From patchwork Sun Dec 20 21:14:05 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Coquelin X-Patchwork-Id: 85564 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 6C7E3A09FD; Sun, 20 Dec 2020 22:26:43 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6E873CF35; Sun, 20 Dec 2020 22:16:57 +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 32BC2CBD5 for ; Sun, 20 Dec 2020 22:16:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608499013; 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=Du6jgHnLunRZTqxTD+BLL6HlxAimplNRvn1H5akPA0I=; b=JWj4NnYeZdlr25lLNaW0T83gdmpMJU09/Skrsdn0qZRQGzjNLizkT8MgxFg0jBJzkl7WlX A+wU/B0A7wlr+UbQ2zTs66UB06lnZf+90FwcHOETaqogU/skOTcdifOvKtLaRC5IOtELc8 JSN1NBOObR0v0hqz1IZ7xqP01DYhxbo= 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-266-xWEizeeFOgO_h7GgV4BfUA-1; Sun, 20 Dec 2020 16:16:51 -0500 X-MC-Unique: xWEizeeFOgO_h7GgV4BfUA-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 CADFE107ACE4; Sun, 20 Dec 2020 21:16:50 +0000 (UTC) Received: from max-t490s.redhat.com (unknown [10.36.110.43]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2F4D760C43; Sun, 20 Dec 2020 21:16:49 +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:14:05 +0100 Message-Id: <20201220211405.313012-41-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 40/40] net/virtio: move Vhost-vDPA data to its backend 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" As done earlier for Vhost-user and Vhost-kernel, this patch moves the Vhost-vDPA specific data to its backend file. Signed-off-by: Maxime Coquelin --- drivers/net/virtio/virtio_user/vhost_vdpa.c | 77 ++++++++++++++----- .../net/virtio/virtio_user/virtio_user_dev.h | 3 - 2 files changed, 58 insertions(+), 22 deletions(-) diff --git a/drivers/net/virtio/virtio_user/vhost_vdpa.c b/drivers/net/virtio/virtio_user/vhost_vdpa.c index 0f422ae84a..c9738b462a 100644 --- a/drivers/net/virtio/virtio_user/vhost_vdpa.c +++ b/drivers/net/virtio/virtio_user/vhost_vdpa.c @@ -13,6 +13,10 @@ #include "vhost.h" #include "virtio_user_dev.h" +struct vhost_vdpa_data { + int vhostfd; +}; + /* vhost kernel & vdpa ioctls */ #define VHOST_VIRTIO 0xAF #define VHOST_GET_FEATURES _IOR(VHOST_VIRTIO, 0x00, __u64) @@ -80,15 +84,18 @@ vhost_vdpa_ioctl(int fd, uint64_t request, void *arg) static int vhost_vdpa_set_owner(struct virtio_user_dev *dev) { - return vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_OWNER, NULL); + struct vhost_vdpa_data *data = dev->backend_data; + + return vhost_vdpa_ioctl(data->vhostfd, VHOST_SET_OWNER, NULL); } static int vhost_vdpa_get_features(struct virtio_user_dev *dev, uint64_t *features) { + struct vhost_vdpa_data *data = dev->backend_data; int ret; - ret = vhost_vdpa_ioctl(dev->vhostfd, VHOST_GET_FEATURES, features); + ret = vhost_vdpa_ioctl(data->vhostfd, VHOST_GET_FEATURES, features); if (ret) { PMD_DRV_LOG(ERR, "Failed to get features"); return -1; @@ -103,16 +110,19 @@ vhost_vdpa_get_features(struct virtio_user_dev *dev, uint64_t *features) static int vhost_vdpa_set_features(struct virtio_user_dev *dev, uint64_t features) { + struct vhost_vdpa_data *data = dev->backend_data; + /* WORKAROUND */ features |= 1ULL << VIRTIO_F_IOMMU_PLATFORM; - return vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_FEATURES, &features); + return vhost_vdpa_ioctl(data->vhostfd, VHOST_SET_FEATURES, &features); } static int vhost_vdpa_dma_map(struct virtio_user_dev *dev, void *addr, uint64_t iova, size_t len) { + struct vhost_vdpa_data *data = dev->backend_data; struct vhost_msg msg = {}; msg.type = VHOST_IOTLB_MSG_V2; @@ -122,7 +132,7 @@ vhost_vdpa_dma_map(struct virtio_user_dev *dev, void *addr, msg.iotlb.size = len; msg.iotlb.perm = VHOST_ACCESS_RW; - if (write(dev->vhostfd, &msg, sizeof(msg)) != sizeof(msg)) { + if (write(data->vhostfd, &msg, sizeof(msg)) != sizeof(msg)) { PMD_DRV_LOG(ERR, "Failed to send IOTLB update (%s)", strerror(errno)); return -1; @@ -135,6 +145,7 @@ static int vhost_vdpa_dma_unmap(struct virtio_user_dev *dev, __rte_unused void *addr, uint64_t iova, size_t len) { + struct vhost_vdpa_data *data = dev->backend_data; struct vhost_msg msg = {}; msg.type = VHOST_IOTLB_MSG_V2; @@ -142,7 +153,7 @@ vhost_vdpa_dma_unmap(struct virtio_user_dev *dev, __rte_unused void *addr, msg.iotlb.iova = iova; msg.iotlb.size = len; - if (write(dev->vhostfd, &msg, sizeof(msg)) != sizeof(msg)) { + if (write(data->vhostfd, &msg, sizeof(msg)) != sizeof(msg)) { PMD_DRV_LOG(ERR, "Failed to send IOTLB invalidate (%s)", strerror(errno)); return -1; @@ -208,55 +219,73 @@ vhost_vdpa_set_memory_table(struct virtio_user_dev *dev) static int vhost_vdpa_set_vring_enable(struct virtio_user_dev *dev, struct vhost_vring_state *state) { - return vhost_vdpa_ioctl(dev->vhostfd, VHOST_VDPA_SET_VRING_ENABLE, state); + struct vhost_vdpa_data *data = dev->backend_data; + + return vhost_vdpa_ioctl(data->vhostfd, VHOST_VDPA_SET_VRING_ENABLE, state); } static int vhost_vdpa_set_vring_num(struct virtio_user_dev *dev, struct vhost_vring_state *state) { - return vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_VRING_NUM, state); + struct vhost_vdpa_data *data = dev->backend_data; + + return vhost_vdpa_ioctl(data->vhostfd, VHOST_SET_VRING_NUM, state); } static int vhost_vdpa_set_vring_base(struct virtio_user_dev *dev, struct vhost_vring_state *state) { - return vhost_vdpa_ioctl(dev->vhostfd, VHOST_SET_VRING_BASE, state); + struct vhost_vdpa_data *data = dev->backend_data; + + return vhost_vdpa_ioctl(data->vhostfd, VHOST_SET_VRING_BASE, state); } static int vhost_vdpa_get_vring_base(struct virtio_user_dev *dev, struct vhost_vring_state *state) { - return vhost_vdpa_ioctl(dev->vhostfd, VHOST_GET_VRING_BASE, state); + struct vhost_vdpa_data *data = dev->backend_data; + + return vhost_vdpa_ioctl(data->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); + struct vhost_vdpa_data *data = dev->backend_data; + + return vhost_vdpa_ioctl(data->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); + struct vhost_vdpa_data *data = dev->backend_data; + + return vhost_vdpa_ioctl(data->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); + struct vhost_vdpa_data *data = dev->backend_data; + + return vhost_vdpa_ioctl(data->vhostfd, VHOST_SET_VRING_ADDR, addr); } static int vhost_vdpa_get_status(struct virtio_user_dev *dev, uint8_t *status) { - return vhost_vdpa_ioctl(dev->vhostfd, VHOST_VDPA_GET_STATUS, status); + struct vhost_vdpa_data *data = dev->backend_data; + + return vhost_vdpa_ioctl(data->vhostfd, VHOST_VDPA_GET_STATUS, status); } static int vhost_vdpa_set_status(struct virtio_user_dev *dev, uint8_t status) { - return vhost_vdpa_ioctl(dev->vhostfd, VHOST_VDPA_SET_STATUS, &status); + struct vhost_vdpa_data *data = dev->backend_data; + + return vhost_vdpa_ioctl(data->vhostfd, VHOST_VDPA_SET_STATUS, &status); } /** @@ -269,16 +298,23 @@ vhost_vdpa_set_status(struct virtio_user_dev *dev, uint8_t status) static int vhost_vdpa_setup(struct virtio_user_dev *dev) { + struct vhost_vdpa_data *data; uint32_t did = (uint32_t)-1; - dev->vhostfd = open(dev->path, O_RDWR); - if (dev->vhostfd < 0) { + data = malloc(sizeof(*data)); + if (!data) { + PMD_DRV_LOG(ERR, "(%s) Faidle to allocate backend data", dev->path); + return -1; + } + + data->vhostfd = open(dev->path, O_RDWR); + if (data->vhostfd < 0) { PMD_DRV_LOG(ERR, "Failed to open %s: %s\n", dev->path, strerror(errno)); return -1; } - if (ioctl(dev->vhostfd, VHOST_VDPA_GET_DEVICE_ID, &did) < 0 || + if (ioctl(data->vhostfd, VHOST_VDPA_GET_DEVICE_ID, &did) < 0 || did != VIRTIO_ID_NETWORK) { PMD_DRV_LOG(ERR, "Invalid vdpa device ID: %u\n", did); return -1; @@ -288,9 +324,12 @@ vhost_vdpa_setup(struct virtio_user_dev *dev) } static int -vhost_vdpa_destroy(struct virtio_user_dev *dev __rte_unused) +vhost_vdpa_destroy(struct virtio_user_dev *dev ) { - return; + struct vhost_vdpa_data *data = dev->backend_data; + + close(data->vhostfd); + return 0; } diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.h b/drivers/net/virtio/virtio_user/virtio_user_dev.h index 5a2c9d38dd..2e0d6504f6 100644 --- a/drivers/net/virtio/virtio_user/virtio_user_dev.h +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.h @@ -28,9 +28,6 @@ struct virtio_user_dev { enum virtio_user_backend_type backend_type; bool is_server; /* server or client mode */ - /* for vhost_vdpa backend */ - int vhostfd; - /* for both vhost_user and vhost_kernel */ int callfds[VIRTIO_MAX_VIRTQUEUES]; int kickfds[VIRTIO_MAX_VIRTQUEUES];