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 DAE1642D46 for ; Sun, 25 Jun 2023 08:36:59 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D70F640ED8; Sun, 25 Jun 2023 08:36:59 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam04on2053.outbound.protection.outlook.com [40.107.100.53]) by mails.dpdk.org (Postfix) with ESMTP id 2AE0D42D0B for ; Sun, 25 Jun 2023 08:36:58 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gbkR/GI9rYdnOiPGpymkxOYy4GK42SHTPJKp3HYXgqOcIqfYjveFPtIdUJ6Iy+kl/TTDC/b7ybKCV5aeCtNLbPvDvAcDTDTxw7eKfZnKnjxQ7keX4YFUnTdqt4m5ifKjWYbYc0Yan74x5Ei+cCsgAaA6GWMogozRQc30haxMjIdZwPY7DMJ8Q6RcgCHUmnS/OHwo3qe6XU2i14AO1rzB8KccYOYWQYXhsT2Sfc9bpp5gLu1RyqaAG/676Wkt3d9SSSy4zQr07J2Tw0/LOmzp/xA9ty7+kWTeNG1ryluC0d2Y9eK5A1ctIkXyMEORuABTvmLLjMUP6M6zuMuFIcnWIw== 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=rH2+l4MIhaX+F/MJpJqeiJjEIo6kBjFMi8yp/rW3VCw=; b=VpCLDnFCW/29vTbXwZKePE4yzHr4m+T1JqMYUdkJAU2JwknoJ0FzpOpRh16OgWAsqhJRPvzTn1hKUjBY6oyFqc4ENL8H14S1rVB4OLemZjts6bidpz9mb/iS9gW+6SwgoVCFp/Bz3upweMHts2HGi63yhtE8GYykJnINrhqehEiOQUan6ynVNDZa07OU7bQJAuSnZGaRQkN9/F19ai011jSon5NtU49T2F0hUs4BSmOF+ZOp5AAtEXtERPuDz7/sAy8Dbx1X9Yo/cTHnorNGACc25qjkKslnPCHX4YSKih+k7XrBRTjmnyucqsR1Ph1q1eo9T5ZCDvwQExa4saOTFA== 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=rH2+l4MIhaX+F/MJpJqeiJjEIo6kBjFMi8yp/rW3VCw=; b=oR6JorAS3oXyTZqjONkyflFwXdHOj9NyIchHr45Qn7/Ocoa8debMZcvXth6HNXTAXGuMGrzGgWLZnUZisQFHgqHiOaaeNm2zVssx5dhekp7YBmdfJ8ykajuIl32WX4icLPIR4dDimYCCvdiR8/9OtXX/7XGyeOH3N5mJeCe3TcvSWJlBIz54npjET6yHGOiEFQSkY7/w2tn+k7LkUjyotJBSmSeMJFH1jkezgFnD5f5B0lgI9VqjZGdl+iXjkW0G2Fwh8UYE6QeLoCm3Dvd95WIxrN5TiZNHAiQaddRRrWm2x3G72aczC+meop4ibZSUymHvaZoXTsCQMYeVK4HoZA== Received: from BN0PR07CA0003.namprd07.prod.outlook.com (2603:10b6:408:141::15) by IA0PR12MB7601.namprd12.prod.outlook.com (2603:10b6:208:43b::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.24; Sun, 25 Jun 2023 06:36:56 +0000 Received: from BN8NAM11FT007.eop-nam11.prod.protection.outlook.com (2603:10b6:408:141:cafe::ad) by BN0PR07CA0003.outlook.office365.com (2603:10b6:408:141::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.33 via Frontend Transport; Sun, 25 Jun 2023 06:36:56 +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 BN8NAM11FT007.mail.protection.outlook.com (10.13.177.109) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.47 via Frontend Transport; Sun, 25 Jun 2023 06:36:55 +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; Sat, 24 Jun 2023 23:36:40 -0700 Received: from nvidia.com (10.126.230.35) 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; Sat, 24 Jun 2023 23:36:39 -0700 From: Xueming Li To: Feifei Wang CC: Ruifeng Wang , =?UTF-8?q?Morten=20Br=C3=B8rup?= , dpdk stable Subject: patch 'ring: fix dequeue parameter name' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:33:47 +0800 Message-ID: <20230625063544.11183-10-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-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.35] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT007:EE_|IA0PR12MB7601:EE_ X-MS-Office365-Filtering-Correlation-Id: eb31e264-2f9c-4424-3fdb-08db75469202 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 43O+r5IUVojBZLYHOjjb9OHAiC5/HHH+3WM8I9jkaft7B4V5vfVJgcST56/trL3NCG1Ro3AsVeLIrDru+TPXb9MYiWQE8+7dE23+wmLZ7VvZ1Tj4bHx5DRr1YBAJk+vH2E/NVjMJOHKvaWP7qXCt1nDEGS5f/VlusUt/qFxzSaBGXRJ/zKWCoYV9sIhZEprz0dwLgXNHPu5L2U93/IAY8irIxfP0jqXbGpygXC77XNHOydhQVazAkKu+a/MjLvli3If4707hdnnUXQpvWr7rC6JxhDHfPbMp93Ai9ywCIR9yxG84BVZbYh2HgvulIFsu/oRdeYEJvtbpawATbHPpf4JDTZRt8TPpqM7iHs2LJz3QvxB778XFX9fj6z5galMhq+gaRxyq1vhst/7/1Zsub0Ormve2w8zAtK3TRcErOYHJgwhQ932oR/fam+VcIXYbsitZVKZudBKTeo/nYpILIkWZDTwwnI0/b6jimRibqMTcNNz4Spr6pkg51Mg40Sg2L7xuw/1JqBaiINSvkD5Ndx6B6s1DxQnMdOBV31pLGzo+i36E3uZqefGmcnKq68m63jjArwRThPcFZScZ9wmy30Z/qj1vHGJ44t4r8a0dfr7h+evla1Hqu/Q1mN4fEw2wVhG9rZfpdHJVuaUdocvwX09hQ3IiPPTXR9kYmxJdVNxW/ujoWiRCvSnG5o/FM3EAzV9MXhAu5l2ZzlvpcVQW18zSdulg8PYtpH4hPALcYJRoYO7pmUWW7VAIHykzHVAbM4x3KyQczlJBimA38EYtv24/LTLFhCqsyuktjxdEsCU= 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)(396003)(346002)(376002)(136003)(451199021)(46966006)(36840700001)(40470700004)(966005)(7696005)(6666004)(478600001)(54906003)(53546011)(16526019)(6286002)(186003)(26005)(1076003)(2906002)(82310400005)(6916009)(4326008)(316002)(70586007)(70206006)(8936002)(8676002)(41300700001)(5660300002)(7636003)(356005)(36756003)(40460700003)(82740400003)(86362001)(55016003)(36860700001)(83380400001)(66574015)(47076005)(2616005)(426003)(336012)(40480700001)(21314003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:36:55.8807 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: eb31e264-2f9c-4424-3fdb-08db75469202 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: BN8NAM11FT007.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB7601 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.3 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/27/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/commit/?h=22.11-staging&id=cada66aff2a95228c980d8d48eaab7aacd043f69 Thanks. Xueming Li --- >From cada66aff2a95228c980d8d48eaab7aacd043f69 Mon Sep 17 00:00:00 2001 From: Feifei Wang Date: Fri, 7 Apr 2023 16:48:25 +0800 Subject: [PATCH] ring: fix dequeue parameter name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Xueming Li [ upstream commit b632e76751ff9797e36531305638e1cbd14ffa09 ] Ring dequeue operation's parameters name should be 'cons_xx', rather than 'prod_xxx'. Fixes: 1fc73390bcf5 ("ring: refactor exported headers") Signed-off-by: Feifei Wang Reviewed-by: Ruifeng Wang Acked-by: Morten Brørup --- lib/ring/rte_ring_elem_pvt.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/ring/rte_ring_elem_pvt.h b/lib/ring/rte_ring_elem_pvt.h index e24e4492ff..4b80f58980 100644 --- a/lib/ring/rte_ring_elem_pvt.h +++ b/lib/ring/rte_ring_elem_pvt.h @@ -194,12 +194,12 @@ __rte_ring_dequeue_elems_32(struct rte_ring *r, const uint32_t size, } static __rte_always_inline void -__rte_ring_dequeue_elems_64(struct rte_ring *r, uint32_t prod_head, +__rte_ring_dequeue_elems_64(struct rte_ring *r, uint32_t cons_head, void *obj_table, uint32_t n) { unsigned int i; const uint32_t size = r->size; - uint32_t idx = prod_head & r->mask; + uint32_t idx = cons_head & r->mask; uint64_t *ring = (uint64_t *)&r[1]; unaligned_uint64_t *obj = (unaligned_uint64_t *)obj_table; if (likely(idx + n <= size)) { @@ -227,12 +227,12 @@ __rte_ring_dequeue_elems_64(struct rte_ring *r, uint32_t prod_head, } static __rte_always_inline void -__rte_ring_dequeue_elems_128(struct rte_ring *r, uint32_t prod_head, +__rte_ring_dequeue_elems_128(struct rte_ring *r, uint32_t cons_head, void *obj_table, uint32_t n) { unsigned int i; const uint32_t size = r->size; - uint32_t idx = prod_head & r->mask; + uint32_t idx = cons_head & r->mask; rte_int128_t *ring = (rte_int128_t *)&r[1]; rte_int128_t *obj = (rte_int128_t *)obj_table; if (likely(idx + n <= size)) { -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:31:58.834717200 +0800 +++ 0009-ring-fix-dequeue-parameter-name.patch 2023-06-25 14:31:58.285773900 +0800 @@ -1 +1 @@ -From b632e76751ff9797e36531305638e1cbd14ffa09 Mon Sep 17 00:00:00 2001 +From cada66aff2a95228c980d8d48eaab7aacd043f69 Mon Sep 17 00:00:00 2001 @@ -7,0 +8,3 @@ +Cc: Xueming Li + +[ upstream commit b632e76751ff9797e36531305638e1cbd14ffa09 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org