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 037D8A0540 for ; Wed, 6 Jul 2022 22:36:06 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F2B4840FAE; Wed, 6 Jul 2022 22:36:05 +0200 (CEST) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mails.dpdk.org (Postfix) with ESMTP id D983740FAE for ; Wed, 6 Jul 2022 22:36:04 +0200 (CEST) Received: by mail-wr1-f49.google.com with SMTP id d16so17279998wrv.10 for ; Wed, 06 Jul 2022 13:36:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=nm9vq/f7S3Lvly2VlAeQj817aVRolY6Bfanimk3trZc=; b=blokHUm8b7o3Ukdl3swoNjFe3nS7Uj8P05OWCmI9PREQRI995JaymlnwhV0J+zweys 8J1RXOE0iu1GlmiftKl0W5QjGK6yzRtF0z8RFZcAteAJKjC50R51u77SpAlELzdokrvF TuQpaqYUPy4mHQlzIMf2dOF2y1fV6UsxQly3jumB5f7HexWT6NOblzVKxuB8uL8Qyydg D3xaBmvm/aMv4uiwAtk3u97AZAk6MoUbfxnE6gs7gZ+jR0XCFbwo7P2fk8jptQ2M/ubh v44sUMKw50Ix95gzk8yrUrJfWe3c0YOJqFagjGPIjeuSjbVQpQMMhb4vEOGpOI8Lulif 7DOg== 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=nm9vq/f7S3Lvly2VlAeQj817aVRolY6Bfanimk3trZc=; b=7jk5Pn19ZsCW7uClWQWV+2a5fLBSnjIxcnfQJPj9fUX4lji2oZIhMTC0O8k77CUYVy J+Iv5B0lAIKrvpiMDRnknvsBMxLpVk1gm8rxEOdmJFGQChOEaj3FHlwc63mTgTahX62F UclR340XR90K9fFbnjqDsIsMp4D7oreG8cvPyo7cuo53VnvHzcetuGZPpTFyLMg9qfl5 QsbazLzUn9QLkIjtaC/XMnQWzFwMlTkXMUMQEPd1xrmwvoWSudvESQIEEXSl9C28tgZL HO9pieWtX2RIyeKzWPyL1cHtD4YtGwjviuNy40CsoFWeLJsuH5/MxIQhU87koFg6o/lB iNFw== X-Gm-Message-State: AJIora850OZjdboflB7D804JZPk78SSwcYTpbFEZxh3D/GI9qQOOuGVA Wdpmu+/d1AnpsqV3ojGvzkI= X-Google-Smtp-Source: AGRyM1uj3OHDnwMc/D7k+VBoK5Tgiq0/1LW3u35BTNaHChTENbLcwnznoOXnUo13sg9geUDkh+uc9A== X-Received: by 2002:a5d:6da8:0:b0:21d:2598:4e28 with SMTP id u8-20020a5d6da8000000b0021d25984e28mr41246099wrs.373.1657139764633; Wed, 06 Jul 2022 13:36:04 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id p9-20020a5d68c9000000b0021d7122ab80sm5920814wrw.110.2022.07.06.13.36.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Jul 2022 13:36:04 -0700 (PDT) From: luca.boccassi@gmail.com To: Yuan Wang Cc: David Marchand , dpdk stable Subject: patch 'net/virtio-user: fix Rx interrupts with multi-queue' has been queued to stable release 21.11.2 Date: Wed, 6 Jul 2022 21:34:52 +0100 Message-Id: <20220706203506.3422496-17-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220706203506.3422496-1-luca.boccassi@gmail.com> References: <20220628151938.2278711-26-ktraynor@redhat.com> <20220706203506.3422496-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 21.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/08/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/36f4c8e67fd41186ea8c1b4567bc4bb684ae75ee Thanks. Luca Boccassi --- >From 36f4c8e67fd41186ea8c1b4567bc4bb684ae75ee Mon Sep 17 00:00:00 2001 From: Yuan Wang Date: Mon, 4 Jul 2022 15:04:28 +0800 Subject: [PATCH] net/virtio-user: fix Rx interrupts with multi-queue [ upstream commit 23ab0c59bcc8c91fe66762a10d64cd07e5acd69c ] The callfds[] array stores eventfds sequentially for Rx and Tx vq. Fixes: d61138d4f0e2 ("drivers: remove direct access to interrupt handle") Signed-off-by: Yuan Wang Reviewed-by: David Marchand --- 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 35aa76b1ff..f9cada05e4 100644 --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c @@ -417,7 +417,7 @@ virtio_user_fill_intr_handle(struct virtio_user_dev *dev) for (i = 0; i < dev->max_queue_pairs; ++i) { if (rte_intr_efds_index_set(eth_dev->intr_handle, i, - dev->callfds[i])) + dev->callfds[2 * i + VTNET_SQ_RQ_QUEUE_IDX])) return -rte_errno; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-06 21:07:54.147174258 +0100 +++ 0017-net-virtio-user-fix-Rx-interrupts-with-multi-queue.patch 2022-07-06 21:07:53.547518784 +0100 @@ -1 +1 @@ -From 23ab0c59bcc8c91fe66762a10d64cd07e5acd69c Mon Sep 17 00:00:00 2001 +From 36f4c8e67fd41186ea8c1b4567bc4bb684ae75ee Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 23ab0c59bcc8c91fe66762a10d64cd07e5acd69c ] + @@ -9 +10,0 @@ -Cc: stable@dpdk.org