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 1583EA04BB for ; Tue, 6 Oct 2020 09:54:11 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C8EAC1C01; Tue, 6 Oct 2020 09:54:09 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by dpdk.org (Postfix) with ESMTP id 9E56A1C01 for ; Tue, 6 Oct 2020 09:54:07 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1601970846; 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:autocrypt:autocrypt; bh=6vJnVqUPEzQgXOMw2eNAhOuqbiz9KeI06U/EoEV8ShM=; b=CmDnM+QxyCJo91wCPOF4fvwKLoZQqOr620jNcJWXaXWM4v8Q/RVyXodFZOsuGExeFMusuu k7qmKQdisYvnsNOg09FPth3XBV54IWNVwOwK4tDbyc0x/FWNQRkq9kpAn4befFul5juh2b crykWAwzDwcIYPZFQXYwFYLAyFMf814= 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-467-7p8MVmYLM82am7ig8iED4g-1; Tue, 06 Oct 2020 03:54:02 -0400 X-MC-Unique: 7p8MVmYLM82am7ig8iED4g-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1DA541084D61; Tue, 6 Oct 2020 07:54:01 +0000 (UTC) Received: from [10.36.110.35] (unknown [10.36.110.35]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 6F79B78482; Tue, 6 Oct 2020 07:53:59 +0000 (UTC) To: Fan Zhang , dev@dpdk.org Cc: chenbo.xia@intel.com, changpeng.liu@intel.com, ferruh.yigit@intel.com, stable@dpdk.org References: <20201002083615.45470-1-roy.fan.zhang@intel.com> <20201002153601.84097-1-roy.fan.zhang@intel.com> <20201002153601.84097-2-roy.fan.zhang@intel.com> From: Maxime Coquelin Autocrypt: addr=maxime.coquelin@redhat.com; keydata= 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 Mwqu3GQ= Message-ID: <7c1121c2-8474-0878-b56b-152fd4854392@redhat.com> Date: Tue, 6 Oct 2020 09:53:57 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.10.0 MIME-Version: 1.0 In-Reply-To: <20201002153601.84097-2-roy.fan.zhang@intel.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 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-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-stable] [dpdk-dev v2 1/2] vhost: add backend type in driver start X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" Hi Fan, On 10/2/20 5:36 PM, Fan Zhang wrote: > This patch adds an internal driver start function with a newly > added backend type identifier as parameter. With this way > different built-in driver types (net, crypto) can be identified. > > Signed-off-by: Fan Zhang > --- > lib/librte_vhost/socket.c | 39 ++++++++++++++++++++++++++++------- > lib/librte_vhost/vhost_user.h | 8 +++++++ > 2 files changed, 39 insertions(+), 8 deletions(-) > > diff --git a/lib/librte_vhost/socket.c b/lib/librte_vhost/socket.c > index 0169d3648..a53e536ac 100644 > --- a/lib/librte_vhost/socket.c > +++ b/lib/librte_vhost/socket.c > @@ -38,7 +38,7 @@ struct vhost_user_socket { > bool is_server; > bool reconnect; > bool iommu_support; > - bool use_builtin_virtio_net; > + enum virtio_backend_type backend_type; > bool extbuf; > bool linearbuf; > bool async_copy; > @@ -224,7 +224,9 @@ vhost_user_add_connection(int fd, struct vhost_user_socket *vsocket) > size = strnlen(vsocket->path, PATH_MAX); > vhost_set_ifname(vid, vsocket->path, size); > > - vhost_set_builtin_virtio_net(vid, vsocket->use_builtin_virtio_net); > + vhost_set_builtin_virtio_net(vid, > + vsocket->backend_type == VIRTIO_DEV_BUILTIN_NET ? > + true : false); > > vhost_attach_vdpa_device(vid, vsocket->vdpa_dev); > > @@ -632,7 +634,7 @@ rte_vhost_driver_disable_features(const char *path, uint64_t features) > pthread_mutex_lock(&vhost_user.mutex); > vsocket = find_vhost_user_socket(path); > > - /* Note that use_builtin_virtio_net is not affected by this function > + /* Note that backend type is not affected by this function > * since callers may want to selectively disable features of the > * built-in vhost net device backend. > */ > @@ -681,7 +683,8 @@ rte_vhost_driver_set_features(const char *path, uint64_t features) > /* Anyone setting feature bits is implementing their own vhost > * device backend. > */ > - vsocket->use_builtin_virtio_net = false; > + if (vsocket->backend_type == VIRTIO_DEV_BUILTIN_NET) > + vsocket->backend_type = VIRTIO_DEV_UNKNOWN; > } > pthread_mutex_unlock(&vhost_user.mutex); > > @@ -899,7 +902,7 @@ rte_vhost_driver_register(const char *path, uint64_t flags) > * rte_vhost_driver_set_features(), which will overwrite following > * two values. > */ > - vsocket->use_builtin_virtio_net = true; > + vsocket->backend_type = VIRTIO_DEV_BUILTIN_NET; > vsocket->supported_features = VIRTIO_NET_SUPPORTED_FEATURES; > vsocket->features = VIRTIO_NET_SUPPORTED_FEATURES; > vsocket->protocol_features = VHOST_USER_PROTOCOL_FEATURES; > @@ -1117,10 +1120,17 @@ vhost_driver_callback_get(const char *path) > } > > int > -rte_vhost_driver_start(const char *path) > +vhost_driver_start(const char *path, enum virtio_backend_type backend_type) > { > struct vhost_user_socket *vsocket; > static pthread_t fdset_tid; > + int ret; > + > + if (backend_type <= VIRTIO_DEV_UNKNOWN || > + backend_type > VIRTIO_DEV_BUILTIN_CRYPTO) { > + VHOST_LOG_CONFIG(ERR, "Wrong backend type\n"); > + return -1; > + } > > pthread_mutex_lock(&vhost_user.mutex); > vsocket = find_vhost_user_socket(path); > @@ -1153,7 +1163,20 @@ rte_vhost_driver_start(const char *path) > } > > if (vsocket->is_server) > - return vhost_user_start_server(vsocket); > + ret = vhost_user_start_server(vsocket); > else > - return vhost_user_start_client(vsocket); > + ret = vhost_user_start_client(vsocket); > + > + if (ret < 0) > + return ret; > + > + vsocket->backend_type = backend_type; > + > + return 0; Looking at it again, I think patch 1 is not necessary. Patch 2 should be enough and would be easier to backport. What do you think? Regards, Maxime > +} > + > +int > +rte_vhost_driver_start(const char *path) > +{ > + return vhost_driver_start(path, VIRTIO_DEV_BUILTIN_NET); > } > diff --git a/lib/librte_vhost/vhost_user.h b/lib/librte_vhost/vhost_user.h > index 16fe03f88..9f526e676 100644 > --- a/lib/librte_vhost/vhost_user.h > +++ b/lib/librte_vhost/vhost_user.h > @@ -158,6 +158,12 @@ typedef struct VhostUserMsg { > /* The version of the protocol we support */ > #define VHOST_USER_VERSION 0x1 > > +/* virtio backend types */ > +enum virtio_backend_type { > + VIRTIO_DEV_UNKNOWN = 0, /* Likely external */ > + VIRTIO_DEV_BUILTIN_NET, /* Virtio-net device */ > + VIRTIO_DEV_BUILTIN_CRYPTO, /* Virtio-crypto device */ > +}; > > /* vhost_user.c */ > int vhost_user_msg_handler(int vid, int fd); > @@ -167,5 +173,7 @@ int vhost_user_iotlb_miss(struct virtio_net *dev, uint64_t iova, uint8_t perm); > int read_fd_message(int sockfd, char *buf, int buflen, int *fds, int max_fds, > int *fd_num); > int send_fd_message(int sockfd, char *buf, int buflen, int *fds, int fd_num); > +int vhost_driver_start(const char *path, > + enum virtio_backend_type backend_type); > > #endif >