From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 0B453A04B5; Wed, 13 Jan 2021 14:43:26 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7EB82140D20; Wed, 13 Jan 2021 14:43:26 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by mails.dpdk.org (Postfix) with ESMTP id B070E140D1E for ; Wed, 13 Jan 2021 14:43:23 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1610545403; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=wiQ31xQBfC819OchFJjXV9e/53yLICyqZpNh4poWtcQ=; b=EuNCBr53QCDnP6hru5LsuGw2AYUm5weSBkJzt5JuVfP001NP6ELSs0kI5Q224O7BvuwhAq 63sZY0hwEPTsNny779biMCZ5lueY4ryS/RJYqa8cWDqotmO+YJx4pZeuThu5oPFNvjpewO itDfGFZJK7DmJU0Bl8OwNpW34glQURQ= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-350-UCfZPZ6vP-ekE10EADm6ZA-1; Wed, 13 Jan 2021 08:43:19 -0500 X-MC-Unique: UCfZPZ6vP-ekE10EADm6ZA-1 Received: by mail-wm1-f70.google.com with SMTP id f18so847602wmq.1 for ; Wed, 13 Jan 2021 05:43:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=wiQ31xQBfC819OchFJjXV9e/53yLICyqZpNh4poWtcQ=; b=myMrcP232aAcv5QYwmDQRkS7lgd/sgETZlqdnmyH8QuPcX09SFlUY9Cj+xa7PXEggB LmC+Mb8T1z7D0L6xw+aA8itjmRHSxHhkrvThx9Xtqit9nbDEy4UlIlty9OCzywUlOuhG FHBlwn8MhnayDdTTwDP2Y3o7uc8857jo5H1AxOSPxN5Kdd5evp5l4cWPzWLfHy4TA2ZF F6HjpLgKOvoI4Ws/CvlUsJJnKkyO0V30SJt43wGYGyi/Fm8j6JBiLT9m94Ixdv2te/B9 H2qbnYujMUhqZ3lE3a7K+UOtaLUEdkXLH+tsNpTrXhPR27N3ABeBPQCP3eil+sCWTXdW pROA== X-Gm-Message-State: AOAM532/xFkUgJvDMxgaV4lTAHq+bYJZcE6Y3PVpD5SM0bh5UUQjob3X adcRLcQqsbnna1OsNeSXf+vQkzroYaW7yMxyW4hVWtvK1NV+jkcYdUJAXAtYeu2vpUJQxAnEj2k 1Bbo= X-Received: by 2002:a1c:6506:: with SMTP id z6mr2317217wmb.66.1610545398734; Wed, 13 Jan 2021 05:43:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJyr39M16tSSt0PrrTgiPPP1oFAvgfx7QoS+PBieMXiA/I3qXcuQJnL6b0qbnSN1iy6S9q6ERg== X-Received: by 2002:a1c:6506:: with SMTP id z6mr2317208wmb.66.1610545398528; Wed, 13 Jan 2021 05:43:18 -0800 (PST) Received: from amorenoz.users.ipa.redhat.com ([94.73.56.18]) by smtp.gmail.com with ESMTPSA id y11sm2914625wmi.0.2021.01.13.05.43.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 13 Jan 2021 05:43:17 -0800 (PST) To: "Xia, Chenbo" , Maxime Coquelin , "dev@dpdk.org" , "olivier.matz@6wind.com" , "david.marchand@redhat.com" References: <20201220211405.313012-1-maxime.coquelin@redhat.com> <20201220211405.313012-26-maxime.coquelin@redhat.com> From: Adrian Moreno Message-ID: <6b3ee0bc-1e26-0b48-6f84-90c4948e228b@redhat.com> Date: Wed, 13 Jan 2021 14:43:17 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=amorenoz@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: 8bit Subject: Re: [dpdk-dev] [PATCH 25/40] net/virtio: add Virtio-user features ops X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 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" Hi Chenbo On 1/6/21 12:54 PM, Xia, Chenbo wrote: > Hi Maxime, > >> -----Original Message----- >> From: Maxime Coquelin >> Sent: Monday, December 21, 2020 5:14 AM >> To: dev@dpdk.org; Xia, Chenbo ; olivier.matz@6wind.com; >> amorenoz@redhat.com; david.marchand@redhat.com >> Cc: Maxime Coquelin >> Subject: [PATCH 25/40] net/virtio: add Virtio-user features ops >> >> This patch introduce new callbacks for getting > > s/introduce/introduces > >> and setting Virtio features, and implements them >> for the different backend types. >> >> Signed-off-by: Maxime Coquelin >> --- >> drivers/net/virtio/virtio_user/vhost.h | 2 + >> drivers/net/virtio/virtio_user/vhost_kernel.c | 150 +++++++++--------- >> .../net/virtio/virtio_user/vhost_kernel_tap.c | 23 +++ >> .../net/virtio/virtio_user/vhost_kernel_tap.h | 1 + >> drivers/net/virtio/virtio_user/vhost_user.c | 63 +++++++- >> drivers/net/virtio/virtio_user/vhost_vdpa.c | 38 +++-- >> .../net/virtio/virtio_user/virtio_user_dev.c | 5 +- >> drivers/net/virtio/virtio_user_ethdev.c | 3 +- >> 8 files changed, 188 insertions(+), 97 deletions(-) >> >> diff --git a/drivers/net/virtio/virtio_user/vhost.h >> b/drivers/net/virtio/virtio_user/vhost.h >> index 8e819ecfb8..16978e27ed 100644 >> --- a/drivers/net/virtio/virtio_user/vhost.h >> +++ b/drivers/net/virtio/virtio_user/vhost.h >> @@ -102,6 +102,8 @@ struct virtio_user_dev; >> struct virtio_user_backend_ops { >> int (*setup)(struct virtio_user_dev *dev); >> int (*set_owner)(struct virtio_user_dev *dev); >> + int (*get_features)(struct virtio_user_dev *dev, uint64_t *features); >> + int (*set_features)(struct virtio_user_dev *dev, uint64_t features); >> 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 b79dcad179..f44df8ef1f 100644 >> --- a/drivers/net/virtio/virtio_user/vhost_kernel.c >> +++ b/drivers/net/virtio/virtio_user/vhost_kernel.c >> @@ -38,6 +38,28 @@ struct vhost_memory_kernel { >> #define VHOST_SET_VRING_ERR _IOW(VHOST_VIRTIO, 0x22, struct vhost_vring_file) >> #define VHOST_NET_SET_BACKEND _IOW(VHOST_VIRTIO, 0x30, struct >> vhost_vring_file) >> >> +/* with below features, vhost kernel does not need to do the checksum and TSO, >> + * these info will be passed to virtio_user through virtio net header. >> + */ >> +#define VHOST_KERNEL_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)) >> + >> +/* with below features, when flows from virtio_user to vhost kernel >> + * (1) if flows goes up through the kernel networking stack, it does not need >> + * to verify checksum, which can save CPU cycles; >> + * (2) if flows goes through a Linux bridge and outside from an interface >> + * (kernel driver), checksum and TSO will be done by GSO in kernel or even >> + * offloaded into real physical device. >> + */ >> +#define VHOST_KERNEL_HOST_OFFLOADS_MASK \ >> + ((1ULL << VIRTIO_NET_F_HOST_TSO4) | \ >> + (1ULL << VIRTIO_NET_F_HOST_TSO6) | \ >> + (1ULL << VIRTIO_NET_F_CSUM)) >> + >> static uint64_t max_regions = 64; >> >> static void >> @@ -77,10 +99,57 @@ vhost_kernel_set_owner(struct virtio_user_dev *dev) >> return vhost_kernel_ioctl(dev->vhostfds[0], VHOST_SET_OWNER, NULL); >> } >> >> +static int >> +vhost_kernel_get_features(struct virtio_user_dev *dev, uint64_t *features) >> +{ >> + int ret; >> + unsigned int tap_features; >> + >> + ret = vhost_kernel_ioctl(dev->vhostfds[0], VHOST_GET_FEATURES, features); >> + if (ret < 0) { >> + PMD_DRV_LOG(ERR, "Failed to get features"); >> + return -1; >> + } >> + >> + ret = tap_support_features(&tap_features); >> + if (ret < 0) { >> + PMD_DRV_LOG(ERR, "Failed to get TAP features)"); > > should delete ')' after 'features'? > >> + return -1; >> + } >> + >> + /* with tap as the backend, all these features are supported >> + * but not claimed by vhost-net, so we add them back when >> + * reporting to upper layer. >> + */ > > > >> .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 f8e4581951..0a85d058a8 100644 >> --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c >> +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c >> @@ -141,7 +141,7 @@ virtio_user_dev_set_features(struct virtio_user_dev *dev) >> /* Strip VIRTIO_NET_F_CTRL_VQ, as devices do not really need to know */ >> features &= ~(1ull << VIRTIO_NET_F_CTRL_VQ); >> features &= ~(1ull << VIRTIO_NET_F_STATUS); >> - ret = dev->ops->send_request(dev, VHOST_USER_SET_FEATURES, &features); >> + ret = dev->ops->set_features(dev, features); > > I noticed that virtio_user_dev_set_features is called by virtio_user_set_status. > The former may fail but the latter will ignore the failure. So this will happen: > setting features already failed but virtio-user still continue to do things. IMHO, > this is not very good (similar things may happen for virtio_user_start_device). > What do you think? > You're right. Although set_status(features_ok) should be followed by get_status() to check if device has set feature_ok bit, the problem is that set_status is called on device initialization, which would happen even when the vhost backed is not yet connected (server-mode). Failing there would tear down the ethdev which would make the future "hotplug" fail. Hopefully this will all be fixed by Maxime's refactoring :) So +1 to reconsider improving error propagation here. > Thanks, > Chenbo > >> if (ret < 0) >> goto error; >> PMD_DRV_LOG(INFO, "set features: %" PRIx64, features); >> @@ -488,8 +488,7 @@ virtio_user_dev_init(struct virtio_user_dev *dev, char >> *path, int queues, >> return -1; >> } >> >> - if (dev->ops->send_request(dev, VHOST_USER_GET_FEATURES, >> - &dev->device_features) < 0) { >> + if (dev->ops->get_features(dev, &dev->device_features) < 0) { >> PMD_INIT_LOG(ERR, "get_features failed: %s", >> strerror(errno)); >> return -1; >> diff --git a/drivers/net/virtio/virtio_user_ethdev.c >> b/drivers/net/virtio/virtio_user_ethdev.c >> index 283f5c7a36..4d2635c8aa 100644 >> --- a/drivers/net/virtio/virtio_user_ethdev.c >> +++ b/drivers/net/virtio/virtio_user_ethdev.c >> @@ -85,8 +85,7 @@ virtio_user_server_reconnect(struct virtio_user_dev *dev) >> >> virtio_set_status(hw, VIRTIO_CONFIG_STATUS_DRIVER); >> >> - if (dev->ops->send_request(dev, VHOST_USER_GET_FEATURES, >> - &dev->device_features) < 0) { >> + if (dev->ops->get_features(dev, &dev->device_features) < 0) { >> PMD_INIT_LOG(ERR, "get_features failed: %s", >> strerror(errno)); >> return -1; >> -- >> 2.29.2 > -- Adrián Moreno