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 C127BA0350 for ; Mon, 21 Feb 2022 16:41:34 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BBFBD40DF6; Mon, 21 Feb 2022 16:41:34 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id C0CFC40E5A for ; Mon, 21 Feb 2022 16:41:33 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458093; 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=KT2weFh8sTA2jWeZHBLexUVdDJO/8Jag5lB7GYGAo9g=; b=Ql0CWhKiQ60avngiJMf93u3SNR+z9aWsJixmclTbplH7ORJdRUrmV4M0qvIWSKQjjs/803 a29D4UqITVv4UimRfDllqTFV5fXVqmjszkLjmTZvJ+XL8SeCda6QqiKwnodTu+3yrHkwzw 0sR1ynsGSzNurcSgo93YfeyvY4c1SEA= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-618-tpzG4L1pOym6agARQeChkw-1; Mon, 21 Feb 2022 10:41:30 -0500 X-MC-Unique: tpzG4L1pOym6agARQeChkw-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 42EBD8144E5; Mon, 21 Feb 2022 15:41:29 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 409647E2EF; Mon, 21 Feb 2022 15:41:28 +0000 (UTC) From: Kevin Traynor To: Marvin Liu Cc: Maxime Coquelin , dpdk stable Subject: patch 'net/virtio: fix slots number when indirect feature on' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:35:33 +0000 Message-Id: <20220221153625.152324-144-ktraynor@redhat.com> In-Reply-To: <20220221153625.152324-1-ktraynor@redhat.com> References: <20220221153625.152324-1-ktraynor@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=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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 Hi, FYI, your patch has been queued to stable release 21.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/26/22. 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 This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/72487940d1f219ab26b6e81cf00d9cb7fa97994e Thanks. Kevin --- >From 72487940d1f219ab26b6e81cf00d9cb7fa97994e Mon Sep 17 00:00:00 2001 From: Marvin Liu Date: Thu, 20 Jan 2022 20:22:18 +0800 Subject: [PATCH] net/virtio: fix slots number when indirect feature on [ upstream commit 787091b9d5f614ae35ab8cfb7718f6ccb64f1f3c ] Virtio driver only occupies one slot for enqueuing chained mbufs when indirect feature is on. Required slots calculation should depend on indirect feature status at the end. Fixes: 0eaf7fc2fe8e ("net/virtio: separate AVX Rx/Tx") Signed-off-by: Marvin Liu Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_rxtx_packed.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/virtio/virtio_rxtx_packed.h b/drivers/net/virtio/virtio_rxtx_packed.h index d5c259a1f6..536112983c 100644 --- a/drivers/net/virtio/virtio_rxtx_packed.h +++ b/drivers/net/virtio/virtio_rxtx_packed.h @@ -126,5 +126,4 @@ virtqueue_enqueue_single_packed_vec(struct virtnet_tx *txvq, * default => number of segments + 1 */ - slots = use_indirect ? 1 : (txm->nb_segs + !can_push); can_push = rte_mbuf_refcnt_read(txm) == 1 && RTE_MBUF_DIRECT(txm) && @@ -132,5 +131,5 @@ virtqueue_enqueue_single_packed_vec(struct virtnet_tx *txvq, rte_pktmbuf_headroom(txm) >= hdr_size; - slots = txm->nb_segs + !can_push; + slots = use_indirect ? 1 : (txm->nb_segs + !can_push); need = slots - vq->vq_free_cnt; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:47.715725172 +0000 +++ 0144-net-virtio-fix-slots-number-when-indirect-feature-on.patch 2022-02-21 15:22:44.299704594 +0000 @@ -1 +1 @@ -From 787091b9d5f614ae35ab8cfb7718f6ccb64f1f3c Mon Sep 17 00:00:00 2001 +From 72487940d1f219ab26b6e81cf00d9cb7fa97994e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 787091b9d5f614ae35ab8cfb7718f6ccb64f1f3c ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org