From nobody Tue Sep 16 20:17:22 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 26900C3DA7C for ; Thu, 29 Dec 2022 02:00:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232555AbiL2CA2 (ORCPT ); Wed, 28 Dec 2022 21:00:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230106AbiL2CAY (ORCPT ); Wed, 28 Dec 2022 21:00:24 -0500 X-Greylist: delayed 467 seconds by postgrey-1.37 at lindbergh.monkeyblade.net; Wed, 28 Dec 2022 18:00:11 PST Received: from mail4.tencent.com (mail12.tencent.com [61.241.47.121]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8051FBC9B; Wed, 28 Dec 2022 18:00:11 -0800 (PST) Received: from EX-SZ018.tencent.com (unknown [10.28.6.39]) by mail4.tencent.com (Postfix) with ESMTP id 3B180BA31F; Thu, 29 Dec 2022 09:52:22 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tencent.com; s=s202002; t=1672278742; bh=IT5RZfT5T334qVeq2A/RSbr1MuPROR0hLfXMCIZCR+o=; h=From:To:CC:Subject:Date; b=VAITQT+B4wjIJ24YQuIEAMVlpM2ZD9YsCynLp56lUHDiCXkrKEtN2ETo2u1xpogf8 SiHLYM11/MJ/JkDtGKkIkchBfhRb8s8DLML6LmyQo/NNUxswL6jtcuwwvWzy2lnnIo V3MCzDygWV4cmSrGms2vRyYNFvWY034cjautQQ3c= Received: from EX-SZ052.tencent.com (10.28.6.108) by EX-SZ018.tencent.com (10.28.6.39) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Thu, 29 Dec 2022 09:52:22 +0800 Received: from EX-SZ049.tencent.com (10.28.6.102) by EX-SZ052.tencent.com (10.28.6.108) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.4; Thu, 29 Dec 2022 09:52:21 +0800 Received: from EX-SZ049.tencent.com ([fe80::a50b:1c86:c1f2:8cf4]) by EX-SZ049.tencent.com ([fe80::a50b:1c86:c1f2:8cf4%8]) with mapi id 15.01.2242.008; Thu, 29 Dec 2022 09:52:21 +0800 From: =?utf-8?B?Zmx5aW5ncGVuZyjlva3mtakp?= To: "pbonzini@redhat.com" CC: "kvm@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: [RESEND PATCH v2] KVM: use unified srcu interface function Thread-Topic: [RESEND PATCH v2] KVM: use unified srcu interface function Thread-Index: AQHZGygwmEDfKOhCQ02bKVr49C7THQ== Date: Thu, 29 Dec 2022 01:52:21 +0000 Message-ID: Accept-Language: zh-CN, en-US Content-Language: zh-CN X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.99.213.112] Content-Type: text/plain; charset="utf-8" Content-ID: Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org kvm->irq_routing is protected by kvm->irq_srcu. Signed-off-by: Peng Hao --- virt/kvm/irqchip.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/virt/kvm/irqchip.c b/virt/kvm/irqchip.c index 1e567d1f6d3d..d3ccfe922880 100644 --- a/virt/kvm/irqchip.c +++ b/virt/kvm/irqchip.c @@ -18,6 +18,10 @@ #include #include +#define kvm_get_irq_routing(kvm) \ + srcu_dereference_check((kvm)->irq_routing, &(kvm)->irq_srcu, \ + lockdep_is_held(&(kvm)->irq_lock)) + int kvm_irq_map_gsi(struct kvm *kvm, struct kvm_kernel_irq_routing_entry *entries, int gsi) { @@ -25,8 +29,7 @@ int kvm_irq_map_gsi(struct kvm *kvm, struct kvm_kernel_irq_routing_entry *e; int n =3D 0; - irq_rt =3D srcu_dereference_check(kvm->irq_routing, &kvm->irq_srcu, - lockdep_is_held(&kvm->irq_lock)); + irq_rt =3D kvm_get_irq_routing(kvm); if (irq_rt && gsi < irq_rt->nr_rt_entries) { hlist_for_each_entry(e, &irq_rt->map[gsi], link) { entries[n] =3D *e; @@ -216,7 +219,7 @@ int kvm_set_irq_routing(struct kvm *kvm, } mutex_lock(&kvm->irq_lock); - old =3D rcu_dereference_protected(kvm->irq_routing, 1); + old =3D kvm_get_irq_routing(kvm); rcu_assign_pointer(kvm->irq_routing, new); kvm_irq_routing_update(kvm); kvm_arch_irq_routing_update(kvm); -- 2.27.0