From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 6F8F3A09FD; Sun, 20 Dec 2020 22:23:54 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2CCA2CC33; Sun, 20 Dec 2020 22:16:25 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id B2856CC33 for ; Sun, 20 Dec 2020 22:16:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608498981; 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=7DUvftMSvmbyRTNIWIF+DPIPP1DD+jBwrcnwftBNwdE=; b=jCRKvR85Wfpw+mrAFFhu6907RYMDkQSc5tyqn+Y44ow8U90gPXRV0uf1vr5RNOdXQ8MOuC NG2qi0Ca6YlcbsEqsIWGm63h9TtaOrvQWVzqmi88a3LC/Eh4bQ2A/SM/OYu0KjLZdHrIkx gh6OPgh4DIvoxODjyVwBDsP/tC3TdNk= 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-140-ZKGSI1foMzS5CDIvicOGJA-1; Sun, 20 Dec 2020 16:16:19 -0500 X-MC-Unique: ZKGSI1foMzS5CDIvicOGJA-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A54F9107ACE3; Sun, 20 Dec 2020 21:16:18 +0000 (UTC) Received: from max-t490s.redhat.com (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 07E4B60C43; Sun, 20 Dec 2020 21:16:10 +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: Sun, 20 Dec 2020 22:13:55 +0100 Message-Id: <20201220211405.313012-31-maxime.coquelin@redhat.com> In-Reply-To: <20201220211405.313012-1-maxime.coquelin@redhat.com> References: <20201220211405.313012-1-maxime.coquelin@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 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 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Subject: [dpdk-dev] [PATCH 30/40] net/virtio: add Virtio-user vring address ops 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" This patch introduces a new callback for setting vrings addresses. Signed-off-by: Maxime Coquelin --- drivers/net/virtio/virtio_user/vhost.h | 1 + drivers/net/virtio/virtio_user/vhost_kernel.c | 32 +++++++++++++------ drivers/net/virtio/virtio_user/vhost_user.c | 29 +++++++++++++---- drivers/net/virtio/virtio_user/vhost_vdpa.c | 8 ++++- .../net/virtio/virtio_user/virtio_user_dev.c | 2 +- 5 files changed, 55 insertions(+), 17 deletions(-) diff --git a/drivers/net/virtio/virtio_user/vhost.h b/drivers/net/virtio/virtio_user/vhost.h index b296ee215d..956eb58728 100644 --- a/drivers/net/virtio/virtio_user/vhost.h +++ b/drivers/net/virtio/virtio_user/vhost.h @@ -113,6 +113,7 @@ struct virtio_user_backend_ops { int (*get_vring_base)(struct virtio_user_dev *dev, struct vhost_vring_state *state); int (*set_vring_call)(struct virtio_user_dev *dev, struct vhost_vring_file *file); int (*set_vring_kick)(struct virtio_user_dev *dev, struct vhost_vring_file *file); + int (*set_vring_addr)(struct virtio_user_dev *dev, struct vhost_vring_addr *addr); int (*send_request)(struct virtio_user_dev *dev, enum vhost_user_request req, void *arg); diff --git a/drivers/net/virtio/virtio_user/vhost_kernel.c b/drivers/net/virtio/virtio_user/vhost_kernel.c index 1805aee7f7..8cd86b72c6 100644 --- a/drivers/net/virtio/virtio_user/vhost_kernel.c +++ b/drivers/net/virtio/virtio_user/vhost_kernel.c @@ -294,9 +294,30 @@ vhost_kernel_set_vring_call(struct virtio_user_dev *dev, struct vhost_vring_file return vhost_kernel_set_vring_file(dev, VHOST_SET_VRING_KICK, file); } +static int +vhost_kernel_set_vring_addr(struct virtio_user_dev *dev, struct vhost_vring_addr *addr) +{ + int ret, fd; + uint32_t index = addr->index; + + /* Convert from queue index to queue-pair & offset */ + fd = dev->vhostfds[addr->index / 2]; + addr->index %= 2; + + ret = vhost_kernel_ioctl(fd, VHOST_SET_VRING_ADDR, addr); + if (ret < 0) { + PMD_DRV_LOG(ERR, "Failed to set vring address"); + return -1; + } + + /* restore index back to queue index */ + addr->index = index; + + return 0; +} + static uint64_t vhost_req_user_to_kernel[] = { [VHOST_USER_RESET_OWNER] = VHOST_RESET_OWNER, - [VHOST_USER_SET_VRING_ADDR] = VHOST_SET_VRING_ADDR, }; static int @@ -308,20 +329,12 @@ vhost_kernel_send_request(struct virtio_user_dev *dev, unsigned int i; uint64_t req_kernel; int vhostfd; - unsigned int queue_sel; PMD_DRV_LOG(INFO, "%s", vhost_msg_strings[req]); req_kernel = vhost_req_user_to_kernel[req]; switch (req_kernel) { - case VHOST_SET_VRING_ADDR: - queue_sel = *(unsigned int *)arg; - vhostfd = dev->vhostfds[queue_sel / 2]; - *(unsigned int *)arg = queue_sel % 2; - PMD_DRV_LOG(DEBUG, "vhostfd=%d, index=%u", - vhostfd, *(unsigned int *)arg); - break; default: vhostfd = -1; } @@ -473,6 +486,7 @@ struct virtio_user_backend_ops virtio_ops_kernel = { .get_vring_base = vhost_kernel_get_vring_base, .set_vring_call = vhost_kernel_set_vring_call, .set_vring_kick = vhost_kernel_set_vring_kick, + .set_vring_addr = vhost_kernel_set_vring_addr, .send_request = vhost_kernel_send_request, .enable_qp = vhost_kernel_enable_queue_pair }; diff --git a/drivers/net/virtio/virtio_user/vhost_user.c b/drivers/net/virtio/virtio_user/vhost_user.c index 509a96dfbc..59cf366683 100644 --- a/drivers/net/virtio/virtio_user/vhost_user.c +++ b/drivers/net/virtio/virtio_user/vhost_user.c @@ -523,11 +523,32 @@ vhost_user_set_vring_kick(struct virtio_user_dev *dev, struct vhost_vring_file * return vhost_user_set_vring_file(dev, VHOST_USER_SET_VRING_KICK, file); } + +static int +vhost_user_set_vring_addr(struct virtio_user_dev *dev, struct vhost_vring_addr *addr) +{ + int ret; + struct vhost_user_msg msg = { + .request = VHOST_USER_SET_VRING_ADDR, + .flags = VHOST_USER_VERSION, + .size = sizeof(*addr), + .payload.addr = *addr, + }; + + ret = vhost_user_write(dev->vhostfd, &msg, NULL, 0); + if (ret < 0) { + PMD_DRV_LOG(ERR, "Failed to send vring addresses"); + return -1; + } + + return 0; +} + + static struct vhost_user_msg m; const char * const vhost_msg_strings[] = { [VHOST_USER_RESET_OWNER] = "VHOST_RESET_OWNER", - [VHOST_USER_SET_VRING_ADDR] = "VHOST_SET_VRING_ADDR", [VHOST_USER_SET_STATUS] = "VHOST_SET_STATUS", [VHOST_USER_GET_STATUS] = "VHOST_GET_STATUS", }; @@ -589,11 +610,6 @@ vhost_user_sock(struct virtio_user_dev *dev, fds[fd_num++] = *((int *)arg); break; - case VHOST_USER_SET_VRING_ADDR: - memcpy(&msg.payload.addr, arg, sizeof(msg.payload.addr)); - msg.size = sizeof(m.payload.addr); - break; - case VHOST_USER_SET_VRING_ERR: file = arg; msg.payload.u64 = file->index & VHOST_USER_VRING_IDX_MASK; @@ -767,6 +783,7 @@ struct virtio_user_backend_ops virtio_ops_user = { .get_vring_base = vhost_user_get_vring_base, .set_vring_call = vhost_user_set_vring_call, .set_vring_kick = vhost_user_set_vring_kick, + .set_vring_addr = vhost_user_set_vring_addr, .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 48fe3f23e8..e09e7c9fb8 100644 --- a/drivers/net/virtio/virtio_user/vhost_vdpa.c +++ b/drivers/net/virtio/virtio_user/vhost_vdpa.c @@ -36,7 +36,6 @@ static uint64_t vhost_req_user_to_vdpa[] = { [VHOST_USER_RESET_OWNER] = VHOST_RESET_OWNER, - [VHOST_USER_SET_VRING_ADDR] = VHOST_SET_VRING_ADDR, [VHOST_USER_SET_STATUS] = VHOST_VDPA_SET_STATUS, [VHOST_USER_GET_STATUS] = VHOST_VDPA_GET_STATUS, }; @@ -248,6 +247,12 @@ vhost_vdpa_set_vring_kick(struct virtio_user_dev *dev, struct vhost_vring_file * return vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_VRING_KICK, file); } +static int +vhost_vdpa_set_vring_addr(struct virtio_user_dev *dev, struct vhost_vring_addr *addr) +{ + return vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_VRING_ADDR, addr); +} + /* with below features, vhost vdpa does not need to do the checksum and TSO, * these info will be passed to virtio_user through virtio net header. */ @@ -357,6 +362,7 @@ struct virtio_user_backend_ops virtio_ops_vdpa = { .get_vring_base = vhost_vdpa_get_vring_base, .set_vring_call = vhost_vdpa_set_vring_call, .set_vring_kick = vhost_vdpa_set_vring_kick, + .set_vring_addr = vhost_vdpa_set_vring_addr, .send_request = vhost_vdpa_send_request, .enable_qp = vhost_vdpa_enable_queue_pair, .dma_map = vhost_vdpa_dma_map, diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c index e4975838ea..48ca7a2548 100644 --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c @@ -81,7 +81,7 @@ virtio_user_kick_queue(struct virtio_user_dev *dev, uint32_t queue_sel) state.num |= (1 << 15); dev->ops->set_vring_base(dev, &state); - dev->ops->send_request(dev, VHOST_USER_SET_VRING_ADDR, &addr); + dev->ops->set_vring_addr(dev, &addr); /* Of all per virtqueue MSGs, make sure VHOST_USER_SET_VRING_KICK comes * lastly because vhost depends on this msg to judge if -- 2.29.2