From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <jianfeng.tan@intel.com>
Received: from mga17.intel.com (mga17.intel.com [192.55.52.151])
by dpdk.org (Postfix) with ESMTP id 1CC1223D
for <dev@dpdk.org>; Tue, 6 Mar 2018 10:37:51 +0100 (CET)
X-Amp-Result: SKIPPED(no attachment in message)
X-Amp-File-Uploaded: False
Received: from fmsmga003.fm.intel.com ([10.253.24.29])
by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;
06 Mar 2018 01:37:51 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.47,430,1515484800"; d="scan'208";a="31714920"
Received: from fmsmsx107.amr.corp.intel.com ([10.18.124.205])
by FMSMGA003.fm.intel.com with ESMTP; 06 Mar 2018 01:37:51 -0800
Received: from fmsmsx120.amr.corp.intel.com (10.18.124.208) by
fmsmsx107.amr.corp.intel.com (10.18.124.205) with Microsoft SMTP Server (TLS)
id 14.3.319.2; Tue, 6 Mar 2018 01:37:50 -0800
Received: from shsmsx102.ccr.corp.intel.com (10.239.4.154) by
fmsmsx120.amr.corp.intel.com (10.18.124.208) with Microsoft SMTP Server (TLS)
id 14.3.319.2; Tue, 6 Mar 2018 01:37:50 -0800
Received: from shsmsx103.ccr.corp.intel.com ([169.254.4.116]) by
shsmsx102.ccr.corp.intel.com ([169.254.2.124]) with mapi id 14.03.0319.002;
Tue, 6 Mar 2018 17:37:47 +0800
From: "Tan, Jianfeng" <jianfeng.tan@intel.com>
To: "Wang, Zhihong" <zhihong.wang@intel.com>, "dev@dpdk.org" <dev@dpdk.org>
CC: "Bie, Tiwei" <tiwei.bie@intel.com>, "maxime.coquelin@redhat.com"
<maxime.coquelin@redhat.com>, "yliu@fridaylinux.org" <yliu@fridaylinux.org>,
"Liang, Cunming" <cunming.liang@intel.com>, "Wang, Xiao W"
<xiao.w.wang@intel.com>, "Daly, Dan" <dan.daly@intel.com>
Thread-Topic: [PATCH v2 1/6] vhost: export vhost feature definitions
Thread-Index: AQHTtGM/pA0zfhtk/kGYJYK2AkXerKPC8ESQ
Date: Tue, 6 Mar 2018 09:37:48 +0000
Message-ID: <ED26CBA2FAD1BF48A8719AEF02201E3651463B51@SHSMSX103.ccr.corp.intel.com>
References: <1517614137-62926-1-git-send-email-zhihong.wang@intel.com>
<20180213092106.57996-1-zhihong.wang@intel.com>
<20180213092106.57996-2-zhihong.wang@intel.com>
In-Reply-To: <20180213092106.57996-2-zhihong.wang@intel.com>
Accept-Language: en-US
Content-Language: en-US
X-MS-Has-Attach:
X-MS-TNEF-Correlator:
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 1/6] vhost: export vhost feature
definitions
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.15
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://dpdk.org/ml/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://dpdk.org/ml/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://dpdk.org/ml/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
X-List-Received-Date: Tue, 06 Mar 2018 09:37:52 -0000
> -----Original Message-----
> From: Wang, Zhihong
> Sent: Tuesday, February 13, 2018 5:21 PM
> To: dev@dpdk.org
> Cc: Tan, Jianfeng; Bie, Tiwei; maxime.coquelin@redhat.com;
> yliu@fridaylinux.org; Liang, Cunming; Wang, Xiao W; Daly, Dan; Wang,
> Zhihong
> Subject: [PATCH v2 1/6] vhost: export vhost feature definitions
>=20
> This patch exports vhost-user protocol features to support device driver
> development.
>=20
> Signed-off-by: Zhihong Wang <zhihong.wang@intel.com>
> ---
> lib/librte_vhost/rte_vhost.h | 8 ++++++++
> lib/librte_vhost/vhost.h | 4 +---
> lib/librte_vhost/vhost_user.c | 9 +++++----
> lib/librte_vhost/vhost_user.h | 20 +++++++-------------
> 4 files changed, 21 insertions(+), 20 deletions(-)
>=20
> diff --git a/lib/librte_vhost/rte_vhost.h b/lib/librte_vhost/rte_vhost.h
> index d33206997..b05162366 100644
> --- a/lib/librte_vhost/rte_vhost.h
> +++ b/lib/librte_vhost/rte_vhost.h
> @@ -29,6 +29,14 @@ extern "C" {
> #define RTE_VHOST_USER_DEQUEUE_ZERO_COPY (1ULL << 2)
> #define RTE_VHOST_USER_IOMMU_SUPPORT (1ULL << 3)
>=20
> +#define RTE_VHOST_USER_PROTOCOL_F_MQ 0
Instead of adding a "RTE_" prefix. I prefer to define it like this:
#ifndef VHOST_USER_PROTOCOL_F_MQ
#define VHOST_USER_PROTOCOL_F_MQ =
0
#endif
Similar to other macros.
> +#define RTE_VHOST_USER_PROTOCOL_F_LOG_SHMFD 1
> +#define RTE_VHOST_USER_PROTOCOL_F_RARP 2
> +#define RTE_VHOST_USER_PROTOCOL_F_REPLY_ACK 3
> +#define RTE_VHOST_USER_PROTOCOL_F_NET_MTU 4
> +#define RTE_VHOST_USER_PROTOCOL_F_SLAVE_REQ 5
> +#define RTE_VHOST_USER_F_PROTOCOL_FEATURES 30
> +
> /**
> * Information relating to memory regions including offsets to
> * addresses in QEMUs memory file.
> diff --git a/lib/librte_vhost/vhost.h b/lib/librte_vhost/vhost.h
> index 58aec2e0d..a0b0520e2 100644
> --- a/lib/librte_vhost/vhost.h
> +++ b/lib/librte_vhost/vhost.h
> @@ -174,8 +174,6 @@ struct vhost_msg {
> #define VIRTIO_F_VERSION_1 32
> #endif
>=20
> -#define VHOST_USER_F_PROTOCOL_FEATURES 30
> -
> /* Features supported by this builtin vhost-user net driver. */
> #define VIRTIO_NET_SUPPORTED_FEATURES ((1ULL <<
> VIRTIO_NET_F_MRG_RXBUF) | \
> (1ULL << VIRTIO_F_ANY_LAYOUT) | \
> @@ -185,7 +183,7 @@ struct vhost_msg {
> (1ULL << VIRTIO_NET_F_MQ) | \
> (1ULL << VIRTIO_F_VERSION_1) | \
> (1ULL << VHOST_F_LOG_ALL) | \
> - (1ULL <<
> VHOST_USER_F_PROTOCOL_FEATURES) | \
> + (1ULL <<
> RTE_VHOST_USER_F_PROTOCOL_FEATURES) | \
> (1ULL << VIRTIO_NET_F_GSO) | \
> (1ULL << VIRTIO_NET_F_HOST_TSO4) | \
> (1ULL << VIRTIO_NET_F_HOST_TSO6) | \
> diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.=
c
> index 5c5361066..c93e48e4d 100644
> --- a/lib/librte_vhost/vhost_user.c
> +++ b/lib/librte_vhost/vhost_user.c
> @@ -527,7 +527,7 @@ vhost_user_set_vring_addr(struct virtio_net **pdev,
> VhostUserMsg *msg)
> vring_invalidate(dev, vq);
>=20
> if (vq->enabled && (dev->features &
> - (1ULL <<
> VHOST_USER_F_PROTOCOL_FEATURES))) {
> + (1ULL <<
> RTE_VHOST_USER_F_PROTOCOL_FEATURES))) {
> dev =3D translate_ring_addresses(dev, msg-
> >payload.addr.index);
> if (!dev)
> return -1;
> @@ -897,11 +897,11 @@ vhost_user_set_vring_kick(struct virtio_net
> **pdev, struct VhostUserMsg *pmsg)
> vq =3D dev->virtqueue[file.index];
>=20
> /*
> - * When VHOST_USER_F_PROTOCOL_FEATURES is not negotiated,
> + * When RTE_VHOST_USER_F_PROTOCOL_FEATURES is not
> negotiated,
> * the ring starts already enabled. Otherwise, it is enabled via
> * the SET_VRING_ENABLE message.
> */
> - if (!(dev->features & (1ULL <<
> VHOST_USER_F_PROTOCOL_FEATURES)))
> + if (!(dev->features & (1ULL <<
> RTE_VHOST_USER_F_PROTOCOL_FEATURES)))
> vq->enabled =3D 1;
>=20
> if (vq->kickfd >=3D 0)
> @@ -1012,7 +1012,8 @@ vhost_user_get_protocol_features(struct
> virtio_net *dev,
> * Qemu versions (from v2.7.0 to v2.9.0).
> */
> if (!(features & (1ULL << VIRTIO_F_IOMMU_PLATFORM)))
> - protocol_features &=3D ~(1ULL <<
> VHOST_USER_PROTOCOL_F_REPLY_ACK);
> + protocol_features &=3D
> + ~(1ULL <<
> RTE_VHOST_USER_PROTOCOL_F_REPLY_ACK);
>=20
> msg->payload.u64 =3D protocol_features;
> msg->size =3D sizeof(msg->payload.u64);
> diff --git a/lib/librte_vhost/vhost_user.h b/lib/librte_vhost/vhost_user.=
h
> index 0fafbe6e0..066e772dd 100644
> --- a/lib/librte_vhost/vhost_user.h
> +++ b/lib/librte_vhost/vhost_user.h
> @@ -14,19 +14,13 @@
>=20
> #define VHOST_MEMORY_MAX_NREGIONS 8
>=20
> -#define VHOST_USER_PROTOCOL_F_MQ 0
> -#define VHOST_USER_PROTOCOL_F_LOG_SHMFD 1
> -#define VHOST_USER_PROTOCOL_F_RARP 2
> -#define VHOST_USER_PROTOCOL_F_REPLY_ACK 3
> -#define VHOST_USER_PROTOCOL_F_NET_MTU 4
> -#define VHOST_USER_PROTOCOL_F_SLAVE_REQ 5
> -
> -#define VHOST_USER_PROTOCOL_FEATURES ((1ULL <<
> VHOST_USER_PROTOCOL_F_MQ) | \
> - (1ULL <<
> VHOST_USER_PROTOCOL_F_LOG_SHMFD) |\
> - (1ULL <<
> VHOST_USER_PROTOCOL_F_RARP) | \
> - (1ULL <<
> VHOST_USER_PROTOCOL_F_REPLY_ACK) | \
> - (1ULL <<
> VHOST_USER_PROTOCOL_F_NET_MTU) | \
> - (1ULL <<
> VHOST_USER_PROTOCOL_F_SLAVE_REQ))
> +#define VHOST_USER_PROTOCOL_FEATURES \
> + ((1ULL << RTE_VHOST_USER_PROTOCOL_F_MQ) | \
> + (1ULL <<
> RTE_VHOST_USER_PROTOCOL_F_LOG_SHMFD) |\
> + (1ULL << RTE_VHOST_USER_PROTOCOL_F_RARP) | \
> + (1ULL <<
> RTE_VHOST_USER_PROTOCOL_F_REPLY_ACK) | \
> + (1ULL <<
> RTE_VHOST_USER_PROTOCOL_F_NET_MTU) | \
> + (1ULL <<
> RTE_VHOST_USER_PROTOCOL_F_SLAVE_REQ))
>=20
> typedef enum VhostUserRequest {
> VHOST_USER_NONE =3D 0,
> --
> 2.13.6