From patchwork Thu Sep 30 14:55:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 100111 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 36C2FA0C41; Thu, 30 Sep 2021 16:56:49 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 25E7041134; Thu, 30 Sep 2021 16:56:49 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2079.outbound.protection.outlook.com [40.107.94.79]) by mails.dpdk.org (Postfix) with ESMTP id 99BE6410EA for ; Thu, 30 Sep 2021 16:56:47 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P9LepNk2IfIP7elIuaaFj99e8rr0t0URqHLqJoU+Ch02n2kFbcCKNRz8q7tVRmbl7v2+lvWQqc2aL298IzIBcY0YJhoWKN+OctMsvVqGnLBM1uoSomcpW7+H7KEDezs5dtNu4rDmhPWPKjvgCX7BschDRyad0Rvv/HuupzcVN/CTVwY0iTSLBq6E2ZpOGPDUokqz6DzIaOV3DRJk2CJZ80/57o5x2EgttRHSbrqDzxdL6biD6t7E5Hve5wIOjfJ3tplrZgW4RamHR4bAcLlJaehAbNBf3VYUi/AGT4UP2jLR5MRrVB3oy0OdtpqnQJYVJUM+/02ow9cMvNQlEuFjNg== 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; bh=7WgHulBILeDlZL8PgcDVmniyRlEEUmzfxuPVooiQxzY=; b=Ra47rNgmeQFJF+RFT7n2LmtH6qcQmg0B4eYujeEb27Nl5WlUzc7by9NiRBy6mKxQ3yHcxnqbHHbTE1P30aIXzCqZZ0atezjGm2V8ERrOeIHiK7MDqch1qbXDRchc0j7Ns+l+dJmLz916NglAY0EZ7YX5cjMlV1eVCpCv4xxw1EJnNyNcAaBiZjlVBEV0mbyDVDsEUFxdVE6zG4n9SCILyxG36HfpcyiV2ijVFeI9YZEXoTYaJPBWYZ8lJ9QbJ1zmcmLHlcBiLjhZWqocrDB0bzP+HtqtOkHnl89oSmSG7xxrgpnBuqhlhkmUiBjxWbMFp6rvHhlO4GuTioNjYTH7AQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=oktetlabs.ru smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=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=7WgHulBILeDlZL8PgcDVmniyRlEEUmzfxuPVooiQxzY=; b=rebYZoVq3zXnxKiUGPeZ4QrTdYJliuugOQpixFVS5KQJ0bfp7Gt/Tf7sQb//x9aq9QGZLNFi8z8xEB9RNwIbWm28a3YYAod4j2Svf4VS4YusIPf+3rZhRu6O5rmmncQzcy5KLXSg63eML7DdbgbwPp/3P/jbdz8Wk5HXnzeqvCTJrW+Y2otgs/CLEjEYBReGYcqGW3vU1HLqPKPAhahbn9UafZaDXM709SdbW5DMZQ0ZloFlV7VEYbpaY7uXepwQ77IK28NDszX/i+U5tuI9Zj1dxdNIdFnIqQlsU71ZtiwZGxrXFEh9pApRQjSZp184jBY+F2DlC2GgjDqOIwYGMA== Received: from CO1PR15CA0052.namprd15.prod.outlook.com (2603:10b6:101:1f::20) by BN6PR12MB1668.namprd12.prod.outlook.com (2603:10b6:405:6::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.18; Thu, 30 Sep 2021 14:56:45 +0000 Received: from CO1NAM11FT010.eop-nam11.prod.protection.outlook.com (2603:10b6:101:1f:cafe::9f) by CO1PR15CA0052.outlook.office365.com (2603:10b6:101:1f::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Thu, 30 Sep 2021 14:56:45 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; oktetlabs.ru; dkim=none (message not signed) header.d=none;oktetlabs.ru; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT010.mail.protection.outlook.com (10.13.175.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4566.14 via Frontend Transport; Thu, 30 Sep 2021 14:56:44 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 30 Sep 2021 14:56:40 +0000 From: Xueming Li To: CC: , Jerin Jacob , Ferruh Yigit , Andrew Rybchenko , Viacheslav Ovsiienko , Thomas Monjalon , Lior Margalit , "Ananyev Konstantin" Date: Thu, 30 Sep 2021 22:55:57 +0800 Message-ID: <20210930145602.763969-2-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210930145602.763969-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20210930145602.763969-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7d7e8ed3-8a42-4d46-4f26-08d9842284d1 X-MS-TrafficTypeDiagnostic: BN6PR12MB1668: 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: AIBBhQnMR1cjVRYSf2IsRyIrgSx+Fqm+5q8+qW/a8OdF5eecNfFVPlnS3sODpfINxf/Bvc3z29FXDzh+dWW5L0aChFdhNgOrmQwd3qyZKiNdJJAUH2Mw0Xb3kSRe5fgx7BhyB8T9Pli9lBCOPDD8C81nu4EUSihGKjrn7NpfOWrFjy8537TVnbjsz/ajLrAF5qZGeg911z+CbQNJbjLie5ZURQMzKN5sH8BLmcAGINGKS2mWvA6jsrHCaMIU0mPZiLGJk00lu8QhWT4FsNaAQULvB0RMivwkD7YSde2KnidPMTDDQcZHuCyOLge+wMdgk6jdW4zi/7xJ3RSgiSco6fRF2MazblBYgzACOOt9Y7lCc4IE35dj1hjs5gPnvZztBVV/fSMhk15cDbJwVBQoiRxVwK0+kHRrPViwLLHNwiAZvzMB+OBelE7/YAUIu7JalDTqmMLZ9MnWYH1IljpnfvrulsWraumjiUQqLL0Hckew7GNPJ6xl8O3QY3040NSnNZNLX386uGf0M6YTMV1EO0/6WDTNxTZznOzBj3oyCKfglra889tgcit1XoyS9AC+nGagnvC1BUgKOOgprgsdR/wBIalSRaLDLo+g/P7ncCugKIAVIvDtVk49LLSI/cpsGUPsljjHEs/k/RdiXtLO8n4FdI71Y0h0Nrp2Pqo85bWSWtGhF4Dr+CZQ4fJYKlYgjsekXZTbpRbA1ybOwC+eMnhma1vVwLl2YTELmgvvJFNn+eS7heQWzSf5BbRjdvpJTebXmBtRFiiGeaUyXidNtkS6MY7IHgjwIjmXWmKOECNHOLCN3bVqfdipUlkOnT23mPIbwvb0ZsYMhxgjddrSvw== 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)(8676002)(7636003)(6916009)(6286002)(5660300002)(316002)(36756003)(36860700001)(508600001)(966005)(55016002)(54906003)(16526019)(47076005)(8936002)(4326008)(2906002)(356005)(82310400003)(86362001)(83380400001)(336012)(26005)(2616005)(426003)(7696005)(6666004)(70206006)(70586007)(1076003)(186003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2021 14:56:44.0590 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7d7e8ed3-8a42-4d46-4f26-08d9842284d1 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: CO1NAM11FT010.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1668 Subject: [dpdk-dev] [PATCH v4 1/6] ethdev: introduce shared Rx queue X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" In current DPDK framework, each RX queue is pre-loaded with mbufs 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 4fce8cd1c97..69bc1d5719c 100644 --- a/doc/guides/nics/features.rst +++ b/doc/guides/nics/features.rst @@ -626,6 +626,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 754184ddd4d..ebeb4c18512 100644 --- a/doc/guides/nics/features/default.ini +++ b/doc/guides/nics/features/default.ini @@ -19,6 +19,7 @@ Free Tx mbuf on demand = Queue start/stop = Runtime Rx queue setup = Runtime Tx queue setup = +Shared Rx queue = Burst mode info = Power mgmt address monitor = MTU update = diff --git a/doc/guides/prog_guide/switch_representation.rst b/doc/guides/prog_guide/switch_representation.rst index ff6aa91c806..bc7ce65fa3d 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. ``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 the shared Rx queue can return + packets of all ports in the 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 61aa49efec6..73270c10492 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 afdc53b674c..d7ac625ee74 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -1077,6 +1077,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 @@ -1403,6 +1404,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 the 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 Thu Sep 30 14:55:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 100112 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 D9679A0C41; Thu, 30 Sep 2021 16:56:53 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2888D41143; Thu, 30 Sep 2021 16:56:51 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam08on2067.outbound.protection.outlook.com [40.107.101.67]) by mails.dpdk.org (Postfix) with ESMTP id C8FBD4113F for ; Thu, 30 Sep 2021 16:56:49 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WBee5/ZFX+ajYLrOi5vpQkYAA37B5HiszeqVyl2gyc6DPyuvI7G23d1zmGcMQCodAC6pDenlOFxYPTap6wSGxatM+F4rhGuVzbH79CV5C4ElkKkalWgSOFkgpJHACbE/apN3sDGCTvILPVaRoAzcoBskW91jFq00RN1bdNeKAEg/+xTgFqvkgHwdSdTbqne7moNqLjd+P07aHrzchcED4IHRotKT5jGJO6bZrcAteOwINh+SxrV4hprlGc0DTi6P1A4pnx0Xe3rLXoxyfBynVUzg8SROtJkpZbcuggjIUajLGxDrgqbLni3ut7uGRadOQe1gXHwXEOc9HYpl3mXLiA== 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; bh=3OhYUn5WctKk0TMKHae38iZkJXg1j2vW9DA38clRI98=; b=Jx86yXlkJBkYRcQ3K9mbgrnbidkUcgMH0tSyTp6qLogeFFlpJ5DxxRcPD2SzbCL6sf4Ldw0114Jfdx9xGtAlxx8PCJf2pFplalGktdkWBJKy79FPbNvuy1Lsy+xEvqJyXNv73PKEUmKft0VH8TDj80TPYP2bmLDeLQhHGgf/zmRm1sc5YXkZ4rQqscuCSiXYvwv8APYTCFNBnR8upnEGGY0K3W1+Ccva+uIAEzNxqxVq6YseFK7ih1OauoHHwZuAAIIPKhyP0jr8yLjRQBUOb4IqUkK4QEvXNUCXJ2Yc6AmoRxYbpSa7FBbhiQgEdUNQ9+fcOKqr06aoIBpmXHDuUg== 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=3OhYUn5WctKk0TMKHae38iZkJXg1j2vW9DA38clRI98=; b=btLzArL8B84uVQJlfcHH1GmbSRKpIAoqKunHwke/xBIrLWmy5dhhVXJdrbSuggUFDGEM7jy9IUPNdMAMdgi/JNdnhaDFTrX7uWk6lSyjQJCaoXgq4sn0GHfU3XgKvRmI6TZIkV3IgFLAVMrCb0ZLz4M/RAeAL3NjT5XQTdimBJVjJmJWdKoFxLASqo4UuppNl0AFhoU4szG+OC5gFus7Bpei+1x/PWeF+E7FpjsLZir08cEWjEm8iH/nZkPo3/CB5rLBplbPPPZprPFNpzYlto7aDC8sIR2+hhU0uW9QY1ee/h8fc0Y1CdNjcTVr97EQlc+Vn228DA+7Slt/o87aRA== Received: from MWHPR15CA0060.namprd15.prod.outlook.com (2603:10b6:301:4c::22) by DM5PR12MB1195.namprd12.prod.outlook.com (2603:10b6:3:7a::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.16; Thu, 30 Sep 2021 14:56:48 +0000 Received: from CO1NAM11FT066.eop-nam11.prod.protection.outlook.com (2603:10b6:301:4c:cafe::71) by MWHPR15CA0060.outlook.office365.com (2603:10b6:301:4c::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Thu, 30 Sep 2021 14:56: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 CO1NAM11FT066.mail.protection.outlook.com (10.13.175.18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4566.14 via Frontend Transport; Thu, 30 Sep 2021 14:56:47 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 30 Sep 2021 14:56:44 +0000 From: Xueming Li To: CC: , Jerin Jacob , Ferruh Yigit , Andrew Rybchenko , Viacheslav Ovsiienko , Thomas Monjalon , Lior Margalit , "Ananyev Konstantin" , Ray Kinsella Date: Thu, 30 Sep 2021 22:55:58 +0800 Message-ID: <20210930145602.763969-3-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210930145602.763969-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20210930145602.763969-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: b524adb6-419c-43cb-7294-08d9842286e8 X-MS-TrafficTypeDiagnostic: DM5PR12MB1195: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr 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: a9nepMT/aGAspOvBamoCMieiLi9Opizm92k+u5X4juSlyfEyIjElAKDo8mvUAMdN5jY+BUDs97mE1oL+wAJ579LwuhVMp/yHoZrJL9NoJ6SeV4zvoQA61Zwtt7wyH4/xzLjyfa4snfdMzOSOcqHL5gO5N4NvL98XDi8LRKIit/VTy/nxewQm7ZgD7hZ08WChHqNT2NsdBhkb+jZPTIl7nxobXRnjq6oPa99wAKhwtwDcX8sJ59V4lgZH0bxFELrrBANWDoMKGFhG9ySgm0Q/wLzXWyMGAcU7QmdacQU7Q/J48gpZ99kbI+AgzFUPoUXPpVtgg2SYL9m5FMVbtS6G9tVHuyGT5UCHUzwv53t42CI8bp4syqLAR1Vz8I54q+v8QKoJJW+dBn76okmGo8AgWOagvfk24H3ozdJhfpkobVXs8NvnkxldK9qv3P9+MEzDjkxb5AoKYB5LiPA/ev82Zvz9yvKtbOqE2MIruDxZPPXUCQPMmWba460A9oKjNtkEVTjgaWmWNat7siG6s+GjXLumg4thohNC+/qZy4Q7nxzXlQzceK1yODHXbGKzf/MXatNXHnb43L2h4eroXcO0qWwPOBNk4pakek83B5cxU2RRFFEMqPheBFUkTsk+vPk3W1NGFy1ZX2hyNrEVdPE3QtjxX6rpXKkdsT7wd7TLVWrx18iRjgGBW/2EpsNgA+LCJiKRWDs0jlFGj5YAUPlGdw== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(8936002)(86362001)(7636003)(55016002)(6286002)(8676002)(36756003)(508600001)(5660300002)(2906002)(36906005)(83380400001)(356005)(47076005)(70586007)(70206006)(316002)(6666004)(7696005)(1076003)(16526019)(6916009)(336012)(2616005)(426003)(26005)(186003)(82310400003)(4326008)(54906003)(36860700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2021 14:56:47.5641 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b524adb6-419c-43cb-7294-08d9842286e8 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: CO1NAM11FT066.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1195 Subject: [dpdk-dev] [PATCH v4 2/6] ethdev: new API to aggregate shared Rx queue group X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch introduces new api to aggreate ports among same shared Rx queue group. Only queues with specified share group are aggregated. Rx burst and device close are expected to be supported by new device. Signed-off-by: Xueming Li --- lib/ethdev/ethdev_driver.h | 23 ++++++++++++++++++++++- lib/ethdev/rte_ethdev.c | 22 ++++++++++++++++++++++ lib/ethdev/rte_ethdev.h | 16 ++++++++++++++++ lib/ethdev/version.map | 3 +++ 4 files changed, 63 insertions(+), 1 deletion(-) diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h index 2f0fd3516d8..88c7bd3f698 100644 --- a/lib/ethdev/ethdev_driver.h +++ b/lib/ethdev/ethdev_driver.h @@ -782,10 +782,28 @@ typedef int (*eth_get_monitor_addr_t)(void *rxq, * @return * Negative errno value on error, number of info entries otherwise. */ - typedef int (*eth_representor_info_get_t)(struct rte_eth_dev *dev, struct rte_eth_representor_info *info); +/** + * @internal + * Aggregate shared Rx queue. + * + * Create a new port used for shared Rx queue polling. + * + * Only queues with specified share group are aggregated. + * At least Rx burst and device close should be supported. + * + * @param dev + * Ethdev handle of port. + * @param group + * Shared Rx queue group to aggregate. + * @return + * UINT16_MAX if failed, otherwise aggregated port number. + */ +typedef uint16_t (*eth_shared_rxq_aggregate_t)(struct rte_eth_dev *dev, + uint32_t group); + /** * @internal A structure containing the functions exported by an Ethernet driver. */ @@ -946,6 +964,9 @@ struct eth_dev_ops { eth_representor_info_get_t representor_info_get; /**< Get representor info. */ + + eth_shared_rxq_aggregate_t shared_rxq_aggregate; + /**< Aggregate shared Rx queue. */ }; /** diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c index 73270c10492..d78b50e1fa7 100644 --- a/lib/ethdev/rte_ethdev.c +++ b/lib/ethdev/rte_ethdev.c @@ -6297,6 +6297,28 @@ rte_eth_representor_info_get(uint16_t port_id, return eth_err(port_id, (*dev->dev_ops->representor_info_get)(dev, info)); } +uint16_t +rte_eth_shared_rxq_aggregate(uint16_t port_id, uint32_t group) +{ + struct rte_eth_dev *dev; + uint64_t offloads; + + RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV); + dev = &rte_eth_devices[port_id]; + + RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->shared_rxq_aggregate, + UINT16_MAX); + + offloads = dev->data->dev_conf.rxmode.offloads; + if ((offloads & RTE_ETH_RX_OFFLOAD_SHARED_RXQ) == 0) { + RTE_ETHDEV_LOG(ERR, "port_id=%u doesn't support Rx offload\n", + port_id); + return UINT16_MAX; + } + + return (*dev->dev_ops->shared_rxq_aggregate)(dev, group); +} + RTE_LOG_REGISTER_DEFAULT(rte_eth_dev_logtype, INFO); RTE_INIT(ethdev_init_telemetry) diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h index d7ac625ee74..b94f7ba5a3f 100644 --- a/lib/ethdev/rte_ethdev.h +++ b/lib/ethdev/rte_ethdev.h @@ -4909,6 +4909,22 @@ __rte_experimental int rte_eth_representor_info_get(uint16_t port_id, struct rte_eth_representor_info *info); +/** + * Aggregate shared Rx queue ports to one port for polling. + * + * Only queues with specified share group are aggregated. + * Any operation besides Rx burst and device close is unexpected. + * + * @param port_id + * The port identifier of the device from shared Rx queue group. + * @param group + * Shared Rx queue group to aggregate. + * @return + * UINT16_MAX if failed, otherwise aggregated port number. + */ +__rte_experimental +uint16_t rte_eth_shared_rxq_aggregate(uint16_t port_id, uint32_t group); + #include /** diff --git a/lib/ethdev/version.map b/lib/ethdev/version.map index 904bce6ea14..6f261bb923a 100644 --- a/lib/ethdev/version.map +++ b/lib/ethdev/version.map @@ -247,6 +247,9 @@ EXPERIMENTAL { rte_mtr_meter_policy_delete; rte_mtr_meter_policy_update; rte_mtr_meter_policy_validate; + + # added in 21.11 + rte_eth_shared_rxq_aggregate; }; INTERNAL { From patchwork Thu Sep 30 14:55:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 100113 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 81E4FA0C41; Thu, 30 Sep 2021 16:57:01 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 994F44114B; Thu, 30 Sep 2021 16:56:56 +0200 (CEST) Received: from NAM11-DM6-obe.outbound.protection.outlook.com (mail-dm6nam11on2086.outbound.protection.outlook.com [40.107.223.86]) by mails.dpdk.org (Postfix) with ESMTP id CAC7D4114A for ; Thu, 30 Sep 2021 16:56:55 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=e7wYThv2ZOfqjOT1AA6TOAvat0Qk2s2WZVbn59HhesilxsKyn++yMkl5Y74F2U71cDeLsHSU4NgSq7RtLKSnphGE9C3VkHq6sarUXlxj+7ncT9q7PL7Xk80wb9CJKRY6HUe+fHDHr5CX7yfPdxWeL5VmfUf63wrUh/kQq324qTJScDmDzSL/DYs2WYD7HmYNPa7i4nTXMG9J2lC2u8bUmr3US+NzI7yCUsH3CFNaYV+WkXbbdT1Z6ODByOHTu5iqWRSNbMBbJ6DGj+tpvrfj//CXyUIWQtzTX4E8e9LDCJ9Woezxv1TB8BmgLI2QxIMnigeC9oArulhAEkE+okHxNg== 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; bh=TYiJxjrqvQUxeUlIZMBM3r8utN4UXwr8ER/ufAaEjr8=; b=bcoc9spjxBm7aAzZj58yvMk7itzXqJT+kQo2A6EL35SBCYcVKT0p3CuRpQ0Rl4eurjJpC5SmFrNt07skLSeGKfUa2BhJGloeLqfL2kTTfFpHXeioX0LISrYU2tF1Y4TATmM0EXIrJw+bwj3i6dVy2SNzjWzUH84cVJMTo4yTIUi+/e8L80r7U3DV8+JZWFiFSL7zEIVuIojXU3m6IL0BhUAm0it+7E0pkKEm1qCYTV8XoyRA7ata/eLuBeTUfy+esc3Bt3eWRLJZKlEgR3gEst4E9XR4D/TvP6r6bNOgtJMU+rSZOvl4bshflhIkDaSq7Xm0BfIssKFCfHpw2YJUvg== 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=TYiJxjrqvQUxeUlIZMBM3r8utN4UXwr8ER/ufAaEjr8=; b=HBHCtAm9VIcH24OAFx0cc4MkCrfMMVhV8DDFf0ol0YoPqQAXdPyKJFbYnrZoR9FlQKylQy4JvOdF1NFLnI/Vsoc+0uZjVHEL/6DP9VDMA9Hu4bJVCFj4Lz6g6WvIvF2A0OvVHE9qUVbzWJ2iecRvsqKrF90fbvqlbbm/K8UR/kvu7PZMByA/MISjS++egOk/GKN8nYxYbv4m8/sOSeSkESodgfmaRAhftN5EQwd0S9qUqRNBLdUuOx0Xx0SuLMUN523j6WTK8DQTuLCsR4EUkz5M41APs/Q5c4N77VHM16+YNFbP3fjMe/kb4QJmDB4JUzYJfdld07JW5x8mMjjQpQ== Received: from MWHPR22CA0026.namprd22.prod.outlook.com (2603:10b6:300:69::12) by BN6PR12MB1619.namprd12.prod.outlook.com (2603:10b6:405:f::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.18; Thu, 30 Sep 2021 14:56:52 +0000 Received: from CO1NAM11FT028.eop-nam11.prod.protection.outlook.com (2603:10b6:300:69:cafe::7) by MWHPR22CA0026.outlook.office365.com (2603:10b6:300:69::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Thu, 30 Sep 2021 14:56:52 +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 CO1NAM11FT028.mail.protection.outlook.com (10.13.175.214) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4566.14 via Frontend Transport; Thu, 30 Sep 2021 14:56:51 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 30 Sep 2021 14:56:47 +0000 From: Xueming Li To: CC: , Jerin Jacob , Ferruh Yigit , Andrew Rybchenko , Viacheslav Ovsiienko , Thomas Monjalon , Lior Margalit , "Ananyev Konstantin" , Xiaoyun Li Date: Thu, 30 Sep 2021 22:55:59 +0800 Message-ID: <20210930145602.763969-4-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210930145602.763969-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20210930145602.763969-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 10361bd5-f9cf-4858-83c5-08d98422894b X-MS-TrafficTypeDiagnostic: BN6PR12MB1619: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2887; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4YXoySdejZWyu2kcQB9e4wbUKtrAW90ILDZBvSfFqGFkyJohJOCNZZa4bffW9YrHWxcAdOUolLWI4POVjINOw0N6Qf9pBMVUX13BO2L1156P3wHFW8p9CehizyqAIF+WV0lCI0UVijcVWRVSqUP/uH7wMF2ICigoSXtQc6ZIt++YULoE2FtunDBqLEL+gbzs0p9/VS2nyNok4rSkq/hqsHlUAodUWIslIGvEhYEBMtOZ+hkidgEXGolrZAGpCDdGi9LmPJ+XXz1y1j2YQ5qy2k0xLh3b4ffJR3KmsUNdV+mosN1AHMGLWmk/3s+sHroe8r47Pzr+ek+hcO6NORJbLua61dptzWvGh/WmPUkT+R0bFhnONMfWo5Rlkj62RKKrUHEcGSc5+HJvn1y0hhMJcvqUUWnkbZ3jPe8ffittdieGWdghiuW0ziDAdFBtnWdenWXpFmqQRTe3fj5TLcHyx/2BODlSz8MwORzVI1j4mDAH17dbNA19t9q6vSG6p+ZSGPtXEevzeAgOECIVjS3KCnsffH64NkaXKoaXYx2VEbD65XCIyhBEPXWDB8m62smRecy+PoL3kpw7d3qsE9L4WI26lRH4cSGFEzjnuouCRt7KSuupYzvLuIhps4VQ0HGy7WItpASAQwAyBNmzoe+/uVuGbHE4Vb5Sh3eMGZc9g+fRTiEndvXyZjBTQ0irjVVmuwpgCX/K9SmmV4iiSjBhtA== 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)(2906002)(5660300002)(82310400003)(6286002)(55016002)(36860700001)(7696005)(86362001)(8676002)(36756003)(47076005)(356005)(6916009)(2616005)(186003)(83380400001)(54906003)(1076003)(7636003)(16526019)(316002)(6666004)(26005)(8936002)(70206006)(426003)(508600001)(70586007)(336012)(4326008); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2021 14:56:51.5768 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 10361bd5-f9cf-4858-83c5-08d98422894b 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: CO1NAM11FT028.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1619 Subject: [dpdk-dev] [PATCH v4 3/6] app/testpmd: new parameter to enable shared Rx queue X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Adds "--rxq-share" 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 | 13 +++++++++++++ app/test-pmd/testpmd.c | 18 ++++++++++++++++++ app/test-pmd/testpmd.h | 2 ++ doc/guides/testpmd_app_ug/run_app.rst | 7 +++++++ 5 files changed, 45 insertions(+), 1 deletion(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 9c66329e96e..6c7f9dee065 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 3f94a82e321..30dae326310 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -167,6 +167,7 @@ usage(char* progname) printf(" --tx-ip=src,dst: IP addresses in Tx-only mode\n"); printf(" --tx-udp=src[,dst]: UDP ports in Tx-only mode\n"); printf(" --eth-link-speed: force link speed.\n"); + printf(" --rxq-share: number of ports per shared rxq groups, defaults to MAX(1 group)\n"); printf(" --disable-link-check: disable check on link status when " "starting/stopping ports.\n"); printf(" --disable-device-start: do not automatically start port\n"); @@ -607,6 +608,7 @@ launch_args_parse(int argc, char** argv) { "rxpkts", 1, 0, 0 }, { "txpkts", 1, 0, 0 }, { "txonly-multi-flow", 0, 0, 0 }, + { "rxq-share", 2, 0, 0 }, { "eth-link-speed", 1, 0, 0 }, { "disable-link-check", 0, 0, 0 }, { "disable-device-start", 0, 0, 0 }, @@ -1271,6 +1273,17 @@ launch_args_parse(int argc, char** argv) } if (!strcmp(lgopts[opt_idx].name, "txonly-multi-flow")) txonly_multi_flow = 1; + if (!strcmp(lgopts[opt_idx].name, "rxq-share")) { + if (optarg == NULL) { + rxq_share = UINT32_MAX; + } else { + n = atoi(optarg); + if (n >= 0) + rxq_share = (uint32_t)n; + else + rte_exit(EXIT_FAILURE, "rxq-share must be >= 0\n"); + } + } if (!strcmp(lgopts[opt_idx].name, "no-flush-rx")) no_flush_rx = 1; if (!strcmp(lgopts[opt_idx].name, "eth-link-speed")) { diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 97ae52e17ec..417e92ade11 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -498,6 +498,11 @@ uint8_t record_core_cycles; */ uint8_t record_burst_stats; +/* + * Number of ports per shared Rx queue group, 0 disable. + */ +uint32_t rxq_share; + unsigned int num_sockets = 0; unsigned int socket_ids[RTE_MAX_NUMA_NODES]; @@ -1506,6 +1511,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 > 0 && + (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; @@ -3401,6 +3411,14 @@ 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; + port->rx_conf[qid].shared_group = nb_ports / rxq_share; + } + if (offloads != 0) port->rx_conf[qid].offloads = offloads; diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 5863b2f43f3..3dfaaad94c0 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -477,6 +477,8 @@ extern enum tx_pkt_split tx_pkt_split; extern uint8_t txonly_multi_flow; +extern uint32_t rxq_share; + extern uint16_t nb_pkt_per_burst; extern uint16_t nb_pkt_flowgen_clones; extern int nb_flows_flowgen; diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst index 640eadeff73..43c85959e0b 100644 --- a/doc/guides/testpmd_app_ug/run_app.rst +++ b/doc/guides/testpmd_app_ug/run_app.rst @@ -389,6 +389,13 @@ The command line options are: Generate multiple flows in txonly mode. +* ``--rxq-share=[X]`` + + Create queues in shared RX queue mode if device supports. + Group number grows per X ports, default to group 0 if X not specified. + Only "shared-rxq" forwarding engine suppose to resolve source stream + correctly. + * ``--eth-link-speed`` Set a forced link speed to the ethernet port:: From patchwork Thu Sep 30 14:56:00 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 100114 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 48A2EA0C41; Thu, 30 Sep 2021 16:57:07 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C167641159; Thu, 30 Sep 2021 16:56:59 +0200 (CEST) Received: from NAM12-DM6-obe.outbound.protection.outlook.com (mail-dm6nam12on2084.outbound.protection.outlook.com [40.107.243.84]) by mails.dpdk.org (Postfix) with ESMTP id EC8C741158 for ; Thu, 30 Sep 2021 16:56:58 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZuSLg4DgHp9+XHvTOj1sU9mQj0GWuYiIeQD6FyMPUP+S3hd8yfwuoOoDIRoAe5hu3ALDiyndMhEHNmyTcmyk4E0N+/1SdoZRK1liyge5sGuIekaoE/dGvxSklfEyjLZG+67rpsDr6Aa5ZK2b8ob2CvfiQwuhErEqKFGFAswtbBb7TpErT7qfebEmnmfWortVfLrmU1K16knepnqgPYQgCL2dyZ4IDLWHNShd+D08vYtQb+xrNSSLJ5KXJQw81YJLDYZom3cKhuGccwdDzivCBR4UxXfmwlT9BHQLmBJtM0gNXzj269rUpq28tlOu//Yh/dlM5KoI35fb/FPrPal0qw== 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; bh=R/ETAZJfl728liQJshqw8T6bsscg+TVUFLrKQcW1l9Q=; b=dYw/SjGK1s/Q77FBh5GZX6NtylShdoZkldciUVVleS9a4hD/JP+w6fREh8nvrkpovT+bfuXNsUTqvCb3JDIrMa3hmdY1d/MX/mFzVHP86VqyM/D0Rint8ROyUuJFsUv9HK0N/m0feLR0TGqvlw2QWRHpXHn/dZSBsW4GSOE9b680sHT0KxB/fZu9KdaFIowMieB0pGVe4T5Pyh6wBGKT9G+L9ToBthPgYNg3dJ43KgtjSI9jfhRx4WewxatWgkMw3HCQ3qZrrEmdRQxSyBtSUF6zM3lfxaPLtJDDHW3CyxjpG3pZuTqXyDzsQ4FSq7zx2L8jO6Zfg+9vft/1GwW/4g== 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=R/ETAZJfl728liQJshqw8T6bsscg+TVUFLrKQcW1l9Q=; b=ryz77hqQKNwIyXNqfPSAZa3SSIO/bWKAr4FkSObl/Z6shJ3cPmkbO7xa/Y7kPEQ2H5QC83s8+jKoYsS/z7R4odRt+7XDck2VDH3YlfGtZHJ0XT6+iPaZTMv73MDYHapSBRT1tXSNRAdmSW+is2QKtYiCmEpipPMvdd+BYc84iIKDwo8n5ox0NLOYDXRKkQFXZ7fXO+j0f8+MEfP363y7PxqPGnKdVJVgkkON4+YgPjX1xQw2WM0S4ae1kndyyQVc88vMq3nMbmvY4rFFhmuwK+ZH5+2v+yUwCcf5YwXRtBL+RuDaheMEQEQxH1k37+DfYTZVMoX1P1hN5gF9EpAEnA== Received: from MWHPR18CA0046.namprd18.prod.outlook.com (2603:10b6:320:31::32) by MW2PR12MB2492.namprd12.prod.outlook.com (2603:10b6:907:8::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.13; Thu, 30 Sep 2021 14:56:56 +0000 Received: from CO1NAM11FT021.eop-nam11.prod.protection.outlook.com (2603:10b6:320:31:cafe::cd) by MWHPR18CA0046.outlook.office365.com (2603:10b6:320:31::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Thu, 30 Sep 2021 14:56:56 +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 CO1NAM11FT021.mail.protection.outlook.com (10.13.175.51) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4566.14 via Frontend Transport; Thu, 30 Sep 2021 14:56:55 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 30 Sep 2021 14:56:51 +0000 From: Xueming Li To: CC: , Jerin Jacob , Ferruh Yigit , Andrew Rybchenko , Viacheslav Ovsiienko , Thomas Monjalon , Lior Margalit , "Ananyev Konstantin" , Xiaoyun Li Date: Thu, 30 Sep 2021 22:56:00 +0800 Message-ID: <20210930145602.763969-5-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210930145602.763969-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20210930145602.763969-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4e035368-87f8-42e2-d472-08d984228b9e X-MS-TrafficTypeDiagnostic: MW2PR12MB2492: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:243; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: feDWVtkV3YX+f/os/Q/Er3BK2HWsvBBBt9jar6Rx8IYlVuNUlRxC3QSb4QT3mDzVsd3WD9XHPKfUzMh5bzV9azkhVTPtSrL6ZmETKO1j8WfD6/MrXguhqP80DUOQ/uIEsIWvztN+RmRxPihwQMTgNHKmvDy+7AVqcMLQy7GHDtZZcokICuxQCF9cuOCGib+JzkeBKNHBoZj0wFMqsbWym/YQITe3z0iqOGQcQGukjHaRigwrLkHf7VuxHnCx/Vy8PO5XNcJPqk30DGnRielU79fXYlGh9UHJorohEbUkHSCYvKs3yj8/eCbGkHzSpmDtSquZ1dWvJZKtYIc07bZ2bfLbXcXmndVIY8qvAsn736CmuxrBRFcpGplVfArqT2Jusimm/LLuJzS74BQsrsGnC83djYLNHoHvY2hAFYDSLt/0BkuXAxZpkgtrq3xPfmuzldksKqZV7mBW2/QEjlLvlUaXKZ1p0tyMo4H0JNdd62Vi23HcniMu1i+l5QTAMGtDtTkLdZJZXSqZhra6fDjaLkRtdEVNUh//BXviJE0aclH7ntlG+Rk9c3Yf/avnpUmpap2w7zlVYt9m1NuVLJBZn6vDKcds4Nn2GNvI4SjUCil2729WGJChLnXwmcqilLH3TFj+D1w6kqKTEdeSWhec3LMRgDIrBPp01DfrujEglA6MjG86YBGHsHh1nMIA/xA9CSLlY//cNrABTgmR1ZRwtA== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(8936002)(2906002)(4744005)(186003)(5660300002)(16526019)(336012)(36756003)(7696005)(508600001)(83380400001)(70206006)(4326008)(82310400003)(2616005)(6286002)(26005)(6666004)(356005)(6916009)(8676002)(47076005)(316002)(1076003)(36860700001)(55016002)(7636003)(70586007)(86362001)(426003)(54906003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2021 14:56:55.4869 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4e035368-87f8-42e2-d472-08d984228b9e 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: CO1NAM11FT021.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR12MB2492 Subject: [dpdk-dev] [PATCH v4 4/6] app/testpmd: dump port info for shared Rx queue X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" In case of shared Rx queue, polling any member port returns mbufs for all members. This patch dumps mbuf->port for each packet. Signed-off-by: Xueming Li --- app/test-pmd/util.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/test-pmd/util.c b/app/test-pmd/util.c index 14a9a251fb9..4c07907c441 100644 --- a/app/test-pmd/util.c +++ b/app/test-pmd/util.c @@ -100,6 +100,9 @@ dump_pkt_burst(uint16_t port_id, uint16_t queue, struct rte_mbuf *pkts[], struct rte_flow_restore_info info = { 0, }; mb = pkts[i]; + if (rxq_share > 0) + MKDUMPSTR(print_buf, buf_size, cur_len, "port %u, ", + mb->port); eth_hdr = rte_pktmbuf_read(mb, 0, sizeof(_eth_hdr), &_eth_hdr); eth_type = RTE_BE_TO_CPU_16(eth_hdr->ether_type); packet_type = mb->packet_type; From patchwork Thu Sep 30 14:56:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 100115 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 3695CA0C41; Thu, 30 Sep 2021 16:57:29 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1B361410EB; Thu, 30 Sep 2021 16:57:29 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2081.outbound.protection.outlook.com [40.107.93.81]) by mails.dpdk.org (Postfix) with ESMTP id 825E8410E5 for ; Thu, 30 Sep 2021 16:57:27 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=dA8mk43955o0IDo1SgzprELY/gwVbG6JgB0o+SNAF5bAfZJ2irZWEIQNr0VMO5mSDwJTgQJXsQOPBaU1nOuy7wJGurIvkN7h/ZWzHj7+5F302aoKhIPBMP6VV82GJggaJoRehPncjrR4iZXsa1CPbxCIWj3ZOIdaiepKcZpzAotiYPTPYOWSZWSS78KbkY+xzhlI8uFc/z+FI9xia86ShCXaNV490Fq4NJI3LxFw9FvnUkyKwiPmDWWad9rYwbnLb5W3Rg3qatdieAwCqEsyqOIBythklWWvjm2VuAeVK2f/gpNlpTrQFKlEgc3wY51qvQpS0D6ABqhl96ZYRYVZUQ== 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; bh=VxXU/Ryb0sZNpmwxKBMLcUmHojY/GuHHHsF8WbuHFKk=; b=gjIta7RiN2t0GeAO6qaNXoX7GfTLs3N/spioo5Oce2r0x7mkXbzW8d8+G3U3/eybCMF6alKeR64rJ5bpA5pUSkGUXnnBBtg6D++pH7mw0t6W4xvoL1Re3gTvLH97+YkIq/oJTSDVphGyc9l6D/ooDr4BQbX/XIHDIZVPuyW/zHJxcPIVLDMzfg2KY3W4BkuCQq+uJjzEE0kpALNFcyyxUu9W8L+vaHKDlXT/8h/8o5Ugm55Qr3x2B4XlDwNxiRDnGXxbsjrRePvgzBUeDgwc8AFhuRgySFd+vPgnStEgdzHNHvvbx40N0ezRiQzbIuALfsBo1CX2MGKMIU96LoAt6w== 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=VxXU/Ryb0sZNpmwxKBMLcUmHojY/GuHHHsF8WbuHFKk=; b=diAuGj6PSis7KDNrJPlTuosy/KJQBYoFx8wPx/4AhAtTkDAooNKChHzAfjD2C+u0o05DUCzBelN1+X/v7OzuXD9ch5jQuQgNmTl/KZO9OnjhhiPTY1LD6TXKrK5xg4pzN5PpvgyxXvbMk9S2+dQRr7B5mrWshkiSgx8JrNZdv+6WcZ8EoPNxbvoFxOHG890ViVrrYggiuuh4cCmp9mGjFyJ3q0Da/bVn4W7mel5SQImnZYRrKn6gYC2m+m4wOsAJlgXmvJUXCCYzGSgYmdfZBzwIEu9MOlkPFp4i3sQT1QFr7cAOtqyOhxDwXTp7Jdml0FmuCudiD0P50mMoYFVyNA== Received: from MW4PR03CA0153.namprd03.prod.outlook.com (2603:10b6:303:8d::8) by BN8PR12MB3458.namprd12.prod.outlook.com (2603:10b6:408:44::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4544.18; Thu, 30 Sep 2021 14:57:22 +0000 Received: from CO1NAM11FT032.eop-nam11.prod.protection.outlook.com (2603:10b6:303:8d:cafe::c3) by MW4PR03CA0153.outlook.office365.com (2603:10b6:303:8d::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.14 via Frontend Transport; Thu, 30 Sep 2021 14:57:22 +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 CO1NAM11FT032.mail.protection.outlook.com (10.13.174.218) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4566.14 via Frontend Transport; Thu, 30 Sep 2021 14:57:21 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 30 Sep 2021 14:57:18 +0000 From: Xueming Li To: CC: , Jerin Jacob , Ferruh Yigit , Andrew Rybchenko , Viacheslav Ovsiienko , Thomas Monjalon , Lior Margalit , "Ananyev Konstantin" , Xiaoyun Li Date: Thu, 30 Sep 2021 22:56:01 +0800 Message-ID: <20210930145602.763969-6-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210930145602.763969-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20210930145602.763969-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: cdda5538-8463-4995-a70b-08d984229b5a X-MS-TrafficTypeDiagnostic: BN8PR12MB3458: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr 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: A2DYhrCjeiGBLQmE3Q0mFWnP7BllYA4Z2kVWvwK2wYuySTM8T9GeC3vSMYsZ2Y1fuV8jUWT/xFgACyXFLYuLjq3mVQbANP+gtUiiwf2fwlyznxgSHCGG7WMtIKyQf232DbOMZYOAIM2eD9A6Q+byrOwJ5uM0T3y/yl0m6NwUjNslz9XoTR5A++niSPtewbpRU/7GVlt9gnxC5n5z0QwEFf5+p+A1lKZ4kPeKVc2b+vaZRK0uEPS8kbasqah5gzEGBJQ6W2Fp34bQsDj2iSnufUxPT58zqYOWmJCUUXAx3dOp3dQMjpvjdQRZoz70bDGnMhyQDfnlVR3Dkr7EP07qXdVu80VoC1+f/UphhTa5V9L8mMMwOnnN43U9awWVfUD+sfgqCEOYhAXr6haZGVFXENi3uiCNqU+I9skQTqgwh36G2UDxdu8KEUei1oLl1uB20/4BQ/Om57XalUvQJUykNMjFXUmX2Bu+78rXSr0htaFUFEk+vQZ+sWkw90MuBfk++tKc7ARZhSsjNJ5AdhYsngFz5Lvxf46Cx7Av28Fo9JYpuHZGJoAG3Ahj9+Gu7O3f76yHXXn71kPHZi7LuS15aRgt3rX6YMGHFxeAGIF4cs1exkspNUKNNpDD0Xt2nYsaKBcBHDrmzU83FV3GIFR7OGyiHNv0OzBuMsUZEQLGUkGhTGW2AgvS/RZ/4dcfyV1q79h80AMP6BR0TOfNkN2XQg== 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)(426003)(83380400001)(6916009)(55016002)(5660300002)(6286002)(2616005)(336012)(70586007)(1076003)(4326008)(82310400003)(508600001)(6666004)(70206006)(8676002)(8936002)(16526019)(26005)(47076005)(356005)(7636003)(7696005)(36756003)(186003)(86362001)(316002)(54906003)(36860700001)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2021 14:57:21.8710 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cdda5538-8463-4995-a70b-08d984229b5a 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: CO1NAM11FT032.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB3458 Subject: [dpdk-dev] [PATCH v4 5/6] app/testpmd: force shared Rx queue polled on same core X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Shared rxqs shares one set rx queue of groups zero. Shared Rx queue must must be polled from one core. Checks and stops forwarding if shared rxq being scheduled on multiple cores. Signed-off-by: Xueming Li --- app/test-pmd/config.c | 96 ++++++++++++++++++++++++++++++++++++++++++ app/test-pmd/testpmd.c | 4 +- app/test-pmd/testpmd.h | 2 + 3 files changed, 101 insertions(+), 1 deletion(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 6c7f9dee065..8bfa26570ba 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -2885,6 +2885,102 @@ 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, + uint32_t shared_group) +{ + 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; + if (rxq_conf->shared_group != shared_group) + continue; + printf("Shared RX queue group %u can't be scheduled on different cores:\n", + shared_group); + 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, + rxq_conf->shared_group)) + 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 417e92ade11..cab4b36b046 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -2241,10 +2241,12 @@ start_packet_forwarding(int with_tx_first) fwd_config_setup(); + pkt_fwd_config_display(&cur_fwd_config); + if (!pkt_fwd_shared_rxq_check()) + return; if(!no_flush_rx) flush_fwd_rx_queues(); - pkt_fwd_config_display(&cur_fwd_config); rxtx_config_display(); fwd_stats_reset(); diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 3dfaaad94c0..f121a2da90c 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -144,6 +144,7 @@ struct fwd_stream { uint64_t core_cycles; /**< used for RX and TX processing */ struct pkt_burst_stats rx_burst_stats; struct pkt_burst_stats tx_burst_stats; + struct fwd_lcore *lcore; /**< Lcore being scheduled. */ }; /** @@ -795,6 +796,7 @@ void port_summary_header_display(void); void rx_queue_infos_display(portid_t port_idi, uint16_t queue_id); void tx_queue_infos_display(portid_t port_idi, uint16_t queue_id); void fwd_lcores_config_display(void); +bool pkt_fwd_shared_rxq_check(void); void pkt_fwd_config_display(struct fwd_config *cfg); void rxtx_config_display(void); void fwd_config_setup(void); From patchwork Thu Sep 30 14:56:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 100116 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 1C3DBA0C41; Thu, 30 Sep 2021 16:57:35 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 699AF4113A; Thu, 30 Sep 2021 16:57:32 +0200 (CEST) Received: from NAM04-BN8-obe.outbound.protection.outlook.com (mail-bn8nam08on2046.outbound.protection.outlook.com [40.107.100.46]) by mails.dpdk.org (Postfix) with ESMTP id 9F777410E5 for ; Thu, 30 Sep 2021 16:57:28 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cSB5Qx7FRhFexrCW9fzDok6Ru8L6JdvYYPju3Ml0NO5c1dpyhSb2dSPqMJ6H+UOLGNusmZfxXRH8oSv7sls+eZ6WhzcIpx6eb+ewwF+yO4SlUWz+YB1qe7JyYc0xMAy/8iis2HAFusYmkfxEccVmmQoWmQvqA+ctgjo4COiSArUDHmwaoI50Bdu1j/HesSrgHYD/gQKpVjj+eWWG2J2/qV0lcyXtZwADfK9Gw8AL0/gRPcgGGb6RrRz7ERVTGDOHf6DGJeTPyGyR0tca/I2a/UF/Iuw8BjZv0kI8EtZ++JybhM9EtRusM/dzgFrT5Sy4SBSMVLMdGrDlILfVOwQeOg== 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; bh=NzlJXDYllOj/fY4LNhvgZ9UsXz29nSZs/6mB59vj2vI=; b=SKalLZPKt6YYCHisRDhV48p252BHZMJ7l4Fwb6jUB4EENbSqxrzeuwdLBTL7Fb6eFo/m9t6F97qX58sgIiE74Vl+pMRxLnjTAZJXY9zDWCOYaWNNe2kFa1l+OgutAPICtkVfZhDofdFjiw06niGD9N4pHhh7bjPYnPn1Z1CmZV9BXFU1cXskN3Y43SbEiujixRLhPh8h70p3vXp/S3x4VL7BZ2g5qYzwY05xwcMWlbI8Ki1XDrwAou5v+2KuuEKX9Qz/M6E/zuNZG5AvA/I5Twt0FPxYpMYnwq56s1v+0oPdRS3Uf7knAOsIaBuqArRmRN/y/qm1WirN9FFtKR2VOA== 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=NzlJXDYllOj/fY4LNhvgZ9UsXz29nSZs/6mB59vj2vI=; b=qUmJLOnVZpnHGMdDXC0CZEGWOhkZnHwsayNO/X4dpa/Mhyq13H7YGqE8UajvGVTZMe8ZX6tZ8qfIk7eYwOtzBk3QfCOeJkONLoXYXwq10qVtOjVctRUFovSzFr+W2oQ4B2UfYObl26kI3UV4kvWqDoJwrhqMleSFSYajNkfjUOUJVOwbm4u48jlRnaxTfsjeqQan7F3EPKR8lnmafQDhm2fkAEY9YObQXGYBEoZ2e3cgOlbdptoczGCckvFekG5mYm/JALA9Pp2R6rwW34hMlXQ6EodRnjNcBBA56dZKesNEMv/GQVFCeEZfFElwzAY4/lSnPWy02BYMEPHHwGaO2g== Received: from MWHPR14CA0020.namprd14.prod.outlook.com (2603:10b6:300:ae::30) by CH0PR12MB5041.namprd12.prod.outlook.com (2603:10b6:610:e0::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.15; Thu, 30 Sep 2021 14:57:25 +0000 Received: from CO1NAM11FT008.eop-nam11.prod.protection.outlook.com (2603:10b6:300:ae:cafe::46) by MWHPR14CA0020.outlook.office365.com (2603:10b6:300:ae::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4566.16 via Frontend Transport; Thu, 30 Sep 2021 14:57:25 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; monjalon.net; dkim=none (message not signed) header.d=none;monjalon.net; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT008.mail.protection.outlook.com (10.13.175.191) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4566.14 via Frontend Transport; Thu, 30 Sep 2021 14:57:25 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 30 Sep 2021 14:57:21 +0000 From: Xueming Li To: CC: , Jerin Jacob , Ferruh Yigit , Andrew Rybchenko , Viacheslav Ovsiienko , Thomas Monjalon , Lior Margalit , "Ananyev Konstantin" , Xiaoyun Li Date: Thu, 30 Sep 2021 22:56:02 +0800 Message-ID: <20210930145602.763969-7-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210930145602.763969-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20210930145602.763969-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dc62b1e4-7103-4726-8b75-08d984229d48 X-MS-TrafficTypeDiagnostic: CH0PR12MB5041: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2803; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vNy5LlbZSniue19SUPlONIsuT3/zgAyy2qboHvnc3DgniuDT8cbqEYVNJFg5HtIyncZp6ZAgh/5vv8D2KHc7ZEKCR1hph7HU44xUQ4H6IQl3cR1REV2NUqZybHdX/IPPib9bU6C3KQ12ji9UYZP+o38+iBehBbx7wTYJFSbGReREyds/HagiL6QywUIKxfPgZceYyRVLJ6sv4crUqzHET3ILyNj5F60j1L4aKnVAJWcRlpAeUOloNniWyM4dNwaIthZuhFLVBAq3keEvfCivkTSkREJ6SSuy2sz8+1XkyiVcU2AqhBNlBmEfcH0DpodB2BG3mzbozqczdNveor5f0SJF6jv5BbFP3IxzE2ZCMfpBtenlf8h4v9HBcoC8/qwKz7v2Pn7gh0BkY2WtadZbkDesQ5yNxKq/hypwO/lQkhmfESHHfv2ZlVxVTUEE+dLIqBFL1HS/rZzMhpF8rUwoJwunmlMNNP1eUnW1zXuMLwD1gkWQKk3ZZLXPEpv1XZEe2/MhhsFVS7wPrnbeTgdn+CLtOqOk9YLK72W1/xzrdiO2EIBO/rZkD0If4PZUh43aZHflbXgyFqn6wppPdms7g8+pO3p96S70PZTh/GfakWBqIV31qP+dDdUoyJwfSFfb1xJz3ybspUD/t5JRx25DtdEPgVyph4U4D5vVy0eJais7y4FZC10kBbyqTu8PGKiWskLwlYUOMZD32o3vVEqL7w== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(36840700001)(46966006)(36756003)(16526019)(7696005)(356005)(83380400001)(36860700001)(86362001)(186003)(7636003)(336012)(6916009)(426003)(5660300002)(70586007)(26005)(70206006)(6666004)(82310400003)(6286002)(55016002)(2906002)(54906003)(4326008)(316002)(508600001)(8676002)(1076003)(8936002)(2616005)(47076005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Sep 2021 14:57:25.0468 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dc62b1e4-7103-4726-8b75-08d984229d48 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: CO1NAM11FT008.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5041 Subject: [dpdk-dev] [PATCH v4 6/6] app/testpmd: add forwarding engine for shared Rx queue X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" To support shared Rx queue, this patch introduces dedicate forwarding engine. The engine groups received packets by mbuf->port into sub-group, updates stream statistics and simply frees packets. Signed-off-by: Xueming Li --- app/test-pmd/meson.build | 1 + app/test-pmd/shared_rxq_fwd.c | 148 ++++++++++++++++++++ app/test-pmd/testpmd.c | 1 + app/test-pmd/testpmd.h | 1 + doc/guides/testpmd_app_ug/run_app.rst | 1 + doc/guides/testpmd_app_ug/testpmd_funcs.rst | 5 +- 6 files changed, 156 insertions(+), 1 deletion(-) create mode 100644 app/test-pmd/shared_rxq_fwd.c diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build index 98f3289bdfa..07042e45b12 100644 --- a/app/test-pmd/meson.build +++ b/app/test-pmd/meson.build @@ -21,6 +21,7 @@ sources = files( 'noisy_vnf.c', 'parameters.c', 'rxonly.c', + 'shared_rxq_fwd.c', 'testpmd.c', 'txonly.c', 'util.c', diff --git a/app/test-pmd/shared_rxq_fwd.c b/app/test-pmd/shared_rxq_fwd.c new file mode 100644 index 00000000000..4e262b99bc7 --- /dev/null +++ b/app/test-pmd/shared_rxq_fwd.c @@ -0,0 +1,148 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2021 NVIDIA Corporation & Affiliates + */ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "testpmd.h" + +/* + * Rx only sub-burst forwarding. + */ +static void +forward_rx_only(uint16_t nb_rx, struct rte_mbuf **pkts_burst) +{ + rte_pktmbuf_free_bulk(pkts_burst, nb_rx); +} + +/** + * Get packet source stream by source port and queue. + * All streams of same shared Rx queue locates on same core. + */ +static struct fwd_stream * +forward_stream_get(struct fwd_stream *fs, uint16_t port) +{ + streamid_t sm_id; + struct fwd_lcore *fc; + struct fwd_stream **fsm; + streamid_t nb_fs; + + fc = fs->lcore; + fsm = &fwd_streams[fc->stream_idx]; + nb_fs = fc->stream_nb; + for (sm_id = 0; sm_id < nb_fs; sm_id++) { + if (fsm[sm_id]->rx_port == port && + fsm[sm_id]->rx_queue == fs->rx_queue) + return fsm[sm_id]; + } + return NULL; +} + +/** + * Forward packet by source port and queue. + */ +static void +forward_sub_burst(struct fwd_stream *src_fs, uint16_t port, uint16_t nb_rx, + struct rte_mbuf **pkts) +{ + struct fwd_stream *fs = forward_stream_get(src_fs, port); + + if (fs != NULL) { + fs->rx_packets += nb_rx; + forward_rx_only(nb_rx, pkts); + } else { + /* Source stream not found, drop all packets. */ + src_fs->fwd_dropped += nb_rx; + while (nb_rx > 0) + rte_pktmbuf_free(pkts[--nb_rx]); + } +} + +/** + * Forward packets from shared Rx queue. + * + * Source port of packets are identified by mbuf->port. + */ +static void +forward_shared_rxq(struct fwd_stream *fs, uint16_t nb_rx, + struct rte_mbuf **pkts_burst) +{ + uint16_t i, nb_sub_burst, port, last_port; + + nb_sub_burst = 0; + last_port = pkts_burst[0]->port; + /* Locate sub-burst according to mbuf->port. */ + for (i = 0; i < nb_rx - 1; ++i) { + rte_prefetch0(pkts_burst[i + 1]); + port = pkts_burst[i]->port; + if (i > 0 && last_port != port) { + /* Forward packets with same source port. */ + forward_sub_burst(fs, last_port, nb_sub_burst, + &pkts_burst[i - nb_sub_burst]); + nb_sub_burst = 0; + last_port = port; + } + nb_sub_burst++; + } + /* Last sub-burst. */ + nb_sub_burst++; + forward_sub_burst(fs, last_port, nb_sub_burst, + &pkts_burst[nb_rx - nb_sub_burst]); +} + +static void +shared_rxq_fwd(struct fwd_stream *fs) +{ + struct rte_mbuf *pkts_burst[nb_pkt_per_burst]; + uint16_t nb_rx; + uint64_t start_tsc = 0; + + get_start_cycles(&start_tsc); + nb_rx = rte_eth_rx_burst(fs->rx_port, fs->rx_queue, pkts_burst, + nb_pkt_per_burst); + inc_rx_burst_stats(fs, nb_rx); + if (unlikely(nb_rx == 0)) + return; + forward_shared_rxq(fs, nb_rx, pkts_burst); + get_end_cycles(fs, start_tsc); +} + +struct fwd_engine shared_rxq_engine = { + .fwd_mode_name = "shared_rxq", + .port_fwd_begin = NULL, + .port_fwd_end = NULL, + .packet_fwd = shared_rxq_fwd, +}; diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index cab4b36b046..681ea591871 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -188,6 +188,7 @@ struct fwd_engine * fwd_engines[] = { #ifdef RTE_LIBRTE_IEEE1588 &ieee1588_fwd_engine, #endif + &shared_rxq_engine, NULL, }; diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index f121a2da90c..f1fd607e365 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -299,6 +299,7 @@ extern struct fwd_engine five_tuple_swap_fwd_engine; #ifdef RTE_LIBRTE_IEEE1588 extern struct fwd_engine ieee1588_fwd_engine; #endif +extern struct fwd_engine shared_rxq_engine; extern struct fwd_engine * fwd_engines[]; /**< NULL terminated array. */ extern cmdline_parse_inst_t cmd_set_raw; diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst index 43c85959e0b..7b83d4b3944 100644 --- a/doc/guides/testpmd_app_ug/run_app.rst +++ b/doc/guides/testpmd_app_ug/run_app.rst @@ -252,6 +252,7 @@ The command line options are: tm noisy 5tswap + shared-rxq * ``--rss-ip`` diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index bbef7063741..a30e2f4dfae 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -314,7 +314,7 @@ set fwd Set the packet forwarding mode:: testpmd> set fwd (io|mac|macswap|flowgen| \ - rxonly|txonly|csum|icmpecho|noisy|5tswap) (""|retry) + rxonly|txonly|csum|icmpecho|noisy|5tswap|shared-rxq) (""|retry) ``retry`` can be specified for forwarding engines except ``rx_only``. @@ -357,6 +357,9 @@ The available information categories are: L4 swaps the source port and destination port of transport layer (TCP and UDP). +* ``shared-rxq``: Receive only for shared Rx queue. + Resolve packet source port from mbuf and update stream statistics accrodingly. + Example:: testpmd> set fwd rxonly