From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 4212CA0C47; Tue, 12 Oct 2021 16:40:49 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 29AA04118A; Tue, 12 Oct 2021 16:40:49 +0200 (CEST) Received: from NAM04-DM6-obe.outbound.protection.outlook.com (mail-dm6nam08on2041.outbound.protection.outlook.com [40.107.102.41]) by mails.dpdk.org (Postfix) with ESMTP id 4426B40151 for ; Tue, 12 Oct 2021 16:40:47 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=NZy+L0w7EFDfEv9jdRJLg5Sxra86CQJSOFG04UWPJBH8mpbO2VGf7GoGP55NmJDIiNRThFJunH8SJcYT46KYufq+XJkSuPAeWef0pAwEtDz71ox0d/JJz2fq9glyfNwXcwBG6s2cibH5lnWza0f6XkjDe8YprmqGzYncM6DBg2hA08SsW1I5OPfgmXVZcQHIQwWHn8YWTQ5t2D169mRiGUu7W+SK/65o+UGAqU2uc3iF5kultfyzq00MGf2TbQ6XtC6k20rzYTckhdVhYEwUP82qAdUzrW/m4U8pbSlDm1zNK4Q4dMa8h3rjVQftLQozgxJRQp0+IC7mfodDInxhNg== 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=fXaV6xoV37J8otTzbqfDYOQQfZNgXSDOxzZYMiFsLIM=; b=Ue/ItVMrWCeeJ0kV4+naCOqq7DM3MBd8ecM/Th7Zs88CElPIIq06WoeHEzpVC00PKF/+tB3cBMGyy/tE8j8WCZ/VMk8Y8w8q80uVq3IJK9VPx2ogaiqzvgQiDqgmWsNdMXv0eFJNpViBINBUE+FeI4KCcdie82E+XqemK/uvyd2FiFVwbykko7mGfDU89RKryHPqyNKj+okGOeOZ94E/g5dRtCA9oOAYkOQFEmmhfPVK3v3sNG3Mul2wr7I2AXvh5/XX21T4cCHEHBrlQQy+0Rdo6U0BqVSUO48FRuXubc+iAmiA9Pq5P4ko5pm+LVbXoT0VN3xFcUBvdhakK4vjBg== 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=fXaV6xoV37J8otTzbqfDYOQQfZNgXSDOxzZYMiFsLIM=; b=F9fQWUaq437s4emO6lzH/QcXVTSicRO5prm2LBB9LiItxpf9sm1T/rtbDceV1BTtsd+vLyWhqVq5+HiVorbe2zM92jIweqpHsKvYPSaAmehoPAV7kIBcV4KuzQHVePlZvuJZMMGgD6HXKLTUHFi43kiBFQPigT3cQQVoX4F3j6+o3pgkiR4DiNH3kGgHs0Obeh6LUwaACf+s6I/WN2RaSM5RsqngJkbJmN7j9j5ZdBH3O5O4bmIU9pEwv9uSDeAsKLMTTgEWQ/p/PlO2ejEcB/J0dsWY7xlF+MUodxVDiIHLQMw8B3G5dxxfu49XpA3LU6p6TaTywFKKCEiimP2gvw== Received: from MWHPR14CA0027.namprd14.prod.outlook.com (2603:10b6:300:12b::13) by BN8PR12MB4769.namprd12.prod.outlook.com (2603:10b6:408:a7::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.18; Tue, 12 Oct 2021 14:40:45 +0000 Received: from CO1NAM11FT010.eop-nam11.prod.protection.outlook.com (2603:10b6:300:12b:cafe::20) by MWHPR14CA0027.outlook.office365.com (2603:10b6:300:12b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Tue, 12 Oct 2021 14:40:44 +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 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.4587.18 via Frontend Transport; Tue, 12 Oct 2021 14:40:44 +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; Tue, 12 Oct 2021 14:40:41 +0000 From: Xueming Li To: CC: , Jerin Jacob , Ferruh Yigit , Andrew Rybchenko , Viacheslav Ovsiienko , Thomas Monjalon , Lior Margalit , "Ananyev Konstantin" , Xiaoyun Li Date: Tue, 12 Oct 2021 22:39:42 +0800 Message-ID: <20211012143942.1133718-6-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211012143942.1133718-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20211012143942.1133718-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] 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: 2559440e-8274-4ef7-5863-08d98d8e45ad X-MS-TrafficTypeDiagnostic: BN8PR12MB4769: 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: ZZx7dcfjct6zRGX5C0uLFhpO6PbWlVJMCzafybK8f5HlivbHWyy/ZfuUyxDzeN/eZH2MJoSV4xV5jVDbAWHniK4EZvl3pPqjo/DbcA4XumaIy2HhmL5gLETMWsYxdfYpIlyWmLdREJKl+khrV24UeOPQEx5i+ye2tLFmDrwO4Aqa4pARweeiuHSqtooBQKFd4SV9x/AqakMVFbqy4cYMh4wnczxEBp1TLDHfHwwx9HEZlGpYfp4+nIYDi5mC6IB8IL23ouQDXV3zTXBDZ1OxtNCWhAFjr+/5dSnRgbTfU7jOnfWmqtkOVYwEGcUh1PAbtOlWGqfAnsjajb4hcr0ir55IXIesBGq4R94awHXldpM842UBVhl6YrcCVzFLBonXURp942dkwC7uxJamgVnuFdEdo7yz5AyEAekk5rbmNypdf5/IXQmP6WSdD0MXp2IkHKkRbgORwyXIXPNo9O4LElJdwvPgv5U/HJ7l4gBvOV8mcMoaOzQxpCS0kabWCd8AeixQW9jtxzd/XYaMwbja5NRPZyeX7A4mXZZxcoYAjHis3NV7OZp3I38thhyDVesnTxtsqudMprDCXb34GTL4U16eLrY4eZvSU2SJ5/nsciM16965adhhgvjw+FZMzZRxIb4ixb9B83dIZLz3pa7xZfjPnKV1g/EN4WmAsaII7wuSdAIGRinnGu+0OU7EAVqHdnny+ERT3ehMB3zC6925Vg== 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)(82310400003)(47076005)(83380400001)(6916009)(36860700001)(7636003)(2906002)(336012)(7696005)(4326008)(508600001)(36756003)(86362001)(54906003)(356005)(426003)(8676002)(2616005)(55016002)(16526019)(26005)(316002)(5660300002)(8936002)(6286002)(70206006)(70586007)(186003)(1076003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Oct 2021 14:40:44.2403 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2559440e-8274-4ef7-5863-08d98d8e45ad 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: BN8PR12MB4769 Subject: [dpdk-dev] [PATCH v6 5/5] 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 df301e2e683..e29837b3b16 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -188,6 +188,7 @@ struct fwd_engine * fwd_engines[] = { #ifdef RTE_LIBRTE_IEEE1588 &ieee1588_fwd_engine, #endif + &shared_rxq_engine, NULL, }; diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index f121a2da90c..f1fd607e365 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -299,6 +299,7 @@ extern struct fwd_engine five_tuple_swap_fwd_engine; #ifdef RTE_LIBRTE_IEEE1588 extern struct fwd_engine ieee1588_fwd_engine; #endif +extern struct fwd_engine shared_rxq_engine; extern struct fwd_engine * fwd_engines[]; /**< NULL terminated array. */ extern cmdline_parse_inst_t cmd_set_raw; diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst index ff5908dcd50..e4b97844ced 100644 --- a/doc/guides/testpmd_app_ug/run_app.rst +++ b/doc/guides/testpmd_app_ug/run_app.rst @@ -252,6 +252,7 @@ The command line options are: tm noisy 5tswap + shared-rxq * ``--rss-ip`` diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 8ead7a4a712..499874187f2 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -314,7 +314,7 @@ set fwd Set the packet forwarding mode:: testpmd> set fwd (io|mac|macswap|flowgen| \ - rxonly|txonly|csum|icmpecho|noisy|5tswap) (""|retry) + rxonly|txonly|csum|icmpecho|noisy|5tswap|shared-rxq) (""|retry) ``retry`` can be specified for forwarding engines except ``rx_only``. @@ -357,6 +357,9 @@ The available information categories are: L4 swaps the source port and destination port of transport layer (TCP and UDP). +* ``shared-rxq``: Receive only for shared Rx queue. + Resolve packet source port from mbuf and update stream statistics accordingly. + Example:: testpmd> set fwd rxonly -- 2.33.0