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 AA7DEA0A0E for ; Mon, 10 May 2021 18:18:02 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1E2BA4111A; Mon, 10 May 2021 18:18:01 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2086.outbound.protection.outlook.com [40.107.93.86]) by mails.dpdk.org (Postfix) with ESMTP id 2D679406A3 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=eHJZYvim+K+KzyLRS3jBTs7Zbe0DEtolEo4ud8WM8DWWmMbsvHPyVahev3u9lFidKuxknJKwdM3aQAGBGhczzVp+EcBj57hrF5UhKNMr6MXKeqZhBu5eKFLL2RWhukT27OsGVDsAWbjHO1MPIADDVZUIuQx/v9BVr2P2nXHiTqoHMJ1+Qwh69rWt00DOuPcaKJH5qUEBsw6XlIobxgyrK9xuu3v1FqIEtmtdkf+ovOkzYu5gqfsJmpyaZ2GgLbJ+SziUsXVjOL9rfKFjfUVnSWMTpNh/ID1HX5TlyuUBjmJLz9dBuBlgG8AC9xh7RengGwrHDIypkI5v6sV1mWqiDA== 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=FygpLUvyRTPO6FfgvX35JbWUr10vgE44vjTij45kG2w=; b=E53aBBB8f3zSNkmdZ+Rmwr6AudcF2BFCaiigXKNuEHddczVgf6zy2yherwpRko11mb1oZSw3PSppR69S6Q9cJTRgQZsrHB2gbNyJK7bVgMspZwO9lv/zvEo2R8OKfeQTY362hoi8AvQnRfJ2wlIVWE7MSQhBMSirK0sd4/2pQe/bmRhC0iB8fHucJ7FqNXNX9HmkFKKqNy+fYefw0VQviZ/Y3DiLxSfS0uGcFOCylGOpQtNp+9j3VrMz9W3x33BYo2qGeAexJoKeZ62T1PMS97Ag2EXQYm2yEAcRsszenn5BQL2YOIDKqhS+g/1N3sKJmR+NpqaL87x1Rvk3Z5GbsA== 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=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=FygpLUvyRTPO6FfgvX35JbWUr10vgE44vjTij45kG2w=; b=iAfYZr9s7KmRmCg+q6QNn2GHPh2OLPVItJ4NYVODAfKasTY8MSPXSHhlcUglOCEMvytPIlj7tmVHQnJwW/q+RleNOkrSSAdYaUtzCzgNu15WvFPMpUp4oSsfw+hkURluWSkWf95dx4uQMY58ZJpr605e4XHKqUkSfB2Ihq2PfedkZ2Lb/LRclvou4NBqAPL18BqtTPZ+yQN8tMe7Hf7ESN3+UvNT4acYHxynB8q3p/KzT4nMFcMLeBNTcqwlHN//DSH+1BdKERvVSqnqEO0LCbcpgcPqMxGPtZnHYHpISD+5KOuegAiYlXsdx1y3cDPsdnnuhLv4hgOKYNVHjGx35A== Received: from DM6PR10CA0034.namprd10.prod.outlook.com (2603:10b6:5:60::47) by SJ0PR12MB5501.namprd12.prod.outlook.com (2603:10b6:a03:304::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.27; Mon, 10 May 2021 16:17:58 +0000 Received: from DM6NAM11FT022.eop-nam11.prod.protection.outlook.com (2603:10b6:5:60:cafe::a6) by DM6PR10CA0034.outlook.office365.com (2603:10b6:5:60::47) 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:58 +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 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:58 +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:54 +0000 From: Xueming Li To: Marvin Liu CC: Luca Boccassi , Maxime Coquelin , dpdk stable Date: Tue, 11 May 2021 00:01:38 +0800 Message-ID: <20210510160258.30982-149-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: b12147d8-3c5a-466c-5f6f-08d913cf2d2d X-MS-TrafficTypeDiagnostic: SJ0PR12MB5501: 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: 8sKHtIkFNc/0M622Ujdk81g83DkRHw9yii9a0htaQa29lHdxJutQc12RmQndmRuWFbIcovKdp7cwCRB6EbQMzP2obkMYyCW2Ii0Qgk0yk50Psn+r+HlEzpb7Bq4YFVmdJR4CKaoDjf3iULmrtkmrgZ1T14z8TTYIRPLqrws6CS32bT8MupzOX76OPyxur6PnijdcbZOWKbmu5QUSyzhFka5q8FZy8Cp+efoigJfC6SHRasaQZVRCSry24lKojLpsJVNaATZ49Do0+W236bOdbHQ96uv56neoFQKAgHlq+bZbEqv6PwgLKYa0Im1cAtWj02fTNjllIslwXbDKSoh7SdT9/YHL02am/Y0IEyNJELjPQ/nMGTkMW5KbxKxWL4X5hQ448/72n0ezZN5FTFmj1M6VeZqB0M8xkhFCFG5W6rgNbygU4SF/KkbXsb4Wz5vwBYj9g2WmINz3zn9Tp90sA5cIQQlXG5VS/z0fkRDHMeQgZQSIfr7aqYU3xmKngMtGpzK3ZDxu7qSDTIVEs/BYR7fgb5lZwdqr+6wkHlgOrHmYyKHW2hYw7hd4m9+frlBOOImVISDLUdtQyHjSpL5adlBwgMAqCAP9R+z0e5ok1JibzQrtTkHDISZQASx+6Uqi6pCmFRBmmkbSJSXhOL4QHoRHG6J1Ut0owwumVLyV6Py8bHkQ/rgWaYacgk+EKbdxjMT2lXyf6LYf0BiN20jDt+IxpFsf6ev/0zsQyE3h4HCWnksYWPmuZktj74mSkqmj5cKGHvoXx7BDdZwMY9VDfw== 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)(136003)(396003)(376002)(39860400002)(346002)(46966006)(36840700001)(26005)(82310400003)(1076003)(16526019)(966005)(53546011)(478600001)(186003)(55016002)(7696005)(5660300002)(2906002)(47076005)(86362001)(82740400003)(36756003)(36860700001)(54906003)(7636003)(70206006)(70586007)(2616005)(6286002)(6666004)(336012)(6916009)(356005)(36906005)(8936002)(4326008)(83380400001)(316002)(426003)(8676002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:17:58.3983 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: b12147d8-3c5a-466c-5f6f-08d913cf2d2d 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: SJ0PR12MB5501 Subject: [dpdk-stable] patch 'vhost: fix initialization of 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/de93dc0502072017149f5c91c8a6e71e88a729e0 Thanks. Xueming Li --- >From de93dc0502072017149f5c91c8a6e71e88a729e0 Mon Sep 17 00:00:00 2001 From: Marvin Liu Date: Wed, 7 Apr 2021 11:25:15 +0800 Subject: [PATCH] vhost: fix initialization of temporary header Cc: Luca Boccassi [ upstream commit 5b784a2d80abddd5d554b1eef534e8047b1d2e5a ] This patch fixs coverity issue by adding initialization step before using temporary virtio header. Coverity issue: 366181 Fixes: fb3815cc614d ("vhost: handle virtually non-contiguous buffers in Rx-mrg") Signed-off-by: Marvin Liu Reviewed-by: Maxime Coquelin --- 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 bd92f45886..4b7c437764 100644 --- a/lib/librte_vhost/virtio_net.c +++ b/lib/librte_vhost/virtio_net.c @@ -835,9 +835,10 @@ copy_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.458963200 +0800 +++ 0150-vhost-fix-initialization-of-temporary-header.patch 2021-05-10 23:59:26.570000000 +0800 @@ -1 +1 @@ -From 5b784a2d80abddd5d554b1eef534e8047b1d2e5a Mon Sep 17 00:00:00 2001 +From de93dc0502072017149f5c91c8a6e71e88a729e0 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 5b784a2d80abddd5d554b1eef534e8047b1d2e5a ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 7f621fb6dd..48b013a9b4 100644 +index bd92f45886..4b7c437764 100644 @@ -23 +25 @@ -@@ -812,9 +812,10 @@ copy_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq, +@@ -835,9 +835,10 @@ copy_mbuf_to_desc(struct virtio_net *dev, struct vhost_virtqueue *vq,