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 10790A0C3F for ; Sat, 12 Jun 2021 01:11:52 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EAD4E4003F; Sat, 12 Jun 2021 01:11:51 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2047.outbound.protection.outlook.com [40.107.244.47]) by mails.dpdk.org (Postfix) with ESMTP id 53DE140E46 for ; Sat, 12 Jun 2021 01:11:50 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=htD6eBQgwDS5c0DUfdOQZrxGchargVaIzXolc8FL0bzcmUjVAgGT3XmkUqjpN8Ijrn6yIB9hBPHWSFn6bJkSIZgKs4728QBV2zkCnBDNkHX06OP5PfKseoGJP7QSKQVrW1dzEDxcnRQYe6rL7bk5nWkEYuLDGMnwjC/kZcd5/ggozHmE0JBy4ZqWYF0otnjWS8FG3985AtRdRmJ6QJ7aV5dP6FVg3B09Awt4+51NOEdb+Sc5VEaXnPcI3kMVhsmZRzgSADXYbUXfoliKVDORWVKv8b2qvn9Ygy8FecrCCtUzD/IHucsqXYBf88w/lAEUOBObbeA/PPJFlO98aSTQUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gyFK1Juv2FNM4COroB/dMZxAcl9VR1DNgEhhD2rbQr8=; b=E+q0HFoRZefg+SzCbH5iOBZQ1mQGb8H5uV1hbOdxKqLZe8levV6deQXCNGbTdtkzsB3uKT6+MJPqxXuj5aPUK0DyeSBCbe10ddvIsasESGB9xOZmRHO3bRUP7JIfIQZBBBEQw4v/msgskIQmNm9pD76+jwg/8Tg1giZxNE01pLSqOgSFSeV2tDRQDBjB20ODz1thOhAeeNuI93ho3D4+9xV7KbydlDnr2Tf8kOM9QiqGhtPsBY3MXz77yvYK9UEk1FEMCqYUMH79VXeC4rD7V2ZCd1aVPMenWPVlsxJBzoB1CjOPrdIm30u+yKpn9bP+Ei9x0KANW0dt0pCj74JqCw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=microsoft.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=gyFK1Juv2FNM4COroB/dMZxAcl9VR1DNgEhhD2rbQr8=; b=RrvsCscRABHwIUOvajibdMwP4WGi7aWEZS2p4fc98gpjQyo+s6qTgiGzZAp3IZpXe5zyCUNjGIQwl0eN0DaQHTzf1u8v0T6r3ZH3TycDJzGR9SmDVZfMq30Hz9eU8NMZZlIqtewAfH1owZJHsR5kx0LnDPe7lUBeY6LQe1cykLafES6i0v0PZ2sOByxgyR4rkv6XExRzvFXMD8FQSIJh6uxjaD+qV22AlUvotlHbm+6KI5QWp9IoxWcCQDh9qCVd+w7Vrq84cgBMx3JQJ1/yDgL0jOiWkQgndHvQrb+X3RofrA0NYJA4DSv2ABBv0tQgDzgbYmPbTGwmvpCVbudO7Q== Received: from MWHPR01CA0027.prod.exchangelabs.com (2603:10b6:300:101::13) by MWHPR12MB1343.namprd12.prod.outlook.com (2603:10b6:300:7::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.22; Fri, 11 Jun 2021 23:11:48 +0000 Received: from CO1NAM11FT064.eop-nam11.prod.protection.outlook.com (2603:10b6:300:101:cafe::34) by MWHPR01CA0027.outlook.office365.com (2603:10b6:300:101::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:11:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; microsoft.com; dkim=none (message not signed) header.d=none;microsoft.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT064.mail.protection.outlook.com (10.13.175.77) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:11:48 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:11:46 +0000 From: Xueming Li To: Lance Richardson CC: Luca Boccassi , Ajit Khaparde , Stephen Hemminger , dpdk stable Date: Sat, 12 Jun 2021 07:02:49 +0800 Message-ID: <20210611230433.8208-75-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 1a73be11-2a54-4a00-b539-08d92d2e4a0c X-MS-TrafficTypeDiagnostic: MWHPR12MB1343: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Embli/Icxfet4PCzG+R7zEY10KtvlG4235ioouHVnGCOAjbYnXapyPoq779xt64l/YbAFFW9BC13jbNDt0iUzFvUUS0tIVKvNdQGW6t6X2+JyjbIGhWQVs4stjelk7i9sWgEmFxA/7EAhl54iBycezyF+fyf4rdsZ6XFAXWXqTSKmHbtYDJY7LtFuGFmq3xdZt/ADTPb2J0+gpnOZhv74e6ZLpq8x2ZcH63bq3UCUm3wC7bTEUVXg4c2PtcYMMlAJDnYaMSpv9tJKwGfncUmGzVjWxPgB/mNf5ELv4NHvLWg8lxMmWMP1k+Fn3pB+qRHKQOw9fPWKVYCQr9qKRMHo+4rjxTjlxlA22QKjECqAR3kP8DjlyJOwfwQ310fWNkGcK7zyM1+ffKgkudn2hXMZ4bmmXSdg4wglgKwlrSxQBKYCDPPlHHdWYUMhtV5vI6sc74ASsPRFCpI4PBx3zHbdVrQoT6LgBjybqkpZeHh6Tza5ca9xwg/G40YqTV3ID0MS8aHnAaQbcfbMsK32jMi1LhYfs+9qilSoJBLmZASs4NFJF9qBWQ3OTfzyGye7wXFCGHlULNrzYhda0fMyKwGpvtJgM9ZZHJomFQv4YxaXmRtGGraNcSTNyKLAQSvtwlpfcZhMp8oyYN5kIC+V+IqCtIkRj9sl7RT09GpMK9iy32mmAdjzkSbFZ++6HYulAPbMocJc9XjS80+XrbNU1TwoNkOQw/MNzJW9ARCVsH65fglA0F268bDpD0hfmCopuRX8w1XdO7LPk93HsaFXVMops0+zZQfXSHPK2K/cMOHAGIA+wzxJUytolX86I8SFvf4 X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(346002)(396003)(376002)(39860400002)(136003)(36840700001)(46966006)(45080400002)(336012)(16526019)(26005)(36860700001)(186003)(47076005)(82740400003)(4326008)(8676002)(426003)(53546011)(316002)(2906002)(82310400003)(2616005)(54906003)(356005)(36906005)(8936002)(55016002)(7696005)(86362001)(7636003)(478600001)(6916009)(70206006)(70586007)(83380400001)(36756003)(5660300002)(966005)(1076003)(6286002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:11:48.2668 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1a73be11-2a54-4a00-b539-08d92d2e4a0c X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT064.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1343 Subject: [dpdk-stable] patch 'net/bnxt: fix dynamic VNIC count' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/14/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/85b0241b6b9262f9a2f68a9da0b3c52fe6afb73f Thanks. Xueming Li --- >From 85b0241b6b9262f9a2f68a9da0b3c52fe6afb73f Mon Sep 17 00:00:00 2001 From: Lance Richardson Date: Wed, 28 Apr 2021 18:03:44 -0400 Subject: [PATCH] net/bnxt: fix dynamic VNIC count Cc: Luca Boccassi [ upstream commit a0c2315a2a5f0a83d5d77ec745ac1de04a1e962b ] Ensure that the current count of in-use VNICs is decremented when a VNIC is freed. Don't attempt VNIC allocation when the maximum supported number of VNICs is currently allocated. Fixes: 49d0709b257f ("net/bnxt: delete and flush L2 filters cleanly") Fixes: d24610f7bfda ("net/bnxt: allow flow creation when RSS is enabled") Signed-off-by: Lance Richardson Reviewed-by: Ajit Khaparde Reported-by: Stephen Hemminger --- drivers/net/bnxt/bnxt.h | 2 +- drivers/net/bnxt/bnxt_flow.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/bnxt/bnxt.h b/drivers/net/bnxt/bnxt.h index 600154f654..0fb195b656 100644 --- a/drivers/net/bnxt/bnxt.h +++ b/drivers/net/bnxt/bnxt.h @@ -705,7 +705,7 @@ struct bnxt { uint32_t max_ring_grps; struct bnxt_ring_grp_info *grp_info; - unsigned int nr_vnics; + uint16_t nr_vnics; #define BNXT_GET_DEFAULT_VNIC(bp) (&(bp)->vnic_info[0]) struct bnxt_vnic_info *vnic_info; diff --git a/drivers/net/bnxt/bnxt_flow.c b/drivers/net/bnxt/bnxt_flow.c index b8020d9e98..11034b6719 100644 --- a/drivers/net/bnxt/bnxt_flow.c +++ b/drivers/net/bnxt/bnxt_flow.c @@ -925,6 +925,9 @@ static int bnxt_vnic_prep(struct bnxt *bp, struct bnxt_vnic_info *vnic) uint64_t rx_offloads = dev_conf->rxmode.offloads; int rc; + if (bp->nr_vnics > bp->max_vnics - 1) + return -ENOMEM; + rc = bnxt_vnic_grp_alloc(bp, vnic); if (rc) goto ret; @@ -1543,6 +1546,7 @@ bnxt_flow_validate(struct rte_eth_dev *dev, bnxt_hwrm_vnic_ctx_free(bp, vnic); bnxt_hwrm_vnic_free(bp, vnic); vnic->rx_queue_cnt = 0; + bp->nr_vnics--; PMD_DRV_LOG(DEBUG, "Free VNIC\n"); } } @@ -2001,6 +2005,7 @@ done: bnxt_hwrm_vnic_free(bp, vnic); vnic->rx_queue_cnt = 0; + bp->nr_vnics--; } } else { rte_flow_error_set(error, -ret, -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:58.545261700 +0800 +++ 0075-net-bnxt-fix-dynamic-VNIC-count.patch 2021-06-12 06:53:56.350000000 +0800 @@ -1 +1 @@ -From a0c2315a2a5f0a83d5d77ec745ac1de04a1e962b Mon Sep 17 00:00:00 2001 +From 85b0241b6b9262f9a2f68a9da0b3c52fe6afb73f Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit a0c2315a2a5f0a83d5d77ec745ac1de04a1e962b ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org @@ -23 +25 @@ -index 72513fe66b..8558565617 100644 +index 600154f654..0fb195b656 100644 @@ -26 +28 @@ -@@ -720,7 +720,7 @@ struct bnxt { +@@ -705,7 +705,7 @@ struct bnxt { @@ -36 +38 @@ -index 844bf1520f..73fd24cd9a 100644 +index b8020d9e98..11034b6719 100644 @@ -49 +51 @@ -@@ -1550,6 +1553,7 @@ bnxt_flow_validate(struct rte_eth_dev *dev, +@@ -1543,6 +1546,7 @@ bnxt_flow_validate(struct rte_eth_dev *dev, @@ -57 +59 @@ -@@ -2011,6 +2015,7 @@ done: +@@ -2001,6 +2005,7 @@ done: