From patchwork Sun Dec 20 21:13:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 85553 X-Patchwork-Delegate: maxime.coquelin@redhat.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 06E5BA09FD; Sun, 20 Dec 2020 22:23:38 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B96CECC19; Sun, 20 Dec 2020 22:16:18 +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 0FB99CBF1 for ; Sun, 20 Dec 2020 22:16:16 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608498975; 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=UGM+v1hjJ2UJmGj78ExypFNx7m4hMMnexVEiC6ZtwJk=; b=WRmcoj6hul82Edm8lSYC5FMOiSnmdRefB3oYfGG8g7P7/Yj/PS+fhIX2HI8Jglacq1pjgs qbxvX0RO54KMu2xTp4MzgVdsne3UmfJA5IQsNCpZsSPDTGqMDyk9ohPJKuF0bzys7kcVqd kCJrfJxVb7oRpOIoBn26elc5OUv5oJc= 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-370-zoe3yM9NNta36QaLHw9d_A-1; Sun, 20 Dec 2020 16:16:12 -0500 X-MC-Unique: zoe3yM9NNta36QaLHw9d_A-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 9018E800D53; Sun, 20 Dec 2020 21:16:10 +0000 (UTC) Received: from max-t490s.redhat.com (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id C1B1B60C43; Sun, 20 Dec 2020 21:16:06 +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:54 +0100 Message-Id: <20201220211405.313012-30-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 Subject: [dpdk-dev] [PATCH 29/40] net/virtio: add Virtio-user vring file 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 new callbacks for setting vring files (kick and call). Signed-off-by: Maxime Coquelin --- drivers/net/virtio/virtio_user/vhost.h | 2 + drivers/net/virtio/virtio_user/vhost_kernel.c | 41 +++++++++++++++-- drivers/net/virtio/virtio_user/vhost_user.c | 46 +++++++++++++++++-- drivers/net/virtio/virtio_user/vhost_vdpa.c | 18 ++++++-- .../net/virtio/virtio_user/virtio_user_dev.c | 4 +- 5 files changed, 97 insertions(+), 14 deletions(-) diff --git a/drivers/net/virtio/virtio_user/vhost.h b/drivers/net/virtio/virtio_user/vhost.h index 1385c1563b..b296ee215d 100644 --- a/drivers/net/virtio/virtio_user/vhost.h +++ b/drivers/net/virtio/virtio_user/vhost.h @@ -111,6 +111,8 @@ struct virtio_user_backend_ops { int (*set_vring_num)(struct virtio_user_dev *dev, struct vhost_vring_state *state); int (*set_vring_base)(struct virtio_user_dev *dev, struct vhost_vring_state *state); 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 (*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 2f1b4840ee..1805aee7f7 100644 --- a/drivers/net/virtio/virtio_user/vhost_kernel.c +++ b/drivers/net/virtio/virtio_user/vhost_kernel.c @@ -259,11 +259,44 @@ vhost_kernel_get_vring_base(struct virtio_user_dev *dev, struct vhost_vring_stat return vhost_kernel_set_vring(dev, VHOST_GET_VRING_BASE, state); } +static int +vhost_kernel_set_vring_file(struct virtio_user_dev *dev, uint64_t req, + struct vhost_vring_file *file) +{ + int ret, fd; + uint32_t index = file->index; + + /* Convert from queue index to queue-pair & offset */ + fd = dev->vhostfds[file->index / 2]; + file->index %= 2; + + ret = vhost_kernel_ioctl(fd, req, file); + if (ret < 0) { + PMD_DRV_LOG(ERR, "Failed to set vring file (request %lu)", req); + return -1; + } + + /* restore index back to queue index */ + file->index = index; + + return 0; +} + +static int +vhost_kernel_set_vring_kick(struct virtio_user_dev *dev, struct vhost_vring_file *file) +{ + return vhost_kernel_set_vring_file(dev, VHOST_SET_VRING_CALL, file); +} + +static int +vhost_kernel_set_vring_call(struct virtio_user_dev *dev, struct vhost_vring_file *file) +{ + return vhost_kernel_set_vring_file(dev, VHOST_SET_VRING_KICK, file); +} + static uint64_t vhost_req_user_to_kernel[] = { [VHOST_USER_RESET_OWNER] = VHOST_RESET_OWNER, - [VHOST_USER_SET_VRING_CALL] = VHOST_SET_VRING_CALL, [VHOST_USER_SET_VRING_ADDR] = VHOST_SET_VRING_ADDR, - [VHOST_USER_SET_VRING_KICK] = VHOST_SET_VRING_KICK, }; static int @@ -283,8 +316,6 @@ vhost_kernel_send_request(struct virtio_user_dev *dev, switch (req_kernel) { case VHOST_SET_VRING_ADDR: - case VHOST_SET_VRING_KICK: - case VHOST_SET_VRING_CALL: queue_sel = *(unsigned int *)arg; vhostfd = dev->vhostfds[queue_sel / 2]; *(unsigned int *)arg = queue_sel % 2; @@ -440,6 +471,8 @@ struct virtio_user_backend_ops virtio_ops_kernel = { .set_vring_num = vhost_kernel_set_vring_num, .set_vring_base = vhost_kernel_set_vring_base, .get_vring_base = vhost_kernel_get_vring_base, + .set_vring_call = vhost_kernel_set_vring_call, + .set_vring_kick = vhost_kernel_set_vring_kick, .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 50a587fab4..509a96dfbc 100644 --- a/drivers/net/virtio/virtio_user/vhost_user.c +++ b/drivers/net/virtio/virtio_user/vhost_user.c @@ -483,13 +483,51 @@ vhost_user_get_vring_base(struct virtio_user_dev *dev, struct vhost_vring_state return -1; } +static int +vhost_user_set_vring_file(struct virtio_user_dev *dev, enum vhost_user_request req, + struct vhost_vring_file *file) +{ + int ret; + int fd = file->fd; + int num_fd = 0; + struct vhost_user_msg msg = { + .request = req, + .flags = VHOST_USER_VERSION, + .size = sizeof(msg.payload.u64), + .payload.u64 = file->index & VHOST_USER_VRING_IDX_MASK, + }; + + if (fd >= 0) + num_fd++; + else + msg.payload.u64 |= VHOST_USER_VRING_NOFD_MASK; + + ret = vhost_user_write(dev->vhostfd, &msg, &fd, num_fd); + if (ret < 0) { + PMD_DRV_LOG(ERR, "Failed to set vring file (request %d)", req); + return -1; + } + + return 0; +} + +static int +vhost_user_set_vring_call(struct virtio_user_dev *dev, struct vhost_vring_file *file) +{ + return vhost_user_set_vring_file(dev, VHOST_USER_SET_VRING_CALL, file); +} + +static int +vhost_user_set_vring_kick(struct virtio_user_dev *dev, struct vhost_vring_file *file) +{ + return vhost_user_set_vring_file(dev, VHOST_USER_SET_VRING_KICK, file); +} + static struct vhost_user_msg m; const char * const vhost_msg_strings[] = { [VHOST_USER_RESET_OWNER] = "VHOST_RESET_OWNER", - [VHOST_USER_SET_VRING_CALL] = "VHOST_SET_VRING_CALL", [VHOST_USER_SET_VRING_ADDR] = "VHOST_SET_VRING_ADDR", - [VHOST_USER_SET_VRING_KICK] = "VHOST_SET_VRING_KICK", [VHOST_USER_SET_STATUS] = "VHOST_SET_STATUS", [VHOST_USER_GET_STATUS] = "VHOST_GET_STATUS", }; @@ -556,8 +594,6 @@ vhost_user_sock(struct virtio_user_dev *dev, msg.size = sizeof(m.payload.addr); break; - case VHOST_USER_SET_VRING_KICK: - case VHOST_USER_SET_VRING_CALL: case VHOST_USER_SET_VRING_ERR: file = arg; msg.payload.u64 = file->index & VHOST_USER_VRING_IDX_MASK; @@ -729,6 +765,8 @@ struct virtio_user_backend_ops virtio_ops_user = { .set_vring_num = vhost_user_set_vring_num, .set_vring_base = vhost_user_set_vring_base, .get_vring_base = vhost_user_get_vring_base, + .set_vring_call = vhost_user_set_vring_call, + .set_vring_kick = vhost_user_set_vring_kick, .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 c1b790ddc6..48fe3f23e8 100644 --- a/drivers/net/virtio/virtio_user/vhost_vdpa.c +++ b/drivers/net/virtio/virtio_user/vhost_vdpa.c @@ -36,9 +36,7 @@ static uint64_t vhost_req_user_to_vdpa[] = { [VHOST_USER_RESET_OWNER] = VHOST_RESET_OWNER, - [VHOST_USER_SET_VRING_CALL] = VHOST_SET_VRING_CALL, [VHOST_USER_SET_VRING_ADDR] = VHOST_SET_VRING_ADDR, - [VHOST_USER_SET_VRING_KICK] = VHOST_SET_VRING_KICK, [VHOST_USER_SET_STATUS] = VHOST_VDPA_SET_STATUS, [VHOST_USER_GET_STATUS] = VHOST_VDPA_GET_STATUS, }; @@ -238,6 +236,18 @@ vhost_vdpa_get_vring_base(struct virtio_user_dev *dev, struct vhost_vring_state return vhost_vdpa_ioctl(dev->vhostfd, VHOST_GET_VRING_BASE, state); } +static int +vhost_vdpa_set_vring_call(struct virtio_user_dev *dev, struct vhost_vring_file *file) +{ + return vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_VRING_CALL, file); +} + +static int +vhost_vdpa_set_vring_kick(struct virtio_user_dev *dev, struct vhost_vring_file *file) +{ + return vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_VRING_KICK, file); +} + /* 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. */ @@ -267,8 +277,6 @@ vhost_vdpa_send_request(struct virtio_user_dev *dev, switch (req_vdpa) { case VHOST_SET_VRING_ADDR: - case VHOST_SET_VRING_KICK: - case VHOST_SET_VRING_CALL: PMD_DRV_LOG(DEBUG, "vhostfd=%d, index=%u", dev->vhostfd, *(unsigned int *)arg); break; @@ -347,6 +355,8 @@ struct virtio_user_backend_ops virtio_ops_vdpa = { .set_vring_num = vhost_vdpa_set_vring_num, .set_vring_base = vhost_vdpa_set_vring_base, .get_vring_base = vhost_vdpa_get_vring_base, + .set_vring_call = vhost_vdpa_set_vring_call, + .set_vring_kick = vhost_vdpa_set_vring_kick, .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 496a48ee51..e4975838ea 100644 --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c @@ -40,7 +40,7 @@ virtio_user_create_queue(struct virtio_user_dev *dev, uint32_t queue_sel) file.index = queue_sel; file.fd = dev->callfds[queue_sel]; - dev->ops->send_request(dev, VHOST_USER_SET_VRING_CALL, &file); + dev->ops->set_vring_call(dev, &file); return 0; } @@ -89,7 +89,7 @@ virtio_user_kick_queue(struct virtio_user_dev *dev, uint32_t queue_sel) */ file.index = queue_sel; file.fd = dev->kickfds[queue_sel]; - dev->ops->send_request(dev, VHOST_USER_SET_VRING_KICK, &file); + dev->ops->set_vring_kick(dev, &file); return 0; }