From patchwork Wed Aug 11 14:04:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 96802 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 14329A0C47; Wed, 11 Aug 2021 16:04:52 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9AAB740C35; Wed, 11 Aug 2021 16:04:51 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2051.outbound.protection.outlook.com [40.107.243.51]) by mails.dpdk.org (Postfix) with ESMTP id 9B15E40042 for ; Wed, 11 Aug 2021 16:04:49 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=aOdaq5vFgGW+5LP5MjLW9FtPqotd3zdYG50ELolpPgzlUfwlRNuYCnDWz8Z95o5BQQzImy+qa0U6jLGO2HslyAZ/Ct3m92Xg2wSNBjdbZNLBGiESXpqkSTHS447Zs+QsbAv6lNRzV45EgN8RaldTi+vLVe7IGIaIutxBfHLJxsVaAGzmHfvamGN3Q77ZMCE4ZvZ+7EnkmgDrbsCq1XwyetrCuSbYUivoJHkOXXqSh8FAJstYN028fjL+LRMQRmbfm6D5Y8A/h1wBLJDVE2JipdXpVzht0dtcXvklstA7Q3BT/9VQXWj13K2DflSPRLnizrffHYnPFVeJUdFyq8+6gg== 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-SenderADCheck; bh=PkQYlx+vtUnNZgrMujHY5rwqL4uPEeMrmSoHy5Ok0jk=; b=KuDx2ThZOsKMymgVJVTW7c53sjHY7kB0UzQ+O+EI2Bh4yXAYxj3//vM0bFsu5UZ9ZMCuN9r0PUMSDGft5PE6gH6SCJ0GzZK2wIy9TpJrMaijjj+jYG3JV35Wx2Klc1rWnSJcDmPLuutWhiLUdr2Z8zKhcqedgtbHT+TpdhcwjASrHNtRi3MnHACjm+gYYIjaGD3jjQ5mOvH3tQSU9JeZSVllrAt73+86eemN8tkh9JrNusF0UV2XgKyUZGr4N0QVBhoFd78zyYPodiDUHg+owIbeSAHyDQBTuEv1dwOmVbH29hUvR5oeOpa3CoOaGItuqZ7rx2wPl1/dhOqgKdxiIQ== 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=none 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=PkQYlx+vtUnNZgrMujHY5rwqL4uPEeMrmSoHy5Ok0jk=; b=LJd9QWAx2WTwF/LpXyViJ7LOEt9C66KV9/MVlfH7EvjphqO2v3s/IvBAbcYQGuoFHkuiRy9dfQgB/K9XtUK6t6iCGnizVHU9j3Rir8ABr3VuQZJgTHY48QIOu9dQbnHyfyeeX6j7lkQulpzLNsJ+zfY0U9jW3gvvK1M8SccESQJT3xr9kS/Ph3xD4Up72fx85TlbCpLfeI+QBsx3c4FT/b4UXuXTBMPxpjrDVmfEyBPEERCp+N/+DoB3Ir31hqMVOyr22U/0VWUBIG2lV6VNb/Asg/x4V8sKpNt3ADFBD0ZN+WCjGguMOZC2ddhtnBtWMBgxhDzHVPmrtAU/vs8khw== Received: from DM5PR07CA0139.namprd07.prod.outlook.com (2603:10b6:3:13e::29) by MN2PR12MB4048.namprd12.prod.outlook.com (2603:10b6:208:1d5::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.21; Wed, 11 Aug 2021 14:04:47 +0000 Received: from DM6NAM11FT015.eop-nam11.prod.protection.outlook.com (2603:10b6:3:13e:cafe::24) by DM5PR07CA0139.outlook.office365.com (2603:10b6:3:13e::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.13 via Frontend Transport; Wed, 11 Aug 2021 14:04: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 DM6NAM11FT015.mail.protection.outlook.com (10.13.172.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4415.16 via Frontend Transport; Wed, 11 Aug 2021 14:04:47 +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.2; Wed, 11 Aug 2021 14:04:45 +0000 From: Xueming Li To: CC: , , Jerin Jacob , Ferruh Yigit , "Thomas Monjalon" , Andrew Rybchenko Date: Wed, 11 Aug 2021 17:04:03 +0300 Message-ID: <20210811140418.393264-1-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210727034204.20649-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 23d88f49-da04-43a8-06e2-08d95cd0fa65 X-MS-TrafficTypeDiagnostic: MN2PR12MB4048: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:8882; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dp/AOPqgFFAs40/OrsJ+9WIpyaSihAIbt2+4y2plpb3ZsLkGsu9EBM0DMQBcdU0GCoRiiyc+J5NwjRCAK6fVkqEMvYKAf8QaR/nqhPBrpfWS7tvH7LKp7bmc6j85ulMfKYpTmvXVWFC9dolkxH9ylhXXz44soKWlfnx83VuR4fIOGwwTu4UMAx2fUXxp0PId5MuJ9/rWyWtWu3MVYof1uR+YZdJ7QUCLCNfyVGgBGkUM7ciLtcCnX90XEaU9JM5YWEYZLBgFGnlIaseHbIg7asYZ7iyaPvKKWciB3FVq2tz5vOgHVyINXgwe/osd5+IJ0L0KwE6QveJybNQVxdX7qFYHM+gLoH3E0nwASaOBLweeWul5NtggQTyvrHYrRX16EDVslh7AP8L+wADwaBA+wTfx3U7xBDKlwpUVu6bGtbYtAFCej7Fkk96hemSJDCXs4/3r8UVfH9k9LMPP+NiCQIAgfdGhlCyZVhlvkW8JOKw3kbJMRynPKKoINFrcqHyi7DdLNzvbncbdUisauxSgm0ImNTk/jh7D7MRHatussSdHDn3USUwYTbHS8+Ek+ZSp6VFwSt0NTXaC3zPRsacpZLNLv3boNF2ZqbTxVyRNgV475WcwBq/OiG1QAOv4yoPqlMxvy4xcAPDodl6n1XnB6gstykF2+YTetyjSkZMsnwyJCYt7VJx8MwC0YEl1dVFOqvRhRE2ji++NJ4JqapqS5ySFMhWyHZSByWfnITUp+EsVhv1uFr8FsYCSEx37oZelq7vwQpsOvzo/Cpm3YkGOvdvDDwu8mMAae9yIvj50gT29A9Y/G2Thj8YxEQPrfiFtzB95amfo6WoFgScsh8rBJg== 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)(136003)(396003)(39860400002)(346002)(376002)(36840700001)(46966006)(83380400001)(2906002)(336012)(36906005)(82310400003)(7696005)(36756003)(316002)(6286002)(47076005)(26005)(2616005)(966005)(1076003)(55016002)(5660300002)(478600001)(6666004)(7636003)(70206006)(8676002)(4326008)(426003)(82740400003)(356005)(186003)(16526019)(54906003)(70586007)(36860700001)(109986005)(86362001)(8936002)(266003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2021 14:04:47.1534 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 23d88f49-da04-43a8-06e2-08d95cd0fa65 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: DM6NAM11FT015.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4048 Subject: [dpdk-dev] [PATCH v2 01/15] 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 for incoming packets. When number of representors scale out in a switch domain, the memory consumption became significant. Most important, polling all ports leads to high cache miss, high latency and low throughput. This patch introduces shared RX queue. Ports with same configuration in a switch domain could share RX queue set by specifying sharing group. Polling any queue using same shared RX queue receives packets from all member ports. Source port is identified by mbuf->port. Port queue number in a shared group should be identical. Queue index is 1:1 mapped in shared group. Share RX queue must be polled on single thread or core. Multiple groups is supported by group ID. Signed-off-by: Xueming Li Cc: Jerin Jacob --- Rx queue object could be used as shared Rx queue object, it's important to clear all queue control callback api that using queue object: https://mails.dpdk.org/archives/dev/2021-July/215574.html --- doc/guides/nics/features.rst | 11 +++++++++++ doc/guides/nics/features/default.ini | 1 + doc/guides/prog_guide/switch_representation.rst | 10 ++++++++++ lib/ethdev/rte_ethdev.c | 1 + lib/ethdev/rte_ethdev.h | 7 +++++++ 5 files changed, 30 insertions(+) diff --git a/doc/guides/nics/features.rst b/doc/guides/nics/features.rst index a96e12d155..2e2a9b1554 100644 --- a/doc/guides/nics/features.rst +++ b/doc/guides/nics/features.rst @@ -624,6 +624,17 @@ 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 switch domain. + +* **[uses] rte_eth_rxconf,rte_eth_rxmode**: ``offloads:RTE_ETH_RX_OFFLOAD_SHARED_RXQ``. +* **[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 754184ddd4..ebeb4c1851 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 ff6aa91c80..45bf5a3a10 100644 --- a/doc/guides/prog_guide/switch_representation.rst +++ b/doc/guides/prog_guide/switch_representation.rst @@ -123,6 +123,16 @@ thought as a software "patch panel" front-end for applications. .. [1] `Ethernet switch device driver model (switchdev) `_ +- Memory usage of representors is huge when number of representor grows, + because PMD always allocate mbuf for each descriptor of Rx queue. + Polling the 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 in same switch domain. ``RTE_ETH_RX_OFFLOAD_SHARED_RXQ`` + is present in Rx offloading capability of device info. Setting the + offloading flag in device Rx mode or Rx queue configuration to enable + shared Rx queue. Polling any member port of shared Rx queue can return + packets of all ports in group, port ID is saved in ``mbuf.port``. + Basic SR-IOV ------------ diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 193f0d8295..058f5c88d9 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -127,6 +127,7 @@ static const struct { RTE_RX_OFFLOAD_BIT2STR(OUTER_UDP_CKSUM), RTE_RX_OFFLOAD_BIT2STR(RSS_HASH), RTE_ETH_RX_OFFLOAD_BIT2STR(BUFFER_SPLIT), + RTE_ETH_RX_OFFLOAD_BIT2STR(SHARED_RXQ), }; #undef RTE_RX_OFFLOAD_BIT2STR diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index d2b27c351f..a578c9db9d 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -1047,6 +1047,7 @@ 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. */ + uint32_t shared_group; /**< Shared port group index in switch domain. */ /** * Per-queue Rx offloads to be set using DEV_RX_OFFLOAD_* flags. * Only offloads set on rx_queue_offload_capa or rx_offload_capa @@ -1373,6 +1374,12 @@ struct rte_eth_conf { #define DEV_RX_OFFLOAD_OUTER_UDP_CKSUM 0x00040000 #define DEV_RX_OFFLOAD_RSS_HASH 0x00080000 #define RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT 0x00100000 +/** + * Rx queue is shared among ports in same switch domain to save memory, + * avoid polling each port. Any port in group can be used to receive packets. + * Real source port number saved in mbuf->port field. + */ +#define RTE_ETH_RX_OFFLOAD_SHARED_RXQ 0x00200000 #define DEV_RX_OFFLOAD_CHECKSUM (DEV_RX_OFFLOAD_IPV4_CKSUM | \ DEV_RX_OFFLOAD_UDP_CKSUM | \ From patchwork Wed Aug 11 14:04:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 96803 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 5152EA0C47; Wed, 11 Aug 2021 16:04:59 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D41D4411EF; Wed, 11 Aug 2021 16:04:52 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2041.outbound.protection.outlook.com [40.107.93.41]) by mails.dpdk.org (Postfix) with ESMTP id A48F040042 for ; Wed, 11 Aug 2021 16:04:50 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gghUQH/s0iILXeK+NLqz4b7uJKhV0u8lD3OEXvQaZxUgxp/hM1YQFCGd+8vlYSGmB5d3sqjTWVh8yDvceiVmY513s1wuziyhr/zI9y6iJ70ejKcLn4+yD4lekKo2UtjWOsD3/0T2R0msS7fdVRLttVh/KFwYSL+UcMhkcemrvZlQhDn08b8ySfGPja7/JlP/NY/axV3tm/ta9R/PUwJIWR/dqCtxRKyrUFgokz4tqDoqMal2t/oMk6hd0YGFg90+2OtWsTNCbKaQwXhGLeXWXJtzIW5oY8i0QAhGPCMQ69TRJ2erZJWwwZr5V5vsxokFUQYZNzQBbLduFNGB00rNiA== 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-SenderADCheck; bh=0LXSOTcSiDvBTIy1VcOKz5kkIcr+Jt2M5qhqfwvMEDA=; b=Lu5OUe5IjQ3eCbKrLTVlOxqZ0eKGiiVpY9qt53R+mwmr+NNHM7b+gcYkqRJvpHxPPRuedRxUOBM49G0uaOHgXHN+/cgimp/YiHuO7jPil3AXcWuDn+7Q9SLUOkldro5GUhOkXz4/ouqTlEbaesjFmHU2Ch0EMjyWiMaKEDA4fMJBY+y3ZXrrcBdh4qXv1qpn8+7cOqCnVgvRiU90jGCZgaZGPfhKTdtpchwi8hp8X5zTYwco5ukLn+9ZYlBKtSs/vNJDcJnsYXzZ/g6iF6f7nD/IDWaKBRCYHfbgtpaagAzbGNB7Ce/I94iQKn9jxz4pHObDjb7xkbOyVRWRk41D3A== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=none 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=0LXSOTcSiDvBTIy1VcOKz5kkIcr+Jt2M5qhqfwvMEDA=; b=KJM8dyG1HojjM4yrpXV4u6lMOXcPjtcT+Iwa4nZHzgHuxeC/fI2+45oBfdct/Hcwefyv2w5x84sjPGvHe2G86kcsJDF/6tsA/BVhEpmuJrkEJiZcQvjuW5sHkG90IXJ7X0NpnsF/e3rW+W5iphlJZmmHMYlr8Lg/MDmNWDymAoG3yDj1uL+8oryaek6lJzPlAxEuN5frTzeruiBmgSqaEJxg6+pBOfByKGmISzfm0wBWv+SARXmN+UTO2yykshXqEhHChRyY7x00udp0w0DXUPqWoFVYRiZ/U1igOAyLvm2zXhrYex4cBlSXAD3yWFQnYynWbuhocDVdnDhKJeWS1g== Received: from DM5PR07CA0122.namprd07.prod.outlook.com (2603:10b6:3:13e::12) by MN2PR12MB3374.namprd12.prod.outlook.com (2603:10b6:208:c9::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.17; Wed, 11 Aug 2021 14:04:48 +0000 Received: from DM6NAM11FT015.eop-nam11.prod.protection.outlook.com (2603:10b6:3:13e:cafe::6b) by DM5PR07CA0122.outlook.office365.com (2603:10b6:3:13e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14 via Frontend Transport; Wed, 11 Aug 2021 14:04:48 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT015.mail.protection.outlook.com (10.13.172.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4415.16 via Frontend Transport; Wed, 11 Aug 2021 14:04: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.2; Wed, 11 Aug 2021 14:04:46 +0000 From: Xueming Li To: CC: , , Xiaoyun Li Date: Wed, 11 Aug 2021 17:04:04 +0300 Message-ID: <20210811140418.393264-2-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210811140418.393264-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20210811140418.393264-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: aaad929f-3655-463b-9f3d-08d95cd0fb1e X-MS-TrafficTypeDiagnostic: MN2PR12MB3374: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:327; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iHzQdDhhnZFDkNhP9TyxiIw6RemQ4SnBbBBjxvNe/g6DlP9OoTJI79QhOo0WOD5hVZnQbhVu6ScugSBLZF5fRPYc0oX548POTVnVjXc+lWvQBrM2WRetghBlWX0v4lkmrLBznFPN+Kh0V+DGs+XCbOA8+P4EKyF/EXrhUW04kZkuBACCPJe+AgwVjwdUpcDgEeGoH7p5e25tSOpzbbmvcbHXfArblNMQhWdqLl6pt264hx5784sAoRTSoNsCldxVKrVMl58G5EmMRD/U69qWZh5Yw5NkxJhvBLkjmk8vyBCLJROYFToJPAkgJ1u+618wpdEKXcWhJ7KdKuygQKxa/sz+E/aV4mQqETSc2pBkxnubel7IGZ/uupgjdJen/SFJpDxWGLsyvEl+9zJM49jaW2I7pj/KvNa/Bn+tY6DtlgHKj5Yh0SzXfYvGc8cVk72cnYB/7bYk1SlPpxLVOsexISy6LYOortWahqR7qlOcjlVQ5ZfahRz045mhc/+w4KFQkZs7Ue1t9nUdq8UolylX+s/7d9TUeCj5PtvwTxxn5nEw+7Ue2zetkefCCnEfSqyg6x1GWSoG676dASprQeSpYYq2B0W9uUKSP2C1f73YgzJm92Vh4VW6rkJkF0EWyAU0eXHTxaMKypGkzq4Qd36moJzudPamWbP0dhTOgr7YXXpebSe+DeZedpEoJJj2IY4WZSnecGSO1a/YXtg+rHadfZb1I2f+Dfe2W/iWB3XQV9U= 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)(2906002)(26005)(16526019)(186003)(70586007)(109986005)(508600001)(336012)(36860700001)(8936002)(7696005)(426003)(70206006)(2616005)(55016002)(5660300002)(6286002)(4326008)(36906005)(54906003)(86362001)(36756003)(316002)(83380400001)(356005)(82310400003)(6666004)(7636003)(1076003)(47076005)(8676002)(4744005)(266003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2021 14:04:48.3558 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: aaad929f-3655-463b-9f3d-08d95cd0fb1e 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: DM6NAM11FT015.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3374 Subject: [dpdk-dev] [PATCH v2 02/15] app/testpmd: dump port and queue info for each packet 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, port number of mbufs returned from one rx burst could be different. To support shared Rx queue, this patch dumps mbuf->port and queue for each packet. Signed-off-by: Xueming Li --- app/test-pmd/util.c | 1 + 1 file changed, 1 insertion(+) diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c index 5dd7157947..1733d5e663 100644 --- a/app/test-pmd/util.c +++ b/app/test-pmd/util.c @@ -100,6 +100,7 @@ dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[], struct rte_flow_restore_info info = { 0, }; mb = pkts[i]; + 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 Wed Aug 11 14:04:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 96804 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 9BA8EA0C47; Wed, 11 Aug 2021 16:05:07 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 07328411F8; Wed, 11 Aug 2021 16:04:55 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2041.outbound.protection.outlook.com [40.107.220.41]) by mails.dpdk.org (Postfix) with ESMTP id 47036411EA for ; Wed, 11 Aug 2021 16:04:52 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e4Eim63FUKk8T+uiwaKdEXXq6Fafa2ZJrvsug0j36s8mFd7n2ARa1d9T9AN5XN/uKpsnZqGIKImn93Cr6k6k50m9ieRNurvGb+y7I8KkJx5BKmiAMBq2zGSYChyLDe2z+3o0Q/WcM6f7su7SpbCOd8Y3OyJZhMKVvxNtSo60vONkynqryTUs89MfbWJT0i4hpF50ZzR2PMRDgaMjP0PDonjhRQ3GKKV4RrgEyvM2ZTKrrhTuZEf6iTQI7u93hA9btSnzXKWcP3JEWLaF1COoejHKfOeplt5m2e7s9rTD0KVaqgRXBQqGD+YDC0XqIcqhHICv7Di+x7NN15XKPQ00vg== 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-SenderADCheck; bh=BtpzuZE0WhK1pM8y/kaXgoSXIMUtHtkaRYGu67sQ7Z4=; b=fQSeAGp5NTMKUW2V3B9QvLTjc8PkPgryUboo+06iagnmfjuJ1BPR/sHEnuhoCINiLW9cApp7K98HpaB6cQmJRei8VUJjyym/l/rRX7o11IsUMlRZXTy7D4roufGQsaj7P7AES/cARea37sEss4mIOq2qEyUwSMmhG15w53laqbKXgCy0xLvcvWFlWBY8gE9Yimb9tWwQhT1eKwSCB/e3osc2DDPfRIMz1B2ohTQke3BWGVrhwdQjGomsM9Buk2536EXol3MDFaw/p0JOKuIImlgOrQGm+xqtAdihfHufvEmE0CPmUyybLOHA1Tp5822k1kiN/dVJu+/Q9b7gOfA3HQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=none 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=BtpzuZE0WhK1pM8y/kaXgoSXIMUtHtkaRYGu67sQ7Z4=; b=DOVQU6P7sRxXbIwmCL6+0uPxVXOjJoEhYDe+y69WM3TdSCndEaNKP8LF4sF9Z4jZQqC03IFI+JlJufqImTPg1XK80+NayikzAasKWza/u6BId5ajhADI4ksLGbSEf7OHVq9KTJp69KJurNJ59wtIGMQm9HmCYxIiOZ6QwnVXw/rsnCCOeBHFaall4GJ3OBZ67O+NbIT7+2S2vwMjwUfDdiWDs3idw2qnS2ECKHU/6XaR8JLhDRF8pOCItaNxTzxJfDgCHbnA8/AXintmZ61Mu2K/I2JEFPlY29cHU/juzHpdahGjNdNhdDHl5bQflFBNg5s37QRKmcykYFu+PDkFiA== Received: from DM5PR07CA0121.namprd07.prod.outlook.com (2603:10b6:3:13e::11) by BL1PR12MB5095.namprd12.prod.outlook.com (2603:10b6:208:31b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.19; Wed, 11 Aug 2021 14:04:50 +0000 Received: from DM6NAM11FT015.eop-nam11.prod.protection.outlook.com (2603:10b6:3:13e:cafe::ed) by DM5PR07CA0121.outlook.office365.com (2603:10b6:3:13e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.13 via Frontend Transport; Wed, 11 Aug 2021 14:04:50 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT015.mail.protection.outlook.com (10.13.172.133) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4415.16 via Frontend Transport; Wed, 11 Aug 2021 14:04: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.2; Wed, 11 Aug 2021 14:04:48 +0000 From: Xueming Li To: CC: , , Xiaoyun Li Date: Wed, 11 Aug 2021 17:04:05 +0300 Message-ID: <20210811140418.393264-3-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210811140418.393264-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20210811140418.393264-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: ddd2e9b8-1155-42de-8b9d-08d95cd0fc01 X-MS-TrafficTypeDiagnostic: BL1PR12MB5095: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: sZ7TXKWqbYDMZtHNEgDngD7eQtkFFXvGB05fxndfqiBz4JcwHmawSg4igo0iexaSP/vRJI0S9H3o6KnU9bZ+InBpjgMs1klkNiNbaJ9KQLduE7FaPdUGwHIzwfOEhxBXeFgYl8YeZB6aIsJKejAtp8JeEdBaJjVIs8KHO3fskzalAop3Ldt4NTTSfsFHo5pgaGEUyH0ZcygP4q6vLJ3Ujg4ven4p/n5znOrPdC7Yq0lBxFZdu+9OR5pdQffrdEr/DWinroy6cXKqg1aNANVG70pz05jh/M8qGoZ/Zke/dhuQucBNeR3xathDJFwmkYYQpCbek2DbcfCITpCNlUylj71vm1i3nu/oLiDyyTWNvBlG/xFYT4G5SZW6+iX+DD36o+H9wmUTIccRIJFaGpEZhpHgAaO5Fxg9IhlOx5Wwh3lcxZQDfCJm+bh7EeGGvV2+knsZtMP/f/IVufJfuvcBO2b70NXpfbIiiQreqd3jUc+snXyh5KpTwYDIuK/c6XYhY5dwF7SaN6oVzb7IgUG+sgH8vVP0s2MScPe5sWNlhbzPjKnSI6CS1BG/Oe9N/Ptandba13LpJT5djlk8IyRYvuJqTa0/R2FZ2GME0cF8NUKOymXDxxTwkAKU/BiSPzhViEwo3kcbcAz8CB2t9bwgKptuWsHpyS8DB99qHAPZdW4pllPH+kOtS29ibAoo63ySZP/SNHuRFmV+iDgy7RdVc2xJGGELUhrG5vIMLtGHI0A= 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)(396003)(376002)(39860400002)(136003)(346002)(36840700001)(46966006)(2906002)(26005)(7636003)(8936002)(186003)(356005)(4326008)(36756003)(5660300002)(16526019)(2616005)(82310400003)(316002)(6666004)(86362001)(7696005)(426003)(55016002)(1076003)(109986005)(6286002)(82740400003)(70206006)(36906005)(336012)(83380400001)(36860700001)(54906003)(8676002)(478600001)(70586007)(47076005)(266003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2021 14:04:49.8019 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: ddd2e9b8-1155-42de-8b9d-08d95cd0fc01 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: DM6NAM11FT015.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5095 Subject: [dpdk-dev] [PATCH v2 03/15] 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" parameter to enable shared rxq for each rxq. Default shared rxq group 0 is used, RX queues in same switch domain shares same rxq according to queue index. Shared Rx queue is enabled only if device support offloading flag RTE_ETH_RX_OFFLOAD_SHARED_RXQ. Signed-off-by: Xueming Li --- app/test-pmd/config.c | 6 +++++- app/test-pmd/parameters.c | 4 ++++ app/test-pmd/testpmd.c | 14 ++++++++++++++ app/test-pmd/testpmd.h | 2 ++ doc/guides/testpmd_app_ug/run_app.rst | 5 +++++ 5 files changed, 30 insertions(+), 1 deletion(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 31d8ba1b91..bb882a56a4 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -2709,7 +2709,11 @@ 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->offloads & RTE_ETH_RX_OFFLOAD_SHARED_RXQ) + printf(" share group=%u", + rx_conf->shared_group); + 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 7c13210f04..a466a20bfb 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -166,6 +166,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: share rxq between PF and representors\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"); @@ -602,6 +603,7 @@ launch_args_parse(int argc, char** argv) { "rxpkts", 1, 0, 0 }, { "txpkts", 1, 0, 0 }, { "txonly-multi-flow", 0, 0, 0 }, + { "rxq-share", 0, 0, 0 }, { "eth-link-speed", 1, 0, 0 }, { "disable-link-check", 0, 0, 0 }, { "disable-device-start", 0, 0, 0 }, @@ -1256,6 +1258,8 @@ 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")) + rxq_share = 1; 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 6cbe9ba3c8..67fd128862 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -223,6 +223,9 @@ uint8_t rx_pkt_nb_segs; /**< Number of segments to split */ uint16_t rx_pkt_seg_offsets[MAX_SEGS_BUFFER_SPLIT]; uint8_t rx_pkt_nb_offs; /**< Number of specified offsets */ +uint8_t rxq_share; +/**< Create shared rxq for PF and representors. */ + /* * Configuration of packet segments used by the "txonly" processing engine. */ @@ -1441,6 +1444,11 @@ init_config_port_offloads(portid_t pid, uint32_t socket_id) port->dev_conf.txmode.offloads &= ~DEV_TX_OFFLOAD_MBUF_FAST_FREE; + if (rxq_share && + (port->dev_info.rx_offload_capa & RTE_ETH_RX_OFFLOAD_SHARED_RXQ)) + port->dev_conf.rxmode.offloads |= + RTE_ETH_RX_OFFLOAD_SHARED_RXQ; + /* Apply Rx offloads configuration */ for (i = 0; i < port->dev_info.max_rx_queues; i++) port->rx_conf[i].offloads = port->dev_conf.rxmode.offloads; @@ -3334,6 +3342,12 @@ rxtx_port_config(struct rte_port *port) 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.rx_offload_capa & + RTE_ETH_RX_OFFLOAD_SHARED_RXQ)) + offloads |= RTE_ETH_RX_OFFLOAD_SHARED_RXQ; + if (offloads != 0) port->rx_conf[qid].offloads = offloads; diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 16a3598e48..f3b1d34e28 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 uint8_t rxq_share; + extern uint16_t nb_pkt_per_burst; extern uint16_t nb_pkt_flowgen_clones; extern uint16_t mb_mempool_cache; diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst index 6061674239..8a9aeeb11f 100644 --- a/doc/guides/testpmd_app_ug/run_app.rst +++ b/doc/guides/testpmd_app_ug/run_app.rst @@ -384,6 +384,11 @@ The command line options are: Generate multiple flows in txonly mode. +* ``--rxq-share`` + + Create all queues in shared RX queue mode if device supports, queues in + same switch domain are shared according queue ID. + * ``--eth-link-speed`` Set a forced link speed to the ethernet port:: From patchwork Wed Aug 11 14:04:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 96805 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 415C6A0C45; Wed, 11 Aug 2021 16:05:16 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 472DF41200; Wed, 11 Aug 2021 16:04:56 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2069.outbound.protection.outlook.com [40.107.243.69]) by mails.dpdk.org (Postfix) with ESMTP id 917BD411F6 for ; Wed, 11 Aug 2021 16:04:53 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=nqSs/raatScvoD1m67cPjwCfD+GsREyC5rccj+MtD24nT9l3F8yQkaZqTPzqIp/KBt8PobmFEvz0UgWWPIZP57XODzmTJDfPr4zo8NeHMwcKvNGRiF5r0qd6EvrN1VJ/Ya8dPCqlKEFx6rLgUlocy8RG1S33YEGVbqqIE0vup7Elj2gW53BskOxbEHBM47Jj0/1UiLT9hFi0piWSBY3PLzDKTB1zOKO9Ax0a73iUZcRFDpLRdGfAwcPBnkHSbFfA4YOsL6BkB2bFmjKm/RENZxd6L8B1vH/bfDaYGwFJ4XQHpK8IqoJENLxGLyvCSQNLfPlX8PU34MHDcCo8R4qpkg== 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-SenderADCheck; bh=TEJ1FRyP2sgkb45a7Zov0JpWCctTP4VtcuUPXg9k5nE=; b=IRN7sBV+lCudnbdbAywYk3weHO0MNnUYBAs0aTSkAyI9lFymkoKVLbhE6L1zeAGFFw94QTD5qn67f+GxlVC+WLUOwf6G1cXhaDUS0ozhFaC6DswC/CYit7QsyuiqhBxcrr3xKuPEKIwREr8EjPLdltGJAExS65PX0UUl+7cwR+UYLy/pmp2gF7QEVI17n/fxgXV9bVAdCBDzYakdKjWpx+QCnyC7EEDOhJ6LvvgyDdpyL7uUVGyevBvduUZrMDWYrM6PFPPRdPo0NYXAURe6mWISlUIEJUmL9fpYA/7Z8tlduP4Ke0DqV1rvsIDrNNtOGhGNwb8tPdyU4QtgNuYnOQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=none 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=TEJ1FRyP2sgkb45a7Zov0JpWCctTP4VtcuUPXg9k5nE=; b=QJybRUy39flbDBoKGlXzOxGaCFfsVcyvYsbdbFe4eZpumf/Fw8g0hvX2+oKS9cnvo2GrbFpD6JatFqwL/8QxBk4JJPglNVRM0YHoJsiAO6mQcaUpFJNdRYQk0XEDwEG51R8CSHTSCse+0S350oyjNYVhcnAb5zjvaYyR0XXDa/dqVhaQ1qb/2vwY8zKtgKEaLQBq1Fr9pnLVv1czW+7okmaSB88/IZzQtmHnCs3dSTMQjAto4qsYWunxLP6FDl9CwWPIdaOu4ZseAVfBn2ypCzPOA77JKs/JH1pL9BeapvHE8q1hoU2aiMZI7gEAhV+jIZMySsX50U1Xa/GO6YfpWQ== Received: from DM5PR19CA0021.namprd19.prod.outlook.com (2603:10b6:3:151::31) by DM6PR12MB3097.namprd12.prod.outlook.com (2603:10b6:5:11d::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.13; Wed, 11 Aug 2021 14:04:51 +0000 Received: from DM6NAM11FT064.eop-nam11.prod.protection.outlook.com (2603:10b6:3:151:cafe::9c) by DM5PR19CA0021.outlook.office365.com (2603:10b6:3:151::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.13 via Frontend Transport; Wed, 11 Aug 2021 14:04:51 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT064.mail.protection.outlook.com (10.13.172.234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4415.14 via Frontend Transport; Wed, 11 Aug 2021 14:04:51 +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.2; Wed, 11 Aug 2021 14:04:49 +0000 From: Xueming Li To: CC: , , Xiaoyun Li Date: Wed, 11 Aug 2021 17:04:06 +0300 Message-ID: <20210811140418.393264-4-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210811140418.393264-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20210811140418.393264-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 828734ae-e175-48ef-4cbf-08d95cd0fd02 X-MS-TrafficTypeDiagnostic: DM6PR12MB3097: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:6430; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: VqyQn8pDdAjzbfjw9GABpLc0PGSILWdkgfJAVVQXCUUbYH3kv5+PE1PFH1tYML7+90Mv5N+fDV8VvglotW9sOvxFp+UyFNWwisvi4WqV75HozpNHo1/U0HemqeOjwAFUGrVGWlSa10sn8Yo3OZ+4IG6e4Hz+5m7TFN3G9Z308KPzJnUsza1lUEJIMZSCbahmblEQJcoAK8yJ5KcdrYYwqUWsnFJZaeW77U9I97P3fxJgEy8awbPamdDeM1HbsBqEDbBzdAvmMk/0aKHpkSIIZYT4WazQdmlsNR/ff4Ma4IlM2+2kYKmnN2rlznssyQjL5TaAueH06L9CeNwFlqS0KWD7xV095WeFuQ4PtbgRKqKR4FWaIbag3asilIg1PDCsrHQazfaEJMlTBdv4ApZb6Cn/t90hPmf8mm36rGTj9YaBpve0fTw8tjTyaDrC3alKhH2iDPPfuMKs0vZkA1dUb+ruvCTBYqEt5Ek9TsPRN0a7JT4Mgz1AmNNOwCRWRhcYfzQJ6PnJVsKswa8n7bagNRaAx4POjdp07ST37tXx24kH4cTM2oT56NDwXfG4mx1kPPbwQ1AydpcGRoCNSypdGmE/WZ5QK1c09L8n8lsBXPLL2lQ+mRGEu5+8zWGiG19UdaCf9ufYXRC8RuR70w49RMna4bIpyETc01tMU5lI8dLrIW+Iqu8WxMeUz0sb1XKtlqsIRLnwBwZNyfTe7ZDNReMiO/r6d8qbJ7f2fhaqCzI= 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)(376002)(396003)(346002)(136003)(39860400002)(46966006)(36840700001)(7696005)(8936002)(55016002)(70586007)(70206006)(8676002)(83380400001)(356005)(47076005)(336012)(82310400003)(36906005)(6666004)(54906003)(7636003)(109986005)(478600001)(36756003)(86362001)(26005)(6286002)(5660300002)(316002)(2616005)(16526019)(186003)(4326008)(426003)(1076003)(82740400003)(2906002)(36860700001)(266003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2021 14:04:51.6335 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 828734ae-e175-48ef-4cbf-08d95cd0fd02 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: DM6NAM11FT064.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3097 Subject: [dpdk-dev] [PATCH v2 04/15] app/testpmd: make sure 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 rxqs uses one set rx queue internally, queues must be polled from one core. Stops forwarding if shared rxq being scheduled on multiple cores. Signed-off-by: Xueming Li --- app/test-pmd/config.c | 91 ++++++++++++++++++++++++++++++++++++++++++ app/test-pmd/testpmd.c | 4 +- app/test-pmd/testpmd.h | 2 + 3 files changed, 96 insertions(+), 1 deletion(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index bb882a56a4..51f7d26045 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -2885,6 +2885,97 @@ 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, portid_t src_port, + queueid_t src_rxq, lcoreid_t src_lc) +{ + 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_rxconf *rxq_conf; + + nb_fc = cur_fwd_config.nb_fwd_lcores; + 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]; + rxq_conf = &port->rx_conf[fs->rx_queue]; + if ((rxq_conf->offloads & RTE_ETH_RX_OFFLOAD_SHARED_RXQ) + == 0) + /* Not shared rxq. */ + continue; + if (domain_id != port->dev_info.switch_info.domain_id) + continue; + if (fs->rx_queue != src_rxq) + continue; + printf("Shared RX queue can't be scheduled on different cores:\n"); + 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 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_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]; + rxq_conf = &port->rx_conf[fs->rx_queue]; + if ((rxq_conf->offloads & RTE_ETH_RX_OFFLOAD_SHARED_RXQ) + == 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, fs->rx_port, + fs->rx_queue, lc_id)) + 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 67fd128862..d941bd982e 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -2169,10 +2169,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 f3b1d34e28..6497c56359 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. */ }; /** @@ -785,6 +786,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 Wed Aug 11 14:04:07 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 96806 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 90B11A0C47; Wed, 11 Aug 2021 16:05:25 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CF27F4120F; Wed, 11 Aug 2021 16:04:57 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2047.outbound.protection.outlook.com [40.107.237.47]) by mails.dpdk.org (Postfix) with ESMTP id EF7BD411F8 for ; Wed, 11 Aug 2021 16:04:53 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jdUrF5O8fou10ldqEAakswr+Y+t4QY/HSMXR4+R7oj3u5QGUIKDz7Zx8Oq3PKk9yFJHePB3tN8vM9Ye1lCgQ/S12flIIZOVuMoE9jdoJFJckb0WOiOFBdUN5CNIzCffcM/Y+sHRaymM2WDlooIwLPLvkIyNZh4k9rH0cig7GIkM7E2KT1E/TcNfVt4cN7KJuEukK3gJWvpFlonYfpj0akfY5K9Qk/Vi2ccbtlw5J3rQHk3bRfjUqPRZwGKD4OCTuyJ6zNaBgud7nnV6ajelVRGOOR6bFoQvYj6Br1SO6nRg4NS8xIxCd1irZwbImUyONfEvwHqd3EK69JB7n7XIwCw== 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-SenderADCheck; bh=eKyBeZb3SLJrUxuSsA8v5fJ/EpaPQQ4b8O4wqQZmYfs=; b=EgW0u1hBdKKjhk7F6d9OvaslmXEw1RetiL9PSQLhc9/UKf4EiAUYqO8AyQRjQu/zbXZyt27cFEQLfLozKmddqjHi1GdiuUMUbxJFXbyQNZtK9ycUd7TtR8O2bC3tDISdE1oi7kaVIjtc8tccqmm9OYrYUeVJGhM//wbYYW1T5pUphppuOZTXz++M6Ebdh+dDbRAYJkpvT1b0k8r6r5M0z57fzwLVuBVnh/lJV6r5CRpcUaV98Sf1GFkFAsA4Au7iDHiYME2ODelIU/lIay03YX722TefnRoIZlDdUyZTFRo0IArzPxy6+1pP2lS0dueuNFLxJ6S3YxFKhKin1nMakA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=none 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=eKyBeZb3SLJrUxuSsA8v5fJ/EpaPQQ4b8O4wqQZmYfs=; b=LnnQG576V4VNcSS5EOePkX4nFLE6dtxRN0u1sBc/vd9B7cvuO5Z8cNbRlnxGjS2la6FnlNt3bOM0sjGJjOLBWZPYmk7uj+A7vdZUsCvVppIxOIqQzjzUrG19URVckF0Jx4GHLQ2WrWy3Y3bjwk/I1C4JqcV+u5MndSgAuFVCuEJc+5bey82p2274ZCluXOCKMuK36mhdBiuJ/DHQ4pshMnGVdYwPjrKvgF5tp9bTd7RofR7VYEvvWFaKhXwkZGOSxVaL6oNRVH3SbJSqCtClS1Xe69y9biTlC+2YkS4TvxvQV6SRUmiPC07Qy/1A4O6y+VkO9piWhWAcfOMBndwhqQ== Received: from DM5PR19CA0022.namprd19.prod.outlook.com (2603:10b6:3:151::32) by CH2PR12MB4165.namprd12.prod.outlook.com (2603:10b6:610:a4::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.21; Wed, 11 Aug 2021 14:04:53 +0000 Received: from DM6NAM11FT064.eop-nam11.prod.protection.outlook.com (2603:10b6:3:151:cafe::c1) by DM5PR19CA0022.outlook.office365.com (2603:10b6:3:151::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.13 via Frontend Transport; Wed, 11 Aug 2021 14:04:52 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT064.mail.protection.outlook.com (10.13.172.234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4415.14 via Frontend Transport; Wed, 11 Aug 2021 14:04:52 +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.2; Wed, 11 Aug 2021 14:04:50 +0000 From: Xueming Li To: CC: , , Xiaoyun Li Date: Wed, 11 Aug 2021 17:04:07 +0300 Message-ID: <20210811140418.393264-5-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210811140418.393264-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20210811140418.393264-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 874bfb5d-cd9a-4272-e9d2-08d95cd0fdb9 X-MS-TrafficTypeDiagnostic: CH2PR12MB4165: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:568; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iwXaNM9CkqXqsZW6jmNeUCoQlbCD2bSNe4k0teQ9syPqdzPtSfm4ThlyGizxYBkw3bhoIR/SQ2UC76x2KTnRHXToYSpMecaznBnK6OdT9WWOHypxY59R/3PXQ4XyouJvRkZNB5fOAy98D68I8zNl7PyA6TUq6CTZpmV7s35PTs+XcmwapeSuzq+mVRdJQ5PchMhvzYVgYURKAVnfi1dVSfHZPxXREeZkgkzjPoz8UsfrzMC/fHqECznOASEzrrHSrOVWZITqQJldqoKpoQTmO7hVmrWUOhs+w2kjwmMscys3AfhZUGe3F92jBKWhMxYFqNiQg8s/OufSbdbZVrGmnC0Cx1GyRgru3kKnRchcVE3K4M+5uEx51IkNXCj85aMLUsF8fGP2iDzmRRdxxzgphCYoOMafvqIkDrUnGYpy2BKfQr2xKyMsKoofoRuC1ovoJg2Ym0zIp0SCikD/SoGjL8iQ3XHkqaI7i7YsKMMPHedsvBKSt8ghO2TRrvAXUGEzY+o7z/g8J/lAUVNsFhM3JR8NnopbmSIrPi38Moxgh46t6rl4Ghe9tpQnsD7F75FWS8xWNyVrAUv3ecRA0Z5cuylMY6jdcCfN6dVgOGQxQmd/k9sJ/Mu0tDwW+JWMEYovvjrt9ns4imBjhLX1ygphRdIpVW5N/I827xChhfgsq801oJBoTxhqMZNXGhvVSpmvECHxFcXDZHAVMinfC5iLgwc/a/FJOL4h91mt7jzWiX4= 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)(39860400002)(376002)(396003)(346002)(136003)(36840700001)(46966006)(82740400003)(36756003)(316002)(82310400003)(4326008)(8936002)(36906005)(426003)(70586007)(70206006)(2616005)(36860700001)(16526019)(86362001)(6666004)(54906003)(7636003)(47076005)(8676002)(336012)(356005)(1076003)(26005)(6286002)(109986005)(2906002)(7696005)(55016002)(478600001)(5660300002)(186003)(266003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2021 14:04:52.7899 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 874bfb5d-cd9a-4272-e9d2-08d95cd0fdb9 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: DM6NAM11FT064.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4165 Subject: [dpdk-dev] [PATCH v2 05/15] app/testpmd: adds common forwarding 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" By enabling shared Rx queue, received packets come from all member ports in same shared Rx queue. This patch adds a common forwarding function for shared Rx queue, groups source forwarding stream by looking up local streams on current lcore with packet source port(mbuf->port) and queue, then invokes callback to handle received packets for source stream. Signed-off-by: Xueming Li --- app/test-pmd/testpmd.c | 69 ++++++++++++++++++++++++++++++++++++++++++ app/test-pmd/testpmd.h | 4 +++ 2 files changed, 73 insertions(+) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index d941bd982e..f46bd97948 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -2034,6 +2034,75 @@ flush_fwd_rx_queues(void) } } +/** + * 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_by_port(struct fwd_stream *src_fs, uint16_t port, uint16_t nb_rx, + struct rte_mbuf **pkts, packet_fwd_cb fwd) +{ + struct fwd_stream *fs = forward_stream_get(src_fs, port); + + if (fs != NULL) { + fs->rx_packets += nb_rx; + fwd(fs, 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. + */ +void +forward_shared_rxq(struct fwd_stream *fs, uint16_t nb_rx, + struct rte_mbuf **pkts_burst, packet_fwd_cb fwd) +{ + uint16_t i, nb_fs_rx = 1, port; + + /* Locate real source fs according to mbuf->port. */ + for (i = 0; i < nb_rx; ++i) { + rte_prefetch0(pkts_burst[i + 1]); + port = pkts_burst[i]->port; + if (i + 1 == nb_rx || pkts_burst[i + 1]->port != port) { + /* Forward packets with same source port. */ + forward_by_port(fs, port, nb_fs_rx, + &pkts_burst[i + 1 - nb_fs_rx], fwd); + nb_fs_rx = 1; + } else { + nb_fs_rx++; + } + } +} + static void run_pkt_fwd_on_lcore(struct fwd_lcore *fc, packet_fwd_t pkt_fwd) { diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 6497c56359..13141dfed9 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -272,6 +272,8 @@ struct fwd_lcore { typedef void (*port_fwd_begin_t)(portid_t pi); typedef void (*port_fwd_end_t)(portid_t pi); typedef void (*packet_fwd_t)(struct fwd_stream *fs); +typedef void (*packet_fwd_cb)(struct fwd_stream *fs, uint16_t nb_rx, + struct rte_mbuf **pkts); struct fwd_engine { const char *fwd_mode_name; /**< Forwarding mode name. */ @@ -897,6 +899,8 @@ char *list_pkt_forwarding_modes(void); char *list_pkt_forwarding_retry_modes(void); void set_pkt_forwarding_mode(const char *fwd_mode); void start_packet_forwarding(int with_tx_first); +void forward_shared_rxq(struct fwd_stream *fs, uint16_t nb_rx, + struct rte_mbuf **pkts_burst, packet_fwd_cb fwd); void fwd_stats_display(void); void fwd_stats_reset(void); void stop_packet_forwarding(void); From patchwork Wed Aug 11 14:04:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 96807 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 61303A0C47; Wed, 11 Aug 2021 16:05:33 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1597A41207; Wed, 11 Aug 2021 16:04:59 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2075.outbound.protection.outlook.com [40.107.220.75]) by mails.dpdk.org (Postfix) with ESMTP id B14CC41205 for ; Wed, 11 Aug 2021 16:04:56 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=M/Q63JDbyP0TuJknTXkYMqKBfQbJpsAPZPvP/WHkQ1ciMQ/SeJHI0V2Z2RJOQqtq4XeWWhnnr40JXUiml7nm7KmIlSb7jBiYMZn4tkIMxwDBcT3F5BbaIuwSjIzZD7KCB+f51IxMvWy9tAvSmxb52+7JQAjgqvwihCBC0EcLpDBrsxorLP2yGha9d5unSfrw8XKBcYhat+v5r1O8gm/Qr/1GpqH1t2B/+rXleGRFW/vuWLmN49xy9/R1Q9d/yFeSp09WSbPYFxJ36JV0G2fnYxyuRbJpBamkYsvYhCPs1mryRkdxBt+6GCDe7fQdsI3TtUoDjovNa8QiapNdSGrnzQ== 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-SenderADCheck; bh=tl6Z/enUQQdEETwhOriTQ+lSKUdAV+IX8NiF+YZghbo=; b=CNqh7lHO1gP1hOJQ0YQc/rJLVhHHOUNT6FbyV9LDGe/57IJxCOj6rQW0ggRQBOudaD9roVO+weJnUz/hG+8Aw0oN9ucIfLSu0+ADJtcPWqp65kBUPWeH8JWKxONd/5e0xADtKWIHa0LvVY2uMl5HDvvJv4Lx48MUUdRxsj5NSBUpdTBuozwGBrlO7Bbk5EcJiYzKYku+Z1CDRkzXiRJYlxNAjmeBiJ38twxwCgYN6nEDg09GUCo+CkQn9AU1dMJG4dGvfxo1O2VMGVmTLw5P0lz38mQXIJUWy5SYE6USPXrDV5sdZpU/kaAaGixfhu3ALG05/nohvasDMv2rPJvCwQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=none 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=tl6Z/enUQQdEETwhOriTQ+lSKUdAV+IX8NiF+YZghbo=; b=lbzyoL3JbBFcpZhcJjLEeHs4uOrPDau+qhAc0nX0gUFeshz+SgGcUv889YEVCtYfVAPFpwFXumCZY3kJ1Wl33qboWoYiYJC41CVi+l9+k8Q6IZb9meHYntjOLmqr0yviOVkovoO0I3rsFl11zd+MijfkmTaKBRjj6Y8beSmjwUB+814VHF4Ta8+gomljA82gFAHS/9doXpF68dzCLoPWxlVM6FCf4YMdXCVkrP2YEmSHVmZxwIum+0jV+Cq74esPWibV9iPM2fIm5geTKMCKtIMBXkeUngu9yEGpCJQ/ES8IRGGpIO3gwQ3R5jdSC/9DhSGK5v6mI1l4B0aXy1y4mA== Received: from DM5PR19CA0021.namprd19.prod.outlook.com (2603:10b6:3:151::31) by DM6PR12MB3737.namprd12.prod.outlook.com (2603:10b6:5:1c5::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14; Wed, 11 Aug 2021 14:04:53 +0000 Received: from DM6NAM11FT064.eop-nam11.prod.protection.outlook.com (2603:10b6:3:151:cafe::84) by DM5PR19CA0021.outlook.office365.com (2603:10b6:3:151::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.13 via Frontend Transport; Wed, 11 Aug 2021 14:04:53 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT064.mail.protection.outlook.com (10.13.172.234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4415.14 via Frontend Transport; Wed, 11 Aug 2021 14:04:53 +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.2; Wed, 11 Aug 2021 14:04:52 +0000 From: Xueming Li To: CC: Xiaoyu Min , , , Xiaoyun Li Date: Wed, 11 Aug 2021 17:04:08 +0300 Message-ID: <20210811140418.393264-6-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210811140418.393264-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20210811140418.393264-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 33164a32-16cc-4e1f-6a8c-08d95cd0fe52 X-MS-TrafficTypeDiagnostic: DM6PR12MB3737: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: QqSJKNdnp6QqImBs2Ell+H7tk1Gx8abKayj4i8uKMKSuRfPhWRj1QdP4IFq+XXKFzcTm9tu5LXL48y7tvq/Ckw+Uvyqy9/4xf2o5CtoycCIm0SL/pzegBniZdlt/qE2XPXujA0gL/NtrxqFjR8OslFp4mPm7pe5GkGUWCqiwhmay9msvdiv4e/+sd9BbRVUvojuAAiFbTsUaQJivBIDlAg1qCRnFmeycFgJkRmZ+mrx49o884SjJ6Wz9pqLsrCNMrGLU1hdZz986XH/FHELW22jzovPsJW+5QsOtwg3NCtgt+0XzcT9vLRpp0hUzB+ays99LNIeTm/G7HkRRgOz2ufT1+Tq91b42XKhxQ9H0h2GyT0GsQgHt0rMUwtY07/SNqoG7qvbNvJ+rufoVy5I8cw2Ve+J7b5eedA2+w9RspeXszFOXB4cjofzjbHGpoJc6y/PkuJGQmqgiSC/fXhDozufNRLuF7JFu3M9ANszog3vslqaBSVBCH9WbRIlGUUitC/0I5VfMwkOXFZBDEe/UYh1A5sJr+UAXhgkNShcQTlGiavrH5BdAMsSdc1mcmJKBs5fw+n8WCsCH78Gv6XVmfqYT8/rpe3KDdpWvNX17ngnG73hZHHFMqXZNoFMyp5y9iNnQpBlnDh6XPoyGHf/+JbyiuY38HFcwZ3cVE1UgccLdoDyUmlHTLO6hKZcuxwtydMSJxeb1nFPaWynNHw3EiCEtqdJFk+v1Nk7Fbg9lApA= 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)(396003)(39860400002)(376002)(136003)(346002)(36840700001)(46966006)(6286002)(83380400001)(478600001)(5660300002)(2616005)(55016002)(109986005)(36756003)(7696005)(336012)(356005)(7636003)(1076003)(70586007)(70206006)(6666004)(82740400003)(82310400003)(2906002)(8936002)(16526019)(47076005)(186003)(8676002)(86362001)(36860700001)(54906003)(426003)(36906005)(4326008)(26005)(316002)(266003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2021 14:04:53.7084 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 33164a32-16cc-4e1f-6a8c-08d95cd0fe52 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: DM6NAM11FT064.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3737 Subject: [dpdk-dev] [PATCH v2 06/15] app/testpmd: add common fwd wrapper function 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" From: Xiaoyu Min Added an inline common wrapper function for all fwd engines which do the following in common: 1. get_start_cycles 2. rte_eth_rx_burst(...,nb_pkt_per_burst) 3. if rxq_share do forward_shared_rxq(), otherwise do fwd directly 4. get_end_cycle Signed-off-by: Xiaoyu Min --- app/test-pmd/testpmd.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 13141dfed9..b685ac48d6 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -1022,6 +1022,30 @@ void add_tx_dynf_callback(portid_t portid); void remove_tx_dynf_callback(portid_t portid); int update_jumbo_frame_offload(portid_t portid); +static inline void +do_burst_fwd(struct fwd_stream *fs, packet_fwd_cb fwd) +{ + struct rte_mbuf *pkts_burst[MAX_PKT_BURST]; + uint16_t nb_rx; + uint64_t start_tsc = 0; + + get_start_cycles(&start_tsc); + + /* + * Receive a burst of packets and forward them. + */ + 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; + if (unlikely(rxq_share > 0)) + forward_shared_rxq(fs, nb_rx, pkts_burst, fwd); + else + (*fwd)(fs, nb_rx, pkts_burst); + get_end_cycles(fs, start_tsc); +} + /* * Work-around of a compilation error with ICC on invocations of the * rte_be_to_cpu_16() function. From patchwork Wed Aug 11 14:04:09 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 96809 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 1122CA0C47; Wed, 11 Aug 2021 16:05:51 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C8E2C41224; Wed, 11 Aug 2021 16:05:01 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2075.outbound.protection.outlook.com [40.107.236.75]) by mails.dpdk.org (Postfix) with ESMTP id 7E70041214 for ; Wed, 11 Aug 2021 16:04:58 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hfZl3ltTljyinHl8wIPc9tjaZVSWk+ef3/m8bivK1ADxj8u7cqhBzxh6Hhs+H0Gq14IyTR0RekZ+bhfKJLtLpQrhW0ybbo+uSYzXz3PZyZZf+xUPZSofJV7Y7+zVVnRxDgQ3Ln8/IIaA3+mH6BFmO8+nDKLRLvm/qrymZ1Lt6IVmA+l95y+v9LEOBmTrYmOCsKtgrFRhwoPONjH4GpFoBPUv0JxXc+x2jBV9p+E6wIuf61042aiZ/VjCNb75w5ywZaurb1WL6bEu1YIyRroBe/9/pINmGPfqTOIZmm6gEGriqk5opcsnVfPDqsK2yF4Vgkz1UM9yDD4RBk0Znxe54g== 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-SenderADCheck; bh=nNiaUUpHTHsqctVvgt1y/xkReyQZB3VMQamRuRZhHs4=; b=HsiMCVzmfTG65uG1Rw53/6xITTkiUMptpTpIj+1a/Q8wjHxJG18i+SLHd1fwxCBSb/Y/Zc5XMXPNZXTX8E+WUd8U1lbSGTpSrc9m68Ud5HzQb6xoJXb+kU8sFq+o/Qj8iS0oj39pNm3pZp4Rr8TzBJrpRP4SR0ntXOTALlNbzqouSA5Zw1MNgwnz8aw4AMqNLIuZ40ZBinjJwT7ZQOSG39RCw0JKJXeD3o1yfQnpK35ok0/EMF+WNe+LC2p/6tZNLWB1FH55kmMADdHLI3yFndiT3Iy8kUoeMLohmv4TqVlsf1EMyJSl8kdPYmBqsD1Bu4QuvjA/mgEkyy1DKVJuqQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=none 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=nNiaUUpHTHsqctVvgt1y/xkReyQZB3VMQamRuRZhHs4=; b=AnvoFpgehSWoWxzv7oclUGl3mXB+PydaT5fRd+ZxAllXfvMtlPiZnrDZ0PgWyvAgqvgFk6j/VBBe4ajEPZOQpGEkPZyq302FQKBL9aJvD6paRiqiJPUK3jFJidA189mM/vy8gIuvUX66kL1EdjPVpyjjK/NKvb/Vyrc5xnxbVXi89/wQWxdFc7iaOpy5lFRDRjRvxEobJGm8DA2RRsSP8nDNxT3bTJHqgRK6K61jHt1lAG2gv9EYud1vjqsDtr0tRf8QSKkSN8kma9quWdoxfevDCAO23nScO1SVo9YZ7dfQ98+4SfaoCNmA9EwSANMkIXF4wTmdiEAcXkvkFkIIVQ== Received: from DM5PR19CA0022.namprd19.prod.outlook.com (2603:10b6:3:151::32) by BY5PR12MB4131.namprd12.prod.outlook.com (2603:10b6:a03:212::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4373.21; Wed, 11 Aug 2021 14:04:55 +0000 Received: from DM6NAM11FT064.eop-nam11.prod.protection.outlook.com (2603:10b6:3:151:cafe::c1) by DM5PR19CA0022.outlook.office365.com (2603:10b6:3:151::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.13 via Frontend Transport; Wed, 11 Aug 2021 14:04:55 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT064.mail.protection.outlook.com (10.13.172.234) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4415.14 via Frontend Transport; Wed, 11 Aug 2021 14:04:55 +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.2; Wed, 11 Aug 2021 14:04:53 +0000 From: Xueming Li To: CC: , , Xiaoyun Li Date: Wed, 11 Aug 2021 17:04:09 +0300 Message-ID: <20210811140418.393264-7-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210811140418.393264-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20210811140418.393264-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0b09c400-62d5-4574-79cb-08d95cd0ff37 X-MS-TrafficTypeDiagnostic: BY5PR12MB4131: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4941; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: OQZ2ZNrIWi6aKIDJWGSgEJfro77PCFPSKnYakNHpi6an0dKRKIhAhOfkVNoIlojznH/uZR89WdFInFHUDQplLIG3kfd6wixir3/Xvhn2FcWYsbGHX6sqxwXS58m37GrX979XA2dxaCevpkdFQm8eORpnrKSgYGWCFcDESTKdNU3MSpln8QdsAScvveHjr5HmR317lyD3rB12/5ufhC3Rajkafsizo+uyIXSsNseHq7RiewLNKQSqPdbQ+BE94cb20jinhuUjMtyPEg1pyPt8/PDQaNpPdRxAtqEwjvn3lEHpZ+bQNqF8ciwvayk+95zWMLNXARCRaXuM/DMknGeqnJpOVe4uTNQP2o+cssoZ9IbRFJunh6khIh3csgMPbfnRfcYdNqtv6CiJLLLOBZIjJoM2ZUtBjRx9j1Tquchg8Ow7Q5CdVu/66detIzf1op313pq7bE3b81E6jy+UNxHFGtwKBSgn6TDJgO4VxY1O1fXug1L7ParlGcI/Ro9J+y/uxuha6MQ9t0NQFTOGYns7ebXbMqVXBzx5h7p8QaMTk4F3TqGaEzvxzhw0yvYxbmSOtg3a2FZb+bX1BUxcmjpj9WpP+EiKnKw+hC7/3PaSFbLmcO3bE261KeFznDwbzIC5p0vt/lwQgFQg4GPxhjv1eSXe144opBth4u4kb0Uluv10YIySOegruptl0LwPk5Ca9277NYDnLP3ZqesuQj/QH8P99peNq9SyQqgBnCMhnck= 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)(396003)(346002)(376002)(136003)(39860400002)(46966006)(36840700001)(70586007)(7696005)(478600001)(6286002)(70206006)(86362001)(82310400003)(83380400001)(36860700001)(8936002)(5660300002)(36906005)(1076003)(6666004)(4326008)(54906003)(36756003)(2906002)(316002)(55016002)(109986005)(8676002)(82740400003)(2616005)(7636003)(47076005)(426003)(186003)(356005)(26005)(16526019)(336012)(266003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2021 14:04:55.1995 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0b09c400-62d5-4574-79cb-08d95cd0ff37 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: DM6NAM11FT064.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB4131 Subject: [dpdk-dev] [PATCH v2 07/15] app/testpmd: support shared Rx queues for IO forwarding 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" Supports shared Rx queue. If shared Rx queue is enabled, group received packets by stream according to mbuf->port value and then and forward in stream basis as before. If shared Rx queue is not enabled, just forward in stream basis. Signed-off-by: Xueming Li --- app/test-pmd/iofwd.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/app/test-pmd/iofwd.c b/app/test-pmd/iofwd.c index 83d098adcb..316a80d65c 100644 --- a/app/test-pmd/iofwd.c +++ b/app/test-pmd/iofwd.c @@ -44,25 +44,11 @@ * to packets data. */ static void -pkt_burst_io_forward(struct fwd_stream *fs) +io_forward_stream(struct fwd_stream *fs, uint16_t nb_rx, + struct rte_mbuf **pkts_burst) { - struct rte_mbuf *pkts_burst[MAX_PKT_BURST]; - uint16_t nb_rx; uint16_t nb_tx; uint32_t retry; - uint64_t start_tsc = 0; - - get_start_cycles(&start_tsc); - - /* - * Receive a burst of packets and forward them. - */ - 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; - fs->rx_packets += nb_rx; nb_tx = rte_eth_tx_burst(fs->tx_port, fs->tx_queue, pkts_burst, nb_rx); @@ -85,8 +71,15 @@ pkt_burst_io_forward(struct fwd_stream *fs) rte_pktmbuf_free(pkts_burst[nb_tx]); } while (++nb_tx < nb_rx); } +} - get_end_cycles(fs, start_tsc); +/* + * Wrapper of real fwd engine. + */ +static void +pkt_burst_io_forward(struct fwd_stream *fs) +{ + return do_burst_fwd(fs, io_forward_stream); } struct fwd_engine io_fwd_engine = { From patchwork Wed Aug 11 14:04:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 96808 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 65D6CA0C47; Wed, 11 Aug 2021 16:05:43 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8E8ED4121F; Wed, 11 Aug 2021 16:05:00 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam08on2055.outbound.protection.outlook.com [40.107.101.55]) by mails.dpdk.org (Postfix) with ESMTP id 2256B41212 for ; Wed, 11 Aug 2021 16:04:58 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Er2iG/w5idOuETWOeMNSf2E2r5CGqvmC/KIgeGhMfCXw4XwuVEtWBeXH5gDjMV7qFzgqKPDiJ71o/vOKo+GA350pW3w7GKTW1t8frXr38uvhxd4tkF4CO8mAQETp9LA6wuCkxo1QCuvPy219PbWHoyVz+TSIr75Ba9aw/dPL/NPeIfJF13PBwYSIvsfjiTmcuPt4Ubv+vZgl+CcBv6rZeoKNtFVSqkr6IP2ob2t2747ZrDwjgWfwOCj2B44RV376oDE3zvZBAM12aOvx9Xm7/wAjOQL/eKBTpmHUPBN3j2qBZyAsBPyj3JA+Z3iN1pp/wQwSHHdAkYSbXsyza53VCQ== 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-SenderADCheck; bh=lG0+gFgASHKu4/xOgmiO0Ejyn3390quxGiNlnXxFIjQ=; b=S8HDSYXly98HYa38bfjjJxVhlMedxGZEd4prpZRA/f2BdICrS63S4rvxZKX/qDJOtYyESscMSINqwSfZk6CvMFJ2B64YGoBjzC74bV6Vq8/rCOMh037Cnsu+V9x8cqNMjQ0oL7u+kRI6CaOwaDD7BE1AjJTMnr89zDEcLEXN4c/mqNMeQbT7s9BqZ/icRI1Ba6fNs6bkg4TnGcn8CJE9YXuIAWmwOM4JvFG7em7bWmX9O+jGN61StNCPGtT/gbau4sDnMzbDKUmlI+530oilVa9pvuW7Fwk6vzlCL5mkeAeV/ywOxcUOuKtiZKcdmqeFypZQd9ZyzVskoCo3rU0YzA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=none 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=lG0+gFgASHKu4/xOgmiO0Ejyn3390quxGiNlnXxFIjQ=; b=gKOYm80vhGzOLICLUg3M3xiyG2/yXu+6j5WwaNIBhuL48DnfHs1DkHTxtj1aaq8kP8XoRIxdzKuurA9CI41TsY2UNuPBord3MVtFtDM6uH53YzLoPGnX0J4II6osxynTfxhmobJO+G3pfv6J/ErKE7655DJzXGFPq1nU/nlySBdD4eiiq1uw/ToeEWTzJ8nSpv66MeaQtoMpXUiyJTtdl3SUUE03o9uyaRab6FCNSZPX1zzj4H0lk3FKXmULqFQ7F9UpjZgarCnuZ/ANU+OYJVLu2jr+5x1xy3YrmCjng6gvK6c1HI1e8263GN8n0MBU3nURvo2dh/UiaV/cpnPSlA== Received: from DS7PR03CA0223.namprd03.prod.outlook.com (2603:10b6:5:3ba::18) by BL1PR12MB5238.namprd12.prod.outlook.com (2603:10b6:208:31e::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.19; Wed, 11 Aug 2021 14:04:56 +0000 Received: from DM6NAM11FT034.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3ba:cafe::e1) by DS7PR03CA0223.outlook.office365.com (2603:10b6:5:3ba::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.13 via Frontend Transport; Wed, 11 Aug 2021 14:04:56 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT034.mail.protection.outlook.com (10.13.173.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4415.14 via Frontend Transport; Wed, 11 Aug 2021 14:04:56 +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.2; Wed, 11 Aug 2021 14:04:54 +0000 From: Xueming Li To: CC: , , Xiaoyun Li Date: Wed, 11 Aug 2021 17:04:10 +0300 Message-ID: <20210811140418.393264-8-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210811140418.393264-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20210811140418.393264-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 213d6992-089f-4718-a92a-08d95cd0ffe3 X-MS-TrafficTypeDiagnostic: BL1PR12MB5238: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0848oZte1xTmqJkfbJ+xA8FTYYp0E890GOieAYVSit/tWuBh3UeWgIoRq3p1Yp7befBv3Ac9tGkYiipfn8N9im+TRb7nLsOUvY7JbgRqI9ukjLXOf/QNqF4C2uBsm8LueV8/uSecwfHeBvFy1hYbVrXiUcPK1fRcfSGu4dWcLwH6RZrMdETTh+P1A8K82cKFJwdkQdq6PWEZN3vD9nW/CwQKuLJYCcDy12dVfUBKJa13WidrGRuiX7miSzyLXLAyZCAXqc+0sNYMkQXCGcfQhIS/74ea+VWAIaSUAez3/VhMEtDbFbtmzVto/nPToRRawAIXQF+LzkhJ+9YRupozvDnyLlDLizZcekKPNUT02D3c5s9A1U2/rjUAWcY4nYelGT+5cbtKk80zxzdHY46pOZi383mH7sHCj4rSkqa9x1aJkHgndwG8iJA78O78dyvaRzSh+SXGebHiUggBlSH8Fc1HmHY1J243OT7xTeLnt5fk294eLcCe5/IPXlKGzA8nIn/9gj1AUB1zqH9ErUrI12/e73N86R1a4b741VCC+95wZyWpggbpxGsN3oRzq5NnzE08567fXmC8acXkfbBWxEkIK118ikWLJSr0RA/lnVcH9RLqLyp7I6aUEu3+skTYbiqc5gM80vsf0UzCqtZNdxebR2Np/X9kavvU2t0a53UpiQ/5b3NyFg4dcz/2gTlFpOO1uX/9NL6doptC/ba+40EOed3kCcCdbyB6PG42FLU= 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)(186003)(7696005)(4326008)(26005)(70586007)(5660300002)(36906005)(508600001)(70206006)(54906003)(109986005)(7636003)(316002)(8676002)(8936002)(16526019)(36756003)(2616005)(83380400001)(47076005)(1076003)(426003)(336012)(6666004)(6286002)(55016002)(356005)(82310400003)(36860700001)(86362001)(2906002)(266003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2021 14:04:56.4639 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 213d6992-089f-4718-a92a-08d95cd0ffe3 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: DM6NAM11FT034.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL1PR12MB5238 Subject: [dpdk-dev] [PATCH v2 08/15] app/testpmd: support shared Rx queue for rxonly forwarding 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" Supports shared Rx queue. If shared Rx queue is enabled, group received packets by stream according to mbuf->port value and then and forward in stream basis as before. If shared Rx queue is not enabled, just forward in stream basis. Signed-off-by: Xueming Li --- app/test-pmd/rxonly.c | 34 +++++++++++++--------------------- 1 file changed, 13 insertions(+), 21 deletions(-) diff --git a/app/test-pmd/rxonly.c b/app/test-pmd/rxonly.c index c78fc4609a..80ae0ecf93 100644 --- a/app/test-pmd/rxonly.c +++ b/app/test-pmd/rxonly.c @@ -41,32 +41,24 @@ #include "testpmd.h" /* - * Received a burst of packets. + * Process a burst of received packets from same stream. */ static void -pkt_burst_receive(struct fwd_stream *fs) +rxonly_forward_stream(struct fwd_stream *fs, uint16_t nb_rx, + struct rte_mbuf **pkts_burst) { - struct rte_mbuf *pkts_burst[MAX_PKT_BURST]; - uint16_t nb_rx; - uint16_t i; - uint64_t start_tsc = 0; - - get_start_cycles(&start_tsc); - - /* - * Receive a burst of packets. - */ - 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; + RTE_SET_USED(fs); + rte_pktmbuf_free_bulk(pkts_burst, nb_rx); +} - fs->rx_packets += nb_rx; - for (i = 0; i < nb_rx; i++) - rte_pktmbuf_free(pkts_burst[i]); - get_end_cycles(fs, start_tsc); +/* + * Wrapper of real fwd engine. + */ +static void +pkt_burst_receive(struct fwd_stream *fs) +{ + return do_burst_fwd(fs, rxonly_forward_stream); } struct fwd_engine rx_only_engine = { From patchwork Wed Aug 11 14:04:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 96810 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 6B23EA0C47; Wed, 11 Aug 2021 16:05:58 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 067304122A; Wed, 11 Aug 2021 16:05:03 +0200 (CEST) Received: from NAM02-SN1-obe.outbound.protection.outlook.com (mail-sn1anam02on2055.outbound.protection.outlook.com [40.107.96.55]) by mails.dpdk.org (Postfix) with ESMTP id E81454120A for ; Wed, 11 Aug 2021 16:04:59 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EYLlY7SF9Jli/CIjodMPlhhvL2RGKxUBWpg/GOZXl9l/9PJvrQm5zg5klKUGUv0xD1BJhSuMyEQqP6jyhP6Es2nklwTr6ZPnZ1MGpm4sm9QedtMsXB7pr9WmKNuXuquR9F4nzuAQ/2Q9a0mkAqmgHzGCMmCiCokZP2V3aJy4XqLdJgpiGFker94r6+zEObW1e8z5ttxyWS6moFCBS5jpj3jLUaHoJOZ/RfY5DCsTh8oacgD/98hkjxzV8sMvycaI+CIKY03nlMkjbZXdSIcSd2C0onkjxwJ1/lPUPuyzq49ymvUVIDtWlBG6q8/Xj1QsGl2LYP2oF2g6nvwc6NEDpg== 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-SenderADCheck; bh=vtiWh3rEGgdvTw2CueDZuidKATYnKjsdHz+L1tQhK60=; b=larY+Qg+S4EMKKr1Q+v+39v/886TUK5TQQZSZAJ1YpYAsoQk5G8pBH//uTARKF9o3IrAzaTZuFOHjeAkJML9xMLR7GEqcwF5oA+RbZERXtwE+STj1ouRlvR+ZtMsl+3YKGiv6fL+uMPB9AC44Rpbqlj/IuwM1ziDgKZW23zHQ4qWMqU0LlPnA7GASiTFQu+lfAsdhxzdZa/oU5tMMllnbuIeYxNEspnl6ClOY7hG3lZF2CYwmChptuf8OcJoM+OJLDxktW8Ks1iDweqNpIBtJUTVItrSZNpspjLO8hyrm6Ulp4V8S2oBC7kz9fCUxre2PFQshaxLvtPNiNTwh9T1Mg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=none 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=vtiWh3rEGgdvTw2CueDZuidKATYnKjsdHz+L1tQhK60=; b=EPUzMWVLXmxfOh+Kpy3OjyXTpl1qjnCIQ+zypH4LLzI1pDW562/FwiCcNDPIQaU2dCrPwh0/zsbMTR5mtTCWCk0Tz65dzfarx6Ku1ASuaNh5E81sSkCt/jrQ1nZNEBiQPD3zvquW09kuRn01+Euu9ExfmvtUqJk8aCxZN2Dn5wONlbf+O0Xc+UcXGanIsUxjz7+ukb61q5reAQw3bUvH8azA2HLUy9MxW5Mcif3LYA6Vn65EtmwOKj5GBOpvJvOYfCOvBfm2Xm1p/GxunlHUn6X5TvOihui+QXxfTaa9dsWt7qQMcLMTYyqA4NNfNrP0SYvRKMklj0SNXfLN1psuGw== Received: from DM6PR18CA0005.namprd18.prod.outlook.com (2603:10b6:5:15b::18) by CH2PR12MB3784.namprd12.prod.outlook.com (2603:10b6:610:21::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.21; Wed, 11 Aug 2021 14:04:58 +0000 Received: from DM6NAM11FT014.eop-nam11.prod.protection.outlook.com (2603:10b6:5:15b:cafe::79) by DM6PR18CA0005.outlook.office365.com (2603:10b6:5:15b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.16 via Frontend Transport; Wed, 11 Aug 2021 14:04:58 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT014.mail.protection.outlook.com (10.13.173.132) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4415.16 via Frontend Transport; Wed, 11 Aug 2021 14:04:57 +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.2; Wed, 11 Aug 2021 14:04:56 +0000 From: Xueming Li To: CC: Xiaoyu Min , , , Xiaoyun Li Date: Wed, 11 Aug 2021 17:04:11 +0300 Message-ID: <20210811140418.393264-9-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210811140418.393264-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20210811140418.393264-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d4ab47eb-fb93-46c6-4b49-08d95cd100c3 X-MS-TrafficTypeDiagnostic: CH2PR12MB3784: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5516; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: swogyNLrjCQAYrxwhupwe8aUJXyIUbB3LYAHXJ4rvNqIfmnoTfkZiqBA0yJ5XC0aIKYYIvxhNf+ajGCFdvxu1d19k2I1mUNNRFC8vkRzlK58Qp3YtM7M9nkYvGh/4Q4pen+MsHJ942QrvnhOQfNkqReB9KC1aAIG8kCcBA3L4VpixgCgohvGCsnShllCLLikHn6aMC7sSVM3mMhafDTNDybOAwg3/PNeqzve4cWa8yhD7IS+27/gtJJ0sp5WD/W0HB3laoIcpqEcSiM5sklaEVXPOYmQeh3eJZzNa5fxp+C0ff8Vu7GoJVRY4mRQEjeW4RdB1dbbKBt9oLVrKp6bVRjEb9ZLqov+lpiKx7U/eJ+0iMZWACSUsNQsBvI0o5wQKlq3SWwe75hkFqKylNta3MWWnxHwNxYc0aYHBi1aRHuw4qnNoRumgSnLsqCjXQrfIbXv2T9OwSQjze5O6lKMVfgSXRZp2Jc/ImcKqhg3z5Bxk+qJtjGm+NgJG8fjg70w1jBHDZ9HxOZFle92+MqnaYFd5bLOaQ2biaizVUvSEk8zc9Qjm5MkBjn+gLbFmtBaA/YNHoTIXgyMH5iVAyf9dEaasBGoShYheShha9Wc8z6oIRLzeOgeKFwH6Wg0Z2OSrXsoMkhS9xjxJ2wNCMOkuOYNQgfPCghf/WRC62ipmA93GZ2+6nMKSIMrZLyhUEnLMer0xlxDxWiTVaPMe/uPZiyi71L/2XAB/4ZhLwrpE7Y= 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)(346002)(376002)(396003)(136003)(39860400002)(46966006)(36840700001)(16526019)(6286002)(7696005)(86362001)(2906002)(186003)(70206006)(4326008)(356005)(82740400003)(70586007)(8936002)(36756003)(8676002)(6666004)(26005)(336012)(55016002)(478600001)(7636003)(83380400001)(426003)(316002)(36906005)(54906003)(109986005)(36860700001)(47076005)(2616005)(5660300002)(82310400003)(1076003)(266003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2021 14:04:57.9275 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d4ab47eb-fb93-46c6-4b49-08d95cd100c3 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: DM6NAM11FT014.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB3784 Subject: [dpdk-dev] [PATCH v2 09/15] app/testpmd: support shared Rx queue for icmpecho fwd 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" From: Xiaoyu Min Add support of shared rxq. If shared rxq is enabled, filter packet by stream according to mbuf->port value and then fwd it in stream basis (as before). If shared rxq is not enabled, just fwd it in stream basis. Signed-off-by: Xiaoyu Min --- app/test-pmd/icmpecho.c | 33 +++++++++++++-------------------- 1 file changed, 13 insertions(+), 20 deletions(-) diff --git a/app/test-pmd/icmpecho.c b/app/test-pmd/icmpecho.c index 8948f28eb5..d6d11a2efb 100644 --- a/app/test-pmd/icmpecho.c +++ b/app/test-pmd/icmpecho.c @@ -267,13 +267,13 @@ ipv4_hdr_cksum(struct rte_ipv4_hdr *ip_h) (((rte_be_to_cpu_32((ipv4_addr)) >> 24) & 0x000000FF) == 0xE0) /* - * Receive a burst of packets, lookup for ICMP echo requests, and, if any, - * send back ICMP echo replies. + * Lookup for ICMP echo requests in received mbuf and, if any, + * send back ICMP echo replies to corresponding Tx port. */ static void -reply_to_icmp_echo_rqsts(struct fwd_stream *fs) +reply_to_icmp_echo_rqsts_stream(struct fwd_stream *fs, uint16_t nb_rx, + struct rte_mbuf **pkts_burst) { - struct rte_mbuf *pkts_burst[MAX_PKT_BURST]; struct rte_mbuf *pkt; struct rte_ether_hdr *eth_h; struct rte_vlan_hdr *vlan_h; @@ -283,7 +283,6 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs) struct rte_ether_addr eth_addr; uint32_t retry; uint32_t ip_addr; - uint16_t nb_rx; uint16_t nb_tx; uint16_t nb_replies; uint16_t eth_type; @@ -291,22 +290,9 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs) uint16_t arp_op; uint16_t arp_pro; uint32_t cksum; - uint8_t i; + uint16_t i; int l2_len; - uint64_t start_tsc = 0; - - get_start_cycles(&start_tsc); - - /* - * First, receive a burst of packets. - */ - 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; - fs->rx_packets += nb_rx; nb_replies = 0; for (i = 0; i < nb_rx; i++) { if (likely(i < nb_rx - 1)) @@ -509,8 +495,15 @@ reply_to_icmp_echo_rqsts(struct fwd_stream *fs) } while (++nb_tx < nb_replies); } } +} - get_end_cycles(fs, start_tsc); +/* + * Wrapper of real fwd engine. + */ +static void +reply_to_icmp_echo_rqsts(struct fwd_stream *fs) +{ + return do_burst_fwd(fs, reply_to_icmp_echo_rqsts_stream); } struct fwd_engine icmp_echo_engine = { From patchwork Wed Aug 11 14:04:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 96811 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 7B34CA0C47; Wed, 11 Aug 2021 16:06:06 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2B22A41230; Wed, 11 Aug 2021 16:05:04 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2081.outbound.protection.outlook.com [40.107.243.81]) by mails.dpdk.org (Postfix) with ESMTP id 1CEE741227 for ; Wed, 11 Aug 2021 16:05:02 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WTpL/HtMjezNNsNxhT5ppyM5rCZ66mCJLapwzomgjiZ8l/F7/ZSIeItJGK5UKfoGzgQ/Wwg+KIDPEpI5HnwBeiTTYqTjuYgM7hi4pGNkPRg7/CtUkB/wXuvi1V4j2Brem7Y7+LwIKqXMXE859FaTqHFppQm8RcYCKJhTBYMigvtZMxtasKagniZMjd3WP85sUWrAWG3WTIToTqpFbY61bRIPts3jFwkgsiPiLIUG8GgfyG00UHPB5Tdy+hZqSbqr4PUn4MN7pre4wANaJEZfY/0h1PsHM0VUETsX7+99NU+ZmoVhGKbeYaWaSc9cpV3RmND7vFGH8iV6qmr5fohsZg== 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-SenderADCheck; bh=DM1wGAMKBJmRHire59yji3klC07g/7KVivRKdCrqnW0=; b=mvpnVGOTYxy2H/a33/e021Ib+NXNvW2fcUpHUKOocnfyOtycu6En5m7HGrPoxLjDKsnDHHEXNRGd5M7rTe0kvFc0/XSxbwC/+ULKQ1D7ZYhbaNWODnCs0GAPvOzyb7D3nHnOtmR02LHyJ2ZGx8UJSWypoJHKMK5X4Dt+kJh/gZwlL/3en23PmgvzzaESNVvGipnHRM3K027lmljCbFuNGOlSHBBFBaF0rruNOePeNXgPdTfPDvArJ8ms9iW/c1/xNLPoafT/Kon1zNJOZr+q7iMMDMj4WCBBVMYuOPjhS5p5eHrDGbewX3AgwyLm6RpX0QOIv+yHd1ouqCwgMeoWiw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=none 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=DM1wGAMKBJmRHire59yji3klC07g/7KVivRKdCrqnW0=; b=IopAzgmxERdFjj3FlxX2XvFMYOJ1i6FCKA0MyJkr5+vReo/W8TvDERDebA9YnAXSbkTYzNt7BcLNW7F89sAtiJCFH8MDken5chD0WjVzda+/I2zyLvRGt9Tqvi+2LPjs7SVzqgaDKYf/Q2pFgItlOlyAkwbvPxf/0zbggBX3qhsVxPWLtcGmuzz6dRpewo7rCLv057zBZ0X0yJyqqGbsIY5jFvIqABEe+maB+6+xK/8UvyGYPEzr1ZE8lZj/T8D8t+Ig/rdTj+zyK1yzd9qyHki7zli360q8xoIYDtBKZV+csAPwe0Ycl3LxsZ/tnLD/YMJ7/PuEq/sLIBhgO7CNwQ== Received: from DS7PR03CA0142.namprd03.prod.outlook.com (2603:10b6:5:3b4::27) by BY5PR12MB3939.namprd12.prod.outlook.com (2603:10b6:a03:1a5::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.17; Wed, 11 Aug 2021 14:05:00 +0000 Received: from DM6NAM11FT042.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3b4:cafe::d9) by DS7PR03CA0142.outlook.office365.com (2603:10b6:5:3b4::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.13 via Frontend Transport; Wed, 11 Aug 2021 14:05:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT042.mail.protection.outlook.com (10.13.173.165) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4415.14 via Frontend Transport; Wed, 11 Aug 2021 14:05:00 +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.2; Wed, 11 Aug 2021 14:04:57 +0000 From: Xueming Li To: CC: Xiaoyu Min , , , Xiaoyun Li Date: Wed, 11 Aug 2021 17:04:12 +0300 Message-ID: <20210811140418.393264-10-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210811140418.393264-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20210811140418.393264-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b08b6ebf-4e97-4e99-37e5-08d95cd10213 X-MS-TrafficTypeDiagnostic: BY5PR12MB3939: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:5797; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: LKe5wdXPmPfnIQItkX+UG/RiS0hwF1MQbnNBWgRqJZ1i6w5JBnnKYRRuIZXhL6aaM+cPqMpkhBHj6bHW3Th0j+sikOKQzfgeiNof42ur2Hdht7tk20CI0iWrzdvl5vS+uEgVkrq2oNrxWPUjgjjvEr/jV8TWSrMuUO8S8Hc93a4jCNQqU6Pn5yW3oa8mwkbrvy7Y3Jw19RzzvOKn9rwz1wHSTfvhV2bL5Z8AnwScePC1pdqf8XfcEN1a1SZytUAnr1MGYMuAa+66yxJQenOOVzPBVnusN5Jt5qHQcpQbmHBd677JuUe5GVwzavL7dLEUAsdc4cmvRyW/rNEbgx9Ffwm2PEyqUvag3HOvyXkbxjKLVtvDi3iq8UdKm1ZeH/MzQTqwA1UB0LC6VeZpX4X663Xgvli/Lk5eBV5Lnbp7QdxWm6qeI7irl0Tl5lua8yCvlfU1jstQyU1QPU+DZrL6MSTasU0Hw5/gt4sRsg97Luj8FAnj3y0nb49MKOVM6UaBau+gf8xzLbTgZXmslQQZclhu24VyToHMfRLKwEk/2y2vgFGez6pYvSVo+Q+I1SqXIKErBf0hn75mLIsjpjHz8VKRDsa8i4PiRK3PSZOWEgb4u/hGiIbXQNr3GQzwNOtWqidJDI3Wj58wSnkh1VUCpsK1CH6WEj6uSP6bIi0LMgfFt8jClVwv1ujvwebPgTqv+4HQikHcQXEvV6tUAgtjW4aiO99AE+0XSLK6VYHNe2w= 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)(26005)(16526019)(1076003)(2906002)(7696005)(316002)(70586007)(70206006)(4326008)(54906003)(5660300002)(508600001)(83380400001)(7636003)(356005)(8936002)(36906005)(82310400003)(6666004)(36860700001)(2616005)(47076005)(6286002)(86362001)(426003)(8676002)(55016002)(36756003)(109986005)(336012)(266003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2021 14:05:00.1250 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b08b6ebf-4e97-4e99-37e5-08d95cd10213 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: DM6NAM11FT042.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB3939 Subject: [dpdk-dev] [PATCH v2 10/15] app/testpmd: support shared Rx queue for csum fwd 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" From: Xiaoyu Min Add support of shared rxq. If shared rxq is enabled, filter packet by stream according to mbuf->port value and then fwd it in stream basis (as before). If shared rxq is not enabled, just fwd it in stream basis. Signed-off-by: Xiaoyu Min --- app/test-pmd/csumonly.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/app/test-pmd/csumonly.c b/app/test-pmd/csumonly.c index 607c889359..3b7fb35843 100644 --- a/app/test-pmd/csumonly.c +++ b/app/test-pmd/csumonly.c @@ -763,7 +763,7 @@ pkt_copy_split(const struct rte_mbuf *pkt) } /* - * Receive a burst of packets, and for each packet: + * For each packet in received mbuf: * - parse packet, and try to recognize a supported packet type (1) * - if it's not a supported packet type, don't touch the packet, else: * - reprocess the checksum of all supported layers. This is done in SW @@ -792,9 +792,9 @@ pkt_copy_split(const struct rte_mbuf *pkt) * OUTER_IP is only useful for tunnel packets. */ static void -pkt_burst_checksum_forward(struct fwd_stream *fs) +checksum_forward_stream(struct fwd_stream *fs, uint16_t nb_rx, + struct rte_mbuf **pkts_burst) { - struct rte_mbuf *pkts_burst[MAX_PKT_BURST]; struct rte_mbuf *gso_segments[GSO_MAX_PKT_BURST]; struct rte_gso_ctx *gso_ctx; struct rte_mbuf **tx_pkts_burst; @@ -805,7 +805,6 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) void **gro_ctx; uint16_t gro_pkts_num; uint8_t gro_enable; - uint16_t nb_rx; uint16_t nb_tx; uint16_t nb_prep; uint16_t i; @@ -820,18 +819,6 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) uint16_t nb_segments = 0; int ret; - uint64_t start_tsc = 0; - - get_start_cycles(&start_tsc); - - /* receive a burst of packet */ - 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; - - fs->rx_packets += nb_rx; rx_bad_ip_csum = 0; rx_bad_l4_csum = 0; rx_bad_outer_l4_csum = 0; @@ -1139,8 +1126,15 @@ pkt_burst_checksum_forward(struct fwd_stream *fs) rte_pktmbuf_free(tx_pkts_burst[nb_tx]); } while (++nb_tx < nb_rx); } +} - get_end_cycles(fs, start_tsc); +/* + * Wrapper of real fwd engine. + */ +static void +pkt_burst_checksum_forward(struct fwd_stream *fs) +{ + return do_burst_fwd(fs, checksum_forward_stream); } struct fwd_engine csum_fwd_engine = { From patchwork Wed Aug 11 14:04:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 96812 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 6ED58A0C47; Wed, 11 Aug 2021 16:06:15 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AED1E4123C; Wed, 11 Aug 2021 16:05:05 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2081.outbound.protection.outlook.com [40.107.243.81]) by mails.dpdk.org (Postfix) with ESMTP id 72BAE41229 for ; Wed, 11 Aug 2021 16:05:02 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iCsGJdvAXquJp2CCMOK8dJY3m3w+igP/4TVkAXJ6IM8AVghyXwPWq994YcE2zvlEkbM7wDw4Saq+SI3FOXrKPtAmljsATHU3lzazzvzf2vUGV/heNCOzb7AL3x8w9lvk4gh9k7BQjpsk7NWYectgkduZF6QI/HJhUwfrL/GBeTWEKGKtUlZSVdeIx7W+Zp+GTZztIbAdMr4zppLMUxTzE8DI4mTJ3eBbfZQXOKYIMhWonpz6tpQvSRqFyf2qhU80WHohmMpbnPUJRmOH5LIIgG/mSePRludyPqd0FpgN4oCuiLwTiOvakj0ZZN6ijlmclzzknPFd7wAvgyehIhhZNg== 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-SenderADCheck; bh=aWt0ZZy+XYm0eZkoPN9wbBn+iBPyAqPsRLfsMmQSM1Y=; b=K0KRWiA69EQCVnrkI24AEQGqlEg+arkBOpVY+5RT1JRPP8u6h6xtAr3zASWbbp7cfEsUhYRHtJEFRPMHXnPoy6F92CRXiNmRJUmwT0FZNCDzxJh9gRRivZSINYxIPAZErQirIbWwmiGwucJoGtZABpvIkV79Ki5zsd0zTn2Egq/iCS3+R4eKX44NewxSM6LydwTnBlWfUvrbOcZi5fefhzst/9gSbmHcViI018C0JGHizQwS+4fVOvcPzhww6xdBJcoPygla2q0oIfnLwmZNAn89z3dgTHg3zioMHTHpnhiTX7TQrdeIvDDetOjvoY8otp/iVog8Y1HJEF763Spbyw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=none 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=aWt0ZZy+XYm0eZkoPN9wbBn+iBPyAqPsRLfsMmQSM1Y=; b=RaIQbG2iq968KOOaF5cWTmPWitdwNw9hdODbaTDATr6VM/3Ky7XXBXJX78YPtodL4tT7qssRfOE5QTVFY/EMToGaz15OYlv0Iz53Piek0wfrtNciTqTBGBREDs+RoHUNXK6LcmZC1mxa93ezc7Ct3fiwX2OsUqIps0IahOEL3UEmjgtHo+28hXJ45XpZhFkVY5lOHq5UjJpvICY3NI1avfWcrSx8KNKObJXbBUCrV2YLGSkDpIJ7HLzvtkhCre5FOFgd38AYLWn7kzUHt8QdWkCP3roN9MVyKqP/YO+LFy+HvQmsyhoBRF/gv6QMGRENDZC7qDMG8pahN08ORPv2NQ== Received: from DS7PR03CA0142.namprd03.prod.outlook.com (2603:10b6:5:3b4::27) by BY5PR12MB3939.namprd12.prod.outlook.com (2603:10b6:a03:1a5::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.17; Wed, 11 Aug 2021 14:05:00 +0000 Received: from DM6NAM11FT042.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3b4:cafe::d9) by DS7PR03CA0142.outlook.office365.com (2603:10b6:5:3b4::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.13 via Frontend Transport; Wed, 11 Aug 2021 14:05:00 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT042.mail.protection.outlook.com (10.13.173.165) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4415.14 via Frontend Transport; Wed, 11 Aug 2021 14:05:00 +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.2; Wed, 11 Aug 2021 14:04:59 +0000 From: Xueming Li To: CC: Xiaoyu Min , , , Xiaoyun Li Date: Wed, 11 Aug 2021 17:04:13 +0300 Message-ID: <20210811140418.393264-11-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210811140418.393264-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20210811140418.393264-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4a05adc6-5f9d-44fa-1767-08d95cd10270 X-MS-TrafficTypeDiagnostic: BY5PR12MB3939: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3826; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: rupFu9rhk+bcSBdcT8WMebl+pgIWfVV3NJBHNO7zDfcFjLm9JkjSzVqj2ksOh2I7fQD0u+mepPMgqvKXZMxPLcfNkLvkYFVLkW6wyKQQ+AEPUNLTIoiZl3z6yJBsiThZOge089CRBL+4I8/KbtC1NsWHv+4cASicHx7X3W7nIQ+53q1ftklsdRLcYXpxozZBlPFA7hc2iwummXnje4SdpJAJXqx8zn4mo+l6pANuqD9IQj19zKCQJmbQ6Zn2j5An1AtqSfdLSEwPRB47dwARFU6T95W3GoZ9KocDbJ9oK362i2vmCG8OqTXx9dBRmaFfIBqnBN7Q2bu6cw2g71pBGu2ZTCxiEKbX5HcNPG8E/Qgnp/lKVLzMTiiuzrShQHtEgJDlOFKmoqQRpgUb64tZ3+q9UxfIAMaguLn9Kon3aXnIFnihZLmAJqUF4IzvPqL5c1RFMy+pGOlhfdBpQ+TuCSe8onymJP7adZoQhvIKY9IiEy+6lSQZZOiVPBs42WH+l3/E+aZ3cF/+wV4rb2HuvAZPiIMPT1j25Djle15fPRPIPuqwbmriiR2QGJqLk4pBgPAADZHBdVe1x2kB01qznnGLS2kk785KIDiwKfuChhPc2nmqDbTfpzWgNxYP6H/TKaxX4cYRIq9u00bVYGj6WF5FCrLcn0te1CtC9xp64G0+VJLg2TSa1omGc9YMWvUZ6Opaq9Cmuj/NbsqcDtACmd7i4yV6Tk2mMCdakKkusiY= 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)(26005)(16526019)(1076003)(2906002)(7696005)(316002)(70586007)(70206006)(4326008)(54906003)(5660300002)(508600001)(83380400001)(7636003)(356005)(8936002)(36906005)(82310400003)(6666004)(36860700001)(2616005)(47076005)(6286002)(86362001)(426003)(8676002)(55016002)(36756003)(109986005)(336012)(266003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2021 14:05:00.7397 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4a05adc6-5f9d-44fa-1767-08d95cd10270 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: DM6NAM11FT042.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY5PR12MB3939 Subject: [dpdk-dev] [PATCH v2 11/15] app/testpmd: support shared Rx queue for flowgen 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" From: Xiaoyu Min Add support of shared rxq. If shared rxq is enabled, filter packet by stream according to mbuf->port value and then do stats in stream basis (as before). If shared rxq is not enabled, just as usual in stream basis. Signed-off-by: Xiaoyu Min --- app/test-pmd/flowgen.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/app/test-pmd/flowgen.c b/app/test-pmd/flowgen.c index 3bf6e1ce97..d74c302b1c 100644 --- a/app/test-pmd/flowgen.c +++ b/app/test-pmd/flowgen.c @@ -83,10 +83,10 @@ ip_sum(const alias_int16_t *hdr, int hdr_len) * still do so in order to maintain traffic statistics. */ static void -pkt_burst_flow_gen(struct fwd_stream *fs) +flow_gen_stream(struct fwd_stream *fs, uint16_t nb_rx, + struct rte_mbuf **pkts_burst) { unsigned pkt_size = tx_pkt_length - 4; /* Adjust FCS */ - struct rte_mbuf *pkts_burst[MAX_PKT_BURST]; struct rte_mempool *mbp; struct rte_mbuf *pkt = NULL; struct rte_ether_hdr *eth_hdr; @@ -94,23 +94,14 @@ pkt_burst_flow_gen(struct fwd_stream *fs) struct rte_udp_hdr *udp_hdr; uint16_t vlan_tci, vlan_tci_outer; uint64_t ol_flags = 0; - uint16_t nb_rx; uint16_t nb_tx; uint16_t nb_pkt; uint16_t nb_clones = nb_pkt_flowgen_clones; uint16_t i; uint32_t retry; uint64_t tx_offloads; - uint64_t start_tsc = 0; static int next_flow = 0; - get_start_cycles(&start_tsc); - - /* Receive a burst of packets and discard them. */ - nb_rx = rte_eth_rx_burst(fs->rx_port, fs->rx_queue, pkts_burst, - nb_pkt_per_burst); - fs->rx_packets += nb_rx; - for (i = 0; i < nb_rx; i++) rte_pktmbuf_free(pkts_burst[i]); @@ -213,8 +204,15 @@ pkt_burst_flow_gen(struct fwd_stream *fs) rte_pktmbuf_free(pkts_burst[nb_tx]); } while (++nb_tx < nb_pkt); } +} - get_end_cycles(fs, start_tsc); +/* + * Wrapper of real fwd engine + */ +static void +pkt_burst_flow_gen(struct fwd_stream *fs) +{ + return do_burst_fwd(fs, flow_gen_stream); } struct fwd_engine flow_gen_engine = { From patchwork Wed Aug 11 14:04:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 96813 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 22FD7A0C47; Wed, 11 Aug 2021 16:06:22 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D0B3241241; Wed, 11 Aug 2021 16:05:06 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2068.outbound.protection.outlook.com [40.107.243.68]) by mails.dpdk.org (Postfix) with ESMTP id 5E4A141233 for ; Wed, 11 Aug 2021 16:05:04 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HRnMFXKlSeMls2nHNFXp3iUbnbJvYerSheYxH/u480qQBOXuOymrXYMQTpuLhDPepoLlMgFMuvUHttOydmhJQtk8KNk1rd+B0x5U/zNtlr0eRLQGizymKNd8eHTX8cB0m54c1wmHFAT4ieao9XtfYr84mcVNU3fgN9NnKts6EMThOXuRJXYTW/pNC8KDcJcDcJb6w40VblBOuAvVuz2602vG9mG2nL3EpGPB0xZ/W5EzNo7a5PqqYKpjzho1iaNQvizMl0oPx/NGoW6SZV9Ig3WrLIp7z9ZsdKntnqu/uhSHC0qL+M2GqZtpp3/1cVFqRPiFRvp8+VUhfAgmAoX1wg== 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-SenderADCheck; bh=WPiYwGNYbWPNrctaSOAbN7mgLD03YIg2G6XeuYPvKCQ=; b=C/+yycTN4iWHgO5LiXuxBiEjMMUhudhFd9KpeMg3EAGj4v+ywceescanSV5ecge0ByNMnuwn/lB/1dzJb+5BM6eZQ7vozeQym0yaLsf4UlkGjGP2Rv58MWIC+THddgEQAGk+c1AX10kz+YEbnsts6TLYhJsUH27NIhQAwi3Bv7Vznrj+I1USzyxylCIVZJ2e53vlmmZtcTClMNdFMDlZ+PU6A3iLYFserMRzdeZAkWck4+wFPQrl4FUu1xFh7Vj6BHV9ahoEP8iZxCjOxXQID/hv7zseiLK0SKvdZgN4sPOaznb81xpZAseOGWkQb4tWETB1Pa65X5pDcxpHrQK3YA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=none 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=WPiYwGNYbWPNrctaSOAbN7mgLD03YIg2G6XeuYPvKCQ=; b=Zlzp5fBy85x2acmLBSQMs5G7KjzxikrAAS0NS/4PjTEEPI12k/oNTcXHVkagtiwbSzWzAmNPDPQ3iwDgH7WvrLJkGj5VcAjzB7OV/QYhnan6bcQc90wITK5ZV0jxf/QUt6+EabjnwSCTMmnBk42rGJja6Lz3vEDhpzcZJqJLmrmlT8eRy9e2io+doUDqvdCMPCn3KyW/JIeIT0XddvKOAmPUYQatlY7Ojvm4/U4KCL2oOwwXXEcm21m89xDXfmPCRxxze8gKMFHrLoiy4KmQB54jH+o+95KqB954PIKzQKoHVcU+EMCCPr8KUAoqTSHXLWyO09Ho9Y6sGMeuHqECBA== Received: from DM5PR20CA0037.namprd20.prod.outlook.com (2603:10b6:3:13d::23) by DM6PR12MB3721.namprd12.prod.outlook.com (2603:10b6:5:1c2::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.19; Wed, 11 Aug 2021 14:05:03 +0000 Received: from DM6NAM11FT010.eop-nam11.prod.protection.outlook.com (2603:10b6:3:13d:cafe::89) by DM5PR20CA0037.outlook.office365.com (2603:10b6:3:13d::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.13 via Frontend Transport; Wed, 11 Aug 2021 14:05:03 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT010.mail.protection.outlook.com (10.13.172.222) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4415.14 via Frontend Transport; Wed, 11 Aug 2021 14:05:02 +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.2; Wed, 11 Aug 2021 14:05:00 +0000 From: Xueming Li To: CC: Xiaoyu Min , , , Xiaoyun Li Date: Wed, 11 Aug 2021 17:04:14 +0300 Message-ID: <20210811140418.393264-12-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210811140418.393264-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20210811140418.393264-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c80f5cff-ad4a-4702-30eb-08d95cd103c0 X-MS-TrafficTypeDiagnostic: DM6PR12MB3721: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:3044; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kuxrCX20m4rfqLRl7SR9i9qyXRSGRHpNxglq34FT5FuxiSNFyRDi05bWY5hn3gU3LtMEv16l4kOuhkysdXfkB3hdYtsa5mHZJB4UeV+94fp75J/3ZCtrAok99Jl0qwpxz5HQp85B/xtgF2Sk/8CSxGF8CjqOqOAefz1xmvnEwr0/CEuuSw3Ff0lNVa5waZXMSU/n+qa6TN6PUJ4PWxNH+Okc6HAzISMad9r7GOtN4HPxHXAhQo2fxsfI2rlGrkFE9wtww1Q/LI6Z5FvaGxmxxen3hcLceCHPJzvmQ38d1mxiAcwSpJ1Ald1kKtw3vJpeErJ5uB7Z8JQXrE4sn/Hyl5d49yuBayztiWlCC7nyZJnVqMUL3Ov2gSNOhheIv/s0ml3aIyevpInqf49XpNKfXgzJBcA7NJJe/Y9wAEjpJdYTyY6JFvGY5nrRCsvFqZobOklqoTak7E/FCVlQyX51XQ3o4iLHH8IBdm4vg6HphNCeVJw9XESssq+2h7xAiS1/k2J51SEG6RNrw4plyvWUKvVkhGgHbgYovUu+JGbP2Df+8lX9fOiZte5kfJFJFpq15MXA2QJkGrB7l68CoqsWWOVkomIc8Vic5uoGTX5YLaFZU3/t+D/JjZ8kKE1t2u5HX1ChS8ex8fqk/WCR81852gWr8T8bgy3axBHygLIdzW1zLyJeQ22kMAor4GU+jM5e65mEkI1FRXY8FEzSP3UUS8se/F6N3jhGnNgLcTXfRFk= 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)(136003)(39860400002)(396003)(376002)(346002)(46966006)(36840700001)(336012)(1076003)(26005)(7696005)(478600001)(6286002)(54906003)(83380400001)(86362001)(2906002)(426003)(356005)(8936002)(36756003)(36906005)(47076005)(109986005)(8676002)(316002)(7636003)(82310400003)(55016002)(82740400003)(186003)(36860700001)(16526019)(70586007)(2616005)(6666004)(4326008)(70206006)(5660300002)(266003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2021 14:05:02.8084 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c80f5cff-ad4a-4702-30eb-08d95cd103c0 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: DM6NAM11FT010.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3721 Subject: [dpdk-dev] [PATCH v2 12/15] app/testpmd: support shared Rx queue for MAC fwd 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" From: Xiaoyu Min Add support of shared rxq. If shared rxq is enabled, filter packet by stream according to mbuf->port value and then fwd it in stream basis (as before). If shared rxq is not enabled, just fwd it as usual in stream basis. Signed-off-by: Xiaoyu Min --- app/test-pmd/macfwd.c | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/app/test-pmd/macfwd.c b/app/test-pmd/macfwd.c index 0568ea794d..75fbea16d4 100644 --- a/app/test-pmd/macfwd.c +++ b/app/test-pmd/macfwd.c @@ -44,32 +44,18 @@ * before forwarding them. */ static void -pkt_burst_mac_forward(struct fwd_stream *fs) +mac_forward_stream(struct fwd_stream *fs, uint16_t nb_rx, + struct rte_mbuf **pkts_burst) { - struct rte_mbuf *pkts_burst[MAX_PKT_BURST]; struct rte_port *txp; struct rte_mbuf *mb; struct rte_ether_hdr *eth_hdr; uint32_t retry; - uint16_t nb_rx; uint16_t nb_tx; uint16_t i; uint64_t ol_flags = 0; uint64_t tx_offloads; - uint64_t start_tsc = 0; - - get_start_cycles(&start_tsc); - - /* - * Receive a burst of packets and forward them. - */ - 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; - fs->rx_packets += nb_rx; txp = &ports[fs->tx_port]; tx_offloads = txp->dev_conf.txmode.offloads; if (tx_offloads & DEV_TX_OFFLOAD_VLAN_INSERT) @@ -116,8 +102,15 @@ pkt_burst_mac_forward(struct fwd_stream *fs) rte_pktmbuf_free(pkts_burst[nb_tx]); } while (++nb_tx < nb_rx); } +} - get_end_cycles(fs, start_tsc); +/* + * Wrapper of real fwd engine. + */ +static void +pkt_burst_mac_forward(struct fwd_stream *fs) +{ + return do_burst_fwd(fs, mac_forward_stream); } struct fwd_engine mac_fwd_engine = { From patchwork Wed Aug 11 14:04:15 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 96814 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 94791A0C47; Wed, 11 Aug 2021 16:06:28 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0C3A141237; Wed, 11 Aug 2021 16:05:09 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2078.outbound.protection.outlook.com [40.107.243.78]) by mails.dpdk.org (Postfix) with ESMTP id E6C9D4123F for ; Wed, 11 Aug 2021 16:05:05 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SmqUru+yHZZKlNeJua/JQIAdEG2sj/LXm6+78st5ve1jfSdtJZGJV3Z3tGARIID9Ud5bhnqNgb3bUtHgmR0epefZZmX264/PiXHHEJVjQojthIILcweG8O8mD9YXwmhnM4vnecyNMVV7PTct5YwAm/eF2Co+FIaIq/xwNZp2nGGDNcbGTy8OERvbkv597QCEQtra+T/JOnq5UxByF/3+8xF0eQLSRFDtEYi9lnKf9xFa7x4z9efOu/18hUAvbQXwz6BXEcDY7+zC2RLYKPdNCRsd/09AI/LWdzHnRun/H0Hqt8qgPe8pF7pjBOcTlttneorJKOmHfOCjrQUj4IlsRQ== 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-SenderADCheck; bh=aYZYwI3iMHUhLNd32q+D4TVcAbjC83WJefa93bpupdE=; b=C5KmxsWcW8gJtuyz+w+wSmey6HWjCUkKVLsVKFMzqb8euJtm1OoeOwJdV+8hscH/nEE4JjpD2kowHWHIdcxQmSqdf8eSsx7CLZ5nEnNYd1G0uthu9W7N5uoh1o/oqmWf7aWV1TYDvglowmrgzwlae3nJXgxn3CmPxVaOAsTdnvooCjwaYOQ+jAcHu0MsFoo09U6N9NDJXPXDiGdZwsW9Wnq9dkah+pvBpNQQ4R+2YsbPWCely0GNjowww/X23IfCuQswEBDE/QNcum4r0a7HuzY6NyqpWus99qbl41ik1Fk0sTd5gC3efq9dal8k5ZxgvC0LwoZTXFwiy6c/dE/UIQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=none 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=aYZYwI3iMHUhLNd32q+D4TVcAbjC83WJefa93bpupdE=; b=HY0c/R194Fea1ogZWAvXBXrHpNHfd/hgEA1SpyKewwLqwn74MCKytb7DIdSHWbS139+dm4MZngDgIcE3tdEQFZvsYZ7+XOkvhxiB07b7oigq112hCN3vlhngYnbBQ49CQiiKSsxZf2eO8+LL+Y+rcRG+p03y8rGs86E26PUqx41TtZQRk9gMUX1hmUwMhOAbyycsLAoa+g3cDQMfr43zgQv29bvmwqzkZhDu3UiRG/SkOBrhLp9JrXCKmJAskLZ4TbCAsY11Nh71emgWyJDuqp/736TeCThAop81H3pGequL5qwNltUFbieYXT9f2PsBL0M0xtjzrXv2H85vREAFSA== Received: from DM5PR20CA0033.namprd20.prod.outlook.com (2603:10b6:3:13d::19) by CY4PR1201MB2551.namprd12.prod.outlook.com (2603:10b6:903:d9::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.21; Wed, 11 Aug 2021 14:05:04 +0000 Received: from DM6NAM11FT010.eop-nam11.prod.protection.outlook.com (2603:10b6:3:13d:cafe::af) by DM5PR20CA0033.outlook.office365.com (2603:10b6:3:13d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14 via Frontend Transport; Wed, 11 Aug 2021 14:05:04 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT010.mail.protection.outlook.com (10.13.172.222) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4415.14 via Frontend Transport; Wed, 11 Aug 2021 14:05:04 +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.2; Wed, 11 Aug 2021 14:05:02 +0000 From: Xueming Li To: CC: Xiaoyu Min , , , Xiaoyun Li Date: Wed, 11 Aug 2021 17:04:15 +0300 Message-ID: <20210811140418.393264-13-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210811140418.393264-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20210811140418.393264-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 915c37e2-9fbc-4d68-dd44-08d95cd1048a X-MS-TrafficTypeDiagnostic: CY4PR1201MB2551: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4125; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 5BZzHHsbr5Wc8jPTKqGPoSBZxbCLuhgQY9N/fyKAKM4JmYEIUe4JuHO1jS3MLjWuNRSmhE8MVkEu/zNMB6idujf+lqG/GXCewSrkv4NX7PWeGxtj+DEK6yItrP/T3F6SKQYBzfxtmIEBcuLwZnbMOUEoJMEhZJM9TvH6R5rTxuorNeFJwrfrJatsuZbRAey0shSBUgxKWaME4pd1AMCrC8myId5tj9bB28gv8dQxMzezyHyTSVQvUqAL0zTXCrh+lo3nYiQwS/l1ZY+Cqo0UE0Bo/r1cL8JaPr4evxypCyPBc8p4U8Ejxj+vkWhk9fm9O+gMpVkocTLUfQLMxRo87SilKmDgr79zFIY6WAgvA5b1mUhp8/aFyxKOl6ikINoBopfec0/omtAYdANqAvzVbu2pD3BagEisFH8cwv7gDw/7yTaVR/4knIlc4d0hYUttDeyBM4KcoSZIaIiVOhCmHGXPx/PHq1BSK8nvXKy4hCu9ro9VjDYcLW+ulqZADcDvq7vUA/FUyMKdzkPg8dcrStVhFh8qpLgxWX7yGonitrEh5hFJaUrEp/i5r4ogEq5Und4yyz5MfDaoTIJbb1Zlo9mG135hP5kLFszoLAVjS0yHMOMeqJdtemW1KYYJWodPYCgrUEQqgtGaLmSdyO7GJbpgB2Ev6JSY3FyvEhEIfP9COOjrXhSD8KP0UzJEVY+vlrRVxa46ochc8oMRJ42tzcsETvRqF3QqVTX6NP1jWhE= 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)(136003)(396003)(346002)(376002)(39860400002)(36840700001)(46966006)(36756003)(86362001)(36860700001)(356005)(82310400003)(54906003)(478600001)(55016002)(6286002)(7696005)(83380400001)(2906002)(8676002)(47076005)(8936002)(316002)(109986005)(6666004)(36906005)(4326008)(26005)(1076003)(7636003)(2616005)(70586007)(82740400003)(70206006)(336012)(186003)(5660300002)(426003)(16526019)(266003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2021 14:05:04.2696 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 915c37e2-9fbc-4d68-dd44-08d95cd1048a 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: DM6NAM11FT010.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR1201MB2551 Subject: [dpdk-dev] [PATCH v2 13/15] app/testpmd: support shared Rx queue for macswap fwd 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" From: Xiaoyu Min Add support of shared rxq. If shared rxq is enabled, filter packet by stream according to mbuf->port value and then fwd it in stream basis (as before). If shared rxq is not enabled, just fwd it as usual in stream basis. Signed-off-by: Xiaoyu Min --- app/test-pmd/macswap.c | 28 +++++++++++----------------- 1 file changed, 11 insertions(+), 17 deletions(-) diff --git a/app/test-pmd/macswap.c b/app/test-pmd/macswap.c index 310bca06af..daf7170092 100644 --- a/app/test-pmd/macswap.c +++ b/app/test-pmd/macswap.c @@ -50,27 +50,13 @@ * addresses of packets before forwarding them. */ static void -pkt_burst_mac_swap(struct fwd_stream *fs) +mac_swap_stream(struct fwd_stream *fs, uint16_t nb_rx, + struct rte_mbuf **pkts_burst) { - struct rte_mbuf *pkts_burst[MAX_PKT_BURST]; struct rte_port *txp; - uint16_t nb_rx; uint16_t nb_tx; uint32_t retry; - uint64_t start_tsc = 0; - - get_start_cycles(&start_tsc); - - /* - * Receive a burst of packets and forward them. - */ - 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; - fs->rx_packets += nb_rx; txp = &ports[fs->tx_port]; do_macswap(pkts_burst, nb_rx, txp); @@ -95,7 +81,15 @@ pkt_burst_mac_swap(struct fwd_stream *fs) rte_pktmbuf_free(pkts_burst[nb_tx]); } while (++nb_tx < nb_rx); } - get_end_cycles(fs, start_tsc); +} + +/* + * Wrapper of real fwd engine. + */ +static void +pkt_burst_mac_swap(struct fwd_stream *fs) +{ + return do_burst_fwd(fs, mac_swap_stream); } struct fwd_engine mac_swap_engine = { From patchwork Wed Aug 11 14:04:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 96815 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 914ADA0C47; Wed, 11 Aug 2021 16:06:36 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4540341249; Wed, 11 Aug 2021 16:05:10 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2077.outbound.protection.outlook.com [40.107.93.77]) by mails.dpdk.org (Postfix) with ESMTP id 6C1664123F for ; Wed, 11 Aug 2021 16:05:06 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GPG27pJKGhwOMooeaqda620iLYoj/jTZ0A0RDfcgcFWwyomQj1bMgkInV3WOayhOZJWP0u3nnzb503OaJvylYa4JkBH9TQb55dEg6Ucl1Ks64FmDWCCRheA7zmdBqyyzKyBZ6RB8IjTUdr5yjmNAQ2kMcyYABZt2ljer+bi3OiszzMdQG45UN3JtTf43ZchlNfY++uOQaq4DU0gqsY72H4mKflOJs4ZnSsxrbrW0hjs2sS3zl2XaXQWs9QKzd6yDObY8nUZia0HlP6dFUdwAtdlIMCMOxczRMTKLWgHyxQD9TPuWy5L/y4cmKtSXWzpZKY4KoqR428tE9svSVTvjWQ== 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-SenderADCheck; bh=mvmXV6iyqjP9ispjqgCSEueLk41DjYYZt8r1Fdf5EtI=; b=iC2HwC/Y9VXR1bfY2Kg4qns/lCKJKwwnLA9B1MGR65MhYOGDpFoT4sNpn/4h8iBWifi1DQJkFuYBZ6I2yJL7XA5XekggLxcWSJJAHnl6/yTsjfj0l1NhCmylJljPlDheFnkdt7rGFCn2s6KVg80LANqRS+gb/cd6fTMzRyITL1WDWC674Bhr1U+ifDXffmVVoAPzUmPVNJ11rkshUJHRaT9unZhZ6+/iGuMuhrBTEaC+uK9/0S2cjl1b7nd9vzfeutcHcceHq/QmaUuykpOP+jPfWAcSOE6VVKe5Js8obfNzKN0PfKmJrSXgON+aRheNMe987jkRzlv0JLITdR3BvQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=none 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=mvmXV6iyqjP9ispjqgCSEueLk41DjYYZt8r1Fdf5EtI=; b=HljjHYG2CeB8SUHAQT/HS6W3S+DaT8VgWlQ1LfVaiXHRKCQdzOpkoGg234/VEDFFm/J/kvGPYzl5/sW4lbFMJydqIV3y6LWDd8oQmSPl1KRaDtvLSTXLkLo0mr0vZdH6mcsy3V0upAKM5iFmwR+9auuyWesbfclc6X6ONh+OAEaSG8MlLRbr02qEFBYXZsTOGpSX0FU2MQHTznme/1Du9IysjEQ8SB7B81G1FEXpaXZ6GS3657wWxatFYfzPHmaj3FDeqs35bsbRzyDaowz2vFKY4Uvd3DHSwSoxv/P9BBXuj9vPOYqwA2ghVpONHlDUDIcsS12AwAt2JXS/d3Sv5A== Received: from DM5PR20CA0046.namprd20.prod.outlook.com (2603:10b6:3:13d::32) by MN2PR12MB4437.namprd12.prod.outlook.com (2603:10b6:208:26f::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.21; Wed, 11 Aug 2021 14:05:05 +0000 Received: from DM6NAM11FT010.eop-nam11.prod.protection.outlook.com (2603:10b6:3:13d:cafe::1a) by DM5PR20CA0046.outlook.office365.com (2603:10b6:3:13d::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.14 via Frontend Transport; Wed, 11 Aug 2021 14:05:05 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT010.mail.protection.outlook.com (10.13.172.222) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4415.14 via Frontend Transport; Wed, 11 Aug 2021 14:05:04 +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.2; Wed, 11 Aug 2021 14:05:03 +0000 From: Xueming Li To: CC: Xiaoyu Min , , , Xiaoyun Li Date: Wed, 11 Aug 2021 17:04:16 +0300 Message-ID: <20210811140418.393264-14-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210811140418.393264-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20210811140418.393264-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e547e3b4-67b0-43e0-f3c4-08d95cd104fa X-MS-TrafficTypeDiagnostic: MN2PR12MB4437: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4125; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mRBv6MQje97jINLcAjyFQ1R3KyDw+QbWvx0s4vJzmKz6NWv0L8T4gNgufNRjpIJ1Z/yFmOo/UitLp4S6ierBzPVAGXeJUApIokDob5jYoqrZDLXpoo4CYsxzWIvwPra1Owgz38MNXJpRcVH+50DbUTn9gzX6ZeaYvdgSMjgznL/6TmcJvS2r3i9HhGYRpBZFOGLPlLjWe8VzJ6Wv4/1FGyN0mdo0PBlM2+9O/x9+8Wyw9aPp3lFDglsDEfLTzzmy3w9fZsisHchVv02FjUXOgg9bPO3XiRprusjbcGaUOCkJ342WRvBAGfWYUihm7+pevOYrXYFUi7uaEw3mZ1xF18odqyqMOIxx2qOjt5M9OlaIB8AQMWpqST1mq6xO45Uq5ugBxtONW/AznvnGSvYzMx2+5d4c7JuvkypBrLDj4mBIKMSw0yK0BgwY9wCCrxorWFbpIf9blPZ61Yesr6UDyon4/H8di3cn5MkdHpQu6ib2vyF8vdN94wl+hO9sf9kUDFcEoQHCh+omg5cMVKB9e5dNd+CCC3RR/jm1foRgtw9PbKs50sYQmrTCh6p15VRfnrZ7BheZCZzrhKIeYChwr4p80l6wfrY7FB20HI6Q04Go+dul0SYZEoZdTrh60xeZ3b/kUsQCaBoUveoE2326iu2naBpqwI2fkWwencXcXz8Ap7AQxSCHzXEPX0rcWFD3uckcyW3YnzAttZoJcXz5YLmVG2I/CohadkNWeTt7gXQ= 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)(83380400001)(2906002)(336012)(36906005)(82310400003)(7696005)(36756003)(316002)(6286002)(47076005)(26005)(2616005)(508600001)(1076003)(55016002)(5660300002)(6666004)(7636003)(70206006)(8676002)(4326008)(426003)(356005)(186003)(16526019)(54906003)(70586007)(36860700001)(109986005)(86362001)(8936002)(266003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2021 14:05:04.9802 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e547e3b4-67b0-43e0-f3c4-08d95cd104fa 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: DM6NAM11FT010.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB4437 Subject: [dpdk-dev] [PATCH v2 14/15] app/testpmd: support shared Rx queue for 5tuple fwd 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" From: Xiaoyu Min Add support of shared rxq. If shared rxq is enabled, filter packet by stream according to mbuf->port value and then fwd it in stream basis (as before). If shared rxq is not enabled, just fwd it as usual in stream basis. Signed-off-by: Xiaoyu Min --- app/test-pmd/5tswap.c | 30 +++++++++++------------------- 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/app/test-pmd/5tswap.c b/app/test-pmd/5tswap.c index e8cef9623b..236a117ee3 100644 --- a/app/test-pmd/5tswap.c +++ b/app/test-pmd/5tswap.c @@ -82,18 +82,16 @@ swap_udp(struct rte_udp_hdr *udp_hdr) * Parses each layer and swaps it. When the next layer doesn't match it stops. */ static void -pkt_burst_5tuple_swap(struct fwd_stream *fs) +_5tuple_swap_stream(struct fwd_stream *fs, uint16_t nb_rx, + struct rte_mbuf **pkts_burst) { - struct rte_mbuf *pkts_burst[MAX_PKT_BURST]; struct rte_port *txp; struct rte_mbuf *mb; uint16_t next_proto; uint64_t ol_flags; uint16_t proto; - uint16_t nb_rx; uint16_t nb_tx; uint32_t retry; - int i; union { struct rte_ether_hdr *eth; @@ -105,20 +103,6 @@ pkt_burst_5tuple_swap(struct fwd_stream *fs) uint8_t *byte; } h; - uint64_t start_tsc = 0; - - get_start_cycles(&start_tsc); - - /* - * Receive a burst of packets and forward them. - */ - 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; - - fs->rx_packets += nb_rx; txp = &ports[fs->tx_port]; ol_flags = ol_flags_init(txp->dev_conf.txmode.offloads); vlan_qinq_set(pkts_burst, nb_rx, ol_flags, @@ -182,7 +166,15 @@ pkt_burst_5tuple_swap(struct fwd_stream *fs) rte_pktmbuf_free(pkts_burst[nb_tx]); } while (++nb_tx < nb_rx); } - get_end_cycles(fs, start_tsc); +} + +/* + * Wrapper of real fwd engine. + */ +static void +pkt_burst_5tuple_swap(struct fwd_stream *fs) +{ + return do_burst_fwd(fs, _5tuple_swap_stream); } struct fwd_engine five_tuple_swap_fwd_engine = { From patchwork Wed Aug 11 14:04:17 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 96816 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 C6EA0A0C47; Wed, 11 Aug 2021 16:06:45 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7463E4124F; Wed, 11 Aug 2021 16:05:11 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2064.outbound.protection.outlook.com [40.107.243.64]) by mails.dpdk.org (Postfix) with ESMTP id 263E941244 for ; Wed, 11 Aug 2021 16:05:08 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=eExJ+Jd0QmsRxaCRkZx8eBszPououX3tiTn23qIepZ5zfu3U6AqOOi5MLeoeTQ/hTNHNUUXm+HqK6WFvzDZlrPQwICrTAWXxheYfyX+X+AmEDdu/u3NHqXFQvCtW0TM8VjCB0NTMP/biTnGvRt2hKPgZv33Dn6bK24Wvyn79WWNpEDsdQ8THOMQfDuB9ZLrPJgb52aGeXPB2bd6KD7QSxXxqnhONsjOzH8lo/jbXY4YrCXLJOy9mH4JRLU9S9p8amldaGRjrH0yDE5B0uAb9DQiwHeSLGROF07KZe2/MEXloHThr+G3SKS9VTkQF0ZIMthKn78vsB6xVTySPfH3MRg== 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-SenderADCheck; bh=va5h1MU3J2gfr1eDMZVMU59UoscHUe9f39UCdsyKrbs=; b=Mk5h9SJG6eWB0fz50FrpV0lswh8OjIlDzvecKn4l7xDUeYvabhl3xBlG6Nq4+kzs/oWam3aJGPL+tYAX3eIvBeNSogfNjCyLEJuJvKJoi3toyP4eWtAyrwU3DqagkMTJJ4uVt7ZTfWZep2ip5+zTLXbEXgFnxvGhmA/bjqYEopMC6/Fx6v3gHxHLcZbuZc89fv6uHCVkau7F6qDinKY/Lh4E7O8Tn6PKtpc0MDsCcMGynIGxMsbm8g8hc22n8U518YhgZ8zrsxmFKiJpoU2t3aVz7lOBal1MidcVSC3Tk9nCI8XWCdL3Kmt7QpADd8FObheEDWcsWsO531+NFuNmIw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=none 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=va5h1MU3J2gfr1eDMZVMU59UoscHUe9f39UCdsyKrbs=; b=fMcFKlFtCdPFEqyzsYQCuebIctwXXR/PEBEDlnhEK625Un7Vf/MRP61iA+jBqECWJUn4nmVfPJBsWQSuI0kYXKaD7kCJg4hpc3B2t1URzZQ3UwYs9hvFffk7ZTGhGlJJ6frDnWGDG2AD8Gxw5HDOnBCtY17Lz3CC107CrAIrGNlACmr4cuOm6CfyeUuLiRjgRa1OVKSbEi9mfoHdO0d7RlIM9bywXMo9uHUnouDT1p7KDw8RihGS33VtygSQRjS6TiMo/MbeFmfKEd93sBzUkQJRcs4Nk/nReuRfi0lv+Sy3XbcFPGeqmWM+i9CGjuY0p/1R5fW6xDMR7bMD6Iju8g== Received: from DM5PR20CA0029.namprd20.prod.outlook.com (2603:10b6:3:13d::15) by CH2PR12MB4167.namprd12.prod.outlook.com (2603:10b6:610:7a::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4394.21; Wed, 11 Aug 2021 14:05:07 +0000 Received: from DM6NAM11FT010.eop-nam11.prod.protection.outlook.com (2603:10b6:3:13d:cafe::fe) by DM5PR20CA0029.outlook.office365.com (2603:10b6:3:13d::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4415.13 via Frontend Transport; Wed, 11 Aug 2021 14:05:07 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT010.mail.protection.outlook.com (10.13.172.222) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4415.14 via Frontend Transport; Wed, 11 Aug 2021 14:05:06 +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.2; Wed, 11 Aug 2021 14:05:05 +0000 From: Xueming Li To: CC: Xiaoyu Min , , , Xiaoyun Li Date: Wed, 11 Aug 2021 17:04:17 +0300 Message-ID: <20210811140418.393264-15-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20210811140418.393264-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20210811140418.393264-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL107.nvidia.com (172.20.187.13) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 94723b73-6fb1-417d-e404-08d95cd10618 X-MS-TrafficTypeDiagnostic: CH2PR12MB4167: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 1+E0JhzmVutZF6v2/UWENS/WkbO1BwF3XEnsdTeIHDWhhzGNmhCHxxWSTXYg68pJVthI6Gf8p7mIEhBzb8jWrE7JqhE5X1v/fjcfoa9eZRuFxF+fRC5LAOAvn/p2BrcykxZWlKXLQK5cjB/5ZC0w3dqPsOZEozOJuYpifNH4d7akSFO8/i7RcJ0h9vMEKTvO7E+BYDAjAvLCSyu2PlKI0FpzVFtWbacxTpm9mI9V5rEznC09UpvzpEYf5sIojuBoutzTwqOoBh1Iv1jxagrCsSYpNFLnDjyO2xaImvdQFGryOkZJkc8tgNVGNae5HnLzAgrpyXFec7cvDhYKqKEY0DdZD8ut10EViiQ4dT9gRe+r2rSM6u4HiOi+IM/J/kRjoCK374N+R23dcwgACJORqh0JtsuMCmDfOieTgo9sHQBc2Vc5zI4b9647VmbIVEP6FSbfL1JRukyDbdw3Xb3FgV6YI9WLhXZYyR8lkdwAVddmfTNHmQwjN/M2x2Kb6dKFc8IicbUGeWkSYfLMAFwzgTMPPiftdH3JA3qINxZYt9XkNkC0X033zWM1cwHEjzRPcAoz6hQphJr61BRjMJsJjPkVLeLrcCA06FLO+4PAdQN5yRdEyRl2Zeut73KVPi2x6FD1BBPkIb75tQErdO+ZyzYeq5tzr81/BYPJQYqSuZsv5DkcBMIHB9aKZRW2e9QA7dg9Q9EwooyxaaY1/uo6Pue0F5LiHf4odtwZf6d7DMw= 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)(376002)(396003)(136003)(39860400002)(346002)(36840700001)(46966006)(82740400003)(55016002)(54906003)(7636003)(2616005)(7696005)(8676002)(8936002)(426003)(4326008)(70206006)(36860700001)(109986005)(70586007)(316002)(6286002)(5660300002)(356005)(36906005)(6666004)(1076003)(47076005)(82310400003)(36756003)(83380400001)(478600001)(336012)(186003)(16526019)(26005)(86362001)(2906002)(266003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2021 14:05:06.8591 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 94723b73-6fb1-417d-e404-08d95cd10618 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: DM6NAM11FT010.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4167 Subject: [dpdk-dev] [PATCH v2 15/15] app/testpmd: support shared Rx queue for ieee1588 fwd 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" From: Xiaoyu Min Add support of shared rxq. If shared rxq is enabled, filter packet by stream according to mbuf->port value and then fwd it in stream basis (as before). If shared rxq is not enabled, just fwd it as usual in stream basis. Signed-off-by: Xiaoyu Min --- app/test-pmd/ieee1588fwd.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/app/test-pmd/ieee1588fwd.c b/app/test-pmd/ieee1588fwd.c index 034f238c34..dc6bf0e39d 100644 --- a/app/test-pmd/ieee1588fwd.c +++ b/app/test-pmd/ieee1588fwd.c @@ -90,23 +90,17 @@ port_ieee1588_tx_timestamp_check(portid_t pi) } static void -ieee1588_packet_fwd(struct fwd_stream *fs) +ieee1588_fwd_stream(struct fwd_stream *fs, uint16_t nb_rx, + struct rte_mbuf **pkt) { - struct rte_mbuf *mb; + struct rte_mbuf *mb = (*pkt); struct rte_ether_hdr *eth_hdr; struct rte_ether_addr addr; struct ptpv2_msg *ptp_hdr; uint16_t eth_type; uint32_t timesync_index; - /* - * Receive 1 packet at a time. - */ - if (rte_eth_rx_burst(fs->rx_port, fs->rx_queue, &mb, 1) == 0) - return; - - fs->rx_packets += 1; - + RTE_SET_USED(nb_rx); /* * Check that the received packet is a PTP packet that was detected * by the hardware. @@ -198,6 +192,22 @@ ieee1588_packet_fwd(struct fwd_stream *fs) port_ieee1588_tx_timestamp_check(fs->rx_port); } +/* + * Wrapper of real fwd ingine. + */ +static void +ieee1588_packet_fwd(struct fwd_stream *fs) +{ + struct rte_mbuf *mb; + + if (rte_eth_rx_burst(fs->rx_port, fs->rx_queue, &mb, 1) == 0) + return; + if (unlikely(rxq_share > 0)) + forward_shared_rxq(fs, 1, &mb, ieee1588_fwd_stream); + else + ieee1588_fwd_stream(fs, 1, &mb); +} + static void port_ieee1588_fwd_begin(portid_t pi) {