From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by dpdk.org (Postfix) with ESMTP id 6C9D737B0 for ; Wed, 19 Sep 2018 16:51:36 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 19 Sep 2018 07:51:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.53,394,1531810800"; d="scan'208";a="91468093" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga001.fm.intel.com with ESMTP; 19 Sep 2018 07:46:27 -0700 Received: from fmsmsx116.amr.corp.intel.com (10.18.116.20) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 19 Sep 2018 07:46:26 -0700 Received: from shsmsx151.ccr.corp.intel.com (10.239.6.50) by fmsmsx116.amr.corp.intel.com (10.18.116.20) with Microsoft SMTP Server (TLS) id 14.3.319.2; Wed, 19 Sep 2018 07:46:24 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.39]) by SHSMSX151.ccr.corp.intel.com ([169.254.3.16]) with mapi id 14.03.0319.002; Wed, 19 Sep 2018 22:46:22 +0800 From: "Wang, Xiao W" To: "Ye, Xiaolong" , "dev@dpdk.org" , Maxime Coquelin , "Bie, Tiwei" , "Wang, Zhihong" CC: Rami Rosen , "Wang, Haiyue" Thread-Topic: [PATCH v2 2/2] examples/vdpa: introduce a new sample for vDPA Thread-Index: AQHUS1PSVzTlONdeakuhtTFPhFmTWqT3rz9g Date: Wed, 19 Sep 2018 14:46:22 +0000 Message-ID: References: <20180913180658.20562-1-xiaolong.ye@intel.com> <20180913180658.20562-2-xiaolong.ye@intel.com> In-Reply-To: <20180913180658.20562-2-xiaolong.ye@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiZTdhYTcyODctZTcxZi00M2FhLWFiNGYtMWFiM2E4OGQ1N2ZmIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoic2t3eHVGRTdLb3NzUHA3YnZEaWw3Rm9PbzI0Z1A1QktNXC84czJOdG1QRCtzcmpPR1p1bGs4ZGEyUlhcLzVRTEpzIn0= dlp-product: dlpe-windows dlp-version: 11.0.400.15 dlp-reaction: no-action x-originating-ip: [10.239.127.40] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Subject: Re: [dpdk-dev] [PATCH v2 2/2] examples/vdpa: introduce a new sample for vDPA 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: , X-List-Received-Date: Wed, 19 Sep 2018 14:51:37 -0000 Hi Xiaolong, > -----Original Message----- > From: Ye, Xiaolong > Sent: Friday, September 14, 2018 2:07 AM > To: dev@dpdk.org; Maxime Coquelin ; Bie, > Tiwei ; Wang, Zhihong > Cc: Wang, Xiao W ; Rami Rosen > ; Wang, Haiyue ; Ye, > Xiaolong > Subject: [PATCH v2 2/2] examples/vdpa: introduce a new sample for vDPA >=20 > The vdpa sample application creates vhost-user sockets by using the > vDPA backend. vDPA stands for vhost Data Path Acceleration which utilizes > virtio ring compatible devices to serve virtio driver directly to enable > datapath acceleration. As vDPA driver can help to set up vhost datapath, > this application doesn't need to launch dedicated worker threads for vhos= t > enqueue/dequeue operations. >=20 > Signed-off-by: Xiao Wang > Signed-off-by: Xiaolong Ye > --- >=20 > v2 changes: >=20 > * fix a compilation error reported by Rosen > * improve create cmd in interactive mode and add two new cmds: list, > * quit > * add application documentation >=20 > MAINTAINERS | 2 + > doc/guides/sample_app_ug/index.rst | 1 + > doc/guides/sample_app_ug/vdpa.rst | 115 ++++++++ > examples/Makefile | 2 +- > examples/vdpa/Makefile | 32 +++ > examples/vdpa/main.c | 437 +++++++++++++++++++++++++++++ > examples/vdpa/meson.build | 16 ++ > 7 files changed, 604 insertions(+), 1 deletion(-) > create mode 100644 doc/guides/sample_app_ug/vdpa.rst > create mode 100644 examples/vdpa/Makefile > create mode 100644 examples/vdpa/main.c > create mode 100644 examples/vdpa/meson.build >=20 > diff --git a/MAINTAINERS b/MAINTAINERS > index 9fd258fad..f84dbf2a7 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -682,6 +682,8 @@ F: doc/guides/sample_app_ug/vhost.rst > F: examples/vhost_scsi/ > F: doc/guides/sample_app_ug/vhost_scsi.rst > F: examples/vhost_crypto/ > +F: examples/vdpa/ > +F: doc/guides/sample_app_ug/vdpa.rst >=20 > Vhost PMD > M: Maxime Coquelin > diff --git a/doc/guides/sample_app_ug/index.rst > b/doc/guides/sample_app_ug/index.rst > index 5bedf4f6f..74b12af85 100644 > --- a/doc/guides/sample_app_ug/index.rst > +++ b/doc/guides/sample_app_ug/index.rst > @@ -45,6 +45,7 @@ Sample Applications User Guides > vhost > vhost_scsi > vhost_crypto > + vdpa > netmap_compatibility > ip_pipeline > test_pipeline > diff --git a/doc/guides/sample_app_ug/vdpa.rst > b/doc/guides/sample_app_ug/vdpa.rst > new file mode 100644 > index 000000000..ab222731e > --- /dev/null > +++ b/doc/guides/sample_app_ug/vdpa.rst > @@ -0,0 +1,115 @@ > +.. SPDX-License-Identifier: BSD-3-Clause > + Copyright(c) 2018 Intel Corporation. > + > +Vdpa Sample Application > +=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > + > +The vdpa sample application creates vhost-user sockets by using the > +vDPA backend. vDPA stands for vhost Data Path Acceleration which utilize= s > +virtio ring compatible devices to serve virtio driver directly to enable > +datapath acceleration. As vDPA driver can help to set up vhost datapath, > +this application doesn't need to launch dedicated worker threads for vho= st > +enqueue/dequeue operations. > + [...] > + > +Take IFCVF driver for example: > + > +.. code-block:: console > + > + ./vdpa --log-level=3D9 -c 0x6 -n 4 --socket-mem 1024,1024 \ > + -w 0000:06:00.2,vdpa=3D1 -w 0000:06:00.3,vdpa=3D1 \ > + -- --interactive > + > +.. note:: > + We need to bind VFIO-pci to VFs before running vdpa sample. Replace "VFIO-pci" with "vfio-pci". > + > + * modprobe vfio-pci > + * ./usertools/dpdk-devbind.py -b vfio-pci 06:00.2 06:00.3 > + > +Then we can create 2 vdpa ports in interactive cmdline. > + > +.. code-block:: console > + > + vdpa> list > + device id device address > + 0 0000:06:00.2 > + 1 0000:06:00.3 Could we show out also the device's features and supported queue number? > + vdpa> create /tmp/vdpa-socket0 0000:06:00.2 > + vdpa> create /tmp/vdpa-socket1 0000:06:00.3 > + > +.. _vdpa_app_run_vm: > + [...] > +#include > +#include > +#include > + > +#include > +#include > +#include > +#include > +#include > + > +#include > +#include > +#include > +#include > + > +#define MAX_PATH_LEN 128 > +#define MAX_VDPA_SAMPLE_PORTS 1024 [...] > + ret =3D rte_vhost_driver_unregister(socket_path); > + if (ret !=3D 0) > + RTE_LOG(ERR, USER1, > + "Fail to unregister vhost driver for %s.\n", > + socket_path); > +} > + > +static void > +vdpa_sample_quit(void) > +{ > + int i; > + for (i =3D 0; i < RTE_MIN(MAX_VDPA_SAMPLE_PORTS, dev_total); i++) { Double " ". > + if (vports[i].ifname[0] !=3D '\0') > + close_vdpa(&vports[i]); > + } > +} > + > +static void > +signal_handler(int signum) > +{ > + if (signum =3D=3D SIGINT || signum =3D=3D SIGTERM) { > + printf("\nSignal %d received, preparing to exit...\n", signum); > + vdpa_sample_quit(); > + exit(0); > + } > +} > + > +/* interactive cmds */ > + > +/* *** Help command with introduction. *** */ > +struct cmd_help_result { > + cmdline_fixed_string_t help; > +}; > + > +static void cmd_help_parsed(__attribute__((unused)) void *parsed_result, > + struct cmdline *cl, > + __attribute__((unused)) void *data) > +{ > + cmdline_printf( > + cl, > + "\n" > + "The following commands are currently available:\n\n" > + "Control:\n" > + " help : Show interactive inst= ructions.\n" > + " list : list all available vd= pa devices.\n" > + " create : create a new vdpa > port.\n" > + " quit : exit vdpa sample app.= \n" > + ); > +} > + > +cmdline_parse_token_string_t cmd_help_help =3D > + TOKEN_STRING_INITIALIZER(struct cmd_help_result, help, "help"); > + > +cmdline_parse_inst_t cmd_help =3D { > + .f =3D cmd_help_parsed, > + .data =3D NULL, > + .help_str =3D "show help", > + .tokens =3D { > + (void *)&cmd_help_help, > + NULL, > + }, > +}; > + > +/* *** List all available vdpa devices *** */ > +struct cmd_list_result { > + cmdline_fixed_string_t action; > +}; > + > +static void cmd_list_vdpa_devices_parsed( > + __attribute__((unused)) void *parsed_result, > + struct cmdline *cl, > + __attribute__((unused)) void *data) > +{ > + int did; > + struct rte_vdpa_device *vdev; > + struct rte_pci_addr addr; > + > + cmdline_printf(cl, "device id\tdevice address\n"); > + for (did =3D 0; did < dev_total; did++) { > + vdev =3D rte_vdpa_get_device(did); > + if (!vdev) > + continue; > + addr =3D vdev->addr.pci_addr; > + cmdline_printf(cl, "%d\t\t"PCI_PRI_FMT"\n", did, addr.domain, > + addr.bus, addr.devid, addr.function); > + } > +} > + > +cmdline_parse_token_string_t cmd_action_list =3D > + TOKEN_STRING_INITIALIZER(struct cmd_list_result, action, "list"); > + > +cmdline_parse_inst_t cmd_list_vdpa_devices =3D { > + .f =3D cmd_list_vdpa_devices_parsed, /* function to call */ > + .data =3D NULL, /* 2nd arg of func */ > + .help_str =3D "list all available vdpa devices", > + .tokens =3D { /* token list, NULL terminated */ > + (void *)&cmd_action_list, > + NULL, > + }, > +}; > + > +/* *** Create new vdpa port *** */ > +struct cmd_create_result { > + cmdline_fixed_string_t action; > + cmdline_fixed_string_t socket_path; > + cmdline_fixed_string_t bdf; > +}; > + > +static void cmd_create_vdpa_port_parsed(void *parsed_result, > + struct cmdline *cl, > + __attribute__((unused)) void *data) > +{ > + int did; > + struct cmd_create_result *res =3D parsed_result; > + struct rte_vdpa_dev_addr addr; > + > + strncpy(vports[devcnt].ifname, res->socket_path, MAX_PATH_LEN); > + if (eal_parse_pci_DomBDF(res->bdf, &addr.pci_addr) !=3D 0) { this is a deprecated API, use rte_pci_addr_parse. > + cmdline_printf(cl, "Unable to parse the given bdf.\n"); > + return; > + } > + addr.type =3D PCI_ADDR; > + did =3D rte_vdpa_find_device_id(&addr); > + if (did < 0) { > + cmdline_printf(cl, "Unable to find vdpa devide id.\n"); > + return; > + } > + > + vports[devcnt].did =3D did; > + start_vdpa(&vports[devcnt]); > + devcnt++; > +} > + > +cmdline_parse_token_string_t cmd_action_create =3D > + TOKEN_STRING_INITIALIZER(struct cmd_create_result, action, > "create"); > +cmdline_parse_token_string_t cmd_socket_path =3D > + TOKEN_STRING_INITIALIZER(struct cmd_create_result, socket_path, > NULL); > +cmdline_parse_token_string_t cmd_bdf =3D > + TOKEN_STRING_INITIALIZER(struct cmd_create_result, bdf, NULL); > + > +cmdline_parse_inst_t cmd_create_vdpa_port =3D { > + .f =3D cmd_create_vdpa_port_parsed, /* function to call */ > + .data =3D NULL, /* 2nd arg of func */ > + .help_str =3D "create a new vdpa port", > + .tokens =3D { /* token list, NULL terminated */ > + (void *)&cmd_action_create, > + (void *)&cmd_socket_path, > + (void *)&cmd_bdf, > + NULL, > + }, > +}; > + > +/* *** QUIT *** */ > +struct cmd_quit_result { > + cmdline_fixed_string_t quit; > +}; > + > +static void cmd_quit_parsed(__attribute__((unused)) void *parsed_result, > + struct cmdline *cl, > + __attribute__((unused)) void *data) > +{ > + vdpa_sample_quit(); > + cmdline_quit(cl); > +} > + > +cmdline_parse_token_string_t cmd_quit_quit =3D > + TOKEN_STRING_INITIALIZER(struct cmd_quit_result, quit, "quit"); > + > +cmdline_parse_inst_t cmd_quit =3D { > + .f =3D cmd_quit_parsed, > + .data =3D NULL, > + .help_str =3D "quit: exit application", > + .tokens =3D { > + (void *)&cmd_quit_quit, > + NULL, > + }, > +}; > +cmdline_parse_ctx_t main_ctx[] =3D { > + (cmdline_parse_inst_t *)&cmd_help, > + (cmdline_parse_inst_t *)&cmd_list_vdpa_devices, > + (cmdline_parse_inst_t *)&cmd_create_vdpa_port, > + (cmdline_parse_inst_t *)&cmd_quit, > + NULL, > +}; > + > +int > +main(int argc, char *argv[]) > +{ > + char ch; > + int i; > + int ret; > + struct cmdline *cl; > + > + ret =3D rte_eal_init(argc, argv); > + if (ret < 0) > + rte_exit(EXIT_FAILURE, "eal init failed\n"); > + argc -=3D ret; > + argv +=3D ret; > + > + signal(SIGINT, signal_handler); > + signal(SIGTERM, signal_handler); > + > + data_init(); data_init first, then set signal handler, otherwise the signal handler may = use some uninitialized variable. > + > + ret =3D parse_args(argc, argv); > + if (ret < 0) > + rte_exit(EXIT_FAILURE, "invalid argument\n"); > + > + if (interactive =3D=3D 1) { > + cl =3D cmdline_stdin_new(main_ctx, "vdpa> "); > + if (cl =3D=3D NULL) > + rte_panic("Cannot create cmdline instance\n"); > + cmdline_interact(cl); > + cmdline_stdin_exit(cl); > + } else { > + for (i =3D 0; i < RTE_MIN(MAX_VDPA_SAMPLE_PORTS, > dev_total); double " " BRs, Xiao