From: Maxime Coquelin <maxime.coquelin@redhat.com> To: tiwei.bie@intel.com, zhihong.wang@intel.com, amorenoz@redhat.com, xiao.w.wang@intel.com, dev@dpdk.org, jfreimann@redhat.com Cc: stable@dpdk.org, Maxime Coquelin <maxime.coquelin@redhat.com> Subject: [dpdk-stable] [PATCH 01/15] vhost: remove vhost kernel header inclusion Date: Thu, 29 Aug 2019 09:59:46 +0200 Message-ID: <20190829080000.20806-2-maxime.coquelin@redhat.com> (raw) In-Reply-To: <20190829080000.20806-1-maxime.coquelin@redhat.com> This is preliminary rework for virtio-vdpa driver, in order to avoid conflicts with Virtio PMD headers. Generally, I think it is better not to include kernel headers in RTE headers, especially in the case of Vhost and Virtio which just re-use the kernel definitions, and has no runtime dependencies. In order to not break IFC driver build, the vhost kernel header is now included directly in the driver. Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com> --- drivers/net/ifc/ifcvf_vdpa.c | 1 + lib/librte_vhost/rte_vdpa.h | 1 - lib/librte_vhost/rte_vhost.h | 9 ++++----- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/drivers/net/ifc/ifcvf_vdpa.c b/drivers/net/ifc/ifcvf_vdpa.c index 8de9ef199..40cb15ca8 100644 --- a/drivers/net/ifc/ifcvf_vdpa.c +++ b/drivers/net/ifc/ifcvf_vdpa.c @@ -7,6 +7,7 @@ #include <fcntl.h> #include <sys/ioctl.h> #include <sys/epoll.h> +#include <linux/vhost.h> #include <linux/virtio_net.h> #include <stdbool.h> diff --git a/lib/librte_vhost/rte_vdpa.h b/lib/librte_vhost/rte_vdpa.h index 9a3deb31d..69438210b 100644 --- a/lib/librte_vhost/rte_vdpa.h +++ b/lib/librte_vhost/rte_vdpa.h @@ -14,7 +14,6 @@ #include <stdbool.h> #include <rte_pci.h> -#include "rte_vhost.h" #define MAX_VDPA_NAME_LEN 128 diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h index 7fb172912..62d3c3c36 100644 --- a/lib/librte_vhost/rte_vhost.h +++ b/lib/librte_vhost/rte_vhost.h @@ -20,11 +20,6 @@ extern "C" { #endif -/* These are not C++-aware. */ -#include <linux/vhost.h> -#include <linux/virtio_ring.h> -#include <linux/virtio_net.h> - #define RTE_VHOST_USER_CLIENT (1ULL << 0) #define RTE_VHOST_USER_NO_RECONNECT (1ULL << 1) #define RTE_VHOST_USER_DEQUEUE_ZERO_COPY (1ULL << 2) @@ -72,6 +67,10 @@ extern "C" { #define VHOST_USER_PROTOCOL_F_HOST_NOTIFIER 11 #endif +#ifndef VHOST_F_LOG_ALL +#define VHOST_F_LOG_ALL 26 +#endif + /** Indicate whether protocol features negotiation is supported. */ #ifndef VHOST_USER_F_PROTOCOL_FEATURES #define VHOST_USER_F_PROTOCOL_FEATURES 30 -- 2.21.0
next prev parent reply index Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-08-29 7:59 [dpdk-stable] [PATCH 00/15] Introduce Virtio vDPA driver Maxime Coquelin 2019-08-29 7:59 ` Maxime Coquelin [this message] 2019-09-02 6:03 ` [dpdk-stable] [PATCH 01/15] vhost: remove vhost kernel header inclusion Tiwei Bie 2019-09-03 7:24 ` Maxime Coquelin 2019-08-29 7:59 ` [dpdk-stable] [PATCH 02/15] vhost: configure vDPA as soon as the device is ready Maxime Coquelin 2019-09-02 8:34 ` Ye Xiaolong 2019-09-02 9:02 ` Wang, Xiao W 2019-09-03 7:34 ` Maxime Coquelin 2019-09-03 10:58 ` Wang, Xiao W 2019-08-29 7:59 ` [dpdk-stable] [PATCH 03/15] net/virtio: move control path fonctions in virtqueue file Maxime Coquelin 2019-09-02 6:05 ` Tiwei Bie 2019-08-29 7:59 ` [dpdk-stable] [PATCH 04/15] net/virtio: add virtio PCI subsystem device ID declaration Maxime Coquelin 2019-09-02 6:14 ` Tiwei Bie 2019-09-03 7:25 ` Maxime Coquelin 2019-08-29 7:59 ` [dpdk-stable] [PATCH 05/15] net/virtio: save notify bar ID in virtio HW struct Maxime Coquelin 2019-09-02 6:17 ` Tiwei Bie 2019-08-29 7:59 ` [dpdk-stable] [PATCH 06/15] net/virtio: add skeleton for virtio vDPA driver Maxime Coquelin 2019-09-02 6:27 ` Tiwei Bie 2019-09-03 7:25 ` Maxime Coquelin 2019-08-29 7:59 ` [dpdk-stable] [PATCH 07/15] net/virtio: add vDPA ops to get number of queue Maxime Coquelin 2019-09-02 6:32 ` Tiwei Bie 2019-08-29 7:59 ` [dpdk-stable] [PATCH 08/15] net/virtio: add virtio vDPA op to get features Maxime Coquelin 2019-09-02 6:43 ` Tiwei Bie 2019-09-03 7:27 ` Maxime Coquelin 2019-08-29 7:59 ` [dpdk-stable] [PATCH 09/15] net/virtio: add virtio vDPA op to get protocol features Maxime Coquelin 2019-09-02 6:46 ` Tiwei Bie 2019-08-29 7:59 ` [dpdk-stable] [PATCH 10/15] net/virtio: add vDPA op to configure and start the device Maxime Coquelin 2019-09-03 5:30 ` Tiwei Bie 2019-09-03 7:40 ` Maxime Coquelin 2019-09-03 8:49 ` Tiwei Bie 2019-09-04 4:06 ` Jason Wang 2019-09-04 6:56 ` Maxime Coquelin 2019-09-05 2:57 ` Tiwei Bie 2019-08-29 7:59 ` [dpdk-stable] [PATCH 11/15] net/virtio: add vDPA op to stop and close " Maxime Coquelin 2019-09-02 7:07 ` Tiwei Bie 2019-09-03 7:30 ` Maxime Coquelin 2019-08-29 7:59 ` [dpdk-stable] [PATCH 12/15] net/virtio: add vDPA op to set features Maxime Coquelin 2019-08-29 7:59 ` [dpdk-stable] [PATCH 13/15] net/virtio: add vDPA ops to get VFIO FDs Maxime Coquelin 2019-09-03 4:47 ` Tiwei Bie 2019-08-29 7:59 ` [dpdk-stable] [PATCH 14/15] net/virtio: add vDPA op to get notification area Maxime Coquelin 2019-09-03 5:02 ` Tiwei Bie 2019-09-03 7:36 ` Maxime Coquelin 2019-09-03 8:40 ` Tiwei Bie 2019-08-29 8:00 ` [dpdk-stable] [PATCH 15/15] doc: add documentation for Virtio vDPA driver Maxime Coquelin 2019-09-09 11:55 ` [dpdk-stable] [dpdk-dev] [PATCH 00/15] Introduce " Shahaf Shuler 2019-09-10 7:46 ` Maxime Coquelin 2019-09-10 13:44 ` Shahaf Shuler 2019-09-10 13:56 ` Maxime Coquelin 2019-09-11 5:15 ` Shahaf Shuler 2019-09-11 7:15 ` Maxime Coquelin 2019-10-24 6:32 ` [dpdk-stable] " Maxime Coquelin
Reply instructions: You may reply publically to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20190829080000.20806-2-maxime.coquelin@redhat.com \ --to=maxime.coquelin@redhat.com \ --cc=amorenoz@redhat.com \ --cc=dev@dpdk.org \ --cc=jfreimann@redhat.com \ --cc=stable@dpdk.org \ --cc=tiwei.bie@intel.com \ --cc=xiao.w.wang@intel.com \ --cc=zhihong.wang@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
patches for DPDK stable branches Archives are clonable: git clone --mirror http://inbox.dpdk.org/stable/0 stable/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 stable stable/ http://inbox.dpdk.org/stable \ stable@dpdk.org public-inbox-index stable Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.stable AGPL code for this site: git clone https://public-inbox.org/ public-inbox