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 79C86A0548 for ; Sun, 28 Nov 2021 16:02:41 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 673554068E; Sun, 28 Nov 2021 16:02:41 +0100 (CET) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2073.outbound.protection.outlook.com [40.107.223.73]) by mails.dpdk.org (Postfix) with ESMTP id 6B7514068A for ; Sun, 28 Nov 2021 16:02:40 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NCJvXYFzshlMFWF2obSGP5QvSRu3xMGsnFIP/pH1IBhu737FJyYoGkZ/DFhi+fmciAK3QHjwz6+WB66XG8HkWn5P9I9TDb1HlaVy5zMqjzTxaxmNFQNPpXheMKHY24l4UWSsFuOWtbnJDY1+d4k0oLv0PN8sT+Y7d8vX5B1Xvp/ybUOd2kBHMusPLPH0Kbcq77kqHw1XSTOj82tO3SMgYVWBlPbt8rJu2u/DrVGw9YUz9sO1iccyODNoMm0F5a/qBJ0l6/DwGQjG9ovkJB1BBz3V5aw+NWfurRedpj3XUux/b0KMWWjs6ED6enTcU9td/c31W+kjFewMy9P+T9WZSw== 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=pUsWtycEfF+ZVEcl9812fGpXOxYxvfAAaYVpQjWWtHg=; b=RnE0a+ioYZspgeu+VBdsfyU2FksIzxUUIXDDeeitBmZFGjU0CGAtq1KTRkvR9MXq3nA1l/uYDn6Roc/SI8TvHpLydP7a+DiTVSNS0QEJx5v7+0q6p4riTVuPu+gIjFSrGRDt0GgF3XSg0GLSmj07TTq1Fmp+3A4bU3U18ZxU/a+Pc0H49kh5FTveXB7N+vLMKF2vzVWVuMam78Ne/8Jqg9g93cpE3fdr4hPjZLzvRfMSxV67ZJ/W+JqBEIt6zPoTaM7eINRrQShxJuSmm+320SJakTG1UMvM9QHRQdPv4qtV2PsrXTo1FbR5sKnWHkZiyHu0kslRC12h43t3v/++2Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.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=pUsWtycEfF+ZVEcl9812fGpXOxYxvfAAaYVpQjWWtHg=; b=k4ZB7zciRdeZZUV/Q56tIUgwRkuyOBmkwYdHcNBJ77iSbCsnh0M0S5wWmmd0u94qcmVG8vkwwCmNehH79YHL3x686lWTRet54kNv9iHil7FOaPHvbDLGlzRDlqHEB+pv8kYjZGenzz0/9vfWxqu/QoCOHVM/vSoRKC+r8nXxxvYU6boqMW9zD+HewOZ6i+6O6cInt/+LCWML+WtVtKVPEG5bUujGQP6jq3bwtM64VovHOAl9mkzwzvem2qbc7OzqCENcaFvc4ngyc2+tZlOfLECdXqhSksVobntTvunDmZN/Ka7nqOUlfelR6fzX0jh+apV1nyiWmH1WNnj2D9Tzzw== Received: from DM3PR11CA0007.namprd11.prod.outlook.com (2603:10b6:0:54::17) by DM5PR12MB2407.namprd12.prod.outlook.com (2603:10b6:4:b4::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Sun, 28 Nov 2021 15:02:38 +0000 Received: from DM6NAM11FT050.eop-nam11.prod.protection.outlook.com (2603:10b6:0:54:cafe::e7) by DM3PR11CA0007.outlook.office365.com (2603:10b6:0:54::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.20 via Frontend Transport; Sun, 28 Nov 2021 15:02:38 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) 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.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 DM6NAM11FT050.mail.protection.outlook.com (10.13.173.111) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4734.22 via Frontend Transport; Sun, 28 Nov 2021 15:02:38 +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; Sun, 28 Nov 2021 15:02:35 +0000 From: Xueming Li To: Jerin Jacob CC: Luca Boccassi , Ferruh Yigit , dpdk stable Subject: patch 'doc: fix memif driver acronyms' has been queued to stable release 20.11.4 Date: Sun, 28 Nov 2021 22:54:14 +0800 Message-ID: <20211128145423.3974892-71-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211128145423.3974892-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> <20211128145423.3974892-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: 2f4b0511-58ab-4522-de36-08d9b2801e8f X-MS-TrafficTypeDiagnostic: DM5PR12MB2407: 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: heWuBc4tQ8h+HHMMO9lmTUOpEcTBctLFpNG6l2FLOQPARJfGO3Z/depo1vgMr81B73EnwuMssegQLt6txoLztiYWv3R5xTbJUISKj6UICzgS0j14pb+TZiBjD5FIn/JLNIHrGpyiX0spjpbuSkYb077DvEZy4AtTV+PYniaye0Ss63J7PUqbjVrc55U1wFdIXV95WK19exO0tjQlAfDJdb2ORS1/iViMeqyre63/zo5EnI9KoW14SWvQIGEKXtGaYq07aD4/XCvNC4/MaIIV84mz4PioglmSI0fCNDmO29bZMWLKOLT+Q4w6MzLOZPrI5Xyz7L2FKnnfmznX9NaW6efLU5l6n42QsbouIY+xZMuatKLOcDw8fst4IOV6DxP47jUUgCuWco/FgJfHkuy+qZdWd+GB4qj744pPpVEjB6dH3JpybMV+vs3YqU/0qlbwNHWyyKXPnWR4BA7rJ1jaRsQYx0CGcHMJL7ynDwhct9rNLQN2MBFVODbSrOtC4Ox9VL2QfajpCmF4QFAFvCFAGJlGjH0NLxCGyGqLOoW70fsQlM/GnIBL4rFKfOwz0ece68gyovxPoE/s1BzpouOQcZpPfDibuhdW8zTjE9crWe2poAJKT3GSR4bRd6URjM7H4vByiIh4F3D7sBmriIVMa91VIh2PxSYLMqfRk+sFDxy5Uhr9EWDkrWcm57incgY5GvTfi0bCXzzGzeRPvQh4kxp+urf7t1pXTdgUs0RmuK+Af+CRXGaAqKuX0dh/u4MG+yKB8wqb2/trAxvO1/6E04PY9WYcN3GeFisAXeQ+/C90B5YdZvBQj5vKRYGYyo5a6A46dSF//Gy9Rv0ZPqkR4g== 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)(4001150100001)(6286002)(54906003)(426003)(966005)(4326008)(2616005)(36756003)(36860700001)(7696005)(1076003)(53546011)(316002)(5660300002)(356005)(47076005)(26005)(55016003)(6666004)(83380400001)(6916009)(8936002)(82310400004)(70206006)(70586007)(336012)(508600001)(8676002)(86362001)(7636003)(16526019)(186003)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2021 15:02:38.6739 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2f4b0511-58ab-4522-de36-08d9b2801e8f 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: DM6NAM11FT050.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB2407 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.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/30/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/9de850690d8a0bccc836d2a2e023009aa832090e Thanks. Xueming Li --- >From 9de850690d8a0bccc836d2a2e023009aa832090e Mon Sep 17 00:00:00 2001 From: Jerin Jacob Date: Fri, 19 Nov 2021 10:29:26 +0530 Subject: [PATCH] doc: fix memif driver acronyms Cc: Xueming Li [ upstream commit 3f7b90eb80b1c6fc63c70f77e27ddbd2599e592e ] The commit d250589d5702 ("net/memif: replace master/slave arguments") replaced master/slave terms to server/client terms. Fix the documentation to reflect the same. Fixes: d250589d5702 ("net/memif: replace master/slave arguments") Signed-off-by: Jerin Jacob Reviewed-by: Ferruh Yigit --- doc/guides/nics/memif.rst | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/guides/nics/memif.rst b/doc/guides/nics/memif.rst index d783f2d4a4..aca843640b 100644 --- a/doc/guides/nics/memif.rst +++ b/doc/guides/nics/memif.rst @@ -107,13 +107,13 @@ region n (no-zero-copy): +-----------------------+-------------------------------------------------------------------------+ | Rings | Buffers | +-----------+-----------+-----------------+---+---------------------------------------------------+ -| S2M rings | M2S rings | packet buffer 0 | . | pb ((1 << pmd->run.log2_ring_size)*(s2m + m2s))-1 | +| C2S rings | S2C rings | packet buffer 0 | . | pb ((1 << pmd->run.log2_ring_size)*(c2s + s2c))-1 | +-----------+-----------+-----------------+---+---------------------------------------------------+ -S2M OR M2S Rings: +C2S OR S2C Rings: +--------+--------+-----------------------+ -| ring 0 | ring 1 | ring num_s2m_rings - 1| +| ring 0 | ring 1 | ring num_c2s_rings - 1| +--------+--------+-----------------------+ ring 0: @@ -123,8 +123,8 @@ ring 0: +-------------+---------------------------------------+ Descriptors are assigned packet buffers in order of rings creation. If we have one ring -in each direction and ring size is 1024, then first 1024 buffers will belong to S2M ring and -last 1024 will belong to M2S ring. In case of zero-copy, buffers are dequeued and +in each direction and ring size is 1024, then first 1024 buffers will belong to C2S ring and +last 1024 will belong to S2C ring. In case of zero-copy, buffers are dequeued and enqueued as needed. **Descriptor format** @@ -193,7 +193,7 @@ region 0: +-----------------------+ | Rings | +-----------+-----------+ -| S2M rings | M2S rings | +| C2S rings | S2C rings | +-----------+-----------+ region n: -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-28 22:41:06.776720426 +0800 +++ 0070-doc-fix-memif-driver-acronyms.patch 2021-11-28 22:41:03.426872382 +0800 @@ -1 +1 @@ -From 3f7b90eb80b1c6fc63c70f77e27ddbd2599e592e Mon Sep 17 00:00:00 2001 +From 9de850690d8a0bccc836d2a2e023009aa832090e Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 3f7b90eb80b1c6fc63c70f77e27ddbd2599e592e ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org