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 F04FF4625C for ; Tue, 18 Feb 2025 13:39:34 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E773F402DF; Tue, 18 Feb 2025 13:39:34 +0100 (CET) Received: from NAM11-CO1-obe.outbound.protection.outlook.com (mail-co1nam11on2056.outbound.protection.outlook.com [40.107.220.56]) by mails.dpdk.org (Postfix) with ESMTP id 47B0A402A0 for ; Tue, 18 Feb 2025 13:39:33 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=hBuQ+BQ9BtUwy0nUcyVdK+E6uHkVJ1fRnAYHX1B2QBLA8MeOe8hr5koevE/favnVbRRBPmwPYonnU5L2BhOWIvaGyk0A5Ws6NexKh5iGP3i0W+bC9RAxnE/jqo7NlepgeRsuJhlFf6j96KxGq/OciUxz1ZLWHPKJ9kYlrZ1XFLKTmC6pdD+McNGJki0VuP6RMSxzb+G+VNnaIIQr7Uv0gaLmkILRy5wdrP30hN7Ml8KGkzcHEO7/wMecqNR3s2PrHVD4Aovkq2OT65kl7opJ+PpHFM/lh66Dmoy11BovS00966oDwqqX4rCNQHKsb2pgmnS70qaymqvAxfKYGFnedg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=xk9PqFAK2Q3BaTJ5wUQBmC/4pabR27thulBwHlgITP0=; b=LwHA0WPTySOm8vnVl6Bz8Vxa4o3B3V8MHEFuXvg29aJVbPfQiSqOMEqKuJZqP3F5b6tI9vZHlapFZKdKwTWrdJMaiy97zGf3XHKK2gxOPiypHqzjbXOLfl4iJKtH2EX2q5XACqHrNzylO8ThRj1G2Ig71iXsebCc21Eq8NnNCqhQrB35c6NtiuWiT3tIe+DF8nkqcP6B97eYIcKMd3dy436GIefMWS+uEoqobB7kjOnK27Kgdp806P9l3OsZiWNVNY1Ws7x2xf6ksU0wfbfemwvYHLu4fxOGYKCGEwzMxDylkIngis/h2+g6KeJsuQkR1yaoBbX2gZVA8OcOVQPsFQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=redhat.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) 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=xk9PqFAK2Q3BaTJ5wUQBmC/4pabR27thulBwHlgITP0=; b=ih46fBttrVFfYQN3vKEcGJURMyHnC+Wc3qEcJiR4sbJLfogwgyhBE4J8vcMPPV/I/u9MOQJRnptNtfutBj7qR1z+89PogOKhVoxxSltShySQO1I36LsxY8u8m0BYJti632fDjm6suuYBl243qbxxNRtM0QXwWmjT7lEI8dzVhQ1kDhHcg9TXAxjilenQXSHinjZXY+5gODYYPJFqQjJeZ6FzinEad4rh1BiXQJkW3o1GzOtLnLk+/8+CuIU12RPLU0+r1ACb33w5psp7bR5OlKR7UTKkmG1McsUbijW4An90NbQPneG9EUIYzNaWrvvshsJ0rQgeI5EjDa9lRLkSdg== Received: from MW4P220CA0001.NAMP220.PROD.OUTLOOK.COM (2603:10b6:303:115::6) by DM3PR12MB9433.namprd12.prod.outlook.com (2603:10b6:0:47::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.16; Tue, 18 Feb 2025 12:39:30 +0000 Received: from MWH0EPF000989EC.namprd02.prod.outlook.com (2603:10b6:303:115:cafe::34) by MW4P220CA0001.outlook.office365.com (2603:10b6:303:115::6) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8398.31 via Frontend Transport; Tue, 18 Feb 2025 12:39:30 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) 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.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by MWH0EPF000989EC.mail.protection.outlook.com (10.167.241.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Tue, 18 Feb 2025 12:39:30 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Tue, 18 Feb 2025 04:39:20 -0800 Received: from nvidia.com (10.126.230.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.14; Tue, 18 Feb 2025 04:39:18 -0800 From: Xueming Li To: Kevin Traynor CC: , Maxime Coquelin , "dpdk stable" Subject: patch 'vhost: add null callback checks' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:34:32 +0800 Message-ID: <20250218123523.36836-38-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: MWH0EPF000989EC:EE_|DM3PR12MB9433:EE_ X-MS-Office365-Filtering-Correlation-Id: f4db4106-c64d-485e-c2a1-08dd50194a01 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|36860700013|82310400026|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?34Bo2o09QIPQbPiVIk/xStw5yg88exoVQUpQRMoFZRRZSi84xrePXW1JX9Bg?= =?us-ascii?Q?QATKFkyj7bFhcQooIoScq1luXCFP8vthBlzHUEZqBKG2p5eI9/p2/JNf4zlu?= =?us-ascii?Q?zU2jB7wn1aZMzWnyrJKD8ddMlZCAHPScM3zFCWpWOueAvcq5Og/CjQeikv9G?= =?us-ascii?Q?2ZaP7wFrOxUDtAGTWStTrsbq2azzHtoAplg7j4QL+0vY5PIoQbN74iqf6oxd?= =?us-ascii?Q?ChYj8TTaYTtWP996o1e3eKVHLfpKpd7eeOltC+2ldw0sHx922H4lgvn0O8Jn?= =?us-ascii?Q?dr3Lqy7OcFIuz0RDhmd10nb2y5EjR2KrXqUK4s51hr95rQax6GpVNgKxuZe2?= =?us-ascii?Q?CgQr4dj+EaPM2mXJaIbHUaWV2g9Ig4N7vwAShgBnAmC04kdf7LDRRuWRkg0O?= =?us-ascii?Q?gaIBlO58l3d590biIkG/HNo2auFeAKrYhmOvH94PKuMmR/FQtV40XAb8OnV4?= =?us-ascii?Q?txxtFTYfc3jzRQ8aL4BxsfU7wVSlBydNzzysRFU2ea5ofSDLmAIlXL8o1PYm?= =?us-ascii?Q?uoc5TTtutuOwsUxUldDc9rU5YUJw0X0ieyQIzwV2ov9GHQDeLXK/f5KkHdsz?= =?us-ascii?Q?nRjRYnhsF5e1Ln2n8Sv6BUr9UOJmy/z2xxZmEa7C2Fm1pUKZzKKHM/2mYPsZ?= =?us-ascii?Q?oqmx4jBdtlI1P3RAsWqd+FjqApFVLinZ85xpzoRKMZhUr+dU+6jxf68y7rvJ?= =?us-ascii?Q?M9K7xR/AWzszDw2+L7xlwTeMSUTgylvbGglWIu1J+fgQSA6N2qCaWu8trQQr?= =?us-ascii?Q?3oBsoR7a2MXbzJ/suQtvewgO/VBZwEjO0S4oiJaDfrYcZh0YvsYNsPibuXgc?= =?us-ascii?Q?9sAxGCxuxg7XwppRTP+2lrCmBRbP96yVVgFISOJOPYFxOx0VvY2g3GLVp2Bi?= =?us-ascii?Q?qdF9ga2PEDLk0BRTXVXETE4Hp1b+WkNn3icBOV/sFFHb3Bh4MDt2Rbr2rQPM?= =?us-ascii?Q?egc9wUysrieYP4ApM3lkJtbBCp2WIbHWcFtpww90Yp025JSnbSFMGh7hQNat?= =?us-ascii?Q?JkSsMMlbf6nd6o8KJT9iFDqEesg561BQca1mUbCOHVNjcvbW0cc2Lmbvkp8m?= =?us-ascii?Q?Ch+pn5G9cCr2v9hCaWIOa8+DInheAIII1slmENvd0dmk2aYjd9PIy5TEs8O7?= =?us-ascii?Q?dIyqtGfX+fLTWGiY8QPeRypzYvWM72xM4+tBq7oP7i80frLqskJOz0Y1hFWr?= =?us-ascii?Q?zm9AvXdiaCLLK7jVtJkPa3AkicN9lpUca6LvM9rrGhUDecvRBvkBb5dilyAW?= =?us-ascii?Q?5kWUkSKyULTjP1rtOuWHzx3bvfC5AGFFrchawQ0a2RkE+b2bTdXOaZCvSSJS?= =?us-ascii?Q?RIfutIv1xcWO2EaQ6s3qiLYQfF3nhq5K/Bi2m0mXQkcRh/Jj84hSQnuy0ih7?= =?us-ascii?Q?+SD2po/fwV/YxeXtltO4NDi+L3qkEsbvvfhlwI/s6h94ALpJPgC+GIlgUtAF?= =?us-ascii?Q?DKwpJY+wezjw05mvnMvJnb5EfDNJD2Sp4xPLl4ZloVZLbEVN5OB8FC35ITB3?= =?us-ascii?Q?HIcaC8XISyp77hA=3D?= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230040)(376014)(1800799024)(36860700013)(82310400026)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:39:30.1418 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f4db4106-c64d-485e-c2a1-08dd50194a01 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: MWH0EPF000989EC.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR12MB9433 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 23.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. 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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=c452aa7dc067ca90419d85ba633ca8dedbae312c Thanks. Xueming Li --- >From c452aa7dc067ca90419d85ba633ca8dedbae312c Mon Sep 17 00:00:00 2001 From: Kevin Traynor Date: Fri, 24 Jan 2025 14:14:07 +0000 Subject: [PATCH] vhost: add null callback checks Cc: Xueming Li [ upstream commit 66be1a05a480a0484b02c1a0194126763f4dbb99 ] rte_vhost_driver_callback_register() does not specify any mandatory callbacks in struct rte_vhost_device_ops. Add some missing NULL checks before calling rte_vhost_device_ops callbacks. Fixes: 4796ad63ba1f ("examples/vhost: import userspace vhost application") Signed-off-by: Kevin Traynor Reviewed-by: Maxime Coquelin --- lib/vhost/vduse.c | 3 ++- lib/vhost/vhost.c | 5 +++-- lib/vhost/vhost_user.c | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/vhost/vduse.c b/lib/vhost/vduse.c index b46f0e53c7..3b1a3b008e 100644 --- a/lib/vhost/vduse.c +++ b/lib/vhost/vduse.c @@ -317,7 +317,8 @@ vduse_device_start(struct virtio_net *dev) dev->flags |= VIRTIO_DEV_READY; - if (dev->notify_ops->new_device(dev->vid) == 0) + if (!dev->notify_ops->new_device || + dev->notify_ops->new_device(dev->vid) == 0) dev->flags |= VIRTIO_DEV_RUNNING; for (i = 0; i < dev->nr_vring; i++) { diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index 8a1f992d9d..276c5f12b7 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -750,10 +750,11 @@ vhost_destroy_device_notify(struct virtio_net *dev) if (dev->flags & VIRTIO_DEV_RUNNING) { vdpa_dev = dev->vdpa_dev; - if (vdpa_dev) + if (vdpa_dev && vdpa_dev->ops->dev_close) vdpa_dev->ops->dev_close(dev->vid); dev->flags &= ~VIRTIO_DEV_RUNNING; - dev->notify_ops->destroy_device(dev->vid); + if (dev->notify_ops->destroy_device) + dev->notify_ops->destroy_device(dev->vid); } } diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c index 14808bd5bc..e01675e478 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -3280,7 +3280,8 @@ unlock: */ if (!(dev->flags & VIRTIO_DEV_RUNNING)) { - if (dev->notify_ops->new_device(dev->vid) == 0) + if (!dev->notify_ops->new_device || + dev->notify_ops->new_device(dev->vid) == 0) dev->flags |= VIRTIO_DEV_RUNNING; } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:02.055757102 +0800 +++ 0037-vhost-add-null-callback-checks.patch 2025-02-18 19:39:00.548244061 +0800 @@ -1 +1 @@ -From 66be1a05a480a0484b02c1a0194126763f4dbb99 Mon Sep 17 00:00:00 2001 +From c452aa7dc067ca90419d85ba633ca8dedbae312c Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 66be1a05a480a0484b02c1a0194126763f4dbb99 ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org @@ -24 +26 @@ -index 8ba58555f9..be548f051e 100644 +index b46f0e53c7..3b1a3b008e 100644 @@ -27 +29 @@ -@@ -318,7 +318,8 @@ vduse_device_start(struct virtio_net *dev, bool reconnect) +@@ -317,7 +317,8 @@ vduse_device_start(struct virtio_net *dev) @@ -38 +40 @@ -index 2f34d3500e..f01ae6130e 100644 +index 8a1f992d9d..276c5f12b7 100644 @@ -41 +43 @@ -@@ -751,10 +751,11 @@ vhost_destroy_device_notify(struct virtio_net *dev) +@@ -750,10 +750,11 @@ vhost_destroy_device_notify(struct virtio_net *dev) @@ -56 +58 @@ -index 52d8078d7c..26dc0bde97 100644 +index 14808bd5bc..e01675e478 100644 @@ -59 +61 @@ -@@ -3301,7 +3301,8 @@ unlock: +@@ -3280,7 +3280,8 @@ unlock: