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 AB4E9A04DD for ; Wed, 28 Oct 2020 11:46:54 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 90556CA16; Wed, 28 Oct 2020 11:46:52 +0100 (CET) Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) by dpdk.org (Postfix) with ESMTP id 4A9BBCA36 for ; Wed, 28 Oct 2020 11:46:50 +0100 (CET) Received: by mail-wm1-f49.google.com with SMTP id 13so4088380wmf.0 for ; Wed, 28 Oct 2020 03:46:50 -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=fglplvjUNScYirkSVHPDndLgpX8gf+qEuNjkwhY8wa4=; b=jFKCBxwPNvGlqds9mTdWZQZ4Mr0lD9vT6H1hbWS3v2lAT+05PO3+1eMWXtbnF+ODG+ 1DgeHQ1S0ZQvgs8HNmWvMiqBu/2PQZG9wyCcf99ob0Q94uD2jTDmebqIP3ozO7l8HIBJ GJ4jSW3tG3wVFPdYd90C753KA+06LmRlazhYe1/TjMn1/RTmsZrX64WJMhK1voW6VSAk +YFnvszUoFtqS7Z4HuBj5PjEa6wdhUc5EOpKDYOQCJp+2ud8gsHJh0DZhy2PMMXBscnK pyFhZXlWcVpp3czHQr0ZcYk15WT8WVyxhrHmZ9+p4TSXAbvaTsUtBikp/8c7hlsbx/8F yeSw== 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=fglplvjUNScYirkSVHPDndLgpX8gf+qEuNjkwhY8wa4=; b=CN2hRQetCDobyg/HMhTFG9og8xBZFMZ40B4x20CysKCbqWaGAQqSJuKSof6koJFMkO QPqw1TBbdmBPsVgm0vT0FoC9W/qchCXQi+Q4jfR/zEae+qpYM+luSKZd5zJapzok+wIo UOlPpX9ECqCCAcKeOI9/D1+YoK/79daZSAep6o5pQ1M4po7Z/h72G6G/NZd/aknx/L4d RYGZpLtaFcFJVFLo17NB1lG3BuSWbnDIzodnwVbR3B0kdZ/ty9SptvKXKrEOkZpAc+66 gxf6ubIUFGyA+zdVSgsrII+BFR0b1+eiMuOOTsV+IahAYR0j7h1fMoP/2req+G3J7Xcb k0Aw== X-Gm-Message-State: AOAM532gPjLdDWLSJ+5F/VVsS27eDQ5eE1aa1lfsiAogUDPA8ow2X9ht W0cDrkN+GeyIaQjMsirOGwSuXwusAW4fng== X-Google-Smtp-Source: ABdhPJyxCiPS2NPqVU3s5hdn/RcNZVzQDOytDdBzmnOKCGKjYAOOl6MmfuERFvYpFDIIphZnREztVw== X-Received: by 2002:a1c:1b53:: with SMTP id b80mr7585367wmb.16.1603882010056; Wed, 28 Oct 2020 03:46:50 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id r28sm2999739wrr.81.2020.10.28.03.46.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:46:49 -0700 (PDT) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Venkat Duvvuru , Somnath Kotur , Ajit Khaparde , dpdk stable Date: Wed, 28 Oct 2020 10:42:54 +0000 Message-Id: <20201028104606.3504127-15-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 L2 filter allocation' 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 0576a693f9ccea14d0e88ac2a7805e02c847be5e Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Fri, 28 Aug 2020 10:31:11 +0530 Subject: [PATCH] net/bnxt: fix L2 filter allocation [ upstream commit c92f053d4e2d3a2f42d1ad97fc596e8b3b86346a ] DPDK does not support RoCE and XDP. The driver should set the bit 5:4 of the flag to 1 and set bit 6 of the flag in the HWRM_CFA_L2_FILTER_ALLOC command to disable RoCE and XDP features. This change will greatly reduce the CFA resource consumption. Fixes: f92735db1e4c ("net/bnxt: add L2 filter alloc/init/free") Signed-off-by: Kalesh AP Reviewed-by: Venkat Duvvuru Reviewed-by: Somnath Kotur Reviewed-by: Ajit Khaparde --- drivers/net/bnxt/bnxt_hwrm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c index ddcb81f29c..7695a6372f 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c @@ -447,6 +447,9 @@ int bnxt_hwrm_set_l2_filter(struct bnxt *bp, HWRM_PREP(req, CFA_L2_FILTER_ALLOC, BNXT_USE_CHIMP_MB); + /* PMD does not support XDP and RoCE */ + filter->flags |= HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_XDP_DISABLE | + HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_TRAFFIC_L2; req.flags = rte_cpu_to_le_32(filter->flags); enables = filter->enables | -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:12.258732899 +0000 +++ 0015-net-bnxt-fix-L2-filter-allocation.patch 2020-10-28 10:35:11.424828846 +0000 @@ -1,8 +1,10 @@ -From c92f053d4e2d3a2f42d1ad97fc596e8b3b86346a Mon Sep 17 00:00:00 2001 +From 0576a693f9ccea14d0e88ac2a7805e02c847be5e Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Fri, 28 Aug 2020 10:31:11 +0530 Subject: [PATCH] net/bnxt: fix L2 filter allocation +[ upstream commit c92f053d4e2d3a2f42d1ad97fc596e8b3b86346a ] + DPDK does not support RoCE and XDP. The driver should set the bit 5:4 of the flag to 1 and set bit 6 of the flag in the HWRM_CFA_L2_FILTER_ALLOC command to disable RoCE and XDP features. @@ -10,7 +12,6 @@ This change will greatly reduce the CFA resource consumption. Fixes: f92735db1e4c ("net/bnxt: add L2 filter alloc/init/free") -Cc: stable@dpdk.org Signed-off-by: Kalesh AP Reviewed-by: Venkat Duvvuru @@ -21,12 +22,12 @@ 1 file changed, 3 insertions(+) diff --git a/drivers/net/bnxt/bnxt_hwrm.c b/drivers/net/bnxt/bnxt_hwrm.c -index f326f842b6..b26952646b 100644 +index ddcb81f29c..7695a6372f 100644 --- a/drivers/net/bnxt/bnxt_hwrm.c +++ b/drivers/net/bnxt/bnxt_hwrm.c -@@ -530,6 +530,9 @@ int bnxt_hwrm_set_l2_filter(struct bnxt *bp, +@@ -447,6 +447,9 @@ int bnxt_hwrm_set_l2_filter(struct bnxt *bp, - HWRM_PREP(&req, HWRM_CFA_L2_FILTER_ALLOC, BNXT_USE_CHIMP_MB); + HWRM_PREP(req, CFA_L2_FILTER_ALLOC, BNXT_USE_CHIMP_MB); + /* PMD does not support XDP and RoCE */ + filter->flags |= HWRM_CFA_L2_FILTER_ALLOC_INPUT_FLAGS_XDP_DISABLE |