From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 22185A0C41 for ; Tue, 30 Nov 2021 17:37:07 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1C32041186; Tue, 30 Nov 2021 17:37:07 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 5CF40410F7 for ; Tue, 30 Nov 2021 17:37:06 +0100 (CET) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 2DF413FFF2 for ; Tue, 30 Nov 2021 16:37:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290226; bh=aEKD7xGc3+Tu9Cw6Qz4ABO7ER9oulqEW1wqZqvtfVVg=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=lEHLSEqFNCCq7cabymjS4a3zfAPBC88RIfGlxk68ZNVg9ERp8aLP3VxJKPA6+wZws VI6hFFs5fzQETocGLO8G6izxJ/53mMRGCw6nAlrwVcFmtZBE1UlF448PRnxM+LwQlD U4mEq7FVPknbpW+9A6VvsZ9qcR/eeOWJMLtssrgRQLA7bVCVqI7kRs8VNo7462uPgu aNe7XMLpxZTXAcfhqxdcS/Hvg6xCckRrNZsqnC0JfRAXZB/5heAJGoa6LXn8qszHfk BDzld5DVYCxBNJLPeMbMGQhc31TTNGkQ06OveI7wgOSWcZWoEG0BP+pgQdq0zzIYPz wan1f323ID9LA== Received: by mail-ed1-f69.google.com with SMTP id s12-20020a50ab0c000000b003efdf5a226fso11294177edc.10 for ; Tue, 30 Nov 2021 08:37:06 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=aEKD7xGc3+Tu9Cw6Qz4ABO7ER9oulqEW1wqZqvtfVVg=; b=dtSjihR8y7mYuKaO68z/h+ZgqzD+UsmlQU+UrkZzUwy4vdnRs1i9nruqpE1gwoCmZc 9/kg9DiklPiMMc5H7TxT9JKWL0OlVTAJn/0KszMa5eQT9JxvvU4lsaTKa20Gdr/0vUce E6gqz0L/XTbkFYQW3j3QMedDGt7aMIYG0jzYnRH8y9fQqLPmirJWeV1aFABiWl6UdyoI QfTvhR3u8ZebccU9tv1IaeP1/Dg0Z9BMGmdK+AWTz9RZpYj0vDB5eGgcIvtCB0ta7vDw 47n2au0kp0GYq6Er+jJcELoL+wvcn+tsio6kUFfqHrPR3Zh+AVAWD9w5EkSmb6MeABZJ CxcA== X-Gm-Message-State: AOAM533acbhd4q2sbm/diFWZXmJsfxz47XK4dXhG254z9W0cKU45oJgU u4CrDk77+jxtIohBMivFjsqwmbZR/xrndx3hVTREelQVCevKhBvmR/olaDI/UxHv1ZdVggk/ogu KZmoUTxlnBA2PWYRj7DrprGfc X-Received: by 2002:a17:906:314e:: with SMTP id e14mr174481eje.165.1638290225889; Tue, 30 Nov 2021 08:37:05 -0800 (PST) X-Google-Smtp-Source: ABdhPJyC5aono40EYGFTBjoj+guBDqjutn7QLa/VG/nmc7+/Y3PFVtzjR4Ax1hlqZpTaM4OBMr/IMw== X-Received: by 2002:a17:906:314e:: with SMTP id e14mr174463eje.165.1638290225740; Tue, 30 Nov 2021 08:37:05 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id dy4sm11442914edb.92.2021.11.30.08.37.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:37:05 -0800 (PST) From: christian.ehrhardt@canonical.com To: Kalesh AP Cc: Ajit Khaparde , Lance Richardson , dpdk stable Subject: patch 'net/bnxt: fix double allocation of ring groups' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:33:42 +0100 Message-Id: <20211130163605.2460997-18-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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. Queued patches are on a temporary branch at: https://github.com/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/06ccbd73937af4bf0e48e5f5eb463a407198237f Thanks. Christian Ehrhardt --- >From 06ccbd73937af4bf0e48e5f5eb463a407198237f Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Wed, 1 Sep 2021 09:30:01 +0530 Subject: [PATCH] net/bnxt: fix double allocation of ring groups [ upstream commit 36a97cd23fc916ac475a0b827074b5645fff0cfe ] After commit "d68249f88266", driver allocates ring groups in bnxt_alloc_hwrm_rx_ring(). But during port start, driver invokes bnxt_alloc_hwrm_rx_ring() followed by bnxt_alloc_all_hwrm_ring_grps(). This will cause the FW command failure in bnxt_alloc_all_hwrm_ring_grps() To fix this, just don't create the ring group if it is already created. Fixes: 9b63c6fd70e3 ("net/bnxt: support Rx/Tx queue start/stop") Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde Reviewed-by: Lance Richardson --- drivers/net/bnxt/bnxt_hwrm.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index 9904d5117f..6e7e3117b9 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -1562,6 +1562,10 @@ int bnxt_hwrm_ring_grp_alloc(struct bnxt *bp, unsigned int idx) struct hwrm_ring_grp_alloc_input req = {.req_type = 0 }; struct hwrm_ring_grp_alloc_output *resp = bp->hwrm_cmd_resp_addr; + /* Don't attempt to re-create the ring group if it is already created */ + if (bp->grp_info[idx].fw_grp_id != INVALID_HW_RING_ID) + return 0; + HWRM_PREP(req, RING_GRP_ALLOC, BNXT_USE_CHIMP_MB); req.cr = rte_cpu_to_le_16(bp->grp_info[idx].cp_fw_ring_id); -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:07.180145338 +0100 +++ 0018-net-bnxt-fix-double-allocation-of-ring-groups.patch 2021-11-30 16:50:05.554871798 +0100 @@ -1 +1 @@ -From 36a97cd23fc916ac475a0b827074b5645fff0cfe Mon Sep 17 00:00:00 2001 +From 06ccbd73937af4bf0e48e5f5eb463a407198237f Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 36a97cd23fc916ac475a0b827074b5645fff0cfe ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +25 @@ -index 0e0e266589..585cdeded8 100644 +index 9904d5117f..6e7e3117b9 100644 @@ -27 +28 @@ -@@ -1873,6 +1873,10 @@ int bnxt_hwrm_ring_grp_alloc(struct bnxt *bp, unsigned int idx) +@@ -1562,6 +1562,10 @@ int bnxt_hwrm_ring_grp_alloc(struct bnxt *bp, unsigned int idx) @@ -35 +36 @@ - HWRM_PREP(&req, HWRM_RING_GRP_ALLOC, BNXT_USE_CHIMP_MB); + HWRM_PREP(req, RING_GRP_ALLOC, BNXT_USE_CHIMP_MB);