From patchwork Fri Apr 19 03:12:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chaoyong He X-Patchwork-Id: 139518 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 4250F43EA9; Fri, 19 Apr 2024 05:13:16 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4C52940687; Fri, 19 Apr 2024 05:13:00 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2093.outbound.protection.outlook.com [40.107.237.93]) by mails.dpdk.org (Postfix) with ESMTP id 63CAE40395 for ; Fri, 19 Apr 2024 05:12:56 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SkMUC5HWVWZ2W5EQcapYzozMpNluPzuYCxN2RaQsCLpSTCeyDUt7wjbWcokckpl4t8OTXPGUXRhZdWfCB5Aqq/BYbJOQmMJwwbK7xBPiBnKZFEH/eYCzfztVplVM6ZPp7ibew5P0kCRmdrtHs3pMAqJQJf36WmZydA7p3/hqZClqjC6EizWsJP7ne7jYcbdoroeTPytHyBXp7ufOTXsBfFlR+w6VL1J4ug6Dhrx+J8f9jW6MGi0RM4HrLDh83S3NcxjaGQHY7GWdrmyD7ZYvD6Z6+vw/wXr9x7wavFkjLRgKhkACRRbdLq8cvmibuduHD7OYkf7SGZ2PAS87C1kGjA== 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=qLrU4LDRZRZFvGKPWtuEx+PpBj+Wc6LuAtSEPf/cUb0=; b=OjW2vQUU7HHeTLWgLM7a6YKXnuEqdNvLTxH+3eIASY/vqmjvQiChLkvf939FysuZEK1RMei6wtE0by7nkVmhXJ1okIi2CVmYNagrqK9XqPeVOSg/17Rf5f1qYS5ZNcePdY1FI1CmlTEREyNUDKkGMNRmOtKZDqo/Gw+ogXIttInj01PIcQOuIVaI5SE1ktrKKSCB0NDTmY02CKVOJmclHQXjcaN1BiEtey062M1O5f4VqP0uW6nlFT9B2YHESxlhe/cE8ripjOZP6HAUU5Ob/RiW+4O1cdSF+pkF2bHNHNvT7nG0VixUAN/eIUwd+BMF3Rb2AdMEbEWRRhdhUQOTGA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=corigine.com; dmarc=pass action=none header.from=corigine.com; dkim=pass header.d=corigine.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=corigine.onmicrosoft.com; s=selector2-corigine-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=qLrU4LDRZRZFvGKPWtuEx+PpBj+Wc6LuAtSEPf/cUb0=; b=s5jiARflhbIWDfOlburP00dEU+l5nM9AQZvGJia1AeL2+Fgcv/szk6iaG/RZyIe5go4pmU5PX8G5WUVD8age/0Pt+UmM83yWYvOgjfym2RigCDSla/rA31r80nr8WiBYjmzgLVJFlu3wZ/J3LAqhs74U1Hq70d9NDBEVdXmfo0E= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=corigine.com; Received: from SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) by BY1PR13MB6310.namprd13.prod.outlook.com (2603:10b6:a03:52e::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.38; Fri, 19 Apr 2024 03:12:55 +0000 Received: from SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e]) by SJ0PR13MB5545.namprd13.prod.outlook.com ([fe80::ec12:7411:559a:850e%5]) with mapi id 15.20.7472.042; Fri, 19 Apr 2024 03:12:55 +0000 From: Chaoyong He To: dev@dpdk.org Cc: oss-drivers@corigine.com, Chaoyong He , Long Wu , Peng Zhang Subject: [PATCH 3/8] net/nfp: adjust the data field of Rx/Tx queue Date: Fri, 19 Apr 2024 11:12:21 +0800 Message-Id: <20240419031226.1191069-4-chaoyong.he@corigine.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20240419031226.1191069-1-chaoyong.he@corigine.com> References: <20240419031226.1191069-1-chaoyong.he@corigine.com> X-ClientProxiedBy: SI2PR01CA0044.apcprd01.prod.exchangelabs.com (2603:1096:4:193::8) To SJ0PR13MB5545.namprd13.prod.outlook.com (2603:10b6:a03:424::5) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SJ0PR13MB5545:EE_|BY1PR13MB6310:EE_ X-MS-Office365-Filtering-Correlation-Id: b797d433-199c-4d12-0a36-08dc601e9b2d X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: t9B5r5RLoJSRpCJbKw4IOS4HANPjvn0/1cEClFabxEXwVZqffDYT2CMTkv2XG3WPCoI0JgO01b8ro7UCiV5DUMVuVqWpEyBBAMua5Em5L4UEA+kP+P+r9p+tJgKrJ7sfXEIieTC/3HiaEUscUqii0KIwM0mVn+S+4fo/rBbXUg5H8gYTyQ64JT27biJAtvQYlZVPCwEaVQVG15ZevK2z8ByfqGJZMtk+rrkwuVGH4DjNCcQmpVrvF3ArIkvkUr+ve24t2cJ/c+syIivbyNR4hFEGW7Y3ueJ6CYCmo6wDNtz22nvm5+vVl5/t7YCjToP7NYEmC7vvwCRZEj++jap+mOd8syNgGom+A4ThR3rrTtHIHywYK1BgIVCh2VplJL+FofJjWPz1VcecW0FdgKM94wczvJRWVLAlBBan2vpYufzNmuzNRHWMs30oVaLiPCh8DihhJvcdhmktQakjlIyX1lOdtqcldCFLRUoE6nR5AkWXxpCRzXoJIcXhwxKvgycZ9Uh6sGCTTGH5x9CsOwYknV5moIzQE1jXDW4Bj5t3ppSMvYZbU6ACh92+3CmWxWxFJnGjC56HlNnEuFSt3mWoIHuzW55TVgNjpdPDKfXtIiHWuXkHhfMw5zC7Fbaq9SpUQ044JX+e4bdhZG5IUpPvAOSgyj9KLsgetQNeOeiyswqM0c4J/wmrttwDl2gDnaMKV2SOlV2iOlvfY+Pmi1SXj7wB01jor8x/EAJoszcG23eiJaHp28astk7/kIW9CBEOrXP179WBMhVLXPoACZhNfW6HYUqMPe1nqwi6lr718Ggpal/sFB62uvq8UTe5AmDnQxDXFEJHBeNbdcSrgItepTTlZyM5WoP5m55MXjCJc2DLuDWJ41mZ+RpQpihW5zWmqPexdThGeEA/qI3yARzJJwL7c/THhj4ertXtKlotvR9HYSZI5hIDmaUIJXbdO28hdjvZY5A/cYK7weTit1imwyd49t4vat9w7hUquJU+PgHx55roCGg9yNRKWk3Hd3atSqQx+ZzJrEyAlLnfSypyuAV/fOHjDIsRokjLI2KRj9AXY2AyKWOAU1Xbk51gyvXRu7R8X6qn4Gd+Bohr8XMdHyTHuG4qNhtpL5aVbc50L/xmLO7IvcwYThQ48SAidNHRd2KDg2Bi762IDWHV4fGijGlJW+A72wNrzHpjVeV80QoDa1tSEZ5de4LTyklewRdwfQnKDr/eq+LdJg/qOFExxayGshFQ2+DaAXBmpc8eTS4VtHNb4OX65n8VubcKYwjLnZ4EuXAEU8ZcENQDSrVxIgGZf2XAZbu2DF+S3DcKOpRG6okOVyQtppjfQqdzw0fjxatAtA4obhJggxE8cYy8ug== X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:SJ0PR13MB5545.namprd13.prod.outlook.com; PTR:; CAT:NONE; SFS:(13230031)(366007)(52116005)(376005)(1800799015)(38350700005); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: K8Tv/p+VG8SwT67THZy+OsuzQRKs0IWuAWrSOocu6cs1WAhKjYsdN/OML2Jn3WcbVQzGONFGdzlAq4RWY0GLXbNsnoM+AGXZoHMeUskI5f7bUpX9DOVBcrRRuOKsPa+9qQUhAngjm0/ziR/1OoalHITUwZbRyj9jxSyivfuqlUBtIpqkiMtwuaIi1ncMDQVpjcZc5OLyOFRkbJZU/6VEHXbedByo81z7U8HRwz7YPbfYmOo/x5etYaHWg9Yrs9f1XC9Tubz78iZSlCZWcGLAH9D+8F90xT739DRdy3T5hkuCoOPbnqtnExv5CsTrGac9BwWOfw3M8aLNM8YWtaL77r5QffQfALrYBif4qKAXU/Ueqf7B5k0sF2YyLkctAXPHAsG2dKMS18V6H5Ik9AF9M7Wnh3670kgqkFpkxEYdyR+qdaYm+4wfeUCX+6Ct6Hv7ck5mTYPdHV0yW0W8gGH7ifQufrlWC2PF9RmwGx+ZCNQ2yP+rKQt6pB+0E166LaVCLrDP83Am8vj8wUFXoj6PKss+7D4Gnfxkv3ydlT9hJ2elgQF0tT19h5J7C2Qk40YPcKrtEGWYt6tDvzaZpqB/lWCPONhLy0O1oZC/jcnFWJjkfeWkndep2dnR7gKrw05DVQGz1XvzwkP7Ft645+v4ZvAZRWZ4L6DSF5rYiCGU75UDU3al7nqS+23E+7eYkXbtdEnOJNwPJojQSrE2sfylz5JJ5fJ6V34xkidOA/bwiHUhVxzWdONc3DzPgX28Es8+xfmnj7bek0cFq66JxK6L9XmAPz1aZcl28qSX3UmAuwYWZm8UHY7nkALb26KrEersM38vy6kDBQsueb57xuCdlPCJOIsRTfIsdCT2gXRGaTVA/67RAg/vdcUAnyJOH6imMNtF5IZAlDbNzxCJFH5pP/Gts8G0Bgrl/8t2A5mPlGfwoc8adw0+3MuE4wZ5cqbUFHjfwofxzJZtimH8SjEwaTOTa1XBoRhWxv5rltjFTKpfQFGk9eCuJC7Y8n/I+wYNea4ouZlUteI4Yk//Y91gLTB04WefPILZTVr2YDU5PUSFXTFm6QGI2NgMkRALVdhcxrSqEF5Gy8mwyT4kH+k9bu/CFiyIgxWQtLlKF1/qIHNP6N1dTqZ9PynT4eckkDH/1m2SKzwXNLGMBOzRK8D3pVf8Xg1K8qinjDNDOjDqRRJHunwm2l/cf7wWTnNZfC/8gIdcTNZkkSAdgiYit0DSEkbg9OXaw9dYVie60WcnTLVWfgDNAFPdlcZrV3eWbT8kOAyEytN3xs4CPb1yCLdELs5lqMyVQEAWFK1W2itzezdL1cCpIyHS/oAA8HXtyB1P8mP2uRulZROh3omNgpmkpnIGDfsPlJHzH3A1Wc/mWQdRjOj0paERUnyze2oB/B4fD5rM4UlBxspnNp6ka8kCsLgWFpBtHpYQmhecHHyF9tapIJuAXZ4hY0mXJ3+/f+EZPNz6GncHiJlefYrHUcTu1lz39nx1QkuOIHvorFt4O7TPAsrryiRPjCSRwhaurGy6eUXvyZ1kdw1+QU1vHu/cBs80pPiln3iL5X0t55fFQVKXpnMORXqAsaJyW8sDv3jHrjSDtsehsWn2rflPFhuqsQ== X-OriginatorOrg: corigine.com X-MS-Exchange-CrossTenant-Network-Message-Id: b797d433-199c-4d12-0a36-08dc601e9b2d X-MS-Exchange-CrossTenant-AuthSource: SJ0PR13MB5545.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Apr 2024 03:12:54.9957 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: fe128f2c-073b-4c20-818e-7246a585940c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 4GuIJQacAzSwNUg5hGknbp4sGvYxrUlhmMTEXIMepB3PLIebwK9nQ1j8JpJwTd6Yh3li5jm9W8JWNWyUsK/FXPRHBRoxp06zMJie3ek8ss8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY1PR13MB6310 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 Adjust the data field of Rx/Tx queue structure, move the cold data back and hold position for hot data. Signed-off-by: Chaoyong He Reviewed-by: Long Wu Reviewed-by: Peng Zhang --- drivers/net/nfp/nfp_rxtx.h | 71 +++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 35 deletions(-) diff --git a/drivers/net/nfp/nfp_rxtx.h b/drivers/net/nfp/nfp_rxtx.h index f463b9cf75..0aa73a6432 100644 --- a/drivers/net/nfp/nfp_rxtx.h +++ b/drivers/net/nfp/nfp_rxtx.h @@ -31,21 +31,6 @@ struct nfp_net_txq { /** Backpointer to nfp_net structure */ struct nfp_net_hw *hw; - /** Point to the base of the queue structure on the NFP. */ - uint8_t *qcp_q; - - /** - * Host side read and write pointer, they are free running and - * have little relation to the QCP pointers. - */ - uint32_t wr_p; - uint32_t rd_p; - - /** The size of the queue in number of descriptors. */ - uint32_t tx_count; - - uint32_t tx_free_thresh; - /** * For each descriptor keep a reference to the mbuf and * DMA address used until completion is signalled. @@ -61,6 +46,18 @@ struct nfp_net_txq { struct nfp_net_nfdk_tx_desc *ktxds; }; + /** + * Host side read and write pointer, they are free running and + * have little relation to the QCP pointers. + */ + uint32_t wr_p; + uint32_t rd_p; + + /** The size of the queue in number of descriptors. */ + uint32_t tx_count; + + uint32_t tx_free_thresh; + /** The index of the QCP queue relative to the TX queue BAR. */ uint32_t tx_qcidx; @@ -72,8 +69,8 @@ struct nfp_net_txq { uint16_t data_pending; /** - * At this point 58 bytes have been used for all the fields in the - * TX critical path. We have room for 6 bytes and still all placed + * At this point 50 bytes have been used for all the fields in the + * TX critical path. We have room for 14 bytes and still all placed * in a cache line. */ uint64_t dma; @@ -83,6 +80,9 @@ struct nfp_net_txq { /** TX pointer ring write back area DMA address */ uint64_t txrwb_dma; + + /** Point to the base of the queue structure on the NFP. */ + uint8_t *qcp_q; } __rte_aligned(64); /* RX and freelist descriptor format */ @@ -145,19 +145,6 @@ struct nfp_net_rxq { */ uint8_t *qcp_fl; - /** - * Host side read pointer, free running and have little relation - * to the QCP pointers. It is where the driver start reading - * descriptors for newly arrive packets from. - */ - uint32_t rd_p; - - /** - * The index of the QCP queue relative to the RX queue BAR - * used for the freelist. - */ - uint32_t fl_qcidx; - /** * For each buffer placed on the freelist, record the * associated mbuf. @@ -177,6 +164,14 @@ struct nfp_net_rxq { * safely copied to the mbuf using the NFP_NET_RX_OFFSET. */ struct rte_mempool *mem_pool; + + /** + * Host side read pointer, free running and have little relation + * to the QCP pointers. It is where the driver start reading + * descriptors for newly arrive packets from. + */ + uint32_t rd_p; + uint16_t mbuf_size; /** @@ -186,9 +181,6 @@ struct nfp_net_rxq { uint16_t rx_free_thresh; uint16_t nb_rx_hold; - /** The size of the queue in number of descriptors */ - uint16_t rx_count; - /** Referencing dev->data->port_id */ uint16_t port_id; @@ -196,11 +188,20 @@ struct nfp_net_rxq { uint16_t qidx; /** - * At this point 60 bytes have been used for all the fields in the - * RX critical path. We have room for 4 bytes and still all placed + * At this point 54 bytes have been used for all the fields in the + * RX critical path. We have room for 10 bytes and still all placed * in a cache line. */ + /** The size of the queue in number of descriptors */ + uint16_t rx_count; + + /** + * The index of the QCP queue relative to the RX queue BAR + * used for the freelist. + */ + uint32_t fl_qcidx; + /** DMA address of the queue */ uint64_t dma; } __rte_aligned(64);