Received: by 2002:a25:ad19:0:0:0:0:0 with SMTP id y25csp901182ybi; Fri, 2 Aug 2019 06:12:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqyV3sK6R/yJg0bJH2ACcJr4inUh9aQVLEmCqWv8MhFGS/RNriLHbC365N8UEJeOvOzhqjsF X-Received: by 2002:a65:4304:: with SMTP id j4mr127240940pgq.419.1564751567318; Fri, 02 Aug 2019 06:12:47 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1564751567; cv=pass; d=google.com; s=arc-20160816; b=XLzPoz23xlCEUZr/nXyhF2m1I5RB0qnWwxedIlZSTiYW/b4Mt6KjfLK5Jfu9bk4ypL cILao9UMqJqii9kSUtkco7FGdNyuZmSuZMexBDvxB7uWxYPZbJJ4tWmdQlpYiqxjeVUy /Rv0IKLy/W/YwUJdTDqPYPp7oSDhHAWdxPDHxEqIJrcJRVi7c5XchdX+GnAZR6JoN7dI qmFxpSUqiyTj0yiwo6wjRo/txqZXFu3+jmG9UZY+z5LRWJ5JVTBmWIQ+h585+uWJAurv MGLkc4YUd6syEGYmD4ISjZA9tNTpN+KnovIkqeLhXKzsOg16UgF6TSVupVFtaqwXsusv b8ZQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :wdcipoutbound:content-language:accept-language:in-reply-to :references:message-id:date:thread-index:thread-topic:subject:cc:to :from:dkim-signature:ironport-sdr:dkim-signature; bh=mZArtSxmyPw6wnleNvKuLKNwVwArx5X/RwE5HHlC63Y=; b=MYCP21CuuFKPz5yZFNuc4FwVG0tF398YZaXcBHNMZ5pEl5GAGrHcYkNos037rP4j1s 8FwqRNQVi/6SyNK+yhXOu2qZYYSwF0sjmUKSyuYr56CchC/ih7T+0wahvMxHDYIowfku jT5BIOJzJqScfJD3FvOV9jM5tr0Hi8ddHE69eTG7aUu/WDCPhnA1wTVisT5RqmxBZlXD aBmIKByheUhqLPiWToInthCMgBbyn0GT/xSRzcgznPww+iXoXTrjlvbpfLJIvIMXRLXw GDSj4nsz2radSpkYp6w7hGX0Eipzq5URdLNU2xg4tSUngmHssjjFLLor2xfNoK8vmEHb B0LA== ARC-Authentication-Results: i=2; mx.google.com; dkim=fail header.i=@wdc.com header.s=dkim.wdc.com header.b=mCJW3xsh; dkim=pass header.i=@sharedspace.onmicrosoft.com header.s=selector2-sharedspace-onmicrosoft-com header.b=l6uBR0mx; arc=pass (i=1 spf=pass spfdomain=wdc.com dkim=pass dkdomain=wdc.com dmarc=pass fromdomain=wdc.com); spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=wdc.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id u91si16612926plb.243.2019.08.02.06.12.31; Fri, 02 Aug 2019 06:12:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@wdc.com header.s=dkim.wdc.com header.b=mCJW3xsh; dkim=pass header.i=@sharedspace.onmicrosoft.com header.s=selector2-sharedspace-onmicrosoft-com header.b=l6uBR0mx; arc=pass (i=1 spf=pass spfdomain=wdc.com dkim=pass dkdomain=wdc.com dmarc=pass fromdomain=wdc.com); spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=wdc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390380AbfHBHsT (ORCPT + 99 others); Fri, 2 Aug 2019 03:48:19 -0400 Received: from esa4.hgst.iphmx.com ([216.71.154.42]:63105 "EHLO esa4.hgst.iphmx.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390355AbfHBHsS (ORCPT ); Fri, 2 Aug 2019 03:48:18 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=wdc.com; i=@wdc.com; q=dns/txt; s=dkim.wdc.com; t=1564732098; x=1596268098; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=ZdQDA68AV0PHmhitUZ+eSOpMzxzX/3qgMoJ0Jl9xXt8=; b=mCJW3xshXUdWG1H8bd1LdJURIB0CPOBl6fJ7yLKHzrS/TUkTKOL/PlfT IMOceUibZVaF6gvZt/aYM6A4xkoFNXPV9zmRQm057/F+Juew6be3Iv7X4 VgUatitzQg+6N3vnsjVauL4qkyfcTJr2d6BCdZxCEMofrMa6YClwFDN5S umX0KXIXy9e62N3QbcsSA6SwsrqZBWyTr2w7r3Rh2Yw9qD36KNOiSBRRW 4z6WVNxss9jcbsMX3QKN5cWSSJF7Uah5Mp8uCGZz1lVp4yJ7WE2GqXYYA y5ORK0ifuW/JneRGwUwjAmwGjbcDSHuGvLUZdbDX4n94GT+RHCwxfOH3A g==; IronPort-SDR: XKgmlgaQeu14jIVfA2VaU/dlw+nOPQpsbYWw+mRKo9WDSs1FhuYOPHB3gryrf85U61faSYMC3y PC/rg6rjgotAHApasTXmtxIG6bgTPFX2nKJaFP0UDoIDSYGFGaoA/3b/q4EPknR5UNhPTgrK7S Dsla6nnOarebdCKmoya1Be88oj0B0W7vk9vEP/8dwPaI6nm9czYeyAYQK0WS75s/kvJChn4b1K f2cYJnUmajCiENb6MjwqMvAXc8L8lbvR5Tr/151az7a/HcGqLx3W/DHiC2hqPC3MngDloccfyN Q9Y= X-IronPort-AV: E=Sophos;i="5.64,337,1559491200"; d="scan'208";a="114783259" Received: from mail-by2nam01lp2053.outbound.protection.outlook.com (HELO NAM01-BY2-obe.outbound.protection.outlook.com) ([104.47.34.53]) by ob1.hgst.iphmx.com with ESMTP; 02 Aug 2019 15:48:16 +0800 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Y5eQboukO6Z2dzl7Padfye5bjG1fJze3YEdzROA7y29Qd33woCHoqXpcY/HUFEDYHFT+OnNNrqBRc96NSf4DLMDms3rPqQv+0JlZ8V17jUx06ePIsUjyOoOKpHTrjy7X+iw9EH6SPbg4NnHWIzh8d67LT4LG5S7KDFlpOjnQmyQVVc4lP7LoX+EP4H/gQMb0X+r8Sixy6D5Noj31CVngUKPS4Vp8TMKzJWmhVDdsvxAAnSPb2dAE308fHGbF5DCYcu5h8OuYaEKiZXtUe9hDCm6OLkmsk79hKZbiwI8Nv91mg/dH/MZ+zZtXr9XyAZPF9tD728QXf1Gw7tEPolziPw== 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-SenderADCheck; bh=mZArtSxmyPw6wnleNvKuLKNwVwArx5X/RwE5HHlC63Y=; b=WyBgAASgu6hiUicgx7Co0N853piT/fFE5nLwCl5Z+VT7CD3uiAGlmB6qDJxKQ2PEb7yrtQqLi1WkhoxsYTQnPwfr/+L7aCFkNWEdRgAjEcYjTcFqscCRQeSivqSxzWvRc4H58ZQFyUxW0JJNybxTkc1ier6doyMC1GaRkOspsSaXZUZEFPbXINVyfY7BaYphfd+8r/XcnAWUiSRGnYgn7H4M6vOTICeNtVRTq4ChzV6wPPcOwIyEccCqK/TQmHkaufAVPspUQgyVixYR3PYReSEK3u7Uito9DSVgx7PQZiGWm4t+QRRGMrVLitOxtnyq14+WLG1yrvOLMzi/QL/0hA== ARC-Authentication-Results: i=1; mx.microsoft.com 1;spf=pass smtp.mailfrom=wdc.com;dmarc=pass action=none header.from=wdc.com;dkim=pass header.d=wdc.com;arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sharedspace.onmicrosoft.com; s=selector2-sharedspace-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=mZArtSxmyPw6wnleNvKuLKNwVwArx5X/RwE5HHlC63Y=; b=l6uBR0mxgmZjAMPbe20LmZ2E+q/1wXneeynAWKe1iAKIPQK0ecztbuKXc34twbiXSkz44odWjlBIhr/mSzuVbvy4o13rx/K1msMM8X7ro9K044tg40/J+pBRS7t8Jb0u6CoV/z/C/QZ8wjMgUPpZ57yFoYYGLQt+ATfWzVz/ook= Received: from MN2PR04MB6061.namprd04.prod.outlook.com (20.178.246.15) by MN2PR04MB5566.namprd04.prod.outlook.com (20.178.248.217) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2115.15; Fri, 2 Aug 2019 07:48:15 +0000 Received: from MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::a815:e61a:b4aa:60c8]) by MN2PR04MB6061.namprd04.prod.outlook.com ([fe80::a815:e61a:b4aa:60c8%7]) with mapi id 15.20.2136.010; Fri, 2 Aug 2019 07:48:15 +0000 From: Anup Patel To: Palmer Dabbelt , Paul Walmsley , Paolo Bonzini , Radim K CC: Daniel Lezcano , Thomas Gleixner , Atish Patra , Alistair Francis , Damien Le Moal , Christoph Hellwig , Anup Patel , "kvm@vger.kernel.org" , "linux-riscv@lists.infradead.org" , "linux-kernel@vger.kernel.org" , Anup Patel Subject: [RFC PATCH v2 13/19] RISC-V: KVM: Implement MMU notifiers Thread-Topic: [RFC PATCH v2 13/19] RISC-V: KVM: Implement MMU notifiers Thread-Index: AQHVSQakf8MUQeBYxUanqsQR3T3eMQ== Date: Fri, 2 Aug 2019 07:48:15 +0000 Message-ID: <20190802074620.115029-14-anup.patel@wdc.com> References: <20190802074620.115029-1-anup.patel@wdc.com> In-Reply-To: <20190802074620.115029-1-anup.patel@wdc.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: PN1PR01CA0111.INDPRD01.PROD.OUTLOOK.COM (2603:1096:c00::27) To MN2PR04MB6061.namprd04.prod.outlook.com (2603:10b6:208:d8::15) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Anup.Patel@wdc.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.17.1 x-originating-ip: [106.51.20.161] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 468e9d71-4436-41b4-f6b9-08d7171dc6a4 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(5600148)(711020)(4605104)(1401327)(4618075)(4534185)(7168020)(4627221)(201703031133081)(201702281549075)(8990200)(2017052603328)(7193020);SRVR:MN2PR04MB5566; x-ms-traffictypediagnostic: MN2PR04MB5566: x-microsoft-antispam-prvs: wdcipoutbound: EOP-TRUE x-ms-oob-tlc-oobclassifiers: OLM:785; x-forefront-prvs: 011787B9DD x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(4636009)(346002)(376002)(39850400004)(136003)(366004)(396003)(189003)(199004)(36756003)(14454004)(7736002)(54906003)(6116002)(102836004)(110136005)(71190400001)(446003)(4326008)(3846002)(5660300002)(52116002)(66066001)(2906002)(25786009)(6486002)(6506007)(386003)(55236004)(76176011)(316002)(53936002)(6436002)(305945005)(9456002)(81156014)(64756008)(66476007)(78486014)(86362001)(66556008)(66946007)(8936002)(11346002)(476003)(68736007)(81166006)(2616005)(478600001)(486006)(26005)(1076003)(99286004)(50226002)(14444005)(256004)(71200400001)(66446008)(186003)(6512007)(44832011)(8676002)(7416002);DIR:OUT;SFP:1102;SCL:1;SRVR:MN2PR04MB5566;H:MN2PR04MB6061.namprd04.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;MX:1;A:1; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: HC/aTiM3GZyyT7iZJEfyLjeidDvIc6R4nLb2yvR8rIP7te76DtweKHNMNVieKjuUODGP71KWlwSGHm8Bs1P2gWYU/3O3QahVJSAAU4hJiS4RMV2JzVxkuxUvq5UIWREfBCDnY2ufA3PKUIe15Gwvi+sldMw/p4+FL/j1kocRZuPz30VJZm2XEUNLJEMD/6+Ic+6/uOaLtIsK8bqGiWoORcuJDAa+VN2S1A2TFPtqdojQgWUwMgtMqVq5xCQ9Q/ueTjPtSL7B7+uvbSPeuAldWTtnWdeDQaVyVBOpjhITgPjNQdOK1nQHiaGKY3UgID2jvnXK39Dv+q+aseZjOKJvTa4by1uMD5tW1O2738dohimtqcWb6gj7bmJLkyTVaonlU1Ckbqiqn1xJN4Osg1F5svgY7I+kTlC9Ij/snNhDKwU= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: wdc.com X-MS-Exchange-CrossTenant-Network-Message-Id: 468e9d71-4436-41b4-f6b9-08d7171dc6a4 X-MS-Exchange-CrossTenant-originalarrivaltime: 02 Aug 2019 07:48:15.2183 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: b61c8803-16f3-4c35-9b17-6f65f441df86 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: Anup.Patel@wdc.com X-MS-Exchange-Transport-CrossTenantHeadersStamped: MN2PR04MB5566 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org This patch implements MMU notifiers for KVM RISC-V so that Guest physical address space is in-sync with Host physical address space. This will allow swapping, page migration, etc to work transparently with KVM RISC-V. Signed-off-by: Anup Patel --- arch/riscv/include/asm/kvm_host.h | 7 ++ arch/riscv/kvm/Kconfig | 1 + arch/riscv/kvm/mmu.c | 200 +++++++++++++++++++++++++++++- arch/riscv/kvm/vm.c | 1 + 4 files changed, 208 insertions(+), 1 deletion(-) diff --git a/arch/riscv/include/asm/kvm_host.h b/arch/riscv/include/asm/kvm= _host.h index a13531d151e0..257617a76e36 100644 --- a/arch/riscv/include/asm/kvm_host.h +++ b/arch/riscv/include/asm/kvm_host.h @@ -174,6 +174,13 @@ static inline void kvm_arch_vcpu_uninit(struct kvm_vcp= u *vcpu) {} static inline void kvm_arch_sched_in(struct kvm_vcpu *vcpu, int cpu) {} static inline void kvm_arch_vcpu_block_finish(struct kvm_vcpu *vcpu) {} =20 +#define KVM_ARCH_WANT_MMU_NOTIFIER +int kvm_unmap_hva_range(struct kvm *kvm, + unsigned long start, unsigned long end); +int kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte); +int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end); +int kvm_test_age_hva(struct kvm *kvm, unsigned long hva); + extern void __kvm_riscv_hfence_gvma_vmid_gpa(unsigned long vmid, unsigned long gpa); extern void __kvm_riscv_hfence_gvma_vmid(unsigned long vmid); diff --git a/arch/riscv/kvm/Kconfig b/arch/riscv/kvm/Kconfig index 35fd30d0e432..002e14ee37f6 100644 --- a/arch/riscv/kvm/Kconfig +++ b/arch/riscv/kvm/Kconfig @@ -20,6 +20,7 @@ if VIRTUALIZATION config KVM tristate "Kernel-based Virtual Machine (KVM) support" depends on OF + select MMU_NOTIFIER select PREEMPT_NOTIFIERS select ANON_INODES select KVM_MMIO diff --git a/arch/riscv/kvm/mmu.c b/arch/riscv/kvm/mmu.c index 4e3dfa86b867..1540c2883fcc 100644 --- a/arch/riscv/kvm/mmu.c +++ b/arch/riscv/kvm/mmu.c @@ -67,6 +67,66 @@ static void *stage2_cache_alloc(struct kvm_mmu_page_cach= e *pcache) return p; } =20 +static int stage2_pgdp_test_and_clear_young(pgd_t *pgd) +{ + return ptep_test_and_clear_young(NULL, 0, (pte_t *)pgd); +} + +static int stage2_pmdp_test_and_clear_young(pmd_t *pmd) +{ + return ptep_test_and_clear_young(NULL, 0, (pte_t *)pmd); +} + +static int stage2_ptep_test_and_clear_young(pte_t *pte) +{ + return ptep_test_and_clear_young(NULL, 0, pte); +} + +static bool stage2_get_leaf_entry(struct kvm *kvm, gpa_t addr, + pgd_t **pgdpp, pmd_t **pmdpp, pte_t **ptepp) +{ + pgd_t *pgdp; + pmd_t *pmdp; + pte_t *ptep; + + *pgdpp =3D NULL; + *pmdpp =3D NULL; + *ptepp =3D NULL; + + pgdp =3D &kvm->arch.pgd[pgd_index(addr)]; + if (!pgd_val(*pgdp)) + return false; + if (pgd_val(*pgdp) & _PAGE_LEAF) { + *pgdpp =3D pgdp; + return true; + } + + if (stage2_have_pmd) { + pmdp =3D (void *)pgd_page_vaddr(*pgdp); + pmdp =3D &pmdp[pmd_index(addr)]; + if (!pmd_present(*pmdp)) + return false; + if (pmd_val(*pmdp) & _PAGE_LEAF) { + *pmdpp =3D pmdp; + return true; + } + + ptep =3D (void *)pmd_page_vaddr(*pmdp); + } else { + ptep =3D (void *)pgd_page_vaddr(*pgdp); + } + + ptep =3D &ptep[pte_index(addr)]; + if (!pte_present(*ptep)) + return false; + if (pte_val(*ptep) & _PAGE_LEAF) { + *ptepp =3D ptep; + return true; + } + + return false; +} + struct local_guest_tlb_info { struct kvm_vmid *vmid; gpa_t addr; @@ -444,6 +504,38 @@ int stage2_ioremap(struct kvm *kvm, gpa_t gpa, phys_ad= dr_t hpa, =20 } =20 +static int handle_hva_to_gpa(struct kvm *kvm, + unsigned long start, + unsigned long end, + int (*handler)(struct kvm *kvm, + gpa_t gpa, u64 size, + void *data), + void *data) +{ + struct kvm_memslots *slots; + struct kvm_memory_slot *memslot; + int ret =3D 0; + + slots =3D kvm_memslots(kvm); + + /* we only care about the pages that the guest sees */ + kvm_for_each_memslot(memslot, slots) { + unsigned long hva_start, hva_end; + gfn_t gpa; + + hva_start =3D max(start, memslot->userspace_addr); + hva_end =3D min(end, memslot->userspace_addr + + (memslot->npages << PAGE_SHIFT)); + if (hva_start >=3D hva_end) + continue; + + gpa =3D hva_to_gfn_memslot(hva_start, memslot) << PAGE_SHIFT; + ret |=3D handler(kvm, gpa, (u64)(hva_end - hva_start), data); + } + + return ret; +} + void kvm_arch_free_memslot(struct kvm *kvm, struct kvm_memory_slot *free, struct kvm_memory_slot *dont) { @@ -576,6 +668,106 @@ int kvm_arch_prepare_memory_region(struct kvm *kvm, return ret; } =20 +static int kvm_unmap_hva_handler(struct kvm *kvm, + gpa_t gpa, u64 size, void *data) +{ + stage2_unmap_range(kvm, gpa, size); + return 0; +} + +int kvm_unmap_hva_range(struct kvm *kvm, + unsigned long start, unsigned long end) +{ + if (!kvm->arch.pgd) + return 0; + + handle_hva_to_gpa(kvm, start, end, + &kvm_unmap_hva_handler, NULL); + return 0; +} + +static int kvm_set_spte_handler(struct kvm *kvm, + gpa_t gpa, u64 size, void *data) +{ + pte_t *pte =3D (pte_t *)data; + + WARN_ON(size !=3D PAGE_SIZE); + stage2_set_pte(kvm, NULL, gpa, pte); + + return 0; +} + +int kvm_set_spte_hva(struct kvm *kvm, unsigned long hva, pte_t pte) +{ + unsigned long end =3D hva + PAGE_SIZE; + kvm_pfn_t pfn =3D pte_pfn(pte); + pte_t stage2_pte; + + if (!kvm->arch.pgd) + return 0; + + stage2_pte =3D pfn_pte(pfn, PAGE_WRITE_EXEC); + handle_hva_to_gpa(kvm, hva, end, + &kvm_set_spte_handler, &stage2_pte); + + return 0; +} + +static int kvm_age_hva_handler(struct kvm *kvm, + gpa_t gpa, u64 size, void *data) +{ + pgd_t *pgd; + pmd_t *pmd; + pte_t *pte; + + WARN_ON(size !=3D PAGE_SIZE && size !=3D PMD_SIZE && size !=3D PGDIR_SIZE= ); + if (!stage2_get_leaf_entry(kvm, gpa, &pgd, &pmd, &pte)) + return 0; + + if (pgd) + return stage2_pgdp_test_and_clear_young(pgd); + else if (pmd) + return stage2_pmdp_test_and_clear_young(pmd); + else + return stage2_ptep_test_and_clear_young(pte); +} + +int kvm_age_hva(struct kvm *kvm, unsigned long start, unsigned long end) +{ + if (!kvm->arch.pgd) + return 0; + + return handle_hva_to_gpa(kvm, start, end, kvm_age_hva_handler, NULL); +} + +static int kvm_test_age_hva_handler(struct kvm *kvm, + gpa_t gpa, u64 size, void *data) +{ + pgd_t *pgd; + pmd_t *pmd; + pte_t *pte; + + WARN_ON(size !=3D PAGE_SIZE && size !=3D PMD_SIZE); + if (!stage2_get_leaf_entry(kvm, gpa, &pgd, &pmd, &pte)) + return 0; + + if (pgd) + return pte_young(*((pte_t *)pgd)); + else if (pmd) + return pte_young(*((pte_t *)pmd)); + else + return pte_young(*pte); +} + +int kvm_test_age_hva(struct kvm *kvm, unsigned long hva) +{ + if (!kvm->arch.pgd) + return 0; + + return handle_hva_to_gpa(kvm, hva, hva, + kvm_test_age_hva_handler, NULL); +} + int kvm_riscv_stage2_map(struct kvm_vcpu *vcpu, gpa_t gpa, unsigned long h= va, bool is_write) { @@ -587,7 +779,7 @@ int kvm_riscv_stage2_map(struct kvm_vcpu *vcpu, gpa_t g= pa, unsigned long hva, struct vm_area_struct *vma; struct kvm *kvm =3D vcpu->kvm; struct kvm_mmu_page_cache *pcache =3D &vcpu->arch.mmu_page_cache; - unsigned long vma_pagesize; + unsigned long vma_pagesize, mmu_seq; =20 down_read(¤t->mm->mmap_sem); =20 @@ -617,6 +809,8 @@ int kvm_riscv_stage2_map(struct kvm_vcpu *vcpu, gpa_t g= pa, unsigned long hva, return ret; } =20 + mmu_seq =3D kvm->mmu_notifier_seq; + hfn =3D gfn_to_pfn_prot(kvm, gfn, is_write, &writeable); if (hfn =3D=3D KVM_PFN_ERR_HWPOISON) { if (is_vm_hugetlb_page(vma)) @@ -635,6 +829,9 @@ int kvm_riscv_stage2_map(struct kvm_vcpu *vcpu, gpa_t g= pa, unsigned long hva, =20 spin_lock(&kvm->mmu_lock); =20 + if (mmu_notifier_retry(kvm, mmu_seq)) + goto out_unlock; + if (writeable) { kvm_set_pfn_dirty(hfn); ret =3D stage2_map_page(kvm, pcache, gpa, hfn << PAGE_SHIFT, @@ -647,6 +844,7 @@ int kvm_riscv_stage2_map(struct kvm_vcpu *vcpu, gpa_t g= pa, unsigned long hva, if (ret) kvm_err("Failed to map in stage2\n"); =20 +out_unlock: spin_unlock(&kvm->mmu_lock); kvm_set_pfn_accessed(hfn); kvm_release_pfn_clean(hfn); diff --git a/arch/riscv/kvm/vm.c b/arch/riscv/kvm/vm.c index c5aab5478c38..fd84b4d914dc 100644 --- a/arch/riscv/kvm/vm.c +++ b/arch/riscv/kvm/vm.c @@ -54,6 +54,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ex= t) switch (ext) { case KVM_CAP_DEVICE_CTRL: case KVM_CAP_USER_MEMORY: + case KVM_CAP_SYNC_MMU: case KVM_CAP_DESTROY_MEMORY_REGION_WORKS: case KVM_CAP_ONE_REG: case KVM_CAP_READONLY_MEM: --=20 2.17.1