From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id C90D9A04DD; Thu, 22 Oct 2020 08:59:52 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5906769F8; Thu, 22 Oct 2020 08:59:48 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by dpdk.org (Postfix) with ESMTP id 01EE75A9C for ; Thu, 22 Oct 2020 08:59:32 +0200 (CEST) IronPort-SDR: goD7YOd/Tlj57lB0Wng60uZGw3p6gvSescJS6iDaex9jN+PnD9UmQ53bPjzOdp1wHyyy5uWgpa EWujMQV5p4mg== X-IronPort-AV: E=McAfee;i="6000,8403,9781"; a="146774881" X-IronPort-AV: E=Sophos;i="5.77,403,1596524400"; d="scan'208";a="146774881" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 21 Oct 2020 23:59:32 -0700 IronPort-SDR: 9lXLtz07Sr2jfjaAmXKVypa3pP74W8UTovGcQr7Pna5wNKMz8awYIskuwlfqp29C8b+ph2JtKl SW+KRlz4wOGg== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.77,403,1596524400"; d="scan'208";a="359772085" Received: from dpdk_jiangcheng.sh.intel.com ([10.67.119.112]) by orsmga007.jf.intel.com with ESMTP; 21 Oct 2020 23:59:30 -0700 From: Cheng Jiang To: maxime.coquelin@redhat.com, chenbo.xia@intel.com Cc: dev@dpdk.org, patrick.fu@intel.com, YvonneX.Yang@intel.com, Cheng Jiang Date: Thu, 22 Oct 2020 06:46:22 +0000 Message-Id: <20201022064625.90974-2-Cheng1.jiang@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201022064625.90974-1-Cheng1.jiang@intel.com> References: <20201021065044.31839-1-Cheng1.jiang@intel.com> <20201022064625.90974-1-Cheng1.jiang@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-dev] [PATCH v9 1/4] example/vhost: add async vhost args parsing function 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" This patch is to add async vhost driver arguments parsing function for CBDMA channel, DMA initiation function and args description. The meson build file is changed to fix dependency problem. With these arguments vhost device can be set to use CBDMA or CPU for enqueue operation and bind vhost device with specific CBDMA channel to accelerate data copy. Signed-off-by: Cheng Jiang --- examples/vhost/ioat.c | 99 ++++++++++++++++++++++++++++++++++++++ examples/vhost/ioat.h | 35 ++++++++++++++ examples/vhost/main.c | 36 +++++++++++++- examples/vhost/meson.build | 5 ++ 4 files changed, 174 insertions(+), 1 deletion(-) create mode 100644 examples/vhost/ioat.c create mode 100644 examples/vhost/ioat.h diff --git a/examples/vhost/ioat.c b/examples/vhost/ioat.c new file mode 100644 index 000000000..52767d599 --- /dev/null +++ b/examples/vhost/ioat.c @@ -0,0 +1,99 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2020 Intel Corporation + */ +#include +#include + +#include "ioat.h" +#include "main.h" + +int +open_ioat(const char *value) +{ + struct dma_for_vhost *dma_info = dma_bind; + char *input = strndup(value, strlen(value) + 1); + char *addrs = input; + char *ptrs[2]; + char *start, *end, *substr; + int64_t vid, vring_id; + struct rte_ioat_rawdev_config config; + struct rte_rawdev_info info = { .dev_private = &config }; + char name[32]; + int dev_id; + int ret = 0; + uint16_t i = 0; + char *dma_arg[MAX_VHOST_DEVICE]; + uint8_t args_nr; + + while (isblank(*addrs)) + addrs++; + if (*addrs == '\0') { + ret = -1; + goto out; + } + + /* process DMA devices within bracket. */ + addrs++; + substr = strtok(addrs, ";]"); + if (!substr) { + ret = -1; + goto out; + } + args_nr = rte_strsplit(substr, strlen(substr), + dma_arg, MAX_VHOST_DEVICE, ','); + do { + char *arg_temp = dma_arg[i]; + rte_strsplit(arg_temp, strlen(arg_temp), ptrs, 2, '@'); + + start = strstr(ptrs[0], "txd"); + if (start == NULL) { + ret = -1; + goto out; + } + + start += 3; + vid = strtol(start, &end, 0); + if (end == start) { + ret = -1; + goto out; + } + + vring_id = 0 + VIRTIO_RXQ; + if (rte_pci_addr_parse(ptrs[1], + &(dma_info + vid)->dmas[vring_id].addr) < 0) { + ret = -1; + goto out; + } + + rte_pci_device_name(&(dma_info + vid)->dmas[vring_id].addr, + name, sizeof(name)); + dev_id = rte_rawdev_get_dev_id(name); + if (dev_id == (uint16_t)(-ENODEV) || + dev_id == (uint16_t)(-EINVAL)) { + ret = -1; + goto out; + } + + if (rte_rawdev_info_get(dev_id, &info, sizeof(config)) < 0 || + strstr(info.driver_name, "ioat") == NULL) { + ret = -1; + goto out; + } + + (dma_info + vid)->dmas[vring_id].dev_id = dev_id; + (dma_info + vid)->dmas[vring_id].is_valid = true; + config.ring_size = IOAT_RING_SIZE; + config.hdls_disable = true; + if (rte_rawdev_configure(dev_id, &info, sizeof(config)) < 0) { + ret = -1; + goto out; + } + rte_rawdev_start(dev_id); + + dma_info->nr++; + i++; + } while (i < args_nr); +out: + free(input); + return ret; +} diff --git a/examples/vhost/ioat.h b/examples/vhost/ioat.h new file mode 100644 index 000000000..02c1a8d35 --- /dev/null +++ b/examples/vhost/ioat.h @@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2020 Intel Corporation + */ + +#ifndef _IOAT_H_ +#define _IOAT_H_ + +#include +#include + +#define MAX_VHOST_DEVICE 1024 +#define IOAT_RING_SIZE 4096 + +struct dma_info { + struct rte_pci_addr addr; + uint16_t dev_id; + bool is_valid; +}; + +struct dma_for_vhost { + struct dma_info dmas[RTE_MAX_QUEUES_PER_PORT * 2]; + uint16_t nr; +}; + +struct dma_for_vhost dma_bind[MAX_VHOST_DEVICE]; + +#ifdef RTE_ARCH_X86 +int open_ioat(const char *value); +#else +static int open_ioat(const char *value __rte_unused) +{ + return -1; +} +#endif +#endif /* _IOAT_H_ */ diff --git a/examples/vhost/main.c b/examples/vhost/main.c index faa482245..08182ff01 100644 --- a/examples/vhost/main.c +++ b/examples/vhost/main.c @@ -25,6 +25,7 @@ #include #include +#include "ioat.h" #include "main.h" #ifndef MAX_QUEUES @@ -95,6 +96,10 @@ static int client_mode; static int builtin_net_driver; +static int async_vhost_driver; + +static char dma_type[MAX_LONG_OPT_SZ]; + /* Specify timeout (in useconds) between retries on RX. */ static uint32_t burst_rx_delay_time = BURST_RX_WAIT_US; /* Specify the number of retries on RX. */ @@ -181,6 +186,15 @@ struct mbuf_table lcore_tx_queue[RTE_MAX_LCORE]; / US_PER_S * BURST_TX_DRAIN_US) #define VLAN_HLEN 4 +static inline int +open_dma(const char *value) +{ + if (strncmp(dma_type, "ioat", 4) == 0) + return open_ioat(value); + + return -1; +} + /* * Builds up the correct configuration for VMDQ VLAN pool map * according to the pool & queue limits. @@ -446,7 +460,9 @@ us_vhost_usage(const char *prgname) " --socket-file: The path of the socket file.\n" " --tx-csum [0|1] disable/enable TX checksum offload.\n" " --tso [0|1] disable/enable TCP segment offload.\n" - " --client register a vhost-user socket as client mode.\n", + " --client register a vhost-user socket as client mode.\n" + " --dma-type register dma type for your vhost async driver. For example \"ioat\" for now.\n" + " --dmas register dma channel for specific vhost device.\n", prgname); } @@ -472,6 +488,8 @@ us_vhost_parse_args(int argc, char **argv) {"tso", required_argument, NULL, 0}, {"client", no_argument, &client_mode, 1}, {"builtin-net-driver", no_argument, &builtin_net_driver, 1}, + {"dma-type", required_argument, NULL, 0}, + {"dmas", required_argument, NULL, 0}, {NULL, 0, 0, 0}, }; @@ -614,6 +632,22 @@ us_vhost_parse_args(int argc, char **argv) } } + if (!strncmp(long_option[option_index].name, + "dma-type", MAX_LONG_OPT_SZ)) { + strcpy(dma_type, optarg); + } + + if (!strncmp(long_option[option_index].name, + "dmas", MAX_LONG_OPT_SZ)) { + if (open_dma(optarg) == -1) { + RTE_LOG(INFO, VHOST_CONFIG, + "Wrong DMA args\n"); + us_vhost_usage(prgname); + return -1; + } + async_vhost_driver = 1; + } + break; /* Invalid option - print options. */ diff --git a/examples/vhost/meson.build b/examples/vhost/meson.build index 872d51153..24f1f7131 100644 --- a/examples/vhost/meson.build +++ b/examples/vhost/meson.build @@ -14,3 +14,8 @@ allow_experimental_apis = true sources = files( 'main.c', 'virtio_net.c' ) + +if dpdk_conf.has('RTE_ARCH_X86') + deps += 'raw_ioat' + sources += files('ioat.c') +endif -- 2.27.0