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 6B16DA0A0E for ; Mon, 10 May 2021 18:18:03 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 403034111A; Mon, 10 May 2021 18:18:03 +0200 (CEST) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2062.outbound.protection.outlook.com [40.107.220.62]) by mails.dpdk.org (Postfix) with ESMTP id EB32341114 for ; Mon, 10 May 2021 18:18:00 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fKYq16S4uh6lur9jU28fiHg2jf0ubOdWhhLwa0sIOmmOL5xVpoJQ2/TYNbgU8KB+h3VfIcBnQulPwnD+9gycLx4q81NfrxHyJMk9QD5BmrCf148ym+v+vZZ6Zp7bvCf4wwIbHxtTzDzfSBWb7MeX2hFTawABwZhGcrZNCzU+iNNrLDTImM2Zm0YGjxn8vR26Z6f8blbl3iNmqAn8AT4TU/6Ut04mzGNjErjoXIk88d/lX+0g9Vd3JzRNwR/VxNS+IrPfp0kbRlqIcQ6nydWDnk/ur4skPBjszOYXjnYuwlm0900ByRdVGBDN+iMI4ItbZIs0AZJ2Z2fNY7Zg1SY87Q== 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-SenderADCheck; bh=UzgPIUdOLPSoIvPTA9lI5lViTEOFbWHH2ofL5sS5T1U=; b=B3ahsDuBUUZKiJ9s9KmlEbZpl3XRNCihiY0IVJAZ5+JKDAFjHV1bdXj4r6nvOlN6gZz8h6AQ026kxxzDFpgR/kY6jxoQcbDvzjJjZe8ekN+DE8rO2H907pa94VoSgW3Noo8r06GKBZ1YrSFDiCMVJtLZZ1mpeDfy5e4e8rcke4ofbp+5QMV5NtQtVzkaKqmA63n8HqzkPvd/cPxLcrQtjM/l9fTWBZirtafgYFjJD5fAtpfOxgYeBUNg5OqUVceGmlBeJjFuvQYGLILC7knsl7nwPkDS1K7/1EkOED7ujqh4vV1kg0JOtU/qyMfsozwkzsPBcAbFxs+WcQQFrJs+2Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none 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=UzgPIUdOLPSoIvPTA9lI5lViTEOFbWHH2ofL5sS5T1U=; b=OomAmnw6r/xprn3d9aRNKSYpUbwvk8d4Rzru5ELSVV7vauVsKQXznZ1RKUYEXw829tDqp/5ZpmqvqQ1beiQ7etdnnL6zBoQvibucLK4aiBSRbusP9DLIg+9G/SVdx4g63+B8SELFXVMBDNJSeGKEAC2dmV8cXREb6sF3tKk9iabM/fPTSPLLKnrv9Fg/Ke/LtYU6IPKkLBeF+nMwxWqyfnzqGWs5pe4q/MaAlrXhWtqUpF7/IPtOmTu+EpP7SP3c8M8DFjzrNATv3l8Iy8+cgDLr2frFjD1llWYGVQM3rBAZ/FkkoVcaER3fv8Nkh8C/yZJxxlJrEHmvVzOUS7jvqQ== Received: from DM6PR10CA0019.namprd10.prod.outlook.com (2603:10b6:5:60::32) by CH2PR12MB4071.namprd12.prod.outlook.com (2603:10b6:610:7b::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.24; Mon, 10 May 2021 16:17:59 +0000 Received: from DM6NAM11FT022.eop-nam11.prod.protection.outlook.com (2603:10b6:5:60:cafe::65) by DM6PR10CA0019.outlook.office365.com (2603:10b6:5:60::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:17:59 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.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 DM6NAM11FT022.mail.protection.outlook.com (10.13.172.210) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:17:59 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:17:56 +0000 From: Xueming Li To: Marvin Liu CC: Luca Boccassi , Chenbo Xia , dpdk stable Date: Tue, 11 May 2021 00:01:39 +0800 Message-ID: <20210510160258.30982-150-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 95ebd504-4024-49dc-10ad-08d913cf2d7c X-MS-TrafficTypeDiagnostic: CH2PR12MB4071: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: pcjQ4KJIDtnCQ8lhlxoHNzQG0GmKvglznHMiTQ0IBW1kb15R/orl5TT5tBBNHVqCtrsLPtZKlmvJD3hbYJ//HM7Muql87h0YXkdzvEc5E3/Otxio4PO9qWSNSfbIQOv62Zmrptg+vOqpslf5/SVaGULf3DuFGiayiwjhH1/NcSchP10d1QtfPQBobFCR1Qjrw35qXQxvDrERY84krLdAomFE8bfJdShzvhPwI/vhhfIMnYZQSOJFyCCcvCKDkhsOHab/N4m2Apm4ykcfj8EP/wMjpTY+gdniWQ8O1ueDM9oQ85cnT6k4kX1sqLr6NTbkm8SCZWybY8kFe5OTpYBSULS7fk5z2PYdWvNYufUBNEB/0P2bnWpzA+i33nlx7JNNdQIB3Q8FGRiNI6QKKvmVlYvtzLHbtIvoelJ9MGKufR1YXqZ3oSb657TOIRHNNaSJEfIWpKO0r8yxfYom7G8LsKDJghgl1M8hepX2rnMbiHPp7udKc2aKAVhZ1UKmla+RDFix35N/eeGo/e4oDFyIADAGwwLvFgX88ANf8sYGHFVqAUv7s8P5T3NL0pInbLdpk3a0dLbifvZVNHdRyTpifH291XwVmMZWIEKXV86ZvxJPzRPRU2J+rkTfxZElXZ/uptxQWvU/uLuPNrf0GuBWmSgHda9Zra7Uie7sEmdgbMYtDFAU0JH4CKCfnKzys7ote6/H8AK6nFiP++QFIC1p1L6H5IkpwT0UmN3CiNbi32DLP6bdIETRSUyy1zWcV6cNC+rtf2bX/AuL1RaoigUmhw== 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)(346002)(136003)(396003)(39860400002)(376002)(46966006)(36840700001)(5660300002)(55016002)(6286002)(70206006)(70586007)(54906003)(356005)(26005)(82740400003)(82310400003)(6916009)(16526019)(186003)(86362001)(36756003)(2906002)(316002)(36906005)(4326008)(7636003)(8676002)(8936002)(478600001)(966005)(47076005)(2616005)(7696005)(1076003)(336012)(36860700001)(426003)(6666004)(83380400001)(53546011); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:17:59.0759 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 95ebd504-4024-49dc-10ad-08d913cf2d7c 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: DM6NAM11FT022.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH2PR12MB4071 Subject: [dpdk-stable] patch 'vhost: fix initialization of async temporary header' has been queued to stable release 20.11.2 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.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 05/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/ec4d4d10f36fde449a9826d4a9d3bff33e1bbc5f Thanks. Xueming Li --- >From ec4d4d10f36fde449a9826d4a9d3bff33e1bbc5f Mon Sep 17 00:00:00 2001 From: Marvin Liu Date: Wed, 7 Apr 2021 11:25:16 +0800 Subject: [PATCH] vhost: fix initialization of async temporary header Cc: Luca Boccassi [ upstream commit 98da5545be5180843e61a4dacdc0612b3ae64da4 ] This patch fixes coverity issue in async enqueue function by adding initialization step before using temporary virtio header. Coverity issue: 366123 Fixes: cd6760da1076 ("vhost: introduce async enqueue for split ring") Signed-off-by: Marvin Liu Reviewed-by: Chenbo Xia --- lib/librte_vhost/virtio_net.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/librte_vhost/virtio_net.c b/lib/librte_vhost/virtio_net.c index 4b7c437764..f2392e77eb 100644 --- a/lib/librte_vhost/virtio_net.c +++ b/lib/librte_vhost/virtio_net.c @@ -1009,9 +1009,10 @@ async_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq, hdr_mbuf = m; hdr_addr = buf_addr; - if (unlikely(buf_len < dev->vhost_hlen)) + if (unlikely(buf_len < dev->vhost_hlen)) { + memset(&tmp_hdr, 0, sizeof(struct virtio_net_hdr_mrg_rxbuf)); hdr = &tmp_hdr; - else + } else hdr = (struct virtio_net_hdr_mrg_rxbuf *)(uintptr_t)hdr_addr; VHOST_LOG_DATA(DEBUG, "(%d) RX: num merge buffers %d\n", -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:30.482388000 +0800 +++ 0151-vhost-fix-initialization-of-async-temporary-header.patch 2021-05-10 23:59:26.570000000 +0800 @@ -1 +1 @@ -From 98da5545be5180843e61a4dacdc0612b3ae64da4 Mon Sep 17 00:00:00 2001 +From ec4d4d10f36fde449a9826d4a9d3bff33e1bbc5f Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 98da5545be5180843e61a4dacdc0612b3ae64da4 ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 48b013a9b4..ff39878609 100644 +index 4b7c437764..f2392e77eb 100644 @@ -23 +25 @@ -@@ -986,9 +986,10 @@ async_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq, +@@ -1009,9 +1009,10 @@ async_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,