From nobody Sat May 4 02:33:52 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=1631463784; cv=pass; d=zohomail.com; s=zohoarc; b=ctq2a7XCHcXyn8L+UboMma8ff+ybIiEPYqQTA6Zzd/eQZ0xkqudaQGgBdSBIBOdp25L/loVP5lU8T9elGs9z3N92ioLD0CUayMOKXfwCAtDNCo766Uon3pzVNZuJcEsUcq0+wEVzPVqbHfSbl2Elqsu7HSsFMavZHpi0hkvhb50= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631463784; 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=0/zXjAw8Ik2iPySqFG7FI/a4jDrjRwm026xP0dbEDz4=; b=oLo3n0tkZQegKp1rH6arYeagZ05V9gA9ysUo0oKu8iH0+fQfp/WolVqTuInAO9WVBlrkSGR5RGqa2dIZZv2Wx3ftWCrNjp2/28aw9H0uwv/EN1F32F5ruQzexRbnuvrrzYrynFjsHBDRItWZNqYyJCmFl7K0Gb+oFF+uA0XV+Z4= 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 1631463784580356.50377410638123; Sun, 12 Sep 2021 09:23:04 -0700 (PDT) Received: from localhost ([::1]:37998 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPSFz-0005r2-FP for importer@patchew.org; Sun, 12 Sep 2021 12:23:03 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPSDz-0003xs-9U; Sun, 12 Sep 2021 12:21:01 -0400 Received: from mail-dm6nam08on2077.outbound.protection.outlook.com ([40.107.102.77]:44641 helo=NAM04-DM6-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 1mPSDm-0001vW-7A; Sun, 12 Sep 2021 12:20:57 -0400 Received: from MW3PR06CA0016.namprd06.prod.outlook.com (2603:10b6:303:2a::21) by BN9PR12MB5068.namprd12.prod.outlook.com (2603:10b6:408:135::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.17; Sun, 12 Sep 2021 16:20:42 +0000 Received: from CO1NAM11FT020.eop-nam11.prod.protection.outlook.com (2603:10b6:303:2a:cafe::c3) by MW3PR06CA0016.outlook.office365.com (2603:10b6:303:2a::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Sun, 12 Sep 2021 16:20:42 +0000 Received: from mail.nvidia.com (216.228.112.36) by CO1NAM11FT020.mail.protection.outlook.com (10.13.174.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4500.14 via Frontend Transport; Sun, 12 Sep 2021 16:20:42 +0000 Received: from DRHQMAIL107.nvidia.com (10.27.9.16) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 12 Sep 2021 16:20:42 +0000 Received: from nvidia.com (172.20.187.5) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 12 Sep 2021 16:20:39 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=apKC1kfRGB+sR6O3/dzXwe++gW0aVFKYBtdjngC0AJV1NM/DsLXiFmf5gBnhnZeDB73pQXJDxtCXkcHdyP84VzTU4L8Gvcc8SI5ZZFVAgKig9GIIp6hYTpRyOpEuTpshmROl+BeuFl1zxf9rntQ6YAEgYlXOPwuSPcQnJH9E1IovkvkvtVB9jJLyODIfRnlNN1oRDL0Gid5Qm/W4lJdHnySyZJTeZwEltP3dsYxcWmrjmRDDkzAJWQaeEOj5PW7v9vKXaTVtnHgztDIuxafzcGHNG/wcZUbRTtyf/NyVOJFAutISTMnOle7NdBr8LpHG/wRHcA7wQwLheNCq1zW9+w== 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; bh=0/zXjAw8Ik2iPySqFG7FI/a4jDrjRwm026xP0dbEDz4=; b=FNbyZR4adMg7nCoKw2gl/6c18d/sjo1/3sFi1KQSbkNw+Saiqo4mJ/Nq1qx59GhwhPUG+106ejtXwf5wzHECmrzx+Bf5wQIvy85oGyqoMay/9VR3jGwDXQ9NbRs6B21dmKuRakbusXMZZGP+xJA1tSSmUXFOLmYIXXfzzvpbX1l26xmpcn6ScjGkIF9RLSTj27D/0PzKd+pZDemekJweqASjR8R8rmOfc0GrNt9fWLNXOZsKgLsxkxzOGx4etP5Ap5I7J1I5bSmT/kxlVIRiL9LksOleJqZmeLMYdpvt5baY8L99/AlpB04/QSNQ90I+Q/OxuHyYaRJPbbCzzQeVHQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.36) smtp.rcpttodomain=nongnu.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine 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=0/zXjAw8Ik2iPySqFG7FI/a4jDrjRwm026xP0dbEDz4=; b=sUxY3t//y2R2t5EMzDj3iSbbOLYOKg/cC3vOp2H6Qatysyh32auKXoikrbLB6z14JowVM6FDVhl8E7Dg22LRfj/eXInhup6byKhNvN5fM9FmMEbWHIccSZsU/6sPdew1xcNuOsTa4U/MDUu7P19xyqga0TWak9qL0xbaGaJMsuNzGP3S5CN4KYZNW+DBMaQml4HjgaBWj9xGSCweZVdA8A4GPv9eqBBM6BOeWF5y2ywz0Y1DuKxM2o4bsV9VqIQQHWHCJxOKaSif8rmDQEK5sg1YyurTrfdGoJX95Xy9jbZDjSq+hDFcgyfaBXgCqIKU9iB21wA933zNYueJ3TGwtQ== X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.36) smtp.mailfrom=nvidia.com; nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; 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.36 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.36; helo=mail.nvidia.com; From: Xueming Li To: CC: "Michael S . Tsirkin" , , , , Yuwei Zhang Subject: [PATCH 1/2] vhost-user: fix VirtQ notifier cleanup Date: Mon, 13 Sep 2021 00:20:13 +0800 Message-ID: <20210912162014.106704-2-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210912162014.106704-1-xuemingl@nvidia.com> References: <20210912162014.106704-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To DRHQMAIL107.nvidia.com (10.27.9.16) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: c9425358-1c4b-489c-f315-08d976094467 X-MS-TrafficTypeDiagnostic: BN9PR12MB5068: 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: PVEUNSYb4w+Yusgppv3H1HZjn4DmtyUoPHfk4RcprAGBjdjxEFq5dqWDf5vIn2dj0GXJqo+5P6El+usHGtMhiyDHdAZl9wwHU/ArV0+FNDqGcDMfAavX/yuTOwlLfGh/WvbA6nR4wRRR4mZnZ5Z2KCsaGPWg6JmWy/g0DoZVUCMhIFqMv0plOurmVp6QI1DEepKJSjR6kkV5T1VjSOCtlqu6mEEmaYyGu6r4ZnCYzlXH1kbD9eFl4NMmTkIQXUrYeovalI+Kum/e16qKsaXT9itWCD7l39H2jGCYm+GizY/iiOhK9zhvPYPqAIg8SwEVd4j4FlKMidwa52J54j1FTF9FVnUIWqbGj2Qca6pP2tr9UwCfBzQ5QHi71FpxDQ0TrSTPTItJuzNrRqqlqFU7nGPaIBn5grLVyxFMeJ3pwZFGU4ABUDz2qbrHgFcz0ZHyi0Ej37qVNZXVg6GjLlxluAXEGCp1lwULXs+f9P+cWlSQep383xMTPKbwykQqV+n+xlin3NwCdzqbwsDPMPSQT9IOh0qq2xyq7Nf0x0miN5RP1BiO7XJt/CVoWpIGfAIGjDb3UoO9gorkcdI9tGQaYIO9hI4O8YC2NnokQ/TCBHaJ6/3wdF+tPRCSvC4pHYu+Z07XQGXJCvrrnjcvZT1d4IelbTnSbTQHNtoHiZ3qahlz7vry80jJEYNgsUJ9MoKWTR0TcdtQA9XPqCjA4qGaCA== X-Forefront-Antispam-Report: CIP:216.228.112.36; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid05.nvidia.com; CAT:NONE; SFS:(4636009)(136003)(396003)(376002)(346002)(39860400002)(36840700001)(46966006)(7636003)(336012)(26005)(36860700001)(5660300002)(83380400001)(54906003)(7696005)(82740400003)(82310400003)(86362001)(70206006)(47076005)(70586007)(316002)(2616005)(8676002)(6916009)(4326008)(16526019)(36756003)(186003)(478600001)(426003)(356005)(6286002)(1076003)(2906002)(8936002)(6666004)(36906005)(55016002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2021 16:20:42.2932 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c9425358-1c4b-489c-f315-08d976094467 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.36]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT020.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN9PR12MB5068 Received-SPF: softfail client-ip=40.107.102.77; envelope-from=xuemingl@nvidia.com; helo=NAM04-DM6-obe.outbound.protection.outlook.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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: 1631463786813100003 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 | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 2c8556237f..58722ab27c 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -1165,6 +1165,10 @@ 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); + /* Wait VM threads accessing old flatview which contains notifier.= */ + drain_call_rcu(); + munmap(n->addr, qemu_real_host_page_size); + n->addr =3D NULL; n->set =3D false; } } @@ -1502,12 +1506,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; @@ -2484,11 +2483,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 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 Sat May 4 02:33:52 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=1631463784; cv=pass; d=zohomail.com; s=zohoarc; b=bLVFaqEsraFGYLEiYgiaG44lME9AUu03ZwOfuO0b/Kj1ZKf1s2LgArYtUKjocNewR1mWE5f/aIajG65TQf90jMWYtQfMFsXFMkOgNjWVb26vMkIR7ZLu0/IxVk1jbcFZZCzmgoAF5A6nF/CL4YoB0nwa2xyMupYVb7SFTtfGJOE= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1631463784; 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=OmJmjbF0cqALuItlhZ1DN410IgtaLD1PAAIquAy9vVk=; b=dkpaMTAUtHzfpLW/5Gie+e/Z5yOkDMhm1xTfWmu9IKzbrGUFXZ6FjSDmQQGdw43IQdSpPrgQTdnEoKpf91f7VRZETgeZy0RvBOQc8r78V6Fb89+88D/1w03XGrQGUykMV3SXFQFcbBPQiWVKzk+rqQJZbNbHRUzUYf8qwF79QPk= 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 1631463783971934.472596439901; Sun, 12 Sep 2021 09:23:03 -0700 (PDT) Received: from localhost ([::1]:37904 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mPSFy-0005nS-JF for importer@patchew.org; Sun, 12 Sep 2021 12:23:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43148) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mPSDr-0003sF-6M; Sun, 12 Sep 2021 12:20:51 -0400 Received: from mail-dm6nam11on2073.outbound.protection.outlook.com ([40.107.223.73]:43578 helo=NAM11-DM6-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 1mPSDo-0001xU-Mv; Sun, 12 Sep 2021 12:20:50 -0400 Received: from MW4PR03CA0293.namprd03.prod.outlook.com (2603:10b6:303:b5::28) by BN8PR12MB2914.namprd12.prod.outlook.com (2603:10b6:408:95::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.16; Sun, 12 Sep 2021 16:20:45 +0000 Received: from CO1NAM11FT031.eop-nam11.prod.protection.outlook.com (2603:10b6:303:b5:cafe::57) by MW4PR03CA0293.outlook.office365.com (2603:10b6:303:b5::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4500.14 via Frontend Transport; Sun, 12 Sep 2021 16:20:45 +0000 Received: from mail.nvidia.com (216.228.112.35) 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.4500.14 via Frontend Transport; Sun, 12 Sep 2021 16:20:45 +0000 Received: from DRHQMAIL107.nvidia.com (10.27.9.16) by HQMAIL111.nvidia.com (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 12 Sep 2021 16:20:44 +0000 Received: from nvidia.com (172.20.187.5) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.18; Sun, 12 Sep 2021 16:20:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IWMYpOgw2jtbu+viKcorY9MwpPT+acNoSmtT+IgCvi/IP/XIuNfH1U4vi3WlfXe1QVJ0ZLOoqWTbPsaWKdoRNapHG1AL4BalpgvAyddgC9UDml6SzVanRf0USx/b4PYq1kSnqb1KTvl1+YX4kXaWKpHWL3b+jaFD8cM40ZxTnl9KT/DMnRlaL0HIyE2ScCbdGsAI3UJXHliVR4fpoA+n8tX1RrJ/lO6Y+bvVRJ7Gi2lrQibDo77pezY40bbyfY6yRAyi5R0NVAoe1z0Ry0qNsBzv++QzY93ry8JLDOirCE1SZGk13w+D4tepgXH14FUvgzWtmALRJXOfvasze7P/jQ== 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; bh=OmJmjbF0cqALuItlhZ1DN410IgtaLD1PAAIquAy9vVk=; b=WtdZPoxa0YDdrVqXevOg7V6ycwFc5dgdKvrL+G9Ux20SGKlFOmNuCAkI5Zm6Gt+O3YoW3koyuM023fiXmk2Vi/n/qqQgNAGhrT3tXCwPVMlZQp9SOYOrgqPwT4GCra9xmyf2muYic6FfgUfGHoyZVVLQbgrSjzPjhUPd9wRP5vriYUzxCuGowKl0a5SJN49Jb4eJunUBbmX4PWkti+5+SI5V1/x+sA2vr+JuLTAaBPsWsa49pxqwmpEQWwPHmvEUNxHY46iB12ameIweYZC/sAoNPXkEtxmFKbJaS/2VqIUR+rFbLMCK32cbIo7z1+YqRpej+6t0FmT7KrDLpqWGfQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.35) smtp.rcpttodomain=nongnu.org smtp.mailfrom=nvidia.com; dmarc=pass (p=quarantine 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=OmJmjbF0cqALuItlhZ1DN410IgtaLD1PAAIquAy9vVk=; b=JBp1VPM0bmYQWuwm8awvqjUzo5SeB8Djqx5JU5RgiHlhMMGIvQR1tbKtgep696WzgskZtzItFJe4sdZbSiOVbFtkl/yqxgmaF+maSbylj3ikPT4TanF8UyiC4OxGbvqWtG2LKh5V6Quj5TYI9Xn66tLhSltemMUkdih7Fkvr+UyfHDtIVIdzbp75Yrv4BE3ewd28QSQGqeFW/j5ITZXKozzqiFntrPv8jkWjAoB+Ll4Mf+AA4GDvS5+WRAP98Whuk9CHwjJB1ZLa1qSVTfHkXmt2yO9zgOjQQxs/GF0Br711IS5vLfrKK4yhDia+kMN/onZhh1z4NRMNbL5bimePSg== X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.35) smtp.mailfrom=nvidia.com; nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; 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.35 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.35; helo=mail.nvidia.com; From: Xueming Li To: CC: "Michael S . Tsirkin" , , , , Yuwei Zhang Subject: [PATCH 2/2] vhost-user: remove VirtQ notifier restore Date: Mon, 13 Sep 2021 00:20:14 +0800 Message-ID: <20210912162014.106704-3-xuemingl@nvidia.com> X-Mailer: git-send-email 2.33.0 In-Reply-To: <20210912162014.106704-1-xuemingl@nvidia.com> References: <20210912162014.106704-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [172.20.187.5] X-ClientProxiedBy: HQMAIL101.nvidia.com (172.20.187.10) To DRHQMAIL107.nvidia.com (10.27.9.16) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: f700ef69-4f4a-4edd-8e8f-08d97609460d X-MS-TrafficTypeDiagnostic: BN8PR12MB2914: X-Microsoft-Antispam-PRVS: X-MS-Exchange-Transport-Forked: True X-MS-Oob-TLC-OOBClassifiers: OLM:102; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2zP4nENV4A+ifnJbDDSRouQ/in3UGB0Z/sLM0UhL6Ca8xDSiC4I8kOKpqMCokL5tUI19qPOSzrMK6zbFD/wjx/lZfF/h1OmaWyMULzbRoXcXzT8/qisz4LuX/1HoAl4dxySil6/Nmht7QOLhonTf+/dM4HbD08UOlUU5Wayi4QpZ+7Wo6uGuCLH6ruIiDSuQ0h8+/rmgVElRHHgE7Qj8b/L+GQ7t4MiWDZmzqaRLqfD2f8IgrJt2EiMNvwzWFPeexF4bWHGLGXA9df/omI4eCm1Mvxd1+5EZ8FwjfgGT4f13/ZZxG+T4VPTx4MMG17iNjstk/6/McXrpy/zBipuzZNFsoq2x+eTcAxG51lrKLmYy0Cn/ukXbGLUiP6FMoklsDA9e6vOfTwQNjX9ajWoXI28hOf2Mboy/dbLVL3lJj/EgcpGjiO7+9cafuy8iguoAsYOb/K+eFnxXg8i3SZef2J3bmavEhZLDU4dKT0iEtFY9EspWiBTg7gHMRrGy4IXPtc40NlzidXqWN0mjYgyg5IapxQ/WNdp5jxvKY2sY5skoTrpl2iXMsASkBJMDFeeATpa6SBpc5Ty4OERCdFQ1opjwhq3kOEbR3277K7LmV9flNh+Fz+965752DizmqyTeTKWWEdUlW0eJQjsg6oKH38SeTnLbwaiwIMtkXFJ9gi4UyY24ohWicAeRnAT8xam//7SAcZ0oEenrYXjKO8LMlw== X-Forefront-Antispam-Report: CIP:216.228.112.35; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid02.nvidia.com; CAT:NONE; SFS:(4636009)(346002)(136003)(376002)(396003)(39860400002)(46966006)(36840700001)(5660300002)(47076005)(70586007)(7696005)(8936002)(7636003)(6666004)(70206006)(336012)(6286002)(55016002)(6916009)(426003)(86362001)(8676002)(1076003)(36756003)(2616005)(36860700001)(16526019)(82310400003)(186003)(478600001)(26005)(4326008)(36906005)(316002)(356005)(54906003)(2906002)(83380400001)(82740400003); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2021 16:20:45.0573 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: f700ef69-4f4a-4edd-8e8f-08d97609460d 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.35]; 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: BN8PR12MB2914 Received-SPF: softfail client-ip=40.107.223.73; envelope-from=xuemingl@nvidia.com; helo=NAM11-DM6-obe.outbound.protection.outlook.com X-Spam_score_int: -24 X-Spam_score: -2.5 X-Spam_bar: -- X-Spam_report: (-2.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.393, 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: 1631463785231100001 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 58722ab27c..fc688db884 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -1143,19 +1143,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) { @@ -1163,21 +1150,18 @@ static void vhost_user_host_notifier_remove(struct = vhost_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); /* Wait VM threads accessing old flatview which contains notifier.= */ drain_call_rcu(); 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 @@ -1536,7 +1520,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