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 0904942D46 for ; Sun, 25 Jun 2023 08:43:25 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 054AC40ED8; Sun, 25 Jun 2023 08:43:25 +0200 (CEST) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2079.outbound.protection.outlook.com [40.107.93.79]) by mails.dpdk.org (Postfix) with ESMTP id 5A1EC40A7F for ; Sun, 25 Jun 2023 08:43:23 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Fu8ua4XqIyo/bQ9SC63kCxLvcyi2NCIBJcyjbrwP6bEiPrZwoNyEfSUU07jLSIjRcjFnaIWggzXv04t5fN8ngO1O3vhMaCUxBJ5G7qcybTSS/v1lxFm8xtPRiUVj2PWk6/savL1gcpX82jlGsIQCV7DfGdGe5FPf0HGHVe4vcBx9IWU7Rs05zL1ImyH1k6zocbSERwsaqXsY7iv5oUq/IlmfWmR4QDxaW4Foj3OebZtTVLDTpQMpLvq/NW/D+ZXTLsCaLUCChMy9Hg5Bvce7F+n22jVGZMyo1BRnWvD6EttVnJOej19PVHNWEs4VGEWcMgo0rwUW6/Z21GT/DpWFCQ== 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=zcASfGN240dyW29J2EuwcvrxgP/Jg+OHqyW2XxMtJx4=; b=Bm5f5NkDUXgB/f61o/3vN6I+zMWa0bD7Avcay6zdL6YD7kvYElOIDAqUuN+ny7W4fPI26TKoTyqeC+rhkyg45yP96M+zZa2n6UK0d+d+eTne0k2ZxwqW18ARut+7xo6ifGPLMvIQqN8N0njC52H6OK/mxG3jI0SQ8zbe/YV9zHU0WrHdBhy+H5pNZVyz/yxCzLBV4q6EHc7JEPqFek5JIl25BrEwOFOR/JVoloVKKPjspnU68pYweTIVKJb5rOVCkzNb06LUck+mD/mxLmYdPD+8INJSDZk5YI1T1KHgOpf8MGq59LSzshwqBIjDy+ELzHrIrStJwmicDiTraV9RtQ== 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 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=zcASfGN240dyW29J2EuwcvrxgP/Jg+OHqyW2XxMtJx4=; b=px3a637A5eCYdluH7PkHmHtx3y5Y/Vv3G9f3ZhW9O0GA54iwa2gE2pB8wvuL51TAqvuEJyz3TLNI8ZXmkypWq8EVMeh7+MstPijK7X5d7wwSkLbR4Tmg68XsMNa6NBp2BF6K7PH7JFT1CPnRmX/CExDQjak8X7BJf9yiSUNmRU3feWVunstGWs0CE10dhdrPxUdaq5EQ3WTnn+RYyCHdLz63hZLi1zd3glGLSo7nM5MQFkiuOTuvbygDVcKX2hnPkIyro7RGHjJCeAMOjrGzI5QApRqGJdpwF2hsPJMs3g9LbFyJ5KJz+3c0QW3CpZ7Go2CuiIiKd0Kj16DW8JWc0g== Received: from BN9PR03CA0306.namprd03.prod.outlook.com (2603:10b6:408:112::11) by PH7PR12MB8013.namprd12.prod.outlook.com (2603:10b6:510:27c::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.24; Sun, 25 Jun 2023 06:43:19 +0000 Received: from BN8NAM11FT046.eop-nam11.prod.protection.outlook.com (2603:10b6:408:112:cafe::a4) by BN9PR03CA0306.outlook.office365.com (2603:10b6:408:112::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6521.32 via Frontend Transport; Sun, 25 Jun 2023 06:43:19 +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 BN8NAM11FT046.mail.protection.outlook.com (10.13.177.127) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6500.47 via Frontend Transport; Sun, 25 Jun 2023 06:43:19 +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.986.5; Sat, 24 Jun 2023 23:43:02 -0700 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.986.37; Sat, 24 Jun 2023 23:43:00 -0700 From: Xueming Li To: Maxime Coquelin CC: Eelco Chaudron , Chenbo Xia , dpdk stable Subject: patch 'vhost: fix invalid call FD handling' has been queued to stable release 22.11.3 Date: Sun, 25 Jun 2023 14:35:01 +0800 Message-ID: <20230625063544.11183-84-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230625063544.11183-1-xuemingl@nvidia.com> References: <20230625063544.11183-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: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN8NAM11FT046:EE_|PH7PR12MB8013:EE_ X-MS-Office365-Filtering-Correlation-Id: 19f2c9b6-fc37-4ab7-e530-08db7547766c X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6sTOBNCaSltROoUXTMEotz//JYN+9qQF2FBwKMdZM4nmA8e662xypBiAX+2LaGK6l19nJ+oDyOgH7l6d3TCIzJYcRdMS8ZXrXqWe+LABHPc1TEzpdlxRMkCCjVXTY7uaogWQ3r3+u2EeX7AcmqQcbc5MgtxHxqbkJViO1zOHf7ovlXe1z2gRbzop7ZUxT7nbsDDs7WtYhrvF/C9YoiAT4c7zVJq85fNF4sxB1GD8Qi2ebfp+SK1Y2ESUY0N/iPBsfVD3Hl2uO78SZFDJXkU+G4kiLHkjOI38awXsfhpOKP7K1zJxFeFYaoC4plJs23/0S1QdO2EECxC+d38iJ3kD2uIQQM0hXlyQQaIHpL0hlJK6CrDBQKRwPGtxvL1bNMsjMVn0XrROBWKA3E72afqvfpxKpfOMdCbzdJ/YA9S4wbKCSKqu2sJCqrfYMly8wpiweKShLTyN617icHyk80ObovfKBVjfrn/Mghqr+W51HAkXHh0l/2XAGO+2Rqt5sGiQ8DWgIeha6XnjWMghSsIhrUpq/C0bY5XqbKzN10wf6hMbT2696tmSoOWdvVn7+oNowse/NrrgXSfO7+5pHZnf1vLME6wUmwSq3/FocLnlJJXsjkz8a3FSy3K5TKJbxrY9AtRvkfrU8N8ar6viX7+xWdEmq9dCkPogQWYwtoRj7kA0ycwj5rI3Duxdq7UUF3qwbV3H0aE5lOKmbT/6Dh6yhzraI23dPHYioTMmo5SPDsraHqwOUcGf1b7peR9WQnRBtvbbyaFqC7Lf3yjNKdVLvg== 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:(13230028)(4636009)(346002)(376002)(39860400002)(396003)(136003)(451199021)(46966006)(40470700004)(36840700001)(36860700001)(82310400005)(47076005)(966005)(478600001)(7696005)(2616005)(54906003)(83380400001)(336012)(426003)(26005)(53546011)(1076003)(6286002)(186003)(16526019)(2906002)(5660300002)(40460700003)(36756003)(70206006)(356005)(4326008)(70586007)(82740400003)(7636003)(40480700001)(316002)(55016003)(8936002)(8676002)(41300700001)(86362001)(6916009); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jun 2023 06:43:19.1158 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 19f2c9b6-fc37-4ab7-e530-08db7547766c 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: BN8NAM11FT046.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR12MB8013 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 22.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/27/23. 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://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=94bed3c2fa9924a92f34ae65f7ca323cd4128105 Thanks. Xueming Li --- >From 94bed3c2fa9924a92f34ae65f7ca323cd4128105 Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Thu, 1 Jun 2023 09:40:08 +0200 Subject: [PATCH] vhost: fix invalid call FD handling Cc: Xueming Li [ upstream commit 0445f81883a3aa727ac7f8531beee2c225d3001a ] This patch fixes cases where IRQ injection is tried while the call FD is not valid, which should not happen. Fixes: b1cce26af1dc ("vhost: add notification for packed ring") Fixes: e37ff954405a ("vhost: support virtqueue interrupt/notification suppression") Signed-off-by: Maxime Coquelin Signed-off-by: Eelco Chaudron Reviewed-by: Chenbo Xia --- lib/vhost/vhost.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h index e125c3d615..63e2f3f577 100644 --- a/lib/vhost/vhost.h +++ b/lib/vhost/vhost.h @@ -881,9 +881,9 @@ vhost_vring_call_split(struct virtio_net *dev, struct vhost_virtqueue *vq) "%s: used_event_idx=%d, old=%d, new=%d\n", __func__, vhost_used_event(vq), old, new); - if ((vhost_need_event(vhost_used_event(vq), new, old) && - (vq->callfd >= 0)) || - unlikely(!signalled_used_valid)) { + if ((vhost_need_event(vhost_used_event(vq), new, old) || + unlikely(!signalled_used_valid)) && + vq->callfd >= 0) { eventfd_write(vq->callfd, (eventfd_t) 1); if (dev->flags & VIRTIO_DEV_STATS_ENABLED) vq->stats.guest_notifications++; @@ -950,7 +950,7 @@ vhost_vring_call_packed(struct virtio_net *dev, struct vhost_virtqueue *vq) if (vhost_need_event(off, new, old)) kick = true; kick: - if (kick) { + if (kick && vq->callfd >= 0) { eventfd_write(vq->callfd, (eventfd_t)1); if (dev->flags & VIRTIO_DEV_STATS_ENABLED) vq->stats.guest_notifications++; -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-06-25 14:32:00.720958100 +0800 +++ 0083-vhost-fix-invalid-call-FD-handling.patch 2023-06-25 14:31:58.455773900 +0800 @@ -1 +1 @@ -From 0445f81883a3aa727ac7f8531beee2c225d3001a Mon Sep 17 00:00:00 2001 +From 94bed3c2fa9924a92f34ae65f7ca323cd4128105 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 0445f81883a3aa727ac7f8531beee2c225d3001a ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 8554ab4002..40863f7bfd 100644 +index e125c3d615..63e2f3f577 100644 @@ -24 +26 @@ -@@ -902,9 +902,9 @@ vhost_vring_call_split(struct virtio_net *dev, struct vhost_virtqueue *vq) +@@ -881,9 +881,9 @@ vhost_vring_call_split(struct virtio_net *dev, struct vhost_virtqueue *vq) @@ -37 +39 @@ -@@ -971,7 +971,7 @@ vhost_vring_call_packed(struct virtio_net *dev, struct vhost_virtqueue *vq) +@@ -950,7 +950,7 @@ vhost_vring_call_packed(struct virtio_net *dev, struct vhost_virtqueue *vq)