From patchwork Tue Apr 28 12:40:09 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harman Kalra X-Patchwork-Id: 69459 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 18986A00BE; Tue, 28 Apr 2020 14:41:31 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EACF91D5CC; Tue, 28 Apr 2020 14:41:30 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by dpdk.org (Postfix) with ESMTP id 6BEFB1D5CC for ; Tue, 28 Apr 2020 14:41:28 +0200 (CEST) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 03SCehgP021441 for ; Tue, 28 Apr 2020 05:41:27 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-type : mime-version; s=pfpt0818; bh=6LWAGMT6Zmc9L0tUS27NEjgU3NBOpWauAXa3jGISACY=; b=MW/+MPaDbi5l23oDGjXJ9RY+o7EHxRaBDfLlJUZ1Opr7Rg6pBeXaaU1Ns7t8eFRbSuuT vo7eb6Yb1CdY42YRVLaMUYtp8A5sStCHhMNJWs4DMuv78UZvLLPm3DTPwNeHPg+/XxeI 4yfYKm/Jcl5vjpmWNP5galEtDUFkc8hEL0ayOJqz4qkyKuar7M6pI08TUYhq1bxSu0Na /MLwFQCstKIhXU3K8TvKD/dLhRUsipM/8R4LWzwR9qChhcMkZZYJRX1T0NfIWM1c6pfw 3KTBYTsF3MKAdGyM9fpT8yjqvu9DQv/TvySHsWRisgULu/28G89kacxDwX/w8NbzG9pl Aw== Received: from sc-exch03.marvell.com ([199.233.58.183]) by mx0a-0016f401.pphosted.com with ESMTP id 30mjjqc7jr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Tue, 28 Apr 2020 05:41:27 -0700 Received: from SC-EXCH04.marvell.com (10.93.176.84) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 28 Apr 2020 05:41:25 -0700 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (104.47.37.56) by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1497.2 via Frontend Transport; Tue, 28 Apr 2020 05:41:25 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oI+tiK/yeUsW5d51aUP2EKzIoqvo/1LaghIFS4zANTipW/XVh9d289rWGTsu42FWyrFnrCvHdrlU1TuZkAoeojslybRDkNRZ8N2p43LkoAVJLodNC7RGbkpT6+cxi/+rw6lfblnASFWGAjIAFhjn8aTfivy1M4GmV0jhclF6Ovu09QsuoGiWw8Wu7gNIct+6vbagoOan4WdY30ip0ttPWQrPOGLp2UmKf1YrSnbXPTQ6azECW0s/WPdnSB/92Gq4KIvP1rs//4yxqu0Ijupe5Q0hJ+n2o6WJ9S/BWoG1aeb4AJ3LOubTg/vPQId/38EgSD9KkVBnzkZNM8ns+Ipiqg== 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=6LWAGMT6Zmc9L0tUS27NEjgU3NBOpWauAXa3jGISACY=; b=ZPNxPiEH7cQlf7KaLEs5ItCXodXVG0qr+bvZeRQPCGXnQDKqqi6AZV/6vI8VchZTLGmLIf6T7F/Dx4PzdYhmgbn2rOh9gwDFbck62fCngQnpMCZWUpl+Clajr8FY5bbl0HciwGS3lZpwAwrNa6Ld9K4w+2hUBP0RN0HJljaDVtNr/mRIMCJy4Kbnsc1w9xaaqRrXsZPgZAp4ZyokTOJpSM+rJnCOzZs5OSgkaYHKCJVmMH8pPLGa9eL9mlaLovBXUp9BNXLTyPnoeS+NFwuY31zr3BtLs09KzhxwT2cyLdmzo5ySm29+wxS5wn7eQhrYaduezvk9wly/a+UVKhWDgA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=marvell.com; dmarc=pass action=none header.from=marvell.com; dkim=pass header.d=marvell.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.onmicrosoft.com; s=selector1-marvell-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=6LWAGMT6Zmc9L0tUS27NEjgU3NBOpWauAXa3jGISACY=; b=iYR/7bxO5/3/wDpenJ18yMsle92C4bHaJwGGqCOFcoPoEr5v5Y+RZ7KM/CRUp/Jsx0hEOllL9pYjANCnqDUuc4WFAGf2+orqlLgTaXNZkm9n0Z8oVIk6TS/sI/KATqhN2paUDvvgPXiaFiXysH665N4Wpj7zvAcj59R3f94Ys+Y= Received: from MN2PR18MB2848.namprd18.prod.outlook.com (2603:10b6:208:38::19) by MN2PR18MB3070.namprd18.prod.outlook.com (2603:10b6:208:ff::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Tue, 28 Apr 2020 12:41:24 +0000 Received: from MN2PR18MB2848.namprd18.prod.outlook.com ([fe80::a8b1:45c4:b84:9c02]) by MN2PR18MB2848.namprd18.prod.outlook.com ([fe80::a8b1:45c4:b84:9c02%7]) with mapi id 15.20.2937.026; Tue, 28 Apr 2020 12:41:24 +0000 From: Harman Kalra To: CC: , Harman Kalra Date: Tue, 28 Apr 2020 18:10:09 +0530 Message-ID: <1588077612-15905-2-git-send-email-hkalra@marvell.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1588077612-15905-1-git-send-email-hkalra@marvell.com> References: <1588077612-15905-1-git-send-email-hkalra@marvell.com> X-ClientProxiedBy: BMXPR01CA0031.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:c::17) To MN2PR18MB2848.namprd18.prod.outlook.com (2603:10b6:208:38::19) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from hkarlara-OptiPlex-3046.marvell.com (115.113.156.2) by BMXPR01CA0031.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2937.13 via Frontend Transport; Tue, 28 Apr 2020 12:41:23 +0000 X-Mailer: git-send-email 2.7.4 X-Originating-IP: [115.113.156.2] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 428741d4-75cc-4f07-2a14-08d7eb717646 X-MS-TrafficTypeDiagnostic: MN2PR18MB3070: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:312; X-Forefront-PRVS: 0387D64A71 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MN2PR18MB2848.namprd18.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(346002)(136003)(396003)(39860400002)(366004)(376002)(2906002)(52116002)(81156014)(7696005)(36756003)(316002)(2616005)(6636002)(5660300002)(8676002)(55236004)(34206002)(30864003)(86362001)(4326008)(8936002)(6666004)(956004)(37006003)(16526019)(107886003)(6486002)(66476007)(66556008)(66946007)(478600001)(186003)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: kfui5hshnIM2IFqyY2gKFikzYzfa+HMI12zHbMtO0wZ9PO2TuSn3rcp6HjYdBvMezp5XWax0s0Cx8EzWMaulLkpwpncvYlUJYJN0xroBsjyGGa1hZNlPViw2Z7Eej2+/S0nOfaxZZ1d9HWanqxXbZCAdhpdSZ640RhqL2+vKZoeyC1jE+DVcc3NxfwHWWsy5LV5htC5nDiefPsC9T3bAbGqWtpT7MzpsKeREil6N8YXPnb9s4AMQJN0fo+EUDuHfnj52zF33dzewUPQyal6vKE5aiqWxMvXQSmfOBNNeU4I41WrZIraKySXIbt85wFtwpv3flMafWbpZNUx5pk+ihGsrg+E3QI8Fa/uk2mLbpUIaXIZEHPtEg1zzzAPUsfoJlxplJo2B3f0dWk7j0lo4PoXQXijpkfhtwbQWq9QREi/uAlEgpuOwWLqyne60F3Qg X-MS-Exchange-AntiSpam-MessageData: AukVDoItV89wN91S/FsQBGtK8snJXpk+3Y3rP+DZxuTHIOjGnU/HN1aHZdPXkneuUpL2B8bEWk/fBktsRhgHayeOq+Gn6gM13S4G3Ege1SZGqN7rZYB2H8xXLFcZkw44vQ/wguK4Yu08Imp+ItcczhnnS2vPpEhIRVKZxm/0HWTfC4qvIsdDhzlRR9HcQb3dWNpcoDG49s5hQY35pC70NW4kE/h9XbfC7bjJRxaSNBhRGoHFBi7vE/ksNzqTLS5BtyScjzjh3SLRLCpLBPDuT/modHter1v8EhtY4POKyuGSYEAS3IOqmMV160AHbYrtwSpqjUM7woV1iOHki4mdPOJ6Q8h72abCuQpUk/aOHJmWNLARGOY9Iock/4cEypmrZlXfx7durd6IXPmu+4yuiqyZMmvVgt70LNnlDLF+ftTrNtZLUyJ/dQV5Pfb/z7pQbiKaaOD7HU2380+QxyVIgsAXyyi1cM9vB87cR2Gc/x5lA4GRZ2o7kj7rHbk1aqh4HIM3tAv1VJdx8WHMotd56xLKbjtianex00qknuo3ADjYzKnDwUdg62P0nWcdc29oYDGQsb93dT7o4aq2dOfg6yRck36geK/3uJCUQTor7ZjFoOisEnTCucFiVf3FfwM+noJSCm/ZJrSY2aylG5gS43bqD6cyeGUlR9/qcbiMqjwUy0OQfPm3B3D50Le4Eo8oM6XJR+YP60+PBi1ZjuYOzkgur1Af35mxzrVFYnuP2RZYcJbBYNfC2kr1a4Zod57OS3+HVsY0a8qM7YJ7IfS/YzwqDi9w86QFxerncYNr+E0= X-MS-Exchange-CrossTenant-Network-Message-Id: 428741d4-75cc-4f07-2a14-08d7eb717646 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2020 12:41:24.6354 (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: YKY3StjHrbBjFd5xTM+6Psj4RBOXFYoD2BWMlcBvUR0HVadzbXWZK0TIH2NYL9e7c1iwro0/Q1yDte/G7QRJVw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR18MB3070 X-OriginatorOrg: marvell.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.676 definitions=2020-04-28_09:2020-04-28, 2020-04-28 signatures=0 Subject: [dpdk-dev] [PATCH v2 1/4] event/octeontx: add multi segment support to eventdev 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" Adding support for multi segment to the eventdev PMD. Signed-off-by: Harman Kalra --- drivers/event/octeontx/ssovf_evdev.c | 33 +++++++--- drivers/event/octeontx/ssovf_evdev.h | 13 ++++ drivers/event/octeontx/ssovf_worker.c | 90 ++++++++++++++++++++++++--- drivers/event/octeontx/ssovf_worker.h | 76 +++++++++++++++++++--- 4 files changed, 189 insertions(+), 23 deletions(-) diff --git a/drivers/event/octeontx/ssovf_evdev.c b/drivers/event/octeontx/ssovf_evdev.c index f9e93244f..1024b7284 100644 --- a/drivers/event/octeontx/ssovf_evdev.c +++ b/drivers/event/octeontx/ssovf_evdev.c @@ -146,15 +146,31 @@ ssovf_fastpath_fns_set(struct rte_eventdev *dev) dev->enqueue_burst = ssows_enq_burst; dev->enqueue_new_burst = ssows_enq_new_burst; dev->enqueue_forward_burst = ssows_enq_fwd_burst; - dev->dequeue = ssows_deq; - dev->dequeue_burst = ssows_deq_burst; - dev->txa_enqueue = sso_event_tx_adapter_enqueue; - dev->txa_enqueue_same_dest = dev->txa_enqueue; - if (edev->is_timeout_deq) { - dev->dequeue = ssows_deq_timeout; - dev->dequeue_burst = ssows_deq_timeout_burst; + if (!!(edev->rx_offload_flags & OCCTX_RX_MULTI_SEG_F)) { + dev->dequeue = ssows_deq_mseg; + dev->dequeue_burst = ssows_deq_burst_mseg; + + if (edev->is_timeout_deq) { + dev->dequeue = ssows_deq_timeout_mseg; + dev->dequeue_burst = ssows_deq_timeout_burst_mseg; + } + } else { + dev->dequeue = ssows_deq; + dev->dequeue_burst = ssows_deq_burst; + + if (edev->is_timeout_deq) { + dev->dequeue = ssows_deq_timeout; + dev->dequeue_burst = ssows_deq_timeout_burst; + } } + + if (!!(edev->tx_offload_flags & OCCTX_TX_MULTI_SEG_F)) + dev->txa_enqueue = sso_event_tx_adapter_enqueue_mseg; + else + dev->txa_enqueue = sso_event_tx_adapter_enqueue; + + dev->txa_enqueue_same_dest = dev->txa_enqueue; } static void @@ -411,6 +427,7 @@ ssovf_eth_rx_adapter_queue_add(const struct rte_eventdev *dev, { int ret = 0; const struct octeontx_nic *nic = eth_dev->data->dev_private; + struct ssovf_evdev *edev = ssovf_pmd_priv(dev); pki_mod_qos_t pki_qos; RTE_SET_USED(dev); @@ -447,6 +464,8 @@ ssovf_eth_rx_adapter_queue_add(const struct rte_eventdev *dev, ssovf_log_err("failed to modify QOS, port=%d, q=%d", nic->port_id, queue_conf->ev.queue_id); + edev->rx_offload_flags = nic->rx_offload_flags; + edev->tx_offload_flags = nic->tx_offload_flags; return ret; } diff --git a/drivers/event/octeontx/ssovf_evdev.h b/drivers/event/octeontx/ssovf_evdev.h index 0e622152c..1c3ae8556 100644 --- a/drivers/event/octeontx/ssovf_evdev.h +++ b/drivers/event/octeontx/ssovf_evdev.h @@ -12,6 +12,8 @@ #include #include +#include "octeontx_rxtx.h" + #define EVENTDEV_NAME_OCTEONTX_PMD event_octeontx #define SSOVF_LOG(level, fmt, args...) \ @@ -132,6 +134,7 @@ enum ssovf_type { }; struct ssovf_evdev { + OFFLOAD_FLAGS; /*Sequence should not be changed */ uint8_t max_event_queues; uint8_t max_event_ports; uint8_t is_timeout_deq; @@ -175,6 +178,14 @@ uint16_t ssows_deq_timeout(void *port, struct rte_event *ev, uint64_t timeout_ticks); uint16_t ssows_deq_timeout_burst(void *port, struct rte_event ev[], uint16_t nb_events, uint64_t timeout_ticks); +uint16_t ssows_deq_mseg(void *port, struct rte_event *ev, + uint64_t timeout_ticks); +uint16_t ssows_deq_burst_mseg(void *port, struct rte_event ev[], + uint16_t nb_events, uint64_t timeout_ticks); +uint16_t ssows_deq_timeout_mseg(void *port, struct rte_event *ev, + uint64_t timeout_ticks); +uint16_t ssows_deq_timeout_burst_mseg(void *port, struct rte_event ev[], + uint16_t nb_events, uint64_t timeout_ticks); typedef void (*ssows_handle_event_t)(void *arg, struct rte_event ev); void ssows_flush_events(struct ssows *ws, uint8_t queue_id, @@ -182,6 +193,8 @@ void ssows_flush_events(struct ssows *ws, uint8_t queue_id, void ssows_reset(struct ssows *ws); uint16_t sso_event_tx_adapter_enqueue(void *port, struct rte_event ev[], uint16_t nb_events); +uint16_t sso_event_tx_adapter_enqueue_mseg(void *port, + struct rte_event ev[], uint16_t nb_events); int ssovf_info(struct ssovf_info *info); void *ssovf_bar(enum ssovf_type, uint8_t id, uint8_t bar); int test_eventdev_octeontx(void); diff --git a/drivers/event/octeontx/ssovf_worker.c b/drivers/event/octeontx/ssovf_worker.c index ab34233d2..a811c2252 100644 --- a/drivers/event/octeontx/ssovf_worker.c +++ b/drivers/event/octeontx/ssovf_worker.c @@ -103,7 +103,7 @@ ssows_deq(void *port, struct rte_event *ev, uint64_t timeout_ticks) ssows_swtag_wait(ws); return 1; } else { - return ssows_get_work(ws, ev); + return ssows_get_work(ws, ev, OCCTX_RX_OFFLOAD_NONE); } } @@ -118,9 +118,9 @@ ssows_deq_timeout(void *port, struct rte_event *ev, uint64_t timeout_ticks) ws->swtag_req = 0; ssows_swtag_wait(ws); } else { - ret = ssows_get_work(ws, ev); + ret = ssows_get_work(ws, ev, OCCTX_RX_OFFLOAD_NONE); for (iter = 1; iter < timeout_ticks && (ret == 0); iter++) - ret = ssows_get_work(ws, ev); + ret = ssows_get_work(ws, ev, OCCTX_RX_OFFLOAD_NONE); } return ret; } @@ -143,6 +143,61 @@ ssows_deq_timeout_burst(void *port, struct rte_event ev[], uint16_t nb_events, return ssows_deq_timeout(port, ev, timeout_ticks); } +__rte_always_inline uint16_t __rte_hot +ssows_deq_mseg(void *port, struct rte_event *ev, uint64_t timeout_ticks) +{ + struct ssows *ws = port; + + RTE_SET_USED(timeout_ticks); + + if (ws->swtag_req) { + ws->swtag_req = 0; + ssows_swtag_wait(ws); + return 1; + } else { + return ssows_get_work(ws, ev, OCCTX_RX_OFFLOAD_NONE | + OCCTX_RX_MULTI_SEG_F); + } +} + +__rte_always_inline uint16_t __rte_hot +ssows_deq_timeout_mseg(void *port, struct rte_event *ev, uint64_t timeout_ticks) +{ + struct ssows *ws = port; + uint64_t iter; + uint16_t ret = 1; + + if (ws->swtag_req) { + ws->swtag_req = 0; + ssows_swtag_wait(ws); + } else { + ret = ssows_get_work(ws, ev, OCCTX_RX_OFFLOAD_NONE | + OCCTX_RX_MULTI_SEG_F); + for (iter = 1; iter < timeout_ticks && (ret == 0); iter++) + ret = ssows_get_work(ws, ev, OCCTX_RX_OFFLOAD_NONE | + OCCTX_RX_MULTI_SEG_F); + } + return ret; +} + +uint16_t __rte_hot +ssows_deq_burst_mseg(void *port, struct rte_event ev[], uint16_t nb_events, + uint64_t timeout_ticks) +{ + RTE_SET_USED(nb_events); + + return ssows_deq_mseg(port, ev, timeout_ticks); +} + +uint16_t __rte_hot +ssows_deq_timeout_burst_mseg(void *port, struct rte_event ev[], + uint16_t nb_events, uint64_t timeout_ticks) +{ + RTE_SET_USED(nb_events); + + return ssows_deq_timeout_mseg(port, ev, timeout_ticks); +} + __rte_always_inline uint16_t __rte_hot ssows_enq(void *port, const struct rte_event *ev) { @@ -231,7 +286,9 @@ ssows_flush_events(struct ssows *ws, uint8_t queue_id, ev.event = sched_type_queue | (get_work0 & 0xffffffff); if (get_work1 && ev.event_type == RTE_EVENT_TYPE_ETHDEV) ev.mbuf = ssovf_octeontx_wqe_to_pkt(get_work1, - (ev.event >> 20) & 0x7F); + (ev.event >> 20) & 0x7F, + OCCTX_RX_OFFLOAD_NONE | + OCCTX_RX_MULTI_SEG_F); else ev.u64 = get_work1; @@ -262,9 +319,9 @@ ssows_reset(struct ssows *ws) } } -uint16_t -sso_event_tx_adapter_enqueue(void *port, - struct rte_event ev[], uint16_t nb_events) +static __rte_always_inline uint16_t +__sso_event_tx_adapter_enqueue(void *port, struct rte_event ev[], + uint16_t nb_events, const uint16_t flag) { uint16_t port_id; uint16_t queue_id; @@ -298,5 +355,22 @@ sso_event_tx_adapter_enqueue(void *port, ethdev = &rte_eth_devices[port_id]; txq = ethdev->data->tx_queues[queue_id]; - return __octeontx_xmit_pkts(txq, &m, 1, cmd, OCCTX_TX_OFFLOAD_NONE); + return __octeontx_xmit_pkts(txq, &m, 1, cmd, flag); +} + +uint16_t +sso_event_tx_adapter_enqueue(void *port, struct rte_event ev[], + uint16_t nb_events) +{ + return __sso_event_tx_adapter_enqueue(port, ev, nb_events, + OCCTX_TX_OFFLOAD_NONE); +} + +uint16_t +sso_event_tx_adapter_enqueue_mseg(void *port, struct rte_event ev[], + uint16_t nb_events) +{ + return __sso_event_tx_adapter_enqueue(port, ev, nb_events, + OCCTX_TX_OFFLOAD_NONE | + OCCTX_TX_MULTI_SEG_F); } diff --git a/drivers/event/octeontx/ssovf_worker.h b/drivers/event/octeontx/ssovf_worker.h index 009b9c18a..0eacec69a 100644 --- a/drivers/event/octeontx/ssovf_worker.h +++ b/drivers/event/octeontx/ssovf_worker.h @@ -19,8 +19,45 @@ enum { /* SSO Operations */ +static __rte_always_inline void +ssovf_octeontx_wqe_xtract_mseg(octtx_wqe_t *wqe, + struct rte_mbuf *mbuf) +{ + octtx_pki_buflink_t *buflink; + rte_iova_t *iova_list; + uint8_t nb_segs; + uint64_t bytes_left = wqe->s.w1.len - wqe->s.w5.size; + + nb_segs = wqe->s.w0.bufs; + + buflink = (octtx_pki_buflink_t *)((uintptr_t)wqe->s.w3.addr - + sizeof(octtx_pki_buflink_t)); + + /*TODO: work with rearm data */ + + while (--nb_segs) { + iova_list = (rte_iova_t *)(uintptr_t)(buflink->w1.s.addr); + mbuf->next = (struct rte_mbuf *)(rte_iova_t *)(iova_list - 2) + - (OCTTX_PACKET_LATER_SKIP / 128); + mbuf = mbuf->next; + + mbuf->data_off = sizeof(octtx_pki_buflink_t); + + __mempool_check_cookies(mbuf->pool, (void **)&mbuf, 1, 1); + if (nb_segs == 1) + mbuf->data_len = bytes_left; + else + mbuf->data_len = buflink->w0.s.size; + + bytes_left = bytes_left - buflink->w0.s.size; + buflink = (octtx_pki_buflink_t *)(rte_iova_t *)(iova_list - 2); + + } +} + static __rte_always_inline struct rte_mbuf * -ssovf_octeontx_wqe_to_pkt(uint64_t work, uint16_t port_info) +ssovf_octeontx_wqe_to_pkt(uint64_t work, uint16_t port_info, + const uint16_t flag) { struct rte_mbuf *mbuf; octtx_wqe_t *wqe = (octtx_wqe_t *)(uintptr_t)work; @@ -31,10 +68,18 @@ ssovf_octeontx_wqe_to_pkt(uint64_t work, uint16_t port_info) mbuf->packet_type = ptype_table[wqe->s.w2.lcty][wqe->s.w2.lety][wqe->s.w2.lfty]; mbuf->data_off = RTE_PTR_DIFF(wqe->s.w3.addr, mbuf->buf_addr); - mbuf->pkt_len = wqe->s.w1.len; - mbuf->data_len = mbuf->pkt_len; - mbuf->nb_segs = 1; mbuf->ol_flags = 0; + mbuf->pkt_len = wqe->s.w1.len; + + if (!!(flag & OCCTX_RX_MULTI_SEG_F)) { + mbuf->nb_segs = wqe->s.w0.bufs; + mbuf->data_len = wqe->s.w5.size; + ssovf_octeontx_wqe_xtract_mseg(wqe, mbuf); + } else { + mbuf->nb_segs = 1; + mbuf->data_len = mbuf->pkt_len; + } + mbuf->port = rte_octeontx_pchan_map[port_info >> 4][port_info & 0xF]; rte_mbuf_refcnt_set(mbuf, 1); @@ -45,14 +90,29 @@ static __rte_always_inline void ssovf_octeontx_wqe_free(uint64_t work) { octtx_wqe_t *wqe = (octtx_wqe_t *)(uintptr_t)work; - struct rte_mbuf *mbuf; + uint8_t nb_segs = wqe->s.w0.bufs; + octtx_pki_buflink_t *buflink; + struct rte_mbuf *mbuf, *head; + rte_iova_t *iova_list; mbuf = (struct rte_mbuf *)((uintptr_t)wqe - OCTTX_PACKET_WQE_SKIP); - rte_pktmbuf_free(mbuf); + buflink = (octtx_pki_buflink_t *)((uintptr_t)wqe->s.w3.addr - + sizeof(octtx_pki_buflink_t)); + head = mbuf; + while (--nb_segs) { + iova_list = (rte_iova_t *)(uintptr_t)(buflink->w1.s.addr); + mbuf = (struct rte_mbuf *)(rte_iova_t *)(iova_list - 2) + - (OCTTX_PACKET_LATER_SKIP / 128); + + mbuf->next = NULL; + rte_pktmbuf_free(mbuf); + buflink = (octtx_pki_buflink_t *)(rte_iova_t *)(iova_list - 2); + } + rte_pktmbuf_free(head); } static __rte_always_inline uint16_t -ssows_get_work(struct ssows *ws, struct rte_event *ev) +ssows_get_work(struct ssows *ws, struct rte_event *ev, const uint16_t flag) { uint64_t get_work0, get_work1; uint64_t sched_type_queue; @@ -67,7 +127,7 @@ ssows_get_work(struct ssows *ws, struct rte_event *ev) if (get_work1 && ev->event_type == RTE_EVENT_TYPE_ETHDEV) { ev->mbuf = ssovf_octeontx_wqe_to_pkt(get_work1, - (ev->event >> 20) & 0x7F); + (ev->event >> 20) & 0x7F, flag); } else if (unlikely((get_work0 & 0xFFFFFFFF) == 0xFFFFFFFF)) { ssovf_octeontx_wqe_free(get_work1); return 0; From patchwork Tue Apr 28 12:40:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harman Kalra X-Patchwork-Id: 69460 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id DE60CA00BE; Tue, 28 Apr 2020 14:41:41 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CA5491D5DD; Tue, 28 Apr 2020 14:41:36 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id 9131A1D5DA for ; Tue, 28 Apr 2020 14:41:34 +0200 (CEST) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 03SCeiSu029070 for ; Tue, 28 Apr 2020 05:41:34 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-type : mime-version; s=pfpt0818; bh=tc0v+MWmibw2E0jr8KzumIKIYI0opyMUEfL8m8MINN8=; b=OYwTxpUkI5gsHVxx4nvrkDRHBFANol+G7x+jDyswmMiZVDSGdp0sZevmOPH+rbRqthhZ fnLKzwim02fo5C8v8MWpM6ZCGKNAT8XvQcehfpRYmRZkTK4JfIZ2YNUdlSzGSqS5dkW0 iDLMEEm6Uk5zM11m6DJR7yWTbw8UKmI84XbTe05tQ3VTAwZI+JuHq/C4+9WKZYKSgIhx 8swrUgrFdO4hufyeYVrBwPIIf5NJNxvM2VAvVHhuaIqZoYg5dlxACNy/woVk64NDoKIP zNZdlhke6mTvlsns5oRMnslshvlG5VTi5Lds5MNXVNnyEUaqX6KurVAaqkDTi1kHC2dL 0A== Received: from sc-exch01.marvell.com ([199.233.58.181]) by mx0b-0016f401.pphosted.com with ESMTP id 30mmqmksv0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Tue, 28 Apr 2020 05:41:33 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 28 Apr 2020 05:41:31 -0700 Received: from SC-EXCH02.marvell.com (10.93.176.82) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 28 Apr 2020 05:41:30 -0700 Received: from NAM02-CY1-obe.outbound.protection.outlook.com (104.47.37.54) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1497.2 via Frontend Transport; Tue, 28 Apr 2020 05:41:30 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IVMNlj4fu62HZoDWwyaVH4l4CFcOv0Ofpj1tMRT2p0NXRI6rDXyYThQPkZCEXgyuvg0aB1Wxn70Hn5mVnZmi40QYDdkHhwNbJiIITRfYUkYcNRH59IOe2wLI8iRe0APR2Nzq8UxzB7kkGDX4s7JbwcNh/TzyZz+53IpXFpQzwopFrE6NytSloBNBz2Tzb8OAEEufkaf9lpYnO+5RWBvhU+ZB9V9iGMRuI+WYskECGx6VpQwP/BC7FvxiO3z7T9/DI3HC9RC9cX+KFRr+OVg0sUTfLepofEWqIhcKexQJQwf4yQv7noYPGo3tW9PN2JWxHuAawQtoO618JrW0BBtYzw== 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=tc0v+MWmibw2E0jr8KzumIKIYI0opyMUEfL8m8MINN8=; b=MR1At/eCohBvZWAMnZ03aBgPH+0TNA/aYXXXm4zGbGpfBk2MJmRHQdgLwNKODDczdpcXgESi0Wv+J8BZHN39v/On5dIUMFR+wdrW4DUVJuFKSw2kQxzrr5yFvNVJXXGHFe5ImLDgsbYDhqKweG/VuAApTJHgXzA2kJr6LXUUaKle3FINwjUEcXwnq36+2FPAGpLPhwfBUFyR62olpKF3I0sLqg/JULW5IJdxM+hcbNkRARd7wluQ7Dy6aSW1ycCm2jDsOrBtD9r+pyaWknk8r/zUaEwvaX5h/x2TsxyWpPwcJKj5AYql5rEBJMoyicg6Dplz/uXeHnkILH1ZB47Xfw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=marvell.com; dmarc=pass action=none header.from=marvell.com; dkim=pass header.d=marvell.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.onmicrosoft.com; s=selector1-marvell-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=tc0v+MWmibw2E0jr8KzumIKIYI0opyMUEfL8m8MINN8=; b=PsY6cuLx97WAqCuFQPDFC7UGezrUxdJgfKFAVMHZRB9CsTd6qxsF+1TgnuKU+LfqP0tVT9Dde3RFXmVth3foBbP5mDo+X7hFjZiKJUeCm4XGGIKn4/POwwVRcdS1Tk76dJDoyuweZJR1g4pKOKjGn53rcOyVlzp7JfrXqDT3q0c= Received: from MN2PR18MB2848.namprd18.prod.outlook.com (2603:10b6:208:38::19) by MN2PR18MB3070.namprd18.prod.outlook.com (2603:10b6:208:ff::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Tue, 28 Apr 2020 12:41:29 +0000 Received: from MN2PR18MB2848.namprd18.prod.outlook.com ([fe80::a8b1:45c4:b84:9c02]) by MN2PR18MB2848.namprd18.prod.outlook.com ([fe80::a8b1:45c4:b84:9c02%7]) with mapi id 15.20.2937.026; Tue, 28 Apr 2020 12:41:29 +0000 From: Harman Kalra To: CC: , Harman Kalra Date: Tue, 28 Apr 2020 18:10:10 +0530 Message-ID: <1588077612-15905-3-git-send-email-hkalra@marvell.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1588077612-15905-1-git-send-email-hkalra@marvell.com> References: <1588077612-15905-1-git-send-email-hkalra@marvell.com> X-ClientProxiedBy: BMXPR01CA0031.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:c::17) To MN2PR18MB2848.namprd18.prod.outlook.com (2603:10b6:208:38::19) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from hkarlara-OptiPlex-3046.marvell.com (115.113.156.2) by BMXPR01CA0031.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2937.13 via Frontend Transport; Tue, 28 Apr 2020 12:41:27 +0000 X-Mailer: git-send-email 2.7.4 X-Originating-IP: [115.113.156.2] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 996537f9-d099-4697-af2b-08d7eb7178d6 X-MS-TrafficTypeDiagnostic: MN2PR18MB3070: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:4502; X-Forefront-PRVS: 0387D64A71 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MN2PR18MB2848.namprd18.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(346002)(136003)(396003)(39860400002)(366004)(376002)(2906002)(52116002)(81156014)(7696005)(36756003)(316002)(2616005)(6636002)(5660300002)(8676002)(55236004)(34206002)(30864003)(86362001)(4326008)(8936002)(6666004)(956004)(37006003)(16526019)(107886003)(6486002)(66476007)(66556008)(66946007)(478600001)(186003)(26005); DIR:OUT; SFP:1101; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: iMa+cmATqNhbBHqEiUTTyWyvkLsWIw8sYajaBGQ1HKe42IiB6Sm9s/DUwRp1wrtAn/1UC0TEBJehUVpaafG9jOQQiVS/VQBuUopyaWvVqhu7o6cJzYI5DwmbtStAxu4UoEniOxyNi5GPFCD1VQpbaTvnq9EFdNRIigtpGj8lCWuE68eXo/yOTI7uMJiAzdAmwcvu3OwOcv4Z0OMjlYvIYfJ3schoAeX6EsAP3oZ5odxP1Zwq3KFIZiYOByUO3SU7MljbLVN68kQ2Ai8M3rKmBzfYK72H/07YPgDOaIrx/RjBRE1rMELLvbFGmpCfk7Yr4vOi+FghJklhkwj7YMDHS9Ie66Pk3hqC9KbrAC2/jWwxfvfkx2OMV9KdrF66U1QjQGkMxBMQ0vuN85poLA7LwVD58VBnm1zEY0gkoaz+Z8yhok1eriyfy67c9AJ2aJQQ X-MS-Exchange-AntiSpam-MessageData: 1ewOYFwxKZ6I+M5h50mVJbt2p1vmJ3v/VrPpkN6SG8HzFh4713A0VvLvHAyVXqNv6a3rBLBJAk7lQYwHe4HeIR5tMx25V9Zq4hT2PsopbH8BJVHEQq8Ttsft7qlhIh+bRXaSoRtOh4AyozH5u9itUFRn4Tk3diV779D0K1nUp0wXKY3wNzc5gjz5SY8GXnKcNc56URBbYOOI9voDXW3XD188Ey/p/MLzoj5Hz2gS/6lelwfa5o3NWGhhkEmCVHd8b0zNJfpEHoGiz037InBDJt9uj99D+Lj6dnOJeTA4EFP53spTFwCFIeEuSw2aeM6p6tJleWWJyZxqx42voVIM4PnSn5tf63ADEyaBsXfQ05PaMAGII4b9umv/GaehCWlEXf5hLsF6/RYEQm9rLJv/3tgLEnu3UDyTiLZFICjNmYIYJGA/xBjZ5xE3IOk8LbQDDS7xmod5H7L0U6OsQNC1g+tzXdkNcv8v304vEDoUkLge/CQQyJVMPUgy2E7O1EJgrfwardcDgnlbIEVA90sd7iWpsDtfWvvBYHL8y722iyHiAGneoRTARFJUmGoHr1HDDXFsbicnTfBZkowUZU+xwUXjEML4RMzzHnlxRXhp+Cxm9vfX5cnnlLJY4tYt6sJIlbGT2dmoBjece3w/KGk6ckBeKj9n8KRCW//sI2xQy54VlSGhvguRZtwVehfS1TGUT+TmKuLf0iJ9W0fRQuD7s/O036W3bigkfar/xh25b/xU1yzXybyEkt5luFNfePRny2A2ZeDxhOzKTpwzFDq7soeIvT07jGTXTc6zm/oPQ38= X-MS-Exchange-CrossTenant-Network-Message-Id: 996537f9-d099-4697-af2b-08d7eb7178d6 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2020 12:41:28.9200 (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: H1pHvQzQuzoa6pqbFIMRJj5T4M4iTIhOZY/242hG46OZpD9atLKWhlcE5ClYijFz4JPnevKNF5CsRjVyBFqq3A== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR18MB3070 X-OriginatorOrg: marvell.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.676 definitions=2020-04-28_09:2020-04-28, 2020-04-28 signatures=0 Subject: [dpdk-dev] [PATCH v2 2/4] event/octeontx: add framework for Rx/Tx offloads 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" Adding macro based framework to hook dequeue/enqueue function pointers to the appropriate function based on rx/tx offloads. Signed-off-by: Harman Kalra --- drivers/event/octeontx/ssovf_evdev.c | 36 ---- drivers/event/octeontx/ssovf_evdev.h | 24 +-- drivers/event/octeontx/ssovf_worker.c | 259 ++++++++++++++------------ drivers/net/octeontx/octeontx_rxtx.h | 7 + 4 files changed, 150 insertions(+), 176 deletions(-) diff --git a/drivers/event/octeontx/ssovf_evdev.c b/drivers/event/octeontx/ssovf_evdev.c index 1024b7284..5d074bcbc 100644 --- a/drivers/event/octeontx/ssovf_evdev.c +++ b/drivers/event/octeontx/ssovf_evdev.c @@ -137,42 +137,6 @@ ssovf_mbox_timeout_ticks(uint64_t ns, uint64_t *tmo_ticks) return 0; } -static void -ssovf_fastpath_fns_set(struct rte_eventdev *dev) -{ - struct ssovf_evdev *edev = ssovf_pmd_priv(dev); - - dev->enqueue = ssows_enq; - dev->enqueue_burst = ssows_enq_burst; - dev->enqueue_new_burst = ssows_enq_new_burst; - dev->enqueue_forward_burst = ssows_enq_fwd_burst; - - if (!!(edev->rx_offload_flags & OCCTX_RX_MULTI_SEG_F)) { - dev->dequeue = ssows_deq_mseg; - dev->dequeue_burst = ssows_deq_burst_mseg; - - if (edev->is_timeout_deq) { - dev->dequeue = ssows_deq_timeout_mseg; - dev->dequeue_burst = ssows_deq_timeout_burst_mseg; - } - } else { - dev->dequeue = ssows_deq; - dev->dequeue_burst = ssows_deq_burst; - - if (edev->is_timeout_deq) { - dev->dequeue = ssows_deq_timeout; - dev->dequeue_burst = ssows_deq_timeout_burst; - } - } - - if (!!(edev->tx_offload_flags & OCCTX_TX_MULTI_SEG_F)) - dev->txa_enqueue = sso_event_tx_adapter_enqueue_mseg; - else - dev->txa_enqueue = sso_event_tx_adapter_enqueue; - - dev->txa_enqueue_same_dest = dev->txa_enqueue; -} - static void ssovf_info_get(struct rte_eventdev *dev, struct rte_event_dev_info *dev_info) { diff --git a/drivers/event/octeontx/ssovf_evdev.h b/drivers/event/octeontx/ssovf_evdev.h index 1c3ae8556..1f5066c9a 100644 --- a/drivers/event/octeontx/ssovf_evdev.h +++ b/drivers/event/octeontx/ssovf_evdev.h @@ -14,6 +14,9 @@ #include "octeontx_rxtx.h" +#define SSO_RX_ADPTR_ENQ_FASTPATH_FUNC OCCTX_RX_FASTPATH_MODES +#define SSO_TX_ADPTR_ENQ_FASTPATH_FUNC OCCTX_TX_FASTPATH_MODES + #define EVENTDEV_NAME_OCTEONTX_PMD event_octeontx #define SSOVF_LOG(level, fmt, args...) \ @@ -171,32 +174,13 @@ uint16_t ssows_enq_new_burst(void *port, const struct rte_event ev[], uint16_t nb_events); uint16_t ssows_enq_fwd_burst(void *port, const struct rte_event ev[], uint16_t nb_events); -uint16_t ssows_deq(void *port, struct rte_event *ev, uint64_t timeout_ticks); -uint16_t ssows_deq_burst(void *port, struct rte_event ev[], - uint16_t nb_events, uint64_t timeout_ticks); -uint16_t ssows_deq_timeout(void *port, struct rte_event *ev, - uint64_t timeout_ticks); -uint16_t ssows_deq_timeout_burst(void *port, struct rte_event ev[], - uint16_t nb_events, uint64_t timeout_ticks); -uint16_t ssows_deq_mseg(void *port, struct rte_event *ev, - uint64_t timeout_ticks); -uint16_t ssows_deq_burst_mseg(void *port, struct rte_event ev[], - uint16_t nb_events, uint64_t timeout_ticks); -uint16_t ssows_deq_timeout_mseg(void *port, struct rte_event *ev, - uint64_t timeout_ticks); -uint16_t ssows_deq_timeout_burst_mseg(void *port, struct rte_event ev[], - uint16_t nb_events, uint64_t timeout_ticks); - typedef void (*ssows_handle_event_t)(void *arg, struct rte_event ev); void ssows_flush_events(struct ssows *ws, uint8_t queue_id, ssows_handle_event_t fn, void *arg); void ssows_reset(struct ssows *ws); -uint16_t sso_event_tx_adapter_enqueue(void *port, - struct rte_event ev[], uint16_t nb_events); -uint16_t sso_event_tx_adapter_enqueue_mseg(void *port, - struct rte_event ev[], uint16_t nb_events); int ssovf_info(struct ssovf_info *info); void *ssovf_bar(enum ssovf_type, uint8_t id, uint8_t bar); int test_eventdev_octeontx(void); +void ssovf_fastpath_fns_set(struct rte_eventdev *dev); #endif /* __SSOVF_EVDEV_H__ */ diff --git a/drivers/event/octeontx/ssovf_worker.c b/drivers/event/octeontx/ssovf_worker.c index a811c2252..b5873c3fa 100644 --- a/drivers/event/octeontx/ssovf_worker.c +++ b/drivers/event/octeontx/ssovf_worker.c @@ -91,112 +91,62 @@ ssows_release_event(struct ssows *ws) ssows_swtag_untag(ws); } -__rte_always_inline uint16_t __rte_hot -ssows_deq(void *port, struct rte_event *ev, uint64_t timeout_ticks) -{ - struct ssows *ws = port; - - RTE_SET_USED(timeout_ticks); - - if (ws->swtag_req) { - ws->swtag_req = 0; - ssows_swtag_wait(ws); - return 1; - } else { - return ssows_get_work(ws, ev, OCCTX_RX_OFFLOAD_NONE); - } -} - -__rte_always_inline uint16_t __rte_hot -ssows_deq_timeout(void *port, struct rte_event *ev, uint64_t timeout_ticks) -{ - struct ssows *ws = port; - uint64_t iter; - uint16_t ret = 1; - - if (ws->swtag_req) { - ws->swtag_req = 0; - ssows_swtag_wait(ws); - } else { - ret = ssows_get_work(ws, ev, OCCTX_RX_OFFLOAD_NONE); - for (iter = 1; iter < timeout_ticks && (ret == 0); iter++) - ret = ssows_get_work(ws, ev, OCCTX_RX_OFFLOAD_NONE); - } - return ret; +#define R(name, f0, flags) \ +static uint16_t __rte_noinline __rte_hot \ +ssows_deq_ ##name(void *port, struct rte_event *ev, uint64_t timeout_ticks) \ +{ \ + struct ssows *ws = port; \ + \ + RTE_SET_USED(timeout_ticks); \ + \ + if (ws->swtag_req) { \ + ws->swtag_req = 0; \ + ssows_swtag_wait(ws); \ + return 1; \ + } else { \ + return ssows_get_work(ws, ev, flags); \ + } \ +} \ + \ +static uint16_t __rte_hot \ +ssows_deq_burst_ ##name(void *port, struct rte_event ev[], \ + uint16_t nb_events, uint64_t timeout_ticks) \ +{ \ + RTE_SET_USED(nb_events); \ + \ + return ssows_deq_ ##name(port, ev, timeout_ticks); \ +} \ + \ +static uint16_t __rte_hot \ +ssows_deq_timeout_ ##name(void *port, struct rte_event *ev, \ + uint64_t timeout_ticks) \ +{ \ + struct ssows *ws = port; \ + uint64_t iter; \ + uint16_t ret = 1; \ + \ + if (ws->swtag_req) { \ + ws->swtag_req = 0; \ + ssows_swtag_wait(ws); \ + } else { \ + ret = ssows_get_work(ws, ev, flags); \ + for (iter = 1; iter < timeout_ticks && (ret == 0); iter++) \ + ret = ssows_get_work(ws, ev, flags); \ + } \ + return ret; \ +} \ + \ +static uint16_t __rte_hot \ +ssows_deq_timeout_burst_ ##name(void *port, struct rte_event ev[], \ + uint16_t nb_events, uint64_t timeout_ticks) \ +{ \ + RTE_SET_USED(nb_events); \ + \ + return ssows_deq_timeout_ ##name(port, ev, timeout_ticks); \ } -uint16_t __rte_hot -ssows_deq_burst(void *port, struct rte_event ev[], uint16_t nb_events, - uint64_t timeout_ticks) -{ - RTE_SET_USED(nb_events); - - return ssows_deq(port, ev, timeout_ticks); -} - -uint16_t __rte_hot -ssows_deq_timeout_burst(void *port, struct rte_event ev[], uint16_t nb_events, - uint64_t timeout_ticks) -{ - RTE_SET_USED(nb_events); - - return ssows_deq_timeout(port, ev, timeout_ticks); -} - -__rte_always_inline uint16_t __rte_hot -ssows_deq_mseg(void *port, struct rte_event *ev, uint64_t timeout_ticks) -{ - struct ssows *ws = port; - - RTE_SET_USED(timeout_ticks); - - if (ws->swtag_req) { - ws->swtag_req = 0; - ssows_swtag_wait(ws); - return 1; - } else { - return ssows_get_work(ws, ev, OCCTX_RX_OFFLOAD_NONE | - OCCTX_RX_MULTI_SEG_F); - } -} - -__rte_always_inline uint16_t __rte_hot -ssows_deq_timeout_mseg(void *port, struct rte_event *ev, uint64_t timeout_ticks) -{ - struct ssows *ws = port; - uint64_t iter; - uint16_t ret = 1; - - if (ws->swtag_req) { - ws->swtag_req = 0; - ssows_swtag_wait(ws); - } else { - ret = ssows_get_work(ws, ev, OCCTX_RX_OFFLOAD_NONE | - OCCTX_RX_MULTI_SEG_F); - for (iter = 1; iter < timeout_ticks && (ret == 0); iter++) - ret = ssows_get_work(ws, ev, OCCTX_RX_OFFLOAD_NONE | - OCCTX_RX_MULTI_SEG_F); - } - return ret; -} - -uint16_t __rte_hot -ssows_deq_burst_mseg(void *port, struct rte_event ev[], uint16_t nb_events, - uint64_t timeout_ticks) -{ - RTE_SET_USED(nb_events); - - return ssows_deq_mseg(port, ev, timeout_ticks); -} - -uint16_t __rte_hot -ssows_deq_timeout_burst_mseg(void *port, struct rte_event ev[], - uint16_t nb_events, uint64_t timeout_ticks) -{ - RTE_SET_USED(nb_events); - - return ssows_deq_timeout_mseg(port, ev, timeout_ticks); -} +SSO_RX_ADPTR_ENQ_FASTPATH_FUNC +#undef R __rte_always_inline uint16_t __rte_hot ssows_enq(void *port, const struct rte_event *ev) @@ -321,7 +271,8 @@ ssows_reset(struct ssows *ws) static __rte_always_inline uint16_t __sso_event_tx_adapter_enqueue(void *port, struct rte_event ev[], - uint16_t nb_events, const uint16_t flag) + uint16_t nb_events, uint64_t *cmd, + const uint16_t flag) { uint16_t port_id; uint16_t queue_id; @@ -329,9 +280,7 @@ __sso_event_tx_adapter_enqueue(void *port, struct rte_event ev[], struct rte_eth_dev *ethdev; struct ssows *ws = port; struct octeontx_txq *txq; - uint64_t cmd[4]; - RTE_SET_USED(nb_events); switch (ev->sched_type) { case SSO_SYNC_ORDERED: ssows_swtag_norm(ws, ev->event, SSO_SYNC_ATOMIC); @@ -355,22 +304,92 @@ __sso_event_tx_adapter_enqueue(void *port, struct rte_event ev[], ethdev = &rte_eth_devices[port_id]; txq = ethdev->data->tx_queues[queue_id]; - return __octeontx_xmit_pkts(txq, &m, 1, cmd, flag); + return __octeontx_xmit_pkts(txq, &m, nb_events, cmd, flag); } -uint16_t -sso_event_tx_adapter_enqueue(void *port, struct rte_event ev[], - uint16_t nb_events) -{ - return __sso_event_tx_adapter_enqueue(port, ev, nb_events, - OCCTX_TX_OFFLOAD_NONE); +#define T(name, f3, f2, f1, f0, sz, flags) \ +static uint16_t __rte_noinline __rte_hot \ +sso_event_tx_adapter_enqueue_ ## name(void *port, struct rte_event ev[], \ + uint16_t nb_events) \ +{ \ + uint64_t cmd[sz]; \ + return __sso_event_tx_adapter_enqueue(port, ev, nb_events, cmd, \ + flags); \ } -uint16_t -sso_event_tx_adapter_enqueue_mseg(void *port, struct rte_event ev[], - uint16_t nb_events) +SSO_TX_ADPTR_ENQ_FASTPATH_FUNC +#undef T + +void +ssovf_fastpath_fns_set(struct rte_eventdev *dev) { - return __sso_event_tx_adapter_enqueue(port, ev, nb_events, - OCCTX_TX_OFFLOAD_NONE | - OCCTX_TX_MULTI_SEG_F); + struct ssovf_evdev *edev = ssovf_pmd_priv(dev); + + dev->enqueue = ssows_enq; + dev->enqueue_burst = ssows_enq_burst; + dev->enqueue_new_burst = ssows_enq_new_burst; + dev->enqueue_forward_burst = ssows_enq_fwd_burst; + + const event_tx_adapter_enqueue ssow_txa_enqueue[2][2][2][2] = { +#define T(name, f3, f2, f1, f0, sz, flags) \ + [f3][f2][f1][f0] = sso_event_tx_adapter_enqueue_ ##name, + +SSO_TX_ADPTR_ENQ_FASTPATH_FUNC +#undef T + }; + + dev->txa_enqueue = ssow_txa_enqueue + [!!(edev->tx_offload_flags & OCCTX_TX_OFFLOAD_MBUF_NOFF_F)] + [0] + [0] + [!!(edev->tx_offload_flags & OCCTX_TX_MULTI_SEG_F)]; + + dev->txa_enqueue_same_dest = dev->txa_enqueue; + + /* Assigning dequeue func pointers */ + const event_dequeue_t ssow_deq[2] = { +#define R(name, f0, flags) \ + [f0] = ssows_deq_ ##name, + +SSO_RX_ADPTR_ENQ_FASTPATH_FUNC +#undef R + }; + + dev->dequeue = ssow_deq + [!!(edev->rx_offload_flags & OCCTX_RX_MULTI_SEG_F)]; + + const event_dequeue_burst_t ssow_deq_burst[2] = { +#define R(name, f0, flags) \ + [f0] = ssows_deq_burst_ ##name, + +SSO_RX_ADPTR_ENQ_FASTPATH_FUNC +#undef R + }; + + dev->dequeue_burst = ssow_deq_burst + [!!(edev->rx_offload_flags & OCCTX_RX_MULTI_SEG_F)]; + + if (edev->is_timeout_deq) { + const event_dequeue_t ssow_deq_timeout[2] = { +#define R(name, f0, flags) \ + [f0] = ssows_deq_timeout_ ##name, + +SSO_RX_ADPTR_ENQ_FASTPATH_FUNC +#undef R + }; + + dev->dequeue = ssow_deq_timeout + [!!(edev->rx_offload_flags & OCCTX_RX_MULTI_SEG_F)]; + + const event_dequeue_burst_t ssow_deq_timeout_burst[2] = { +#define R(name, f0, flags) \ + [f0] = ssows_deq_timeout_burst_ ##name, + +SSO_RX_ADPTR_ENQ_FASTPATH_FUNC +#undef R + }; + + dev->dequeue_burst = ssow_deq_timeout_burst + [!!(edev->rx_offload_flags & OCCTX_RX_MULTI_SEG_F)]; + } } diff --git a/drivers/net/octeontx/octeontx_rxtx.h b/drivers/net/octeontx/octeontx_rxtx.h index 5e607f170..144ae055b 100644 --- a/drivers/net/octeontx/octeontx_rxtx.h +++ b/drivers/net/octeontx/octeontx_rxtx.h @@ -484,4 +484,11 @@ T(noff_ol3ol4csum_l3l4csum_mseg, 1, 1, 1, 1, 14, \ NOFF_F | OL3OL4CSUM_F | L3L4CSUM_F | \ MULT_F) +/* RX offload macros */ +#define MULT_RX_F OCCTX_RX_MULTI_SEG_F +/* [MULTI_SEG] */ +#define OCCTX_RX_FASTPATH_MODES \ +R(no_offload, 0, OCCTX_RX_OFFLOAD_NONE) \ +R(mseg, 1, MULT_RX_F) \ + #endif /* __OCTEONTX_RXTX_H__ */ From patchwork Tue Apr 28 12:40:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harman Kalra X-Patchwork-Id: 69461 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id DA7F7A00BE; Tue, 28 Apr 2020 14:41:51 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5CF5E1D5E4; Tue, 28 Apr 2020 14:41:38 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id A519E1D579 for ; Tue, 28 Apr 2020 14:41:36 +0200 (CEST) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 03SCf1q5029174 for ; Tue, 28 Apr 2020 05:41:36 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-type : mime-version; s=pfpt0818; bh=nsQOGQN2L2Y7KFlapKKpNEN3Y3GmxCZr6NGAvAlMyuM=; b=f+bmDhEDCcy+cmqsSCxYhH2DE28fRtOINSImYJoqUXnEkZQNUxDeXsPYc5RnIXwW7Ibv EamhkXfYVkvvHcwVv7/iwrWMSJrECLbSLJYl9oyLJxuiJqf+HlGhCxpUuVmNKOJI8/Bw 2cv/Vaf21MBj/PxvqzjnFyZF3H0p6P6ZdPY1Rw4sYH6Chh67tfvaHvmCCKPyajXXPBQ7 oLd3gSTHvj1uxoEqHbCDjOa0xs80vr+Hjnc8w1JP9MKJhQ8LfZZEbsC4bxlqSBoz5FqN 1ynYUOYHx2JrYdH6BeQLdKvrYFSI9oI5cZQsoCs+O8AcXU9TxYgzY9OeUuC1v5UPZLwo Ww== Received: from sc-exch04.marvell.com ([199.233.58.184]) by mx0b-0016f401.pphosted.com with ESMTP id 30mmqmksv4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Tue, 28 Apr 2020 05:41:36 -0700 Received: from SC-EXCH03.marvell.com (10.93.176.83) by SC-EXCH04.marvell.com (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 28 Apr 2020 05:41:33 -0700 Received: from NAM04-BN3-obe.outbound.protection.outlook.com (104.47.46.55) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1497.2 via Frontend Transport; Tue, 28 Apr 2020 05:41:33 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y/ycGFdoHCbHmjTX3H4ea7mSGnQaIQalLTQvVRDwt0fz26sXVMjkXLo4lTTrVviNYrwXsgTr8/OupPUWUkanbDmgyapdZPK0tI9YGsAqgRNP1JRUsYMuZ0kCqZG6o/QqZaPv2c7nFXOVHZ9zE7SXf/bKJK6KWXtClZfh0+U8D+mfJ0Ov0+SueqSMgjsh687VBdhHP0tRYmYUYRRmdJQ60yviI27xe6SF5OmtPZnrGEBzgm2MyNFaFv6yQ1mnsaYfuDMH6E0yWYWonOjEBCCbLgN7rd4LRYQBCHst918WiFVZRLCxm9+tigiJURr64UZbAnjwsIA6WeRXfY+XhZW7aw== 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=nsQOGQN2L2Y7KFlapKKpNEN3Y3GmxCZr6NGAvAlMyuM=; b=bX/UxVBPJDaXYcGG5JNLs3cJXXBV5ExsVLlXD+Ucq3EKtCw6RJBF5dok1gUSD6b1JhVQ5v+k1eacCV+4OwLFnJxM9AvCfeKduTE72gVhhBRF9HLvNdCoC053yd8H861OiGhtwWrbUpEBKKVXpj3xGnmq5Jq361c0JmwxykkdM2BjLIMlE/tZ8huWLUvyJq1B704JsgTSYb0jYZOgw7lu/3SI4QPUVZcfvsuY/8Zh1AMTebwuDOuefCOAgGJcwtJ1bkTPNkWidKlNwxTz28fOahr6LZ2Tnqq6lJRUFRfknzQqHKQ3V839uiwTdFZKQfVzT5uNB5ec6HAjBc4jlxMN7w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=marvell.com; dmarc=pass action=none header.from=marvell.com; dkim=pass header.d=marvell.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.onmicrosoft.com; s=selector1-marvell-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=nsQOGQN2L2Y7KFlapKKpNEN3Y3GmxCZr6NGAvAlMyuM=; b=ZSxKeXbuLDFgXFUB4+BHDE+6M0LmYg49bFaGF9+YHRfjxPNeTOXQmPhrvktvfcyK0iiVHKYvH0PbWArsbCmFPpdEspgWJNVqWva0LKPeZCJtXt1bMjBxiorhQK/kW9l9B3Rcjsesf+xcZk4vsfYh+ELt34rd4NlQKASqvJGtEXE= Received: from MN2PR18MB2848.namprd18.prod.outlook.com (2603:10b6:208:38::19) by MN2PR18MB3328.namprd18.prod.outlook.com (2603:10b6:208:165::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Tue, 28 Apr 2020 12:41:31 +0000 Received: from MN2PR18MB2848.namprd18.prod.outlook.com ([fe80::a8b1:45c4:b84:9c02]) by MN2PR18MB2848.namprd18.prod.outlook.com ([fe80::a8b1:45c4:b84:9c02%7]) with mapi id 15.20.2937.026; Tue, 28 Apr 2020 12:41:31 +0000 From: Harman Kalra To: CC: , Vamsi Attunuru Date: Tue, 28 Apr 2020 18:10:11 +0530 Message-ID: <1588077612-15905-4-git-send-email-hkalra@marvell.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1588077612-15905-1-git-send-email-hkalra@marvell.com> References: <1588077612-15905-1-git-send-email-hkalra@marvell.com> X-ClientProxiedBy: BMXPR01CA0031.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:c::17) To MN2PR18MB2848.namprd18.prod.outlook.com (2603:10b6:208:38::19) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from hkarlara-OptiPlex-3046.marvell.com (115.113.156.2) by BMXPR01CA0031.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2937.13 via Frontend Transport; Tue, 28 Apr 2020 12:41:30 +0000 X-Mailer: git-send-email 2.7.4 X-Originating-IP: [115.113.156.2] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 13f79ff2-87f8-4577-e2d3-08d7eb717a59 X-MS-TrafficTypeDiagnostic: MN2PR18MB3328: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:220; X-Forefront-PRVS: 0387D64A71 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MN2PR18MB2848.namprd18.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(346002)(396003)(366004)(136003)(376002)(39860400002)(478600001)(6666004)(81156014)(16526019)(2616005)(8676002)(8936002)(956004)(6636002)(26005)(86362001)(316002)(7696005)(52116002)(4326008)(66556008)(34206002)(6486002)(66946007)(2906002)(55236004)(186003)(37006003)(66476007)(5660300002)(107886003)(36756003); DIR:OUT; SFP:1101; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3iE1EK4Tk0u3XLtX2ppInb8ajkbvCYbnowfdxk1hn7woebCW+R2i2AxkS9lKbfXYHvxdeD3XVJwTlO8lcRmXfheTHfdWB7LXNxvgN2TvYBpReF+OgOCU+FaEA1LM2aEDXfA30axHzPjWLLQmaHaYOXHALRcCLJ6MjqloM9yJZwojxnHsQdRqVfbUdz0kWSh7OlnzTc7hlNKMHz893uzuBzaqC8tBzGcQYM6Ue5j3E7zrgE94Mkc1a44CTtFZ1VZLfiQp6wdUTMi8OyT3b2/ZCipBXZClVecbJIr8UKaH1AGXbt5sSxdfolkKIn87UtfTF2yoNGZ9MI68LtCqzOcs2DJOQ+E4+Sp+t9W1U+Fx6pyFSnpKnAcaS670yuRSNM5xfZr5mahnfOBpJVebLqs/QjzK0oshbFanZ67A/iIEIHReJGqYO2VekZk+R9RfLzWW X-MS-Exchange-AntiSpam-MessageData: +AD/IwHdTjYYb851XQ+N4wgbHKyoxvrzuQM9lbx4pLGVqnGTjf8yu7Sm0sIDhF1P2ibzn6to+AywW7/hrSjMw4+6MAm9JR0u0cTziDVkVpVJ/UpRjnhRY/px4s/0Zow0Bp84EyLqQwSeEnHf+q2NQCM5xx+ISdpEFFhHL+zTOGEuuat86IeS7YAlA00B9gdNOI/6ijlPUONtd1qfnOgSqQ4y2q04JjAGSWHIrckLrDKU48cBsv/iNRUhin4d+PhlaQudbtaZbRdPYoBtJHo4eCmoCRFTsUKFEEgra4KcgeYOWl8k/09EJKEvNmA9KV9Tudj1ZtpkXNUlg1D3A2X3IGTZpFWtc7dxM4DccHkUi7y2VQRvTekIIWLTfaE0uyoOO9rS85BZcaQjbW/iAmGuh8ajGDxbPOOD06Sy6JsS+/X6yvutKNiQ9lACv+xcDzayyL5Re7NScu/Lk1EItGWOfpTvDX4EpLFqjRkeWvIzQeE5GM31REW7cQyi0os2isZS22zUYOFzIdbRuXyJa1nK1BPY9UeASh9taBi97Gcuhz2xA2ryG/3+lr26ejUg17r/n/PzcEE8e4/qrYansGCaRd8Z8DlO/2E11BbUEJrQEHrlkMkXVF5kFvVIedCnn3O8ziDeUVZng0neFiOJiYTM7qawCl93/xLRavCNMRNQRtAzujcssdd/EHLJ8Y0FbpLVu+1s3ASZvInDWWAX4tcW/qdR7QsCMGaAc0SIi7j7KG0EV4NR/g7zDw5OxiHJm1azdZp7p8SvTNILCPIFeHiIZk1XCgYdH21UHwmRLUwIavw= X-MS-Exchange-CrossTenant-Network-Message-Id: 13f79ff2-87f8-4577-e2d3-08d7eb717a59 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2020 12:41:31.4796 (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: I7M7YR74wCX1w3aJ2Cz4mXscLDB8fUYmMfSGwNKzAMbjAK4t9WHDCGtxIbFQuLPLbOPeOU9gZmqds+UzfQSWnw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR18MB3328 X-OriginatorOrg: marvell.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.676 definitions=2020-04-28_09:2020-04-28, 2020-04-28 signatures=0 Subject: [dpdk-dev] [PATCH v2 3/4] event/octeontx: add VLAN filter offload support 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" From: Vamsi Attunuru Adding rx burst function pointer hooks for vlan filter offload in event PMD. Signed-off-by: Vamsi Attunuru --- drivers/event/octeontx/ssovf_worker.c | 38 +++++++++++++++------------ drivers/event/octeontx/ssovf_worker.h | 9 +++++++ drivers/net/octeontx/octeontx_rxtx.h | 11 +++++--- 3 files changed, 37 insertions(+), 21 deletions(-) diff --git a/drivers/event/octeontx/ssovf_worker.c b/drivers/event/octeontx/ssovf_worker.c index b5873c3fa..a276269d7 100644 --- a/drivers/event/octeontx/ssovf_worker.c +++ b/drivers/event/octeontx/ssovf_worker.c @@ -91,7 +91,7 @@ ssows_release_event(struct ssows *ws) ssows_swtag_untag(ws); } -#define R(name, f0, flags) \ +#define R(name, f1, f0, flags) \ static uint16_t __rte_noinline __rte_hot \ ssows_deq_ ##name(void *port, struct rte_event *ev, uint64_t timeout_ticks) \ { \ @@ -347,49 +347,53 @@ SSO_TX_ADPTR_ENQ_FASTPATH_FUNC dev->txa_enqueue_same_dest = dev->txa_enqueue; /* Assigning dequeue func pointers */ - const event_dequeue_t ssow_deq[2] = { -#define R(name, f0, flags) \ - [f0] = ssows_deq_ ##name, + const event_dequeue_t ssow_deq[2][2] = { +#define R(name, f1, f0, flags) \ + [f1][f0] = ssows_deq_ ##name, SSO_RX_ADPTR_ENQ_FASTPATH_FUNC #undef R }; dev->dequeue = ssow_deq + [!!(edev->rx_offload_flags & OCCTX_RX_VLAN_FLTR_F)] [!!(edev->rx_offload_flags & OCCTX_RX_MULTI_SEG_F)]; - const event_dequeue_burst_t ssow_deq_burst[2] = { -#define R(name, f0, flags) \ - [f0] = ssows_deq_burst_ ##name, + const event_dequeue_burst_t ssow_deq_burst[2][2] = { +#define R(name, f1, f0, flags) \ + [f1][f0] = ssows_deq_burst_ ##name, SSO_RX_ADPTR_ENQ_FASTPATH_FUNC #undef R }; dev->dequeue_burst = ssow_deq_burst + [!!(edev->rx_offload_flags & OCCTX_RX_VLAN_FLTR_F)] [!!(edev->rx_offload_flags & OCCTX_RX_MULTI_SEG_F)]; if (edev->is_timeout_deq) { - const event_dequeue_t ssow_deq_timeout[2] = { -#define R(name, f0, flags) \ - [f0] = ssows_deq_timeout_ ##name, + const event_dequeue_t ssow_deq_timeout[2][2] = { +#define R(name, f1, f0, flags) \ + [f1][f0] = ssows_deq_timeout_ ##name, SSO_RX_ADPTR_ENQ_FASTPATH_FUNC #undef R }; - dev->dequeue = ssow_deq_timeout - [!!(edev->rx_offload_flags & OCCTX_RX_MULTI_SEG_F)]; + dev->dequeue = ssow_deq_timeout + [!!(edev->rx_offload_flags & OCCTX_RX_VLAN_FLTR_F)] + [!!(edev->rx_offload_flags & OCCTX_RX_MULTI_SEG_F)]; - const event_dequeue_burst_t ssow_deq_timeout_burst[2] = { -#define R(name, f0, flags) \ - [f0] = ssows_deq_timeout_burst_ ##name, + const event_dequeue_burst_t ssow_deq_timeout_burst[2][2] = { +#define R(name, f1, f0, flags) \ + [f1][f0] = ssows_deq_timeout_burst_ ##name, SSO_RX_ADPTR_ENQ_FASTPATH_FUNC #undef R }; - dev->dequeue_burst = ssow_deq_timeout_burst - [!!(edev->rx_offload_flags & OCCTX_RX_MULTI_SEG_F)]; + dev->dequeue_burst = ssow_deq_timeout_burst + [!!(edev->rx_offload_flags & OCCTX_RX_VLAN_FLTR_F)] + [!!(edev->rx_offload_flags & OCCTX_RX_MULTI_SEG_F)]; } } diff --git a/drivers/event/octeontx/ssovf_worker.h b/drivers/event/octeontx/ssovf_worker.h index 0eacec69a..b2bcc27c3 100644 --- a/drivers/event/octeontx/ssovf_worker.h +++ b/drivers/event/octeontx/ssovf_worker.h @@ -80,6 +80,15 @@ ssovf_octeontx_wqe_to_pkt(uint64_t work, uint16_t port_info, mbuf->data_len = mbuf->pkt_len; } + if (!!(flag & OCCTX_RX_VLAN_FLTR_F)) { + if (likely(wqe->s.w2.vv)) { + mbuf->ol_flags |= PKT_RX_VLAN; + mbuf->vlan_tci = + ntohs(*((uint16_t *)((char *)mbuf->buf_addr + + mbuf->data_off + wqe->s.w4.vlptr + 2))); + } + } + mbuf->port = rte_octeontx_pchan_map[port_info >> 4][port_info & 0xF]; rte_mbuf_refcnt_set(mbuf, 1); diff --git a/drivers/net/octeontx/octeontx_rxtx.h b/drivers/net/octeontx/octeontx_rxtx.h index 144ae055b..3f2147a02 100644 --- a/drivers/net/octeontx/octeontx_rxtx.h +++ b/drivers/net/octeontx/octeontx_rxtx.h @@ -485,10 +485,13 @@ T(noff_ol3ol4csum_l3l4csum_mseg, 1, 1, 1, 1, 14, \ MULT_F) /* RX offload macros */ +#define VLAN_FLTR_F OCCTX_RX_VLAN_FLTR_F #define MULT_RX_F OCCTX_RX_MULTI_SEG_F -/* [MULTI_SEG] */ -#define OCCTX_RX_FASTPATH_MODES \ -R(no_offload, 0, OCCTX_RX_OFFLOAD_NONE) \ -R(mseg, 1, MULT_RX_F) \ +/* [VLAN_FLTR][MULTI_SEG] */ +#define OCCTX_RX_FASTPATH_MODES \ +R(no_offload, 0, 0, OCCTX_RX_OFFLOAD_NONE) \ +R(mseg, 0, 1, MULT_RX_F) \ +R(vlan, 1, 0, VLAN_FLTR_F) \ +R(vlan_mseg, 1, 1, VLAN_FLTR_F | MULT_RX_F) #endif /* __OCTEONTX_RXTX_H__ */ From patchwork Tue Apr 28 12:40:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harman Kalra X-Patchwork-Id: 69462 X-Patchwork-Delegate: jerinj@marvell.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id F0C77A00BE; Tue, 28 Apr 2020 14:42:06 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5A9331D5F6; Tue, 28 Apr 2020 14:41:41 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id B03341D5E7 for ; Tue, 28 Apr 2020 14:41:38 +0200 (CEST) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 03SCf1q6029174 for ; Tue, 28 Apr 2020 05:41:38 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : content-type : mime-version; s=pfpt0818; bh=X6V5NFEPXhLV58Vnpr50+nGF1MzNw/QayT59yYzpZ5M=; b=wzIlZRSn1VAuCsGsKIu6yKqB37T0tTDjzGcX/LTGGsn2pckyb4quvM82QhDatjsPpy8k RJAOoDTYP7Ky/eEOMYw562Q1o5us3IaF3fkhO8hASQwSHkyH2rVJa9nAdP699KcFML2y S7lMZ0k6VgspCOKm+8ePiI/8HsuGC4NAXZmM6l5ydqJNRsHpmAhjzAKBn1Q3aqlw1VIJ vtWJpMTkJRx31WmfI+P6oW95oSo2A1PZW1oxal428lUtjXcbU+lBihJQdesEHv0nSrBg Qz9ag5f4ZLEZef9Ec749ZErTPfDjn2PXq3/UnfqAkDmz2zRIN46IId+QmFliTcuZtooU PA== Received: from sc-exch02.marvell.com ([199.233.58.182]) by mx0b-0016f401.pphosted.com with ESMTP id 30mmqmksva-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Tue, 28 Apr 2020 05:41:37 -0700 Received: from SC-EXCH01.marvell.com (10.93.176.81) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 28 Apr 2020 05:41:35 -0700 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.169) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server (TLS) id 15.0.1497.2 via Frontend Transport; Tue, 28 Apr 2020 05:41:35 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=YYnLUhWjPA3b7/qJRroPq8mmMz7GtxQBYpjIcqS9fybDNMSeo53IGW/03AQtsGxqG9Q6wgCAX4vrzFDSRxXGQ7Q6nKA1fMoDbrzIsuMqNLfDEe1iFwdjBZJWEbq+odQ7EAHXfAxvJ37d5cpCsavSEuXQgBx0RJTU7Bm8vCUE3JovdyB7uDAaer0Dv948/o/h3N0iKyZUmZm5t6mE1LC3f/M0UPAg822/qmep2PPiduTerfiwMOOxQ7WLiCkOaWG4aJ3MoxJ8TGE1LIzB2ckxq34ulDg9DDv2VDJjOQMV8l5xWePltrlqoZnevTxxRneepgudM0Eva+8eE6qtcBZkVw== 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=X6V5NFEPXhLV58Vnpr50+nGF1MzNw/QayT59yYzpZ5M=; b=WGzDNFRVTLgXCWyD2g7O/IAmbrKDladXCI6WmZGdeUXtgknrab01Qbqdg1/MuA5tk0ZLCLPnLMm03JgMtf8Ji1daFJ+PG8tIRDTAn49wWBfOsScdJJ/LlXMQ58glyUO9tFSiTSOGhd5Fh7bZDcnQQtNIHzg0DE0NQr6bksfdcBADWz+ez0VkcfatWSicaWTKACYxX3SCHSEFlzi8ZqSTirSScECSqXDXTw2BNZRJxJflxY7XuJC5lMY817ygcdlUSQ3R7rws7y8Sj4ySFnjtqwKBSwDogDF89e5m1ZMrj5thtiOpF+ccCoFC7Z0ZsFUtuRqYEW8XKwRYqDBjssEPvw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=marvell.com; dmarc=pass action=none header.from=marvell.com; dkim=pass header.d=marvell.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.onmicrosoft.com; s=selector1-marvell-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=X6V5NFEPXhLV58Vnpr50+nGF1MzNw/QayT59yYzpZ5M=; b=tRmbuCt6A++YeAsQ3EaUOxh/bHldLr/3F7WfBPY/VImMU5Un4HQXZuXtt2HpYAKMl9a5JX9IvagRKCH0FLWIdKiTlvQkWqIbYHKD9kEGwiazS6zWXtPHZInc/WlDTW5ORz1tukvvYhnlzt2tdnsIfc4R8YGpePXp9ZAPCLhGKTc= Received: from MN2PR18MB2848.namprd18.prod.outlook.com (2603:10b6:208:38::19) by MN2PR18MB2494.namprd18.prod.outlook.com (2603:10b6:208:102::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.13; Tue, 28 Apr 2020 12:41:34 +0000 Received: from MN2PR18MB2848.namprd18.prod.outlook.com ([fe80::a8b1:45c4:b84:9c02]) by MN2PR18MB2848.namprd18.prod.outlook.com ([fe80::a8b1:45c4:b84:9c02%7]) with mapi id 15.20.2937.026; Tue, 28 Apr 2020 12:41:34 +0000 From: Harman Kalra To: CC: , Harman Kalra Date: Tue, 28 Apr 2020 18:10:12 +0530 Message-ID: <1588077612-15905-5-git-send-email-hkalra@marvell.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1588077612-15905-1-git-send-email-hkalra@marvell.com> References: <1588077612-15905-1-git-send-email-hkalra@marvell.com> X-ClientProxiedBy: BMXPR01CA0031.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:c::17) To MN2PR18MB2848.namprd18.prod.outlook.com (2603:10b6:208:38::19) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from hkarlara-OptiPlex-3046.marvell.com (115.113.156.2) by BMXPR01CA0031.INDPRD01.PROD.OUTLOOK.COM (2603:1096:b00:c::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256) id 15.20.2937.13 via Frontend Transport; Tue, 28 Apr 2020 12:41:32 +0000 X-Mailer: git-send-email 2.7.4 X-Originating-IP: [115.113.156.2] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 455eb7d6-89ea-4078-a3cb-08d7eb717bb8 X-MS-TrafficTypeDiagnostic: MN2PR18MB2494: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:826; X-Forefront-PRVS: 0387D64A71 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:MN2PR18MB2848.namprd18.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(346002)(136003)(376002)(396003)(366004)(39860400002)(26005)(66946007)(956004)(66556008)(16526019)(30864003)(5660300002)(186003)(55236004)(6666004)(66476007)(2906002)(37006003)(7696005)(2616005)(52116002)(36756003)(8676002)(34206002)(6486002)(316002)(4326008)(107886003)(6636002)(86362001)(8936002)(81156014)(478600001); DIR:OUT; SFP:1101; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Xw3+tixQX8rJtTDXl3nicNfSYdkkUWPut1I8QVSZCDwR0Zq/K3rn69uDlTvo/UmXxADBu4QvgMYipqeTLECv4JazbvSkOt9cVMYdxw+9h5JRQ+q6KYC/fxWKY8IVDBuqrpLDuVStiflf8AVaxutDj73qs5X9J+hAmBkY+xU3qMJUmUuyWd2AHNu5jWa8I75+CPJgmsj6f/N7LsOIOmz2+MqtGt934EXIughIGl/fkYzIhBDo++0rIr6IFMztj9mcjrt64C+P4dFi1R8H8VOh6QJvvKIxNYUVOK5ex8eLetcRA6kkaqsTEdG0fst9CKb5ALHx+0Keh52OMT5h2SG+EnGTtr3wTaVK9QbHhPeavK5lVLu9z5p3sSuJMjpur8Mp6iM0A6cokL1lfDwKxaKeB/DUsoQpIz2Gtf1lW0H7yAR2EXZAbEhuw9kMV216KhUZ X-MS-Exchange-AntiSpam-MessageData: +OjhzSDC9DF/6o8g1DQHN7LF0lmYarCbjrS4SRyzjKXaglw9lGm94dYpFYyVAoUsBjUJEppc8g+PGIHBbfvL+a9wfcPVQtlApuTlzMLYhVgi1e9awdNiXG4y1XTJySpSHcH/aqvs9yJbHv2RN4RuPkkLm1a/aR7Sg3tWj2DnmR8K1F+S/aSrqVVtyfBDQgevflgUREQ+y2ZFEEq/PUzgeme5VYiUkup8iNHj3bVNGRD+4/jY5ezuHEjraYi8B3GcIHABOGOZtFucD3I82eRV/AjT2SV/FZIsdPx4yUMp8o/C9wskLhvzW5z0F0GXIv8Cg0qzL35i+PvPW94x5qXLifD1LWiprkyp3YfTGPl1mT5OaBTlZ5dRXXeepspbSmQX5q/MdQ9TUAYhSob2QPu59FWvr0U89fKo/jGXJqt0+57pH3rFY+oFAf643UHaRsDInmTbnHlp4lJlSYXNU2C+uGjzPzDe21nJpElUJKsOezzgJmtchvqKp04FHoPXIdZOph6ZLrZFck/YzD6xG/HCnTYb+ntcI6Mk+7IWD9xZ0ZuZIpRRF2X7RuFKqN4RAPmcZWGUlC+7rPb3QwognNvVjBqVZAN83P4B11J/hO8Dxmio5gwx1H7050WDwhAS0qUhLXRsMd7/KyDtD8p6MddyLALGsOEAbO+zzRLlpEBhtGYAso7inVdaWrljSrZ44DG8+tiTsHmOeKfs7P5cYM7BRtTgotCybCtP+XqnQm4BsWirX0WV0XOc3FPvBMAVp9LkCUXwWw5fioTfpYHR3w1o1hFs28ZveHQ2g8eMwk+YLD4= X-MS-Exchange-CrossTenant-Network-Message-Id: 455eb7d6-89ea-4078-a3cb-08d7eb717bb8 X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Apr 2020 12:41:34.1221 (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: rtm9MSEZjTS8xwo1DeyZzIxOtsp07XGyTiPrgK7QU/gXJCVr/z2NbDDx+Gol6XUW6k1st9FETzJNqZR6bTb/Kg== X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR18MB2494 X-OriginatorOrg: marvell.com X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.676 definitions=2020-04-28_09:2020-04-28, 2020-04-28 signatures=0 Subject: [dpdk-dev] [PATCH v2 4/4] event/octeontx: support Rx Tx checksum offload 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" Adding support for rx checksum offload. In case of wrong checksum received (inner/outer l3/l4) it reports the corresponding layer which has bad checksum. It also adds rx burst function pointer hook for rx checksum offload to event PMD. Signed-off-by: Harman Kalra --- drivers/event/octeontx/ssovf_evdev.c | 1 + drivers/event/octeontx/ssovf_evdev.h | 2 + drivers/event/octeontx/ssovf_worker.c | 127 ++++++++++++++++++++++---- drivers/event/octeontx/ssovf_worker.h | 44 ++++++++- drivers/net/octeontx/octeontx_rxtx.h | 17 +++- 5 files changed, 168 insertions(+), 23 deletions(-) diff --git a/drivers/event/octeontx/ssovf_evdev.c b/drivers/event/octeontx/ssovf_evdev.c index 5d074bcbc..1b1a5d939 100644 --- a/drivers/event/octeontx/ssovf_evdev.c +++ b/drivers/event/octeontx/ssovf_evdev.c @@ -272,6 +272,7 @@ ssovf_port_setup(struct rte_eventdev *dev, uint8_t port_id, reg_off |= 1 << 16; /* Wait */ ws->getwork = ws->base + reg_off; ws->port = port_id; + ws->lookup_mem = octeontx_fastpath_lookup_mem_get(); for (q = 0; q < edev->nb_event_queues; q++) { ws->grps[q] = ssovf_bar(OCTEONTX_SSO_GROUP, q, 2); diff --git a/drivers/event/octeontx/ssovf_evdev.h b/drivers/event/octeontx/ssovf_evdev.h index 1f5066c9a..aa5acf246 100644 --- a/drivers/event/octeontx/ssovf_evdev.h +++ b/drivers/event/octeontx/ssovf_evdev.h @@ -157,6 +157,7 @@ struct ssows { uint8_t *getwork; uint8_t *grps[SSO_MAX_VHGRP]; uint8_t port; + void *lookup_mem; } __rte_cache_aligned; static inline struct ssovf_evdev * @@ -182,5 +183,6 @@ int ssovf_info(struct ssovf_info *info); void *ssovf_bar(enum ssovf_type, uint8_t id, uint8_t bar); int test_eventdev_octeontx(void); void ssovf_fastpath_fns_set(struct rte_eventdev *dev); +void *octeontx_fastpath_lookup_mem_get(void); #endif /* __SSOVF_EVDEV_H__ */ diff --git a/drivers/event/octeontx/ssovf_worker.c b/drivers/event/octeontx/ssovf_worker.c index a276269d7..d2d5eea8f 100644 --- a/drivers/event/octeontx/ssovf_worker.c +++ b/drivers/event/octeontx/ssovf_worker.c @@ -91,7 +91,7 @@ ssows_release_event(struct ssows *ws) ssows_swtag_untag(ws); } -#define R(name, f1, f0, flags) \ +#define R(name, f2, f1, f0, flags) \ static uint16_t __rte_noinline __rte_hot \ ssows_deq_ ##name(void *port, struct rte_event *ev, uint64_t timeout_ticks) \ { \ @@ -238,7 +238,8 @@ ssows_flush_events(struct ssows *ws, uint8_t queue_id, ev.mbuf = ssovf_octeontx_wqe_to_pkt(get_work1, (ev.event >> 20) & 0x7F, OCCTX_RX_OFFLOAD_NONE | - OCCTX_RX_MULTI_SEG_F); + OCCTX_RX_MULTI_SEG_F, + ws->lookup_mem); else ev.u64 = get_work1; @@ -340,16 +341,16 @@ SSO_TX_ADPTR_ENQ_FASTPATH_FUNC dev->txa_enqueue = ssow_txa_enqueue [!!(edev->tx_offload_flags & OCCTX_TX_OFFLOAD_MBUF_NOFF_F)] - [0] - [0] + [!!(edev->tx_offload_flags & OCCTX_TX_OFFLOAD_OL3_OL4_CSUM_F)] + [!!(edev->tx_offload_flags & OCCTX_TX_OFFLOAD_L3_L4_CSUM_F)] [!!(edev->tx_offload_flags & OCCTX_TX_MULTI_SEG_F)]; dev->txa_enqueue_same_dest = dev->txa_enqueue; /* Assigning dequeue func pointers */ - const event_dequeue_t ssow_deq[2][2] = { -#define R(name, f1, f0, flags) \ - [f1][f0] = ssows_deq_ ##name, + const event_dequeue_t ssow_deq[2][2][2] = { +#define R(name, f2, f1, f0, flags) \ + [f2][f1][f0] = ssows_deq_ ##name, SSO_RX_ADPTR_ENQ_FASTPATH_FUNC #undef R @@ -357,11 +358,12 @@ SSO_RX_ADPTR_ENQ_FASTPATH_FUNC dev->dequeue = ssow_deq [!!(edev->rx_offload_flags & OCCTX_RX_VLAN_FLTR_F)] + [!!(edev->rx_offload_flags & OCCTX_RX_OFFLOAD_CSUM_F)] [!!(edev->rx_offload_flags & OCCTX_RX_MULTI_SEG_F)]; - const event_dequeue_burst_t ssow_deq_burst[2][2] = { -#define R(name, f1, f0, flags) \ - [f1][f0] = ssows_deq_burst_ ##name, + const event_dequeue_burst_t ssow_deq_burst[2][2][2] = { +#define R(name, f2, f1, f0, flags) \ + [f2][f1][f0] = ssows_deq_burst_ ##name, SSO_RX_ADPTR_ENQ_FASTPATH_FUNC #undef R @@ -369,12 +371,13 @@ SSO_RX_ADPTR_ENQ_FASTPATH_FUNC dev->dequeue_burst = ssow_deq_burst [!!(edev->rx_offload_flags & OCCTX_RX_VLAN_FLTR_F)] + [!!(edev->rx_offload_flags & OCCTX_RX_OFFLOAD_CSUM_F)] [!!(edev->rx_offload_flags & OCCTX_RX_MULTI_SEG_F)]; if (edev->is_timeout_deq) { - const event_dequeue_t ssow_deq_timeout[2][2] = { -#define R(name, f1, f0, flags) \ - [f1][f0] = ssows_deq_timeout_ ##name, + const event_dequeue_t ssow_deq_timeout[2][2][2] = { +#define R(name, f2, f1, f0, flags) \ + [f2][f1][f0] = ssows_deq_timeout_ ##name, SSO_RX_ADPTR_ENQ_FASTPATH_FUNC #undef R @@ -382,11 +385,12 @@ SSO_RX_ADPTR_ENQ_FASTPATH_FUNC dev->dequeue = ssow_deq_timeout [!!(edev->rx_offload_flags & OCCTX_RX_VLAN_FLTR_F)] + [!!(edev->rx_offload_flags & OCCTX_RX_OFFLOAD_CSUM_F)] [!!(edev->rx_offload_flags & OCCTX_RX_MULTI_SEG_F)]; - const event_dequeue_burst_t ssow_deq_timeout_burst[2][2] = { -#define R(name, f1, f0, flags) \ - [f1][f0] = ssows_deq_timeout_burst_ ##name, + const event_dequeue_burst_t ssow_deq_timeout_burst[2][2][2] = { +#define R(name, f2, f1, f0, flags) \ + [f2][f1][f0] = ssows_deq_timeout_burst_ ##name, SSO_RX_ADPTR_ENQ_FASTPATH_FUNC #undef R @@ -394,6 +398,97 @@ SSO_RX_ADPTR_ENQ_FASTPATH_FUNC dev->dequeue_burst = ssow_deq_timeout_burst [!!(edev->rx_offload_flags & OCCTX_RX_VLAN_FLTR_F)] + [!!(edev->rx_offload_flags & OCCTX_RX_OFFLOAD_CSUM_F)] [!!(edev->rx_offload_flags & OCCTX_RX_MULTI_SEG_F)]; } } + +static void +octeontx_create_rx_ol_flags_array(void *mem) +{ + uint16_t idx, errcode, errlev; + uint32_t val, *ol_flags; + + /* Skip ptype array memory */ + ol_flags = (uint32_t *)mem; + + for (idx = 0; idx < BIT(ERRCODE_ERRLEN_WIDTH); idx++) { + errcode = idx & 0xff; + errlev = (idx & 0x700) >> 8; + + val = PKT_RX_IP_CKSUM_UNKNOWN; + val |= PKT_RX_L4_CKSUM_UNKNOWN; + val |= PKT_RX_OUTER_L4_CKSUM_UNKNOWN; + + switch (errlev) { + case OCCTX_ERRLEV_RE: + if (errcode) { + val |= PKT_RX_IP_CKSUM_BAD; + val |= PKT_RX_L4_CKSUM_BAD; + } else { + val |= PKT_RX_IP_CKSUM_GOOD; + val |= PKT_RX_L4_CKSUM_GOOD; + } + break; + case OCCTX_ERRLEV_LC: + if (errcode == OCCTX_EC_IP4_CSUM) { + val |= PKT_RX_IP_CKSUM_BAD; + val |= PKT_RX_EIP_CKSUM_BAD; + } else { + val |= PKT_RX_IP_CKSUM_GOOD; + } + break; + case OCCTX_ERRLEV_LD: + /* Check if parsed packet is neither IPv4 or IPV6 */ + if (errcode == OCCTX_EC_IP4_NOT) + break; + val |= PKT_RX_IP_CKSUM_GOOD; + if (errcode == OCCTX_EC_L4_CSUM) + val |= PKT_RX_OUTER_L4_CKSUM_BAD; + else + val |= PKT_RX_L4_CKSUM_GOOD; + break; + case OCCTX_ERRLEV_LE: + if (errcode == OCCTX_EC_IP4_CSUM) + val |= PKT_RX_IP_CKSUM_BAD; + else + val |= PKT_RX_IP_CKSUM_GOOD; + break; + case OCCTX_ERRLEV_LF: + /* Check if parsed packet is neither IPv4 or IPV6 */ + if (errcode == OCCTX_EC_IP4_NOT) + break; + val |= PKT_RX_IP_CKSUM_GOOD; + if (errcode == OCCTX_EC_L4_CSUM) + val |= PKT_RX_L4_CKSUM_BAD; + else + val |= PKT_RX_L4_CKSUM_GOOD; + break; + } + + ol_flags[idx] = val; + } +} + +void * +octeontx_fastpath_lookup_mem_get(void) +{ + const char name[] = OCCTX_FASTPATH_LOOKUP_MEM; + const struct rte_memzone *mz; + void *mem; + + mz = rte_memzone_lookup(name); + if (mz != NULL) + return mz->addr; + + /* Request for the first time */ + mz = rte_memzone_reserve_aligned(name, LOOKUP_ARRAY_SZ, + SOCKET_ID_ANY, 0, OCCTX_ALIGN); + if (mz != NULL) { + mem = mz->addr; + /* Form the rx ol_flags based on errcode */ + octeontx_create_rx_ol_flags_array(mem); + return mem; + } + return NULL; +} diff --git a/drivers/event/octeontx/ssovf_worker.h b/drivers/event/octeontx/ssovf_worker.h index b2bcc27c3..99a0726c2 100644 --- a/drivers/event/octeontx/ssovf_worker.h +++ b/drivers/event/octeontx/ssovf_worker.h @@ -10,6 +10,34 @@ #include "ssovf_evdev.h" #include "octeontx_rxtx.h" +/* Alignment */ +#define OCCTX_ALIGN 128 + +/* Fastpath lookup */ +#define OCCTX_FASTPATH_LOOKUP_MEM "octeontx_fastpath_lookup_mem" + +/* WQE's ERRCODE + ERRLEV (11 bits) */ +#define ERRCODE_ERRLEN_WIDTH 11 +#define ERR_ARRAY_SZ ((BIT(ERRCODE_ERRLEN_WIDTH)) *\ + sizeof(uint32_t)) + +#define LOOKUP_ARRAY_SZ (ERR_ARRAY_SZ) + +#define OCCTX_EC_IP4_NOT 0x41 +#define OCCTX_EC_IP4_CSUM 0x42 +#define OCCTX_EC_L4_CSUM 0x62 + +enum OCCTX_ERRLEV_E { + OCCTX_ERRLEV_RE = 0, + OCCTX_ERRLEV_LA = 1, + OCCTX_ERRLEV_LB = 2, + OCCTX_ERRLEV_LC = 3, + OCCTX_ERRLEV_LD = 4, + OCCTX_ERRLEV_LE = 5, + OCCTX_ERRLEV_LF = 6, + OCCTX_ERRLEV_LG = 7, +}; + enum { SSO_SYNC_ORDERED, SSO_SYNC_ATOMIC, @@ -19,6 +47,14 @@ enum { /* SSO Operations */ +static __rte_always_inline uint32_t +ssovf_octeontx_rx_olflags_get(const void * const lookup_mem, const uint64_t in) +{ + const uint32_t * const ol_flags = (const uint32_t *)lookup_mem; + + return ol_flags[(in & 0x7ff)]; +} + static __rte_always_inline void ssovf_octeontx_wqe_xtract_mseg(octtx_wqe_t *wqe, struct rte_mbuf *mbuf) @@ -57,7 +93,7 @@ ssovf_octeontx_wqe_xtract_mseg(octtx_wqe_t *wqe, static __rte_always_inline struct rte_mbuf * ssovf_octeontx_wqe_to_pkt(uint64_t work, uint16_t port_info, - const uint16_t flag) + const uint16_t flag, const void *lookup_mem) { struct rte_mbuf *mbuf; octtx_wqe_t *wqe = (octtx_wqe_t *)(uintptr_t)work; @@ -71,6 +107,10 @@ ssovf_octeontx_wqe_to_pkt(uint64_t work, uint16_t port_info, mbuf->ol_flags = 0; mbuf->pkt_len = wqe->s.w1.len; + if (!!(flag & OCCTX_RX_OFFLOAD_CSUM_F)) + mbuf->ol_flags = ssovf_octeontx_rx_olflags_get(lookup_mem, + wqe->w[2]); + if (!!(flag & OCCTX_RX_MULTI_SEG_F)) { mbuf->nb_segs = wqe->s.w0.bufs; mbuf->data_len = wqe->s.w5.size; @@ -136,7 +176,7 @@ ssows_get_work(struct ssows *ws, struct rte_event *ev, const uint16_t flag) if (get_work1 && ev->event_type == RTE_EVENT_TYPE_ETHDEV) { ev->mbuf = ssovf_octeontx_wqe_to_pkt(get_work1, - (ev->event >> 20) & 0x7F, flag); + (ev->event >> 20) & 0x7F, flag, ws->lookup_mem); } else if (unlikely((get_work0 & 0xFFFFFFFF) == 0xFFFFFFFF)) { ssovf_octeontx_wqe_free(get_work1); return 0; diff --git a/drivers/net/octeontx/octeontx_rxtx.h b/drivers/net/octeontx/octeontx_rxtx.h index 3f2147a02..8b46105b6 100644 --- a/drivers/net/octeontx/octeontx_rxtx.h +++ b/drivers/net/octeontx/octeontx_rxtx.h @@ -486,12 +486,19 @@ T(noff_ol3ol4csum_l3l4csum_mseg, 1, 1, 1, 1, 14, \ /* RX offload macros */ #define VLAN_FLTR_F OCCTX_RX_VLAN_FLTR_F +#define CSUM_F OCCTX_RX_OFFLOAD_CSUM_F #define MULT_RX_F OCCTX_RX_MULTI_SEG_F -/* [VLAN_FLTR][MULTI_SEG] */ + +/* [VLAN_FLTR] [CSUM_F] [MULTI_SEG] */ #define OCCTX_RX_FASTPATH_MODES \ -R(no_offload, 0, 0, OCCTX_RX_OFFLOAD_NONE) \ -R(mseg, 0, 1, MULT_RX_F) \ -R(vlan, 1, 0, VLAN_FLTR_F) \ -R(vlan_mseg, 1, 1, VLAN_FLTR_F | MULT_RX_F) +R(no_offload, 0, 0, 0, OCCTX_RX_OFFLOAD_NONE) \ +R(mseg, 0, 0, 1, MULT_RX_F) \ +R(csum, 0, 1, 0, CSUM_F) \ +R(csum_mseg, 0, 1, 1, CSUM_F | MULT_RX_F) \ +R(vlan, 1, 0, 0, VLAN_FLTR_F) \ +R(vlan_mseg, 1, 0, 1, VLAN_FLTR_F | MULT_RX_F) \ +R(vlan_csum, 1, 1, 0, VLAN_FLTR_F | CSUM_F) \ +R(vlan_csum_mseg, 1, 1, 1, CSUM_F | VLAN_FLTR_F | \ + MULT_RX_F) #endif /* __OCTEONTX_RXTX_H__ */