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 69F46A034F for ; Wed, 10 Nov 2021 07:38:15 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 161D940142; Wed, 10 Nov 2021 07:38:15 +0100 (CET) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2055.outbound.protection.outlook.com [40.107.92.55]) by mails.dpdk.org (Postfix) with ESMTP id A29E340E03 for ; Wed, 10 Nov 2021 07:38:13 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=MZdc04VNAsDrHbHcVp0bNiL2s2JPV3xDj5NsVzoDz232J6rnSH+FmWOyBt1CyL3rpfFoXssr4suX/4QKWrwweYIEU5WyQYr+DQG3x1nXkrdoB+CVDGZ80ZIgpFta41wnqLRG4mWVoOQSj4ckIqEcNbUU9BI7nVJxDNrxADv026m6WA4FQgoYgzmcL+BxNNDX5V9ZCD5a92YvlIiEub52VHj6F3989PiDtl40st+N5y1fxFEUB0y+60V/mPKFHlhRBuf5I59JnRq64XgP3FUC/pX+08IqhvK18mscPOU9vzpjiiJOtKeNqyTsVJ+PFl4oMF4bpwfagdJvZwUkyaZ4pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Sf1QtGvXpMGcMhNI+81cN7u1jNl78hhDQm63o4jTe0M=; b=G/+LZaFwIRzaNaNQ1yd4tRzg5wOd5fLNc51q+x+8H8IDDOiUNFE5szWGjFRN+tk9dU4UWNLbg7cI0UWllQ+8yoWttUpT4PR7WK1CayU+PvQDwyYJro5jdfBiWEhTCuBwmFqYuQAmO8NRcvfuJwPZ0Tf5irFrsaqrCnmtJJnxVyGOVcih2Z9u4yHqtq5yhnZMUMSZSlmDOXK8XqnWeUekiUoncc8movM3XzakIB6BnAFfvkY4l55RkfnuiSCgiVEnYvduUsTKdZ+Ur4KCTLRIToIc3baGtrR3oOVXEPrfcUAi48ozAy+4aBYCLV8nzlzsZLi6Mp/WX5UQUx41iAkVlw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=redhat.com smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine sp=quarantine pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Sf1QtGvXpMGcMhNI+81cN7u1jNl78hhDQm63o4jTe0M=; b=Fi1QYKLO1qHVDWf4/gM2FfGgXRVnmxfjb4yAOypdmKTuskPHgbukfsjx6cFbiCCOCaKYSv/msTQ35D87Jq/CUR8fTgfzdbW97LiMO81BC8onit5nXmq0xQSpEuQOe072d3OJw4VgJttra7yqfLDTMX9xOXJTfZNhQwzdRpUqwpb6esv+/YCPP2z2EzX2Jtkr83b/uSAGJsyQIUekQXpiOMl2JYNkoGNZhCD6I7ue5A/hNktrUvIl87McxfSY3P50KKD7glPNUPlb3ZK1oBhNgxusdAZT6O6I2HbuYFoLrTiE3Y1Q++T+rFJgqDNZuGP19SXT5kRI2yAAP2zM5KH+7g== Received: from DS7PR03CA0295.namprd03.prod.outlook.com (2603:10b6:5:3ad::30) by SA0PR12MB4415.namprd12.prod.outlook.com (2603:10b6:806:70::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11; Wed, 10 Nov 2021 06:38:11 +0000 Received: from DM6NAM11FT059.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3ad:cafe::d6) by DS7PR03CA0295.outlook.office365.com (2603:10b6:5:3ad::30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.10 via Frontend Transport; Wed, 10 Nov 2021 06:38:11 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; redhat.com; dkim=none (message not signed) header.d=none;redhat.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by DM6NAM11FT059.mail.protection.outlook.com (10.13.172.92) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4690.15 via Frontend Transport; Wed, 10 Nov 2021 06:38:10 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:38:06 +0000 From: Xueming Li To: David Marchand CC: Luca Boccassi , Maxime Coquelin , dpdk stable Date: Wed, 10 Nov 2021 14:28:56 +0800 Message-ID: <20211110063216.2744012-53-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211110063216.2744012-1-xuemingl@nvidia.com> References: <20211110063216.2744012-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 92945353-5bae-4b42-b467-08d9a414aa48 X-MS-TrafficTypeDiagnostic: SA0PR12MB4415: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 7HFwL26yqyPR5XnaKoNk8Pu9Gz9lxNCq2giAzeVQ4sDoXrmI8WoGxK3ZPKC07+2yqLYVmYrjjR8bD3A/8hyH4AL8OhDped+tnndMvmA7JAfSbWMgivmtS6HCZLm2RfGVKg/OPt9HwpAG6LstVuhWK5vwBj3QofIgMCBOmV200d+KKI6X71VKyVW+RajZOxfQIWB6zyHzGUh827EDUhyqLWw2oZFUhpKsye0o6hbk8Gqg6LCDb76jvl8GSMNlQxnJOdif6bQlfkOV4pbp0xvVSx+HrgQj68vEqaVLHIvWfjBZru+EQs56AJSDXuz+plUoUMfje/Dsf4jERszBQiTo7SF5NySaf57r/lkYR60hSqgMJHbsAGe7NZOFCEpJYf755S25omXjdFee3A2ou4KfGia9yjI6CmR92IB0K8nWNJdR+M/mxmmmecVuE1nqNEba6stUppDhBcGO50xH9szdcf/FJmt6Zt8kSXbcPge4qi8CzUEZZ635ZTqxJq+ggsVQLRAu26LX02eeX3/YXnOxdUmddsjQtHvCe9g6sKpbPQ//udtGnO4QnW+JE25skrGP77NJC0a2r3aFSCW1kvWoyqOcTCh3fDwfckEMU4cn7s9DCGE4UAGXobwiF630uxUqGIZ9frjyQ/zWTDEhlh0kX1rHZP4SCQqs7JR0a2H0XHxA6NgRTBrHJA/z4Jan8RFzAsnl2IJ3i2fYzseIU8oX9cjwYpeTNn+/UbbtuLPUyfFre02HKaa/Kt6cQwG6vML086jzaMUtr/koTMeFnFnssw1SXKK0gwcEhH0cLuvvFbThNLMR3INGrUbKpC2dQsuWvG1Yi52w2dA+XsMWEGb/GQ== X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(46966006)(36840700001)(6916009)(4001150100001)(336012)(426003)(83380400001)(1076003)(36756003)(70586007)(8676002)(6666004)(4326008)(36906005)(53546011)(2616005)(16526019)(36860700001)(82310400003)(7636003)(186003)(5660300002)(508600001)(7696005)(966005)(54906003)(70206006)(6286002)(8936002)(55016002)(86362001)(47076005)(316002)(2906002)(26005)(356005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:38:10.8800 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 92945353-5bae-4b42-b467-08d9a414aa48 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT059.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4415 Subject: [dpdk-stable] patch 'net/virtio-user: fix Rx interrupts with multi-queue' has been queued to stable release 20.11.4 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/12/21. 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/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/dd6e6e33c7cf046becb5a373f44228489cf01af2 Thanks. Xueming Li --- >From dd6e6e33c7cf046becb5a373f44228489cf01af2 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 Cc: Xueming Li [ 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 e93e1919ab..73f6fd7313 100644 --- a/drivers/net/virtio/virtio_user/virtio_user_dev.c +++ b/drivers/net/virtio/virtio_user/virtio_user_dev.c @@ -312,7 +312,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.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:04.418669644 +0800 +++ 0052-net-virtio-user-fix-Rx-interrupts-with-multi-queue.patch 2021-11-10 14:17:01.804079970 +0800 @@ -1 +1 @@ -From 848e93d9001e74fdbcb31b7ac5cdc1991b9e3f03 Mon Sep 17 00:00:00 2001 +From dd6e6e33c7cf046becb5a373f44228489cf01af2 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 848e93d9001e74fdbcb31b7ac5cdc1991b9e3f03 ] @@ -9 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ -index 16c58710d7..89f8b2271f 100644 +index e93e1919ab..73f6fd7313 100644 @@ -21 +23 @@ -@@ -416,7 +416,7 @@ virtio_user_fill_intr_handle(struct virtio_user_dev *dev) +@@ -312,7 +312,7 @@ virtio_user_fill_intr_handle(struct virtio_user_dev *dev)