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 3A5DEA0350 for ; Mon, 21 Feb 2022 16:40:29 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2F78340DF6; Mon, 21 Feb 2022 16:40:29 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id B81B94013F for ; Mon, 21 Feb 2022 16:40:25 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1645458025; 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=8fEXCb7i6hl53VBFFhDdNFKlM6cfffki17dxSXSeDmc=; b=Lo5zmX2CHkMHS76G6v4Tjs1IvsxRCryIPTmDYdd4H46OPhkNUpSzs2sQOoimzeo1NYqN/L OUOHpyywDO0S36pDUvl7IX5aLWNG9jLWFQbNkbtID96N6lds6sZG0Z9/rxhGEM/rW3TuPl C0K/1dJwsclQ9+J3SN8eKy88IyVEORQ= 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-453-kxDHQ0K6Pca5ccR0YNkt-Q-1; Mon, 21 Feb 2022 10:40:22 -0500 X-MC-Unique: kxDHQ0K6Pca5ccR0YNkt-Q-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 972531846088; Mon, 21 Feb 2022 15:40:21 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D9847E131; Mon, 21 Feb 2022 15:40:20 +0000 (UTC) From: Kevin Traynor To: Xueming Li Cc: Maxime Coquelin , dpdk stable Subject: patch 'net/virtio: fix Tx queue 0 overriden by queue 128' has been queued to stable release 21.11.1 Date: Mon, 21 Feb 2022 15:34:57 +0000 Message-Id: <20220221153625.152324-108-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/7c58dbf159c20c07cf3ec81171801971dba6873c Thanks. Kevin --- >From 7c58dbf159c20c07cf3ec81171801971dba6873c Mon Sep 17 00:00:00 2001 From: Xueming Li Date: Thu, 2 Dec 2021 21:50:45 +0800 Subject: [PATCH] net/virtio: fix Tx queue 0 overriden by queue 128 [ upstream commit 8a886e573af9d25be33e333e9f5cfb48ddd3646c ] Both Rx queue and Tx queue are VirtQ in virtio, VQ index is 256 for Tx queue 128. Uint8 type of TxQ VQ index overflows and overrides Tx queue 0 data. This patch fixes VQ index type with uint16 type. Fixes: c1f86306a026 ("virtio: add new driver") Signed-off-by: Xueming Li Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_rxtx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c index b39dd92d1b..4795893ec7 100644 --- a/drivers/net/virtio/virtio_rxtx.c +++ b/drivers/net/virtio/virtio_rxtx.c @@ -815,5 +815,5 @@ virtio_dev_tx_queue_setup(struct rte_eth_dev *dev, const struct rte_eth_txconf *tx_conf) { - uint8_t vq_idx = 2 * queue_idx + VTNET_SQ_TQ_QUEUE_IDX; + uint16_t vq_idx = 2 * queue_idx + VTNET_SQ_TQ_QUEUE_IDX; struct virtio_hw *hw = dev->data->dev_private; struct virtqueue *vq = hw->vqs[vq_idx]; @@ -859,5 +859,5 @@ virtio_dev_tx_queue_setup_finish(struct rte_eth_dev *dev, uint16_t queue_idx) { - uint8_t vq_idx = 2 * queue_idx + VTNET_SQ_TQ_QUEUE_IDX; + uint16_t vq_idx = 2 * queue_idx + VTNET_SQ_TQ_QUEUE_IDX; struct virtio_hw *hw = dev->data->dev_private; struct virtqueue *vq = hw->vqs[vq_idx]; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-21 15:22:46.949982807 +0000 +++ 0108-net-virtio-fix-Tx-queue-0-overriden-by-queue-128.patch 2022-02-21 15:22:44.214704403 +0000 @@ -1 +1 @@ -From 8a886e573af9d25be33e333e9f5cfb48ddd3646c Mon Sep 17 00:00:00 2001 +From 7c58dbf159c20c07cf3ec81171801971dba6873c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 8a886e573af9d25be33e333e9f5cfb48ddd3646c ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org