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 930A545BB6 for ; Wed, 23 Oct 2024 23:19:03 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8CD7240261; Wed, 23 Oct 2024 23:19:03 +0200 (CEST) Received: from mail-wm1-f42.google.com (mail-wm1-f42.google.com [209.85.128.42]) by mails.dpdk.org (Postfix) with ESMTP id 3F34F40261 for ; Wed, 23 Oct 2024 23:19:02 +0200 (CEST) Received: by mail-wm1-f42.google.com with SMTP id 5b1f17b1804b1-43162cf1eaaso2991055e9.0 for ; Wed, 23 Oct 2024 14:19:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1729718342; x=1730323142; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ZF+EXG1/RrP9NYF1Kh7fKxLJIjBeWwRlgTHeFOQWurc=; b=NrT8hvZYO3iK661hk0mx+NBFQYfeWBoJY6EQ2LObDrnaNmMoyXzkB7PAzLzS+AqxY3 arY8nu5MTJOuFDVA7jOogEFbcE0591Ln6xVL9ATrfohjAVb4Vp+IWHXHoiD608QcTF5N yQS/z/DbINGYlS2CohOdOjKIRhqWeTtOLHTS3kry+mKqZ1l6S6V+7QwCvfrk7BxToBS3 5yBb3BwPSkkhC1Y74cNEB6o6dXVcYGWutDBXZoXCrtegqs3s2PrnkG7gPVt/ou6/LMbC nrSWEBlZmToYeD09BAftWGY3BeYXcRX1Mqx0DGKM+dgA2EcMupeI8qe/pp9ZQN07HsDm V1hA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729718342; x=1730323142; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ZF+EXG1/RrP9NYF1Kh7fKxLJIjBeWwRlgTHeFOQWurc=; b=QLOL8Jchd7TYMUKPmw7RsHiYb+ijiwW/zwOPxceuOGF/NnDqx7QwMsos1EJLwP4gn4 Ob5ukCb2M9SQYqFyPTQb4hTXG3pWfo0pqRPCduYPcgYSYY565ti8v01cQVg+9O3MmYQf yOSF1AK7fp0+DfrZXPNz+sCSS8e9MIxFOnMsh4WF4AC9jCInTcnaEVFTsNIqBP0LmPJW tx9UnIGGx5J91K/31627F1RtI6Ytis0X5VzLRyyc6yKuDd4cLeH63Ydbe7gXSyVkGQaR cWz8KFRSKE7z33Ib68qF54kakBDWAQlgpdrjE4cv15B556i+aUe7qCproZj2Nq6+D8Xe jeXg== X-Forwarded-Encrypted: i=1; AJvYcCXBN8+X+vGX47T09FuvA578PTVQ5CNZiMyKBKqjqa/1DOPksNYt4TC+w6wzgc/yF/uUgJblr3c=@dpdk.org X-Gm-Message-State: AOJu0YzXe03ufWMoLIe4/mM1jirdKgsFy+NXMACwqP9Pl8KyPXviAGxK GgyyUYYv/js+HM1kjRScaoq0IEoCcpt/nhOJGfjhT9SLMo5CxxOroBveaw== X-Google-Smtp-Source: AGHT+IGUNvvW6828LwNDhJDtAO1Iq16vzo+p/emd0jjXnh73OKy5Tp3Z2jwnMzztgyz104vV8CinHA== X-Received: by 2002:adf:f206:0:b0:37d:4833:38f5 with SMTP id ffacd0b85a97d-37efcf18a9emr3256910f8f.30.1729718341758; Wed, 23 Oct 2024 14:19:01 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:21cd:def0:a01d:d2aa]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-37ee0a37aecsm9819709f8f.8.2024.10.23.14.19.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 23 Oct 2024 14:19:01 -0700 (PDT) From: luca.boccassi@gmail.com To: Kommula Shiva Shankar Cc: Maxime Coquelin , dpdk stable Subject: patch 'net/virtio-user: reset used index counter' has been queued to stable release 22.11.7 Date: Wed, 23 Oct 2024 22:16:11 +0100 Message-ID: <20241023211704.1216956-31-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20241023211704.1216956-1-luca.boccassi@gmail.com> References: <20241023211704.1216956-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 22.11.7 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/25/24. 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/768ca32567522f0a75e458add4069dd4b171d6c3 Thanks. Luca Boccassi --- >From 768ca32567522f0a75e458add4069dd4b171d6c3 Mon Sep 17 00:00:00 2001 From: Kommula Shiva Shankar Date: Mon, 5 Aug 2024 10:08:41 +0000 Subject: [PATCH] net/virtio-user: reset used index counter [ upstream commit ff11fc60c5d8d9ae5a0f0114db4c3bc834090548 ] When the virtio device is reinitialized during ethdev reconfiguration, all the virtio rings are recreated and repopulated on the device. Accordingly, reset the used index counter value back to zero. Fixes: 48a4464029a7 ("net/virtio-user: support control VQ for packed") Signed-off-by: Kommula Shiva Shankar Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_user_ethdev.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c index 78b1ed9ace..ae087b0c92 100644 --- a/drivers/net/virtio/virtio_user_ethdev.c +++ b/drivers/net/virtio/virtio_user_ethdev.c @@ -199,6 +199,7 @@ virtio_user_setup_queue_packed(struct virtqueue *vq, vring->device = (void *)(uintptr_t)used_addr; dev->packed_queues[queue_idx].avail_wrap_counter = true; dev->packed_queues[queue_idx].used_wrap_counter = true; + dev->packed_queues[queue_idx].used_idx = 0; for (i = 0; i < vring->num; i++) vring->desc[i].flags = 0; -- 2.45.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-10-23 22:16:41.700365835 +0100 +++ 0031-net-virtio-user-reset-used-index-counter.patch 2024-10-23 22:16:40.467941496 +0100 @@ -1 +1 @@ -From ff11fc60c5d8d9ae5a0f0114db4c3bc834090548 Mon Sep 17 00:00:00 2001 +From 768ca32567522f0a75e458add4069dd4b171d6c3 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit ff11fc60c5d8d9ae5a0f0114db4c3bc834090548 ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index bf29f0dacd..747dddeb2e 100644 +index 78b1ed9ace..ae087b0c92 100644 @@ -23 +24 @@ -@@ -204,6 +204,7 @@ virtio_user_setup_queue_packed(struct virtqueue *vq, +@@ -199,6 +199,7 @@ virtio_user_setup_queue_packed(struct virtqueue *vq,