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 2DCD2A0524 for ; Fri, 5 Feb 2021 12:29:44 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2017A1887BD; Fri, 5 Feb 2021 12:29:44 +0100 (CET) Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) by mails.dpdk.org (Postfix) with ESMTP id 94839188742 for ; Fri, 5 Feb 2021 12:29:42 +0100 (CET) Received: by mail-wm1-f51.google.com with SMTP id a16so7688697wmm.0 for ; Fri, 05 Feb 2021 03:29:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=GbggFFMFZOKfAT3Es8P8bYMxcooy1HxjSrihmNqETAw=; b=GjX2Ek6/RNmtMSOFYMUZqQVXFR2gs7thovvT+ymEBgd4cWIAfBpx3onB8MSywBgSbi FBh/EqRSBFN/+ZuA1rRiTa0KVEsL3501CBk2qeLSUsQM6hfpMhogDxm9zepkkM20/CKn nnsaVq13AoHuD/3m3ZAhIfN5IZTFjs/Vs4OdHb1K6l0/YpTuW7XtQIKNkDx7kJkmA1Lk X4ouXJ26MKKEUde3gpyd9sGlMEt/h5k4WZf0UmdxfR055FfurVhGT5Ns1ZPUxdQwVTk9 SZjORev0MwmXrWoLcQLceLH4XJ5nhtcWMULubqMuo7gUOuTvVULsY14o4Uy7yyThwY1w hu4Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=GbggFFMFZOKfAT3Es8P8bYMxcooy1HxjSrihmNqETAw=; b=Ffz/I6sWOgzRhsX6p8vFOi7kxyia4HeT58RA3KnjhH617WVxFseZNL1ch8EWky+wT9 lT4lhoLR4DcLAZchrdhsX8Vtrm+0DbJz8Px0MZq70hGjlLcwrY+fjWJ3bnU6rcyiShUq SrqrB5K057ybuWIxSDCdrFbwDC13okRnB4NUbA1eDdNFUL1sau8q4pWdlZ7tiies1lu6 QvJxf+oKEPnLRGxo9qndQmlyfJ7ivYGEzIKpUYwtTZ58mtCM7VeKy7GlP2j8AzLZaiOf z0hnXTRkIdEuHJb4ewBbZk8KvSZCRpxX95EcHBJzB4KsILeCiUjca+5VVzrK3qJdAVzT nX3A== X-Gm-Message-State: AOAM530PVLaXLWuDJ3ClGefqfdFjwin5A72TJUdQGZuYLXonM8MpdEeK 4VU+R+LGUCZ2n5Z4ZJOpFHk= X-Google-Smtp-Source: ABdhPJzIMbnBZt/EzD1fvRD8Z1F/fqCRmNSb4h1lUykqpp2mTi5IdNwruM9wmEucXCXwFQhA4bLJoQ== X-Received: by 2002:a7b:c041:: with SMTP id u1mr3150319wmc.161.1612524582379; Fri, 05 Feb 2021 03:29:42 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id i15sm7821635wmq.26.2021.02.05.03.29.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:29:41 -0800 (PST) From: luca.boccassi@gmail.com To: Olivier Matz Cc: Maxime Coquelin , dpdk stable Date: Fri, 5 Feb 2021 11:16:14 +0000 Message-Id: <20210205111920.1272063-88-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/virtio-user: fix protocol features advertising' has been queued to stable release 20.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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, FYI, your patch has been queued to stable release 20.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/07/21. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/ef713f3b0c0d9dc3c3c6155221bfcfac6942cf34 Thanks. Luca Boccassi --- >From ef713f3b0c0d9dc3c3c6155221bfcfac6942cf34 Mon Sep 17 00:00:00 2001 From: Olivier Matz Date: Fri, 18 Dec 2020 14:23:52 +0100 Subject: [PATCH] net/virtio-user: fix protocol features advertising [ upstream commit c3243eb5a88c59fba9334ace253068c35fc16894 ] When connected to a vhost-user backend, the flag VHOST_USER_F_PROTOCOL_FEATURES is not advertised, preventing to do multiqueue (the VHOST_USER_PROTOCOL_F_MQ protocol feature is ignored by some backends if the VHOST_USER_F_PROTOCOL_FEATURES feature is not set). When setting vhost-user features, advertise this flag if it was advertised by our peer. Fixes: 8e7561054ac7 ("net/virtio: support vhost-user protocol features") Suggested-by: Maxime Coquelin Signed-off-by: Olivier Matz Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_user/vhost_user.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio/virtio_user/vhost_user.c b/drivers/net/virtio/virtio_user/vhost_user.c index b93e65c60b..350eed4182 100644 --- a/drivers/net/virtio/virtio_user/vhost_user.c +++ b/drivers/net/virtio/virtio_user/vhost_user.c @@ -297,13 +297,18 @@ vhost_user_sock(struct virtio_user_dev *dev, if (has_reply_ack) msg.flags |= VHOST_USER_NEED_REPLY_MASK; /* Fallthrough */ - case VHOST_USER_SET_FEATURES: case VHOST_USER_SET_PROTOCOL_FEATURES: case VHOST_USER_SET_LOG_BASE: msg.payload.u64 = *((__u64 *)arg); msg.size = sizeof(m.payload.u64); break; + case VHOST_USER_SET_FEATURES: + msg.payload.u64 = *((__u64 *)arg) | (dev->device_features & + (1ULL << VHOST_USER_F_PROTOCOL_FEATURES)); + msg.size = sizeof(m.payload.u64); + break; + case VHOST_USER_SET_OWNER: case VHOST_USER_RESET_OWNER: break; -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:33.228454436 +0000 +++ 0088-net-virtio-user-fix-protocol-features-advertising.patch 2021-02-05 11:18:28.934693549 +0000 @@ -1 +1 @@ -From c3243eb5a88c59fba9334ace253068c35fc16894 Mon Sep 17 00:00:00 2001 +From ef713f3b0c0d9dc3c3c6155221bfcfac6942cf34 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c3243eb5a88c59fba9334ace253068c35fc16894 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org