[v4] examples/vhost: fix ioat dependency issue
Checks
Commit Message
Fix vhost-switch compiling issue when ioat dependency is missing.
Change 'RTE_x86' check into 'RTE_RAW_IOAT' check in meson build file.
Use 'RTE_RAW_IOAT' to control conditional compiling in source file.
Clean some codes.
Fixes: abec60e7115d ("examples/vhost: support vhost async data path")
Fixes: 3a04ecb21420 ("examples/vhost: add async vhost args parsing")
Signed-off-by: Cheng Jiang <Cheng1.jiang@intel.com>
---
v4:
* Use macros in ioat.c for conditional compilation instead of changing Makefile.
v3:
* Added fixes lines in commit log.
v2:
* Cleaned some codes
* Changed RTE_RAW_IOAT check method in Makefile
* Added ioat function definition when RTE_RAW_IOAT is missing
examples/vhost/Makefile | 2 +-
examples/vhost/ioat.c | 6 ++++++
examples/vhost/ioat.h | 32 +++++++++++++++++++++++++-------
examples/vhost/main.c | 22 +++++++++++-----------
examples/vhost/meson.build | 2 +-
5 files changed, 44 insertions(+), 20 deletions(-)
--
2.29.2
Comments
On Thu, Nov 12, 2020 at 01:47:54PM +0000, Cheng Jiang wrote:
> Fix vhost-switch compiling issue when ioat dependency is missing.
> Change 'RTE_x86' check into 'RTE_RAW_IOAT' check in meson build file.
> Use 'RTE_RAW_IOAT' to control conditional compiling in source file.
> Clean some codes.
>
> Fixes: abec60e7115d ("examples/vhost: support vhost async data path")
> Fixes: 3a04ecb21420 ("examples/vhost: add async vhost args parsing")
>
> Signed-off-by: Cheng Jiang <Cheng1.jiang@intel.com>
> ---
> v4:
> * Use macros in ioat.c for conditional compilation instead of changing Makefile.
>
> v3:
> * Added fixes lines in commit log.
>
> v2:
> * Cleaned some codes
> * Changed RTE_RAW_IOAT check method in Makefile
> * Added ioat function definition when RTE_RAW_IOAT is missing
>
> examples/vhost/Makefile | 2 +-
> examples/vhost/ioat.c | 6 ++++++
> examples/vhost/ioat.h | 32 +++++++++++++++++++++++++-------
> examples/vhost/main.c | 22 +++++++++++-----------
> examples/vhost/meson.build | 2 +-
> 5 files changed, 44 insertions(+), 20 deletions(-)
>
> diff --git a/examples/vhost/Makefile b/examples/vhost/Makefile
> index cec59d0e0..8c969caaa 100644
> --- a/examples/vhost/Makefile
> +++ b/examples/vhost/Makefile
> @@ -5,7 +5,7 @@
> APP = vhost-switch
>
> # all source are stored in SRCS-y
> -SRCS-y := main.c virtio_net.c
> +SRCS-y := main.c virtio_net.c ioat.c
>
> # Build using pkg-config variables if possible
> ifneq ($(shell pkg-config --exists libdpdk && echo 0),0)
> diff --git a/examples/vhost/ioat.c b/examples/vhost/ioat.c
> index b2c74f653..6f87d7bba 100644
> --- a/examples/vhost/ioat.c
> +++ b/examples/vhost/ioat.c
> @@ -1,13 +1,17 @@
> /* SPDX-License-Identifier: BSD-3-Clause
> * Copyright(c) 2010-2020 Intel Corporation
> */
> +#ifdef RTE_RAW_IOAT
> #include <rte_rawdev.h>
> #include <rte_ioat_rawdev.h>
> +#endif /* RTE_RAW_IOAT */
> #include <sys/uio.h>
>
> #include "ioat.h"
> #include "main.h"
>
> +#ifdef RTE_RAW_IOAT
> +
Minor nit is that we generally include system header files before DPDK
headers. Following that policy, we can move sys/uio.h up to be before the
first #ifdef, and then we can just merge the two #ifdefs together to just
have one at the start and one at the end.
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
> -----Original Message-----
> From: Bruce Richardson <bruce.richardson@intel.com>
> Sent: Thursday, November 12, 2020 11:02 PM
> To: Jiang, Cheng1 <cheng1.jiang@intel.com>
> Cc: maxime.coquelin@redhat.com; Xia, Chenbo <chenbo.xia@intel.com>;
> dev@dpdk.org; Fu, Patrick <patrick.fu@intel.com>; Yang, YvonneX
> <yvonnex.yang@intel.com>; david.marchand@redhat.com; Hu, Jiayu
> <jiayu.hu@intel.com>
> Subject: Re: [PATCH v4] examples/vhost: fix ioat dependency issue
>
> On Thu, Nov 12, 2020 at 01:47:54PM +0000, Cheng Jiang wrote:
> > Fix vhost-switch compiling issue when ioat dependency is missing.
> > Change 'RTE_x86' check into 'RTE_RAW_IOAT' check in meson build file.
> > Use 'RTE_RAW_IOAT' to control conditional compiling in source file.
> > Clean some codes.
> >
> > Fixes: abec60e7115d ("examples/vhost: support vhost async data path")
> > Fixes: 3a04ecb21420 ("examples/vhost: add async vhost args parsing")
> >
> > Signed-off-by: Cheng Jiang <Cheng1.jiang@intel.com>
> > ---
> > v4:
> > * Use macros in ioat.c for conditional compilation instead of changing
> Makefile.
> >
> > v3:
> > * Added fixes lines in commit log.
> >
> > v2:
> > * Cleaned some codes
> > * Changed RTE_RAW_IOAT check method in Makefile
> > * Added ioat function definition when RTE_RAW_IOAT is missing
> >
> > examples/vhost/Makefile | 2 +-
> > examples/vhost/ioat.c | 6 ++++++
> > examples/vhost/ioat.h | 32 +++++++++++++++++++++++++-------
> > examples/vhost/main.c | 22 +++++++++++-----------
> > examples/vhost/meson.build | 2 +-
> > 5 files changed, 44 insertions(+), 20 deletions(-)
> >
> > diff --git a/examples/vhost/Makefile b/examples/vhost/Makefile index
> > cec59d0e0..8c969caaa 100644
> > --- a/examples/vhost/Makefile
> > +++ b/examples/vhost/Makefile
> > @@ -5,7 +5,7 @@
> > APP = vhost-switch
> >
> > # all source are stored in SRCS-y
> > -SRCS-y := main.c virtio_net.c
> > +SRCS-y := main.c virtio_net.c ioat.c
> >
> > # Build using pkg-config variables if possible ifneq ($(shell
> > pkg-config --exists libdpdk && echo 0),0) diff --git
> > a/examples/vhost/ioat.c b/examples/vhost/ioat.c index
> > b2c74f653..6f87d7bba 100644
> > --- a/examples/vhost/ioat.c
> > +++ b/examples/vhost/ioat.c
> > @@ -1,13 +1,17 @@
> > /* SPDX-License-Identifier: BSD-3-Clause
> > * Copyright(c) 2010-2020 Intel Corporation
> > */
> > +#ifdef RTE_RAW_IOAT
> > #include <rte_rawdev.h>
> > #include <rte_ioat_rawdev.h>
> > +#endif /* RTE_RAW_IOAT */
> > #include <sys/uio.h>
> >
> > #include "ioat.h"
> > #include "main.h"
> >
> > +#ifdef RTE_RAW_IOAT
> > +
>
> Minor nit is that we generally include system header files before DPDK
> headers. Following that policy, we can move sys/uio.h up to be before the
> first #ifdef, and then we can just merge the two #ifdefs together to just have
> one at the start and one at the end.
>
> Acked-by: Bruce Richardson <bruce.richardson@intel.com>
Sure, fixed in the next version, thanks a lot.
Cheng
@@ -5,7 +5,7 @@
APP = vhost-switch
# all source are stored in SRCS-y
-SRCS-y := main.c virtio_net.c
+SRCS-y := main.c virtio_net.c ioat.c
# Build using pkg-config variables if possible
ifneq ($(shell pkg-config --exists libdpdk && echo 0),0)
@@ -1,13 +1,17 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2010-2020 Intel Corporation
*/
+#ifdef RTE_RAW_IOAT
#include <rte_rawdev.h>
#include <rte_ioat_rawdev.h>
+#endif /* RTE_RAW_IOAT */
#include <sys/uio.h>
#include "ioat.h"
#include "main.h"
+#ifdef RTE_RAW_IOAT
+
struct dma_for_vhost dma_bind[MAX_VHOST_DEVICE];
struct packet_tracker {
@@ -199,3 +203,5 @@ ioat_check_completed_copies_cb(int vid, uint16_t queue_id,
/* Opaque data is not supported */
return -1;
}
+
+#endif /* RTE_RAW_IOAT */
@@ -24,14 +24,8 @@ struct dma_for_vhost {
uint16_t nr;
};
-#ifdef RTE_ARCH_X86
+#ifdef RTE_RAW_IOAT
int open_ioat(const char *value);
-#else
-static int open_ioat(const char *value __rte_unused)
-{
- return -1;
-}
-#endif
uint32_t
ioat_transfer_data_cb(int vid, uint16_t queue_id,
@@ -42,4 +36,28 @@ uint32_t
ioat_check_completed_copies_cb(int vid, uint16_t queue_id,
struct rte_vhost_async_status *opaque_data,
uint16_t max_packets);
+#else
+static int open_ioat(const char *value __rte_unused)
+{
+ return -1;
+}
+
+static uint32_t
+ioat_transfer_data_cb(int vid __rte_unused, uint16_t queue_id __rte_unused,
+ struct rte_vhost_async_desc *descs __rte_unused,
+ struct rte_vhost_async_status *opaque_data __rte_unused,
+ uint16_t count __rte_unused)
+{
+ return -1;
+}
+
+static uint32_t
+ioat_check_completed_copies_cb(int vid __rte_unused,
+ uint16_t queue_id __rte_unused,
+ struct rte_vhost_async_status *opaque_data __rte_unused,
+ uint16_t max_packets __rte_unused)
+{
+ return -1;
+}
+#endif
#endif /* _IOAT_H_ */
@@ -1294,13 +1294,6 @@ new_device(int vid)
int lcore, core_add = 0;
uint32_t device_num_min = num_devices;
struct vhost_dev *vdev;
-
- struct rte_vhost_async_channel_ops channel_ops = {
- .transfer_data = ioat_transfer_data_cb,
- .check_completed_copies = ioat_check_completed_copies_cb
- };
- struct rte_vhost_async_features f;
-
vdev = rte_zmalloc("vhost device", sizeof(*vdev), RTE_CACHE_LINE_SIZE);
if (vdev == NULL) {
RTE_LOG(INFO, VHOST_DATA,
@@ -1342,10 +1335,17 @@ new_device(int vid)
vid, vdev->coreid);
if (async_vhost_driver) {
- f.async_inorder = 1;
- f.async_threshold = 256;
- return rte_vhost_async_channel_register(vid, VIRTIO_RXQ,
- f.intval, &channel_ops);
+ struct rte_vhost_async_features f;
+ struct rte_vhost_async_channel_ops channel_ops;
+ if (strncmp(dma_type, "ioat", 4) == 0) {
+ channel_ops.transfer_data = ioat_transfer_data_cb;
+ channel_ops.check_completed_copies =
+ ioat_check_completed_copies_cb;
+ f.async_inorder = 1;
+ f.async_threshold = 256;
+ return rte_vhost_async_channel_register(vid, VIRTIO_RXQ,
+ f.intval, &channel_ops);
+ }
}
return 0;
@@ -15,7 +15,7 @@ sources = files(
'main.c', 'virtio_net.c'
)
-if dpdk_conf.has('RTE_ARCH_X86')
+if dpdk_conf.has('RTE_RAW_IOAT')
deps += 'raw_ioat'
sources += files('ioat.c')
endif