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 9A2C3428F8 for ; Sun, 9 Apr 2023 17:35:32 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9194942D16; Sun, 9 Apr 2023 17:35:32 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2064.outbound.protection.outlook.com [40.107.237.64]) by mails.dpdk.org (Postfix) with ESMTP id 3B1FD42C4D for ; Sun, 9 Apr 2023 17:35:31 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EIxZK+CzuaDno6Xett0sIsJYMSvOdsJMt2KRseOdPojBfECvrG/b/NDPAYeQXY2ppYu4hb1skUMRx1u1uYK6t7x9LZ+MYoU1FOgQ2pz+ClGxTLq0OxFLQnmUs5SMuugSHHmG1KIYpLxoeWqXTELgCf5HdU6ppjDTCiKExk6Mk7to3LtMuBJoyvsIWXv34GC+VJzy9u0FPPp9aHilEwY6Np4vmHkdL7TfXeV4MpIIMuuLtqMzsspFuHVHSVkBT0HqkLa3jwQj+Q43Pv5Demto2KxlLLYy/VhspRF1ONREfKT/7DjRTKlxBYLidvtxuoZ79Rbx80NFn6o70E8DcU9gig== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BbRiwj+GDxIMWYrmfJICNPbW+r2c9wcc0IUiM7ZIhzU=; b=Wx9PPr7YjWgHBpPlhKp7YyDSbY4PmZ6fGdjyf4g8ZatyIQVkS/6CdRZ7sARnHdWUTHSVYgoUyhLOB7OMjU2WwBGTjNaUK7J0MTfuovChUZV0QNWbSStGHEXzMMfMHf47Px9xQfODxAoQSXE6WugXyIQk5kl3TY4DaA6sjZTJi4Qk6gS7VgIBKDjU/BxpFb4wHoWvilqhWL1EQI59kpF+EKdYoOicEeVDofmBxKWamt2gGyUsT5tj/skNXy3CkThcnFBc7hFGK3h/Y02GLmm6Nrbgv3LolkW2b5mHopys61DCvRXBQp6oEWsl5N1fthlbp8/d5bc+RCo6hBJuF/Nsqg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=arm.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject 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=BbRiwj+GDxIMWYrmfJICNPbW+r2c9wcc0IUiM7ZIhzU=; b=pFS6LbjM97x+EjKGc0+1HmFbwB25yli/KqKS7hSJIVcET4GxMtrZVf6BLVB1YX3jep21YaXXha8+MYm7vF6ajXxiFujRXSTpF8v+St50+AetrwBG9cYfd3ujo8fkzJWKe2NLNJszmxYlJ6QBoEhd5gpp+Zv6oVe3riIqLvJhALpnRdNxToy+U+/tTECkQRbZsAehVBabgJPlssB32CVxNt3W/gUxsLV/Ya7Lc1HIAxMGKEJwFkYzNv48MXhf8F64NqEzTRgzDPp8o2SLXj1dpKYxy7/Uni/ergfRzYv0hBIIXfmtSRd/f7t31dncWRMEXg2yRDLrUIFthYidxPA/gA== Received: from MW4PR03CA0026.namprd03.prod.outlook.com (2603:10b6:303:8f::31) by SJ0PR12MB8615.namprd12.prod.outlook.com (2603:10b6:a03:484::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.36; Sun, 9 Apr 2023 15:35:29 +0000 Received: from CO1NAM11FT016.eop-nam11.prod.protection.outlook.com (2603:10b6:303:8f:cafe::c) by MW4PR03CA0026.outlook.office365.com (2603:10b6:303:8f::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.35 via Frontend Transport; Sun, 9 Apr 2023 15:35:29 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by CO1NAM11FT016.mail.protection.outlook.com (10.13.175.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.25 via Frontend Transport; Sun, 9 Apr 2023 15:35:29 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sun, 9 Apr 2023 08:35:16 -0700 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 9 Apr 2023 08:35:14 -0700 From: Xueming Li To: Kamalakshitha Aligeri CC: Ruifeng Wang , Feifei Wang , =?UTF-8?q?Morten=20Br=C3=B8rup?= , dpdk stable Subject: patch 'net/i40e: fix AVX512 fast-free path' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:25:02 +0800 Message-ID: <20230409152529.5308-115-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230409152529.5308-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230409152529.5308-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1NAM11FT016:EE_|SJ0PR12MB8615:EE_ X-MS-Office365-Filtering-Correlation-Id: 3bab9600-b19f-4d05-26ed-08db39100c60 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: oNcM2UDr+4b/lGsrIGJTMo/b4nVwHycdIFcj4cBwp8kjUFxRg2wEtXLV8KpT/YOSd1p+RhVdXCJWTuJZw4p3qaChblr+++Y0ATuE78NHQ9LLuzaoYfja1xSKH+gn4ucDWiBkJzxJHrtVGuSvnwpg5dNFbEibjc83yFgcGR9VzB/ehXjjbZpwBoj6HEmDLl4ttTfJVmP7iQJ4urytiZ0n47RP/7ry/W7TgtIkPys9QPl+EvWG1N4Vt3yTcXkitLPDGei1O9Eo7bhP2UObQO18tE1P5DOcQOYS0xefQntJNaePVpSqvJBI4fzfY7flPN4GBs1HK+UFx8UJ9RQps72aqGSPcFSyCKRuFtk/NN3GU1SdSR8iTnEGJ+dfFv49DpcKs4osrSCZoxB8yp8D5n7kSTdbzu4gqk+UKdARhbglFVAOo0BoJYz1b+0ugLxPOdCtY2PxUoctbatx7y1ZR7MpgW1Gvzv6N2HbE0ivsdGlDWqUeEnWbCZ0VeDdpb4ieiHqoigiL2g0w66dy3pxIyJqAQ45IIhA0g/HgLXpjh/eTfMFNAEW5RBwR5MGlOMELumb5ZkX013kKioSBDo27Ud5SXzpO30scSr9GJwnh2QSEXSL1JZeRCmBF+FfBneZuzYV/mzQMNydqnhmVgLL9ARVh+tv9AhiVNx+ov6jzONeVv6+5K7Vs4FH1+t7Gq0NFGQTjOsGuDVtyg7cmu60dX1u30x56b9vAch7V5uKEd49smf6/K/iXlL7cqgzzP/3pGwNiXnPoHgcArkmsExGk2RKaRSy3roLqkmmH/GGkVVPuYCZ3/19g66NugfLEOGyUeQggfYad/wkOiouBquSAfVA7Q== X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(39860400002)(136003)(346002)(396003)(376002)(451199021)(36840700001)(40470700004)(46966006)(7696005)(478600001)(86362001)(55016003)(40480700001)(83380400001)(47076005)(66574015)(36756003)(40460700003)(82740400003)(7636003)(356005)(2616005)(36860700001)(426003)(336012)(6666004)(966005)(2906002)(54906003)(316002)(16526019)(6286002)(186003)(1076003)(53546011)(26005)(8676002)(6916009)(41300700001)(8936002)(5660300002)(82310400005)(4326008)(70586007)(70206006); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:35:29.2007 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3bab9600-b19f-4d05-26ed-08db39100c60 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT016.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ0PR12MB8615 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 22.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 04/11/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging/commit/91a60dfeee486a0815ed92a2e641380422a20ddc Thanks. Xueming Li --- >From 91a60dfeee486a0815ed92a2e641380422a20ddc Mon Sep 17 00:00:00 2001 From: Kamalakshitha Aligeri Date: Tue, 7 Mar 2023 19:32:21 +0000 Subject: [PATCH] net/i40e: fix AVX512 fast-free path MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit 1ad4bea0d73a7671095c2c675f9bb8b19503ac06 ] In i40e_tx_free_bufs_avx512 fast-free path, when cache is NULL, non fast-free path is being executed. Fixed the bug by calling rte_mempool_generic_put API that handles the cache==NULL case. Fixes: 5171b4ee6b6b ("net/i40e: optimize Tx by using AVX512") Signed-off-by: Kamalakshitha Aligeri Reviewed-by: Ruifeng Wang Reviewed-by: Feifei Wang Acked-by: Morten Brørup --- .mailmap | 1 + drivers/net/i40e/i40e_rxtx_vec_avx512.c | 12 ++++-------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.mailmap b/.mailmap index da2ce216a3..cfdaeaf6a4 100644 --- a/.mailmap +++ b/.mailmap @@ -674,6 +674,7 @@ Kai Ji Kaiwen Deng Kalesh AP Kamalakannan R +Kamalakshitha Aligeri Kamil Bednarczyk Kamil Chalupnik Kamil Rytarowski diff --git a/drivers/net/i40e/i40e_rxtx_vec_avx512.c b/drivers/net/i40e/i40e_rxtx_vec_avx512.c index 60c97d5331..74ff54c653 100644 --- a/drivers/net/i40e/i40e_rxtx_vec_avx512.c +++ b/drivers/net/i40e/i40e_rxtx_vec_avx512.c @@ -906,16 +906,13 @@ i40e_tx_free_bufs_avx512(struct i40e_tx_queue *txq) struct rte_mempool_cache *cache = rte_mempool_default_cache(mp, rte_lcore_id()); - if (!cache || cache->len == 0) - goto normal; - - cache_objs = &cache->objs[cache->len]; - - if (n > RTE_MEMPOOL_CACHE_MAX_SIZE) { - rte_mempool_ops_enqueue_bulk(mp, (void *)txep, n); + if (!cache || n > RTE_MEMPOOL_CACHE_MAX_SIZE) { + rte_mempool_generic_put(mp, (void *)txep, n, cache); goto done; } + cache_objs = &cache->objs[cache->len]; + /* The cache follows the following algorithm * 1. Add the objects to the cache * 2. Anything greater than the cache min value (if it @@ -947,7 +944,6 @@ i40e_tx_free_bufs_avx512(struct i40e_tx_queue *txq) goto done; } -normal: m = rte_pktmbuf_prefree_seg(txep[0].mbuf); if (likely(m)) { free[0] = m; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:41.695634400 +0800 +++ 0114-net-i40e-fix-AVX512-fast-free-path.patch 2023-04-09 21:45:38.769042200 +0800 @@ -1 +1 @@ -From 1ad4bea0d73a7671095c2c675f9bb8b19503ac06 Mon Sep 17 00:00:00 2001 +From 91a60dfeee486a0815ed92a2e641380422a20ddc Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit 1ad4bea0d73a7671095c2c675f9bb8b19503ac06 ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -26 +28 @@ -index 9578b86866..c77cdc9ddf 100644 +index da2ce216a3..cfdaeaf6a4 100644 @@ -29 +31 @@ -@@ -681,6 +681,7 @@ Kai Ji +@@ -674,6 +674,7 @@ Kai Ji @@ -38 +40 @@ -index d3c7bfd121..ad0893324d 100644 +index 60c97d5331..74ff54c653 100644 @@ -41 +43 @@ -@@ -783,16 +783,13 @@ i40e_tx_free_bufs_avx512(struct i40e_tx_queue *txq) +@@ -906,16 +906,13 @@ i40e_tx_free_bufs_avx512(struct i40e_tx_queue *txq) @@ -62 +64 @@ -@@ -824,7 +821,6 @@ i40e_tx_free_bufs_avx512(struct i40e_tx_queue *txq) +@@ -947,7 +944,6 @@ i40e_tx_free_bufs_avx512(struct i40e_tx_queue *txq)