From patchwork Mon Oct 18 12:08:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xueming(Steven) Li" X-Patchwork-Id: 101987 X-Patchwork-Delegate: ferruh.yigit@amd.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C9FEDA0C43; Mon, 18 Oct 2021 14:10:29 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B5BE540683; Mon, 18 Oct 2021 14:10:29 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2083.outbound.protection.outlook.com [40.107.244.83]) by mails.dpdk.org (Postfix) with ESMTP id D18E940142 for ; Mon, 18 Oct 2021 14:10:27 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=drNK+ECxvv2d1Xj8d5BoxWsCjvBUhUsjk0D3jSFGtad2mwgq3uMe9i8TemS3jxKUrFm5FZ0fXgthpeheIv7GoEYgm+zSbVSOddpiPKsd0TXx+FnoT3uzje//byDhlNO58NzGJvYxmmNsN1L8v8lItC6Ju0o4Aoir6rWtDN65FXw+4FnmsvQ2XYxv4sxqJcTUkjRtFMerXUdAPHX1NNKYdw1lwR3sTyRSPwMOY9Z9qqSdr9F3sRmudedzm7RIuNauvNGG/xas03ov9+PKnA54J5K3epCmZIBp+mhll1l7WxxeJkT7uESFybfCqKH4cj68rqYouxYzRapL4lmd6agFAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=B7n2988QVsChIR4PsUZNKDrQZshm6A1uet2CXqopejI=; b=EmZUNKfW2denXGoEEJ3aiL5xJH6R1k4Y+vwM5p8TZ2BvQ+1seKv/xSNk2YaR3jUBqEPJa/bOwAmI/fRYjNLfKq4rlPWTXGHbAZIAF97rNL7mtwpeHvMXbEtuzSMvSVjg2iF3Z2Wsm7T4dwJ7sXD10sRFilr5sz7o66QN5Zim8kNRTVuBxxmHDidWj36Jp9Z/+RacDmecE7YpJwg6ra9d+EBZVxWzEZYF7NQbAqQYMBFq2iW82r9piUSsOmFcrjcXaaideV9EtZtodohfJqw4Yla1HXVNKFnvyFTBDfDCxAfivt9BS1QN9D6+8VfnEAgjS3uIRwDjBCnGJ+KQscMEqA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=monjalon.net smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=B7n2988QVsChIR4PsUZNKDrQZshm6A1uet2CXqopejI=; b=WhmGTpW+fuYIgmwAnkzsyKhbvh42vJG0JbvcJP9yrMvm27cRuMojOEUvrh63k3X7QGOao+S2T8BQ73MM1ANrNZ98CojP8BBbvpNgWvFOuYa7Y0Q64yy8nNzvK9mU6LxWyp7kimtfMMlRI+61PKDuLwuKdLMicsTwM0cqcNHtNaCjfJWgLTEhOkMn8DLNWsN+L/JF/t9HqeD0D9GZlEV3/fKMsoMpPhMrj1Rsn96f0iDjy8jxFNNPCB10P0HEQ0MRheCJd3Sp/FGq+znP56YvEfj/h05m5Ne+Ag9c6l6T8BAW5E+YoOboe02gMKT9ErTJ+je81pK7zlR/6Ssm5nOsAQ== Received: from MWHPR13CA0003.namprd13.prod.outlook.com (2603:10b6:300:16::13) by MW3PR12MB4364.namprd12.prod.outlook.com (2603:10b6:303:5c::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Mon, 18 Oct 2021 12:10:26 +0000 Received: from CO1NAM11FT055.eop-nam11.prod.protection.outlook.com (2603:10b6:300:16:cafe::a9) by MWHPR13CA0003.outlook.office365.com (2603:10b6:300:16::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.8 via Frontend Transport; Mon, 18 Oct 2021 12:10:26 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; monjalon.net; dkim=none (message not signed) header.d=none;monjalon.net; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT055.mail.protection.outlook.com (10.13.175.129) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4608.15 via Frontend Transport; Mon, 18 Oct 2021 12:10:24 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Mon, 18 Oct 2021 12:09:41 +0000 From: Xueming Li To: CC: , Jerin Jacob , Ferruh Yigit , Andrew Rybchenko , Viacheslav Ovsiienko , Thomas Monjalon , Lior Margalit , "Ananyev Konstantin" , Xiaoyun Li Date: Mon, 18 Oct 2021 20:08:42 +0800 Message-ID: <20211018120842.2058637-7-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211018120842.2058637-1-xuemingl@nvidia.com> References: <20211018120842.2058637-1-xuemingl@nvidia.com> MIME-Version: 1.0 X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4429356c-8a79-446b-59a6-08d9923044c3 X-MS-TrafficTypeDiagnostic: MW3PR12MB4364: X-LD-Processed: 43083d15-7273-40c1-b7db-39efd9ccc17a,ExtAddr X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:2803; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MC/W/muTOaeeF2ZfnSlWgZqGRisFRaHdiYTmCZ4dynXHNpIlpvCIRI04scyggd8vjxLRCOg21+WLEATtDRHmDXsmaI/Ymyr3Giua0OndWkAb8CUHmuG0uKrtEcd0ZfO5IAfCFhuvrL+5yGY9heDe9v6RGsJucVCmk181F3ujNuNJr4M4KdViMFdKSz/+Ize4VsL3EkJrr3ddQ+R7INDhmp2aDebbFzwr/8ChidVuB4OEPjXHpEQU/rJHoO0yY02+p/5lJHKPEdVDxEJEg6+1yX6uqObgXkex9lBBLDnV2DzDHZPl/RON+CHpsuN6v7ax0sfw+xsSTfCw6GMu82Pr5ByCXro+ZmU8azqOB9MhQUbYAw5UW/M2Ve2RfMlMbA0FAPdL0+w35nTSdPcyz8ZsQuXavwK+x0Jd9VUw1UENiKxssHrOgjCg2Mg1MRVZ3Nftp2O1ilE8CAhZBVy0B/G6MRefGMBmjAeAqvWQWgA5d/m+DdED6VfTKwEfNOG02vg33zQ8kY5jF+DsMMlF0qMIJANw+/aDxQbXm5CkTe+yP5+T25icIt5kFzXkYbjeYvMugQ4CamiDZd6ZuTf1kc9CmWROxXnbmF+74UMMsELm1qmLS6tSoJ4VzQwnqrhtepV9YGvcCdkwnL8o3Pi8rRurlAoAhkQgxdSXqqsMW4xsH2m1vmIeyCwGjbubNxvAMsygYOvbibjz4Wl7C4kygimctQ== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(70206006)(70586007)(2616005)(1076003)(54906003)(16526019)(356005)(26005)(36860700001)(336012)(2906002)(316002)(5660300002)(8676002)(82310400003)(426003)(83380400001)(186003)(36906005)(6286002)(8936002)(4326008)(55016002)(36756003)(47076005)(7636003)(7696005)(6916009)(508600001)(86362001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Oct 2021 12:10:24.3493 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4429356c-8a79-446b-59a6-08d9923044c3 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT055.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW3PR12MB4364 Subject: [dpdk-dev] [PATCH v8 6/6] app/testpmd: add forwarding engine for shared Rx queue X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" To support shared Rx queue, this patch introduces dedicate forwarding engine. The engine groups received packets by mbuf->port into sub-group, updates stream statistics and simply frees packets. Signed-off-by: Xueming Li --- app/test-pmd/meson.build | 1 + app/test-pmd/shared_rxq_fwd.c | 148 ++++++++++++++++++++ app/test-pmd/testpmd.c | 1 + app/test-pmd/testpmd.h | 1 + doc/guides/testpmd_app_ug/run_app.rst | 1 + doc/guides/testpmd_app_ug/testpmd_funcs.rst | 5 +- 6 files changed, 156 insertions(+), 1 deletion(-) create mode 100644 app/test-pmd/shared_rxq_fwd.c diff --git a/app/test-pmd/meson.build b/app/test-pmd/meson.build index 98f3289bdfa..07042e45b12 100644 --- a/app/test-pmd/meson.build +++ b/app/test-pmd/meson.build @@ -21,6 +21,7 @@ sources = files( 'noisy_vnf.c', 'parameters.c', 'rxonly.c', + 'shared_rxq_fwd.c', 'testpmd.c', 'txonly.c', 'util.c', diff --git a/app/test-pmd/shared_rxq_fwd.c b/app/test-pmd/shared_rxq_fwd.c new file mode 100644 index 00000000000..4e262b99bc7 --- /dev/null +++ b/app/test-pmd/shared_rxq_fwd.c @@ -0,0 +1,148 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright (c) 2021 NVIDIA Corporation & Affiliates + */ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "testpmd.h" + +/* + * Rx only sub-burst forwarding. + */ +static void +forward_rx_only(uint16_t nb_rx, struct rte_mbuf **pkts_burst) +{ + rte_pktmbuf_free_bulk(pkts_burst, nb_rx); +} + +/** + * Get packet source stream by source port and queue. + * All streams of same shared Rx queue locates on same core. + */ +static struct fwd_stream * +forward_stream_get(struct fwd_stream *fs, uint16_t port) +{ + streamid_t sm_id; + struct fwd_lcore *fc; + struct fwd_stream **fsm; + streamid_t nb_fs; + + fc = fs->lcore; + fsm = &fwd_streams[fc->stream_idx]; + nb_fs = fc->stream_nb; + for (sm_id = 0; sm_id < nb_fs; sm_id++) { + if (fsm[sm_id]->rx_port == port && + fsm[sm_id]->rx_queue == fs->rx_queue) + return fsm[sm_id]; + } + return NULL; +} + +/** + * Forward packet by source port and queue. + */ +static void +forward_sub_burst(struct fwd_stream *src_fs, uint16_t port, uint16_t nb_rx, + struct rte_mbuf **pkts) +{ + struct fwd_stream *fs = forward_stream_get(src_fs, port); + + if (fs != NULL) { + fs->rx_packets += nb_rx; + forward_rx_only(nb_rx, pkts); + } else { + /* Source stream not found, drop all packets. */ + src_fs->fwd_dropped += nb_rx; + while (nb_rx > 0) + rte_pktmbuf_free(pkts[--nb_rx]); + } +} + +/** + * Forward packets from shared Rx queue. + * + * Source port of packets are identified by mbuf->port. + */ +static void +forward_shared_rxq(struct fwd_stream *fs, uint16_t nb_rx, + struct rte_mbuf **pkts_burst) +{ + uint16_t i, nb_sub_burst, port, last_port; + + nb_sub_burst = 0; + last_port = pkts_burst[0]->port; + /* Locate sub-burst according to mbuf->port. */ + for (i = 0; i < nb_rx - 1; ++i) { + rte_prefetch0(pkts_burst[i + 1]); + port = pkts_burst[i]->port; + if (i > 0 && last_port != port) { + /* Forward packets with same source port. */ + forward_sub_burst(fs, last_port, nb_sub_burst, + &pkts_burst[i - nb_sub_burst]); + nb_sub_burst = 0; + last_port = port; + } + nb_sub_burst++; + } + /* Last sub-burst. */ + nb_sub_burst++; + forward_sub_burst(fs, last_port, nb_sub_burst, + &pkts_burst[nb_rx - nb_sub_burst]); +} + +static void +shared_rxq_fwd(struct fwd_stream *fs) +{ + struct rte_mbuf *pkts_burst[nb_pkt_per_burst]; + uint16_t nb_rx; + uint64_t start_tsc = 0; + + get_start_cycles(&start_tsc); + nb_rx = rte_eth_rx_burst(fs->rx_port, fs->rx_queue, pkts_burst, + nb_pkt_per_burst); + inc_rx_burst_stats(fs, nb_rx); + if (unlikely(nb_rx == 0)) + return; + forward_shared_rxq(fs, nb_rx, pkts_burst); + get_end_cycles(fs, start_tsc); +} + +struct fwd_engine shared_rxq_engine = { + .fwd_mode_name = "shared_rxq", + .port_fwd_begin = NULL, + .port_fwd_end = NULL, + .packet_fwd = shared_rxq_fwd, +}; diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index f3f81ef561f..11a85d92d9a 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -188,6 +188,7 @@ struct fwd_engine * fwd_engines[] = { #ifdef RTE_LIBRTE_IEEE1588 &ieee1588_fwd_engine, #endif + &shared_rxq_engine, NULL, }; diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index f121a2da90c..f1fd607e365 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -299,6 +299,7 @@ extern struct fwd_engine five_tuple_swap_fwd_engine; #ifdef RTE_LIBRTE_IEEE1588 extern struct fwd_engine ieee1588_fwd_engine; #endif +extern struct fwd_engine shared_rxq_engine; extern struct fwd_engine * fwd_engines[]; /**< NULL terminated array. */ extern cmdline_parse_inst_t cmd_set_raw; diff --git a/doc/guides/testpmd_app_ug/run_app.rst b/doc/guides/testpmd_app_ug/run_app.rst index ff5908dcd50..e4b97844ced 100644 --- a/doc/guides/testpmd_app_ug/run_app.rst +++ b/doc/guides/testpmd_app_ug/run_app.rst @@ -252,6 +252,7 @@ The command line options are: tm noisy 5tswap + shared-rxq * ``--rss-ip`` diff --git a/doc/guides/testpmd_app_ug/testpmd_funcs.rst b/doc/guides/testpmd_app_ug/testpmd_funcs.rst index 8ead7a4a712..499874187f2 100644 --- a/doc/guides/testpmd_app_ug/testpmd_funcs.rst +++ b/doc/guides/testpmd_app_ug/testpmd_funcs.rst @@ -314,7 +314,7 @@ set fwd Set the packet forwarding mode:: testpmd> set fwd (io|mac|macswap|flowgen| \ - rxonly|txonly|csum|icmpecho|noisy|5tswap) (""|retry) + rxonly|txonly|csum|icmpecho|noisy|5tswap|shared-rxq) (""|retry) ``retry`` can be specified for forwarding engines except ``rx_only``. @@ -357,6 +357,9 @@ The available information categories are: L4 swaps the source port and destination port of transport layer (TCP and UDP). +* ``shared-rxq``: Receive only for shared Rx queue. + Resolve packet source port from mbuf and update stream statistics accordingly. + Example:: testpmd> set fwd rxonly