From nobody Wed May 22 00:00:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nvidia.com); dmarc=pass(p=quarantine dis=none) header.from=nvidia.com ARC-Seal: i=2; a=rsa-sha256; t=1634625921; cv=pass; d=zohomail.com; s=zohoarc; b=ZNF6cxUcKAO6itSasre0b2pRmY0zVkU51Cv2O7IZ8+cNx14JE0P49HKvyPverMG7x01pwCRJ/9c6ZKK0z34rObB4U1tD4BMqxPGh+f2bGxoOFsORMQEiLXarQyrwvfaAW4+ZjuIsIvJfNxhCF/9WQxaDQKFz3bxBbcnhL7Tg8gQ= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634625921; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=4FRKhPA2wpK2GSJPSTxPMZhalrnGz0nVLgQyK9uP2bk=; b=S6FeoRidLhkEmHyPe1D4i8S4+b4ktteyH7wvdSttB6DhQE5OFhJ/IYmYzDOMPn6RjMNhzBepnqCkeUD9Ukkvc8xNaF8OpkZ5RVNb4EkP2EWChc38dP2v/QkufAunGEKjVZ7FrQtnG+ediKvv+GCcHO18Mu1qC3gq8jggFh/tvEo= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nvidia.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 16346259216435.318357887210254; Mon, 18 Oct 2021 23:45:21 -0700 (PDT) Received: from localhost ([::1]:33834 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mcisC-0002If-EA for importer@patchew.org; Tue, 19 Oct 2021 02:45:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcilX-0002EI-MU; Tue, 19 Oct 2021 02:38:27 -0400 Received: from mail-co1nam11on2071.outbound.protection.outlook.com ([40.107.220.71]:18144 helo=NAM11-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcilT-0003nD-Iu; Tue, 19 Oct 2021 02:38:27 -0400 Received: from MWHPR03CA0021.namprd03.prod.outlook.com (2603:10b6:300:117::31) by BYAPR12MB3511.namprd12.prod.outlook.com (2603:10b6:a03:132::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.17; Tue, 19 Oct 2021 06:38:18 +0000 Received: from CO1NAM11FT031.eop-nam11.prod.protection.outlook.com (2603:10b6:300:117:cafe::39) by MWHPR03CA0021.outlook.office365.com (2603:10b6:300:117::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16 via Frontend Transport; Tue, 19 Oct 2021 06:38:18 +0000 Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT031.mail.protection.outlook.com (10.13.174.118) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4608.15 via Frontend Transport; Tue, 19 Oct 2021 06:38:17 +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; Tue, 19 Oct 2021 06:38:08 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L90p7Vcc18KeHPw3v2Hmp1t+Q8ctVXhs3KsdVJ9GT8Lr3qadcoI6pgEDtaqWXkhRVBs149MzT+41XPFHidcUlg8qzUJzcAwU4+A4siGAOL+2cU5Trvn0zN+xxlR/2JBBq7oV2xkMQGBrQ7Qc3/Gerbr+lrAMqYMTswFso0f8w2/I0U8hcYSaG6yZPQntbDWGdB+rLk8ttj1AO1XRqN4pIpqO/YOMWJbQUyKsE9XTzd/JFuUWVd/bJ3WbKdpA8ibD53eO/lHEw5M56WNWSJaWLkgekLMV7PA6GTVyUORNiyftjg0X1NnIXNZlBPKUJP8cQr9pNxSPlNlzSQfravxmFw== 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=4FRKhPA2wpK2GSJPSTxPMZhalrnGz0nVLgQyK9uP2bk=; b=GYH7kcLehYqXmEWxCw9plf0KtyCdfHGzoSxhvMjLRVKAjFONWj+tW61Tt+MuUO0GKkjSFQ02SV/9qHqrkGCD9GQrDCZXh4LY34CUdpHf0aguo4zh59oSVIQWRlwI2V0SOW8CUGO29AGjFdC4JQdYdmWLIjXjUVe8XpKt0Pf2PT2UQC08aIMwtc5vBI4aW/zvxJ+Xa8jpbvNkH966NsmHt7mx/qdsUI/yHjanfQt44ZivCHvrbDfGuE1pu2+yiTF1ko2p/hwEFnEXpdFbKKrpjOCb+H2vKrceduMrH2wRfvijAarl8+zrL/0lqBA5uI9674uCQ7zx1ga76e6P6irllw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=bytedance.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=4FRKhPA2wpK2GSJPSTxPMZhalrnGz0nVLgQyK9uP2bk=; b=h6SK3uTs7RM5C5J4xPJMZLs5S1114yjf/wm4zAhxQ5rsskPEO/0o9wGq1rRTadWG6OppEEgJ97kwtP/Qkq4Jg9P+BkMNG+OEJdXVQ9aAemrv6cYnm5jUABCABitmJ4+knZSdkXMqpb9lbmjlADwICy2dZA+FcRFzr8cd3rYXDjM1xmpbVUtv5aAt/qfvC0kEphkKIJoHXwXtc3d3Fg9+VmHa/VPPitOl/mu/DqUxriKcW+UP6Rjt8SxsUDehYvnxupgPwlFJBSfyzrCwo4Ylh6C4gWAvT73ydAMyWcMA8vrtWaQvQe2t/YPeGSuqFbyKBjzATGUqcYZyuPbQtODazA== X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; bytedance.com; dkim=none (message not signed) header.d=none;bytedance.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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; From: Xueming Li To: CC: , , , Yuwei Zhang , "Michael S. Tsirkin" Subject: [PATCH v4 1/2] vhost-user: fix VirtQ notifier cleanup Date: Tue, 19 Oct 2021 14:37:54 +0800 Message-ID: <20211019063755.2150452-2-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211019063755.2150452-1-xuemingl@nvidia.com> References: <20211019063755.2150452-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 85af902d-bf04-4ca1-e3d3-08d992cb0920 X-MS-TrafficTypeDiagnostic: BYAPR12MB3511: X-Microsoft-Antispam-PRVS: X-MS-Exchange-Transport-Forked: True X-MS-Oob-TLC-OOBClassifiers: OLM:187; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: epF+vkl3OguSSR3wD9nP3bnaHEKnNARoZhGR3JQ837VxHwQZiRLB2yLKfO7X54JWyOorRTeo+hzghfBoCFQcw1CNAGxonaDn1EOHR8eXEOCyKP5eMJm6rYQtki/Jsyd+skmGb/UAKvADC85lhTt7nSY+I6RevUlVFvdJJyRrNLLeD3KnjtKzpp0J/Mbtsnr6MsZLrl0EsmxA3wwGruKfp8FtSpxmEMKAZDAyR+nQ4sGbJuxIToIBXf6eJWgS3YfZ+hKxEPlj5+V1LJNMYbwd3F/w5LO3z07hv+YAPnWmFwsDJVnf/VPLohgMEYZDBgjWdsH5dsmMqMbiCh0o77BE/oQnz/CV3S2r/1vEF2TBXPpmHuDaid7Sa/OFYSmjIh1Ri3RuN/9739c2BCXjae+QweKLh5zAKOEqbVEAeIV19tTNvBOKmfgiNTQdjIgz+bgdHUNXf0XdlU/K9RimJTm5UBy1zFIZu6uwvnA2HdkeSsKoCpGzffMsoQvk/9p2YwGY89BsCiQAuYfTJQxWA1I/xY5ersetcm7fA4I5rhQFCOvSfbpn/Y6KdJ8TU12xL6jemow3XwX6AVlDBPCPUuAgh2fcMf/rVkaftVZPctDZR5xWroj7FGchRO95ze/OzQfThEXT04QgqJBfPLOJl09PTRbDLogG8oH6NpA6si46CggmYisJeTtZLO1IL88a1ylOwMh/3H0e/Dsr55BvsjfHHQ== 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)(356005)(426003)(8936002)(70206006)(86362001)(1076003)(2616005)(8676002)(36756003)(47076005)(26005)(7696005)(336012)(70586007)(55016002)(5660300002)(82310400003)(6286002)(6666004)(2906002)(83380400001)(6916009)(316002)(7636003)(36860700001)(54906003)(186003)(16526019)(508600001)(4326008); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2021 06:38:17.3432 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 85af902d-bf04-4ca1-e3d3-08d992cb0920 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: CO1NAM11FT031.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR12MB3511 Received-SPF: softfail client-ip=40.107.220.71; envelope-from=xuemingl@nvidia.com; helo=NAM11-CO1-obe.outbound.protection.outlook.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.049, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @Nvidia.com) X-ZM-MESSAGEID: 1634625923489100001 Content-Type: text/plain; charset="utf-8" When vhost-user device cleanup and unmmap notifier address, VM cpu thread that writing the notifier failed with accessing invalid address. To avoid this concurrent issue, wait memory flatview update by draining rcu callbacks, then unmap notifiers. Fixes: 44866521bd6e ("vhost-user: support registering external host notifie= rs") Cc: tiwei.bie@intel.com Cc: qemu-stable@nongnu.org Cc: Yuwei Zhang Signed-off-by: Xueming Li --- hw/virtio/vhost-user.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index bf6e50223c..cfca1b9adc 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -18,6 +18,7 @@ #include "chardev/char-fe.h" #include "io/channel-socket.h" #include "sysemu/kvm.h" +#include "sysemu/cpus.h" #include "qemu/error-report.h" #include "qemu/main-loop.h" #include "qemu/sockets.h" @@ -1165,6 +1166,12 @@ static void vhost_user_host_notifier_remove(struct v= host_dev *dev, =20 if (n->addr && n->set) { virtio_queue_set_host_notifier_mr(vdev, queue_idx, &n->mr, false); + if (!qemu_in_vcpu_thread()) { /* Avoid vCPU dead lock. */ + /* Wait for VM threads accessing old flatview which contains n= otifier. */ + drain_call_rcu(); + } + munmap(n->addr, qemu_real_host_page_size); + n->addr =3D NULL; n->set =3D false; } } @@ -1502,12 +1509,7 @@ static int vhost_user_slave_handle_vring_host_notifi= er(struct vhost_dev *dev, =20 n =3D &user->notifier[queue_idx]; =20 - if (n->addr) { - virtio_queue_set_host_notifier_mr(vdev, queue_idx, &n->mr, false); - object_unparent(OBJECT(&n->mr)); - munmap(n->addr, page_size); - n->addr =3D NULL; - } + vhost_user_host_notifier_remove(dev, queue_idx); =20 if (area->u64 & VHOST_USER_VRING_NOFD_MASK) { return 0; @@ -2485,11 +2487,17 @@ void vhost_user_cleanup(VhostUserState *user) for (i =3D 0; i < VIRTIO_QUEUE_MAX; i++) { if (user->notifier[i].addr) { object_unparent(OBJECT(&user->notifier[i].mr)); + } + } + memory_region_transaction_commit(); + /* Wait for VM threads accessing old flatview which contains notifier.= */ + drain_call_rcu(); + for (i =3D 0; i < VIRTIO_QUEUE_MAX; i++) { + if (user->notifier[i].addr) { munmap(user->notifier[i].addr, qemu_real_host_page_size); user->notifier[i].addr =3D NULL; } } - memory_region_transaction_commit(); user->chr =3D NULL; } =20 --=20 2.33.0 From nobody Wed May 22 00:00:31 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nvidia.com); dmarc=pass(p=quarantine dis=none) header.from=nvidia.com ARC-Seal: i=2; a=rsa-sha256; t=1634626188; cv=pass; d=zohomail.com; s=zohoarc; b=kSDXZl4sKKfizz/J66KzqruYYrsZbpW553tFdocjkZ5exuYtZGu3Ss1e+ObSUiHiAX9aHUwQhjcBX0QFSOgaLArD7iUoqmFLbFgIokcxe9hJVUA8HGdZ7LsPNdapG6GdWSb3TVNmy5pRL7K9h8xUIwOKnH74zxQ8zmlEi9PLs/Y= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1634626188; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=mDVoIDUEMDly/sZD06A5qPUIkKgJDYq68yzNn/igx+o=; b=Wj+1PPQ8pe5g0uvxn+Xkj+ne2XzVOlNnxuyD64eozn8wegvzya5qqb8eJPU/0LfrYhEw7xJQRWgdF5DjqEUqgABs4woxxiAqeWSylx+eSy+fSS1OLp2U3zuskt0bE/slV3/0vkg3/jEWsU7PSiXQr16FYnzrratyNC5IUqJDHeU= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1 dmarc=pass fromdomain=nvidia.com); dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1634626188083499.5743822688181; Mon, 18 Oct 2021 23:49:48 -0700 (PDT) Received: from localhost ([::1]:41022 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mciwU-0007KO-Qo for importer@patchew.org; Tue, 19 Oct 2021 02:49:46 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:45338) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcila-0002Ho-9b; Tue, 19 Oct 2021 02:38:31 -0400 Received: from mail-co1nam11on2052.outbound.protection.outlook.com ([40.107.220.52]:23040 helo=NAM11-CO1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mcilX-0003qP-Ro; Tue, 19 Oct 2021 02:38:30 -0400 Received: from MWHPR03CA0012.namprd03.prod.outlook.com (2603:10b6:300:117::22) by MN2PR12MB3454.namprd12.prod.outlook.com (2603:10b6:208:c8::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.16; Tue, 19 Oct 2021 06:38:21 +0000 Received: from CO1NAM11FT031.eop-nam11.prod.protection.outlook.com (2603:10b6:300:117:cafe::aa) by MWHPR03CA0012.outlook.office365.com (2603:10b6:300:117::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4608.15 via Frontend Transport; Tue, 19 Oct 2021 06:38:21 +0000 Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT031.mail.protection.outlook.com (10.13.174.118) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4608.15 via Frontend Transport; Tue, 19 Oct 2021 06:38:20 +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; Tue, 19 Oct 2021 06:38:10 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=N6htOHNImsXyvCbvDl+m4eWTm83o535TDhyuQR+wswyut4SZHBvvDaTW9FVh5IizkCs9x9hjwFzz3q0ne5VHR+1K/3UP9CalGB1hUkgJ+WnMipb+dkrKsB6OWLVjnX9pWeZhPERkrdq9nuqL4dH3QD/P5/Pz3kto86tC6V7xEKqHHQhV8/GZGkshKwC+TW0p0/H4RIKiPOTPk9xk0rUzBUEkW/AiVgHbEnR14gliioTG/p2zwdHGaAz5A8nyg0wYh8H/Y/YggOt5juL38UAjzNdyo0vPG3freeOTNKccXNLFSafjQMcb4qrdbnNlTHgQHtIwBX01qRCnAh6kcgRk2w== 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=mDVoIDUEMDly/sZD06A5qPUIkKgJDYq68yzNn/igx+o=; b=IwsOiHXiQaEkW6+yKOj7w6Zbtq4ux4bEWzmij+89aPO77b2w7AKAgPBC5BOJpZ6R6X2Z9hl4mpbGuOzQzC2clsv6ogYJ+0T108IFmTGDZNnJjuCJWmMPPaI3X6XR+XP6fJEHl1GQk0vTWm8rYBiILrT999dIawhtz3oQeMiFLBXzTykbZmSgZS72FmDx0o4xnj2yPjxbXp0mAcFHsyvzumn4DOcU9k/ul3jnry25+eMCWlowudiww+sfmmD0JgSy9C4Pw69BEaY0ewkhLxD9oj6kUHiMJZyywCq9V9/ltp23L86E0bH0z7HMYuEakrgsFqOdrrLJja3iUZEVedEadw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=bytedance.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=mDVoIDUEMDly/sZD06A5qPUIkKgJDYq68yzNn/igx+o=; b=lwzU5kE7x7qH4RPG3kJuMipcUB2Feq3Fd+aTsVo4Bl6GgySfxhvQ+S6Ou+bk8rskKv9G05QhpIw1qBL8k3oFOtMqZyfsVxh4sQW/07AtBxZNM9Xjf2CQeOTaIkZIyn7bOHEJvfUohTWEd/c4jSJn65BCgwMrzAbuFGfNBEHehU92rXSYeWqbUAEDtH4qGFHWQLitmCkEdOjp8h81D/WGWqVhFBdT3OHVDwX3NZ63SKzARVJdDuSHD2R/NfCtpzZyXM3rEqHai30ufOyPKP+eoath5bABJPuZlNZseuANMVXNGcdOMp1VUXnbzxTvzXRr9oVGixfsbr6E5yygNqv6tA== X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; bytedance.com; dkim=none (message not signed) header.d=none;bytedance.com; dmarc=pass action=none header.from=nvidia.com; Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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; From: Xueming Li To: CC: , , , Yuwei Zhang , "Michael S. Tsirkin" Subject: [PATCH v4 2/2] vhost-user: remove VirtQ notifier restore Date: Tue, 19 Oct 2021 14:37:55 +0800 Message-ID: <20211019063755.2150452-3-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211019063755.2150452-1-xuemingl@nvidia.com> References: <20211019063755.2150452-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: bb078104-c1dd-488f-911b-08d992cb0ad4 X-MS-TrafficTypeDiagnostic: MN2PR12MB3454: X-Microsoft-Antispam-PRVS: X-MS-Exchange-Transport-Forked: True X-MS-Oob-TLC-OOBClassifiers: OLM:288; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: m5Ur7ohsopAhcGV/ZxkOq7AS370An1slBbS8gNUFro7q0ookgldoyQZY05pu4QpqyylX41zL3TnnXX+c0M7LiBARoVKgljpR4vg9NTqrFT3j3ax4NBlTdJvS3AVgNHaNT++TYtVkfr+mKX7pjoPzHJmHzPz1xXTWZtq8jKml5BAUkYBxoMtaUNO2x9RjGNFnztPiIsud9aaG07U6RODOiysb+chBTRfYXesBm0WmvcUUk0gqu25SnVaUMomtJ27lDP/DNlMoEoIczqjpiSBHqsiOhYhEFFxzZKwkYYW3YuYl48EidfjAVu8C3YfVadroWxGd8HYkj6oCWJM64NeIykSht3NGUhrZTOso/AKmAWhrxth56F5luq1VbC0v4LJ8vEYWrAtfeIBTJwmq2apJVZzkmqoToYQNIX1K7bo2f5sxGy0VQI0G9hKX5o9RiAKI+VzPdBsEqssy1/rKk3c1e/Uv9dnWVkd7ZRigv8/uZuNHPLeAEY/DNDMq7TFbqCmvMTDDpPgy+uupw65xPIUGrceNPn67y9gybYg4DYNRe7qTmrSP7/2pqNpCosSJRHnxdDKxGT98AowH7YbTXGfSSyqSswbS2BW/i/XSlPoRmcRY7gxzRXgJurLPGpVsoABVd6Ds9D8+4QFvza4suHF6eLQk2hfAwLndbdGYSlLof8ryL1uLpfxV88aueCo4aJ0jdUOr33zD5SviklT2SiU6HA== 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)(5660300002)(70586007)(70206006)(6666004)(8676002)(47076005)(508600001)(16526019)(7696005)(6286002)(4326008)(8936002)(36756003)(426003)(2906002)(316002)(7636003)(83380400001)(54906003)(6916009)(55016002)(1076003)(82310400003)(336012)(356005)(36860700001)(26005)(186003)(86362001)(2616005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Oct 2021 06:38:20.1785 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: bb078104-c1dd-488f-911b-08d992cb0ad4 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: CO1NAM11FT031.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR12MB3454 Received-SPF: softfail client-ip=40.107.220.52; envelope-from=xuemingl@nvidia.com; helo=NAM11-CO1-obe.outbound.protection.outlook.com X-Spam_score_int: -21 X-Spam_score: -2.2 X-Spam_bar: -- X-Spam_report: (-2.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.049, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @Nvidia.com) X-ZM-MESSAGEID: 1634626190423100001 Content-Type: text/plain; charset="utf-8" When vhost-user vdpa client restart, VQ notifier resources become invalid, no need to keep mmap, vdpa client will set VQ notifier after reconnect. Removes VQ notifier restore and related flags. Fixes: 44866521bd6e ("vhost-user: support registering external host notifie= rs") Cc: tiwei.bie@intel.com Cc: qemu-stable@nongnu.org Cc: Yuwei Zhang Signed-off-by: Xueming Li --- hw/virtio/vhost-user.c | 19 +------------------ include/hw/virtio/vhost-user.h | 1 - 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index cfca1b9adc..cc33f4b042 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -1144,19 +1144,6 @@ static int vhost_user_set_vring_num(struct vhost_dev= *dev, return vhost_set_vring(dev, VHOST_USER_SET_VRING_NUM, ring); } =20 -static void vhost_user_host_notifier_restore(struct vhost_dev *dev, - int queue_idx) -{ - struct vhost_user *u =3D dev->opaque; - VhostUserHostNotifier *n =3D &u->user->notifier[queue_idx]; - VirtIODevice *vdev =3D dev->vdev; - - if (n->addr && !n->set) { - virtio_queue_set_host_notifier_mr(vdev, queue_idx, &n->mr, true); - n->set =3D true; - } -} - static void vhost_user_host_notifier_remove(struct vhost_dev *dev, int queue_idx) { @@ -1164,7 +1151,7 @@ static void vhost_user_host_notifier_remove(struct vh= ost_dev *dev, VhostUserHostNotifier *n =3D &u->user->notifier[queue_idx]; VirtIODevice *vdev =3D dev->vdev; =20 - if (n->addr && n->set) { + if (n->addr) { virtio_queue_set_host_notifier_mr(vdev, queue_idx, &n->mr, false); if (!qemu_in_vcpu_thread()) { /* Avoid vCPU dead lock. */ /* Wait for VM threads accessing old flatview which contains n= otifier. */ @@ -1172,15 +1159,12 @@ static void vhost_user_host_notifier_remove(struct = vhost_dev *dev, } munmap(n->addr, qemu_real_host_page_size); n->addr =3D NULL; - n->set =3D false; } } =20 static int vhost_user_set_vring_base(struct vhost_dev *dev, struct vhost_vring_state *ring) { - vhost_user_host_notifier_restore(dev, ring->index); - return vhost_set_vring(dev, VHOST_USER_SET_VRING_BASE, ring); } =20 @@ -1540,7 +1524,6 @@ static int vhost_user_slave_handle_vring_host_notifie= r(struct vhost_dev *dev, } =20 n->addr =3D addr; - n->set =3D true; =20 return 0; } diff --git a/include/hw/virtio/vhost-user.h b/include/hw/virtio/vhost-user.h index a9abca3288..f6012b2078 100644 --- a/include/hw/virtio/vhost-user.h +++ b/include/hw/virtio/vhost-user.h @@ -14,7 +14,6 @@ typedef struct VhostUserHostNotifier { MemoryRegion mr; void *addr; - bool set; } VhostUserHostNotifier; =20 typedef struct VhostUserState { --=20 2.33.0