From patchwork Mon Nov 4 22:50:22 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Khaparde X-Patchwork-Id: 62396 X-Patchwork-Delegate: ajit.khaparde@broadcom.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6BDD4A0352; Mon, 4 Nov 2019 23:50:35 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B7A352F42; Mon, 4 Nov 2019 23:50:33 +0100 (CET) Received: from rnd-relay.smtp.broadcom.com (rnd-relay.smtp.broadcom.com [192.19.229.170]) by dpdk.org (Postfix) with ESMTP id 563B22BF4; Mon, 4 Nov 2019 23:50:32 +0100 (CET) Received: from mail-irv-17.broadcom.com (mail-irv-17.lvn.broadcom.net [10.75.242.48]) by rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id E4A4E30C101; Mon, 4 Nov 2019 14:47:43 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com E4A4E30C101 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1572907663; bh=4F8h+DwiYmL1+bH5BTg/BcNpJWF6TJbhko9sWwnfBUQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X4kvfXNkKlQz9q0APu383PrttoFD9dOagutObAYKrYbzO/nRUu1jtCQX3km9ypof9 D+eCvn6AnEtvAX51/TTy7KZ9BPQV7Na2FCqDS3WVMQPvXbkYssjDOkGJv+pkDZFP70 WSaH3irSdQGnLt132m51LJQvCUnU9YD3Ec7R9bhg= Received: from C02VPB22HTD6.wifi.broadcom.net (c02vpb22htd6.wifi.broadcom.net [10.69.74.102]) by mail-irv-17.broadcom.com (Postfix) with ESMTP id D8B8614008C; Mon, 4 Nov 2019 14:50:29 -0800 (PST) From: Ajit Khaparde To: dev@dpdk.org Cc: ferruh.yigit@intel.com, Kalesh AP , stable@dpdk.org, Somnath Kotur Date: Mon, 4 Nov 2019 14:50:22 -0800 Message-Id: <20191104225026.97569-2-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20191104225026.97569-1-ajit.khaparde@broadcom.com> References: <20191104100240.28974-1-kalesh-anakkur.purayil@broadcom.com> <20191104225026.97569-1-ajit.khaparde@broadcom.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 1/5] net/bnxt: fix L4 checksum indication in non-vector Rx 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: Kalesh AP Update "mbuf->ol_flags" correctly for inner and ourter ip checksum errors in case of tunnel and non-tunnel packets. Fixes: 65ee636872eb ("net/bnxt: fix Rx checksum flags") Cc: stable@dpdk.org Signed-off-by: Kalesh AP Reviewed-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_rxr.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c index ee1444c1d..c35bc1afd 100644 --- a/drivers/net/bnxt/bnxt_rxr.c +++ b/drivers/net/bnxt/bnxt_rxr.c @@ -512,15 +512,19 @@ static int bnxt_rx_pkt(struct rte_mbuf **rx_pkt, flags2_f = flags2_0xf(rxcmp1); /* IP Checksum */ - if (unlikely(((IS_IP_NONTUNNEL_PKT(flags2_f)) && - (RX_CMP_IP_CS_ERROR(rxcmp1))) || - (IS_IP_TUNNEL_PKT(flags2_f) && - (RX_CMP_IP_OUTER_CS_ERROR(rxcmp1))))) { - mbuf->ol_flags |= PKT_RX_IP_CKSUM_BAD; + if (likely(IS_IP_NONTUNNEL_PKT(flags2_f))) { + if (unlikely(RX_CMP_IP_CS_ERROR(rxcmp1))) + mbuf->ol_flags |= PKT_RX_IP_CKSUM_BAD; + else + mbuf->ol_flags |= PKT_RX_IP_CKSUM_GOOD; + } else if (IS_IP_TUNNEL_PKT(flags2_f)) { + if (unlikely(RX_CMP_IP_OUTER_CS_ERROR(rxcmp1) || + RX_CMP_IP_CS_ERROR(rxcmp1))) + mbuf->ol_flags |= PKT_RX_IP_CKSUM_BAD; + else + mbuf->ol_flags |= PKT_RX_IP_CKSUM_GOOD; } else if (unlikely(RX_CMP_IP_CS_UNKNOWN(rxcmp1))) { mbuf->ol_flags |= PKT_RX_IP_CKSUM_UNKNOWN; - } else { - mbuf->ol_flags |= PKT_RX_IP_CKSUM_GOOD; } /* L4 Checksum */ From patchwork Mon Nov 4 22:50:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Khaparde X-Patchwork-Id: 62399 X-Patchwork-Delegate: ajit.khaparde@broadcom.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 18091A0352; Mon, 4 Nov 2019 23:50:59 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B829837AF; Mon, 4 Nov 2019 23:50:38 +0100 (CET) Received: from rnd-relay.smtp.broadcom.com (rnd-relay.smtp.broadcom.com [192.19.229.170]) by dpdk.org (Postfix) with ESMTP id 5DCBF2F42 for ; Mon, 4 Nov 2019 23:50:32 +0100 (CET) Received: from mail-irv-17.broadcom.com (mail-irv-17.lvn.broadcom.net [10.75.242.48]) by rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id 0BAB730C105; Mon, 4 Nov 2019 14:47:44 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com 0BAB730C105 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1572907664; bh=EdKLuaEUfueSY+m6AKh1ooSqQKAPMF42aJmhe8m5BGs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MUsLSouTIFkR8qt7u/HmJvGykFHxamAi6MDIXGlLhgl9sD+fIf6u6BYi2P2tcHCKH eCxXdDKVfRPWxqkNtNUJzuBArD98ulRJxsxEPbU8kSlUnR9hfMElilhdzwxbi0sdGA OJtW3vpHrDo/2d6rS+VtOfYvfoFZeAObVB6Jm4t8= Received: from C02VPB22HTD6.wifi.broadcom.net (c02vpb22htd6.wifi.broadcom.net [10.69.74.102]) by mail-irv-17.broadcom.com (Postfix) with ESMTP id 02FB4140069; Mon, 4 Nov 2019 14:50:29 -0800 (PST) From: Ajit Khaparde To: dev@dpdk.org Cc: ferruh.yigit@intel.com, Venkat Duvvuru , Somnath Kotur Date: Mon, 4 Nov 2019 14:50:23 -0800 Message-Id: <20191104225026.97569-3-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20191104225026.97569-1-ajit.khaparde@broadcom.com> References: <20191104100240.28974-1-kalesh-anakkur.purayil@broadcom.com> <20191104225026.97569-1-ajit.khaparde@broadcom.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 2/5] net/bnxt: fix redundant MAC address check 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: Venkat Duvvuru filter->mac_index is used to check, if a same mac is already programmed. Hence, filter->dflt member is not needed which is also used for mac addr redundancy check. This patch fixes it by moving mac_index based redundant check from bnxt_mac_addr_add_op to bnxt_add_mac_filter Fixes: 6118503d8071 ("net/bnxt: fix VLAN filtering") Signed-off-by: Venkat Duvvuru Reviewed-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_ethdev.c | 107 ++++++++++++--------------------- drivers/net/bnxt/bnxt_filter.c | 1 + drivers/net/bnxt/bnxt_filter.h | 7 ++- drivers/net/bnxt/bnxt_hwrm.c | 9 +-- drivers/net/bnxt/bnxt_rxq.c | 2 + 5 files changed, 51 insertions(+), 75 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 7d9459f0a..0b0ce8785 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -1018,8 +1018,7 @@ static void bnxt_mac_addr_remove_op(struct rte_eth_dev *eth_dev, bnxt_hwrm_clear_l2_filter(bp, filter); filter->mac_index = INVALID_MAC_INDEX; memset(&filter->l2_addr, 0, RTE_ETHER_ADDR_LEN); - STAILQ_INSERT_TAIL(&bp->free_filter_list, - filter, next); + bnxt_free_filter(bp, filter); } filter = temp_filter; } @@ -1027,19 +1026,21 @@ static void bnxt_mac_addr_remove_op(struct rte_eth_dev *eth_dev, } static int bnxt_add_mac_filter(struct bnxt *bp, struct bnxt_vnic_info *vnic, - struct rte_ether_addr *mac_addr, uint32_t index) + struct rte_ether_addr *mac_addr, uint32_t index, + uint32_t pool) { struct bnxt_filter_info *filter; int rc = 0; - filter = STAILQ_FIRST(&vnic->filter); - /* During bnxt_mac_addr_add_op, default MAC is - * already programmed, so skip it. But, when - * hw-vlan-filter is turned OFF from ON, default - * MAC filter should be restored - */ - if (index == 0 && filter->dflt) - return 0; + /* Attach requested MAC address to the new l2_filter */ + STAILQ_FOREACH(filter, &vnic->filter, next) { + if (filter->mac_index == index) { + PMD_DRV_LOG(ERR, + "MAC addr already existed for pool %d\n", + pool); + return 0; + } + } filter = bnxt_alloc_filter(bp); if (!filter) { @@ -1047,7 +1048,6 @@ static int bnxt_add_mac_filter(struct bnxt *bp, struct bnxt_vnic_info *vnic, return -ENODEV; } - filter->mac_index = index; /* bnxt_alloc_filter copies default MAC to filter->l2_addr. So, * if the MAC that's been programmed now is a different one, then, * copy that addr to filter->l2_addr @@ -1058,14 +1058,12 @@ static int bnxt_add_mac_filter(struct bnxt *bp, struct bnxt_vnic_info *vnic, rc = bnxt_hwrm_set_l2_filter(bp, vnic->fw_vnic_id, filter); if (!rc) { - if (filter->mac_index == 0) { - filter->dflt = true; + filter->mac_index = index; + if (filter->mac_index == 0) STAILQ_INSERT_HEAD(&vnic->filter, filter, next); - } else { + else STAILQ_INSERT_TAIL(&vnic->filter, filter, next); - } } else { - filter->mac_index = INVALID_MAC_INDEX; memset(&filter->l2_addr, 0, RTE_ETHER_ADDR_LEN); bnxt_free_filter(bp, filter); } @@ -1079,7 +1077,6 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev, { struct bnxt *bp = eth_dev->data->dev_private; struct bnxt_vnic_info *vnic = &bp->vnic_info[pool]; - struct bnxt_filter_info *filter; int rc = 0; rc = is_bnxt_in_error(bp); @@ -1095,16 +1092,8 @@ static int bnxt_mac_addr_add_op(struct rte_eth_dev *eth_dev, PMD_DRV_LOG(ERR, "VNIC not found for pool %d!\n", pool); return -EINVAL; } - /* Attach requested MAC address to the new l2_filter */ - STAILQ_FOREACH(filter, &vnic->filter, next) { - if (filter->mac_index == index) { - PMD_DRV_LOG(ERR, - "MAC addr already existed for pool %d\n", pool); - return 0; - } - } - rc = bnxt_add_mac_filter(bp, vnic, mac_addr, index); + rc = bnxt_add_mac_filter(bp, vnic, mac_addr, index, pool); return rc; } @@ -1726,33 +1715,22 @@ static int bnxt_del_vlan_filter(struct bnxt *bp, uint16_t vlan_id) int rc = 0; uint32_t chk = HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_IVLAN; - /* if VLAN exists && VLAN matches vlan_id - * remove the MAC+VLAN filter - * add a new MAC only filter - * else - * VLAN filter doesn't exist, just skip and continue - */ vnic = BNXT_GET_DEFAULT_VNIC(bp); filter = STAILQ_FIRST(&vnic->filter); while (filter) { /* Search for this matching MAC+VLAN filter */ - if ((filter->enables & chk) && - (filter->l2_ivlan == vlan_id && - filter->l2_ivlan_mask != 0) && - !memcmp(filter->l2_addr, bp->mac_addr, - RTE_ETHER_ADDR_LEN)) { + if (bnxt_vlan_filter_exists(bp, filter, chk, vlan_id)) { /* Delete the filter */ rc = bnxt_hwrm_clear_l2_filter(bp, filter); if (rc) return rc; STAILQ_REMOVE(&vnic->filter, filter, bnxt_filter_info, next); - STAILQ_INSERT_TAIL(&bp->free_filter_list, filter, next); - + bnxt_free_filter(bp, filter); PMD_DRV_LOG(INFO, - "Del Vlan filter for %d\n", + "Deleted vlan filter for %d\n", vlan_id); - return rc; + return 0; } filter = STAILQ_NEXT(filter, next); } @@ -1780,11 +1758,7 @@ static int bnxt_add_vlan_filter(struct bnxt *bp, uint16_t vlan_id) filter = STAILQ_FIRST(&vnic->filter); /* Check if the VLAN has already been added */ while (filter) { - if ((filter->enables & chk) && - (filter->l2_ivlan == vlan_id && - filter->l2_ivlan_mask == 0x0FFF) && - !memcmp(filter->l2_addr, bp->mac_addr, - RTE_ETHER_ADDR_LEN)) + if (bnxt_vlan_filter_exists(bp, filter, chk, vlan_id)) return -EEXIST; filter = STAILQ_NEXT(filter, next); @@ -1817,18 +1791,17 @@ static int bnxt_add_vlan_filter(struct bnxt *bp, uint16_t vlan_id) * not able to create the filter in hardware. */ filter->fw_l2_filter_id = UINT64_MAX; - STAILQ_INSERT_TAIL(&bp->free_filter_list, filter, next); + bnxt_free_filter(bp, filter); return rc; - } else { - /* Add this new filter to the list */ - if (vlan_id == 0) { - filter->dflt = true; - STAILQ_INSERT_HEAD(&vnic->filter, filter, next); - } else { - STAILQ_INSERT_TAIL(&vnic->filter, filter, next); - } } + filter->mac_index = 0; + /* Add this new filter to the list */ + if (vlan_id == 0) + STAILQ_INSERT_HEAD(&vnic->filter, filter, next); + else + STAILQ_INSERT_TAIL(&vnic->filter, filter, next); + PMD_DRV_LOG(INFO, "Added Vlan filter for %d\n", vlan_id); return rc; @@ -1859,19 +1832,17 @@ static int bnxt_del_dflt_mac_filter(struct bnxt *bp, filter = STAILQ_FIRST(&vnic->filter); while (filter) { - if (filter->dflt && + if (filter->mac_index == 0 && !memcmp(filter->l2_addr, bp->mac_addr, RTE_ETHER_ADDR_LEN)) { rc = bnxt_hwrm_clear_l2_filter(bp, filter); - if (rc) - return rc; - filter->dflt = false; - STAILQ_REMOVE(&vnic->filter, filter, - bnxt_filter_info, next); - STAILQ_INSERT_TAIL(&bp->free_filter_list, - filter, next); - filter->fw_l2_filter_id = -1; - break; + if (!rc) { + STAILQ_REMOVE(&vnic->filter, filter, + bnxt_filter_info, next); + bnxt_free_filter(bp, filter); + filter->fw_l2_filter_id = UINT64_MAX; + } + return rc; } filter = STAILQ_NEXT(filter, next); } @@ -1894,10 +1865,10 @@ bnxt_vlan_offload_set_op(struct rte_eth_dev *dev, int mask) vnic = BNXT_GET_DEFAULT_VNIC(bp); if (!(rx_offloads & DEV_RX_OFFLOAD_VLAN_FILTER)) { /* Remove any VLAN filters programmed */ - for (i = 0; i < 4095; i++) + for (i = 0; i < RTE_ETHER_MAX_VLAN_ID; i++) bnxt_del_vlan_filter(bp, i); - rc = bnxt_add_mac_filter(bp, vnic, NULL, 0); + rc = bnxt_add_mac_filter(bp, vnic, NULL, 0, 0); if (rc) return rc; } else { diff --git a/drivers/net/bnxt/bnxt_filter.c b/drivers/net/bnxt/bnxt_filter.c index 1c8e3e329..7e29468b7 100644 --- a/drivers/net/bnxt/bnxt_filter.c +++ b/drivers/net/bnxt/bnxt_filter.c @@ -34,6 +34,7 @@ struct bnxt_filter_info *bnxt_alloc_filter(struct bnxt *bp) } STAILQ_REMOVE_HEAD(&bp->free_filter_list, next); + filter->mac_index = INVALID_MAC_INDEX; /* Default to L2 MAC Addr filter */ filter->flags = HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_PATH_RX; filter->enables = HWRM_CFA_L2_FILTER_ALLOC_INPUT_ENABLES_L2_ADDR | diff --git a/drivers/net/bnxt/bnxt_filter.h b/drivers/net/bnxt/bnxt_filter.h index e09b435db..7415b3612 100644 --- a/drivers/net/bnxt/bnxt_filter.h +++ b/drivers/net/bnxt/bnxt_filter.h @@ -8,6 +8,12 @@ #include +#define bnxt_vlan_filter_exists(bp, filter, chk, vlan_id) \ + (((filter)->enables & (chk)) && \ + ((filter)->l2_ivlan == (vlan_id) && \ + (filter)->l2_ivlan_mask == 0x0FFF) && \ + !memcmp((filter)->l2_addr, (bp)->mac_addr, \ + RTE_ETHER_ADDR_LEN)) struct bnxt; #define BNXT_FLOW_L2_VALID_FLAG BIT(0) @@ -71,7 +77,6 @@ struct bnxt_filter_info { uint16_t ip_addr_type; uint16_t ethertype; uint32_t priority; - uint8_t dflt; }; struct bnxt_filter_info *bnxt_alloc_filter(struct bnxt *bp); diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index c777c73bd..daed4ee76 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -2468,18 +2468,15 @@ int bnxt_set_hwrm_vnic_filters(struct bnxt *bp, struct bnxt_vnic_info *vnic) int rc = 0; STAILQ_FOREACH(filter, &vnic->filter, next) { - if (filter->filter_type == HWRM_CFA_EM_FILTER) { + if (filter->filter_type == HWRM_CFA_EM_FILTER) rc = bnxt_hwrm_set_em_filter(bp, filter->dst_id, filter); - } else if (filter->filter_type == HWRM_CFA_NTUPLE_FILTER) { + else if (filter->filter_type == HWRM_CFA_NTUPLE_FILTER) rc = bnxt_hwrm_set_ntuple_filter(bp, filter->dst_id, filter); - } else { + else rc = bnxt_hwrm_set_l2_filter(bp, vnic->fw_vnic_id, filter); - if (!rc) - filter->dflt = 1; - } if (rc) break; } diff --git a/drivers/net/bnxt/bnxt_rxq.c b/drivers/net/bnxt/bnxt_rxq.c index d55adc33a..6420281d3 100644 --- a/drivers/net/bnxt/bnxt_rxq.c +++ b/drivers/net/bnxt/bnxt_rxq.c @@ -63,6 +63,7 @@ int bnxt_mq_rx_configure(struct bnxt *bp) rc = -ENOMEM; goto err_out; } + filter->mac_index = 0; filter->flags |= HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_OUTERMOST; STAILQ_INSERT_TAIL(&vnic->filter, filter, next); goto out; @@ -146,6 +147,7 @@ int bnxt_mq_rx_configure(struct bnxt *bp) rc = -ENOMEM; goto err_out; } + filter->mac_index = 0; filter->flags |= HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_OUTERMOST; /* * TODO: Configure & associate CFA rule for From patchwork Mon Nov 4 22:50:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Khaparde X-Patchwork-Id: 62400 X-Patchwork-Delegate: ajit.khaparde@broadcom.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 32101A0352; Mon, 4 Nov 2019 23:51:07 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4C8A944C7; Mon, 4 Nov 2019 23:50:40 +0100 (CET) Received: from rnd-relay.smtp.broadcom.com (rnd-relay.smtp.broadcom.com [192.19.229.170]) by dpdk.org (Postfix) with ESMTP id 592972C37 for ; Mon, 4 Nov 2019 23:50:32 +0100 (CET) Received: from mail-irv-17.broadcom.com (mail-irv-17.lvn.broadcom.net [10.75.242.48]) by rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id 321A130C108; Mon, 4 Nov 2019 14:47:44 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com 321A130C108 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1572907664; bh=VmN6kQ98f8dVPUCfGv69XiF2OXTYkZntWT+8cWmohig=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ojJ7uey0YqEPVTQlgq7/OVukvl91XC+tIsfr4tyMLYMPFjDceTe1LWu/6jEUQv6sW DdSOGcoQMGMPqmwuQVHtFWy4JTvRSLVNJqS22dw2oFIl7Bbov5fuhPjuHnAEb8T3P/ Jhk8FWLctj7w9aWvT22fUxlv82PCI+BupQWKwz9o= Received: from C02VPB22HTD6.wifi.broadcom.net (c02vpb22htd6.wifi.broadcom.net [10.69.74.102]) by mail-irv-17.broadcom.com (Postfix) with ESMTP id 1CCA114008D; Mon, 4 Nov 2019 14:50:30 -0800 (PST) From: Ajit Khaparde To: dev@dpdk.org Cc: ferruh.yigit@intel.com, Santoshkumar Karanappa Rastapur , Somnath Kotur Date: Mon, 4 Nov 2019 14:50:24 -0800 Message-Id: <20191104225026.97569-4-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20191104225026.97569-1-ajit.khaparde@broadcom.com> References: <20191104100240.28974-1-kalesh-anakkur.purayil@broadcom.com> <20191104225026.97569-1-ajit.khaparde@broadcom.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 3/5] net/bnxt: fix vnic allocation failure on port toggle 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: Santoshkumar Karanappa Rastapur bnxt_init_chip called on port start keeps incrementing rx_cosq_cnt. Hence more vnics are allocated with less number of rings on each port stop/start operation. Eventually vnic allocation fails due to incorrect ring group as no ring gets allocated to the vnic. Fixes: 84d49664b5b2 ("net/bnxt: support CoS classification") Signed-off-by: Santoshkumar Karanappa Rastapur Reviewed-by: Somnath Kotur --- drivers/net/bnxt/bnxt_ethdev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 0b0ce8785..3acf66d59 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -967,6 +967,7 @@ static void bnxt_dev_stop_op(struct rte_eth_dev *eth_dev) bnxt_shutdown_nic(bp); bnxt_hwrm_if_change(bp, 0); bp->dev_stopped = 1; + bp->rx_cosq_cnt = 0; } static void bnxt_dev_close_op(struct rte_eth_dev *eth_dev) From patchwork Mon Nov 4 22:50:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Khaparde X-Patchwork-Id: 62398 X-Patchwork-Delegate: ajit.khaparde@broadcom.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 74C5FA0352; Mon, 4 Nov 2019 23:50:50 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 3726D3772; Mon, 4 Nov 2019 23:50:37 +0100 (CET) Received: from rnd-relay.smtp.broadcom.com (rnd-relay.smtp.broadcom.com [192.19.229.170]) by dpdk.org (Postfix) with ESMTP id 67868316B for ; Mon, 4 Nov 2019 23:50:32 +0100 (CET) Received: from mail-irv-17.broadcom.com (mail-irv-17.lvn.broadcom.net [10.75.242.48]) by rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id 4B9E830C10D; Mon, 4 Nov 2019 14:47:44 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com 4B9E830C10D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1572907664; bh=Nl5siO4ugW8nW1RL1mGQwWswIu2anmrw4wgDD1gmDdQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=E2pgd4xOXVQJm4rAgyg7BUr+xWuNpb6viFRDauHNtdLjJfbeZCdN5tKRBNzow0Xrb Vsy2I6C+onpztWQ0yBbVtN2C9AIcjeVUvzD8IO7iXQl9bQFvO6Nqbb4T/l7hDumREI VcRg8uue1pV6lF6iTS5eHbLuxP38+GQqg5/hJykM= Received: from C02VPB22HTD6.wifi.broadcom.net (c02vpb22htd6.wifi.broadcom.net [10.69.74.102]) by mail-irv-17.broadcom.com (Postfix) with ESMTP id 40A98140090; Mon, 4 Nov 2019 14:50:30 -0800 (PST) From: Ajit Khaparde To: dev@dpdk.org Cc: ferruh.yigit@intel.com, Kalesh AP , Santoshkumar Karanappa Rastapur Date: Mon, 4 Nov 2019 14:50:25 -0800 Message-Id: <20191104225026.97569-5-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20191104225026.97569-1-ajit.khaparde@broadcom.com> References: <20191104100240.28974-1-kalesh-anakkur.purayil@broadcom.com> <20191104225026.97569-1-ajit.khaparde@broadcom.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 4/5] net/bnxt: fix a failure case during initialization 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: Kalesh AP During initialization sequence in bnxt_alloc_mem() if bnxt_alloc_async_cp_ring() fails, driver invokes bnxt_free_mem() which in turn call bnxt_free_vnic_mem() which causes the error logs "bnxt_free_vnic_mem(): VNIC is not freed yet!". This is because vnic memory is allocated but not initialized yet. Fix this by moving bnxt_init_vnics() from bnxt_init_nic() to bnxt_alloc_vnic_mem(). Also get rid of bnxt_init_nic() as the initialization is done in respective functions now. Fixes: 1bf01f5135f8 ("net/bnxt: prevent device access when device is in reset") Signed-off-by: Kalesh AP Reviewed-by: Santoshkumar Karanappa Rastapur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_ethdev.c | 18 ------------------ drivers/net/bnxt/bnxt_filter.c | 3 ++- drivers/net/bnxt/bnxt_filter.h | 1 - drivers/net/bnxt/bnxt_ring.c | 5 ++--- drivers/net/bnxt/bnxt_ring.h | 1 - drivers/net/bnxt/bnxt_vnic.c | 5 +++-- drivers/net/bnxt/bnxt_vnic.h | 1 - 7 files changed, 7 insertions(+), 27 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 3acf66d59..b9b055e71 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -479,22 +479,6 @@ static int bnxt_shutdown_nic(struct bnxt *bp) return 0; } -static int bnxt_init_nic(struct bnxt *bp) -{ - int rc; - - if (BNXT_HAS_RING_GRPS(bp)) { - rc = bnxt_init_ring_grps(bp); - if (rc) - return rc; - } - - bnxt_init_vnics(bp); - bnxt_init_filters(bp); - - return 0; -} - /* * Device configuration and status function */ @@ -4665,8 +4649,6 @@ static int bnxt_init_resources(struct bnxt *bp, bool reconfig_dev) if (rc) return rc; - bnxt_init_nic(bp); - rc = bnxt_request_int(bp); if (rc) return rc; diff --git a/drivers/net/bnxt/bnxt_filter.c b/drivers/net/bnxt/bnxt_filter.c index 7e29468b7..da1a6c24a 100644 --- a/drivers/net/bnxt/bnxt_filter.c +++ b/drivers/net/bnxt/bnxt_filter.c @@ -61,7 +61,7 @@ struct bnxt_filter_info *bnxt_alloc_vf_filter(struct bnxt *bp, uint16_t vf) return filter; } -void bnxt_init_filters(struct bnxt *bp) +static void bnxt_init_filters(struct bnxt *bp) { struct bnxt_filter_info *filter; int i, max_filters; @@ -171,6 +171,7 @@ int bnxt_alloc_filter_mem(struct bnxt *bp) return -ENOMEM; } bp->filter_info = filter_mem; + bnxt_init_filters(bp); return 0; } diff --git a/drivers/net/bnxt/bnxt_filter.h b/drivers/net/bnxt/bnxt_filter.h index 7415b3612..9db3e7487 100644 --- a/drivers/net/bnxt/bnxt_filter.h +++ b/drivers/net/bnxt/bnxt_filter.h @@ -81,7 +81,6 @@ struct bnxt_filter_info { struct bnxt_filter_info *bnxt_alloc_filter(struct bnxt *bp); struct bnxt_filter_info *bnxt_alloc_vf_filter(struct bnxt *bp, uint16_t vf); -void bnxt_init_filters(struct bnxt *bp); void bnxt_free_all_filters(struct bnxt *bp); void bnxt_free_filter_mem(struct bnxt *bp); int bnxt_alloc_filter_mem(struct bnxt *bp); diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c index 0a182d3a8..ea46fa9bc 100644 --- a/drivers/net/bnxt/bnxt_ring.c +++ b/drivers/net/bnxt/bnxt_ring.c @@ -38,15 +38,13 @@ void bnxt_free_ring(struct bnxt_ring *ring) * Ring groups */ -int bnxt_init_ring_grps(struct bnxt *bp) +static void bnxt_init_ring_grps(struct bnxt *bp) { unsigned int i; for (i = 0; i < bp->max_ring_grps; i++) memset(&bp->grp_info[i], (uint8_t)HWRM_NA_SIGNATURE, sizeof(struct bnxt_ring_grp_info)); - - return 0; } int bnxt_alloc_ring_grps(struct bnxt *bp) @@ -76,6 +74,7 @@ int bnxt_alloc_ring_grps(struct bnxt *bp) "Failed to alloc grp info tbl.\n"); return -ENOMEM; } + bnxt_init_ring_grps(bp); } return 0; diff --git a/drivers/net/bnxt/bnxt_ring.h b/drivers/net/bnxt/bnxt_ring.h index 833118391..48a39d788 100644 --- a/drivers/net/bnxt/bnxt_ring.h +++ b/drivers/net/bnxt/bnxt_ring.h @@ -65,7 +65,6 @@ struct bnxt_tx_ring_info; struct bnxt_rx_ring_info; struct bnxt_cp_ring_info; void bnxt_free_ring(struct bnxt_ring *ring); -int bnxt_init_ring_grps(struct bnxt *bp); int bnxt_alloc_ring_grps(struct bnxt *bp); int bnxt_alloc_rings(struct bnxt *bp, uint16_t qidx, struct bnxt_tx_queue *txq, diff --git a/drivers/net/bnxt/bnxt_vnic.c b/drivers/net/bnxt/bnxt_vnic.c index 2f0ed1026..412a53dc0 100644 --- a/drivers/net/bnxt/bnxt_vnic.c +++ b/drivers/net/bnxt/bnxt_vnic.c @@ -35,7 +35,7 @@ void prandom_bytes(void *dest_ptr, size_t len) } } -void bnxt_init_vnics(struct bnxt *bp) +static void bnxt_init_vnics(struct bnxt *bp) { struct bnxt_vnic_info *vnic; uint16_t max_vnics; @@ -52,7 +52,6 @@ void bnxt_init_vnics(struct bnxt *bp) vnic->hash_mode = HWRM_VNIC_RSS_CFG_INPUT_HASH_MODE_FLAGS_DEFAULT; - prandom_bytes(vnic->rss_hash_key, HW_HASH_KEY_SIZE); STAILQ_INIT(&vnic->filter); STAILQ_INIT(&vnic->flow_list); STAILQ_INSERT_TAIL(&bp->free_vnic_list, vnic, next); @@ -179,6 +178,7 @@ int bnxt_alloc_vnic_attributes(struct bnxt *bp) HW_HASH_KEY_SIZE); vnic->mc_list_dma_addr = vnic->rss_hash_key_dma_addr + HW_HASH_KEY_SIZE; + prandom_bytes(vnic->rss_hash_key, HW_HASH_KEY_SIZE); } return 0; @@ -220,6 +220,7 @@ int bnxt_alloc_vnic_mem(struct bnxt *bp) return -ENOMEM; } bp->vnic_info = vnic_mem; + bnxt_init_vnics(bp); return 0; } diff --git a/drivers/net/bnxt/bnxt_vnic.h b/drivers/net/bnxt/bnxt_vnic.h index 4f760e0b0..a372b899b 100644 --- a/drivers/net/bnxt/bnxt_vnic.h +++ b/drivers/net/bnxt/bnxt_vnic.h @@ -58,7 +58,6 @@ struct bnxt_vnic_info { }; struct bnxt; -void bnxt_init_vnics(struct bnxt *bp); int bnxt_free_vnic(struct bnxt *bp, struct bnxt_vnic_info *vnic, int pool); struct bnxt_vnic_info *bnxt_alloc_vnic(struct bnxt *bp); From patchwork Mon Nov 4 22:50:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Khaparde X-Patchwork-Id: 62401 X-Patchwork-Delegate: ajit.khaparde@broadcom.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 14EF1A0352; Mon, 4 Nov 2019 23:51:17 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 54C514CA7; Mon, 4 Nov 2019 23:50:42 +0100 (CET) Received: from rnd-relay.smtp.broadcom.com (rnd-relay.smtp.broadcom.com [192.19.229.170]) by dpdk.org (Postfix) with ESMTP id 705162BF4 for ; Mon, 4 Nov 2019 23:50:33 +0100 (CET) Received: from mail-irv-17.broadcom.com (mail-irv-17.lvn.broadcom.net [10.75.242.48]) by rnd-relay.smtp.broadcom.com (Postfix) with ESMTP id 6E53830C118; Mon, 4 Nov 2019 14:47:44 -0800 (PST) DKIM-Filter: OpenDKIM Filter v2.10.3 rnd-relay.smtp.broadcom.com 6E53830C118 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=broadcom.com; s=dkimrelay; t=1572907664; bh=ZVUlHCW0J87V4WajXyVzraMt+oXN8p6XCT0yOTlaVwc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZbNaFhLZVkEFcrjbgQnw2wCeiYUOH2Q9ys7SrARZ/H09V9xYvTbqEyW1h/228x0ma EUq8A5qsifihDhYkX6rkbKUZK+xOhECnK+hYby0gPez9hmDqh00OzxpJyV0S+GnNc6 zL18thP0YfRssdCgyww0C5P2yk96GXRhq0ee84Mg= Received: from C02VPB22HTD6.wifi.broadcom.net (c02vpb22htd6.wifi.broadcom.net [10.69.74.102]) by mail-irv-17.broadcom.com (Postfix) with ESMTP id 5B98A14008E; Mon, 4 Nov 2019 14:50:30 -0800 (PST) From: Ajit Khaparde To: dev@dpdk.org Cc: ferruh.yigit@intel.com, Somnath Kotur Date: Mon, 4 Nov 2019 14:50:26 -0800 Message-Id: <20191104225026.97569-6-ajit.khaparde@broadcom.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20191104225026.97569-1-ajit.khaparde@broadcom.com> References: <20191104100240.28974-1-kalesh-anakkur.purayil@broadcom.com> <20191104225026.97569-1-ajit.khaparde@broadcom.com> MIME-Version: 1.0 Subject: [dpdk-dev] [PATCH v3 5/5] net/bnxt: fix incorrect COS queue mapping 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" While issuing hwrm_queue_qportcfg command, we are setting the drv_qmap_cap bit which is causing the firmware to return incorrect COS queue mapping. This bit is not required when COS classification is enabled. Fixes: 698aa7e95325 ("net/bnxt: add code to determine the Tx COS queue") Signed-off-by: Ajit Khaparde Reviewed-by: Somnath Kotur --- drivers/net/bnxt/bnxt_hwrm.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index daed4ee76..ab6cb1dc3 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -1217,8 +1217,9 @@ int bnxt_hwrm_queue_qportcfg(struct bnxt *bp) HWRM_PREP(req, QUEUE_QPORTCFG, BNXT_USE_CHIMP_MB); req.flags = rte_cpu_to_le_32(dir); - /* HWRM Version >= 1.9.1 */ - if (bp->hwrm_spec_code >= HWRM_VERSION_1_9_1) + /* HWRM Version >= 1.9.1 only if COS Classification is not required. */ + if (bp->hwrm_spec_code >= HWRM_VERSION_1_9_1 && + !(bp->vnic_cap_flags & BNXT_VNIC_CAP_COS_CLASSIFY)) req.drv_qmap_cap = HWRM_QUEUE_QPORTCFG_INPUT_DRV_QMAP_CAP_ENABLED; rc = bnxt_hwrm_send_message(bp, &req, sizeof(req), BNXT_USE_CHIMP_MB);