From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id E40E8A0573; Thu, 5 Mar 2020 11:26:24 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 509D61BFD2; Thu, 5 Mar 2020 11:26:24 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2057.outbound.protection.outlook.com [40.107.93.57]) by dpdk.org (Postfix) with ESMTP id 8733E2BA8 for ; Thu, 5 Mar 2020 11:26:22 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=R65WpnCefZGmDtwOej/YaLIglTwblRipi2gdeU04puFQsrOXzT39KhMR5Iwdbbb71v1sYj100yDo4paJCaOcKOgxNeWyLrzUXDQApnm27hKQAFvk1WP2BMgPfXyyDndiIDS2P7VCOtUEZDOtTurfTdyzxXBuziLgYymC0u5enWBpVy/KcY7QiTVzyqs8NHsF1t0U/oSXnMORCkuEwgJvmieYs4tjNR6HrMUmDGolMDkx/Vw18cLV03QYhWMiMdIoPKRrNo9vm3PrbrNvxXUDSpuy4H389/tpwngQDUCtYqnHaHQ3dXMgniWYPuWBQfhZxQAIu/2MrQRp16HBk5f95Q== 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-SenderADCheck; bh=Us4Tzk4pnWoBUXRn24LRTrYTriZp1wdeQIhmAJIi8+A=; b=b3BRKMzabxJz4KoDq1xJzZOxZGT2VfHYLB/5A3lEx8JFgeWinKAjCe6B9o99T74eW+wc6dbJtDNooxTD0XoND/qxRx5kZMKB4NlQ9LBkA6lHUN0ue8DGMece+ESpFOV6/BrshndDI6xptGgEkbUbfX0eyTgSpRJ36HpJ5EIqbckb5GueseXkpjVTpNI2xpPjpjPqqPgqDZsNiArztqKuOAee1Qvu78GkDpTM/Li7SrLY6ZW4BrI6zjNoqF6VburthM/D0rT2G5DAaoEQ8Lq2mbenvLLLrukELT/s+E4fUSbPvgBY5ps4ymPQVYvMR5j4yA/JdP68nSXxXBpShj4oFw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=amd.com; dmarc=pass action=none header.from=amd.com; dkim=pass header.d=amd.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amdcloud.onmicrosoft.com; s=selector2-amdcloud-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Us4Tzk4pnWoBUXRn24LRTrYTriZp1wdeQIhmAJIi8+A=; b=rPsZCxWC8IEDEyfxkhySyLguMLujnpkmmJF4sydxa3r3Lo+20xf0OFxVWaL2Z/7HfM7QnDW3+UoD3DAtavr6u8iLV5wl3HoZvCY+yKmylwcNcIZv4akuhjhyARdFgWg7RCwsLOw0YAychY8NSjrPZ7ueumUdiginvbKtJ2+iJYU= Received: from MW2PR12MB2570.namprd12.prod.outlook.com (2603:10b6:907:a::13) by MW2PR12MB2362.namprd12.prod.outlook.com (2603:10b6:907:e::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2772.18; Thu, 5 Mar 2020 10:26:19 +0000 Received: from MW2PR12MB2570.namprd12.prod.outlook.com ([fe80::218a:b130:80a9:9e3f]) by MW2PR12MB2570.namprd12.prod.outlook.com ([fe80::218a:b130:80a9:9e3f%7]) with mapi id 15.20.2793.013; Thu, 5 Mar 2020 10:26:19 +0000 From: "Kumar, Ravi1" To: "Sebastian, Selwin" , "dev@dpdk.org" CC: "ferruh.yigit@intel.com" Thread-Topic: [PATCH v3] net/axgbe: add support for Scattered Rx Thread-Index: AQHV8q6Lm8CQfsbvn02yVXo7kfutsKg5zCFg Date: Thu, 5 Mar 2020 10:26:19 +0000 Message-ID: References: <20200305052521.3645-1-ssebasti@amd.com> In-Reply-To: <20200305052521.3645-1-ssebasti@amd.com> Accept-Language: en-IN, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_Enabled=true; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_SetDate=2020-03-05T10:28:13Z; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_Method=Standard; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_Name=Internal Use Only - Unrestricted; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_SiteId=3dd8961f-e488-4e60-8e11-a82d994e183d; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_ActionId=04389376-ac27-48a3-830a-0000431ec3be; MSIP_Label_76546daa-41b6-470c-bb85-f6f40f044d7f_ContentBits=1 msip_label_76546daa-41b6-470c-bb85-f6f40f044d7f_enabled: true msip_label_76546daa-41b6-470c-bb85-f6f40f044d7f_setdate: 2020-03-05T10:28:13Z msip_label_76546daa-41b6-470c-bb85-f6f40f044d7f_method: Standard msip_label_76546daa-41b6-470c-bb85-f6f40f044d7f_name: Internal Use Only - Unrestricted msip_label_76546daa-41b6-470c-bb85-f6f40f044d7f_siteid: 3dd8961f-e488-4e60-8e11-a82d994e183d msip_label_76546daa-41b6-470c-bb85-f6f40f044d7f_actionid: 787c7123-fb30-4638-96fa-0000228bc0ba msip_label_76546daa-41b6-470c-bb85-f6f40f044d7f_contentbits: 0 authentication-results: spf=none (sender IP is ) smtp.mailfrom=Ravi1.Kumar@amd.com; x-originating-ip: [165.204.159.242] x-ms-publictraffictype: Email x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 119f96e7-f4f8-4fc0-77d7-08d7c0efa4ea x-ms-traffictypediagnostic: MW2PR12MB2362:|MW2PR12MB2362: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:45; x-forefront-prvs: 03333C607F x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(366004)(189003)(199004)(498600001)(86362001)(8936002)(81156014)(8676002)(81166006)(186003)(55016002)(26005)(110136005)(9686003)(66476007)(66946007)(33656002)(76116006)(66446008)(64756008)(66556008)(52536014)(71200400001)(7696005)(2906002)(6506007)(5660300002)(4326008)(83323001); DIR:OUT; SFP:1101; SCL:1; SRVR:MW2PR12MB2362; H:MW2PR12MB2570.namprd12.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: amd.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 9zXF9A3xc64XWj8SALqJiIgTxlkB9DrWV4LZXmR8VFCpHe1KzarrK8aRtSsYWu8ZE+Ue5WsbxOHf6J8jlu6Va2WtpsVPvDvDU/tweUnIfw9t2V2M0qL/yNpr4fOvh1vqNLfzOFz6xTtNxHGidsHlQc256ED9lLvCGBgUUhj3qG3YH137qJkCHb975TtJ5f1J7vI7tqMQxsmtTTaDEJmRrn8691h14a79EZTHvRGBoXUzs2rCGXEk0WUEEE8CA8ZCPWNQLDhD/asphoz1/dhcmW+9upjArDS5126wCUx5kQznXcKEI09HWXau0Yp2JRj3T1z3akxBsBxq5QELF7gi7nilJMGtUDXH83qmOl92zM8m4fZzBLxeZmrmQrsLRyGkvBYk2YJ/OoxUZGI0w1aZYGPN1FZ8yPTKiv8KEer+8uonmSoXBm/N+OCQw+bGM5Xea0AKyi97z9sTUt31QpOO81VA6AtQlVReRrzchDvtuZs1Rp8wmso+1Isxg9Kl4lgi x-ms-exchange-antispam-messagedata: JyUXOVuSxQK5CHXVdu4ufkriNwKA9fFrYrFsUarao1v3oqsTtoG5WVDg0yGfR8IcolhC1YmdaqOEFNOMID/4waf0KO323MpVbbXHpgqR2bKKkEl4oW7D/k6+8L8tfIM9cGIFj+HMoZr8a3OZeC7/Jg== Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-Network-Message-Id: 119f96e7-f4f8-4fc0-77d7-08d7c0efa4ea X-MS-Exchange-CrossTenant-originalarrivaltime: 05 Mar 2020 10:26:19.1021 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: MSGNd7pqbZhsvZIZA2pydGZN3idmmnsaJ3dCX8VfsyXOw2OfxwBxiOKsP3xrCLeg6x/z3oY9tzyTNFkBl/A0Qg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR12MB2362 Subject: Re: [dpdk-dev] [PATCH v3] net/axgbe: add support for Scattered Rx X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" [AMD Official Use Only - Internal Distribution Only] Acked-by: Ravi Kumar >From: Selwin Sebastian > >Enable scattered rx support and add jumbo packet receive capability > >Signed-off-by: Selwin Sebastian >--- > doc/guides/nics/features/axgbe.ini | 1 + > drivers/net/axgbe/axgbe_common.h | 2 + > drivers/net/axgbe/axgbe_ethdev.c | 16 +++- > drivers/net/axgbe/axgbe_rxtx.c | 145 +++++++++++++++++++++++++++++ > drivers/net/axgbe/axgbe_rxtx.h | 2 + > 5 files changed, 165 insertions(+), 1 deletion(-) > >diff --git a/doc/guides/nics/features/axgbe.ini b/doc/guides/nics/features= /axgbe.ini >index ab4da559f..0becaa097 100644 >--- a/doc/guides/nics/features/axgbe.ini >+++ b/doc/guides/nics/features/axgbe.ini >@@ -7,6 +7,7 @@ > Speed capabilities =3D Y > Link status =3D Y > Jumbo frame =3D Y >+Scattered Rx =3D Y > Promiscuous mode =3D Y > Allmulticast mode =3D Y > RSS hash =3D Y >diff --git a/drivers/net/axgbe/axgbe_common.h b/drivers/net/axgbe/axgbe_co= mmon.h >index fdb037dd5..fbd46150c 100644 >--- a/drivers/net/axgbe/axgbe_common.h >+++ b/drivers/net/axgbe/axgbe_common.h >@@ -1135,6 +1135,8 @@ > #define RX_NORMAL_DESC3_PL_WIDTH 14 > #define RX_NORMAL_DESC3_RSV_INDEX 26 > #define RX_NORMAL_DESC3_RSV_WIDTH 1 >+#define RX_NORMAL_DESC3_LD_INDEX 28 >+#define RX_NORMAL_DESC3_LD_WIDTH 1 >=20 > #define RX_DESC3_L34T_IPV4_TCP 1 > #define RX_DESC3_L34T_IPV4_UDP 2 >diff --git a/drivers/net/axgbe/axgbe_ethdev.c b/drivers/net/axgbe/axgbe_et= hdev.c >index d0b6f091f..013c6330d 100644 >--- a/drivers/net/axgbe/axgbe_ethdev.c >+++ b/drivers/net/axgbe/axgbe_ethdev.c >@@ -249,6 +249,8 @@ axgbe_dev_start(struct rte_eth_dev *dev) { > struct axgbe_port *pdata =3D dev->data->dev_private; > int ret; >+ struct rte_eth_dev_data *dev_data =3D dev->data; >+ uint16_t max_pkt_len =3D dev_data->dev_conf.rxmode.max_rx_pkt_len; >=20 > PMD_INIT_FUNC_TRACE(); >=20 >@@ -279,6 +281,17 @@ axgbe_dev_start(struct rte_eth_dev *dev) >=20 > axgbe_clear_bit(AXGBE_STOPPED, &pdata->dev_state); > axgbe_clear_bit(AXGBE_DOWN, &pdata->dev_state); >+ >+ if ((dev_data->dev_conf.rxmode.offloads & DEV_RX_OFFLOAD_SCATTER) || >+ max_pkt_len > pdata->rx_buf_size) >+ dev_data->scattered_rx =3D 1; >+ >+ /* Scatter Rx handling */ >+ if (dev_data->scattered_rx) >+ dev->rx_pkt_burst =3D ð_axgbe_recv_scattered_pkts; >+ else >+ dev->rx_pkt_burst =3D &axgbe_recv_pkts; >+ > return 0; > } >=20 >@@ -789,6 +802,8 @@ axgbe_dev_info_get(struct rte_eth_dev *dev, struct rte= _eth_dev_info *dev_info) > DEV_RX_OFFLOAD_IPV4_CKSUM | > DEV_RX_OFFLOAD_UDP_CKSUM | > DEV_RX_OFFLOAD_TCP_CKSUM | >+ DEV_RX_OFFLOAD_JUMBO_FRAME | >+ DEV_RX_OFFLOAD_SCATTER | > DEV_RX_OFFLOAD_KEEP_CRC; >=20 > dev_info->tx_offload_capa =3D >@@ -1020,7 +1035,6 @@ eth_axgbe_dev_init(struct rte_eth_dev *eth_dev) > int ret; >=20 > eth_dev->dev_ops =3D &axgbe_eth_dev_ops; >- eth_dev->rx_pkt_burst =3D &axgbe_recv_pkts; >=20 > /* > * For secondary processes, we don't initialise any further as primary d= iff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c= index 96055c25b..8f818eb89 100644 >--- a/drivers/net/axgbe/axgbe_rxtx.c >+++ b/drivers/net/axgbe/axgbe_rxtx.c >@@ -307,6 +307,151 @@ axgbe_recv_pkts(void *rx_queue, struct rte_mbuf **rx= _pkts, > return nb_rx; > } >=20 >+uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, >+ struct rte_mbuf **rx_pkts, uint16_t nb_pkts) { >+ PMD_INIT_FUNC_TRACE(); >+ uint16_t nb_rx =3D 0; >+ struct axgbe_rx_queue *rxq =3D rx_queue; >+ volatile union axgbe_rx_desc *desc; >+ >+ uint64_t old_dirty =3D rxq->dirty; >+ struct rte_mbuf *first_seg =3D NULL; >+ struct rte_mbuf *mbuf, *tmbuf; >+ unsigned int err; >+ uint32_t error_status; >+ uint16_t idx, pidx, data_len =3D 0, pkt_len =3D 0; >+ >+ idx =3D AXGBE_GET_DESC_IDX(rxq, rxq->cur); >+ while (nb_rx < nb_pkts) { >+ bool eop =3D 0; >+next_desc: >+ if (unlikely(idx =3D=3D rxq->nb_desc)) >+ idx =3D 0; >+ >+ desc =3D &rxq->desc[idx]; >+ >+ if (AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3, OWN)) >+ break; >+ >+ tmbuf =3D rte_mbuf_raw_alloc(rxq->mb_pool); >+ if (unlikely(!tmbuf)) { >+ PMD_DRV_LOG(ERR, "RX mbuf alloc failed port_id =3D %u" >+ " queue_id =3D %u\n", >+ (unsigned int)rxq->port_id, >+ (unsigned int)rxq->queue_id); >+ rte_eth_devices[rxq->port_id].data->rx_mbuf_alloc_failed++; >+ break; >+ } >+ >+ pidx =3D idx + 1; >+ if (unlikely(pidx =3D=3D rxq->nb_desc)) >+ pidx =3D 0; >+ >+ rte_prefetch0(rxq->sw_ring[pidx]); >+ if ((pidx & 0x3) =3D=3D 0) { >+ rte_prefetch0(&rxq->desc[pidx]); >+ rte_prefetch0(&rxq->sw_ring[pidx]); >+ } >+ >+ mbuf =3D rxq->sw_ring[idx]; >+ /* Check for any errors and free mbuf*/ >+ err =3D AXGMAC_GET_BITS_LE(desc->write.desc3, >+ RX_NORMAL_DESC3, ES); >+ error_status =3D 0; >+ if (unlikely(err)) { >+ error_status =3D desc->write.desc3 & AXGBE_ERR_STATUS; >+ if ((error_status !=3D AXGBE_L3_CSUM_ERR) >+ && (error_status !=3D AXGBE_L4_CSUM_ERR)) { >+ rxq->errors++; >+ rte_pktmbuf_free(mbuf); >+ goto err_set; >+ } >+ } >+ rte_prefetch1(rte_pktmbuf_mtod(mbuf, void *)); >+ >+ if (!AXGMAC_GET_BITS_LE(desc->write.desc3, >+ RX_NORMAL_DESC3, LD)) { >+ eop =3D 0; >+ pkt_len =3D rxq->buf_size; >+ data_len =3D pkt_len; >+ } else { >+ eop =3D 1; >+ pkt_len =3D AXGMAC_GET_BITS_LE(desc->write.desc3, >+ RX_NORMAL_DESC3, PL); >+ data_len =3D pkt_len - rxq->crc_len; >+ } >+ >+ if (first_seg !=3D NULL) { >+ if (rte_pktmbuf_chain(first_seg, mbuf) !=3D 0) >+ rte_mempool_put(rxq->mb_pool, >+ first_seg); >+ } else { >+ first_seg =3D mbuf; >+ } >+ >+ /* Get the RSS hash */ >+ if (AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3, RSV)) >+ mbuf->hash.rss =3D rte_le_to_cpu_32(desc->write.desc1); >+ >+ /* Mbuf populate */ >+ mbuf->data_off =3D RTE_PKTMBUF_HEADROOM; >+ mbuf->data_len =3D data_len; >+ >+err_set: >+ rxq->cur++; >+ rxq->sw_ring[idx++] =3D tmbuf; >+ desc->read.baddr =3D >+ rte_cpu_to_le_64(rte_mbuf_data_iova_default(tmbuf)); >+ memset((void *)(&desc->read.desc2), 0, 8); >+ AXGMAC_SET_BITS_LE(desc->read.desc3, RX_NORMAL_DESC3, OWN, 1); >+ rxq->dirty++; >+ >+ if (!eop) { >+ rte_pktmbuf_free(mbuf); >+ goto next_desc; >+ } >+ >+ first_seg->pkt_len =3D pkt_len; >+ rxq->bytes +=3D pkt_len; >+ mbuf->next =3D NULL; >+ >+ first_seg->port =3D rxq->port_id; >+ if (rxq->pdata->rx_csum_enable) { >+ mbuf->ol_flags =3D 0; >+ mbuf->ol_flags |=3D PKT_RX_IP_CKSUM_GOOD; >+ mbuf->ol_flags |=3D PKT_RX_L4_CKSUM_GOOD; >+ if (unlikely(error_status =3D=3D AXGBE_L3_CSUM_ERR)) { >+ mbuf->ol_flags &=3D ~PKT_RX_IP_CKSUM_GOOD; >+ mbuf->ol_flags |=3D PKT_RX_IP_CKSUM_BAD; >+ mbuf->ol_flags &=3D ~PKT_RX_L4_CKSUM_GOOD; >+ mbuf->ol_flags |=3D PKT_RX_L4_CKSUM_UNKNOWN; >+ } else if (unlikely(error_status >+ =3D=3D AXGBE_L4_CSUM_ERR)) { >+ mbuf->ol_flags &=3D ~PKT_RX_L4_CKSUM_GOOD; >+ mbuf->ol_flags |=3D PKT_RX_L4_CKSUM_BAD; >+ } >+ } >+ >+ rx_pkts[nb_rx++] =3D first_seg; >+ >+ /* Setup receipt context for a new packet.*/ >+ first_seg =3D NULL; >+ } >+ >+ /* Save receive context.*/ >+ rxq->pkts +=3D nb_rx; >+ >+ if (rxq->dirty !=3D old_dirty) { >+ rte_wmb(); >+ idx =3D AXGBE_GET_DESC_IDX(rxq, rxq->dirty - 1); >+ AXGMAC_DMA_IOWRITE(rxq, DMA_CH_RDTR_LO, >+ low32_value(rxq->ring_phys_addr + >+ (idx * sizeof(union axgbe_rx_desc)))); >+ } >+ return nb_rx; >+} >+ > /* Tx Apis */ > static void axgbe_tx_queue_release(struct axgbe_tx_queue *tx_queue) { di= ff --git a/drivers/net/axgbe/axgbe_rxtx.h b/drivers/net/axgbe/axgbe_rxtx.h = index a21537df9..f6796b09b 100644 >--- a/drivers/net/axgbe/axgbe_rxtx.h >+++ b/drivers/net/axgbe/axgbe_rxtx.h >@@ -179,6 +179,8 @@ int axgbe_dev_rx_queue_start(struct rte_eth_dev *dev, = uint16_t rx_queue_id); int axgbe_dev_rx_queue_stop(struct rte_eth_dev *dev= , uint16_t rx_queue_id); uint16_t axgbe_recv_pkts(void *rx_queue, struct r= te_mbuf **rx_pkts, > uint16_t nb_pkts); >+uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue, >+ struct rte_mbuf **rx_pkts, uint16_t nb_pkts); > uint16_t axgbe_recv_pkts_threshold_refresh(void *rx_queue, > struct rte_mbuf **rx_pkts, > uint16_t nb_pkts); >-- >2.17.1 > >