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 5C1EEA0C41 for ; Tue, 30 Nov 2021 17:37:39 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5639241177; Tue, 30 Nov 2021 17:37:39 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id 6672341148 for ; Tue, 30 Nov 2021 17:37:38 +0100 (CET) Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 480473FFF1 for ; Tue, 30 Nov 2021 16:37:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290258; bh=m57rGsIwKfQnWqRZlhXuUH2CXSsaz95TtnjsvkMc6+8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=LT/uoVtJ5b2VLDupBMS9Ca0jc0Y6XC9DkN8BOnbsnWeuo7S5DVcgZj+FPLPIVtjYz IZlkavXMybrv0fRDCjp+JIRQ3Gyf1Lc6WWNXHhqjnTH/0D334kQ6q2vuR32T3ddKGJ RX1aILqduacsL0JgwFfuNR4nxhQ1ZUO3VWaAsuEKN549H8todADuhBIXSVvh8M09/T 1iMyPkjUr7H3AIZMTOZwrVlbHKMos6wtmHkD2DXNMoPBxKVEMPWaZf2YStsLOMvW7x KUWhL13YpJETsjLeWJp6MG8vvXrw2UDzBe8fqFFpbKTEsB9UaAuf8m0TDZKhNqAulz ybhsnrASJ0jXg== Received: by mail-ed1-f69.google.com with SMTP id m12-20020a056402430c00b003e9f10bbb7dso17432923edc.18 for ; Tue, 30 Nov 2021 08:37:38 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=m57rGsIwKfQnWqRZlhXuUH2CXSsaz95TtnjsvkMc6+8=; b=vktF9KHQsoANfGygWY208R8WF554XsIgJG56JCTNd3X/dFT2HrIrjC4pttUfClNPW3 gNj4Ms2000ivA2YCVYdPftzwAeaingLiwuvSufyYTCyYC+L9ofDkIhB1LiQFdDUZyNb4 38Y4b5qEM8Vmmt4Cy+PVkJfBo/aY+yrq/rtVIzIwfUqmspnEHFxSzAU9IDi/Tlf0qzdc lim/PA1X1hHGoHjaRU7vYJt+vyU9sGRUxnLXVwMyzv/kFiaa8QRqzq7TI+k51OYqPKkp +tNZKZQaZHZydFJ7XaiVFSnysH/kDSpn3gyhZRxp9KWlb9na78G/lNCmnxUBcBnWRXBf PA1w== X-Gm-Message-State: AOAM532OdnN0aHTqgwoJO6Mxed76jJAcquR/7rjnzH0SnLIvccMjq2iT gkKFEHV+W3JRoSlOHXkJqrN8iAoI1LD4aSXIIE6ifXoRdslFphtG/nE1IFaoGlpq03viYvyyUQH XQlOtfdsZBU1rV6d/Knwym6yZ X-Received: by 2002:a17:907:1693:: with SMTP id hc19mr218412ejc.396.1638290257468; Tue, 30 Nov 2021 08:37:37 -0800 (PST) X-Google-Smtp-Source: ABdhPJw9oiO70ULEuyoV1pXmDQWBMf81Wpv7O8Bouo/dHOEIEF2rUkCcuG6K4jy/F8g+yuo2oZ7s4A== X-Received: by 2002:a17:907:1693:: with SMTP id hc19mr218391ejc.396.1638290257316; Tue, 30 Nov 2021 08:37:37 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id sd28sm10442587ejc.37.2021.11.30.08.37.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:37:36 -0800 (PST) From: christian.ehrhardt@canonical.com To: David Marchand Cc: Maxime Coquelin , dpdk stable Subject: patch 'net/virtio-user: fix Rx interrupts with multi-queue' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:33:53 +0100 Message-Id: <20211130163605.2460997-29-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.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 19.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 December 10th 2021. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/7bd82b66f0f765a4de7512000b0caae33cea2a95 Thanks. Christian Ehrhardt --- >From 7bd82b66f0f765a4de7512000b0caae33cea2a95 Mon Sep 17 00:00:00 2001 From: David Marchand Date: Tue, 31 Aug 2021 17:54:11 +0200 Subject: [PATCH] net/virtio-user: fix Rx interrupts with multi-queue [ upstream commit 848e93d9001e74fdbcb31b7ac5cdc1991b9e3f03 ] The callfds[] array stores eventfds sequentially for Rx and Tx vq. Fixes: 3d4fb6fd2505 ("net/virtio-user: support Rx interrupt") Signed-off-by: David Marchand Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_user/virtio_user_dev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/virtio/virtio_user/virtio_user_dev.c b/drivers/net/virtio/virtio_user/virtio_user_dev.c index ad5d2f3bf8..72b3dbd265 100644 --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c @@ -299,7 +299,7 @@ virtio_user_fill_intr_handle(struct virtio_user_dev *dev) } for (i = 0; i < dev->max_queue_pairs; ++i) - eth_dev->intr_handle->efds[i] = dev->callfds[i]; + eth_dev->intr_handle->efds[i] = dev->callfds[2 * i]; eth_dev->intr_handle->nb_efd = dev->max_queue_pairs; eth_dev->intr_handle->max_intr = dev->max_queue_pairs + 1; eth_dev->intr_handle->type = RTE_INTR_HANDLE_VDEV; -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:07.777961732 +0100 +++ 0029-net-virtio-user-fix-Rx-interrupts-with-multi-queue.patch 2021-11-30 16:50:05.614872238 +0100 @@ -1 +1 @@ -From 848e93d9001e74fdbcb31b7ac5cdc1991b9e3f03 Mon Sep 17 00:00:00 2001 +From 7bd82b66f0f765a4de7512000b0caae33cea2a95 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 848e93d9001e74fdbcb31b7ac5cdc1991b9e3f03 ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 16c58710d7..89f8b2271f 100644 +index ad5d2f3bf8..72b3dbd265 100644 @@ -21 +22 @@ -@@ -416,7 +416,7 @@ virtio_user_fill_intr_handle(struct virtio_user_dev *dev) +@@ -299,7 +299,7 @@ virtio_user_fill_intr_handle(struct virtio_user_dev *dev)