From patchwork Mon Oct 18 12:08:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 101982 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 16ECAA0C43; Mon, 18 Oct 2021 14:09:49 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 03D85410E5; Mon, 18 Oct 2021 14:09:49 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam08on2041.outbound.protection.outlook.com [40.107.102.41]) by mails.dpdk.org (Postfix) with ESMTP id 70A06410E4 for ; Mon, 18 Oct 2021 14:09:48 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R5kCHWDNapzVKOWJSsi9WpFFYex9geBKOYbLUBFmh2+opEWGDVVoxNZ5lFvs5tiuHrcG0MVQyFvk5GATl2aOY1glVAlQaOtkyD5xjEi5C9eBGhUY7POIvSrLG+be/VUMYAF/vFnQIP89PnGx4CmjxnxSQ7/1nembK1RD1RPilBK+5HTkUTuU1sNLa1o9hHeGEWfdjQH2O+fy7mzB5rwT1eGXu72BYApbFiM4HU0mXscqvcvLMeLBE+hFf+Oz7bke+zZ+q+D6k6nYkhe80Shkn24C8I03L/Mj4H7cmDLPf6Ipnj1M9vAhUWZo29AygOMBg7SykZTYvocJFzr7qaRrZw== 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=8J/h7A4oVeRRNdvNWKYEkvawGsyrE9A5bzuL7NHQAwY=; b=R6YUy9PwRtxFaQDK45TIUaW049svhEBcgsBnDRZLKByEhfzu68Sm/rpChICdtL6ra635qMDAZ4paJ2J8620Ud7paAk8M/bibrUdQJWv0re7tLiXtnjqgF7RS8tGGndRDGE4k4lzDG54qluV3p/HHugQF8tgu+uj5rgB2c9zGF1i4qTCXZqQfeUc8gvQdI1MC+DO7RyTWFyw85w3y97TZYxl3R1F+NJj6pogTYwcRBHQ3Ewf61lHBAAucj6fZcDkifSwVskz8psJ+qyFIeUbUB8ctEd52cGEsS3aK8mj6D23zjLzYBt/F3GzGArGuJjeigwTI0uRM2tDHnmf62dsoFA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=oktetlabs.ru 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=8J/h7A4oVeRRNdvNWKYEkvawGsyrE9A5bzuL7NHQAwY=; b=h/dMeDwIg6/qnj69j00wxz9XINmBSftaJWhPAxOOnX4zBQMph7bhxoCrj3adCalhjXZ9VJ8o2uUZzScjB6kNWR4bQLNNlGZN6DUdIHYKZlBuR6CqPslW8rKlVaqUuqHmkGfJJQWrU9I8AQAP/A02/+QEREuPO1jj5umTL2iK/tp2YyoFQCVyRxpPl3Pg6FEkA6gcStipbVYSxZi8EHrHbG93p+ySXFxtZPKzdyph2wZBHRVfvrRUX2EKkMIbLYIQIlfyvP7hy2MTPZ5G9mhkTolmal00MV0OaHUmuhqL4Itizvfab1EwxAsga4DXpmb3bJZvRpAEZtseFpwxsRcvSQ== Received: from CO2PR04CA0144.namprd04.prod.outlook.com (2603:10b6:104::22) by BN9PR12MB5146.namprd12.prod.outlook.com (2603:10b6:408:137::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.17; Mon, 18 Oct 2021 12:09:45 +0000 Received: from CO1NAM11FT040.eop-nam11.prod.protection.outlook.com (2603:10b6:104:0:cafe::d9) by CO2PR04CA0144.outlook.office365.com (2603:10b6:104::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 12:09:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; oktetlabs.ru; dkim=none (message not signed) header.d=none;oktetlabs.ru; 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 CO1NAM11FT040.mail.protection.outlook.com (10.13.174.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 12:09:41 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Mon, 18 Oct 2021 12:09:03 +0000 From: Xueming Li To: CC: , Jerin Jacob , Ferruh Yigit , Andrew Rybchenko , Viacheslav Ovsiienko , Thomas Monjalon , Lior Margalit , "Ananyev Konstantin" Date: Mon, 18 Oct 2021 20:08:37 +0800 Message-ID: <20211018120842.2058637-2-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211018120842.2058637-1-xuemingl@nvidia.com> References: <20211018120842.2058637-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 54712cbe-ec59-4314-ee36-08d992302abd X-MS-TrafficTypeDiagnostic: BN9PR12MB5146: 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: zCFkPTAy53gIvv9ZCGp9b5TR4rwm4E0sfPx1an//H2tyTqGfPG8cru+hHG0JvfJbCDz+32SWGDc6PZn3yc4mTZLFnRJJZOHL9xcaLA820lyAHcdqZBGaA6mRoZWFSHcQnV/8iMVsjd4m+owUl3bqLD/2oMBihxIZJSSa13aZ1YdjpvXfoZifQ18lXST0AQyAErsttPiRoAsinZo5QGqfCLEQLd4n2el8fjDNoeCMTYUiTVZeoBKkrjcKvjdR87FtpxZbvNOmMEai6yr9TDE16iven47nyUuBuUbXiMx+DtTe1hXaPLUJvj+UCFDRxJFMZFuONouz3EtFITrwX5k7eohLjyoJ968T01+j9GNrJR/hy9DWR9K2v84uCTf7mTtc8atjzlu/w32VJfLD7t+ZXjrLg7l9rItEwvNrzXYYN0iE1IMDtVBDNAMnI4MDV8aRjRZkbNeQXEZZwYyPHyWQ80nXgTq5dTCwRh8tgOKNwgP1G3VmvdEDsVkVHjamLTJ/B86VpbQYMj2Q8Ql1eXDtqfDW+B3Krv10sqj801v5vHRn6vj6qtHhHCgKgVlAatTIltyw3vue535YbRlyLeYKJUi9TwRPtIaJBaZWF/rf8Iz4jM0zyUE5+V6/oqUDvj5PgNXAe6lCrOhjb+PHTGXwoHIInP2Yxzp7cbOSn3HE1u2m9H3813TBz+m/suaOPmdwssi+syy7M/TxcrUHlI63aNEMO/f8gNWPRN66rRaSJ+yKgzjy/XhjZzUfhpsyAvwdEGRwbDYd/RinQuiQQPkEIolDCo7Z+doZ3LNfRQ21lrc= 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)(86362001)(6916009)(4326008)(55016002)(47076005)(26005)(5660300002)(508600001)(7696005)(1076003)(6666004)(186003)(316002)(2616005)(36756003)(426003)(2906002)(6286002)(7636003)(8936002)(36860700001)(8676002)(356005)(16526019)(54906003)(83380400001)(70586007)(82310400003)(70206006)(336012); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 12:09:41.7481 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 54712cbe-ec59-4314-ee36-08d992302abd 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: CO1NAM11FT040.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5146 Subject: [dpdk-dev] [PATCH v8 1/6] 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 introduce 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. Device 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 to each other. Signed-off-by: Xueming Li --- 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 e346018e4b8..89f9accbca1 100644 --- a/doc/guides/nics/features.rst +++ b/doc/guides/nics/features.rst @@ -615,6 +615,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 d473b94091a..93f5d1b46f4 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..fe89a7f5c33 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 + identifiy 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 d5435a64aa1..2143e38ff11 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 new RSS offload types for IPv4/L4 checksum in RSS flow.** Added macros ETH_RSS_IPV4_CHKSUM and ETH_RSS_L4_CHKSUM, now IPv4 and diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 028907bc4b9..bc55f899f72 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -2159,6 +2159,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 6d80514ba7a..465293fd66d 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -1044,6 +1044,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 is 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 Mon Oct 18 12:08:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 101983 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 5077BA0C43; Mon, 18 Oct 2021 14:09:57 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5A9F5410F7; Mon, 18 Oct 2021 14:09:52 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2085.outbound.protection.outlook.com [40.107.223.85]) by mails.dpdk.org (Postfix) with ESMTP id 2D5D8410E9 for ; Mon, 18 Oct 2021 14:09:49 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fyfvpx0ZncGSl92khQv4Ywz9vTpManLoM33n5UWxUeue0ziMnWVSWj4Ywt0Y/9vu42ulRVbemhDDrCIQOCP8vu5z2+aCuhvdsPELqyC4FYUFHPmBL8l9x1j3/kYScOcZvkpIWYQirUbl2B+My1r2abQ4gdtWC/gflNPw2KTT8zTCwA1dgkaAjqAu/9ag0CtFLMSqIE6dGFQj5gpWYdRF7KJ3S9e8lhqbLfbrLJLGJh6FJ/tquwksxfbmWleWGY8RYn6u6ia/zCZVNiisbtiMrZndBIpHIs67dDLbdZ1+bC4RNJ61RxCsm2Qh2DuXd9+3XzShVvqNeD0fKqyXmKYwRg== 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=crzR44mvUJ8rcXIIYyIUjgQ9E9KtMENR3Lrzhz7E6AU=; b=m3ZH/VrAwyhxrnshWSRASf+SL7yOcQhiWbsMyTvnm50dKiAlh35Y8BLFg7tltB4wxKDl0a6tCS9WPbTnx0OZqZjIGepRG4l2X9H9RMYJYRdXeTrvoBLUOGMwXMu5Dn7D+sG00Cjm8b+NecLjRjX9YmGAdiZ1lF1B1+4A3Gy14Mpx2fx0gNMiQU9Gfo6LBioZ8GhoWGmflBb8JYSD1tSBWtK+MC3LfKv4kp9MxAmWC5an1JZeGJgHbt64dubSpd+Sp4RCgAoyVrr72wQvt8ECEfWT0hQA+zzZer2qHUxZfg6C5sv4l3Kwg2LI3g+x2D4dIz+mOI9XQLR4kMi6EbJxoA== 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=crzR44mvUJ8rcXIIYyIUjgQ9E9KtMENR3Lrzhz7E6AU=; b=gEgplOp80ZPEg7r/EuwtG5vLA55YUqkJlaJ6m85Vgqw1bGVVJ4TH9GZflqezJVMMNu5nr6gIWzsfQl5bTmkkL9I+sgV88Gr68eakyAB20ahv5e74+64hPUgO37Xe8sMBsJkM+d+bHHMkNR5jgx1IJLM5GEobd8YeYQQ/LaUUioh9Izg1QsiYoF90uKW832GB2nqs9pzk09AoA4cp1TnC/Yr5pI7tJO8Y9RZFca00GFys6WavMNvrgiE/wi7UgIYKOPZuWpIXCXHUHNRzpRldLjtcuwrnHV1JDk+sgGmoLstJY+hBIAX315h07/l7o9Lcfjy5XUfm0kz6d/X+W9Hv9Q== Received: from CO2PR04CA0142.namprd04.prod.outlook.com (2603:10b6:104::20) by DM5PR12MB1371.namprd12.prod.outlook.com (2603:10b6:3:78::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.18; Mon, 18 Oct 2021 12:09:47 +0000 Received: from CO1NAM11FT040.eop-nam11.prod.protection.outlook.com (2603:10b6:104:0:cafe::6) by CO2PR04CA0142.outlook.office365.com (2603:10b6:104::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 12:09:47 +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 CO1NAM11FT040.mail.protection.outlook.com (10.13.174.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 12:09:46 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Mon, 18 Oct 2021 12:09:06 +0000 From: Xueming Li To: CC: , Jerin Jacob , Ferruh Yigit , Andrew Rybchenko , Viacheslav Ovsiienko , Thomas Monjalon , Lior Margalit , "Ananyev Konstantin" , Xiaoyun Li Date: Mon, 18 Oct 2021 20:08:38 +0800 Message-ID: <20211018120842.2058637-3-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211018120842.2058637-1-xuemingl@nvidia.com> References: <20211018120842.2058637-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 80e7911c-8445-498a-6721-08d992302d52 X-MS-TrafficTypeDiagnostic: DM5PR12MB1371: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:115; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SBqSzhjz6Pyl9pm/rYEbGHXI05F0I8ZngCOAl/xUlnRY1K87HKEV/4ehg6UTYhg4YtADXkQMuXL/eu7z0y5+KqfkVyu6lGk8hR17aclRzT3rnkwnivfVlv9IFn7AYDSxqm3U/DuTlpTbnwmz95aHcjnwTh1G9DLzU0Pzf7dHKs9RL9Rm1xYeA1NApckNUB4gjKexisRXDEMUJR/eirKzNrtjOIu4YaLMJgSjwMEIkFcDIH9OQzbaRqsRhHE+E50t6Ed/vUBjpMNCa9ruZcgsIFHc6RLa+2+luN1RdSPI1BvpqDPqw2rLBWpfyU9IPh3qtLR1pg/jNnx6pJWjcK8me1hOY8uOeg+zFgOgni1mr+Yd8MsgV1eraTs555jCCShLl6JHzx14uSmHcxasN2hqGrJeooTU/+sQmAF5Sb/GxaR8JElGDZH9K9Puw8KABRvJbUEXMxLfaN3zWsXD8QuFe7h2Vs6miYtGD+kvnxQZ0mmA/vZKGJxtQk692lXmYPqv7gUohC5zkJRqbd+WpyNitVcv4b5pu5ex5z32wT8Lz1wlcaR7askmLVEGlkt4Tb9QnufGwp3ORKwrFacerq9Uzm9s/kZlQ4GLxJlMHBftMvvqAFkRVKOL8ermupRsEd3CG0+ayhoYga31f88w/V4rm1mPdE+EOhK2gpY8lN+QOD3+TeeFdpFXiW3C5A9VmoitTxsqaZwgaGQFF5IiFpEUcw== 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)(8936002)(4326008)(7636003)(8676002)(26005)(47076005)(86362001)(186003)(508600001)(82310400003)(356005)(70586007)(70206006)(6916009)(16526019)(55016002)(426003)(54906003)(336012)(36756003)(2906002)(6666004)(6286002)(316002)(36860700001)(1076003)(2616005)(7696005)(5660300002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 12:09:46.3730 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 80e7911c-8445-498a-6721-08d992302d52 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: CO1NAM11FT040.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1371 Subject: [dpdk-dev] [PATCH v8 2/6] 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 --- app/test-pmd/config.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 9c66329e96e..c0616dcd2fd 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -733,6 +733,7 @@ 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"\n", dev_info.dev_capa); /* 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) { @@ -743,6 +744,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 Mon Oct 18 12:08:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 101984 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 BB145A0C43; Mon, 18 Oct 2021 14:10:03 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B9A1E410FC; Mon, 18 Oct 2021 14:09:53 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2089.outbound.protection.outlook.com [40.107.94.89]) by mails.dpdk.org (Postfix) with ESMTP id 4C2CF410EB for ; Mon, 18 Oct 2021 14:09:51 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SUmZrrhPRokP8hD+NvQoreh8BLqG61hfxOC5yPqgXsHUuNZI8mNyvy1SwY/cH8Y39qBFY/7Rr7l5ruFYZZqmOyEV1BcUTtsN75vlNLMzMlXm9pVjYEf624kmwlrgB0j5rWxAhrIbhcoaZUWdfLl4IH7ZbTYXuPAOIc1YGQ7n1ejkiRrk7119osSflPd4sPKioaIWUYXen8+hut4oK57xWSByLqY2t4PmaXSuhXhMmkE9mpU5BXoqjsrUaHIZPppdJuNlUvyfHA4nKQk2QZya4cuA0M5awS26lubN1GuxJaAIjLNi0ARc2jYY7obqcWXgalkLNbssx63DPakVil78sQ== 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=/iiL1nMgiMkbYTUOHNuFoZGIN69qjAPB3VVVQQr/7qY=; b=i+hqqo+f8T6nH1z7QHiDoFuFIWtOQq06dImPkN714mIqrI6bYExMLSLm0kxdLtFaLqV8ItdSC0UKswc1rOx8HHpdWFqBMw4i+5nuwrw+ds0dbRKRpjifaJE7/H9Ir4V6aJ6GhnKj6mJk5kYahmyYPzEG7YF/kW7PuU3eo3yxxeBm5XbnNw8NFlLW1hbumBjJ4v9zwcSz913gjpHrSiNZvm/oculN7BNeJx2BHpbFdChDe3l8GwTrWRWlKXexMgnnhrYLLlwBdBJJg3/dnIFCq4juNQWwoR58RNXj3IsYwoZRM9e9ttVAnMtOxd7brk+64RLDDELjB3ojDu1iEn7GNQ== 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=/iiL1nMgiMkbYTUOHNuFoZGIN69qjAPB3VVVQQr/7qY=; b=jH9OIUxtkVnZFBpwEE6qVPvyOoLq8/2N9Pt2zNH3B0ZwpKAVNJxgThV/3aT+4oPAJUHOfpHsLpyKiznZqW7nzEeeNQt2nKU6ve0nankkDFEwPhbit0QFZO0WRbUAKwZ8p4hMFvj/Jb4yM81xic1/LpRPD9inPgR02aBVqfn4uYESCSTpkMd1StUgmfFQhpHSj+MGJrqpNlGxDta0jl0Hnv8kYBw84uL7JZRhRQyeWjt47FW6pCI7YQ0ZLTUM2l7RCsBpelWgaMmoJxskcqOS5EruIW25BjmVObIokEF4r2UZsWRBrMYoKG/OUYT47wFSWSB8Ow1ayKt3X8GBpDejvw== Received: from CO2PR04CA0135.namprd04.prod.outlook.com (2603:10b6:104::13) by DM6PR12MB4843.namprd12.prod.outlook.com (2603:10b6:5:1d1::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.17; Mon, 18 Oct 2021 12:09:49 +0000 Received: from CO1NAM11FT040.eop-nam11.prod.protection.outlook.com (2603:10b6:104:0:cafe::a2) by CO2PR04CA0135.outlook.office365.com (2603:10b6:104::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 12:09:49 +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 CO1NAM11FT040.mail.protection.outlook.com (10.13.174.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 12:09:48 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Mon, 18 Oct 2021 12:09:09 +0000 From: Xueming Li To: CC: , Jerin Jacob , Ferruh Yigit , Andrew Rybchenko , Viacheslav Ovsiienko , Thomas Monjalon , Lior Margalit , "Ananyev Konstantin" , Xiaoyun Li Date: Mon, 18 Oct 2021 20:08:39 +0800 Message-ID: <20211018120842.2058637-4-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211018120842.2058637-1-xuemingl@nvidia.com> References: <20211018120842.2058637-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f0864290-574e-4cb5-aac8-08d992302e9d X-MS-TrafficTypeDiagnostic: DM6PR12MB4843: 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: bNAuC3+FIjANadL/ZYS1Me/9LrjqEA45aN+39sMtV2XkH503Gk6oEEqSZevsRaZHvDPHTJDmQo2NeNZVxVjKFmQ2MzE2jzV22VQUVuihBcLYNcuzSrz81JWx289Fa27bOqNaEKYtErKfTOsHa+XNrbr33Gi2V+Q26PZBB0SDIlBMrwUAEHclqpxgitjJvEAiZRcTtE4EY1vx9/l3JzPlHagyAkcWMnSJnnjzAHvgM2ZBwqbF4nJ7kMP0Xj/01dSXYKkDohFGHEtxw5WhkPvASKTebSklnnvqawywD0AhFyC+QXJs4dFhWtMDAAALxP+SG3L/79BRCThVtof9BARS8NlMvVG8XDzPa2eF5jnpl3R/fVv8Gv6EGak5dblnJsD8kntKWqV89b+wstSG6Zz8x+eKOSIKOYQwqWfq5odPPEUMeaisLrMZAa00wVymQqXVKfGq7Dk9uL2DDCgljnLHr/mcu8ZTQ2UcdkUw/tOoZ1TTRPTrnFN5qpz00MR/gsuNLoQcGaMj4dAQwNlTrmZG09GZnzppFrc2XUPk9ubZMq4exJZuTCUbM7+FKSM2opn5xQMa2KNw0kr/pNYuwNLvrIRcGGpxcyoPto9/WeaQ7iA1lm48/lg616upAVsKDMOyrCnnCpkEdJEm24hVGpidQt9ddhUrUSrpM6NKPvgwY2+B3mOn0gD8F9doW0c/w5meH7sbhA65aHdxPvt3hc1jsQ== 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)(26005)(83380400001)(82310400003)(356005)(7696005)(186003)(2616005)(6286002)(70586007)(6916009)(70206006)(1076003)(36756003)(86362001)(8936002)(6666004)(4326008)(508600001)(47076005)(55016002)(8676002)(316002)(5660300002)(54906003)(36860700001)(336012)(2906002)(426003)(7636003)(16526019); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 12:09:48.2476 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f0864290-574e-4cb5-aac8-08d992302e9d 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: CO1NAM11FT040.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB4843 Subject: [dpdk-dev] [PATCH v8 3/6] 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, share if device supports, otherwise fallback to standard RxQ. Share group number grows per X ports. X defaults to MAX, implies all ports join share group 1. Queue ID is mapped equally with shared Rx queue ID. Forwarding engine "shared-rxq" should be used which Rx only and update stream statistics correctly. Signed-off-by: Xueming Li --- 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 | 7 +++++++ 5 files changed, 45 insertions(+), 4 deletions(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index c0616dcd2fd..f8fb8961cae 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -2713,7 +2713,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 3f94a82e321..30dae326310 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -167,6 +167,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: number of ports per shared rxq groups, defaults to 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"); @@ -607,6 +608,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 }, @@ -1271,6 +1273,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 97ae52e17ec..123142ed110 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -498,6 +498,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]; @@ -3393,14 +3398,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; @@ -3558,7 +3572,7 @@ init_port_config(void) port->dev_conf.rxmode.mq_mode = ETH_MQ_RX_NONE; } - rxtx_port_config(port); + rxtx_port_config(pid); ret = eth_macaddr_get_print_err(pid, &port->eth_addr); if (ret != 0) @@ -3772,7 +3786,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 5863b2f43f3..3dfaaad94c0 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -477,6 +477,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 640eadeff73..ff5908dcd50 100644 --- a/doc/guides/testpmd_app_ug/run_app.rst +++ b/doc/guides/testpmd_app_ug/run_app.rst @@ -389,6 +389,13 @@ The command line options are: Generate multiple flows in txonly mode. +* ``--rxq-share=[X]`` + + Create queues in shared Rx queue mode if device supports. + Group number grows per X ports. X defaults to MAX, implies all ports + join share group 1. Forwarding engine "shared-rxq" should be used + which Rx only and update stream statistics correctly. + * ``--eth-link-speed`` Set a forced link speed to the ethernet port:: From patchwork Mon Oct 18 12:08:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 101985 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 3D4BBA0C43; Mon, 18 Oct 2021 14:10:10 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BF0CD41102; Mon, 18 Oct 2021 14:09:54 +0200 (CEST) Received: from NAM02-BN1-obe.outbound.protection.outlook.com (mail-bn1nam07on2060.outbound.protection.outlook.com [40.107.212.60]) by mails.dpdk.org (Postfix) with ESMTP id 54577410F4 for ; Mon, 18 Oct 2021 14:09:52 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RlBGEe95M31QY0iSP/QaykNdlT38xEWxxNoIBabvaFfE+13lj4TXTcUkEOXW0cTdjkFnBvhF04BwQVQ0p7PwAnQd5HDmcyJ3LvSbTlIIf8DpGgtcqBAHGnqCCSZwcf6lnj/dmP5d9IimSyhJVXTuH7R5fBUiwBF8aRMIlURtCEoURMpZnXSSIZdapDUzSTQbWfqCWTmIT5dM6+MB68IuedcLv9lHox4OqamqIV7g0QmXAE6yTeZrjk++UR5E5i5vl3cVQEcfQGv9sZMJ2IfRADOZmPQ0/P7i9etQfMK5JEiwW7kdVl8E7UxbByevdXGUCqqSXM1UTektJaISOB9BNQ== 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=WMmdQKxUkb1lg/PnhuxMHrL9QxXzkfBXCCV5SII83A4=; b=oM4xXrg5OCNTI1qkFc6Lvt9rLt+rAY0e5fK3LHLXtYNM6HTVRYICxel9qQFZDMJ12JpqzJJ4yLhqS7+yPbbmpElvtat3k0AyO9WTDmG9dNkeIWGLHK7xtK0eM7Lmv8Hq3CGNhmSxP00AzFQKz8f45CJf3RNOieSexApNqYQjlcfOJed0zl7uhVQAy+u8sZNflx3xCwKOlKxXnc59/1i7seNo9Krua4HVk/aIc0wRDUCWdR8F3h9e+gcWj7DtHV8BUwoNtsWPMKTVab850I96c+Z5NPfQiJRkymMCIO4n0P5U+pZ6tusmDDIjhm8JtixUQbj0ISHxXTjJjzkmxdUeDQ== 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=WMmdQKxUkb1lg/PnhuxMHrL9QxXzkfBXCCV5SII83A4=; b=ut3k/5swjOln7qgimYycofejHidesvFNZNpLLCkKYWBjHY0nPzNINKWiRjxvywSE18WKScKkj9rQu5e1liKqr8GyBIEOf3REUByCMZtPQvp2zIYQsagHvi8qNiJvw0u9bcDpldghIxZszUAowvQvSgHKxFWZ8vopqWYbx62uuaF1m2ueluTK0Qyy9FvzYzKXif/dqFhnqzkGRmpCrPwooKWjKED3o+EB5tOnC2L87JgJDbO5PyHerRinowvpUV7hP4qt90ps0Xgzwl5Jw1m6wZhTHCFIyRwyBpn2ikh5ULo/9r0YFDv3jk+OmTKtgp+4Lduk3lXDFxYHu7ZgXrX4AQ== Received: from CO2PR04CA0125.namprd04.prod.outlook.com (2603:10b6:104:7::27) by MW3PR12MB4457.namprd12.prod.outlook.com (2603:10b6:303:2e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Mon, 18 Oct 2021 12:09:50 +0000 Received: from CO1NAM11FT040.eop-nam11.prod.protection.outlook.com (2603:10b6:104:7:cafe::24) by CO2PR04CA0125.outlook.office365.com (2603:10b6:104:7::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 12:09:50 +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 CO1NAM11FT040.mail.protection.outlook.com (10.13.174.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 12:09:49 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Mon, 18 Oct 2021 12:09:12 +0000 From: Xueming Li To: CC: , Jerin Jacob , Ferruh Yigit , Andrew Rybchenko , Viacheslav Ovsiienko , Thomas Monjalon , Lior Margalit , "Ananyev Konstantin" , Xiaoyun Li Date: Mon, 18 Oct 2021 20:08:40 +0800 Message-ID: <20211018120842.2058637-5-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211018120842.2058637-1-xuemingl@nvidia.com> References: <20211018120842.2058637-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7ae0625d-3aeb-480a-bd14-08d992302fa0 X-MS-TrafficTypeDiagnostic: MW3PR12MB4457: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: 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: l/aayH/vOsrYPSX3XahJRFv5nGbUseKZT54OO7qH/FD6DdpAqZfY3VRx8L26ECLK2ydibdpE06ZSuAzmVt1JiGT6zDPPE9ukf2lMXoERtBsMPJlC1ls7LcJSnVmlLmgGelkRRZNB3mhH7nzl7fG4+9dnWEmTr+7fggapk+dhKl6lix21riauGm2gcwy4MeKBrHb82J3LqwjCVFB2QGg/dypMHCBmJtmb0wEWQh3hqpB80E9+fE3ct13/286ainqnRzGvXSgZfRYG8W4pIZLA9rDXvw8A5CWPeq2bEkOvgmz2K6xXpAQBIPjwUMF+LOy94h+E00DEdmH0e5VyYe9Dh9jd7ezBHyLXk31fx9m7Z9PIiTv+sB0XG6oNsv9Is9zaOlQ18su4LErZbMVlQPQ1A6MVTZM1+Qi5xV8DOTCexJ7wRpd2bmmWjHwdG/+oUkLq1tnrrK1Kai/m5h4v316GS0zmjijvB9dGYrS4Rtjwp2MYE7WF68As1yx037Yt3lgYRY9R+kVYg6/3W+EjUm6LJDY6DMC7aQ2yAQMDV8vmchtmA4N5aYYZ1VKfOk/gUPrq8B5R559j6IllLmh9TInwIzFmJjMZ9MuN+sJRTaTMnGQDSpqFeM4w/e04D/gvQd1kMEb4xRF2jePe+up91pIWmL4dwSRVQhO2iuRUT3ByInwLXXbn8B4nw16V88ToDcfTZ3vbnvGErTWINOSz+Bs8vQ== 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)(356005)(6666004)(7636003)(426003)(508600001)(316002)(2906002)(336012)(54906003)(16526019)(47076005)(55016002)(2616005)(1076003)(26005)(186003)(8936002)(86362001)(36860700001)(8676002)(83380400001)(82310400003)(4326008)(5660300002)(6286002)(70586007)(4744005)(6916009)(70206006)(7696005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 12:09:49.8805 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7ae0625d-3aeb-480a-bd14-08d992302fa0 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: CO1NAM11FT040.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4457 Subject: [dpdk-dev] [PATCH v8 4/6] 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 --- 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 51506e49404..e98f136d5ed 100644 --- a/app/test-pmd/util.c +++ b/app/test-pmd/util.c @@ -100,6 +100,9 @@ dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[], struct rte_flow_restore_info info = { 0, }; 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 Mon Oct 18 12:08:41 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 101986 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 E8555A0C43; Mon, 18 Oct 2021 14:10:21 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D8B9F410E1; Mon, 18 Oct 2021 14:10:21 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2077.outbound.protection.outlook.com [40.107.92.77]) by mails.dpdk.org (Postfix) with ESMTP id 8167140142 for ; Mon, 18 Oct 2021 14:10:21 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NHUPViTeM8wypzp1o0bnjjaXKAjkSj2DVx70vylvsuNG8ygmoR6cgJJ/xNVy8+5G7nbRtOoeUDclFee7EQL+9Ged55lqb7b9yLFX0BYZ92xt2qCsuUd5IyWmCt+7avtROKdF9fRBlTQkcb9EWQXxPdDogam/pKNA1ohYo91BDWaYZVzRGmHHdXsxxFzMY74B5oGmepSjx0eGfVupmPtw3waVikS846h67nAZL8EwpI54T7/MJjW/SVruSwKRvV976B6atEzfhbUvTS1wUGPEgiQesKbGp31WhJ6Bkm7QLzbB1z5qdDgzk9yeKpV9PPuxIl9OvXEFB2pQKa8Ha+MfsA== 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=L6rWHKqE0+MsWJfxIv9xpN3cluU1PHlg7oMBgb/ihoY=; b=McLBpkNHASuPFidrp66XCY+dAOB/vzn9+SBjYjq+w+VEA38rbwi6JfidpoIiSNEEFI8V+8wzRkwnMGkvvI83HRte/UZSoo6yfm+wkE4RC1zmwXzH09hwTMtB6I2zTvzWPABiFMPOxNMrxTxFo7pemzfpksfmoZePIduNi4lSSn4+Q6WyhvgnffyFhKK40QYFTatzUBCLRIOYojyDfIfLTCbeFlDblkL+c8q4nAnopaXW+FNsen/udZjW3xm2gTeEIkkaFC7lBiBAZP2EU5AkbT0E9ELZxyOYfEhqjqwV32/vXgpbIAHX1cwLJ5ZDHP1tEPfrekGz2z0bahDxDhG1bQ== 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=L6rWHKqE0+MsWJfxIv9xpN3cluU1PHlg7oMBgb/ihoY=; b=mWoYWhBuAHd8ChEBr6Bz+9MO28WHTL0XaXHsuRqdGrEiDNFHMS/vlAIFCOqTlRJeqBT+Lr/qSi22a7E1pA1JyCiOMHuHsz3PK/D177GyRkMRxSB1923O/lXppPH4xMboXZPf4emdmV+EueW2dOunvg7++AMMFQF6EPWMpq7UcdI/ecwRYlZ0bZEutf4jE7sjtun+nKF8vhN7v39XJ3mCZfZqyw+XrGUgTHx+GCz3TzvHyw9TDEpOOWji58/+yKNm46OSQ9DSyuTKMdvTMxfzWtYoaE9DCGkMoPbXrMTRonEz3LoFNQ7CNNWq+cqtSnQshTdkeQE9uZjRMAvzTkDeUw== Received: from MWHPR13CA0015.namprd13.prod.outlook.com (2603:10b6:300:16::25) by MN2PR12MB4469.namprd12.prod.outlook.com (2603:10b6:208:268::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Mon, 18 Oct 2021 12:10:19 +0000 Received: from CO1NAM11FT055.eop-nam11.prod.protection.outlook.com (2603:10b6:300:16:cafe::51) by MWHPR13CA0015.outlook.office365.com (2603:10b6:300:16::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; Mon, 18 Oct 2021 12:10: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 CO1NAM11FT055.mail.protection.outlook.com (10.13.175.129) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 12:10:18 +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; Mon, 18 Oct 2021 12:09:38 +0000 From: Xueming Li To: CC: , Jerin Jacob , Ferruh Yigit , Andrew Rybchenko , Viacheslav Ovsiienko , Thomas Monjalon , Lior Margalit , "Ananyev Konstantin" , Xiaoyun Li Date: Mon, 18 Oct 2021 20:08:41 +0800 Message-ID: <20211018120842.2058637-6-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211018120842.2058637-1-xuemingl@nvidia.com> References: <20211018120842.2058637-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c6ef2869-21d0-43e9-fef7-08d992304038 X-MS-TrafficTypeDiagnostic: MN2PR12MB4469: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3631; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: +jfroB15c7vHi09P50K46AKaAZYCfAN8QHuctQjgr1HytcU4Zfk+ozQ/oosthbQdirATEyL2qJv3kV/Aoh6bn++wqqwWkxb7nr/ELoBENB40VGUCD5QupBme8B+3z5n2PKhUOzIJlYkYmb1onKtoubo/PH4R7QMxkcCX5MoxoTbYWMGaGoCyTHb0ZpfhMShf3S2XJ2tOEPfjCkpIERfhwanP2ZB0lWCPT+/6hBgyF+ccU9dXFrdA3K4E+qXNyLC5sONEJZM8YzkepZ+DClmkHPhbFr9+2OfH2HNFlM7u74esxXn4j75DL5C7GOO2j5bia79Hy9XsamVULQqS2dbTQ09mtOz+MLOc5hEsF8qwilMdEiAH3oYcFZAf0EncTT0gRPfcJT0vKqA4s7EYP0+NV17XKkdWfpYxxr2QYgCNlhcQq6HhZ/Egc8E6i9QTwQztLSPKEoiX8GFVENlK9gNmtlGe6nUJYsUvo5vB0laadeB1AmDTCK6ZJktK3NspACCUwB3QNmp4DqAJsQuxsuZNdJXAYWDn7opabywC5wvFZEoLWi7ddzhpzJumTXyPLm5N1vQGQe9/WL+vwwEI6M1qe4Vh0+nAprK2yOq7H0pIB5SgNWK8yZsd+20iGWtRI/XsTfJI3xdA4y1Kr3TunRmN12NHwsEhpu9n/FN700kpvOaNUOoFd4UfEVS4BvBTzV3zWSTwl/jODAzlHci2x5MJEA== 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)(5660300002)(36756003)(186003)(70586007)(1076003)(6916009)(8936002)(336012)(36860700001)(4326008)(16526019)(47076005)(2906002)(508600001)(8676002)(6286002)(426003)(6666004)(70206006)(54906003)(83380400001)(55016002)(316002)(82310400003)(36906005)(356005)(7696005)(7636003)(26005)(86362001)(2616005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 12:10:18.0220 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c6ef2869-21d0-43e9-fef7-08d992304038 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: CO1NAM11FT055.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4469 Subject: [dpdk-dev] [PATCH v8 5/6] 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 --- app/test-pmd/config.c | 103 +++++++++++++++++++++++++++++++++++++++++ app/test-pmd/testpmd.c | 4 +- app/test-pmd/testpmd.h | 2 + 3 files changed, 108 insertions(+), 1 deletion(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index f8fb8961cae..c4150d77589 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -2890,6 +2890,109 @@ 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) + /* 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; + + 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) + /* 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 123142ed110..f3f81ef561f 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -2236,10 +2236,12 @@ start_packet_forwarding(int with_tx_first) fwd_config_setup(); + pkt_fwd_config_display(&cur_fwd_config); + if (!pkt_fwd_shared_rxq_check()) + return; 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 3dfaaad94c0..f121a2da90c 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -144,6 +144,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. */ }; /** @@ -795,6 +796,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 Mon Oct 18 12:08:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 101987 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 C9FEDA0C43; Mon, 18 Oct 2021 14:10:29 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B5BE540683; Mon, 18 Oct 2021 14:10:29 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2083.outbound.protection.outlook.com [40.107.244.83]) by mails.dpdk.org (Postfix) with ESMTP id D18E940142 for ; Mon, 18 Oct 2021 14:10:27 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=drNK+ECxvv2d1Xj8d5BoxWsCjvBUhUsjk0D3jSFGtad2mwgq3uMe9i8TemS3jxKUrFm5FZ0fXgthpeheIv7GoEYgm+zSbVSOddpiPKsd0TXx+FnoT3uzje//byDhlNO58NzGJvYxmmNsN1L8v8lItC6Ju0o4Aoir6rWtDN65FXw+4FnmsvQ2XYxv4sxqJcTUkjRtFMerXUdAPHX1NNKYdw1lwR3sTyRSPwMOY9Z9qqSdr9F3sRmudedzm7RIuNauvNGG/xas03ov9+PKnA54J5K3epCmZIBp+mhll1l7WxxeJkT7uESFybfCqKH4cj68rqYouxYzRapL4lmd6agFAQ== 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=B7n2988QVsChIR4PsUZNKDrQZshm6A1uet2CXqopejI=; b=EmZUNKfW2denXGoEEJ3aiL5xJH6R1k4Y+vwM5p8TZ2BvQ+1seKv/xSNk2YaR3jUBqEPJa/bOwAmI/fRYjNLfKq4rlPWTXGHbAZIAF97rNL7mtwpeHvMXbEtuzSMvSVjg2iF3Z2Wsm7T4dwJ7sXD10sRFilr5sz7o66QN5Zim8kNRTVuBxxmHDidWj36Jp9Z/+RacDmecE7YpJwg6ra9d+EBZVxWzEZYF7NQbAqQYMBFq2iW82r9piUSsOmFcrjcXaaideV9EtZtodohfJqw4Yla1HXVNKFnvyFTBDfDCxAfivt9BS1QN9D6+8VfnEAgjS3uIRwDjBCnGJ+KQscMEqA== 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=B7n2988QVsChIR4PsUZNKDrQZshm6A1uet2CXqopejI=; b=WhmGTpW+fuYIgmwAnkzsyKhbvh42vJG0JbvcJP9yrMvm27cRuMojOEUvrh63k3X7QGOao+S2T8BQ73MM1ANrNZ98CojP8BBbvpNgWvFOuYa7Y0Q64yy8nNzvK9mU6LxWyp7kimtfMMlRI+61PKDuLwuKdLMicsTwM0cqcNHtNaCjfJWgLTEhOkMn8DLNWsN+L/JF/t9HqeD0D9GZlEV3/fKMsoMpPhMrj1Rsn96f0iDjy8jxFNNPCB10P0HEQ0MRheCJd3Sp/FGq+znP56YvEfj/h05m5Ne+Ag9c6l6T8BAW5E+YoOboe02gMKT9ErTJ+je81pK7zlR/6Ssm5nOsAQ== Received: from MWHPR13CA0003.namprd13.prod.outlook.com (2603:10b6:300:16::13) by MW3PR12MB4364.namprd12.prod.outlook.com (2603:10b6:303:5c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Mon, 18 Oct 2021 12:10:26 +0000 Received: from CO1NAM11FT055.eop-nam11.prod.protection.outlook.com (2603:10b6:300:16:cafe::a9) by MWHPR13CA0003.outlook.office365.com (2603:10b6:300:16::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.8 via Frontend Transport; Mon, 18 Oct 2021 12:10:26 +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 CO1NAM11FT055.mail.protection.outlook.com (10.13.175.129) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 12:10: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; Mon, 18 Oct 2021 12:09:41 +0000 From: Xueming Li To: CC: , Jerin Jacob , Ferruh Yigit , Andrew Rybchenko , Viacheslav Ovsiienko , Thomas Monjalon , Lior Margalit , "Ananyev Konstantin" , Xiaoyun Li Date: Mon, 18 Oct 2021 20:08:42 +0800 Message-ID: <20211018120842.2058637-7-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211018120842.2058637-1-xuemingl@nvidia.com> References: <20211018120842.2058637-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4429356c-8a79-446b-59a6-08d9923044c3 X-MS-TrafficTypeDiagnostic: MW3PR12MB4364: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2803; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MC/W/muTOaeeF2ZfnSlWgZqGRisFRaHdiYTmCZ4dynXHNpIlpvCIRI04scyggd8vjxLRCOg21+WLEATtDRHmDXsmaI/Ymyr3Giua0OndWkAb8CUHmuG0uKrtEcd0ZfO5IAfCFhuvrL+5yGY9heDe9v6RGsJucVCmk181F3ujNuNJr4M4KdViMFdKSz/+Ize4VsL3EkJrr3ddQ+R7INDhmp2aDebbFzwr/8ChidVuB4OEPjXHpEQU/rJHoO0yY02+p/5lJHKPEdVDxEJEg6+1yX6uqObgXkex9lBBLDnV2DzDHZPl/RON+CHpsuN6v7ax0sfw+xsSTfCw6GMu82Pr5ByCXro+ZmU8azqOB9MhQUbYAw5UW/M2Ve2RfMlMbA0FAPdL0+w35nTSdPcyz8ZsQuXavwK+x0Jd9VUw1UENiKxssHrOgjCg2Mg1MRVZ3Nftp2O1ilE8CAhZBVy0B/G6MRefGMBmjAeAqvWQWgA5d/m+DdED6VfTKwEfNOG02vg33zQ8kY5jF+DsMMlF0qMIJANw+/aDxQbXm5CkTe+yP5+T25icIt5kFzXkYbjeYvMugQ4CamiDZd6ZuTf1kc9CmWROxXnbmF+74UMMsELm1qmLS6tSoJ4VzQwnqrhtepV9YGvcCdkwnL8o3Pi8rRurlAoAhkQgxdSXqqsMW4xsH2m1vmIeyCwGjbubNxvAMsygYOvbibjz4Wl7C4kygimctQ== 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)(70206006)(70586007)(2616005)(1076003)(54906003)(16526019)(356005)(26005)(36860700001)(336012)(2906002)(316002)(5660300002)(8676002)(82310400003)(426003)(83380400001)(186003)(36906005)(6286002)(8936002)(4326008)(55016002)(36756003)(47076005)(7636003)(7696005)(6916009)(508600001)(86362001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 12:10:24.3493 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4429356c-8a79-446b-59a6-08d9923044c3 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: CO1NAM11FT055.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4364 Subject: [dpdk-dev] [PATCH v8 6/6] 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 --- app/test-pmd/meson.build | 1 + app/test-pmd/shared_rxq_fwd.c | 148 ++++++++++++++++++++ app/test-pmd/testpmd.c | 1 + app/test-pmd/testpmd.h | 1 + doc/guides/testpmd_app_ug/run_app.rst | 1 + doc/guides/testpmd_app_ug/testpmd_funcs.rst | 5 +- 6 files changed, 156 insertions(+), 1 deletion(-) 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 98f3289bdfa..07042e45b12 100644 --- a/app/test-pmd/meson.build +++ b/app/test-pmd/meson.build @@ -21,6 +21,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..4e262b99bc7 --- /dev/null +++ b/app/test-pmd/shared_rxq_fwd.c @@ -0,0 +1,148 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2021 NVIDIA Corporation & Affiliates + */ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#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 f3f81ef561f..11a85d92d9a 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 f121a2da90c..f1fd607e365 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -299,6 +299,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 ff5908dcd50..e4b97844ced 100644 --- a/doc/guides/testpmd_app_ug/run_app.rst +++ b/doc/guides/testpmd_app_ug/run_app.rst @@ -252,6 +252,7 @@ The command line options are: tm noisy 5tswap + shared-rxq * ``--rss-ip`` diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 8ead7a4a712..499874187f2 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