From patchwork Thu Oct 21 10:41:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xueming Li X-Patchwork-Id: 102584 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 E0BBDA0C4B; Thu, 21 Oct 2021 12:43:05 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 24391411E5; Thu, 21 Oct 2021 12:43:03 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2084.outbound.protection.outlook.com [40.107.94.84]) by mails.dpdk.org (Postfix) with ESMTP id 060A1411DF for ; Thu, 21 Oct 2021 12:43:02 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gVtYX8eNen7q++YUiMBy1u5sfWPWQSWW/djG6re06wWDdBdg5+5swHkRQ1LTcAEklEg0pXZouqdOAiwStlQGczvj2iTYbzQj7K31VgTozQN757iu7Nu+YVYRijDr4lUOVh58gCenuNCb5F+t7pUYjAcxg6V9iwqHnFpzjAdu75/jLdT3oJMP5iBYz1idECvYN3c3fljFk3iCXLpRFqGYDQziEip1gPBgALjleitxRoxuaxpPg4+XYrk97zvRczw0lc8csMOVFDzIgp5EXgu0gmQf3+3AMpWbgtdxv3zEIH4frbMbElpL/2wfYeZjRsAKumT3BsGJz4OUURhR4L6hng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=l8AIGfeBRtXqsKobqNzTOOHeZTMo7RcB5GFco1fVW6Y=; b=l8Cw/9k/RwfCjWQ2faKNRaRgoqCozKmSa6Jw3fozV9CdIdHagVln8saHM9swE+FLBg5OdVebOoifO4dqHEfkrpSMsDT9alrKV3eFruIp4feASketcuBVhiq8m55PgGf8tVruYOxg9O+zuixGPy4IfoOs9j7+7xKqjutNvblWC5kvpi9Mm7t22e2VPmVvpmUEAtDz/9p7m2Wt+gDAVYv1Fi3XKm1FGKeejS3z/ZrbVXh3yEG7GYntdLqBTsIqjAGF1q3QNAUHRNS6Q7pAwWYZs/Q5+NPolb3L0eTaIhTSk/usBpHVQebmSpZymEi+UcUmJTJEJC94Wjf4LFpnRxnjVA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=l8AIGfeBRtXqsKobqNzTOOHeZTMo7RcB5GFco1fVW6Y=; b=OCDyNYB1amwA4yzzBXpMq3IQf8OdIrA66IPr4NpNWUP8mp12LN/nJ0lmKYb8vae5HjRpbrGxyrCKjbl3yifmqHmaJvQmbOQXB4yIl5sEunvlZWK6irFiFgF8MV2g+LJ2OdTkw0Y4krhIddCk8mzdHsSGsObkljKzMCymsIKFmjs2gFWWtlqoADBIvocCmYpF+fS8h6WAC1nNdxRWH7Sm3P0K+qo+tyafE0PKCglPJbJCzAfdNuyKZfxAS9p7AfqIr9bywcDGy5P0zqgdIgX0tl6iTujFyVYWj/TceJm2v9js3SVIRMoAsPD3l2NpSsCPkcQGmus2X5TJxRkbLmKNnw== Received: from BN9PR03CA0934.namprd03.prod.outlook.com (2603:10b6:408:108::9) by DM6PR12MB3049.namprd12.prod.outlook.com (2603:10b6:5:11d::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.18; Thu, 21 Oct 2021 10:42:59 +0000 Received: from BN8NAM11FT032.eop-nam11.prod.protection.outlook.com (2603:10b6:408:108:cafe::4a) by BN9PR03CA0934.outlook.office365.com (2603:10b6:408:108::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16 via Frontend Transport; Thu, 21 Oct 2021 10:42:58 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; monjalon.net; dkim=none (message not signed) header.d=none;monjalon.net; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by BN8NAM11FT032.mail.protection.outlook.com (10.13.177.88) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4628.16 via Frontend Transport; Thu, 21 Oct 2021 10:42:58 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Thu, 21 Oct 2021 10:42:51 +0000 From: Xueming Li To: , Zhang Yuying , Li Xiaoyun CC: , Jerin Jacob , Ferruh Yigit , Andrew Rybchenko , Viacheslav Ovsiienko , Thomas Monjalon , Lior Margalit , "Ananyev Konstantin" , Ajit Khaparde Date: Thu, 21 Oct 2021 18:41:42 +0800 Message-ID: <20211021104142.2649060-8-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211021104142.2649060-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20211021104142.2649060-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 66134da5-50f5-4483-12ff-08d9947f8c94 X-MS-TrafficTypeDiagnostic: DM6PR12MB3049: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Exchange-Transport-Forked: True X-MS-Oob-TLC-OOBClassifiers: OLM:3173; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: vPG7goYU+21Ea3g0mi7HGQhL+Kh5nqrZQ8dkjCggrinF+Bf6kgVNC3kxKYRnya7d8dmkaZRvnUztgn6zrOB+fzb4SW7iUvGb7oAqI8rCxzJjK1mCYVeyY7coY4mhRGvkMIaNVYrjetoxe4VIOC2ruozSVWkzH+9zk5c4E9D6XkPZFz515FcwEoa8lDq2iB0w9kJXC/V+aw5iLG9n24K9nqkLipcO/dOeY83sGOsUmHl5PDNsgfUaLRLp3F967j17e3gFGzo33eXrLpnLHfrUjwqUDoSBksiQqg5ZI/BjaElg5kXwP1yulBT9tVeqbY9I8cGR/oG2IsG6mEG9I3ebdSyB5ExzXy/Nod7Kyhv6XRL+TsCr08WOB9AjIEq4hCfiLyCyayThmW5CfwA75h0ajQlQdEcy5ydUr1JrRP/JGN5rgJ8E4qNg3I2rgmjOS0zjT+uyaBP75ru4USzxW8Iyj9XbH93rEk+ZEBY0y+7pAIaLixaW2qs68WBZ7pRIvnaAV4HmpCmx82a5xVe/YeJhgbSSlfbEk9kyIYFPoiMo3Ef/VLoFr0wlaRsYWwu5rPh6o4zFkh+hw3SDcBvn3xB8GNomSsJB9J7RWOE9fGyKAQZblJAKBzDkc3m/5QsjE8tkay/EVg5PSUE1tEitOZgwJLxo3t4Gm8ZigE6ZOf47SFjrAh2aeWMtkpP+siQec4AoTloDHqVqYnQR8qxxbkd5yA== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(86362001)(6286002)(336012)(54906003)(316002)(110136005)(83380400001)(508600001)(4326008)(7636003)(2906002)(36906005)(6666004)(26005)(36860700001)(82310400003)(36756003)(8676002)(47076005)(70586007)(2616005)(5660300002)(426003)(356005)(16526019)(70206006)(8936002)(55016002)(186003)(7696005)(1076003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2021 10:42:58.4520 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 66134da5-50f5-4483-12ff-08d9947f8c94 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: BN8NAM11FT032.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3049 Subject: [dpdk-dev] [PATCH v13 7/7] app/testpmd: add forwarding engine for shared Rx queue X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" To support shared Rx queue, this patch introduces dedicate forwarding engine. The engine groups received packets by mbuf->port into sub-group, updates stream statistics and simply frees packets. Signed-off-by: Xueming Li --- app/test-pmd/meson.build | 1 + app/test-pmd/shared_rxq_fwd.c | 115 ++++++++++++++++++++ app/test-pmd/testpmd.c | 1 + app/test-pmd/testpmd.h | 1 + doc/guides/testpmd_app_ug/run_app.rst | 5 +- doc/guides/testpmd_app_ug/testpmd_funcs.rst | 5 +- 6 files changed, 126 insertions(+), 2 deletions(-) create mode 100644 app/test-pmd/shared_rxq_fwd.c diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build index 1ad54caef2c..b5a0f7b6209 100644 --- a/app/test-pmd/meson.build +++ b/app/test-pmd/meson.build @@ -22,6 +22,7 @@ sources = files( 'noisy_vnf.c', 'parameters.c', 'rxonly.c', + 'shared_rxq_fwd.c', 'testpmd.c', 'txonly.c', 'util.c', diff --git a/app/test-pmd/shared_rxq_fwd.c b/app/test-pmd/shared_rxq_fwd.c new file mode 100644 index 00000000000..da54a383fd5 --- /dev/null +++ b/app/test-pmd/shared_rxq_fwd.c @@ -0,0 +1,115 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2021 NVIDIA Corporation & Affiliates + */ + +#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 d76d298a4b9..6d5bbc82404 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -188,6 +188,7 @@ struct fwd_engine * fwd_engines[] = { #ifdef RTE_LIBRTE_IEEE1588 &ieee1588_fwd_engine, #endif + &shared_rxq_engine, NULL, }; diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index 9482dab3071..bf3669134aa 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -339,6 +339,7 @@ extern struct fwd_engine five_tuple_swap_fwd_engine; #ifdef RTE_LIBRTE_IEEE1588 extern struct fwd_engine ieee1588_fwd_engine; #endif +extern struct fwd_engine shared_rxq_engine; extern struct fwd_engine * fwd_engines[]; /**< NULL terminated array. */ extern cmdline_parse_inst_t cmd_set_raw; diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst index faa3efb902c..d23e0b6a7a2 100644 --- a/doc/guides/testpmd_app_ug/run_app.rst +++ b/doc/guides/testpmd_app_ug/run_app.rst @@ -258,6 +258,7 @@ The command line options are: tm noisy 5tswap + shared-rxq * ``--rss-ip`` @@ -399,7 +400,9 @@ The command line options are: Create queues in shared Rx queue mode if device supports. Shared Rx queues are grouped per X ports. X defaults to UINT32_MAX, - implies all ports join share group 1. + implies all ports join share group 1. Forwarding engine "shared-rxq" + should be used for shared Rx queues. This engine does Rx only and + update stream statistics accordingly. * ``--eth-link-speed`` diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 6d127d9a7bc..78d23429c42 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -314,7 +314,7 @@ set fwd Set the packet forwarding mode:: testpmd> set fwd (io|mac|macswap|flowgen| \ - rxonly|txonly|csum|icmpecho|noisy|5tswap) (""|retry) + rxonly|txonly|csum|icmpecho|noisy|5tswap|shared-rxq) (""|retry) ``retry`` can be specified for forwarding engines except ``rx_only``. @@ -357,6 +357,9 @@ The available information categories are: L4 swaps the source port and destination port of transport layer (TCP and UDP). +* ``shared-rxq``: Receive only for shared Rx queue. + Resolve packet source port from mbuf and update stream statistics accordingly. + Example:: testpmd> set fwd rxonly