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 8DCDAA0032 for ; Fri, 18 Feb 2022 13:41:01 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 795B740141; Fri, 18 Feb 2022 13:41:01 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mails.dpdk.org (Postfix) with ESMTP id C144641140 for ; Fri, 18 Feb 2022 13:41:00 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id bg21-20020a05600c3c9500b0035283e7a012so6351062wmb.0 for ; Fri, 18 Feb 2022 04:41:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8YF8zhEYbVM5GHmoMgVjqE2mGrbQTaa5l1Z7XUFl8ko=; b=Y4bRLTOiGoWFxmurF+ZoMhoyB1FY2YXibXgS08sOzoDtRNOP6+JyM7g9lQJzyknIzR xAvDc5SvWoCmPUDcNCPwLRmH+ujS+I0750Aq7sgl0pntIHvghs/dmRYMf7jfGPNnda18 aWtm5P0I52E11FeBb+ofwdi+igd9tH9Caf3iL8kgtShjiOdvGPzxs8KuBEIeHTMZMkro CDodu219ycsYI9eLOZHuAaJAUBTCRIIrSRFsAknh3rfdNMoM4uyPJmIjOWyseQ7iKh1k 3WdLTKOc1WHfOovkVns3MVqS59i6WjjAo0//8OXD8CRgvQYecgqiLOAgznzeLOPL4oH5 HRvw== 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=8YF8zhEYbVM5GHmoMgVjqE2mGrbQTaa5l1Z7XUFl8ko=; b=2nNZ5Vu9GypbA7QOaO+oWDkvgcyqnB6OSNPTh2KowysDVJXIgA4YJS1kS280D6gv9r 19gcFXzIXMsGgBTLEXo9MaVtbe++e7VRzBG7kBJIoXBHePjZFoB/f+HWDabyFW5ZCxot QRKekygilpSLAtQHpsya25SbjE7GY97An9Tu8dhx78rP0aj6Kzsb5EbOekfqSOEFHS8F YABuoumJx/e8j39QCzHCeJuy7EbmO87LEvl9IIkk/WUwNEDUAubTg6z/A0NWmEjvTSYB zVjCfeIGWedacUFvEdYve9PMfCcVVRfIZwkfvymlZi2MD4JOr1etol5b5godNwlcjqSM txdA== X-Gm-Message-State: AOAM533GCSzhkO063CZAOrVOe/PtX5saXqZlWwFqNMK+5En41jJ6FDRO 9OnMonzTayyncLSqaSUnF/0= X-Google-Smtp-Source: ABdhPJyS5Vv0vPSe7Q1Is3Zfr8fxWjJXhT7PiqnmdaRqawvcWlNIkEbxu+H0WNM7BV7xm9Kqq94O6Q== X-Received: by 2002:a1c:7207:0:b0:37c:af4b:637c with SMTP id n7-20020a1c7207000000b0037caf4b637cmr10195161wmc.178.1645188060487; Fri, 18 Feb 2022 04:41:00 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id i3sm44909465wrq.72.2022.02.18.04.40.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:40:59 -0800 (PST) From: luca.boccassi@gmail.com To: Kalesh AP Cc: Ajit Khaparde , Somnath Kotur , dpdk stable Subject: patch 'net/bnxt: cap maximum number of unicast MAC addresses' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:37:57 +0000 Message-Id: <20220218123931.1749595-28-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-1-luca.boccassi@gmail.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 20.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/20/22. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/5889a24544457b11abaccd66f24fc28c0bdbe872 Thanks. Luca Boccassi --- >From 5889a24544457b11abaccd66f24fc28c0bdbe872 Mon Sep 17 00:00:00 2001 From: Kalesh AP Date: Tue, 4 Jan 2022 14:08:12 +0530 Subject: [PATCH] net/bnxt: cap maximum number of unicast MAC addresses [ upstream commit 604a6be6b6c70cafdf055129d7d141d84509ad90 ] The Maximum number of receive mac addr is hard coded to 128 in the ethdev library(RTE_ETH_NUM_RECEIVE_MAC_ADDR). But the bnxt devices support more than 128 unicast MAC filters which could result in a segfault while user tries to add more than 128 unicast MAC addresses to the port. Fixes: a2033fda22ab ("net/bnxt: fix number of MAC addresses for VMDq") Signed-off-by: Kalesh AP Reviewed-by: Ajit Khaparde Reviewed-by: Somnath Kotur --- drivers/net/bnxt/bnxt_ethdev.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/net/bnxt/bnxt_ethdev.c b/drivers/net/bnxt/bnxt_ethdev.c index 0168481663..cc9cf6c0ea 100644 --- a/drivers/net/bnxt/bnxt_ethdev.c +++ b/drivers/net/bnxt/bnxt_ethdev.c @@ -964,7 +964,7 @@ static int bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev, return rc; /* MAC Specifics */ - dev_info->max_mac_addrs = bp->max_l2_ctx; + dev_info->max_mac_addrs = RTE_MIN(bp->max_l2_ctx, RTE_ETH_NUM_RECEIVE_MAC_ADDR); dev_info->max_hash_mac_addrs = 0; /* PF/VF specifics */ @@ -4781,11 +4781,15 @@ static int bnxt_alloc_stats_mem(struct bnxt *bp) static int bnxt_setup_mac_addr(struct rte_eth_dev *eth_dev) { struct bnxt *bp = eth_dev->data->dev_private; + size_t max_mac_addr = RTE_MIN(bp->max_l2_ctx, RTE_ETH_NUM_RECEIVE_MAC_ADDR); int rc = 0; + if (bp->max_l2_ctx > RTE_ETH_NUM_RECEIVE_MAC_ADDR) + PMD_DRV_LOG(INFO, "Max number of MAC addrs supported is %d, but will be limited to %d\n", + bp->max_l2_ctx, RTE_ETH_NUM_RECEIVE_MAC_ADDR); + eth_dev->data->mac_addrs = rte_zmalloc("bnxt_mac_addr_tbl", - RTE_ETHER_ADDR_LEN * - bp->max_l2_ctx, + RTE_ETHER_ADDR_LEN * max_mac_addr, 0); if (eth_dev->data->mac_addrs == NULL) { PMD_DRV_LOG(ERR, "Failed to alloc MAC addr tbl\n"); -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:39.228919121 +0000 +++ 0028-net-bnxt-cap-maximum-number-of-unicast-MAC-addresses.patch 2022-02-18 12:37:37.598789865 +0000 @@ -1 +1 @@ -From 604a6be6b6c70cafdf055129d7d141d84509ad90 Mon Sep 17 00:00:00 2001 +From 5889a24544457b11abaccd66f24fc28c0bdbe872 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 604a6be6b6c70cafdf055129d7d141d84509ad90 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 99a7d35470..82350a5008 100644 +index 0168481663..cc9cf6c0ea 100644 @@ -26 +27 @@ -@@ -954,7 +954,7 @@ static int bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev, +@@ -964,7 +964,7 @@ static int bnxt_dev_info_get_op(struct rte_eth_dev *eth_dev, @@ -35 +36 @@ -@@ -5016,11 +5016,15 @@ static int bnxt_alloc_stats_mem(struct bnxt *bp) +@@ -4781,11 +4781,15 @@ static int bnxt_alloc_stats_mem(struct bnxt *bp)