From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 79517A04DD for ; Wed, 28 Oct 2020 11:46:51 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6BAEACA10; Wed, 28 Oct 2020 11:46:50 +0100 (CET) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by dpdk.org (Postfix) with ESMTP id EA657CA10 for ; Wed, 28 Oct 2020 11:46:48 +0100 (CET) Received: by mail-wr1-f41.google.com with SMTP id b8so5179065wrn.0 for ; Wed, 28 Oct 2020 03:46:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=CU/4dJxFIdBpu1LIAGxGqCaTz9Ak2DvIfoSpDm5cqA8=; b=CVBDcwbIOuGZfJ7T1LQ77Q2r8vU69ooX2ZyyzBoAtIIBGyNsoVoXg8nh5YkTRgQ8cq +R/2v94Xl2nmo/AYSFQMJGd4jem/7ZHP5ZbxCLwf9n2ipVNR5gp0mg09vNRyEuRryPOh YG81HW2YM0xfQM9Hg54IoELdXJRCo/S9cl7zZoXApqYQeerpHEJU6CGq8IFWnBbGJ8p0 vNgh356/kHjnRKAKLpS8fwuKIqgn/cDyYT8KQSgjDrnbFMmdJPRBZCXYXoAWZyak29B+ b1iuzqsctJJjU6BBwyLhGhOdgtYh6Aze01iID1uZ63K59rXEEhkPErgXPk5lO8y9pEhD DhdQ== 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:mime-version:content-transfer-encoding; bh=CU/4dJxFIdBpu1LIAGxGqCaTz9Ak2DvIfoSpDm5cqA8=; b=GKyuaif+1PC2LKamLv1obAF51GffQw2bQ2gb1wcG1TWj64uci3XWN5+PXPUwUraNnn vCjlIx6hVCdc9T3BkDaHtvTkx6VxhUqArmHEIG9rEvqxag/FYTb30dwyro6/KFzbFMCj 2kmHAmJ7+5NKuO0ynOFZB0rPfndXsVuTooJiNL4SkTchKHxlQEztLuqKOC/ILm6QxBgQ FJcWt43VQWEPOC1F1Tod608zPeY8eFD9tathnnJ3Ty2QIO/fT3JWJPE92NZPpGWYR6zM YMvYZ1LyslsgtbbH/zNAaMTubxV8pzzgQnvbFBnQBXBwdk6To2sFulFG2MUefyjDln7s YCsg== X-Gm-Message-State: AOAM533Eg53El0VvUPajLqBXF+jYjjDRxAjfM80/daIOswdON8Weq/HO 4FpYXpN+D5wdnZL/Ans5XKg= X-Google-Smtp-Source: ABdhPJwQzJvSPRb9cvt9dIewsyMZWWtSpHci5XP3UYDotwP5fJ0WS6RsfAGed8XETiAlaGmIzWsOPw== X-Received: by 2002:adf:fe8b:: with SMTP id l11mr8452557wrr.9.1603882007607; Wed, 28 Oct 2020 03:46:47 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id x6sm6294474wmb.17.2020.10.28.03.46.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:46:46 -0700 (PDT) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Lance Richardson , Ajit Khaparde , dpdk stable Date: Wed, 28 Oct 2020 10:42:52 +0000 Message-Id: <20201028104606.3504127-13-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/bnxt: fix structure variable initialization' has been queued to stable release 19.11.6 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi, FYI, your patch has been queued to stable release 19.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/20. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Thanks. Luca Boccassi --- >From 2a7ce4a15fc72e162383b974b31220f70971742a Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Fri, 28 Aug 2020 10:31:09 +0530 Subject: [PATCH] net/bnxt: fix structure variable initialization [ upstream commit ce41561d1b998d9e15f74f9c3a6aff78e0f99871 ] During port start if bnxt_alloc_all_hwrm_stat_ctxs() fails, in the cleanup path we do see errors like below: bnxt_hwrm_ring_free(): hwrm_ring_free cp failed. rc:2 bnxt_hwrm_ring_free(): hwrm_ring_free rx failed. rc:2 The reason for this is in bnxt_free_all_hwrm_rings(), the check is made against "ring->fw_ring_id != INVALID_HW_RING_ID" which always return true as ring->fw_ring_id is not set to INVALID_HW_RING_ID while initialising the ring structs. Fixes: 6eb3cc2294fd ("net/bnxt: add initial Tx code") Fixes: 2eb53b134aae ("net/bnxt: add initial Rx code") Signed-off-by: Kalesh AP Reviewed-by: Lance Richardson Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_ring.c | 1 + drivers/net/bnxt/bnxt_rxr.c | 3 +++ drivers/net/bnxt/bnxt_txr.c | 2 ++ 3 files changed, 6 insertions(+) diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c index 1999cd7861..bb60f8ab0f 100644 --- a/drivers/net/bnxt/bnxt_ring.c +++ b/drivers/net/bnxt/bnxt_ring.c @@ -451,6 +451,7 @@ int bnxt_alloc_rxtx_nq_ring(struct bnxt *bp) ring->ring_mask = ring->ring_size - 1; ring->vmem_size = 0; ring->vmem = NULL; + ring->fw_ring_id = INVALID_HW_RING_ID; nqr->cp_ring_struct = ring; rc = bnxt_alloc_rings(bp, 0, NULL, NULL, nqr, NULL, "l2_nqr"); diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c index fa3b4a6be4..32eaf75ed5 100644 --- a/drivers/net/bnxt/bnxt_rxr.c +++ b/drivers/net/bnxt/bnxt_rxr.c @@ -779,6 +779,7 @@ int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id) ring->bd_dma = rxr->rx_desc_mapping; ring->vmem_size = ring->ring_size * sizeof(struct bnxt_sw_rx_bd); ring->vmem = (void **)&rxr->rx_buf_ring; + ring->fw_ring_id = INVALID_HW_RING_ID; cpr = rte_zmalloc_socket("bnxt_rx_ring", sizeof(struct bnxt_cp_ring_info), @@ -800,6 +801,7 @@ int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id) ring->bd_dma = cpr->cp_desc_mapping; ring->vmem_size = 0; ring->vmem = NULL; + ring->fw_ring_id = INVALID_HW_RING_ID; /* Allocate Aggregator rings */ ring = rte_zmalloc_socket("bnxt_rx_ring_struct", @@ -815,6 +817,7 @@ int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id) ring->bd_dma = rxr->ag_desc_mapping; ring->vmem_size = ring->ring_size * sizeof(struct bnxt_sw_rx_bd); ring->vmem = (void **)&rxr->ag_buf_ring; + ring->fw_ring_id = INVALID_HW_RING_ID; return 0; } diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c index 16021407e8..9a18e8f6f7 100644 --- a/drivers/net/bnxt/bnxt_txr.c +++ b/drivers/net/bnxt/bnxt_txr.c @@ -78,6 +78,7 @@ int bnxt_init_tx_ring_struct(struct bnxt_tx_queue *txq, unsigned int socket_id) ring->bd_dma = txr->tx_desc_mapping; ring->vmem_size = ring->ring_size * sizeof(struct bnxt_sw_tx_bd); ring->vmem = (void **)&txr->tx_buf_ring; + ring->fw_ring_id = INVALID_HW_RING_ID; cpr = rte_zmalloc_socket("bnxt_tx_ring", sizeof(struct bnxt_cp_ring_info), @@ -98,6 +99,7 @@ int bnxt_init_tx_ring_struct(struct bnxt_tx_queue *txq, unsigned int socket_id) ring->bd_dma = cpr->cp_desc_mapping; ring->vmem_size = 0; ring->vmem = NULL; + ring->fw_ring_id = INVALID_HW_RING_ID; return 0; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:12.198850185 +0000 +++ 0013-net-bnxt-fix-structure-variable-initialization.patch 2020-10-28 10:35:11.420828787 +0000 @@ -1,8 +1,10 @@ -From ce41561d1b998d9e15f74f9c3a6aff78e0f99871 Mon Sep 17 00:00:00 2001 +From 2a7ce4a15fc72e162383b974b31220f70971742a Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Fri, 28 Aug 2020 10:31:09 +0530 Subject: [PATCH] net/bnxt: fix structure variable initialization +[ upstream commit ce41561d1b998d9e15f74f9c3a6aff78e0f99871 ] + During port start if bnxt_alloc_all_hwrm_stat_ctxs() fails, in the cleanup path we do see errors like below: @@ -16,7 +18,6 @@ Fixes: 6eb3cc2294fd ("net/bnxt: add initial Tx code") Fixes: 2eb53b134aae ("net/bnxt: add initial Rx code") -Cc: stable@dpdk.org Signed-off-by: Kalesh AP Reviewed-by: Lance Richardson @@ -28,7 +29,7 @@ 3 files changed, 6 insertions(+) diff --git a/drivers/net/bnxt/bnxt_ring.c b/drivers/net/bnxt/bnxt_ring.c -index 54f6547442..8f2296b293 100644 +index 1999cd7861..bb60f8ab0f 100644 --- a/drivers/net/bnxt/bnxt_ring.c +++ b/drivers/net/bnxt/bnxt_ring.c @@ -451,6 +451,7 @@ int bnxt_alloc_rxtx_nq_ring(struct bnxt *bp) @@ -40,10 +41,10 @@ nqr->cp_ring_struct = ring; rc = bnxt_alloc_rings(bp, 0, NULL, NULL, nqr, NULL, "l2_nqr"); diff --git a/drivers/net/bnxt/bnxt_rxr.c b/drivers/net/bnxt/bnxt_rxr.c -index 43b1256dcc..b086898148 100644 +index fa3b4a6be4..32eaf75ed5 100644 --- a/drivers/net/bnxt/bnxt_rxr.c +++ b/drivers/net/bnxt/bnxt_rxr.c -@@ -962,6 +962,7 @@ int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id) +@@ -779,6 +779,7 @@ int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id) ring->bd_dma = rxr->rx_desc_mapping; ring->vmem_size = ring->ring_size * sizeof(struct bnxt_sw_rx_bd); ring->vmem = (void **)&rxr->rx_buf_ring; @@ -51,7 +52,7 @@ cpr = rte_zmalloc_socket("bnxt_rx_ring", sizeof(struct bnxt_cp_ring_info), -@@ -983,6 +984,7 @@ int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id) +@@ -800,6 +801,7 @@ int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id) ring->bd_dma = cpr->cp_desc_mapping; ring->vmem_size = 0; ring->vmem = NULL; @@ -59,7 +60,7 @@ /* Allocate Aggregator rings */ ring = rte_zmalloc_socket("bnxt_rx_ring_struct", -@@ -998,6 +1000,7 @@ int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id) +@@ -815,6 +817,7 @@ int bnxt_init_rx_ring_struct(struct bnxt_rx_queue *rxq, unsigned int socket_id) ring->bd_dma = rxr->ag_desc_mapping; ring->vmem_size = ring->ring_size * sizeof(struct bnxt_sw_rx_bd); ring->vmem = (void **)&rxr->ag_buf_ring; @@ -68,7 +69,7 @@ return 0; } diff --git a/drivers/net/bnxt/bnxt_txr.c b/drivers/net/bnxt/bnxt_txr.c -index c7a2de67c7..20683315ed 100644 +index 16021407e8..9a18e8f6f7 100644 --- a/drivers/net/bnxt/bnxt_txr.c +++ b/drivers/net/bnxt/bnxt_txr.c @@ -78,6 +78,7 @@ int bnxt_init_tx_ring_struct(struct bnxt_tx_queue *txq, unsigned int socket_id)