From patchwork Tue Jan 19 21:24:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 86924 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 19A65A0A05; Tue, 19 Jan 2021 22:29:38 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 444A8140F59; Tue, 19 Jan 2021 22:27:47 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by mails.dpdk.org (Postfix) with ESMTP id E872D140F52 for ; Tue, 19 Jan 2021 22:27:44 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1611091664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4qU5UhLhL27n/3iDE28T3U2Ff2KljPARFMHfuIM90U4=; b=AKy4FejBlpEH7g35GgX3uqQkYkWex8kJSa6wQGRZJT4u2GEQascuOHT1AuXI16liCPUA4W PbfAolLOCRzLYrnGuyQKrLDxmdM5/60ONyb/sT+M3z9juurKzhMixrX3+tfBitaQ+f2Zbw sEAh93UCRMzQhjgjKh2Hh1Q+VDRy4bA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-549-j4AavK1hOWGW_ZcAhAxmgA-1; Tue, 19 Jan 2021 16:27:42 -0500 X-MC-Unique: j4AavK1hOWGW_ZcAhAxmgA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 7480D180A098; Tue, 19 Jan 2021 21:27:41 +0000 (UTC) Received: from max-t490s.redhat.com (unknown [10.36.110.29]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0A09F5D9DD; Tue, 19 Jan 2021 21:27:39 +0000 (UTC) From: Maxime Coquelin To: dev@dpdk.org, chenbo.xia@intel.com, olivier.matz@6wind.com, amorenoz@redhat.com, david.marchand@redhat.com Cc: Maxime Coquelin Date: Tue, 19 Jan 2021 22:24:51 +0100 Message-Id: <20210119212507.1043636-29-maxime.coquelin@redhat.com> In-Reply-To: <20210119212507.1043636-1-maxime.coquelin@redhat.com> References: <20210119212507.1043636-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=maxime.coquelin@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [dpdk-dev] [PATCH v2 28/44] net/virtio: add Virtio-user protocol features ops X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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 introduces new callbacks for getting and setting Vhost-user protocol features. Signed-off-by: Maxime Coquelin --- drivers/net/virtio/virtio_user/vhost.h | 2 + drivers/net/virtio/virtio_user/vhost_user.c | 64 +++++++++++++++++-- drivers/net/virtio/virtio_user/vhost_vdpa.c | 14 ++++ .../net/virtio/virtio_user/virtio_user_dev.c | 14 ++-- drivers/net/virtio/virtio_user_ethdev.c | 14 ++-- 5 files changed, 82 insertions(+), 26 deletions(-) diff --git a/drivers/net/virtio/virtio_user/vhost.h b/drivers/net/virtio/virtio_user/vhost.h index 13a88c7671..d805526130 100644 --- a/drivers/net/virtio/virtio_user/vhost.h +++ b/drivers/net/virtio/virtio_user/vhost.h @@ -112,6 +112,8 @@ struct virtio_user_backend_ops { int (*set_owner)(struct virtio_user_dev *dev); int (*get_features)(struct virtio_user_dev *dev, uint64_t *features); int (*set_features)(struct virtio_user_dev *dev, uint64_t features); + int (*get_protocol_features)(struct virtio_user_dev *dev, uint64_t *features); + int (*set_protocol_features)(struct virtio_user_dev *dev, uint64_t features); int (*send_request)(struct virtio_user_dev *dev, enum vhost_user_request req, void *arg); diff --git a/drivers/net/virtio/virtio_user/vhost_user.c b/drivers/net/virtio/virtio_user/vhost_user.c index 8e5bf332d6..4877574f72 100644 --- a/drivers/net/virtio/virtio_user/vhost_user.c +++ b/drivers/net/virtio/virtio_user/vhost_user.c @@ -201,6 +201,62 @@ vhost_user_set_features(struct virtio_user_dev *dev, uint64_t features) return 0; } +static int +vhost_user_get_protocol_features(struct virtio_user_dev *dev, uint64_t *features) +{ + int ret; + struct vhost_user_msg msg = { + .request = VHOST_USER_GET_PROTOCOL_FEATURES, + .flags = VHOST_USER_VERSION, + }; + + ret = vhost_user_write(dev->vhostfd, &msg, NULL, 0); + if (ret < 0) + goto err; + + ret = vhost_user_read(dev->vhostfd, &msg); + if (ret < 0) + goto err; + + if (msg.request != VHOST_USER_GET_PROTOCOL_FEATURES) { + PMD_DRV_LOG(ERR, "Unexpected request type (%d)", msg.request); + goto err; + } + + if (msg.size != sizeof(*features)) { + PMD_DRV_LOG(ERR, "Unexpected payload size (%u)", msg.size); + goto err; + } + + *features = msg.payload.u64; + + return 0; +err: + PMD_DRV_LOG(ERR, "Failed to get backend protocol features"); + + return -1; +} + +static int +vhost_user_set_protocol_features(struct virtio_user_dev *dev, uint64_t features) +{ + int ret; + struct vhost_user_msg msg = { + .request = VHOST_USER_SET_PROTOCOL_FEATURES, + .flags = VHOST_USER_VERSION, + .size = sizeof(features), + .payload.u64 = features, + }; + + ret = vhost_user_write(dev->vhostfd, &msg, NULL, 0); + if (ret < 0) { + PMD_DRV_LOG(ERR, "Failed to set protocol features"); + return -1; + } + + return 0; +} + struct walk_arg { struct vhost_memory *vm; int *fds; @@ -315,8 +371,6 @@ const char * const vhost_msg_strings[] = { [VHOST_USER_SET_VRING_KICK] = "VHOST_SET_VRING_KICK", [VHOST_USER_SET_MEM_TABLE] = "VHOST_SET_MEM_TABLE", [VHOST_USER_SET_VRING_ENABLE] = "VHOST_SET_VRING_ENABLE", - [VHOST_USER_GET_PROTOCOL_FEATURES] = "VHOST_USER_GET_PROTOCOL_FEATURES", - [VHOST_USER_SET_PROTOCOL_FEATURES] = "VHOST_USER_SET_PROTOCOL_FEATURES", [VHOST_USER_SET_STATUS] = "VHOST_SET_STATUS", [VHOST_USER_GET_STATUS] = "VHOST_GET_STATUS", }; @@ -354,8 +408,6 @@ vhost_user_sock(struct virtio_user_dev *dev, (!(dev->protocol_features & (1ULL << VHOST_USER_PROTOCOL_F_STATUS)))) return -ENOTSUP; - /* Fallthrough */ - case VHOST_USER_GET_PROTOCOL_FEATURES: need_reply = 1; break; @@ -368,7 +420,6 @@ vhost_user_sock(struct virtio_user_dev *dev, if (has_reply_ack) msg.flags |= VHOST_USER_NEED_REPLY_MASK; /* Fallthrough */ - case VHOST_USER_SET_PROTOCOL_FEATURES: case VHOST_USER_SET_LOG_BASE: msg.payload.u64 = *((__u64 *)arg); msg.size = sizeof(m.payload.u64); @@ -454,7 +505,6 @@ vhost_user_sock(struct virtio_user_dev *dev, switch (req) { case VHOST_USER_GET_STATUS: - case VHOST_USER_GET_PROTOCOL_FEATURES: if (msg.size != sizeof(m.payload.u64)) { PMD_DRV_LOG(ERR, "Received bad msg size"); return -1; @@ -592,6 +642,8 @@ struct virtio_user_backend_ops virtio_ops_user = { .set_owner = vhost_user_set_owner, .get_features = vhost_user_get_features, .set_features = vhost_user_set_features, + .get_protocol_features = vhost_user_get_protocol_features, + .set_protocol_features = vhost_user_set_protocol_features, .send_request = vhost_user_sock, .enable_qp = vhost_user_enable_queue_pair }; diff --git a/drivers/net/virtio/virtio_user/vhost_vdpa.c b/drivers/net/virtio/virtio_user/vhost_vdpa.c index 22a329526a..f627afbcfc 100644 --- a/drivers/net/virtio/virtio_user/vhost_vdpa.c +++ b/drivers/net/virtio/virtio_user/vhost_vdpa.c @@ -105,6 +105,18 @@ vhost_vdpa_set_owner(struct virtio_user_dev *dev) return vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_OWNER, NULL); } +static int +vhost_vdpa_get_backend_features(struct virtio_user_dev *dev, uint64_t *features) +{ + return vhost_vdpa_ioctl(dev->vhostfd, VHOST_GET_BACKEND_FEATURES, features); +} + +static int +vhost_vdpa_set_backend_features(struct virtio_user_dev *dev, uint64_t features) +{ + return vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_BACKEND_FEATURES, &features); +} + static int vhost_vdpa_get_features(struct virtio_user_dev *dev, uint64_t *features) { @@ -447,6 +459,8 @@ struct virtio_user_backend_ops virtio_ops_vdpa = { .set_owner = vhost_vdpa_set_owner, .get_features = vhost_vdpa_get_features, .set_features = vhost_vdpa_set_features, + .get_protocol_features = vhost_vdpa_get_backend_features, + .set_protocol_features = vhost_vdpa_set_backend_features, .send_request = vhost_vdpa_send_request, .enable_qp = vhost_vdpa_enable_queue_pair, .dma_map = vhost_vdpa_dma_map_batch, diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c index 1f3bbae663..45417bbc5d 100644 --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c @@ -505,22 +505,16 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char *path, int queues, if ((dev->device_features & (1ULL << VHOST_USER_F_PROTOCOL_FEATURES)) || (dev->backend_type == VIRTIO_USER_BACKEND_VHOST_VDPA)) { - if (dev->ops->send_request(dev, - VHOST_USER_GET_PROTOCOL_FEATURES, - &protocol_features)) + if (dev->ops->get_protocol_features(dev, &protocol_features)) return -1; dev->protocol_features &= protocol_features; - if (dev->ops->send_request(dev, - VHOST_USER_SET_PROTOCOL_FEATURES, - &dev->protocol_features)) + if (dev->ops->set_protocol_features(dev, dev->protocol_features)) return -1; - if (!(dev->protocol_features & - (1ULL << VHOST_USER_PROTOCOL_F_MQ))) - dev->unsupported_features |= - (1ull << VIRTIO_NET_F_MQ); + if (!(dev->protocol_features & (1ULL << VHOST_USER_PROTOCOL_F_MQ))) + dev->unsupported_features |= (1ull << VIRTIO_NET_F_MQ); } } else { /* We just pretend vhost-user can support all these features. diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c index 56c379bc15..5e256f4e6d 100644 --- a/drivers/net/virtio/virtio_user_ethdev.c +++ b/drivers/net/virtio/virtio_user_ethdev.c @@ -93,23 +93,17 @@ virtio_user_server_reconnect(struct virtio_user_dev *dev) if (dev->device_features & (1ULL << VHOST_USER_F_PROTOCOL_FEATURES)) { - if (dev->ops->send_request(dev, - VHOST_USER_GET_PROTOCOL_FEATURES, - &protocol_features)) + if (dev->ops->get_protocol_features(dev, &protocol_features)) return -1; /* Offer VHOST_USER_PROTOCOL_F_STATUS */ - dev->protocol_features |= - (1ULL << VHOST_USER_PROTOCOL_F_STATUS); + dev->protocol_features |= (1ULL << VHOST_USER_PROTOCOL_F_STATUS); dev->protocol_features &= protocol_features; - if (dev->ops->send_request(dev, - VHOST_USER_SET_PROTOCOL_FEATURES, - &dev->protocol_features)) + if (dev->ops->set_protocol_features(dev, dev->protocol_features)) return -1; - if (!(dev->protocol_features & - (1ULL << VHOST_USER_PROTOCOL_F_MQ))) + if (!(dev->protocol_features & (1ULL << VHOST_USER_PROTOCOL_F_MQ))) dev->unsupported_features |= (1ull << VIRTIO_NET_F_MQ); }