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 4B3F7A0C4B; Thu, 21 Oct 2021 07:09:40 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4DBE94118A; Thu, 21 Oct 2021 07:09:29 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2089.outbound.protection.outlook.com [40.107.237.89]) by mails.dpdk.org (Postfix) with ESMTP id AA30C40142 for ; Thu, 21 Oct 2021 07:09:27 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HWUF5/v7tu7XVOV87j6P2SZH2ZMnZB1pjXdMzzh48Alo1+6GEa9m45RXLB731l0LVgS8xSMbMaFTnL+shbKecIl+mlMMI6TlYOXoOmXje0nc8Y/qDAP0fDpSJnjsgH/GaW3WMsH2lMBMSLyT4iVQutZG1VMkXznUr6XgcvOUJ3F4UlhcAtwtB04KMANUBZFJPjDW3tGCMKOSKgT2U4Ptq28aDwBu8Ul93Wwf5RZXwzQUlwATTD4bndeLKsiYDLZTWGeGPNNHcDnXUwjequ5AceA0l5n86g/gU3Zu0IUHDNDnhlskOKvRHb2LPucuyNmKb93hRsiab5YzQPcT/nRznA== 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=hikHGl04xF6EYIfh6N62+aCoqTzyqQXjdkTqD7kMKl0=; b=bCqtrE52SeF9tSOcH7/a0ybpRsuEkldRF1QEOUyMq08pg/af1e125IZTVORy5jRS2iGb4iSK8ug5YzZWyWwqb2NxEQT6mwY6Yru21ERirCcyWBzT/87epvdxNewnDqHcTjbcZJdxKPxQfSrCpSujJaENFMhFoCgpP4Hn/dPMs59u2Nldm/KtZ9KvVS0J4I3J0YyQXX4y5eF8cKaA2PmNdF4mIA76QzErfM/jYkLMvEPXjVjOVxZbJ3jMi2p1f6JV7YX62N6fLx8LH8rSV2EFrNhiqN/xAMaI4o4ebrPR5bzyvqhMdoJ5IYlBBbTOYmZ3Pl7lvSS8DJcDhwCyL74nyg== 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=hikHGl04xF6EYIfh6N62+aCoqTzyqQXjdkTqD7kMKl0=; b=dSjOGaeimUu0iQi0VWMkALGRwflpN7X3ucoZBiyEJ6sY8cmRhPaXvLl+Fs8Qnthxi+sH/Tu0TBxhSHyIXDx+vB6mwSrkJ/gBa6l+0y8238qqT+uSQDqyztMvC6DuutZnboeqZnMVWzB+PitFaFtdSJCxauIgf4nwY7I1uZIWuZ+qoornrVJxFWjoi1Xdi5aDQWH3ugCLKeI7cPFkYMTYEP+5yv+pKYglNgj1M8pKck6OKWRIhn0ASt18GdR0FKhmV1of8UM+p552/Ff20XeYyCSGJay5B71ZrwKwctSdQF+he0a+91dBrSppv551K03uREoHbyOFQruV3OsoI8pQpw== Received: from DM6PR04CA0017.namprd04.prod.outlook.com (2603:10b6:5:334::22) by BL0PR12MB5555.namprd12.prod.outlook.com (2603:10b6:208:1c2::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4628.16; Thu, 21 Oct 2021 05:09:25 +0000 Received: from DM6NAM11FT009.eop-nam11.prod.protection.outlook.com (2603:10b6:5:334:cafe::d8) by DM6PR04CA0017.outlook.office365.com (2603:10b6:5:334::22) 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 05:09: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 DM6NAM11FT009.mail.protection.outlook.com (10.13.173.20) 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 05:09: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; Thu, 21 Oct 2021 05:09:16 +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 13:08:29 +0800 Message-ID: <20211021050832.2599691-5-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211021050832.2599691-1-xuemingl@nvidia.com> References: <20210727034204.20649-1-xuemingl@nvidia.com> <20211021050832.2599691-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain 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: 3c26213c-b8ed-4027-4b51-08d99450f39b X-MS-TrafficTypeDiagnostic: BL0PR12MB5555: 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: GsAWvoT384y7kABFZIqe3np2klNgfWKQVRfDqi/ThdsRCUZ/jGY8Gb88H/6YmQP2vxbFgMOf23kc44tJr50h5LpDfw7Awr3no9srjAqBrpsJrHB2zfIER1kXTI8JHBOSHbC2873BdgEIjCHP9HLfYmluoc5VmAWnVKmi10vUGYsRUaceF9rGZqJ+Sb2UN9of7V8P6XrpZBkdt/0pDL1KDWzgiCCLkR3/vMYzooMCPxpT/agI0sDlLLHg+3+hlvTcZDfN9Q6NlymHEGNQPxrmjD4xmIbKr/WVHlgCj1CyVVFlRnHbqyx1yqntlHLzbhT3fLIncjKOlOB3l49gcRerEF8YsbNrWEeFtqDFg7BfCCzKta8h1p6jeJIoC2vtgFfgh7L8RyqYI+irN2ua1Y/a/08xfE1si0NmYOtn8ZfLvpJCSrgavtjchvdRM/+rH4Um9hxrbUUkBvWpPchIh7eG+D2bBA2WfhRPVh0tqR0D9vED27zNNnctHxaug5rnoUaf7X9y2Gstpw+Jm6zGg5g+Hrj/Da0I8XZzC71rm+8493GaWr0QhFIjML2mbsXKTcBUylrdSkPMskVMGz71/WbwC/7OwXVsTdYm2pRcXGneGhb/6vcswD1S8cY4c5rXm+lY7mBJBHDlCzs1RZroidDhxj0w9AE3R58U9MH5zlfjSbYzxqkKJA5mkMXtQsOW3ydjRyJ2R6PHqea5gGp3P3wHrw== 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)(7696005)(110136005)(70206006)(36860700001)(26005)(82310400003)(8936002)(70586007)(47076005)(508600001)(1076003)(2906002)(55016002)(86362001)(5660300002)(2616005)(6666004)(36906005)(426003)(83380400001)(8676002)(36756003)(316002)(6286002)(16526019)(7636003)(54906003)(4326008)(186003)(356005)(336012); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Oct 2021 05:09:24.9424 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3c26213c-b8ed-4027-4b51-08d99450f39b 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: DM6NAM11FT009.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL0PR12MB5555 Subject: [dpdk-dev] [PATCH v12 4/7] 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=X" parameter to enable shared RxQ. Rx queue is shared if device supports, otherwise fallback to standard RxQ. Shared Rx queues are grouped per X ports. X defaults to UINT32_MAX, implies all ports join share group 1. Queue ID is mapped equally with shared Rx queue ID. Signed-off-by: Xueming Li --- app/test-pmd/config.c | 7 ++++++- app/test-pmd/parameters.c | 13 +++++++++++++ app/test-pmd/testpmd.c | 20 +++++++++++++++++--- app/test-pmd/testpmd.h | 2 ++ doc/guides/testpmd_app_ug/run_app.rst | 6 ++++++ 5 files changed, 44 insertions(+), 4 deletions(-) diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index db36ca41b94..e4bbf457916 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -2890,7 +2890,12 @@ 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->share_group > 0) + printf(" share_group=%u share_qid=%u", + rx_conf->share_group, + rx_conf->share_qid); + 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 779a721fa05..afc75f6bd21 100644 --- a/app/test-pmd/parameters.c +++ b/app/test-pmd/parameters.c @@ -171,6 +171,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=X: number of ports per shared Rx queue groups, defaults to UINT32_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"); @@ -678,6 +679,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 }, @@ -1352,6 +1354,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 af0e79fe6d5..80337bad382 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -502,6 +502,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]; @@ -3629,14 +3634,23 @@ dev_event_callback(const char *device_name, enum rte_dev_event_type type, } static void -rxtx_port_config(struct rte_port *port) +rxtx_port_config(portid_t pid) { uint16_t qid; uint64_t offloads; + struct rte_port *port = &ports[pid]; 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.dev_capa & RTE_ETH_DEV_CAPA_RXQ_SHARE)) { + /* Non-zero share group to enable RxQ share. */ + port->rx_conf[qid].share_group = pid / rxq_share + 1; + port->rx_conf[qid].share_qid = qid; /* Equal mapping. */ + } + if (offloads != 0) port->rx_conf[qid].offloads = offloads; @@ -3765,7 +3779,7 @@ init_port_config(void) } } - rxtx_port_config(port); + rxtx_port_config(pid); ret = eth_macaddr_get_print_err(pid, &port->eth_addr); if (ret != 0) @@ -3977,7 +3991,7 @@ init_port_dcb_config(portid_t pid, memcpy(&rte_port->dev_conf, &port_conf, sizeof(struct rte_eth_conf)); - rxtx_port_config(rte_port); + rxtx_port_config(pid); /* VLAN filter */ rte_port->dev_conf.rxmode.offloads |= DEV_RX_OFFLOAD_VLAN_FILTER; for (i = 0; i < RTE_DIM(vlan_tags); i++) diff --git a/app/test-pmd/testpmd.h b/app/test-pmd/testpmd.h index e3995d24ab5..63f9913deb6 100644 --- a/app/test-pmd/testpmd.h +++ b/app/test-pmd/testpmd.h @@ -524,6 +524,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 8ff7ab85369..faa3efb902c 100644 --- a/doc/guides/testpmd_app_ug/run_app.rst +++ b/doc/guides/testpmd_app_ug/run_app.rst @@ -395,6 +395,12 @@ The command line options are: Generate multiple flows in txonly mode. +* ``--rxq-share=[X]`` + + 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. + * ``--eth-link-speed`` Set a forced link speed to the ethernet port:: -- 2.33.0