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 E4289A034F for ; Wed, 10 Nov 2021 07:52:22 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DE35140142; Wed, 10 Nov 2021 07:52:22 +0100 (CET) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2087.outbound.protection.outlook.com [40.107.236.87]) by mails.dpdk.org (Postfix) with ESMTP id 2346640142 for ; Wed, 10 Nov 2021 07:52:22 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ObKC0CxpuTDd6QQWr4Rx79wB59j9KqoIKhYU3M04mRVWgcsrbC8QaXZFMcrkrv900ULElGvfYFHpANSs1L/Fm+9efMpysoIgx2v1nTaYbkwhJVOiyHEunmoEfuXFZmHCwJWPbFmd/I/+ONMazOcF+OD1GNg6LA4m5XPJfINs9dX8Q9/KAxORAuJi76BKxQ+u6yjbhuP4eFnjC0cKqXojj5fdzUy/HLpe1fWzpKIquhoFTh+I10L+ZyHNCepVDQVq0QwwgK19FG7/vPBxW2wE7tRCAKXQPAFqpHteqROS2PwgLCo+QdhQPbReI3vfB83FqT5HmHeNFuvnKXedLNN5Qw== 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=34S0X77K6JD+YsNFFFcG+SPLsT+CB/Wty5N2A7FaziE=; b=H4qtIkMjje+cTGBTkncKKgaHReg+lzyUjaiLpK1bf81K7+XaYvhjpsOJY+JW22VlDxT8FxJDSMuvlPz9AChDB3Z+yjOx23KNCQyu37HPL0vBmAuZvUgAyi/0o6KyCJwTrdTagFpPcBXGZxcJxItHx6r8gp+nL7VSqFZ7ZZrDb0qpP0wVDD3oz9yyYZHwiDekv4Y81ungxzsFu/+svFjfiJCKYXtPbM9XgfKKEKy+2iu2ZEfvYU4wW/Rce9i/GOwO/BMytHzSyh0aYJ3wiTrJ5crOtLPI23Mw1cI0dDHfKLxFHir728yT/tkjum7WwgTYcSqVHByjSoUUsur5HU4wpg== 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=34S0X77K6JD+YsNFFFcG+SPLsT+CB/Wty5N2A7FaziE=; b=ZjK4B9lVsWhOG7AD/Vib/dgrg7G+UBpSZhs5CQQU7NI6YjCj2ryV1gIAPWhjIKTqCbV7XuzfsBrkuKQY288zPNThZ0NcNFlLwbdLXlKcyQXXSa7RyyQL94tBg3lXTjhgXGPejSOCr0zKy9oW2cKh7Kzd8iq5Dghos7gWQWfOu8Bv6vhs6m4zzE/ymU4DXym56Ego//StNgxGgWzoFfbp7sDNtvMIq3ZOcPumrxJKFCMma0UJef2LhL9ges9noBc0tFplAatHPdTpIr+RPwl5xnqiAG0JOW+BA1Ga+gGzhKuzKWPKnijLH1xugSqgfTbyVM587sHypRJFfLm+Ao/fdA== Received: from BN9PR03CA0954.namprd03.prod.outlook.com (2603:10b6:408:108::29) by SA0PR12MB4384.namprd12.prod.outlook.com (2603:10b6:806:9f::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4690.15; Wed, 10 Nov 2021 06:52:19 +0000 Received: from BN8NAM11FT023.eop-nam11.prod.protection.outlook.com (2603:10b6:408:108:cafe::71) by BN9PR03CA0954.outlook.office365.com (2603:10b6:408:108::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4669.11 via Frontend Transport; Wed, 10 Nov 2021 06:52:19 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;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 BN8NAM11FT023.mail.protection.outlook.com (10.13.177.103) 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:52:18 +0000 Received: from nvidia.com (172.20.187.5) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Wed, 10 Nov 2021 06:52:10 +0000 From: Xueming Li To: Zhihong Peng CC: Luca Boccassi , Maxime Coquelin , dpdk stable Date: Wed, 10 Nov 2021 14:31:01 +0800 Message-ID: <20211110063216.2744012-178-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.5] 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: 1b235b8b-7aa7-4574-7765-08d9a416a390 X-MS-TrafficTypeDiagnostic: SA0PR12MB4384: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pdj3K9Nhk0HujHfzhYlEM6N/VTqueJACQqnPc2yZ8AresU/JWlD2EYXx3uPrhR/+WX/o/s/Nj0lTDeRA1FV5vy/Nr0u2E3A9Gg2PE7ia6t8v/faMZakUY2aiDXraiJSNBzykBdeRYZd8wRLfVBpJosOaCITMgnhCkOhVTb5dI7MmqG0P3QQDNU3s9igEbZhHB39/TBeRJEH6ef6mt3X/7zABkJ0WBeKCKCXM7whRP5KhUeaeR8jojyjR5NivhEfY7+JoVjcLbzZFtgEQIdexKHSWu9qvUbX85+R6R05yR4sbBRxVvYWIyy8NaoWmit5n7vzdj+f0qwgI/bn5WQFMCTeVkeAdwnK4VXYcdDC9wwrGSXjKxzCSZ9IcWws1CqhQEYdseJa9tPfWZ3CYTaGbQZRizDec2+0If8S3IuFynbbaiKVlCZHCIItoawe4YNRVXB1urEbLn/DE+Jk8inw907nZ59+zuszjHA6/I1KUSLOqaAKVvpDww211F+XISZhpslmVd23SVGYfxgro+s8wpqsYYRj93r77KFm1P56zpv1hQpmxj2ZB/MjMPKZjz4SOvibDJFA8e64yYuMq2OAJ44Yt0c1r0zZjOkEg+9thbqVLQQBN78/gu4qyy7Rgef7HvMpwdJcM966ycoLkyE4tSt2ki0wP/G8r2MEJC1W4MTcw6CIdx82SnSWdSKVhileJH6MLMRxvYLStThbiCW8H+Yq8OlyKmxuUOVZWfYyYZhVgeOdMlljZZXCy7eJM5UaDmLxiuHT9uWweDjYP8z2IUanNdrQi86HSWtYc2FaJ3eVN4npm0SgSAaENK0GZ0ZtXE6GNIpZ1zatsV0mVKnUttQ== 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)(36840700001)(46966006)(26005)(53546011)(70586007)(70206006)(55016002)(16526019)(36860700001)(83380400001)(47076005)(2906002)(5660300002)(316002)(82310400003)(508600001)(7636003)(6916009)(54906003)(36906005)(7696005)(336012)(36756003)(6286002)(426003)(1076003)(4001150100001)(86362001)(2616005)(966005)(8936002)(4326008)(8676002)(356005)(6666004)(186003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2021 06:52:18.4818 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 1b235b8b-7aa7-4574-7765-08d9a416a390 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: BN8NAM11FT023.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA0PR12MB4384 Subject: [dpdk-stable] patch 'net/virtio: fix check scatter on all Rx queues' 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/9e14b11f35b4c2c1bf699bcb3d10c47340132a1c Thanks. Xueming Li --- >From 9e14b11f35b4c2c1bf699bcb3d10c47340132a1c Mon Sep 17 00:00:00 2001 From: Zhihong Peng Date: Fri, 8 Oct 2021 05:49:45 +0000 Subject: [PATCH] net/virtio: fix check scatter on all Rx queues Cc: Xueming Li [ upstream commit 84cc857b5d9a344a1f04ec9f55417b58cd38e260 ] This patch fixes the wrong way to obtain virtqueue. The end of virtqueue cannot be judged based on whether the array is NULL. Fixes: 4e8169eb0d2d ("net/virtio: fix Rx scatter offload") Signed-off-by: Zhihong Peng Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_ethdev.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c index ed20b1427e..afa9fb591f 100644 --- a/drivers/net/virtio/virtio_ethdev.c +++ b/drivers/net/virtio/virtio_ethdev.c @@ -900,8 +900,11 @@ virtio_check_scatter_on_all_rx_queues(struct rte_eth_dev *dev, if (hw->vqs == NULL) return true; - for (qidx = 0; (vq = hw->vqs[2 * qidx + VTNET_SQ_RQ_QUEUE_IDX]) != NULL; - qidx++) { + for (qidx = 0; qidx < hw->max_queue_pairs; qidx++) { + vq = hw->vqs[2 * qidx + VTNET_SQ_RQ_QUEUE_IDX]; + if (vq == NULL) + continue; + rxvq = &vq->rxq; if (rxvq->mpool == NULL) continue; -- 2.33.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-10 14:17:09.795391724 +0800 +++ 0177-net-virtio-fix-check-scatter-on-all-Rx-queues.patch 2021-11-10 14:17:01.990745109 +0800 @@ -1 +1 @@ -From 84cc857b5d9a344a1f04ec9f55417b58cd38e260 Mon Sep 17 00:00:00 2001 +From 9e14b11f35b4c2c1bf699bcb3d10c47340132a1c Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 84cc857b5d9a344a1f04ec9f55417b58cd38e260 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 047d3f43a3..ddf0e26ab4 100644 +index ed20b1427e..afa9fb591f 100644 @@ -23 +25 @@ -@@ -882,8 +882,11 @@ virtio_check_scatter_on_all_rx_queues(struct rte_eth_dev *dev, +@@ -900,8 +900,11 @@ virtio_check_scatter_on_all_rx_queues(struct rte_eth_dev *dev,