From patchwork Mon Jan 13 06:00:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mahipal Challa X-Patchwork-Id: 64533 X-Patchwork-Delegate: thomas@monjalon.net 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 C73CDA04F0; Mon, 13 Jan 2020 07:02:06 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BEA031D63D; Mon, 13 Jan 2020 07:01:20 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id AC2C61D631 for ; Mon, 13 Jan 2020 07:01:19 +0100 (CET) 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 00D60NWb023005; Sun, 12 Jan 2020 22:01:17 -0800 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 : mime-version : content-type; s=pfpt0818; bh=YtBf66bGS5/cGHLHe91kHjyzxspSKlBKy3FTPjNjcfw=; b=uWnc6r7Ra2i6iIz5oOzwtFZNN5QgGstHWNta3DbGVPSWaMEm0DsjkXkhZrIArL1h20He JcbP1RqEHLJsIFunSfGxgHOq23WYud6YWsa6q/xcG/j9TEK089ldXFaLC1OpbZ19qFo4 f6nlIippdakg9o0NsGew/jBjL7SLIBo2lrsNwNDFCpu/0GpfuFXpP9yQOUd+9aTS4xqh 6ALIO+DRV6ezWcbtq+MQs9CXRuHS74/a8YWoZRNS0okCIr+aWOj6pKF0pt0nU4zhELP9 o/g7MpXoFS/kBLQ5NWjOozEieTtBXzFMxKpbaEDfv9FzCU7Hoe6I/dNuk5DaiZIgco1B NA== Received: from sc-exch02.marvell.com ([199.233.58.182]) by mx0b-0016f401.pphosted.com with ESMTP id 2xfert4ceu-5 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Sun, 12 Jan 2020 22:01:17 -0800 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; Sun, 12 Jan 2020 22:01:15 -0800 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Sun, 12 Jan 2020 22:01:15 -0800 Received: from hyd1244.marvell.com (hyd1244.marvell.com [10.29.20.28]) by maili.marvell.com (Postfix) with ESMTP id C02373F7041; Sun, 12 Jan 2020 22:01:13 -0800 (PST) From: Mahipal Challa To: , CC: , , , , Date: Mon, 13 Jan 2020 11:30:41 +0530 Message-ID: <1578895241-22229-7-git-send-email-mchalla@marvell.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1578895241-22229-1-git-send-email-mchalla@marvell.com> References: <1578895241-22229-1-git-send-email-mchalla@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.572 definitions=2020-01-13_01:2020-01-13, 2020-01-13 signatures=0 Subject: [dpdk-dev] [PATCH v5 6/6] raw/octeontx2_ep: add driver self test 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" Add rawdev's selftest feature in SDP VF driver, which verifies the EP mode functionality test. Signed-off-by: Mahipal Challa --- doc/guides/rawdevs/octeontx2_ep.rst | 13 +++ drivers/raw/octeontx2_ep/Makefile | 1 + drivers/raw/octeontx2_ep/meson.build | 1 + drivers/raw/octeontx2_ep/otx2_ep_rawdev.c | 1 + drivers/raw/octeontx2_ep/otx2_ep_rawdev.h | 2 + drivers/raw/octeontx2_ep/otx2_ep_test.c | 173 ++++++++++++++++++++++++++++++ 6 files changed, 191 insertions(+) diff --git a/doc/guides/rawdevs/octeontx2_ep.rst b/doc/guides/rawdevs/octeontx2_ep.rst index 39a7c29..bbcf530 100644 --- a/doc/guides/rawdevs/octeontx2_ep.rst +++ b/doc/guides/rawdevs/octeontx2_ep.rst @@ -74,3 +74,16 @@ Performing Data Transfer To perform data transfer using SDP VF EP rawdev devices use standard ``rte_rawdev_enqueue_buffers()`` and ``rte_rawdev_dequeue_buffers()`` APIs. +Self test +--------- + +On EAL initialization, SDP VF devices will be probed and populated into the +raw devices. The rawdev ID of the device can be obtained using + +* Invoke ``rte_rawdev_get_dev_id("SDPEP:x")`` from the test application + where x is the VF device's bus id specified in "bus:device.func"(BDF) + format. Use this index for further rawdev function calls. + +* The driver's selftest rawdev API can be used to verify the SDP EP mode + functional tests which can send/receive the raw data packets to/from the + EP device. diff --git a/drivers/raw/octeontx2_ep/Makefile b/drivers/raw/octeontx2_ep/Makefile index 02853fb..44fdf89 100644 --- a/drivers/raw/octeontx2_ep/Makefile +++ b/drivers/raw/octeontx2_ep/Makefile @@ -37,6 +37,7 @@ LIBABIVER := 1 # SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += otx2_ep_rawdev.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += otx2_ep_enqdeq.c +SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += otx2_ep_test.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_OCTEONTX2_EP_RAWDEV) += otx2_ep_vf.c diff --git a/drivers/raw/octeontx2_ep/meson.build b/drivers/raw/octeontx2_ep/meson.build index 99e6c6d..0e6338f 100644 --- a/drivers/raw/octeontx2_ep/meson.build +++ b/drivers/raw/octeontx2_ep/meson.build @@ -5,4 +5,5 @@ deps += ['bus_pci', 'common_octeontx2', 'rawdev'] sources = files('otx2_ep_rawdev.c', 'otx2_ep_enqdeq.c', + 'otx2_ep_test.c', 'otx2_ep_vf.c') diff --git a/drivers/raw/octeontx2_ep/otx2_ep_rawdev.c b/drivers/raw/octeontx2_ep/otx2_ep_rawdev.c index 7158b97..0778603 100644 --- a/drivers/raw/octeontx2_ep/otx2_ep_rawdev.c +++ b/drivers/raw/octeontx2_ep/otx2_ep_rawdev.c @@ -253,6 +253,7 @@ .dev_close = sdp_rawdev_close, .enqueue_bufs = sdp_rawdev_enqueue, .dequeue_bufs = sdp_rawdev_dequeue, + .dev_selftest = sdp_rawdev_selftest, }; static int diff --git a/drivers/raw/octeontx2_ep/otx2_ep_rawdev.h b/drivers/raw/octeontx2_ep/otx2_ep_rawdev.h index a77cbab..dab2fb7 100644 --- a/drivers/raw/octeontx2_ep/otx2_ep_rawdev.h +++ b/drivers/raw/octeontx2_ep/otx2_ep_rawdev.h @@ -494,4 +494,6 @@ int sdp_rawdev_enqueue(struct rte_rawdev *dev, struct rte_rawdev_buf **buffers, int sdp_rawdev_dequeue(struct rte_rawdev *dev, struct rte_rawdev_buf **buffers, unsigned int count, rte_rawdev_obj_t context); +int sdp_rawdev_selftest(uint16_t dev_id); + #endif /* _OTX2_EP_RAWDEV_H_ */ diff --git a/drivers/raw/octeontx2_ep/otx2_ep_test.c b/drivers/raw/octeontx2_ep/otx2_ep_test.c new file mode 100644 index 0000000..9746840 --- /dev/null +++ b/drivers/raw/octeontx2_ep/otx2_ep_test.c @@ -0,0 +1,173 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(C) 2019 Marvell International Ltd. + */ + +#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include + +#include "otx2_common.h" +#include "otx2_ep_rawdev.h" + +#define SDP_IOQ_NUM_BUFS (4 * 1024) +#define SDP_IOQ_BUF_SIZE (2 * 1024) + +#define SDP_TEST_PKT_FSZ (0) +#define SDP_TEST_PKT_SIZE (1024) + +static int +sdp_validate_data(struct sdp_droq_pkt *oq_pkt, uint8_t *iq_pkt, + uint32_t pkt_len) +{ + if (!oq_pkt) + return -EINVAL; + + if (pkt_len != oq_pkt->len) { + otx2_err("Invalid packet length"); + return -EINVAL; + } + + if (memcmp(oq_pkt->data, iq_pkt, pkt_len) != 0) { + otx2_err("Data validation failed"); + return -EINVAL; + } + otx2_sdp_dbg("Data validation successful"); + + return 0; +} + +static void +sdp_ioq_buffer_fill(uint8_t *addr, uint32_t len) +{ + uint32_t idx; + + memset(addr, 0, len); + + for (idx = 0; idx < len; idx++) + addr[idx] = idx; +} + +static struct rte_mempool* +sdp_ioq_mempool_create(void) +{ + struct rte_mempool *mpool; + + mpool = rte_mempool_create("ioqbuf_pool", + SDP_IOQ_NUM_BUFS /*num elt*/, + SDP_IOQ_BUF_SIZE /*elt size*/, + 0 /*cache_size*/, + 0 /*private_data_size*/, + NULL /*mp_init*/, + NULL /*mp_init arg*/, + NULL /*obj_init*/, + NULL /*obj_init arg*/, + rte_socket_id() /*socket id*/, + (MEMPOOL_F_SP_PUT | MEMPOOL_F_SC_GET)); + + return mpool; +} + + +int +sdp_rawdev_selftest(uint16_t dev_id) +{ + struct sdp_rawdev_info app_info = {0}; + struct rte_rawdev_info dev_info = {0}; + + struct rte_rawdev_buf *d_buf[1]; + struct sdp_droq_pkt oq_pkt; + struct sdp_soft_instr si; + struct sdp_device sdpvf; + + uint32_t buf_size; + int ret = 0; + void *buf; + + otx2_info("SDP RAWDEV Self Test: Started"); + + memset(&oq_pkt, 0x00, sizeof(oq_pkt)); + d_buf[0] = (struct rte_rawdev_buf *)&oq_pkt; + + struct rte_mempool *ioq_mpool = sdp_ioq_mempool_create(); + if (!ioq_mpool) { + otx2_err("IOQ mpool creation failed"); + return -ENOMEM; + } + + app_info.enqdeq_mpool = ioq_mpool; + app_info.app_conf = NULL; /* Use default conf */ + + dev_info.dev_private = &app_info; + + ret = rte_rawdev_configure(dev_id, &dev_info); + if (ret) { + otx2_err("Unable to configure SDP_VF %d", dev_id); + rte_mempool_free(ioq_mpool); + return -ENOMEM; + } + otx2_info("SDP VF rawdev[%d] configured successfully", dev_id); + + memset(&si, 0x00, sizeof(si)); + memset(&sdpvf, 0x00, sizeof(sdpvf)); + + buf_size = SDP_TEST_PKT_SIZE; + + si.q_no = 0; + si.reqtype = SDP_REQTYPE_NORESP; + si.rptr = NULL; + + si.ih.fsz = SDP_TEST_PKT_FSZ; + si.ih.tlen = buf_size; + si.ih.gather = 0; + + /* Enqueue raw pkt data */ + rte_mempool_get(ioq_mpool, &buf); + if (!buf) { + otx2_err("Buffer allocation failed"); + rte_mempool_free(ioq_mpool); + rte_rawdev_close(dev_id); + return -ENOMEM; + } + + sdp_ioq_buffer_fill(buf, buf_size); + si.dptr = (uint8_t *)buf; + + rte_rawdev_enqueue_buffers(dev_id, NULL, 1, &si); + usleep(10000); + + /* Dequeue raw pkt data */ + ret = 0; + while (ret < 1) { + ret = rte_rawdev_dequeue_buffers(dev_id, &d_buf[0], 1, &si); + rte_pause(); + } + + /* Validate the dequeued raw pkt data */ + if (sdp_validate_data((struct sdp_droq_pkt *)d_buf[0], + buf, buf_size) != 0) { + otx2_err("Data invalid"); + rte_mempool_put(ioq_mpool, + ((struct sdp_droq_pkt *)d_buf[0])->data); + rte_mempool_free(ioq_mpool); + rte_rawdev_close(dev_id); + return -EINVAL; + } + + rte_mempool_put(ioq_mpool, ((struct sdp_droq_pkt *)d_buf[0])->data); + rte_mempool_free(ioq_mpool); + rte_rawdev_close(dev_id); + + otx2_info("SDP RAWDEV Self Test: Successful"); + + return 0; +} +