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 9519CA04DD for ; Wed, 18 Nov 2020 17:37:07 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 8C9FC160; Wed, 18 Nov 2020 17:37:06 +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 1692A160 for ; Wed, 18 Nov 2020 17:37:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1605717424; 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=+8NqdHePz6nPDp2Iw5nQQHGJXsp+02muxZ7ilob1XtI=; b=PLQ3D6peO+EM3genGlrCTVERgxo+9mRfUMG9Xp6vBtZVxXYjQwoOcbBUSdKyBJaL9tWS0s nomGA5FjHpnBgcYF2IxD0jXOk+ycy9MfQLZCa9QSahOhT4i1S+5kFghSjA99qPosFv+ayc rCeXKjbrsJ7ThgWpXhp4GPaS6zU02dA= 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-218-HOh0KOJ_MBO-j3uBRxyZzQ-1; Wed, 18 Nov 2020 11:37:01 -0500 X-MC-Unique: HOh0KOJ_MBO-j3uBRxyZzQ-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 38839192AB96; Wed, 18 Nov 2020 16:36:32 +0000 (UTC) Received: from rh.redhat.com (ovpn-113-249.ams2.redhat.com [10.36.113.249]) by smtp.corp.redhat.com (Postfix) with ESMTP id CF6765C1DA; Wed, 18 Nov 2020 16:36:30 +0000 (UTC) From: Kevin Traynor To: Maxime Coquelin Cc: Marvin Liu , Chenbo Xia , dpdk stable Date: Wed, 18 Nov 2020 16:34:54 +0000 Message-Id: <20201118163558.1101823-8-ktraynor@redhat.com> In-Reply-To: <20201118163558.1101823-1-ktraynor@redhat.com> References: <20201118163558.1101823-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@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-stable] patch 'vhost: fix virtio-net header length with packed ring' has been queued to LTS release 18.11.11 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, FYI, your patch has been queued to LTS release 18.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/24/20. 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/kevintraynor/dpdk-stable-queue This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable-queue/commit/e79b80970ffe8bf1d08252b9508304794eb83932 Thanks. Kevin. --- >From e79b80970ffe8bf1d08252b9508304794eb83932 Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Thu, 1 Oct 2020 12:11:54 +0200 Subject: [PATCH] vhost: fix virtio-net header length with packed ring [ upstream commit 22eaf2613537ba6b0e79f656195eeeaa3dd14666 ] In case packed ring layout has been negotiated, but neither Version 1 nor mergeable buffers, the Virtio-net header len is assigned to the legacy devices value, which is wrong. This patch fixes this with using the proper len as devices using packed ring are not legacy devices. Fixes: a922401f35cc ("vhost: add Rx support for packed ring") Fixes: ae999ce49dcb ("vhost: add Tx support for packed ring") Reported-by: Marvin Liu Signed-off-by: Maxime Coquelin Reviewed-by: Chenbo Xia --- lib/librte_vhost/vhost_user.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index 2a6a23c4b2..754759f6e0 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -326,5 +326,7 @@ vhost_user_set_features(struct virtio_net **pdev, struct VhostUserMsg *msg, dev->features = features; if (dev->features & - ((1 << VIRTIO_NET_F_MRG_RXBUF) | (1ULL << VIRTIO_F_VERSION_1))) { + ((1ULL << VIRTIO_NET_F_MRG_RXBUF) | + (1ULL << VIRTIO_F_VERSION_1) | + (1ULL << VIRTIO_F_RING_PACKED))) { dev->vhost_hlen = sizeof(struct virtio_net_hdr_mrg_rxbuf); } else { -- 2.26.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-11-18 16:33:38.139298198 +0000 +++ 0008-vhost-fix-virtio-net-header-length-with-packed-ring.patch 2020-11-18 16:33:37.906215047 +0000 @@ -1 +1 @@ -From 22eaf2613537ba6b0e79f656195eeeaa3dd14666 Mon Sep 17 00:00:00 2001 +From e79b80970ffe8bf1d08252b9508304794eb83932 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 22eaf2613537ba6b0e79f656195eeeaa3dd14666 ] + @@ -15 +16,0 @@ -Cc: stable@dpdk.org @@ -25 +26 @@ -index 4deceb3e00..5d1fb9e863 100644 +index 2a6a23c4b2..754759f6e0 100644 @@ -28 +29 @@ -@@ -342,5 +342,7 @@ vhost_user_set_features(struct virtio_net **pdev, struct VhostUserMsg *msg, +@@ -326,5 +326,7 @@ vhost_user_set_features(struct virtio_net **pdev, struct VhostUserMsg *msg,