Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/66693/?format=api
{ "id": 66693, "url": "http://patches.dpdk.org/api/patches/66693/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1584351224-23500-3-git-send-email-hkalra@marvell.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1584351224-23500-3-git-send-email-hkalra@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1584351224-23500-3-git-send-email-hkalra@marvell.com", "date": "2020-03-16T09:33:38", "name": "[2/8] net/octeontx: add framework for Rx/Tx offloads", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "29f852a650e6261d2fb05b9d3b2f12faacb44fa9", "submitter": { "id": 1182, "url": "http://patches.dpdk.org/api/people/1182/?format=api", "name": "Harman Kalra", "email": "hkalra@marvell.com" }, "delegate": { "id": 310, "url": "http://patches.dpdk.org/api/users/310/?format=api", "username": "jerin", "first_name": "Jerin", "last_name": "Jacob", "email": "jerinj@marvell.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1584351224-23500-3-git-send-email-hkalra@marvell.com/mbox/", "series": [ { "id": 8923, "url": "http://patches.dpdk.org/api/series/8923/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=8923", "date": "2020-03-16T09:33:36", "name": "add new features to octeontx PMD", "version": 1, "mbox": "http://patches.dpdk.org/series/8923/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/66693/comments/", "check": "fail", "checks": "http://patches.dpdk.org/api/patches/66693/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 9BBACA0559;\n\tMon, 16 Mar 2020 10:34:44 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 6B5941C08C;\n\tMon, 16 Mar 2020 10:34:34 +0100 (CET)", "from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com\n [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id 345441AFF\n for <dev@dpdk.org>; Mon, 16 Mar 2020 10:34:33 +0100 (CET)", "from pps.filterd (m0045851.ppops.net [127.0.0.1])\n by mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id\n 02G9UM1i015008; Mon, 16 Mar 2020 02:34:32 -0700", "from sc-exch04.marvell.com ([199.233.58.184])\n by mx0b-0016f401.pphosted.com with ESMTP id 2yrxsme4yv-1\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);\n Mon, 16 Mar 2020 02:34:32 -0700", "from DC5-EXCH02.marvell.com (10.69.176.39) by SC-EXCH04.marvell.com\n (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1497.2;\n Mon, 16 Mar 2020 02:34:30 -0700", "from SC-EXCH03.marvell.com (10.93.176.83) by DC5-EXCH02.marvell.com\n (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.2;\n Mon, 16 Mar 2020 02:34:29 -0700", "from NAM11-BN8-obe.outbound.protection.outlook.com (104.47.58.176)\n by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id\n 15.0.1497.2 via Frontend Transport; Mon, 16 Mar 2020 02:34:29 -0700", "from MN2PR18MB2848.namprd18.prod.outlook.com (2603:10b6:208:38::19)\n by MN2PR18MB3117.namprd18.prod.outlook.com (2603:10b6:208:162::16)\n with Microsoft SMTP Server (version=TLS1_2,\n cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2814.14; Mon, 16 Mar\n 2020 09:34:28 +0000", "from MN2PR18MB2848.namprd18.prod.outlook.com\n ([fe80::f829:3e55:94f6:4efb]) by MN2PR18MB2848.namprd18.prod.outlook.com\n ([fe80::f829:3e55:94f6:4efb%5]) with mapi id 15.20.2814.021; Mon, 16 Mar 2020\n 09:34:28 +0000", "from hkarlara-OptiPlex-3046.marvell.com (115.113.156.2) by\n BMXPR01CA0006.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:d::16) with Microsoft\n SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id\n 15.20.2814.13 via Frontend Transport; Mon, 16 Mar 2020 09:34:26 +0000" ], "DKIM-Signature": [ "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n h=from : to : cc :\n subject : date : message-id : in-reply-to : references : content-type :\n mime-version; s=pfpt0818; bh=+WvXHQyq13pwWVPtE+zveeuPtQwkNaU5zcI67YYWRqs=;\n b=iF2GGH4nj7tYiTLjp6yJ2Hn5xY9Sgv4eyb9snYPHB1J8DHocuMiCWLhJBUJSyxOqRz7R\n ZnyzIGW6fzzEudMzex6+LoQH/6j+WePcpmBE7DjVwrzpwknhmPbjoptz+SG+xsN8DKYR\n T+C9XX9UD6CidKbEef8hhIbfgHmdHEG9ufaexm72rrqRRs2BB+EtN477Fh7RIkJew2In\n cGMWU2kseM8I9gS87qdQlsxH0ZUPAKvmBMVGsCHc6d8UcjHk0mO6sBHxzNbVkmUU4+7I\n eUkhCprXn+0kSJzhr+TVJnfeVOd11kjcU771XHIupfiPsYIrIu3KxofzW4D/FFSaH0EO Rg==", "v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=marvell.onmicrosoft.com; s=selector1-marvell-onmicrosoft-com;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=+WvXHQyq13pwWVPtE+zveeuPtQwkNaU5zcI67YYWRqs=;\n b=eRq/VJdX9y4v40fObP7QbpCBf1vqcddE6nx2oDKpNxPDzOX+Dx77lUYvDiJKK/jTrvXASRAgEcA3efHJbgSwF8+UeFWocLKgGBwTdQY+QaPmFth0x9Ba6uITGi9ZQQ4/hqafUrOdSIoEwpepXIT5BsZVpCC2xdz/p7wcMW/3Gz0=" ], "ARC-Seal": "i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none;\n b=B8ohZsTszO9HDcc9Jwq47w6ZcHaHTpwHwP/uFaDyJUdMYIJIPn79oEJiC8yV00qUL6p8kSTu04oJflHSzwg9Y7e37tKMTBAdCwYzLUgOMfAuxk82i3cg2DBeCq8LC7sXh/F8emYGKz0aw/XkXoe4c6NOUj2rWnI2Xueb+2qjc8O7gdLQr7NasIx/T2yaqY8Bab0K7l/SRcq5KKgTm/HN87/Wj0PP5+uWJVkeD4EFHJyjkbEM9JDBXguP27At7F6ElYXFLzyk4RSy192a2xNtBzmPNBUNSP0dy+vKKQ09F8PxnuBLqfdhlT8ZuOXZEo0m0ilab+Toil1kkGsvIPm3eg==", "ARC-Message-Signature": "i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com;\n s=arcselector9901;\n h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck;\n bh=+WvXHQyq13pwWVPtE+zveeuPtQwkNaU5zcI67YYWRqs=;\n b=P1IQAhOemihgKZy5YaHzZIjH4g3fhWM1mm1Ol2xF0Me5MT91uEcloeVHpJW5YUTIY3KKvu9uehP0dI/uYSO3oKig+WqClLKkZCwMwdfaQj7ZJ5r3ZMW2ipjB3IEvP+x/vroWIguM58aaFcIBF98cK6F+4g46upV2UeR93LVGmEBLdzO9QVVShpl/V/yffWD7jPJ3GzXnIurTUALCTjLG5WXTnr8ZZ+cRoLHODmDZBhNbaBp69n3ZM4yaJJ/9tUy18oX64blO/uOQZWyJ1HbApUr8guM40+RU6o9g0wPIdLs9bpA7eGucO/gBc/+44+JvTgRBLlYAaskWthcHvKvVlQ==", "ARC-Authentication-Results": "i=1; mx.microsoft.com 1; spf=pass\n smtp.mailfrom=marvell.com; dmarc=pass action=none header.from=marvell.com;\n dkim=pass header.d=marvell.com; arc=none", "From": "Harman Kalra <hkalra@marvell.com>", "To": "<jerinj@marvell.com>, <john.mcnamara@intel.com>,\n <marko.kovacevic@intel.com>", "CC": "<dev@dpdk.org>, <vattunuru@marvell.com>, Harman Kalra <hkalra@marvell.com>", "Date": "Mon, 16 Mar 2020 15:03:38 +0530", "Message-ID": "<1584351224-23500-3-git-send-email-hkalra@marvell.com>", "X-Mailer": [ "git-send-email 2.7.4", "git-send-email 2.7.4" ], "In-Reply-To": "<1584351224-23500-1-git-send-email-hkalra@marvell.com>", "References": "<1584351224-23500-1-git-send-email-hkalra@marvell.com>", "Content-Type": "text/plain", "X-ClientProxiedBy": "BMXPR01CA0006.INDPRD01.PROD.OUTLOOK.COM\n (2603:1096:b00:d::16) To MN2PR18MB2848.namprd18.prod.outlook.com\n (2603:10b6:208:38::19)", "MIME-Version": "1.0", "X-MS-Exchange-MessageSentRepresentingType": "1", "X-Originating-IP": "[115.113.156.2]", "X-MS-PublicTrafficType": "Email", "X-MS-Office365-Filtering-Correlation-Id": "5bb475c4-4653-46cd-810f-08d7c98d38e6", "X-MS-TrafficTypeDiagnostic": "MN2PR18MB3117:", "X-MS-Exchange-Transport-Forked": "True", "X-Microsoft-Antispam-PRVS": "\n <MN2PR18MB311771687069CE5842C1BC83C5F90@MN2PR18MB3117.namprd18.prod.outlook.com>", "X-MS-Oob-TLC-OOBClassifiers": "OLM:2201;", "X-Forefront-PRVS": "03449D5DD1", "X-Forefront-Antispam-Report": "SFV:NSPM;\n SFS:(10009020)(4636009)(366004)(136003)(376002)(39860400002)(346002)(396003)(199004)(52116002)(7696005)(478600001)(4326008)(8676002)(8936002)(107886003)(26005)(66556008)(30864003)(2906002)(86362001)(5660300002)(36756003)(55236004)(16526019)(2616005)(956004)(66946007)(6486002)(66476007)(81156014)(81166006)(6666004)(186003)(316002);\n DIR:OUT; SFP:1101; SCL:1; SRVR:MN2PR18MB3117;\n H:MN2PR18MB2848.namprd18.prod.outlook.com; FPR:; SPF:None; LANG:en;\n PTR:InfoNoRecords; A:1;", "Received-SPF": "None (protection.outlook.com: marvell.com does not designate\n permitted sender hosts)", "X-MS-Exchange-SenderADCheck": "1", "X-Microsoft-Antispam": "BCL:0;", "X-Microsoft-Antispam-Message-Info": "\n 8MvtzjHAL32A9TJUNpkCzm3hVLtRnx3ZEaaYPYhozCVmFxTPSEV4NbmgIF9RGKY0CFliWy5eC53/0b1vn4h60Nbg1zWR4foEBAgoG6jQvZu4Ul/OIQbE7z3PZId6B3KQnojySeW1eEUzFItzf09qndnb5ytGdMeVybM78YKGDJ9eNZNewm0YMnXDdl/dLurdTuz9rtomjQC0LgjaPEcXuvNSxcqPIkhS+3uo8xE2oGqtmw57E3+fiABxF7ZhJ1RWnFFUJAkPq0Mbiw8dtpFUt8w9/gG4FtnBBgphjug+CZ8bBLGKzh63JD2jX7ZGxA9J7zyYytlrQdCwLysb1FCSo6Em2HOizk4Qo8MBGGljJUXPsY4WGHpKvkwT1jAkvgc3iPThdvhJN9JtoGVbwWknq+NAI2CMebqYB+ptZTQxv7ulGSU2oNktpIP6fxUIYChP", "X-MS-Exchange-AntiSpam-MessageData": "\n zoB6sPYjiWTuGPjHMflMRJ6Nl7Wd0P0Uqg7+jJnqomqrbmpCRAN1CV/JidnsKA6z4BedLhl/l2sfOW3DstCV51Pe0HCvC57CETEnU5aqZPZS0qfdYPyJOYpFLSu3BtXzIdjwaEkAH42UUkCd6AgKUg==", "X-MS-Exchange-CrossTenant-Network-Message-Id": "\n 5bb475c4-4653-46cd-810f-08d7c98d38e6", "X-MS-Exchange-CrossTenant-OriginalArrivalTime": "16 Mar 2020 09:34:28.0005 (UTC)", "X-MS-Exchange-CrossTenant-FromEntityHeader": "Hosted", "X-MS-Exchange-CrossTenant-Id": "70e1fb47-1155-421d-87fc-2e58f638b6e0", "X-MS-Exchange-CrossTenant-MailboxType": "HOSTED", "X-MS-Exchange-CrossTenant-UserPrincipalName": "\n nsOoAv2EuOlG6qEDBJh/edOscy3/SoldKO57TbMb8An4LFn3t8JV4nMI5IRawFyRmdJ0334uFfRQ6CJf+sZ31w==", "X-MS-Exchange-Transport-CrossTenantHeadersStamped": "MN2PR18MB3117", "X-OriginatorOrg": "marvell.com", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10434:6.0.138, 18.0.572\n definitions=2020-03-16_02:2020-03-12,\n 2020-03-16 signatures=0", "Subject": "[dpdk-dev] [PATCH 2/8] net/octeontx: add framework for Rx/Tx\n\toffloads", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Adding macro based framework to hook rx/tx burst function\npointers to the appropriate function based on rx/tx offloads.\n\nSigned-off-by: Harman Kalra <hkalra@marvell.com>\n---\n drivers/event/octeontx/ssovf_worker.c | 9 +-\n drivers/net/octeontx/octeontx_ethdev.c | 27 ++--\n drivers/net/octeontx/octeontx_ethdev.h | 12 +-\n drivers/net/octeontx/octeontx_rxtx.c | 81 +++++-------\n drivers/net/octeontx/octeontx_rxtx.h | 173 +++++++++++++++----------\n 5 files changed, 151 insertions(+), 151 deletions(-)", "diff": "diff --git a/drivers/event/octeontx/ssovf_worker.c b/drivers/event/octeontx/ssovf_worker.c\nindex f11b9d8c4..169939d1a 100644\n--- a/drivers/event/octeontx/ssovf_worker.c\n+++ b/drivers/event/octeontx/ssovf_worker.c\n@@ -272,7 +272,7 @@ sso_event_tx_adapter_enqueue(void *port,\n \tstruct rte_eth_dev *ethdev;\n \tstruct ssows *ws = port;\n \tstruct octeontx_txq *txq;\n-\tocteontx_dq_t *dq;\n+\tuint64_t cmd[4];\n \n \tRTE_SET_USED(nb_events);\n \tswitch (ev->sched_type) {\n@@ -297,11 +297,6 @@ sso_event_tx_adapter_enqueue(void *port,\n \tqueue_id = rte_event_eth_tx_adapter_txq_get(m);\n \tethdev = &rte_eth_devices[port_id];\n \ttxq = ethdev->data->tx_queues[queue_id];\n-\tdq = &txq->dq;\n \n-\tif (__octeontx_xmit_pkts(dq->lmtline_va, dq->ioreg_va, dq->fc_status_va,\n-\t\t\t\tm, OCCTX_TX_OFFLOAD_NONE) < 0)\n-\t\treturn 0;\n-\n-\treturn 1;\n+\treturn __octeontx_xmit_pkts(txq, &m, 1, cmd, OCCTX_TX_OFFLOAD_NONE);\n }\ndiff --git a/drivers/net/octeontx/octeontx_ethdev.c b/drivers/net/octeontx/octeontx_ethdev.c\nindex 24c4e83a9..d6adbbc93 100644\n--- a/drivers/net/octeontx/octeontx_ethdev.c\n+++ b/drivers/net/octeontx/octeontx_ethdev.c\n@@ -436,27 +436,20 @@ octeontx_recheck_rx_offloads(struct octeontx_rxq *rxq)\n \treturn 0;\n }\n \n-static void\n-octeontx_set_tx_function(struct rte_eth_dev *dev)\n-{\n-\tstruct octeontx_nic *nic = octeontx_pmd_priv(dev);\n-\n-\tconst eth_tx_burst_t tx_burst_func[2] = {\n-\t\t[0] = octeontx_xmit_pkts,\n-\t\t[1] = octeontx_xmit_pkts_mseg,\n-\t};\n-\n-\tdev->tx_pkt_burst =\n-\t\ttx_burst_func[!!(nic->tx_offloads & DEV_TX_OFFLOAD_MULTI_SEGS)];\n-}\n-\n static int\n octeontx_dev_start(struct rte_eth_dev *dev)\n {\n \tstruct octeontx_nic *nic = octeontx_pmd_priv(dev);\n-\tint ret;\n+\tstruct octeontx_rxq *rxq;\n+\tint ret = 0, i;\n \n-\tret = 0;\n+\t/* Rechecking if any new offload set to update\n+\t * rx/tx burst function pointer accordingly.\n+\t */\n+\tfor (i = 0; i < dev->data->nb_rx_queues; i++) {\n+\t\trxq = dev->data->rx_queues[i];\n+\t\tocteontx_recheck_rx_offloads(rxq);\n+\t}\n \n \tPMD_INIT_FUNC_TRACE();\n \t/*\n@@ -1159,7 +1152,7 @@ octeontx_create(struct rte_vdev_device *dev, int port, uint8_t evdev,\n \n \t\teth_dev->dev_ops = &octeontx_dev_ops;\n \t\teth_dev->device = &dev->device;\n-\t\teth_dev->tx_pkt_burst = octeontx_xmit_pkts;\n+\t\tocteontx_set_tx_function(eth_dev);\n \t\teth_dev->rx_pkt_burst = octeontx_recv_pkts;\n \t\trte_eth_dev_probing_finish(eth_dev);\n \t\treturn 0;\ndiff --git a/drivers/net/octeontx/octeontx_ethdev.h b/drivers/net/octeontx/octeontx_ethdev.h\nindex 10da6a2a0..06223e6e7 100644\n--- a/drivers/net/octeontx/octeontx_ethdev.h\n+++ b/drivers/net/octeontx/octeontx_ethdev.h\n@@ -29,12 +29,12 @@\n #define OCTEONTX_MAX_BGX_PORTS\t\t\t4\n #define OCTEONTX_MAX_LMAC_PER_BGX\t\t4\n \n-#define OCTEONTX_RX_OFFLOADS\t\t\t(DEV_RX_OFFLOAD_CHECKSUM | \\\n-\t\t\t\t\t\t DEV_RX_OFFLOAD_SCATTER\t | \\\n-\t\t\t\t\t\t DEV_RX_OFFLOAD_JUMBO_FRAME)\n+#define OCTEONTX_RX_OFFLOADS\t\t(DEV_RX_OFFLOAD_CHECKSUM | \\\n+\t\t\t\t\t DEV_RX_OFFLOAD_SCATTER\t | \\\n+\t\t\t\t\t DEV_RX_OFFLOAD_JUMBO_FRAME)\n \n-#define OCTEONTX_TX_OFFLOADS\t\t\t(DEV_TX_OFFLOAD_MT_LOCKFREE | \\\n-\t\t\t\t\t\t DEV_TX_OFFLOAD_MULTI_SEGS)\n+#define OCTEONTX_TX_OFFLOADS\t\t(DEV_TX_OFFLOAD_MT_LOCKFREE | \\\n+\t\t\t\t\t DEV_TX_OFFLOAD_MULTI_SEGS)\n \n static inline struct octeontx_nic *\n octeontx_pmd_priv(struct rte_eth_dev *dev)\n@@ -99,4 +99,6 @@ struct octeontx_rxq {\n \tstruct rte_mempool *pool;\n } __rte_cache_aligned;\n \n+void\n+octeontx_set_tx_function(struct rte_eth_dev *dev);\n #endif /* __OCTEONTX_ETHDEV_H__ */\ndiff --git a/drivers/net/octeontx/octeontx_rxtx.c b/drivers/net/octeontx/octeontx_rxtx.c\nindex 8f6d14b5f..3de88e187 100644\n--- a/drivers/net/octeontx/octeontx_rxtx.c\n+++ b/drivers/net/octeontx/octeontx_rxtx.c\n@@ -19,56 +19,6 @@\n #include \"octeontx_rxtx.h\"\n #include \"octeontx_logs.h\"\n \n-uint16_t __hot\n-octeontx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts)\n-{\n-\tint count;\n-\tstruct octeontx_txq *txq = tx_queue;\n-\tocteontx_dq_t *dq = &txq->dq;\n-\tint res;\n-\n-\tcount = 0;\n-\n-\trte_cio_wmb();\n-\twhile (count < nb_pkts) {\n-\t\tres = __octeontx_xmit_pkts(dq->lmtline_va, dq->ioreg_va,\n-\t\t\t\t\t dq->fc_status_va, tx_pkts[count],\n-\t\t\t\t\t OCCTX_TX_OFFLOAD_NONE);\n-\t\tif (res < 0)\n-\t\t\tbreak;\n-\n-\t\tcount++;\n-\t}\n-\n-\treturn count; /* return number of pkts transmitted */\n-}\n-\n-uint16_t __hot\n-octeontx_xmit_pkts_mseg(void *tx_queue, struct rte_mbuf **tx_pkts,\n-\t\t\tuint16_t nb_pkts)\n-{\n-\tint count;\n-\tstruct octeontx_txq *txq = tx_queue;\n-\tocteontx_dq_t *dq = &txq->dq;\n-\tint res;\n-\n-\tcount = 0;\n-\n-\trte_cio_wmb();\n-\twhile (count < nb_pkts) {\n-\t\tres = __octeontx_xmit_pkts(dq->lmtline_va, dq->ioreg_va,\n-\t\t\t\t\t dq->fc_status_va, tx_pkts[count],\n-\t\t\t\t\t OCCTX_TX_OFFLOAD_NONE |\n-\t\t\t\t\t OCCTX_TX_MULTI_SEG_F);\n-\t\tif (res < 0)\n-\t\t\tbreak;\n-\n-\t\tcount++;\n-\t}\n-\n-\treturn count; /* return number of pkts transmitted */\n-}\n-\n uint16_t __hot\n octeontx_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n {\n@@ -90,3 +40,34 @@ octeontx_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts)\n \n \treturn count; /* return number of pkts received */\n }\n+\n+#define T(name, f1, sz, flags)\t\t\t\t\t\\\n+static uint16_t __rte_noinline\t__hot\t\t\t\t\t\\\n+octeontx_xmit_pkts_ ##name(void *tx_queue,\t\t\t\t\\\n+\t\t\tstruct rte_mbuf **tx_pkts, uint16_t pkts)\t\\\n+{\t\t\t\t\t\t\t\t\t\\\n+\tuint64_t cmd[(sz)];\t\t\t\t\t\t\\\n+\t\t\t\t\t\t\t\t\t\\\n+\treturn __octeontx_xmit_pkts(tx_queue, tx_pkts, pkts, cmd,\t\\\n+\t\t\t\t flags);\t\t\t\t\\\n+}\n+\n+OCCTX_TX_FASTPATH_MODES\n+#undef T\n+\n+void __hot\n+octeontx_set_tx_function(struct rte_eth_dev *dev)\n+{\n+\tstruct octeontx_nic *nic = octeontx_pmd_priv(dev);\n+\n+\tconst eth_tx_burst_t tx_burst_func[2] = {\n+#define T(name, f0, sz, flags)\t\t\t\\\n+\t[f0] = octeontx_xmit_pkts_ ##name,\n+\n+OCCTX_TX_FASTPATH_MODES\n+#undef T\n+\t};\n+\n+\tdev->tx_pkt_burst = tx_burst_func\n+\t\t[!!(nic->tx_offload_flags & OCCTX_TX_MULTI_SEG_F)];\n+}\ndiff --git a/drivers/net/octeontx/octeontx_rxtx.h b/drivers/net/octeontx/octeontx_rxtx.h\nindex 562268f16..6182cd8ee 100644\n--- a/drivers/net/octeontx/octeontx_rxtx.h\n+++ b/drivers/net/octeontx/octeontx_rxtx.h\n@@ -113,90 +113,119 @@ ptype_table[PTYPE_SIZE][PTYPE_SIZE][PTYPE_SIZE] = {\n \n };\n \n-static __rte_always_inline int\n-__octeontx_xmit_pkts(void *lmtline_va, void *ioreg_va, int64_t *fc_status_va,\n-\t\t\tstruct rte_mbuf *tx_pkt, const uint16_t flag)\n+\n+static __rte_always_inline uint16_t\n+__octeontx_xmit_prepare(struct rte_mbuf *tx_pkt, uint64_t *cmd_buf,\n+\t\t\tconst uint16_t flag __rte_unused)\n+{\n+\tuint16_t gaura_id, nb_desc = 0;\n+\n+\t/* Setup PKO_SEND_HDR_S */\n+\tcmd_buf[nb_desc++] = tx_pkt->data_len & 0xffff;\n+\tcmd_buf[nb_desc++] = 0x0;\n+\n+\t/* Mark mempool object as \"put\" since it is freed by PKO */\n+\tif (!(cmd_buf[0] & (1ULL << 58)))\n+\t\t__mempool_check_cookies(tx_pkt->pool, (void **)&tx_pkt,\n+\t\t\t\t\t1, 0);\n+\t/* Get the gaura Id */\n+\tgaura_id = octeontx_fpa_bufpool_gpool((uintptr_t)\n+\t\t\t\t\t tx_pkt->pool->pool_id);\n+\n+\t/* Setup PKO_SEND_BUFLINK_S */\n+\tcmd_buf[nb_desc++] = PKO_SEND_BUFLINK_SUBDC |\n+\t\tPKO_SEND_BUFLINK_LDTYPE(0x1ull) |\n+\t\tPKO_SEND_BUFLINK_GAUAR((long)gaura_id) |\n+\t\ttx_pkt->data_len;\n+\tcmd_buf[nb_desc++] = rte_mbuf_data_iova(tx_pkt);\n+\n+\treturn nb_desc;\n+}\n+\n+static __rte_always_inline uint16_t\n+__octeontx_xmit_mseg_prepare(struct rte_mbuf *tx_pkt, uint64_t *cmd_buf,\n+\t\t\tconst uint16_t flag __rte_unused)\n {\n-\tuint8_t sz = (4 + (!!(flag & OCCTX_TX_MULTI_SEG_F) * 10));\n-\t/* Max size of PKO SEND desc is 112 bytes*/\n-\tuint64_t cmd_buf[sz] __rte_cache_aligned;\n-\tuint8_t nb_segs, nb_desc = 0;\n+\tuint16_t nb_segs, nb_desc = 0;\n \tuint16_t gaura_id, len = 0;\n \tstruct rte_mbuf *m_next = NULL;\n \n-\tif (unlikely(*((volatile int64_t *)fc_status_va) < 0))\n-\t\treturn -ENOSPC;\n-\n-\n-\tif (flag & OCCTX_TX_MULTI_SEG_F) {\n-\t\tnb_segs = tx_pkt->nb_segs;\n-\t\t/* Setup PKO_SEND_HDR_S */\n-\t\tcmd_buf[nb_desc++] = tx_pkt->pkt_len & 0xffff;\n-\t\tcmd_buf[nb_desc++] = 0x0;\n-\n-\t\tdo {\n-\t\t\tm_next = tx_pkt->next;\n-\t\t\t/* To handle case where mbufs belong to diff pools, like\n-\t\t\t * fragmentation\n-\t\t\t */\n-\t\t\tgaura_id = octeontx_fpa_bufpool_gpool((uintptr_t)\n-\t\t\t\t\t\t\ttx_pkt->pool->pool_id);\n-\n-\t\t\t/* Setup PKO_SEND_GATHER_S */\n-\t\t\tcmd_buf[nb_desc] = PKO_SEND_GATHER_SUBDC |\n-\t\t\t\t\t PKO_SEND_GATHER_LDTYPE(0x1ull) |\n-\t\t\t\t\t PKO_SEND_GATHER_GAUAR((long)\n-\t\t\t\t\t\t\t\t gaura_id) |\n-\t\t\t\t\t tx_pkt->data_len;\n-\t\t\t/* Mark mempool object as \"put\" since it is freed by\n-\t\t\t * PKO.\n-\t\t\t */\n-\t\t\tif (!(cmd_buf[nb_desc] & (1ULL << 57))) {\n-\t\t\t\ttx_pkt->next = NULL;\n-\t\t\t\t__mempool_check_cookies(tx_pkt->pool,\n-\t\t\t\t\t\t\t(void **)&tx_pkt, 1, 0);\n-\t\t\t}\n-\t\t\tnb_desc++;\n-\n-\t\t\tcmd_buf[nb_desc++] = rte_mbuf_data_iova(tx_pkt);\n-\n-\t\t\tnb_segs--;\n-\t\t\tlen += tx_pkt->data_len;\n-\t\t\ttx_pkt = m_next;\n-\t\t} while (nb_segs);\n-\t} else {\n-\t\t/* Setup PKO_SEND_HDR_S */\n-\t\tcmd_buf[nb_desc++] = tx_pkt->data_len & 0xffff;\n-\t\tcmd_buf[nb_desc++] = 0x0;\n-\n-\t\t/* Mark mempool object as \"put\" since it is freed by PKO */\n-\t\tif (!(cmd_buf[0] & (1ULL << 58)))\n-\t\t\t__mempool_check_cookies(tx_pkt->pool, (void **)&tx_pkt,\n-\t\t\t\t\t\t1, 0);\n-\t\t/* Get the gaura Id */\n+\tnb_segs = tx_pkt->nb_segs;\n+\t/* Setup PKO_SEND_HDR_S */\n+\tcmd_buf[nb_desc++] = tx_pkt->pkt_len & 0xffff;\n+\tcmd_buf[nb_desc++] = 0x0;\n+\n+\tdo {\n+\t\tm_next = tx_pkt->next;\n+\t\t/* To handle case where mbufs belong to diff pools, like\n+\t\t * fragmentation\n+\t\t */\n \t\tgaura_id = octeontx_fpa_bufpool_gpool((uintptr_t)\n \t\t\t\t\t\t tx_pkt->pool->pool_id);\n \n-\t\t/* Setup PKO_SEND_BUFLINK_S */\n-\t\tcmd_buf[nb_desc++] = PKO_SEND_BUFLINK_SUBDC |\n-\t\t\t\t PKO_SEND_BUFLINK_LDTYPE(0x1ull) |\n-\t\t\t\t PKO_SEND_BUFLINK_GAUAR((long)gaura_id) |\n-\t\t\t\t tx_pkt->data_len;\n+\t\t/* Setup PKO_SEND_GATHER_S */\n+\t\tcmd_buf[nb_desc] = PKO_SEND_GATHER_SUBDC\t\t |\n+\t\t\t\t PKO_SEND_GATHER_LDTYPE(0x1ull)\t |\n+\t\t\t\t PKO_SEND_GATHER_GAUAR((long)gaura_id) |\n+\t\t\t\t tx_pkt->data_len;\n+\n+\t\t/* Mark mempool object as \"put\" since it is freed by\n+\t\t * PKO.\n+\t\t */\n+\t\tif (!(cmd_buf[nb_desc] & (1ULL << 57))) {\n+\t\t\ttx_pkt->next = NULL;\n+\t\t\t__mempool_check_cookies(tx_pkt->pool,\n+\t\t\t\t\t\t(void **)&tx_pkt, 1, 0);\n+\t\t}\n+\t\tnb_desc++;\n+\n \t\tcmd_buf[nb_desc++] = rte_mbuf_data_iova(tx_pkt);\n-\t}\n-\tocteontx_reg_lmtst(lmtline_va, ioreg_va, cmd_buf, nb_desc);\n \n-\treturn 0;\n-}\n+\t\tnb_segs--;\n+\t\tlen += tx_pkt->data_len;\n+\t\ttx_pkt = m_next;\n+\t} while (nb_segs);\n \n-uint16_t\n-octeontx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts, uint16_t nb_pkts);\n+\treturn nb_desc;\n+}\n \n-uint16_t\n-octeontx_xmit_pkts_mseg(void *tx_queue, struct rte_mbuf **tx_pkts,\n-\t\t\tuint16_t nb_pkts);\n+static __rte_always_inline uint16_t\n+__octeontx_xmit_pkts(void *tx_queue, struct rte_mbuf **tx_pkts,\n+\t\t uint16_t nb_pkts, uint64_t *cmd_buf,\n+\t\t const uint16_t flags)\n+{\n+\tstruct octeontx_txq *txq = tx_queue;\n+\tocteontx_dq_t *dq = &txq->dq;\n+\tuint16_t count = 0, nb_desc;\n+\trte_cio_wmb();\n+\n+\twhile (count < nb_pkts) {\n+\t\tif (unlikely(*((volatile int64_t *)dq->fc_status_va) < 0))\n+\t\t\tbreak;\n+\n+\t\tif (flags & OCCTX_TX_MULTI_SEG_F) {\n+\t\t\tnb_desc = __octeontx_xmit_mseg_prepare(tx_pkts[count],\n+\t\t\t\t\t\t\t cmd_buf, flags);\n+\t\t} else {\n+\t\t\tnb_desc = __octeontx_xmit_prepare(tx_pkts[count],\n+\t\t\t\t\t\t\t cmd_buf, flags);\n+\t\t}\n+\n+\t\tocteontx_reg_lmtst(dq->lmtline_va, dq->ioreg_va, cmd_buf,\n+\t\t\t\t nb_desc);\n+\n+\t\tcount++;\n+\t}\n+\treturn count;\n+}\n \n uint16_t\n octeontx_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t nb_pkts);\n \n-#endif /* __OCTEONTX_RXTX_H__ */\n+#define MULT_F OCCTX_TX_MULTI_SEG_F\n+/* [NOFF] [MULTI_SEG] */\n+#define OCCTX_TX_FASTPATH_MODES\t\t\t\t\t\t \\\n+T(no_offload,\t\t\t\t0,\t4, OCCTX_TX_OFFLOAD_NONE) \\\n+T(mseg,\t\t\t\t\t1,\t14, MULT_F)\t\t \\\n+\n+ #endif /* __OCTEONTX_RXTX_H__ */\n", "prefixes": [ "2/8" ] }