From patchwork Thu Oct 21 05:08:26 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 102511 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B23ECA0C4B; Thu, 21 Oct 2021 07:09:16 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E9E4C4117F; Thu, 21 Oct 2021 07:09:09 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2061.outbound.protection.outlook.com [40.107.212.61]) by mails.dpdk.org (Postfix) with ESMTP id EDF2940142 for ; Thu, 21 Oct 2021 07:09:06 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=OOCAYlXV9N0qUIijjYZ3AnbFsFxcrBhMZ67CKmc3+rb3rUDVoHQpUph+S1rxWqtr+3DllqYBb4lZbkmdojPW0lgHjw/TrJi/QDP23g9pc2ioGtYMrb3hPlSAtkpj6xgwCBMfuuT3979943UAoNNlehfeBTVwO2fTaQCrKi7k4B8ATRVOGEIS1Xm/BLiipmhhj7O8WJjEVgH3pMTc9yeneYNmugwWRyR5wnNBrlzdwnjcukmg1fuHyRXd3FCq41uaQqWURcYrunfQIbAJlGKJLqZM8Or2BmVvCcOhccfWw9wj3etvTKOp2f23eHiBPBjU0y7d+3sqgauZIUalawPzyw== 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=3EQT6OzXhTogkTDMPP3XyWMlWwcnuM4DV/He80Ai3G8=; b=RLNxir+TWtmfZq4p7Adb/FvqgliBC8gvEwoQlOyBKC/kSCREU+NJ9e79VBdNAK88bRcbx9CfNGQ4QtRUdz9kHXm+OZiqYx/yNxuY3NFgrdOxwLFzf8MsZwHqjJgP0APyjjh+RrofnFYKr3xxfGCDq7qUj1CAIdiSrCt4qvGzUmNodpfdPYl+aipanLRg6sxxL3NsShilO22WJnlVn0ONEKHaiGrXeSxD0ZGxrMw17lghqIUW2Rz25lEV/J1dz+f8cID0g3aPxuG9rlT9Vc/9bt6jqPfulVt2lpCfQF4qy0OEPXfUNrK0PeYOSye9WYw6zbrwzUlGV9kWowy0VYwMlg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=monjalon.net 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=3EQT6OzXhTogkTDMPP3XyWMlWwcnuM4DV/He80Ai3G8=; b=Fsj/Jk6YKw6PgCVwHDAXnUALFcBNobD81BPSQGnfEBPUaYMspt3QZ069Ct6UQIAlXVhhXXBVMThAPJewjpfWYdmfLYaSt5zRgA4107Z0RzZ21IfTWYQmUWUw7JyPdfL8isPalELxOcIFhEr8a+0gfNVMg3WrZdNmZ/d37+1HmrFLBR7t2pCd+NCPzbey4uLmAe4rZpOvfn/0H7LaH3aBylVVhz3lzEE98Dj3bhQSAqPAfyAxMsCuFTjxZrxT/Zm0yPwFj4OiqIpKldfW2s7z+JG+Wfn94cqxbMqSphAzm7NzE/3IN5UtuFumgoNqn38vc+R4uxsP6waz2JskohsqEw== Received: from DM5PR13CA0042.namprd13.prod.outlook.com (2603:10b6:3:7b::28) by CH2PR12MB4857.namprd12.prod.outlook.com (2603:10b6:610:64::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.17; Thu, 21 Oct 2021 05:09:05 +0000 Received: from DM6NAM11FT003.eop-nam11.prod.protection.outlook.com (2603:10b6:3:7b:cafe::4f) by DM5PR13CA0042.outlook.office365.com (2603:10b6:3:7b::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4649.8 via Frontend Transport; Thu, 21 Oct 2021 05:09:05 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; monjalon.net; dkim=none (message not signed) header.d=none;monjalon.net; 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 DM6NAM11FT003.mail.protection.outlook.com (10.13.173.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4628.16 via Frontend Transport; Thu, 21 Oct 2021 05:09:04 +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; Thu, 21 Oct 2021 05:08:53 +0000 From: Xueming Li To: , Zhang Yuying , Li Xiaoyun CC: , Jerin Jacob , Ferruh Yigit , Andrew Rybchenko , Viacheslav Ovsiienko , Thomas Monjalon , Lior Margalit , "Ananyev Konstantin" , Ajit Khaparde Date: Thu, 21 Oct 2021 13:08:26 +0800 Message-ID: <20211021050832.2599691-2-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211021050832.2599691-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20211021050832.2599691-1-xuemingl@nvidia.com> MIME-Version: 1.0 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: 0c0e2f50-9934-4067-70bf-08d99450e76b X-MS-TrafficTypeDiagnostic: CH2PR12MB4857: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: I5jSlutxrzv9cFJE9puk7iPRBMzCdX40CghDXXQiznDqHCZ4vTpVGHLqrVtB9fVQab6i/D0lqKia5BxomyvtnrqIBEOeh8tE2zPRVKlRk1T389fveqj9Amr2PIGcLuB9V8y/oI4bU3NBw8djyu58FPzmHhJOjPL4eDiCwtK4Ujg7c/lVNPCweIaIq0sdVrhEcgHIYjMlHL0WdgjEH67vOaJOh5Cm44zoyKKxGSJ60CNmaDPPUEtibXaqRcHPtSg29EaMGl7dyGDTRmv7P7eO4FElocV94WIB7Km0UAoyRHTKgntw5ururLSNKvPPG92lZXaskgJa3A7CgxP9s0hsQUGubgGbebBGbYi9pMuPxPu3BCgm1A6E3vb71magF+g9L1Al9/R5rYSVevn12ZMmb4V7BHjgxVQinpcoPC1/uXXwBEbrhHTM0/e23bq+k3u5T3ucSHuIUSsfP25RUDRnKL+ZERVd92LIF5j50OjJF8atehFtE/ti/sh36OlqsrVevLw+qp8nO0uf2zd6Zjpvt2DF8WVHIPEzp4ODMCDXbVpfQYE+yvvchC5FpLuMfCZaI6IBISuUF1PEfBFs8USBBE+GgcAwjQ9gck122qjt1dxKLCSK/e8ywdn1Nlw3bw5Gq9Osto999o349UjSczr2j4QOVfC2K1aqTBoH3rQMEXZu4M6v8Ifx5/IzMHyGurfin8inMou7O4+iWYpnLNEb6Jnb96rIqd1ctsId9waHEWRei50nq6OGrASUcOThSSVi57sTKTJccS900rNZAeztqN5xZch8xT/KcH3GoPpsVqc= 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)(36840700001)(46966006)(508600001)(6666004)(36860700001)(336012)(316002)(36906005)(1076003)(110136005)(54906003)(7696005)(186003)(16526019)(55016002)(82310400003)(47076005)(26005)(6286002)(7636003)(2616005)(83380400001)(2906002)(36756003)(70206006)(8676002)(5660300002)(356005)(8936002)(4326008)(426003)(86362001)(70586007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2021 05:09:04.3581 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0c0e2f50-9934-4067-70bf-08d99450e76b 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: DM6NAM11FT003.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4857 Subject: [dpdk-dev] [PATCH v12 1/7] ethdev: introduce shared Rx queue X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" In current DPDK framework, each Rx queue is pre-loaded with mbufs to save incoming packets. For some PMDs, when number of representors scale out in a switch domain, the memory consumption became significant. Polling all ports also leads to high cache miss, high latency and low throughput. This patch introduces shared Rx queue. Ports in same Rx domain and switch domain could share Rx queue set by specifying non-zero sharing group in Rx queue configuration. Shared Rx queue is identified by share_rxq field of Rx queue configuration. Port A RxQ X can share RxQ with Port B RxQ Y by using same shared Rx queue ID. No special API is defined to receive packets from shared Rx queue. Polling any member port of a shared Rx queue receives packets of that queue for all member ports, port_id is identified by mbuf->port. PMD is responsible to resolve shared Rx queue from device and queue data. Shared Rx queue must be polled in same thread or core, polling a queue ID of any member port is essentially same. Multiple share groups are supported. PMD should support mixed configuration by allowing multiple share groups and non-shared Rx queue on one port. Example grouping and polling model to reflect service priority: Group1, 2 shared Rx queues per port: PF, rep0, rep1 Group2, 1 shared Rx queue per port: rep2, rep3, ... rep127 Core0: poll PF queue0 Core1: poll PF queue1 Core2: poll rep2 queue0 PMD advertise shared Rx queue capability via RTE_ETH_DEV_CAPA_RXQ_SHARE. PMD is responsible for shared Rx queue consistency checks to avoid member port's configuration contradict each other. Signed-off-by: Xueming Li Reviewed-by: Andrew Rybchenko Acked-by: Ajit Khaparde --- doc/guides/nics/features.rst | 13 ++++++++++ doc/guides/nics/features/default.ini | 1 + .../prog_guide/switch_representation.rst | 11 +++++++++ doc/guides/rel_notes/release_21_11.rst | 6 +++++ lib/ethdev/rte_ethdev.c | 8 +++++++ lib/ethdev/rte_ethdev.h | 24 +++++++++++++++++++ 6 files changed, 63 insertions(+) diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst index 8dd421ca013..d35751d5b5a 100644 --- a/doc/guides/nics/features.rst +++ b/doc/guides/nics/features.rst @@ -614,6 +614,19 @@ Supports inner packet L4 checksum. ``tx_offload_capa,tx_queue_offload_capa:DEV_TX_OFFLOAD_OUTER_UDP_CKSUM``. +.. _nic_features_shared_rx_queue: + +Shared Rx queue +--------------- + +Supports shared Rx queue for ports in same Rx domain of a switch domain. + +* **[uses] rte_eth_dev_info**: ``dev_capa:RTE_ETH_DEV_CAPA_RXQ_SHARE``. +* **[uses] rte_eth_dev_infoļ¼Œrte_eth_switch_info**: ``rx_domain``, ``domain_id``. +* **[uses] rte_eth_rxconf**: ``share_group``, ``share_qid``. +* **[provides] mbuf**: ``mbuf.port``. + + .. _nic_features_packet_type_parsing: Packet type parsing diff --git a/doc/guides/nics/features/default.ini b/doc/guides/nics/features/default.ini index 09914b1ad32..39d21fcd379 100644 --- a/doc/guides/nics/features/default.ini +++ b/doc/guides/nics/features/default.ini @@ -19,6 +19,7 @@ Free Tx mbuf on demand = Queue start/stop = Runtime Rx queue setup = Runtime Tx queue setup = +Shared Rx queue = Burst mode info = Power mgmt address monitor = MTU update = diff --git a/doc/guides/prog_guide/switch_representation.rst b/doc/guides/prog_guide/switch_representation.rst index ff6aa91c806..4f2532a91ea 100644 --- a/doc/guides/prog_guide/switch_representation.rst +++ b/doc/guides/prog_guide/switch_representation.rst @@ -123,6 +123,17 @@ thought as a software "patch panel" front-end for applications. .. [1] `Ethernet switch device driver model (switchdev) `_ +- For some PMDs, memory usage of representors is huge when number of + representor grows, mbufs are allocated for each descriptor of Rx queue. + Polling large number of ports brings more CPU load, cache miss and + latency. Shared Rx queue can be used to share Rx queue between PF and + representors among same Rx domain. ``RTE_ETH_DEV_CAPA_RXQ_SHARE`` in + device info is used to indicate the capability. Setting non-zero share + group in Rx queue configuration to enable share, share_qid is used to + identify the shared Rx queue in group. Polling any member port can + receive packets of all member ports in the group, port ID is saved in + ``mbuf.port``. + Basic SR-IOV ------------ diff --git a/doc/guides/rel_notes/release_21_11.rst b/doc/guides/rel_notes/release_21_11.rst index 74776ca0691..f4fb68e7408 100644 --- a/doc/guides/rel_notes/release_21_11.rst +++ b/doc/guides/rel_notes/release_21_11.rst @@ -75,6 +75,12 @@ New Features operations. * Added multi-process support. +* **Added ethdev shared Rx queue support.** + + * Added new device capability flag and Rx domain field to switch info. + * Added share group and share queue ID to Rx queue configuration. + * Added testpmd support and dedicate forwarding engine. + * **Added support to get all MAC addresses of a device.** Added ``rte_eth_macaddrs_get`` to allow user to retrieve all Ethernet diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 1f18aa916cc..31a9cba065b 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -2175,6 +2175,14 @@ rte_eth_rx_queue_setup(uint16_t port_id, uint16_t rx_queue_id, return -EINVAL; } + if (local_conf.share_group > 0 && + (dev_info.dev_capa & RTE_ETH_DEV_CAPA_RXQ_SHARE) == 0) { + RTE_ETHDEV_LOG(ERR, + "Ethdev port_id=%d rx_queue_id=%d, enabled share_group=%hu while device doesn't support Rx queue share\n", + port_id, rx_queue_id, local_conf.share_group); + return -EINVAL; + } + /* * If LRO is enabled, check that the maximum aggregated packet * size is supported by the configured device. diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index 014270d3167..40f88cc3d64 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -1045,6 +1045,14 @@ struct rte_eth_rxconf { uint8_t rx_drop_en; /**< Drop packets if no descriptors are available. */ uint8_t rx_deferred_start; /**< Do not start queue with rte_eth_dev_start(). */ uint16_t rx_nseg; /**< Number of descriptions in rx_seg array. */ + /** + * Share group index in Rx domain and switch domain. + * Non-zero value to enable Rx queue share, zero value disable share. + * PMD is responsible for Rx queue consistency checks to avoid member + * port's configuration contradict to each other. + */ + uint16_t share_group; + uint16_t share_qid; /**< Shared Rx queue ID in group. */ /** * Per-queue Rx offloads to be set using DEV_RX_OFFLOAD_* flags. * Only offloads set on rx_queue_offload_capa or rx_offload_capa @@ -1445,6 +1453,16 @@ struct rte_eth_conf { #define RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP 0x00000001 /** Device supports Tx queue setup after device started. */ #define RTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP 0x00000002 +/** + * Device supports shared Rx queue among ports within Rx domain and + * switch domain. Mbufs are consumed by shared Rx queue instead of + * each queue. Multiple groups are supported by share_group of Rx + * queue configuration. Shared Rx queue is identified by PMD using + * share_qid of Rx queue configuration. Polling any port in the group + * receive packets of all member ports, source port identified by + * mbuf->port field. + */ +#define RTE_ETH_DEV_CAPA_RXQ_SHARE RTE_BIT64(2) /**@}*/ /* @@ -1488,6 +1506,12 @@ struct rte_eth_switch_info { * but each driver should explicitly define the mapping of switch * port identifier to that physical interconnect/switch */ + /** + * Shared Rx queue sub-domain boundary. Only ports in same Rx domain + * and switch domain can share Rx queue. Valid only if device advertised + * RTE_ETH_DEV_CAPA_RXQ_SHARE capability. + */ + uint16_t rx_domain; }; /** From patchwork Thu Oct 21 05:08:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 102512 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 941ADA0C4B; Thu, 21 Oct 2021 07:09:24 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EA90D41124; Thu, 21 Oct 2021 07:09:15 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam08on2076.outbound.protection.outlook.com [40.107.100.76]) by mails.dpdk.org (Postfix) with ESMTP id 8ABF940142 for ; Thu, 21 Oct 2021 07:09:14 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZYTpnphyNs4DCiZfDruXNKY6r9VJaST/WeqmxdlUZsWmBlXw6+24v1Irpce6OD7yFoPZQMkaY/O26W2iYZi2kx8goVDbSrMITw/eXpTp8LHAd6qyDSi5+zW40Nekv1vouAJjmHtfF6XSyFi5KJRWITqsOqDrtyy6dZR2aopbOANczltiir87u3ZO58Dykw9EL7UNtYogKwzxJEOoj0K12ye1QOxBZ4Z7kUFHngrCYbZpwm7vPed6/mbxvODyTNUXXNB+A6lJLBOo+S/QUk2lXURTc9wlbv/iZ9lDnayFJ6HLaHW3mEIMb6lYDxtSVomoqbwFKaFrglx1vSgL4scozA== 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=th5WE7hzWwPx2N90+zqSyf1QEdnOyOSQHpWVRERrwrQ=; b=gneV1YTqTBXrM5hylQuy5nuWxFGYzb1ssNqk3YDxGZWpu9CBivxRwqZ+tN7rp0sSloxO+48aL/xIxHMkUl75dznJBpA4LSy/iZsYY/6OMtp/k2LZfnlpzfTrBgqt01X3SIpNe3qyCBv1/xm+Pi3ytyKXjXKqS1wCOMjn/u330o+WRYv005/he6Hlg5fAVVxLGEM/NRK+blODAwMuIOM9wwwM8OeLk8yvU+GN3+Ncb7t8gr6TO6BPlyYgvCpZNPYr7gN6rmS3/CEOL/vPHAwqzrgEjNUW1J28gcDp3wrPtKz8CDGI3e5owTOWFB/KY7hkl96rwezkV07pqdr3tl9aLw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=monjalon.net 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=th5WE7hzWwPx2N90+zqSyf1QEdnOyOSQHpWVRERrwrQ=; b=LLhGk7eVVMaUP7Ms50Cnm7gZjY8x0em0Vl7fC/w2xxUc5aX3c1wPM6Hx85g6rjJzoS04rv6q8yeXvHfljbGFXaIV5J0C9iD19mffFP77UqYEukhiLjPl82V4/UPSfqbHGa3zLuzCERBLFANC/LMukJQucPuaysjNF8MiG++UMGKXxktKyQgVU9lpcnnm00QY1wl02Dp6zhQyhjcI6piGDGBsrOr0njYqrW4rnnqcTh6jdd3C1pAOxT3g2olW1c3SgpBkrdNbYs777SfldfV94FAwa6wVZuKsq0OHiO5BSZddGrL4/QejFmshTIEi68BwunGsL4cRNrXwbuMwviJd2Q== Received: from DM5PR13CA0028.namprd13.prod.outlook.com (2603:10b6:3:7b::14) by MWHPR1201MB0110.namprd12.prod.outlook.com (2603:10b6:301:56::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Thu, 21 Oct 2021 05:09:12 +0000 Received: from DM6NAM11FT003.eop-nam11.prod.protection.outlook.com (2603:10b6:3:7b:cafe::f) by DM5PR13CA0028.outlook.office365.com (2603:10b6:3:7b::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.8 via Frontend Transport; Thu, 21 Oct 2021 05:09:11 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; monjalon.net; dkim=none (message not signed) header.d=none;monjalon.net; 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 DM6NAM11FT003.mail.protection.outlook.com (10.13.173.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4628.16 via Frontend Transport; Thu, 21 Oct 2021 05:09:11 +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; Thu, 21 Oct 2021 05:09:00 +0000 From: Xueming Li To: , Zhang Yuying , Li Xiaoyun CC: , Jerin Jacob , Ferruh Yigit , Andrew Rybchenko , Viacheslav Ovsiienko , Thomas Monjalon , Lior Margalit , "Ananyev Konstantin" , Ajit Khaparde , Ray Kinsella Date: Thu, 21 Oct 2021 13:08:27 +0800 Message-ID: <20211021050832.2599691-3-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211021050832.2599691-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20211021050832.2599691-1-xuemingl@nvidia.com> MIME-Version: 1.0 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: ed59996e-f4ac-47eb-0ee9-08d99450eb81 X-MS-TrafficTypeDiagnostic: MWHPR1201MB0110: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Exchange-Transport-Forked: True X-MS-Oob-TLC-OOBClassifiers: OLM:2331; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kiYambtDPJ3mTBC0rouujzAjj1UMBtgsBgpTGyIQu96k4cIaT1KYy1n3i62JJbaJMsKELY/BMT0Aql6pdLPHQFMQTCaYZywOnHCYc+8OY4M8UYLaBSQxtK8DzvRSEKQQXplemh4yOlUeQ9gd5l4pi2K1aI34o+9oMXZVRc0Ym+q1qoRayS168/CTdrUAPhH32q7/H5bkFOu5zXAhjJx97MtiWDWeTYu49TBIeFRHp89wiV+Ok0dgOWCLFt13YNDI6SQcYAxW9J5EPTd17EEbI/f+b+CW0CdKmbC8vYc+X8/2c20K8cF6zVdd/SZbD9go6M4anreDhVVUhwfmwPY8vbSxRPMO+0I8DIYcogS1kMAXdiSD88Gy1ziRe1mH10725by5X6FrbwTUdFO1BEQV8oMXglmUAUBE9EynU7XHKXJOT4FXVpaohmf3dNCJDywYYq8zl+bCm4kPFbWavnLqfduc2IcUVJZHFH20gmZpswWN/YJhzxrLJUNlnPzMldvIV8PBN+BHSQAdlmtOTeiSSZr7XJNIDLQ/pOH3aauAA4/GboXY97lyZw9hsn1QdaQl+uTTxzMIWmqRsOQo0IH7W/t8qy79K9AshBdrxCUX5Q0eChNXH4/GVFbKuXLTBclVZSDCt+6Jw6zIdGg4w3fTDqwfRqA9jnzMEJ3V4lcsfF//sO9jePpBgraUT46oBNkz9/+rianVzLSM/tJY69TIXw== 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)(36840700001)(46966006)(36756003)(36860700001)(426003)(336012)(83380400001)(6286002)(70586007)(5660300002)(8676002)(186003)(2616005)(55016002)(2906002)(508600001)(16526019)(86362001)(70206006)(110136005)(26005)(7696005)(356005)(7636003)(7416002)(36906005)(8936002)(54906003)(82310400003)(316002)(47076005)(1076003)(6666004)(4326008); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2021 05:09:11.3117 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ed59996e-f4ac-47eb-0ee9-08d99450eb81 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: DM6NAM11FT003.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR1201MB0110 Subject: [dpdk-dev] [PATCH v12 2/7] ethdev: get device capability name as string X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch adds API to return name of device capability. Signed-off-by: Xueming Li Reviewed-by: Andrew Rybchenko Acked-by: Ajit Khaparde Acked-by: Thomas Monjalon --- lib/ethdev/rte_ethdev.c | 25 +++++++++++++++++++++++++ lib/ethdev/rte_ethdev.h | 14 ++++++++++++++ lib/ethdev/version.map | 1 + 3 files changed, 40 insertions(+) diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 31a9cba065b..bfe5b0adbef 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -167,6 +167,15 @@ static const struct { #undef RTE_TX_OFFLOAD_BIT2STR +static const struct { + uint64_t offload; + const char *name; +} rte_eth_dev_capa_names[] = { + {RTE_ETH_DEV_CAPA_RUNTIME_RX_QUEUE_SETUP, "RUNTIME_RX_QUEUE_SETUP"}, + {RTE_ETH_DEV_CAPA_RUNTIME_TX_QUEUE_SETUP, "RUNTIME_TX_QUEUE_SETUP"}, + {RTE_ETH_DEV_CAPA_RXQ_SHARE, "RXQ_SHARE"}, +}; + /** * The user application callback description. * @@ -1236,6 +1245,22 @@ rte_eth_dev_tx_offload_name(uint64_t offload) return name; } +const char * +rte_eth_dev_capability_name(uint64_t capability) +{ + const char *name = "UNKNOWN"; + unsigned int i; + + for (i = 0; i < RTE_DIM(rte_eth_dev_capa_names); ++i) { + if (capability == rte_eth_dev_capa_names[i].offload) { + name = rte_eth_dev_capa_names[i].name; + break; + } + } + + return name; +} + static inline int eth_dev_check_lro_pkt_size(uint16_t port_id, uint32_t config_size, uint32_t max_rx_pkt_len, uint32_t dev_info_size) diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index 40f88cc3d64..9baca39e97a 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -2109,6 +2109,20 @@ const char *rte_eth_dev_rx_offload_name(uint64_t offload); */ const char *rte_eth_dev_tx_offload_name(uint64_t offload); +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice. + * + * Get RTE_ETH_DEV_CAPA_* flag name. + * + * @param capability + * Capability flag. + * @return + * Capability name or 'UNKNOWN' if the flag cannot be recognized. + */ +__rte_experimental +const char *rte_eth_dev_capability_name(uint64_t capability); + /** * Configure an Ethernet device. * This function must be invoked first before any other function in the diff --git a/lib/ethdev/version.map b/lib/ethdev/version.map index d552c955c94..e1abe997290 100644 --- a/lib/ethdev/version.map +++ b/lib/ethdev/version.map @@ -249,6 +249,7 @@ EXPERIMENTAL { rte_mtr_meter_policy_validate; # added in 21.11 + rte_eth_dev_capability_name; rte_eth_dev_conf_get; rte_eth_macaddrs_get; rte_eth_rx_metadata_negotiate; From patchwork Thu Oct 21 05:08:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 102513 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id DA790A0C4B; Thu, 21 Oct 2021 07:09:31 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D89584116A; Thu, 21 Oct 2021 07:09:22 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2080.outbound.protection.outlook.com [40.107.237.80]) by mails.dpdk.org (Postfix) with ESMTP id D2A6240142 for ; Thu, 21 Oct 2021 07:09:20 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NTak96b6cQjp5N7RsNvUKwQKAmzg3bjZpiI6cq4bpxA6ksqVdh6LfZhNgnju8F7StueQVqYAtQkHk/SrKLaIXyW/Y+ZRpQ5PpqBZ6XlVSPHIdjt+EviMwtgOIsHv7bxZ0tdOSoP9ABgvTAR/V5dJIke9vwSJX4rHxA9qeWuD4BNx2wZ578+kS17wgTq1AhMjcc5pH186cS68NmTKOv7OrOlECywBcOe0goidLDyu0En6+FTzL9TxlPc7RjEaQZktVlQiyFVYanzt10pqpsDWw4ohGKBd2kjA35XdoOqqdwcSkOzHj94nJEEyzhiB35IxVi8PfOJBEOTsSueD+YfUpA== 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=CwnHpJdaaTxuam6nt6TxTKzUQMJd0SqsFlzqQqVLYBc=; b=J+2mEyo4OsZodDiJTSCghv6IhmuZOmgZT8WnifqwRWJYjlKmox7/nYxUt6I6tJH20soX7sjPt/tyYwDdjSv7B55PH6MA3kqt4JzQWZx1XHuf3YWFR5FP4edVQaslwcCgj9lwN60dBP+o/QRWWXfpiYpPe5RtTvAGn7V0eyQWWVjE0uzTy5pcu04mviGK6PzMmM1h521KCQJUlrYzaKTpaE0TkByHE9SEw+FKYRFHN3pW7hzpkw/XR8XkxwQk3ee52Nn9xxXeYfdjj42MWXt51Y9rsJT7nUU0OwmOxV7IcBgNEWZLybhGbxc/saglb5H+N58I9cJJa3i61WPa584Ytw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=monjalon.net 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=CwnHpJdaaTxuam6nt6TxTKzUQMJd0SqsFlzqQqVLYBc=; b=NtD6DBzbOi7z7oMlQJgwz+0P5GHMtlIkz1NJTg0qTSdi0mqNzYjrttYI1LDK5z/E2c9JoSycT6MLMZo+FxV3en03V5nDmVXx/CIFaNHxJRFr1HRM0yjFQ/+9BS/20hY/+1BLY7JxQmYPglgFPKZh7tFNvcLbln2zyDkk19W7Npq0c0bF8FPJ6QnFFTnBa6PYCDw0NJmZhSOJHtrR2qWxrDJBr4jSMvKMnVCLkflIHP8eSyqRK7w+brOI3kPb7qRlAGbNHZkV5Tb6iZV4YeWGOxUcmtZlo50HFaU7Wl7EYMVkJRMQzwPsq5d9cCmeqJb2kSx+tBG0MWeMonrBlTJDqg== Received: from DM5PR13CA0039.namprd13.prod.outlook.com (2603:10b6:3:7b::25) by MW2PR12MB4668.namprd12.prod.outlook.com (2603:10b6:302:e::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.17; Thu, 21 Oct 2021 05:09:18 +0000 Received: from DM6NAM11FT003.eop-nam11.prod.protection.outlook.com (2603:10b6:3:7b:cafe::82) by DM5PR13CA0039.outlook.office365.com (2603:10b6:3:7b::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.9 via Frontend Transport; Thu, 21 Oct 2021 05:09:18 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; monjalon.net; dkim=none (message not signed) header.d=none;monjalon.net; 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 DM6NAM11FT003.mail.protection.outlook.com (10.13.173.162) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4628.16 via Frontend Transport; Thu, 21 Oct 2021 05:09:17 +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; Thu, 21 Oct 2021 05:09:09 +0000 From: Xueming Li To: , Zhang Yuying , Li Xiaoyun CC: , Jerin Jacob , Ferruh Yigit , Andrew Rybchenko , Viacheslav Ovsiienko , Thomas Monjalon , Lior Margalit , "Ananyev Konstantin" , Ajit Khaparde Date: Thu, 21 Oct 2021 13:08:28 +0800 Message-ID: <20211021050832.2599691-4-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211021050832.2599691-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20211021050832.2599691-1-xuemingl@nvidia.com> MIME-Version: 1.0 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: 2babe507-ae25-44cf-cf89-08d99450ef40 X-MS-TrafficTypeDiagnostic: MW2PR12MB4668: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Exchange-Transport-Forked: True X-MS-Oob-TLC-OOBClassifiers: OLM:238; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4cmUvWtmp63H91lSYcoSMMfzZrd1xJ/sjUaRIiY6u4zT2LQuxke4CZRejY8iejLuTaeJCIoklYgzz8iFifudCqPx26Ja95FfCppwNwQr40flnEvJ7Q1U9E7u9HmYd07+de3dvLQs4Ku+EpjfHyHKYxKxtg0/nUe6Bg7bSO6PUjT7uzkN4BrrkYWe7eBlSAYV3ezCOdq3hzq51BEzQvBQuyT0mvHS/uajLOGgGiDitpK35ZUyiqaUQQUQ8kOIbtO44L2zMJ0XBEswPI9Ntx38OsbLUl0QVFG1EDI/wnqKO+QMr+ENPpY1faeY2ZUQ1U588do/gZiVDFDKSqke/jNVfzBqLYlNnVTqT+tzhsAUHwULcmSuZwZsEOv7HYmndRlJWzr5hKPZoqBXCvETw/MJjS90nEJ08AOuJ1bV4/VGuZc8nL9JmTEvzyGuwg1BF7tTeZSom8sWeKcp4XFDSdAvLV9QFjQI6wskAwzOBgkdl6n/3P5ovgxC2qNA+h058VdDbhUaxAS9zOmQG8nKUOv0uolDWH8Yq7ZcIV0RXMfHS9XWb7A65spbg6KOdMWXsFWN1LtBuoGvGjTSt2Nx7/0jZZ+am3hak3oERrL4biWPGR+PnWokfZF//ehPYssHq7W+NsX7t9UsooSRkp+xbfZLaNmhCNNTfoW8IddwLmwEIkVtpPlzMBHWIV3lL4uyXsNblpOR+5QZU8RTcj7qgLqG7A== 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)(36840700001)(46966006)(336012)(2616005)(6666004)(1076003)(5660300002)(47076005)(70586007)(6286002)(186003)(36860700001)(54906003)(82310400003)(8936002)(7696005)(110136005)(508600001)(55016002)(7636003)(70206006)(16526019)(316002)(4326008)(2906002)(426003)(356005)(8676002)(36756003)(26005)(36906005)(86362001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2021 05:09:17.6675 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2babe507-ae25-44cf-cf89-08d99450ef40 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: DM6NAM11FT003.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR12MB4668 Subject: [dpdk-dev] [PATCH v12 3/7] app/testpmd: dump device capability and Rx domain info X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Dump device capability and Rx domain ID if shared Rx queue is supported by device. Signed-off-by: Xueming Li Acked-by: Andrew Rybchenko Acked-by: Xiaoyun Li --- app/test-pmd/config.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 23aa334cda0..db36ca41b94 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -644,6 +644,29 @@ device_infos_display(const char *identifier) rte_devargs_reset(&da); } +static void +print_dev_capabilities(uint64_t capabilities) +{ + uint64_t single_capa; + int begin; + int end; + int bit; + + if (capabilities == 0) + return; + + begin = __builtin_ctzll(capabilities); + end = sizeof(capabilities) * CHAR_BIT - __builtin_clzll(capabilities); + + single_capa = 1ULL << begin; + for (bit = begin; bit < end; bit++) { + if (capabilities & single_capa) + printf(" %s", + rte_eth_dev_capability_name(single_capa)); + single_capa <<= 1; + } +} + void port_infos_display(portid_t port_id) { @@ -795,6 +818,9 @@ port_infos_display(portid_t port_id) printf("Max segment number per MTU/TSO: %hu\n", dev_info.tx_desc_lim.nb_mtu_seg_max); + printf("Device capabilities: 0x%"PRIx64"(", dev_info.dev_capa); + print_dev_capabilities(dev_info.dev_capa); + printf(" )\n"); /* Show switch info only if valid switch domain and port id is set */ if (dev_info.switch_info.domain_id != RTE_ETH_DEV_SWITCH_DOMAIN_ID_INVALID) { @@ -805,6 +831,9 @@ port_infos_display(portid_t port_id) dev_info.switch_info.domain_id); printf("Switch Port Id: %u\n", dev_info.switch_info.port_id); + if ((dev_info.dev_capa & RTE_ETH_DEV_CAPA_RXQ_SHARE) != 0) + printf("Switch Rx domain: %u\n", + dev_info.switch_info.rx_domain); } } From patchwork Thu Oct 21 05:08:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 102514 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4B3F7A0C4B; Thu, 21 Oct 2021 07:09:40 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4DBE94118A; Thu, 21 Oct 2021 07:09:29 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2089.outbound.protection.outlook.com [40.107.237.89]) by mails.dpdk.org (Postfix) with ESMTP id AA30C40142 for ; Thu, 21 Oct 2021 07:09:27 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HWUF5/v7tu7XVOV87j6P2SZH2ZMnZB1pjXdMzzh48Alo1+6GEa9m45RXLB731l0LVgS8xSMbMaFTnL+shbKecIl+mlMMI6TlYOXoOmXje0nc8Y/qDAP0fDpSJnjsgH/GaW3WMsH2lMBMSLyT4iVQutZG1VMkXznUr6XgcvOUJ3F4UlhcAtwtB04KMANUBZFJPjDW3tGCMKOSKgT2U4Ptq28aDwBu8Ul93Wwf5RZXwzQUlwATTD4bndeLKsiYDLZTWGeGPNNHcDnXUwjequ5AceA0l5n86g/gU3Zu0IUHDNDnhlskOKvRHb2LPucuyNmKb93hRsiab5YzQPcT/nRznA== 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=hikHGl04xF6EYIfh6N62+aCoqTzyqQXjdkTqD7kMKl0=; b=bCqtrE52SeF9tSOcH7/a0ybpRsuEkldRF1QEOUyMq08pg/af1e125IZTVORy5jRS2iGb4iSK8ug5YzZWyWwqb2NxEQT6mwY6Yru21ERirCcyWBzT/87epvdxNewnDqHcTjbcZJdxKPxQfSrCpSujJaENFMhFoCgpP4Hn/dPMs59u2Nldm/KtZ9KvVS0J4I3J0YyQXX4y5eF8cKaA2PmNdF4mIA76QzErfM/jYkLMvEPXjVjOVxZbJ3jMi2p1f6JV7YX62N6fLx8LH8rSV2EFrNhiqN/xAMaI4o4ebrPR5bzyvqhMdoJ5IYlBBbTOYmZ3Pl7lvSS8DJcDhwCyL74nyg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=monjalon.net 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=hikHGl04xF6EYIfh6N62+aCoqTzyqQXjdkTqD7kMKl0=; b=dSjOGaeimUu0iQi0VWMkALGRwflpN7X3ucoZBiyEJ6sY8cmRhPaXvLl+Fs8Qnthxi+sH/Tu0TBxhSHyIXDx+vB6mwSrkJ/gBa6l+0y8238qqT+uSQDqyztMvC6DuutZnboeqZnMVWzB+PitFaFtdSJCxauIgf4nwY7I1uZIWuZ+qoornrVJxFWjoi1Xdi5aDQWH3ugCLKeI7cPFkYMTYEP+5yv+pKYglNgj1M8pKck6OKWRIhn0ASt18GdR0FKhmV1of8UM+p552/Ff20XeYyCSGJay5B71ZrwKwctSdQF+he0a+91dBrSppv551K03uREoHbyOFQruV3OsoI8pQpw== Received: from DM6PR04CA0017.namprd04.prod.outlook.com (2603:10b6:5:334::22) by BL0PR12MB5555.namprd12.prod.outlook.com (2603:10b6:208:1c2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.16; Thu, 21 Oct 2021 05:09:25 +0000 Received: from DM6NAM11FT009.eop-nam11.prod.protection.outlook.com (2603:10b6:5:334:cafe::d8) by DM6PR04CA0017.outlook.office365.com (2603:10b6:5:334::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16 via Frontend Transport; Thu, 21 Oct 2021 05:09:25 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; monjalon.net; dkim=none (message not signed) header.d=none;monjalon.net; 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 DM6NAM11FT009.mail.protection.outlook.com (10.13.173.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4628.16 via Frontend Transport; Thu, 21 Oct 2021 05:09:24 +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; Thu, 21 Oct 2021 05:09:16 +0000 From: Xueming Li To: , Zhang Yuying , Li Xiaoyun CC: , Jerin Jacob , Ferruh Yigit , Andrew Rybchenko , Viacheslav Ovsiienko , Thomas Monjalon , Lior Margalit , "Ananyev Konstantin" , Ajit Khaparde Date: Thu, 21 Oct 2021 13:08:29 +0800 Message-ID: <20211021050832.2599691-5-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211021050832.2599691-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20211021050832.2599691-1-xuemingl@nvidia.com> MIME-Version: 1.0 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: 3c26213c-b8ed-4027-4b51-08d99450f39b X-MS-TrafficTypeDiagnostic: BL0PR12MB5555: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2887; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: GsAWvoT384y7kABFZIqe3np2klNgfWKQVRfDqi/ThdsRCUZ/jGY8Gb88H/6YmQP2vxbFgMOf23kc44tJr50h5LpDfw7Awr3no9srjAqBrpsJrHB2zfIER1kXTI8JHBOSHbC2873BdgEIjCHP9HLfYmluoc5VmAWnVKmi10vUGYsRUaceF9rGZqJ+Sb2UN9of7V8P6XrpZBkdt/0pDL1KDWzgiCCLkR3/vMYzooMCPxpT/agI0sDlLLHg+3+hlvTcZDfN9Q6NlymHEGNQPxrmjD4xmIbKr/WVHlgCj1CyVVFlRnHbqyx1yqntlHLzbhT3fLIncjKOlOB3l49gcRerEF8YsbNrWEeFtqDFg7BfCCzKta8h1p6jeJIoC2vtgFfgh7L8RyqYI+irN2ua1Y/a/08xfE1si0NmYOtn8ZfLvpJCSrgavtjchvdRM/+rH4Um9hxrbUUkBvWpPchIh7eG+D2bBA2WfhRPVh0tqR0D9vED27zNNnctHxaug5rnoUaf7X9y2Gstpw+Jm6zGg5g+Hrj/Da0I8XZzC71rm+8493GaWr0QhFIjML2mbsXKTcBUylrdSkPMskVMGz71/WbwC/7OwXVsTdYm2pRcXGneGhb/6vcswD1S8cY4c5rXm+lY7mBJBHDlCzs1RZroidDhxj0w9AE3R58U9MH5zlfjSbYzxqkKJA5mkMXtQsOW3ydjRyJ2R6PHqea5gGp3P3wHrw== 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)(7696005)(110136005)(70206006)(36860700001)(26005)(82310400003)(8936002)(70586007)(47076005)(508600001)(1076003)(2906002)(55016002)(86362001)(5660300002)(2616005)(6666004)(36906005)(426003)(83380400001)(8676002)(36756003)(316002)(6286002)(16526019)(7636003)(54906003)(4326008)(186003)(356005)(336012); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2021 05:09:24.9424 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3c26213c-b8ed-4027-4b51-08d99450f39b 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: DM6NAM11FT009.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB5555 Subject: [dpdk-dev] [PATCH v12 4/7] app/testpmd: new parameter to enable shared Rx queue X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Adds "--rxq-share=X" parameter to enable shared RxQ. Rx queue is shared if device supports, otherwise fallback to standard RxQ. Shared Rx queues are grouped per X ports. X defaults to UINT32_MAX, implies all ports join share group 1. Queue ID is mapped equally with shared Rx queue ID. Signed-off-by: Xueming Li Acked-by: Thomas Monjalon --- app/test-pmd/config.c | 7 ++++++- app/test-pmd/parameters.c | 13 +++++++++++++ app/test-pmd/testpmd.c | 20 +++++++++++++++++--- app/test-pmd/testpmd.h | 2 ++ doc/guides/testpmd_app_ug/run_app.rst | 6 ++++++ 5 files changed, 44 insertions(+), 4 deletions(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index db36ca41b94..e4bbf457916 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -2890,7 +2890,12 @@ rxtx_config_display(void) printf(" RX threshold registers: pthresh=%d hthresh=%d " " wthresh=%d\n", pthresh_tmp, hthresh_tmp, wthresh_tmp); - printf(" RX Offloads=0x%"PRIx64"\n", offloads_tmp); + printf(" RX Offloads=0x%"PRIx64, offloads_tmp); + if (rx_conf->share_group > 0) + printf(" share_group=%u share_qid=%u", + rx_conf->share_group, + rx_conf->share_qid); + printf("\n"); } /* per tx queue config only for first queue to be less verbose */ diff --git a/app/test-pmd/parameters.c b/app/test-pmd/parameters.c index 779a721fa05..afc75f6bd21 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -171,6 +171,7 @@ usage(char* progname) printf(" --tx-ip=src,dst: IP addresses in Tx-only mode\n"); printf(" --tx-udp=src[,dst]: UDP ports in Tx-only mode\n"); printf(" --eth-link-speed: force link speed.\n"); + printf(" --rxq-share=X: number of ports per shared Rx queue groups, defaults to UINT32_MAX (1 group)\n"); printf(" --disable-link-check: disable check on link status when " "starting/stopping ports.\n"); printf(" --disable-device-start: do not automatically start port\n"); @@ -678,6 +679,7 @@ launch_args_parse(int argc, char** argv) { "rxpkts", 1, 0, 0 }, { "txpkts", 1, 0, 0 }, { "txonly-multi-flow", 0, 0, 0 }, + { "rxq-share", 2, 0, 0 }, { "eth-link-speed", 1, 0, 0 }, { "disable-link-check", 0, 0, 0 }, { "disable-device-start", 0, 0, 0 }, @@ -1352,6 +1354,17 @@ launch_args_parse(int argc, char** argv) } if (!strcmp(lgopts[opt_idx].name, "txonly-multi-flow")) txonly_multi_flow = 1; + if (!strcmp(lgopts[opt_idx].name, "rxq-share")) { + if (optarg == NULL) { + rxq_share = UINT32_MAX; + } else { + n = atoi(optarg); + if (n >= 0) + rxq_share = (uint32_t)n; + else + rte_exit(EXIT_FAILURE, "rxq-share must be >= 0\n"); + } + } if (!strcmp(lgopts[opt_idx].name, "no-flush-rx")) no_flush_rx = 1; if (!strcmp(lgopts[opt_idx].name, "eth-link-speed")) { diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index af0e79fe6d5..80337bad382 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -502,6 +502,11 @@ uint8_t record_core_cycles; */ uint8_t record_burst_stats; +/* + * Number of ports per shared Rx queue group, 0 disable. + */ +uint32_t rxq_share; + unsigned int num_sockets = 0; unsigned int socket_ids[RTE_MAX_NUMA_NODES]; @@ -3629,14 +3634,23 @@ dev_event_callback(const char *device_name, enum rte_dev_event_type type, } static void -rxtx_port_config(struct rte_port *port) +rxtx_port_config(portid_t pid) { uint16_t qid; uint64_t offloads; + struct rte_port *port = &ports[pid]; for (qid = 0; qid < nb_rxq; qid++) { offloads = port->rx_conf[qid].offloads; port->rx_conf[qid] = port->dev_info.default_rxconf; + + if (rxq_share > 0 && + (port->dev_info.dev_capa & RTE_ETH_DEV_CAPA_RXQ_SHARE)) { + /* Non-zero share group to enable RxQ share. */ + port->rx_conf[qid].share_group = pid / rxq_share + 1; + port->rx_conf[qid].share_qid = qid; /* Equal mapping. */ + } + if (offloads != 0) port->rx_conf[qid].offloads = offloads; @@ -3765,7 +3779,7 @@ init_port_config(void) } } - rxtx_port_config(port); + rxtx_port_config(pid); ret = eth_macaddr_get_print_err(pid, &port->eth_addr); if (ret != 0) @@ -3977,7 +3991,7 @@ init_port_dcb_config(portid_t pid, memcpy(&rte_port->dev_conf, &port_conf, sizeof(struct rte_eth_conf)); - rxtx_port_config(rte_port); + rxtx_port_config(pid); /* VLAN filter */ rte_port->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_VLAN_FILTER; for (i = 0; i < RTE_DIM(vlan_tags); i++) diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index e3995d24ab5..63f9913deb6 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -524,6 +524,8 @@ extern enum tx_pkt_split tx_pkt_split; extern uint8_t txonly_multi_flow; +extern uint32_t rxq_share; + extern uint16_t nb_pkt_per_burst; extern uint16_t nb_pkt_flowgen_clones; extern int nb_flows_flowgen; diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst index 8ff7ab85369..faa3efb902c 100644 --- a/doc/guides/testpmd_app_ug/run_app.rst +++ b/doc/guides/testpmd_app_ug/run_app.rst @@ -395,6 +395,12 @@ The command line options are: Generate multiple flows in txonly mode. +* ``--rxq-share=[X]`` + + Create queues in shared Rx queue mode if device supports. + Shared Rx queues are grouped per X ports. X defaults to UINT32_MAX, + implies all ports join share group 1. + * ``--eth-link-speed`` Set a forced link speed to the ethernet port:: From patchwork Thu Oct 21 05:08:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 102515 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id A4DCBA0C4D; Thu, 21 Oct 2021 07:09:56 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8D1BA41186; Thu, 21 Oct 2021 07:09:56 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2064.outbound.protection.outlook.com [40.107.92.64]) by mails.dpdk.org (Postfix) with ESMTP id 1768940142 for ; Thu, 21 Oct 2021 07:09:55 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dsizxHIhfn67MTNGOy6ZvzMQn4PX41Co61eoiN1o2fEuA/SWA5Ss3p82BSCTBP4x7NCYIHP51XMDKJtk6BJ4LsTw5yx5QiHFpeXYzhZVpSWV9cP0uHuQsKo4ZXjVHwn9VUiC0oBosItBUCPgjFndle1D1yrH69aAL8hu8hNFD6en37CA6N9klrQHdqTwIFc+2Qx2GP0jbPvODglXLUWfrQ6uv6xY3eo3yNFrJ6AszQ7w3/+F04Ug4zgDot1ZBtqSOSRVECRgQiPqTcAnah8aCp+cH0+6basuMtOHaAWyEf5+kDQxZgquJxeGoyCLkSJ1ErolQe73Fo6YwbGO7UBBWg== 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=xB0uSRYwlakfJwwPAU1zYi0i2HewLOOMTlIZPce3s6A=; b=A88CcDVEjZ/i1OFFcj47JT3NO0Mgtd4UMfkaLQYLEa6gzECC3n0rqZgR1Ls2eDyroPuKlSPsDq6F+bbmBXv5OTds5ci/H0vSNtr+0nQh6oQlymKgw/37hKAQhanBiOaCX0/hHSsTOqwcsVnALQ04rX7xtCnwhQdsz0vBtEMWMHgJWfTWf5PyuvL6BxJy0C60DhupppsRUPFkD2N3u7UOSnS2tEa+0P6BWnzSEyPWT3s6tMmWF/CYNwC+empJZ6Ci4XeTqkd2TXPIUdmrl04vzxO6+dCEbgb2xptcdpi57jzy1GglgZNoVq6eLOQLRf4mb+R0f7r21KYgU/68ARRQGQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=monjalon.net 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=xB0uSRYwlakfJwwPAU1zYi0i2HewLOOMTlIZPce3s6A=; b=mBt+PrUW67h9TCjpTTcV49sS2bx144jrU99Hisiy9vtjqkDZ00ybBNi8qfLFeyV/5l3H65eJ35CqWexTTpTb639InYFlWyhgh5Zv9jiIyKI/i0SaClbnvKvKxSC+nkSX9GufKR14ZXi7zkO/oLjf1kYCkInTRa2+3qJ62TBvHJY2DWJIxWxrOa/pBHC6+usfG8nzorK/YLeudZ4Fw0UYvw8fMmkpDnBeuzlgDyezJS5iBQ51z3uuGATSLKjFrxAEfdIzVp5+HuCSOUJD+GHsBTBWFo3uMTw4A+2eHGL7T30gdD5zc1+PaZjKbfbtjsHRUiW8sMQmc/+q2/UMOuHquA== Received: from DM6PR06CA0062.namprd06.prod.outlook.com (2603:10b6:5:54::39) by DM4PR12MB5311.namprd12.prod.outlook.com (2603:10b6:5:39f::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.17; Thu, 21 Oct 2021 05:09:53 +0000 Received: from DM6NAM11FT011.eop-nam11.prod.protection.outlook.com (2603:10b6:5:54:cafe::2e) by DM6PR06CA0062.outlook.office365.com (2603:10b6:5:54::39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16 via Frontend Transport; Thu, 21 Oct 2021 05:09:53 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; monjalon.net; dkim=none (message not signed) header.d=none;monjalon.net; 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 DM6NAM11FT011.mail.protection.outlook.com (10.13.172.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4628.16 via Frontend Transport; Thu, 21 Oct 2021 05:09:52 +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; Thu, 21 Oct 2021 05:09:46 +0000 From: Xueming Li To: , Zhang Yuying , Li Xiaoyun CC: , Jerin Jacob , Ferruh Yigit , Andrew Rybchenko , Viacheslav Ovsiienko , Thomas Monjalon , Lior Margalit , "Ananyev Konstantin" , Ajit Khaparde Date: Thu, 21 Oct 2021 13:08:30 +0800 Message-ID: <20211021050832.2599691-6-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211021050832.2599691-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20211021050832.2599691-1-xuemingl@nvidia.com> MIME-Version: 1.0 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: 9ed057ba-4dcd-4186-25ac-08d9945103d9 X-MS-TrafficTypeDiagnostic: DM4PR12MB5311: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Exchange-Transport-Forked: True X-MS-Oob-TLC-OOBClassifiers: OLM:243; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yeK33h2ciGb0BE28jALhlGq4acZtGVr2AVdDhG55cMVplPS99p4BF62QM6tsKepzVJ8tb4E87zD1wkJNDG7Rqlg9YmdWVRuYdTAmdrNoWzkELDpay/KD+aNuWObLhFjffbnShiJFwmIAQYITxL3aeaj0RNIK/weNqhIGdnLQUfxB6R0VT4c4tlch9QUW8xMwXbqFZ5CiPLgNdDTuWcylzg6jJQDlqhM12UzE2tFGCqbCZMvLA63qCAo7qY/ZJZvwHqPy9BQNz0Fd3XJrKTjGvW21NhGPNKmGUF7cdN2WX2PTYU+UVQuPqbB1SQEHTrYRyM73bZ1GMOne2Q35fhLUB2vQIKPQjfl3a2BmGiymzbvX2LHHRbY20j0YUswPBIJS3w8qiVGsoS2jo8mdghYpDennb1vGB1JA4v2TQWL2XB9eTv3SRxFYWYd+mkzetb0ftjXnIsnURiZMzvVo+3NaOwdIxp5FQHafVBfZU3bJGijozqvI3L2tytv39bJdDbs3J8MWKcnmWJyCTtrmY/jCxGOQn5Ad2cIKVw9CgMa1kVnNsp6rJq2HoCY5ipWAiPUz6sFLsIUT1hot4srAZETNGHFuKzfc+p5/NeBZ5JiQ2u5ZM6hk6amk1Fl/bEhpWF8wHJShRUcNtz8xM+hQnPRezzh4INapqwZOctBU7PnyKUuwCMPBKJNmbTLqpesuBQQ7GBwfm8fPqcjowSp+GkskUQ== 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)(7696005)(4744005)(336012)(82310400003)(426003)(36756003)(8936002)(2906002)(508600001)(5660300002)(110136005)(4326008)(1076003)(70586007)(70206006)(54906003)(6286002)(26005)(6666004)(55016002)(86362001)(7636003)(8676002)(356005)(36860700001)(2616005)(186003)(316002)(16526019)(47076005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2021 05:09:52.2123 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 9ed057ba-4dcd-4186-25ac-08d9945103d9 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: DM6NAM11FT011.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM4PR12MB5311 Subject: [dpdk-dev] [PATCH v12 5/7] app/testpmd: dump port info for shared Rx queue X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" In case of shared Rx queue, polling any member port returns mbufs for all members. This patch dumps mbuf->port for each packet. Signed-off-by: Xueming Li Acked-by: Xiaoyun Li --- app/test-pmd/util.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c index 26dc0c86406..f712f687287 100644 --- a/app/test-pmd/util.c +++ b/app/test-pmd/util.c @@ -101,6 +101,9 @@ dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[], struct rte_port *port = &ports[port_id]; mb = pkts[i]; + if (rxq_share > 0) + MKDUMPSTR(print_buf, buf_size, cur_len, "port %u, ", + mb->port); eth_hdr = rte_pktmbuf_read(mb, 0, sizeof(_eth_hdr), &_eth_hdr); eth_type = RTE_BE_TO_CPU_16(eth_hdr->ether_type); packet_type = mb->packet_type; From patchwork Thu Oct 21 05:08:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 102516 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id E96E6A0C4B; Thu, 21 Oct 2021 07:10:04 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DA2CC4117A; Thu, 21 Oct 2021 07:10:04 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2047.outbound.protection.outlook.com [40.107.243.47]) by mails.dpdk.org (Postfix) with ESMTP id 35F9E40142 for ; Thu, 21 Oct 2021 07:10:01 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RjwdUneiuy9HcQ6suVZxC5WC5Rrd0Kov4PuXi/rzAcBvB4pCnN4REqYW/9ldmDwMTsOU5/Xkt2UkE6Bvu6G5aeicO7Lf2qy9Un2vkV+CyFywXJgynfWtwJJlbmi53HyIYJf64JwP51ys/udUbZUUzHT4aRa1owV1V1dcZdqJJmDGUKlcSwNocgXj5psswKdmLGiQ15FRh4vUiWjbNoaTB8EJoLnmx0KPzXqxvdXOqX4HJ4hjXWlpbLzrUd+0oHgeEyb5bVFRddH/bTgnYE7WnMe24ETi9hv0R0pfGiYYi9eb3uHztPyqjwiuAfK5WcG8ZASjMSvHfD5L9NO9Hqm6tA== 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=4eApp9jaYOhKJlaFO/v128K1bo79+7a37eRQAFGAIdI=; b=Bf4Txa/1dh8JxvmzQfGedwktp+98m9k8x3nC1IfqrOAu/IY2R/MSPshot+Iw3hNqKshnUqvKDGbhl/osXNpYyjgqvCQlFO2uv8SyNcOkFAxcxE5vSEee0OcD+CpFBsHAazFa0f0Qr1v4s0qxFOXGDZUu418WEpbNUyZhQgEISx07hD6H5LZ6xXq1EqSVQSHBU+PNvr5rYRSRa1kBojmcZY6/HuV+LnRRk2TXzlh3edTc3ecCyp9cJq7j45ZbY1VtS+RvcNgGidZwbi7ZT268pikJXTDohUTet9G/O+Koe7MGtq0V9W1kq6cLUQtc9tgPvatSaQJGZLq7Rl9E/1cifQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=monjalon.net 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=4eApp9jaYOhKJlaFO/v128K1bo79+7a37eRQAFGAIdI=; b=r8X9yKi0Vlx9dxjIrAIe6AP3KRMaLDVRNW40NWXSsix1hZyKOAwFgvxBKecKlzhCjwZpzn6LgWVJbxPyl4kEz/EXUgij2ll7Go0pFzgG+dM5XdkmiNQTbPCa2e5LaMD5FYlAYJyr1bwO+ivCtJ0p/UcyTWl+0FH1E4R6rKiM/xYX/o85WoyyNroqbLIwGfhRH1GjwZeJ/oD3R/X227MWVktUHsLm/Qa2ITzLEhLg5GXyPfDLoQEq/6Xar1qcXDseaNT/ektnKKuPPeZsGDZ3MLhXusmwANG5XvW3rFDdteRq/GrJVvar+ifXfPPBrltCIRu7u+9Jw+un1dzgSNAV6Q== Received: from DM6PR06CA0072.namprd06.prod.outlook.com (2603:10b6:5:54::49) by BN8PR12MB3315.namprd12.prod.outlook.com (2603:10b6:408:41::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.18; Thu, 21 Oct 2021 05:09:58 +0000 Received: from DM6NAM11FT011.eop-nam11.prod.protection.outlook.com (2603:10b6:5:54:cafe::21) by DM6PR06CA0072.outlook.office365.com (2603:10b6:5:54::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Thu, 21 Oct 2021 05:09:58 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; monjalon.net; dkim=none (message not signed) header.d=none;monjalon.net; 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 DM6NAM11FT011.mail.protection.outlook.com (10.13.172.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4628.16 via Frontend Transport; Thu, 21 Oct 2021 05:09:55 +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; Thu, 21 Oct 2021 05:09:50 +0000 From: Xueming Li To: , Zhang Yuying , Li Xiaoyun CC: , Jerin Jacob , Ferruh Yigit , Andrew Rybchenko , Viacheslav Ovsiienko , Thomas Monjalon , Lior Margalit , "Ananyev Konstantin" , Ajit Khaparde Date: Thu, 21 Oct 2021 13:08:31 +0800 Message-ID: <20211021050832.2599691-7-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211021050832.2599691-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20211021050832.2599691-1-xuemingl@nvidia.com> MIME-Version: 1.0 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: 0b426281-d04b-4f60-025e-08d9945105c8 X-MS-TrafficTypeDiagnostic: BN8PR12MB3315: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Exchange-Transport-Forked: True X-MS-Oob-TLC-OOBClassifiers: OLM:2582; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PWasjtjc4KJRtdGkqYq3CHIRqelUs6qJw2QhVMc3O/IwstTzuWudTD4Zs2vRnyu5B/YicmKPW8kytd5TECt6Lw6K8jSdRUrsTOXbb3M3Km6g4jxiEMFKg3a2qpkPlXuBTK1db8bVU9DFdkSb0mN8+lNFKXGKKdIFy/YCAzTfHX3t9dpdBTCpmnjSJCQjEY9kmGkll6sLIasch1PDPVbfL3xkWYj/E3tePM8mXDUkqKqAgHHRAB0UKw1gRw/juJv9px31GXfUGZHtdCGWd1WWKhWgxakf8Fm9SyxNZmYFcJfMfvHcAD0qYTTbZ1zk2OQZ5GYgo+2Qbbdb7sH4+2zmwjlOBWDjwU/8C6H0Ze7djAqSaPpgMUbePhjtJ0aaIhNXz8GRxlZ+ZhNhUCXuvT9tpJOoF1Pc1wwkdFkDTQytPypGFK1UhKKIMAlnpyfkHlnIfPt7Bll9WHrgceIs/mI+EmfYK5vd2UHpft6RKDVOwwTHQ5sFh6ikgkw+NY6bi1vjJHdWRWIzzUjhtWdICphMmTlO7+Sb+zpGgtLO778G/fv7KlKDblC+DlWjaL5/Ckalw9jgHB5ZfS3nroGh0obh7cmui3FvRZgYSCx2wR+fDKhrPtrsFgY5D/mu1ItFQcM+eHWTzuSoIDn26zFidSmpHgYBDjZJzNE4P1O7b79TGa//uc7bOcxFJ0KubxfrM7vA0zXjwxmzkS1F329/MnV8FQ== 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)(36840700001)(46966006)(186003)(16526019)(316002)(7696005)(6286002)(2616005)(8676002)(26005)(2906002)(82310400003)(110136005)(336012)(47076005)(426003)(1076003)(508600001)(86362001)(70206006)(70586007)(54906003)(36756003)(4326008)(8936002)(55016002)(6666004)(7636003)(356005)(36860700001)(83380400001)(5660300002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2021 05:09:55.4084 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0b426281-d04b-4f60-025e-08d9945105c8 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: DM6NAM11FT011.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB3315 Subject: [dpdk-dev] [PATCH v12 6/7] app/testpmd: force shared Rx queue polled on same core X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Shared Rx queue must be polled on same core. This patch checks and stops forwarding if shared RxQ being scheduled on multiple cores. It's suggested to use same number of Rx queues and polling cores. Signed-off-by: Xueming Li Acked-by: Xiaoyun Li --- app/test-pmd/config.c | 105 +++++++++++++++++++++++++++++++++++++++++ app/test-pmd/testpmd.c | 5 +- app/test-pmd/testpmd.h | 2 + 3 files changed, 111 insertions(+), 1 deletion(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index e4bbf457916..cad78350dcc 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -3067,6 +3067,111 @@ port_rss_hash_key_update(portid_t port_id, char rss_type[], uint8_t *hash_key, } } +/* + * Check whether a shared rxq scheduled on other lcores. + */ +static bool +fwd_stream_on_other_lcores(uint16_t domain_id, lcoreid_t src_lc, + portid_t src_port, queueid_t src_rxq, + uint32_t share_group, queueid_t share_rxq) +{ + streamid_t sm_id; + streamid_t nb_fs_per_lcore; + lcoreid_t nb_fc; + lcoreid_t lc_id; + struct fwd_stream *fs; + struct rte_port *port; + struct rte_eth_dev_info *dev_info; + struct rte_eth_rxconf *rxq_conf; + + nb_fc = cur_fwd_config.nb_fwd_lcores; + /* Check remaining cores. */ + for (lc_id = src_lc + 1; lc_id < nb_fc; lc_id++) { + sm_id = fwd_lcores[lc_id]->stream_idx; + nb_fs_per_lcore = fwd_lcores[lc_id]->stream_nb; + for (; sm_id < fwd_lcores[lc_id]->stream_idx + nb_fs_per_lcore; + sm_id++) { + fs = fwd_streams[sm_id]; + port = &ports[fs->rx_port]; + dev_info = &port->dev_info; + rxq_conf = &port->rx_conf[fs->rx_queue]; + if ((dev_info->dev_capa & RTE_ETH_DEV_CAPA_RXQ_SHARE) + == 0 || rxq_conf->share_group == 0) + /* Not shared rxq. */ + continue; + if (domain_id != port->dev_info.switch_info.domain_id) + continue; + if (rxq_conf->share_group != share_group) + continue; + if (rxq_conf->share_qid != share_rxq) + continue; + printf("Shared Rx queue group %u queue %hu can't be scheduled on different cores:\n", + share_group, share_rxq); + printf(" lcore %hhu Port %hu queue %hu\n", + src_lc, src_port, src_rxq); + printf(" lcore %hhu Port %hu queue %hu\n", + lc_id, fs->rx_port, fs->rx_queue); + printf("Please use --nb-cores=%hu to limit number of forwarding cores\n", + nb_rxq); + return true; + } + } + return false; +} + +/* + * Check shared rxq configuration. + * + * Shared group must not being scheduled on different core. + */ +bool +pkt_fwd_shared_rxq_check(void) +{ + streamid_t sm_id; + streamid_t nb_fs_per_lcore; + lcoreid_t nb_fc; + lcoreid_t lc_id; + struct fwd_stream *fs; + uint16_t domain_id; + struct rte_port *port; + struct rte_eth_dev_info *dev_info; + struct rte_eth_rxconf *rxq_conf; + + if (rxq_share == 0) + return true; + nb_fc = cur_fwd_config.nb_fwd_lcores; + /* + * Check streams on each core, make sure the same switch domain + + * group + queue doesn't get scheduled on other cores. + */ + for (lc_id = 0; lc_id < nb_fc; lc_id++) { + sm_id = fwd_lcores[lc_id]->stream_idx; + nb_fs_per_lcore = fwd_lcores[lc_id]->stream_nb; + for (; sm_id < fwd_lcores[lc_id]->stream_idx + nb_fs_per_lcore; + sm_id++) { + fs = fwd_streams[sm_id]; + /* Update lcore info stream being scheduled. */ + fs->lcore = fwd_lcores[lc_id]; + port = &ports[fs->rx_port]; + dev_info = &port->dev_info; + rxq_conf = &port->rx_conf[fs->rx_queue]; + if ((dev_info->dev_capa & RTE_ETH_DEV_CAPA_RXQ_SHARE) + == 0 || rxq_conf->share_group == 0) + /* Not shared rxq. */ + continue; + /* Check shared rxq not scheduled on remaining cores. */ + domain_id = port->dev_info.switch_info.domain_id; + if (fwd_stream_on_other_lcores(domain_id, lc_id, + fs->rx_port, + fs->rx_queue, + rxq_conf->share_group, + rxq_conf->share_qid)) + return false; + } + } + return true; +} + /* * Setup forwarding configuration for each logical core. */ diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 80337bad382..d76d298a4b9 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -2309,6 +2309,10 @@ start_packet_forwarding(int with_tx_first) fwd_config_setup(); + pkt_fwd_config_display(&cur_fwd_config); + if (!pkt_fwd_shared_rxq_check()) + return; + port_fwd_begin = cur_fwd_config.fwd_eng->port_fwd_begin; if (port_fwd_begin != NULL) { for (i = 0; i < cur_fwd_config.nb_fwd_ports; i++) { @@ -2338,7 +2342,6 @@ start_packet_forwarding(int with_tx_first) if(!no_flush_rx) flush_fwd_rx_queues(); - pkt_fwd_config_display(&cur_fwd_config); rxtx_config_display(); fwd_stats_reset(); diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 63f9913deb6..9482dab3071 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -147,6 +147,7 @@ struct fwd_stream { uint64_t core_cycles; /**< used for RX and TX processing */ struct pkt_burst_stats rx_burst_stats; struct pkt_burst_stats tx_burst_stats; + struct fwd_lcore *lcore; /**< Lcore being scheduled. */ }; /** @@ -842,6 +843,7 @@ void port_summary_header_display(void); void rx_queue_infos_display(portid_t port_idi, uint16_t queue_id); void tx_queue_infos_display(portid_t port_idi, uint16_t queue_id); void fwd_lcores_config_display(void); +bool pkt_fwd_shared_rxq_check(void); void pkt_fwd_config_display(struct fwd_config *cfg); void rxtx_config_display(void); void fwd_config_setup(void); From patchwork Thu Oct 21 05:08:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 102517 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B182EA0C4B; Thu, 21 Oct 2021 07:10:11 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EAF7541184; Thu, 21 Oct 2021 07:10:05 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2063.outbound.protection.outlook.com [40.107.92.63]) by mails.dpdk.org (Postfix) with ESMTP id 0FDDE4117A for ; Thu, 21 Oct 2021 07:10:03 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=l0jvxbKc7bWjKp5lpWXpLRY8Ze20XnlYKaWe3jSlFS5JOUTwXkMPl4AqJ0zghZYorEZhWw6uw19QJOS493u1CnHfhbDMhS8jKovNgH12vqjvy03hJemgxuoprYi0HBYuqfnj8F33qHtZ642WlRF8ar5By+8PXpx5iELNP7DffVzQyr7Jza18vRheH8DnIjLgadmB2HJZQOtqblNJicOukUPKlvHVyJsGjRvt5bdFQm8e2VrzSe4NVVfiN+oC6MhwFnaJuUsCOVg+OtZbZXntVjiepzEpfG4fhHUemUFuHYp3kb4+AywNpfcZN99ZDCoqFcInbTxv/rln9LGjSCx1Bg== 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=eahzqfP2YPjjfwKoJsmSVuxbm0iuD6nwhw9/3M8qDNA=; b=WNuNeO2cmpL2J5Dny0TJoL8AGUAxln9rCoxfeAObU+WDQxCmk+KE+vnMuJ+3V++ZLw6eofTox83jF93fkH446tbhFUlcYIlijMZlf4lAOPjRQwlbcwAVK1BgRzVlSDTZvi5Z9kr6ldr5dwVWlLvEvBCeM8tNlr9HAA21BKQXOrPMz0Ayq4qBjwxZ553iOhTjFfebgYIMQUGvBgyCJJG964fchJxMXzSvbsAU3X5948LYZbs6Qbju1R2lSXv0kReVp39C3xV0m5cktuNrx74Fmw0V5NOoAE9DZxzIpgyl1v1vwYWDGclaiNN4Re8ZO9I19o+LuYq4YwZEqV4qyk+ZEQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=monjalon.net 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=eahzqfP2YPjjfwKoJsmSVuxbm0iuD6nwhw9/3M8qDNA=; b=HCc4rD9fztbQoEZjSNT7t/vBoZNKFrjrqCsbCqOz95yIFJlEAgsomRcihR8K2zivVTtR0bmmKJuQTxXp8zsAwGZ4VrK/vfQ2QpptqeSWsJVnmpNwHni42kXfQK4zd55uQtmYvA/Gv+5yhZx68RF+C4znrX2sebdgq58wrDtpVfceiqmc54jPrtaYdWhp0puybywGvRu+uw+nzdnTGBNtk2nu2UyvDmgYWg5eIt7zdRjC9g/IB8NXWOnOXv1qCIVo8FF3FDgC9pKVuanFZgG8EqaUAEjbXLvLFBVDJuvrZ6JqYLumsia8LVUcgkrYRkYxsE9Bg7y9yrIiRTFdnwPRJw== Received: from DM6PR06CA0037.namprd06.prod.outlook.com (2603:10b6:5:54::14) by BY5PR12MB3745.namprd12.prod.outlook.com (2603:10b6:a03:1ae::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.16; Thu, 21 Oct 2021 05:10:00 +0000 Received: from DM6NAM11FT011.eop-nam11.prod.protection.outlook.com (2603:10b6:5:54:cafe::39) by DM6PR06CA0037.outlook.office365.com (2603:10b6:5:54::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16 via Frontend Transport; Thu, 21 Oct 2021 05:10:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; monjalon.net; dkim=none (message not signed) header.d=none;monjalon.net; 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 DM6NAM11FT011.mail.protection.outlook.com (10.13.172.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4628.16 via Frontend Transport; Thu, 21 Oct 2021 05:09:59 +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; Thu, 21 Oct 2021 05:09:53 +0000 From: Xueming Li To: , Zhang Yuying , Li Xiaoyun CC: , Jerin Jacob , Ferruh Yigit , Andrew Rybchenko , Viacheslav Ovsiienko , Thomas Monjalon , Lior Margalit , "Ananyev Konstantin" , Ajit Khaparde Date: Thu, 21 Oct 2021 13:08:32 +0800 Message-ID: <20211021050832.2599691-8-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211021050832.2599691-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20211021050832.2599691-1-xuemingl@nvidia.com> MIME-Version: 1.0 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: 8f664eb9-3c49-4013-6438-08d994510807 X-MS-TrafficTypeDiagnostic: BY5PR12MB3745: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3173; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: ohukgriJSO1U+WcWLuzuib5fzu966/iqdZhjxibGN6QAqE7xuP9hJyoyQZgkPcSuNh3tZRYIMUI6+DTJZwOc0tGCgAQqDSA1oD9pnh0Z+USacnpwZXOVLF9CCQnP9/7FqGZ/L3bOInTHUL/760j4G/N7TbnyHTdI7Xqij8B2ENPqLmw1+ixVoLVquL6WU6MdVeCGjPsicqRwlTwDEAKoSw9P5RJB2gpTwWV7PeAwiHt/pqSKY7L+T4RLmXK4wit1CMy8KcOYxliHkP5jtuFvaQHNAapY7Ts3JW4hDVsGI2XjFOHdTapG7f7O5YPD6g0RmG5128HWfXjBW0bORQCLyPaVKWvpex7PfncBZ+rEpr0J3vFccU+2ugE18YNKBJWq7XZ3bXp82/lxvnjK1qJrcG2EyKgrgdIokPeL8wEaxdmTzGioaCa2ra+iqAjFJx7CFunYUrxhrfZVw7sfEo3CZ7tXK7MNxRUZrhTOv+2Q9Fe0V+7cuUK0m2f66xECGU0QSy725M2O+FSE5OLmps4R5sz8Goj/nQsV3irK9E4UpeDkoIrMbuvet540ODKDGLdsUioy1am2uj5ZAEnDg4qxhjX3eCEFkb86J3CGIO2hkwPpFwshaEfG9nwYfkJM7cFWQiRNgf4KaV3iS11DvZLonNzXD3vSlcvPne0Zaclt4tf4xz3Q+WWGjwKvNUZTIX2dcoHKuQdouCYFvZIGoEug+g== 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)(36840700001)(46966006)(70206006)(356005)(6666004)(8936002)(7636003)(508600001)(70586007)(55016002)(2616005)(8676002)(5660300002)(336012)(186003)(83380400001)(16526019)(6286002)(4326008)(47076005)(316002)(7696005)(26005)(426003)(110136005)(2906002)(36756003)(54906003)(1076003)(36860700001)(86362001)(82310400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2021 05:09:59.2033 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8f664eb9-3c49-4013-6438-08d994510807 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: DM6NAM11FT011.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB3745 Subject: [dpdk-dev] [PATCH v12 7/7] app/testpmd: add forwarding engine for shared Rx queue X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" To support shared Rx queue, this patch introduces dedicate forwarding engine. The engine groups received packets by mbuf->port into sub-group, updates stream statistics and simply frees packets. Signed-off-by: Xueming Li Acked-by: Xiaoyun Li Acked-by: Ajit Khaparde --- app/test-pmd/meson.build | 1 + app/test-pmd/shared_rxq_fwd.c | 113 ++++++++++++++++++++ app/test-pmd/testpmd.c | 1 + app/test-pmd/testpmd.h | 5 + doc/guides/testpmd_app_ug/run_app.rst | 5 +- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 5 +- 6 files changed, 128 insertions(+), 2 deletions(-) create mode 100644 app/test-pmd/shared_rxq_fwd.c diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build index 1ad54caef2c..b5a0f7b6209 100644 --- a/app/test-pmd/meson.build +++ b/app/test-pmd/meson.build @@ -22,6 +22,7 @@ sources = files( 'noisy_vnf.c', 'parameters.c', 'rxonly.c', + 'shared_rxq_fwd.c', 'testpmd.c', 'txonly.c', 'util.c', diff --git a/app/test-pmd/shared_rxq_fwd.c b/app/test-pmd/shared_rxq_fwd.c new file mode 100644 index 00000000000..c4684893674 --- /dev/null +++ b/app/test-pmd/shared_rxq_fwd.c @@ -0,0 +1,113 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2021 NVIDIA Corporation & Affiliates + */ + +#include "testpmd.h" + +/* + * Rx only sub-burst forwarding. + */ +static void +forward_rx_only(uint16_t nb_rx, struct rte_mbuf **pkts_burst) +{ + rte_pktmbuf_free_bulk(pkts_burst, nb_rx); +} + +/** + * Get packet source stream by source port and queue. + * All streams of same shared Rx queue locates on same core. + */ +static struct fwd_stream * +forward_stream_get(struct fwd_stream *fs, uint16_t port) +{ + streamid_t sm_id; + struct fwd_lcore *fc; + struct fwd_stream **fsm; + streamid_t nb_fs; + + fc = fs->lcore; + fsm = &fwd_streams[fc->stream_idx]; + nb_fs = fc->stream_nb; + for (sm_id = 0; sm_id < nb_fs; sm_id++) { + if (fsm[sm_id]->rx_port == port && + fsm[sm_id]->rx_queue == fs->rx_queue) + return fsm[sm_id]; + } + return NULL; +} + +/** + * Forward packet by source port and queue. + */ +static void +forward_sub_burst(struct fwd_stream *src_fs, uint16_t port, uint16_t nb_rx, + struct rte_mbuf **pkts) +{ + struct fwd_stream *fs = forward_stream_get(src_fs, port); + + if (fs != NULL) { + fs->rx_packets += nb_rx; + forward_rx_only(nb_rx, pkts); + } else { + /* Source stream not found, drop all packets. */ + src_fs->fwd_dropped += nb_rx; + while (nb_rx > 0) + rte_pktmbuf_free(pkts[--nb_rx]); + } +} + +/** + * Forward packets from shared Rx queue. + * + * Source port of packets are identified by mbuf->port. + */ +static void +forward_shared_rxq(struct fwd_stream *fs, uint16_t nb_rx, + struct rte_mbuf **pkts_burst) +{ + uint16_t i, nb_sub_burst, port, last_port; + + nb_sub_burst = 0; + last_port = pkts_burst[0]->port; + /* Locate sub-burst according to mbuf->port. */ + for (i = 0; i < nb_rx - 1; ++i) { + rte_prefetch0(pkts_burst[i + 1]); + port = pkts_burst[i]->port; + if (i > 0 && last_port != port) { + /* Forward packets with same source port. */ + forward_sub_burst(fs, last_port, nb_sub_burst, + &pkts_burst[i - nb_sub_burst]); + nb_sub_burst = 0; + last_port = port; + } + nb_sub_burst++; + } + /* Last sub-burst. */ + nb_sub_burst++; + forward_sub_burst(fs, last_port, nb_sub_burst, + &pkts_burst[nb_rx - nb_sub_burst]); +} + +static void +shared_rxq_fwd(struct fwd_stream *fs) +{ + struct rte_mbuf *pkts_burst[nb_pkt_per_burst]; + uint16_t nb_rx; + uint64_t start_tsc = 0; + + get_start_cycles(&start_tsc); + nb_rx = rte_eth_rx_burst(fs->rx_port, fs->rx_queue, pkts_burst, + nb_pkt_per_burst); + inc_rx_burst_stats(fs, nb_rx); + if (unlikely(nb_rx == 0)) + return; + forward_shared_rxq(fs, nb_rx, pkts_burst); + get_end_cycles(fs, start_tsc); +} + +struct fwd_engine shared_rxq_engine = { + .fwd_mode_name = "shared_rxq", + .port_fwd_begin = NULL, + .port_fwd_end = NULL, + .packet_fwd = shared_rxq_fwd, +}; diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index d76d298a4b9..6d5bbc82404 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -188,6 +188,7 @@ struct fwd_engine * fwd_engines[] = { #ifdef RTE_LIBRTE_IEEE1588 &ieee1588_fwd_engine, #endif + &shared_rxq_engine, NULL, }; diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 9482dab3071..ef7a6199313 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -12,6 +12,10 @@ #include #include #include +#include +#include +#include + #include #include #ifdef RTE_HAS_JANSSON @@ -339,6 +343,7 @@ extern struct fwd_engine five_tuple_swap_fwd_engine; #ifdef RTE_LIBRTE_IEEE1588 extern struct fwd_engine ieee1588_fwd_engine; #endif +extern struct fwd_engine shared_rxq_engine; extern struct fwd_engine * fwd_engines[]; /**< NULL terminated array. */ extern cmdline_parse_inst_t cmd_set_raw; diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst index faa3efb902c..74412bb82ca 100644 --- a/doc/guides/testpmd_app_ug/run_app.rst +++ b/doc/guides/testpmd_app_ug/run_app.rst @@ -258,6 +258,7 @@ The command line options are: tm noisy 5tswap + shared-rxq * ``--rss-ip`` @@ -399,7 +400,9 @@ The command line options are: Create queues in shared Rx queue mode if device supports. Shared Rx queues are grouped per X ports. X defaults to UINT32_MAX, - implies all ports join share group 1. + implies all ports join share group 1. A new forwarding engine + "shared-rxq" should be used for shared Rx queues. This engine does + Rx only and update stream statistics accordingly. * ``--eth-link-speed`` diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 6d127d9a7bc..78d23429c42 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -314,7 +314,7 @@ set fwd Set the packet forwarding mode:: testpmd> set fwd (io|mac|macswap|flowgen| \ - rxonly|txonly|csum|icmpecho|noisy|5tswap) (""|retry) + rxonly|txonly|csum|icmpecho|noisy|5tswap|shared-rxq) (""|retry) ``retry`` can be specified for forwarding engines except ``rx_only``. @@ -357,6 +357,9 @@ The available information categories are: L4 swaps the source port and destination port of transport layer (TCP and UDP). +* ``shared-rxq``: Receive only for shared Rx queue. + Resolve packet source port from mbuf and update stream statistics accordingly. + Example:: testpmd> set fwd rxonly