From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from dpdk.org (dpdk.org [92.243.14.124])
by inbox.dpdk.org (Postfix) with ESMTP id B4B0BA09FD;
Sun, 20 Dec 2020 22:24:27 +0100 (CET)
Received: from [92.243.14.124] (localhost [127.0.0.1])
by dpdk.org (Postfix) with ESMTP id 3DDBFCE8B;
Sun, 20 Dec 2020 22:16:32 +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 586E1CE8A
for <dev@dpdk.org>; Sun, 20 Dec 2020 22:16:29 +0100 (CET)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;
s=mimecast20190719; t=1608498987;
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=90MzPkDX+xD6Plj9y4yNgK6qNcHEJYVxqSoS2xLHO9Y=;
b=GGTK6ljUOdM981Zpr+p7GgJG/Xhmov3zELK+KpGQO5MhYWZ1nLdOnApsd+jvv/MOsi8aK8
0jfyDhwR1Dbzb+HKsEKOB5aVh75oCYznZP3Hc1ueXAdmAUiqH2v2ve1rE6b0r37PaQC5Xq
J+muU50Ch1dRx8TrX7G/008u4cTxo+A=
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-350-gk577GWcNjusEAGmWxDrfg-1; Sun, 20 Dec 2020 16:16:25 -0500
X-MC-Unique: gk577GWcNjusEAGmWxDrfg-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 E21D3800D62;
Sun, 20 Dec 2020 21:16:24 +0000 (UTC)
Received: from max-t490s.redhat.com (unknown [10.36.110.43])
by smtp.corp.redhat.com (Postfix) with ESMTP id 0351460C43;
Sun, 20 Dec 2020 21:16:22 +0000 (UTC)
From: Maxime Coquelin <maxime.coquelin@redhat.com>
To: dev@dpdk.org, chenbo.xia@intel.com, olivier.matz@6wind.com,
amorenoz@redhat.com, david.marchand@redhat.com
Cc: Maxime Coquelin <maxime.coquelin@redhat.com>
Date: Sun, 20 Dec 2020 22:13:57 +0100
Message-Id: <20201220211405.313012-33-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 32/40] net/virtio: remove useless request ops
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://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Sender: "dev" <dev-bounces@dpdk.org>
Now that all the ops have been implemented, we
can remove the send_request ops for all backends.
Signed-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>
---
drivers/net/virtio/virtio_user/vhost.h | 15 +--
drivers/net/virtio/virtio_user/vhost_kernel.c | 43 ---------
drivers/net/virtio/virtio_user/vhost_user.c | 96 -------------------
drivers/net/virtio/virtio_user/vhost_vdpa.c | 49 ----------
4 files changed, 3 insertions(+), 200 deletions(-)
diff --git a/drivers/net/virtio/virtio_user/vhost.h b/drivers/net/virtio/virtio_user/vhost.h
index c85ba9a47b..3e39fd2246 100644
--- a/drivers/net/virtio/virtio_user/vhost.h
+++ b/drivers/net/virtio/virtio_user/vhost.h
@@ -88,8 +88,6 @@ enum vhost_user_request {
VHOST_USER_MAX
};
-extern const char * const vhost_msg_strings[VHOST_USER_MAX];
-
struct vhost_memory_region {
uint64_t guest_phys_addr;
uint64_t memory_size; /* bytes */
@@ -116,16 +114,9 @@ struct virtio_user_backend_ops {
int (*set_vring_addr)(struct virtio_user_dev *dev, struct vhost_vring_addr *addr);
int (*get_status)(struct virtio_user_dev *dev, uint8_t *status);
int (*set_status)(struct virtio_user_dev *dev, uint8_t status);
- int (*send_request)(struct virtio_user_dev *dev,
- enum vhost_user_request req,
- void *arg);
- int (*enable_qp)(struct virtio_user_dev *dev,
- uint16_t pair_idx,
- int enable);
- int (*dma_map)(struct virtio_user_dev *dev, void *addr,
- uint64_t iova, size_t len);
- int (*dma_unmap)(struct virtio_user_dev *dev, void *addr,
- uint64_t iova, size_t len);
+ int (*enable_qp)(struct virtio_user_dev *dev, uint16_t pair_idx, int enable);
+ int (*dma_map)(struct virtio_user_dev *dev, void *addr, uint64_t iova, size_t len);
+ int (*dma_unmap)(struct virtio_user_dev *dev, void *addr, uint64_t iova, size_t len);
};
extern struct virtio_user_backend_ops virtio_ops_user;
diff --git a/drivers/net/virtio/virtio_user/vhost_kernel.c b/drivers/net/virtio/virtio_user/vhost_kernel.c
index 0b74f73c97..c4c9c9d085 100644
--- a/drivers/net/virtio/virtio_user/vhost_kernel.c
+++ b/drivers/net/virtio/virtio_user/vhost_kernel.c
@@ -328,48 +328,6 @@ vhost_kernel_set_status(struct virtio_user_dev *dev __rte_unused, uint8_t status
return -ENOTSUP;
}
-static uint64_t vhost_req_user_to_kernel[] = {
- [VHOST_USER_RESET_OWNER] = VHOST_RESET_OWNER,
-};
-
-static int
-vhost_kernel_send_request(struct virtio_user_dev *dev,
- enum vhost_user_request req,
- void *arg)
-{
- int ret = -1;
- unsigned int i;
- uint64_t req_kernel;
- int vhostfd;
-
- PMD_DRV_LOG(INFO, "%s", vhost_msg_strings[req]);
-
- req_kernel = vhost_req_user_to_kernel[req];
-
- switch (req_kernel) {
- default:
- vhostfd = -1;
- }
- if (vhostfd == -1) {
- for (i = 0; i < dev->max_queue_pairs; ++i) {
- if (dev->vhostfds[i] < 0)
- continue;
-
- ret = ioctl(dev->vhostfds[i], req_kernel, arg);
- if (ret < 0)
- break;
- }
- } else {
- ret = ioctl(vhostfd, req_kernel, arg);
- }
-
- if (ret < 0)
- PMD_DRV_LOG(ERR, "%s failed: %s",
- vhost_msg_strings[req], strerror(errno));
-
- return ret;
-}
-
/**
* Set up environment to talk with a vhost kernel backend.
*
@@ -501,6 +459,5 @@ struct virtio_user_backend_ops virtio_ops_kernel = {
.set_vring_addr = vhost_kernel_set_vring_addr,
.get_status = vhost_kernel_get_status,
.set_status = vhost_kernel_set_status,
- .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 d426b44fe7..0632b80050 100644
--- a/drivers/net/virtio/virtio_user/vhost_user.c
+++ b/drivers/net/virtio/virtio_user/vhost_user.c
@@ -634,101 +634,6 @@ vhost_user_set_status(struct virtio_user_dev *dev, uint8_t status)
return vhost_user_check_reply_ack(dev, &msg);
}
-static struct vhost_user_msg m;
-
-const char * const vhost_msg_strings[] = {
- [VHOST_USER_RESET_OWNER] = "VHOST_RESET_OWNER",
-};
-
-static int
-vhost_user_sock(struct virtio_user_dev *dev,
- enum vhost_user_request req,
- void *arg)
-{
- struct vhost_user_msg msg;
- struct vhost_vring_file *file = 0;
- int need_reply = 0;
- int fds[VHOST_MEMORY_MAX_NREGIONS];
- int fd_num = 0;
- int vhostfd = dev->vhostfd;
-
- RTE_SET_USED(m);
-
- PMD_DRV_LOG(INFO, "%s", vhost_msg_strings[req]);
-
- if (dev->is_server && vhostfd < 0)
- return -1;
-
- msg.request = req;
- msg.flags = VHOST_USER_VERSION;
- msg.size = 0;
-
- switch (req) {
- case VHOST_USER_SET_LOG_BASE:
- msg.payload.u64 = *((__u64 *)arg);
- msg.size = sizeof(m.payload.u64);
- break;
-
- case VHOST_USER_RESET_OWNER:
- break;
-
- case VHOST_USER_SET_LOG_FD:
- fds[fd_num++] = *((int *)arg);
- break;
-
- case VHOST_USER_SET_VRING_ERR:
- file = arg;
- msg.payload.u64 = file->index & VHOST_USER_VRING_IDX_MASK;
- msg.size = sizeof(m.payload.u64);
- if (file->fd > 0)
- fds[fd_num++] = file->fd;
- else
- msg.payload.u64 |= VHOST_USER_VRING_NOFD_MASK;
- break;
-
- default:
- PMD_DRV_LOG(ERR, "trying to send unhandled msg type");
- return -1;
- }
-
- if (vhost_user_write(vhostfd, &msg, fds, fd_num) < 0) {
- PMD_DRV_LOG(ERR, "%s failed: %s",
- vhost_msg_strings[req], strerror(errno));
- return -1;
- }
-
- if (need_reply || msg.flags & VHOST_USER_NEED_REPLY_MASK) {
- if (vhost_user_read(vhostfd, &msg) < 0) {
- PMD_DRV_LOG(ERR, "Received msg failed: %s",
- strerror(errno));
- return -1;
- }
-
- if (req != msg.request) {
- PMD_DRV_LOG(ERR, "Received unexpected msg type");
- return -1;
- }
-
- switch (req) {
- default:
- /* Reply-ack handling */
- if (msg.size != sizeof(m.payload.u64)) {
- PMD_DRV_LOG(ERR, "Received bad msg size");
- return -1;
- }
-
- if (msg.payload.u64 != 0) {
- PMD_DRV_LOG(ERR, "Slave replied NACK");
- return -1;
- }
-
- break;
- }
- }
-
- return 0;
-}
-
#define MAX_VIRTIO_USER_BACKLOG 1
static int
virtio_user_start_server(struct virtio_user_dev *dev, struct sockaddr_un *un)
@@ -845,6 +750,5 @@ struct virtio_user_backend_ops virtio_ops_user = {
.set_vring_addr = vhost_user_set_vring_addr,
.get_status = vhost_user_get_status,
.set_status = vhost_user_set_status,
- .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 f4331884c3..ecfaeaf814 100644
--- a/drivers/net/virtio/virtio_user/vhost_vdpa.c
+++ b/drivers/net/virtio/virtio_user/vhost_vdpa.c
@@ -34,10 +34,6 @@
#define VHOST_VDPA_SET_STATUS _IOW(VHOST_VIRTIO, 0x72, __u8)
#define VHOST_VDPA_SET_VRING_ENABLE _IOW(VHOST_VIRTIO, 0x75, struct vhost_vring_state)
-static uint64_t vhost_req_user_to_vdpa[] = {
- [VHOST_USER_RESET_OWNER] = VHOST_RESET_OWNER,
-};
-
/* no alignment requirement */
struct vhost_iotlb_msg {
uint64_t iova;
@@ -263,50 +259,6 @@ vhost_vdpa_set_status(struct virtio_user_dev *dev, uint8_t status)
return vhost_vdpa_ioctl(dev->vhostfd, VHOST_VDPA_SET_STATUS, &status);
}
-/* 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.
- */
-#define VHOST_VDPA_GUEST_OFFLOADS_MASK \
- ((1ULL << VIRTIO_NET_F_GUEST_CSUM) | \
- (1ULL << VIRTIO_NET_F_GUEST_TSO4) | \
- (1ULL << VIRTIO_NET_F_GUEST_TSO6) | \
- (1ULL << VIRTIO_NET_F_GUEST_ECN) | \
- (1ULL << VIRTIO_NET_F_GUEST_UFO))
-
-#define VHOST_VDPA_HOST_OFFLOADS_MASK \
- ((1ULL << VIRTIO_NET_F_HOST_TSO4) | \
- (1ULL << VIRTIO_NET_F_HOST_TSO6) | \
- (1ULL << VIRTIO_NET_F_CSUM))
-
-static int
-vhost_vdpa_send_request(struct virtio_user_dev *dev,
- enum vhost_user_request req,
- void *arg)
-{
- int ret = -1;
- uint64_t req_vdpa;
-
- PMD_DRV_LOG(INFO, "%s", vhost_msg_strings[req]);
-
- req_vdpa = vhost_req_user_to_vdpa[req];
-
- switch (req_vdpa) {
- case VHOST_SET_VRING_ADDR:
- PMD_DRV_LOG(DEBUG, "vhostfd=%d, index=%u",
- dev->vhostfd, *(unsigned int *)arg);
- break;
- default:
- break;
- }
-
- ret = ioctl(dev->vhostfd, req_vdpa, arg);
- if (ret < 0)
- PMD_DRV_LOG(ERR, "%s failed: %s",
- vhost_msg_strings[req], strerror(errno));
-
- return ret;
-}
-
/**
* Set up environment to talk with a vhost vdpa backend.
*
@@ -375,7 +327,6 @@ struct virtio_user_backend_ops virtio_ops_vdpa = {
.set_vring_addr = vhost_vdpa_set_vring_addr,
.get_status = vhost_vdpa_get_status,
.set_status = vhost_vdpa_set_status,
- .send_request = vhost_vdpa_send_request,
.enable_qp = vhost_vdpa_enable_queue_pair,
.dma_map = vhost_vdpa_dma_map,
.dma_unmap = vhost_vdpa_dma_unmap,
--
2.29.2