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 35C02A034F for ; Wed, 10 Nov 2021 07:41:40 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2FBC14014D; Wed, 10 Nov 2021 07:41:40 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2061.outbound.protection.outlook.com [40.107.236.61]) by mails.dpdk.org (Postfix) with ESMTP id 3C3FD410E0 for ; Wed, 10 Nov 2021 07:41:38 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=VSsRf5+gfizKRYiUUz/pI2gsUOA3y6utGiFsv8dmAysM63xIcQ0DgMfbFgbFscw9ZGYpEn36jm40zCKLXQ5hhWjxCoA270ea3xLdD518fein4O8VERMNduKeJF5H4gmURMSPVoBrcqjvRoaxtX4qg64ZdRZLBJMhS7DO6thkBp0q12F4zP/Z9FiXdqENHv+kA/I/ol3LAt4TLwWeLbJ0+10FB7quXDL2I+DgdyzD0993xE0+ka+iPPNqZkvoNrzsmloN/DfTixYL/GcOmlJqc6J+AlSEnsHOr4kC2A5me3XRWDyPlz7NeoE6MeEI97pSKQmfwMk9neoZWIrYuBiChA== 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=aMJtUqz6qj9bxAIeHOR6xdY0fRAHttnw5WDpkURvi+s=; b=IDPvsK6yLEfb9kyJNKJpdeDOG8eMLzc7rbPgNK6XOmr7xxeFV9+q4l5puCekPPw4iN73kTd+UjBLf/b5/9kgAwIbeivykJDFlDeW3vEAJpXC0f1aucr/d9Adz8yCvPxLvJrK1qgqaz4yuvukEnZT/FmZBqsA6qwoeb1zq8v0I2tfkvQWX744ckMZvszsI5ZQFeycGLAgHY8ZVZu25utAVYyOALG1gRr/ugRyOHxMZja9rnjFZbNG9/ovPSnQxLcXDvt/OpJGBc8t+s+6VQjuyuwcArQIFeBNN+L04zveO4TO9KcvTI0moryEL/Xsv3xzGHx+hKm25pzfZEtQdOLZZA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=arm.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine 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=aMJtUqz6qj9bxAIeHOR6xdY0fRAHttnw5WDpkURvi+s=; b=qQwws6U6uo12elnDQX8E3QjLL8h0Guq1AYN/NgI37Fu5a4HX61EgaRVcKMPkZyJgF0+eKvpVSYQpvY580Sj/gexkLHIh2+M60dXaYbv42jzyVECfB8Zsa8c2T6rpnVl0uZcBr/RfTXwXd9GvSVu70srH0CWNqzx6mKu5SK1zTqpA9tybwt/gbQs6lV8+j6hGpH4Fssnh7Ms+5LXyG8isU3JobrDoIkgClafaVU6lc7n3Qjy+i1fAQHfA/Zq5x5pWHGKw2DAut4b+UpP3aRH0fC+y5bWtJl/m7MMnMFALDQjKUc/lp5NZJvJA3LYIrDowSvmgKFq8YIVKwX00AZQtsA== Received: from DS7PR05CA0027.namprd05.prod.outlook.com (2603:10b6:5:3b9::32) by CY4PR12MB1413.namprd12.prod.outlook.com (2603:10b6:903:39::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.15; Wed, 10 Nov 2021 06:41:33 +0000 Received: from DM6NAM11FT023.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3b9:cafe::5a) by DS7PR05CA0027.outlook.office365.com (2603:10b6:5:3b9::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.6 via Frontend Transport; Wed, 10 Nov 2021 06:41:33 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; arm.com; dkim=none (message not signed) header.d=none;arm.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 DM6NAM11FT023.mail.protection.outlook.com (10.13.173.96) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4669.10 via Frontend Transport; Wed, 10 Nov 2021 06:41:32 +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.18; Wed, 10 Nov 2021 06:41:30 +0000 From: Xueming Li To: Cian Ferriter CC: Luca Boccassi , Honnappa Nagarahalli , dpdk stable Date: Wed, 10 Nov 2021 14:29:26 +0800 Message-ID: <20211110063216.2744012-83-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-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: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c571f773-c93b-4a8a-66b5-08d9a415225f X-MS-TrafficTypeDiagnostic: CY4PR12MB1413: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AaOnXhWVa1UpQ6I5wRQYi2WK+D1IDEGUZfgQNCvZLevJweAGTqHPG7cYk5YYimL1kR/+YWq7cF46Ed7Tn9jm2zgl01Y82cCDEMARWMbXkYVfQZzfc9borZcTvXx4FcT7L+AfSZ5cInnBnPhYHsGYiryXXlQFKZFT1jm4frN7Bj6P1SwD9E5aPlxkEbpxME/8dASAHc2LhZCWUhZA4nMsdB+lVDS3FYi6AMfAxkaGWemGLdpJhMUNLOZMo9Rq2lbdmjeZ/G7k29JfSqCk+fRqHF0rHKK73ULmU+P9cND7D+6fg2C249f9W6tfWvg2KM2W7mXwcFcrpguW36Q8AxaZUlp8ldmjK8ka596QORlXJGw7QnQ9hlBL5OxDwUKURmJYbjXfH1RJ46e+IayFSAaG3y4hN6RkIxpQkuSEXenLioCmnn53vAW8uBezthzTigLQI2cRU9UpZCzYDww5xoPX8yfMDeV1Zqgz/PADXqExedO3FJZWISfAIzhMaA6of5vRWW/VPqFZzYDOJAY43ecB5M/MrRb3+gfZdYHl1+ZoCyjABSciGXRvbza9m0qHcEsnG+yEpWrxmZtzNRIjGXTk92vu+wx2VSPq/dt79nOn6WzX3SIaMVrpeqosP8F71/xYHMAgSv/KQbGt2Q/jpvtAK38/98PMGv/qzP14078Wden4w1QUukLEG9UhWr/WfIpDjldN1/RH5jGy6f+6nDxiQGyetSMZ1mJgXx/FsM1FumQ7edDrb+rXTQ1Bdap1ynHL+/QWe7CGYv2hVDAjKVf2GXfRi0hmlyOu4gSxq+vYUNF1GtO8DPX27cwmY7Hf+uwRPds28kR5fohQZnFNI2mi7Q== 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)(46966006)(36840700001)(6916009)(5660300002)(316002)(426003)(26005)(966005)(36860700001)(356005)(55016002)(54906003)(70586007)(508600001)(2906002)(1076003)(4001150100001)(8936002)(36756003)(4326008)(7636003)(8676002)(53546011)(70206006)(83380400001)(6666004)(16526019)(6286002)(7696005)(336012)(2616005)(186003)(82310400003)(47076005)(86362001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:41:32.6422 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c571f773-c93b-4a8a-66b5-08d9a415225f 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: DM6NAM11FT023.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1413 Subject: [dpdk-stable] patch 'ring: fix Doxygen comment of internal function' has been queued to stable release 20.11.4 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/12/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/1e697abcfd978d22c3b56c9b9a00ffb294718dbe Thanks. Xueming Li --- >From 1e697abcfd978d22c3b56c9b9a00ffb294718dbe Mon Sep 17 00:00:00 2001 From: Cian Ferriter Date: Mon, 23 Aug 2021 18:28:44 +0100 Subject: [PATCH] ring: fix Doxygen comment of internal function Cc: Xueming Li [ upstream commit 0203a14c72da4ae726056a147cb6e51622c9c28e ] Change "enqueue" to "dequeue" because the __rte_ring_move_cons_head() function is updating the consumer head for dequeue. Fixes: 0dfc98c507b1 ("ring: separate out head index manipulation") Signed-off-by: Cian Ferriter Acked-by: Honnappa Nagarahalli --- lib/librte_ring/rte_ring_c11_mem.h | 2 +- lib/librte_ring/rte_ring_generic.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/librte_ring/rte_ring_c11_mem.h b/lib/librte_ring/rte_ring_c11_mem.h index 0fb73a3371..ae886532ee 100644 --- a/lib/librte_ring/rte_ring_c11_mem.h +++ b/lib/librte_ring/rte_ring_c11_mem.h @@ -111,7 +111,7 @@ __rte_ring_move_prod_head(struct rte_ring *r, unsigned int is_sp, * @param is_sc * Indicates whether multi-consumer path is needed or not * @param n - * The number of elements we will want to enqueue, i.e. how far should the + * The number of elements we will want to dequeue, i.e. how far should the * head be moved * @param behavior * RTE_RING_QUEUE_FIXED: Dequeue a fixed number of items from a ring diff --git a/lib/librte_ring/rte_ring_generic.h b/lib/librte_ring/rte_ring_generic.h index 953cdbbd5e..79ae4ecb14 100644 --- a/lib/librte_ring/rte_ring_generic.h +++ b/lib/librte_ring/rte_ring_generic.h @@ -107,7 +107,7 @@ __rte_ring_move_prod_head(struct rte_ring *r, unsigned int is_sp, * @param is_sc * Indicates whether multi-consumer path is needed or not * @param n - * The number of elements we will want to enqueue, i.e. how far should the + * The number of elements we will want to dequeue, i.e. how far should the * head be moved * @param behavior * RTE_RING_QUEUE_FIXED: Dequeue a fixed number of items from a ring -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:05.697840966 +0800 +++ 0082-ring-fix-Doxygen-comment-of-internal-function.patch 2021-11-10 14:17:01.844079642 +0800 @@ -1 +1 @@ -From 0203a14c72da4ae726056a147cb6e51622c9c28e Mon Sep 17 00:00:00 2001 +From 1e697abcfd978d22c3b56c9b9a00ffb294718dbe Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 0203a14c72da4ae726056a147cb6e51622c9c28e ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -15,2 +17,2 @@ - lib/ring/rte_ring_c11_pvt.h | 2 +- - lib/ring/rte_ring_generic_pvt.h | 2 +- + lib/librte_ring/rte_ring_c11_mem.h | 2 +- + lib/librte_ring/rte_ring_generic.h | 2 +- @@ -19,4 +21,4 @@ -diff --git a/lib/ring/rte_ring_c11_pvt.h b/lib/ring/rte_ring_c11_pvt.h -index 37e0b2afd6..f895950df4 100644 ---- a/lib/ring/rte_ring_c11_pvt.h -+++ b/lib/ring/rte_ring_c11_pvt.h +diff --git a/lib/librte_ring/rte_ring_c11_mem.h b/lib/librte_ring/rte_ring_c11_mem.h +index 0fb73a3371..ae886532ee 100644 +--- a/lib/librte_ring/rte_ring_c11_mem.h ++++ b/lib/librte_ring/rte_ring_c11_mem.h @@ -32,5 +34,5 @@ -diff --git a/lib/ring/rte_ring_generic_pvt.h b/lib/ring/rte_ring_generic_pvt.h -index c95ad7e12c..5acb6e59be 100644 ---- a/lib/ring/rte_ring_generic_pvt.h -+++ b/lib/ring/rte_ring_generic_pvt.h -@@ -106,7 +106,7 @@ __rte_ring_move_prod_head(struct rte_ring *r, unsigned int is_sp, +diff --git a/lib/librte_ring/rte_ring_generic.h b/lib/librte_ring/rte_ring_generic.h +index 953cdbbd5e..79ae4ecb14 100644 +--- a/lib/librte_ring/rte_ring_generic.h ++++ b/lib/librte_ring/rte_ring_generic.h +@@ -107,7 +107,7 @@ __rte_ring_move_prod_head(struct rte_ring *r, unsigned int is_sp,