From patchwork Wed May 9 12:47:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Krawczyk X-Patchwork-Id: 39591 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B6A861B66F; Wed, 9 May 2018 14:47:48 +0200 (CEST) Received: from mail-lf0-f68.google.com (mail-lf0-f68.google.com [209.85.215.68]) by dpdk.org (Postfix) with ESMTP id D08251B641 for ; Wed, 9 May 2018 14:47:33 +0200 (CEST) Received: by mail-lf0-f68.google.com with SMTP id z142-v6so7489932lff.5 for ; Wed, 09 May 2018 05:47:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=semihalf-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ieKV3+HEFKeo3DwvFd4k7fxGWdioCKRDbbdAWeTWAn8=; b=Uf7i8OCicl95zkZyxZvTsb9oDwIRwDHx4TS2ZnYC4fdiHPr7adYzeIaPr629B/NAo4 41QFGbw1N2mw88SuuSzEfbnAFDAeRtddTrk8F6fwZG7ZJZo9SNS3/r0VZzS8oOQPF3f2 isZM6q7WfmUq2Q62ZykWEecikNusNxqtAvjWSjIvhfUmzzggN5P54NdxfPw+Cl94nLQ9 LDAAMtnK0hg5xci512ED458COFk6PBR8Uxmjv2hq/WbnS27WTWwrp6V1V0503sFbcNI1 E/2nTxqLA7CiBN1Dnfrq2iHxNvT5JY0cvE8OlINLb4n31Mtdoyfw3MAgdQmEp0bPn9mH YuaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ieKV3+HEFKeo3DwvFd4k7fxGWdioCKRDbbdAWeTWAn8=; b=gmSWBbCjhM7c9Gj6ZM8tF0FAJFQ5O7USRvGxeYFtLvtRubrZD7Iyr3wH9JZvfqMzFV wCh1Ffii6y3cU5sD1wqmLbRUK2RPIFgZu2oJIA/lcG80kkbq3NkFm3tTH7ZItau4PjBC WmuznqRyrOnQ9AAEADnm4vtpb+gRFgZhwAd/UtwkJJCqbbXimeyRBjlUDpv6TxpgZ92l f3ArQZqMkuzNYKD9qY00wUFWqo4Zm6cxA6dRnWvckGN+rr1EAijx7d3J9OU9K2LHAIJO HAVJHDW3oj1nTY398DEASyOoNfze7tIimX9gAhfTMAkrxGHedWeK3ZNppmni5akFNbQB LNTg== X-Gm-Message-State: ALKqPwfqDi4+nfS0aAxetqvwijZFxlWtfJgGIOyJ0g6cz26erPOBJ5fc BLfPqmvSs4L+Qs6FSTFw6QuhKQ== X-Google-Smtp-Source: AB8JxZq14EgNdk+moxCCs5XkJCZMfXZmBecGgZ+Ac535Ti1SkP3+1tp6dOfmqkbQleWVNnN0HnQXJg== X-Received: by 2002:a19:7713:: with SMTP id s19-v6mr5524938lfc.8.1525870053488; Wed, 09 May 2018 05:47:33 -0700 (PDT) Received: from mkPC.semihalf.local (31-172-191-173.noc.fibertech.net.pl. [31.172.191.173]) by smtp.gmail.com with ESMTPSA id l10-v6sm5149258lja.62.2018.05.09.05.47.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 09 May 2018 05:47:32 -0700 (PDT) From: Michal Krawczyk To: Marcin Wojtas , Michal Krawczyk , Guy Tzalik , Evgeny Schemeilin Cc: dev@dpdk.org, matua@amazon.com, Rafal Kozik Date: Wed, 9 May 2018 14:47:08 +0200 Message-Id: <20180509124714.23305-9-mk@semihalf.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180509124714.23305-1-mk@semihalf.com> References: <20180509124714.23305-1-mk@semihalf.com> Subject: [dpdk-dev] [PATCH v1 18/24] net/ena: validate Tx req id X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" From: Rafal Kozik Validate Tx req id during clearing completed packets. If id is wrong, trigger NIC reset. Signed-off-by: Rafal Kozik Acked-by: Michal Krawczyk --- drivers/net/ena/ena_ethdev.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) -- 2.14.1 diff --git a/drivers/net/ena/ena_ethdev.c b/drivers/net/ena/ena_ethdev.c index 3fabe196f..43e34a252 100644 --- a/drivers/net/ena/ena_ethdev.c +++ b/drivers/net/ena/ena_ethdev.c @@ -388,6 +388,27 @@ static inline int validate_rx_req_id(struct ena_ring *rx_ring, uint16_t req_id) return -EFAULT; } +static int validate_tx_req_id(struct ena_ring *tx_ring, u16 req_id) +{ + struct ena_tx_buffer *tx_info = NULL; + + if (likely(req_id < tx_ring->ring_size)) { + tx_info = &tx_ring->tx_buffer_info[req_id]; + if (likely(tx_info->mbuf)) + return 0; + } + + if (tx_info) + RTE_LOG(ERR, PMD, "tx_info doesn't have valid mbuf\n"); + else + RTE_LOG(ERR, PMD, "Invalid req_id: %hu\n", req_id); + + /* Trigger device reset */ + tx_ring->adapter->reset_reason = ENA_REGS_RESET_INV_TX_REQ_ID; + tx_ring->adapter->trigger_reset = true; + return -EFAULT; +} + static void ena_config_host_info(struct ena_com_dev *ena_dev) { struct ena_admin_host_info *host_info; @@ -2154,6 +2175,10 @@ static uint16_t eth_ena_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, /* Clear complete packets */ while (ena_com_tx_comp_req_id_get(tx_ring->ena_com_io_cq, &req_id) >= 0) { + rc = validate_tx_req_id(tx_ring, req_id); + if (rc) + break; + /* Get Tx info & store how many descs were processed */ tx_info = &tx_ring->tx_buffer_info[req_id]; total_tx_descs += tx_info->tx_descs;