From patchwork Tue Mar 5 19:41:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krister Johansen X-Patchwork-Id: 13582945 Received: from antelope.elm.relay.mailchannels.net (antelope.elm.relay.mailchannels.net [23.83.212.4]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C21CD128805 for ; Tue, 5 Mar 2024 19:58:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=23.83.212.4 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709668691; cv=pass; b=USZaZ9MsvZxLoOPkHPsK9J+YLruFCA02zs53j3HBhTkraxGttZkJyN178by38yQD6F+MBffzqUB1MDaZbwuQn+jTFxGilgEO9EPPumkacpeGNnKhQRp+HHWZd9171hEl7p0gwhj6C1I3wiVm0elyiPFdR+8RYpHvOyKCK6q+dwM= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709668691; c=relaxed/simple; bh=6vmeA6S/aWTdxIm3wzboVir81wQ0joTj+zd4cbwqkok=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=Fi3kAZf/jXSA6BNpj9Xq51lDJWTBvc7o2oQQtf2Iyw1Tp/O6pHEMiJXjqQS/Zbs9z+KTPPi72y8tCSdyi5dftNEHTCwfTwXXy4QYljE2P9WadETxIp5em8kCXE/ZvB7VOx5F3v1iBhMdT461bYn8Rgd8G9nLazj3V8NSjAdxjZQ= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=templeofstupid.com; spf=pass smtp.mailfrom=templeofstupid.com; dkim=pass (2048-bit key) header.d=templeofstupid.com header.i=@templeofstupid.com header.b=LQ1ldbdB; arc=pass smtp.client-ip=23.83.212.4 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=templeofstupid.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=templeofstupid.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=templeofstupid.com header.i=@templeofstupid.com header.b="LQ1ldbdB" X-Sender-Id: dreamhost|x-authsender|kjlx@templeofstupid.com Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 3A5BC6C24F9 for ; Tue, 5 Mar 2024 19:41:55 +0000 (UTC) Received: from pdx1-sub0-mail-a310.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 9DDF56C2B24 for ; Tue, 5 Mar 2024 19:41:54 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1709667714; a=rsa-sha256; cv=none; b=ceI96vjLUIph6tOVfSsuKNSUmmRJFruiGhkOX4mSSgnODVINS7oA7CI84cbk3u36zoQx30 mlAGVQb/xK45j760hnA/C6RbtYb5+TrIbfNt+B2alBBqlMBOBAlNMe1l2LGYYehMArgJmM SBxDvtUpL39wbdPep30fhqmhDKFY9gqEO9JOHU/oNvmUawYtW2Cfbv2XIX406+RuXn1C+u 9ia2A54+Cnpe7wrAQ2v/K32JUiAhXDbBNc4SuVNxfp0G7OC4h2KIF3Hmv37wCbkum4JMqu eqWQd4TNZgMZb35rt59hmE2jI0ki6aeF0E2sr5kQXx0rFcacgkoON9b14TYPbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1709667714; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references:dkim-signature; bh=toLiXIytUz7sF69OdOxZkKEWMldkS6KytMaGIuNQxWY=; b=hMpe4kjA0GNt3F8VUW5l5XZH0WWiVlpWV+kYoDKJb//5SvwBA3ObKAv/dBWE21UzicCv2O 3WtnzM+OT7hbNLavRi6OuBr1fsVtZvP+4aD4MfizyyaNlqYxl4w7Pkza9awGlUGR4GOU14 iEz93oLaQ7ZhRibRVnOG8iEsSml5MYpDrLfqgcClN/rTdE+ctS98AJ/w8z3RVuxNeW+A2T VSeKiDtjGYFConTAutzKefRnynvHvXK91Ea7L4yLHD5qd4eJzkK1P+x457pgddh27uDWYG Kt9rq2+2cxvTrXrk3ODTy+3TCG53wVEkIKCeTK8HK902FoYDRiNEL1F549PnqQ== ARC-Authentication-Results: i=1; rspamd-7f9dd9fb96-6mb89; auth=pass smtp.auth=dreamhost smtp.mailfrom=kjlx@templeofstupid.com X-Sender-Id: dreamhost|x-authsender|kjlx@templeofstupid.com X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|kjlx@templeofstupid.com X-MailChannels-Auth-Id: dreamhost X-Wiry-Eyes: 1b1667e654377f49_1709667715017_1861599966 X-MC-Loop-Signature: 1709667715017:3570600356 X-MC-Ingress-Time: 1709667715016 Received: from pdx1-sub0-mail-a310.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.98.116.72 (trex/6.9.2); Tue, 05 Mar 2024 19:41:55 +0000 Received: from kmjvbox.templeofstupid.com (c-73-222-159-162.hsd1.ca.comcast.net [73.222.159.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kjlx@templeofstupid.com) by pdx1-sub0-mail-a310.dreamhost.com (Postfix) with ESMTPSA id 4Tq5YG2yhczjf for ; Tue, 5 Mar 2024 11:41:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=templeofstupid.com; s=dreamhost; t=1709667714; bh=toLiXIytUz7sF69OdOxZkKEWMldkS6KytMaGIuNQxWY=; h=Date:From:To:Cc:Subject:Content-Type; b=LQ1ldbdBzrfZOfybz1OG2hiUQ8hoVAY4JE7ExpjyYbpXBybIXaj2DBUuWHVD96wZa Q8ZploU00Z3BKEinmW+SX49ukC1O31takTkVuy/WsmvpncyJ8mbUuaIGoMcRFWoovb EHG6CHqbbLSLtFtV1k/eVZQPznmLjZfxa9wu8UGOTWCW5jSdHM+SL+13om4KXtVkGk elAIHjG7M0HBxXOL/pnyu4qt55yjJJXRGf6ollckMi0p+n5QdP1TtXWNq6fC2nRjE5 XMxQVlYdrLWQ+JiXQ+u4v5po2l3vGpeGS9V+nWxOGTB3Vqq+EU4tYyqyw8Uv1bOxSe JojEgxKsTrucg== Received: from johansen (uid 1000) (envelope-from kjlx@templeofstupid.com) id e00eb by kmjvbox.templeofstupid.com (DragonFly Mail Agent v0.12); Tue, 05 Mar 2024 11:41:45 -0800 Date: Tue, 5 Mar 2024 11:41:45 -0800 From: Krister Johansen To: stable@vger.kernel.org Cc: Oliver Upton , Marc Zyngier , James Morse , Alexandru Elisei , David Matlack , kvm@vger.kernel.org Subject: [PATCH 5.15.y 1/2] KVM: arm64: Work out supported block level at compile time Message-ID: <21a92d6c66b6100d45a9cf8a0e48f613576157fa.1709665227.git.kjlx@templeofstupid.com> References: Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: commit 3b5c082bbfa20d9a57924edd655bbe63fe98ab06 upstream. Work out the minimum page table level where KVM supports block mappings at compile time. While at it, rewrite the comment around supported block mappings to directly describe what KVM supports instead of phrasing in terms of what it does not. Signed-off-by: Oliver Upton Signed-off-by: Marc Zyngier Link: https://lore.kernel.org/r/20221007234151.461779-2-oliver.upton@linux.dev Signed-off-by: Krister Johansen --- arch/arm64/include/asm/kvm_pgtable.h | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/arch/arm64/include/asm/kvm_pgtable.h b/arch/arm64/include/asm/kvm_pgtable.h index 027783829584..87e782eec925 100644 --- a/arch/arm64/include/asm/kvm_pgtable.h +++ b/arch/arm64/include/asm/kvm_pgtable.h @@ -13,6 +13,18 @@ #define KVM_PGTABLE_MAX_LEVELS 4U +/* + * The largest supported block sizes for KVM (no 52-bit PA support): + * - 4K (level 1): 1GB + * - 16K (level 2): 32MB + * - 64K (level 2): 512MB + */ +#ifdef CONFIG_ARM64_4K_PAGES +#define KVM_PGTABLE_MIN_BLOCK_LEVEL 1U +#else +#define KVM_PGTABLE_MIN_BLOCK_LEVEL 2U +#endif + static inline u64 kvm_get_parange(u64 mmfr0) { u64 parange = cpuid_feature_extract_unsigned_field(mmfr0, @@ -58,11 +70,7 @@ static inline u64 kvm_granule_size(u32 level) static inline bool kvm_level_supports_block_mapping(u32 level) { - /* - * Reject invalid block mappings and don't bother with 4TB mappings for - * 52-bit PAs. - */ - return !(level == 0 || (PAGE_SIZE != SZ_4K && level == 1)); + return level >= KVM_PGTABLE_MIN_BLOCK_LEVEL; } /** From patchwork Tue Mar 5 19:41:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krister Johansen X-Patchwork-Id: 13582922 Received: from rusty.tulip.relay.mailchannels.net (rusty.tulip.relay.mailchannels.net [23.83.218.252]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0B23A5813B for ; Tue, 5 Mar 2024 19:42:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=23.83.218.252 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709667732; cv=pass; b=ts2nm3JuHgo4xCnbM6teqVqfPUK15YuclKX3J1w7XkgTX+YKRklpvUz1QFBUx4jJ6imJmMf/6ECZP42LcM6em+uf0P7+2J4NsHMdF+XZNLkYit7aOFz8UxDgEjslfTdJxxboqp9/bwoBBR0p1JWPMSlbi8YYnCFFzIAkiV1kL1k= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709667732; c=relaxed/simple; bh=EOGcYRR8j28W36imuAgLZSy4Vkb/ifa3ueWHDTjmuMs=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=CwvemukodjBOuhAIjLWO7WiteUKIlf4e8I2x7CqMOmTO+L2K47BAI0xdyufIBqD5x80VV7NeTCLSO20VTnLLydLXJOTxQP/1crK4sp2crILfuQ0xH/CJZ9iW46BOGiPdI++kaxtn7Tv1HKeMjL9jRYu+g0GdETmK3zE+WCBbiSU= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=templeofstupid.com; spf=pass smtp.mailfrom=templeofstupid.com; dkim=pass (2048-bit key) header.d=templeofstupid.com header.i=@templeofstupid.com header.b=aIsHa2k0; arc=pass smtp.client-ip=23.83.218.252 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=templeofstupid.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=templeofstupid.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=templeofstupid.com header.i=@templeofstupid.com header.b="aIsHa2k0" X-Sender-Id: dreamhost|x-authsender|kjlx@templeofstupid.com Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id D9CE37633B0 for ; Tue, 5 Mar 2024 19:42:03 +0000 (UTC) Received: from pdx1-sub0-mail-a310.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 6B0E9762E6F for ; Tue, 5 Mar 2024 19:42:03 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1709667723; a=rsa-sha256; cv=none; b=uUmV3Th0y7qrwq+7y4NbHxMZINqcJQ5CYEG8+OkZ7phcaPZG5uCJuH4uh4JxkslC+cQevK otXkIBFqAb9t5GavguWiTt+90aoeb2Fo88X5GqREzAk6Z2QJBYP2kUJpfKUCRiZ8Rs5oD1 YXc0J++TaLdIMEzUHWo0VNKeD44m4DCSQNTmL20RnG4y4jD5TTrjQQuFAdP41SIH30P+jy YdWC49OnKwQ3eg6nGgYTuumLQdAGdDN1Jf+z8yCbscVwL4BRrGFYCNbh/mi1CfzLExwUGZ cci3orLHh+SItH1otuuVhTsCVd+adJAx4RHe0KXLFc9PBD/zQEsAJmhWdq1EtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1709667723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references:dkim-signature; bh=+BA4XyTTe9dXYeDxUHHM6ruKkOnuaTxBxKb11+5EML8=; b=bWDG32C/whDdZveZl3eVLtuiu/NcPdOtYraLrCfHtfaOB3JhB34hJulKbYjNzrSjeWeN4O u/pmhaijqVMjCz1yMRImZYz21xfhHPQvmxgIJiN/w68bY7Rx8JwtCRphXlYEwGYgfE8Pxs Kj9gagK8L3yy7obwPzwQoLlcvKcFS3FTZZY5cHahBddsJo29Z4az8fDA61TO36De+2yhSQ g3pTJPoPUAiSWcQA18+EILlFzr8+seimlw7y02Loov/Z1hfG/eUUq3yd+oa+vlMlIjkYXX n63s8cxC4q2oZ69/hlc9/K3H4+kfmmrsXjJ8wUTZLCu0ohnB6frjZPe+dvdPag== ARC-Authentication-Results: i=1; rspamd-55b4bfd7cb-xzgg5; auth=pass smtp.auth=dreamhost smtp.mailfrom=kjlx@templeofstupid.com X-Sender-Id: dreamhost|x-authsender|kjlx@templeofstupid.com X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|kjlx@templeofstupid.com X-MailChannels-Auth-Id: dreamhost X-Power-Coil: 671989613ba96d63_1709667723715_561256111 X-MC-Loop-Signature: 1709667723715:762577087 X-MC-Ingress-Time: 1709667723715 Received: from pdx1-sub0-mail-a310.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.116.14.15 (trex/6.9.2); Tue, 05 Mar 2024 19:42:03 +0000 Received: from kmjvbox.templeofstupid.com (c-73-222-159-162.hsd1.ca.comcast.net [73.222.159.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kjlx@templeofstupid.com) by pdx1-sub0-mail-a310.dreamhost.com (Postfix) with ESMTPSA id 4Tq5YR1QjyzSS for ; Tue, 5 Mar 2024 11:42:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=templeofstupid.com; s=dreamhost; t=1709667723; bh=+BA4XyTTe9dXYeDxUHHM6ruKkOnuaTxBxKb11+5EML8=; h=Date:From:To:Cc:Subject:Content-Type; b=aIsHa2k0sTpAAqxiFRiuvUHn0bRysW96MVRo5FR94fH61MR48xeK0xTvMo/nH2qpd dA6l+HitOa/wy/ACvNwHQi7F1OVfDHZngVXkx2FQRjJloMRMX3Qk6/pxPOBZqyd0E5 I7BCRnQ/Y29jTgpnRop2Pu8l8SpQAnINykbQOG5DYgMJQewzqveqkXP9vR4uRMx9vL bDuTsgmsfpjsG/29vd5T2IG0yL1OkxsxrP0/aVgPPbZqTde8DnaNoHf9m7OnS0jLan mSQlOsd5k9DD7+fQOw8gktp+qLplCtEqU7hYEnckor0wWK6BrJWch9YG5DRpOMzQJr 62mb0wN6TBHhA== Received: from johansen (uid 1000) (envelope-from kjlx@templeofstupid.com) id e00eb by kmjvbox.templeofstupid.com (DragonFly Mail Agent v0.12); Tue, 05 Mar 2024 11:41:54 -0800 Date: Tue, 5 Mar 2024 11:41:54 -0800 From: Krister Johansen To: stable@vger.kernel.org Cc: Oliver Upton , Marc Zyngier , James Morse , Alexandru Elisei , David Matlack , kvm@vger.kernel.org Subject: [PATCH 5.15.y 2/2] KVM: arm64: Limit stage2_apply_range() batch size to largest block Message-ID: <373363c947131626f70c6337c5c0f197046db4fe.1709665227.git.kjlx@templeofstupid.com> References: Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: commit 5994bc9e05c2f8811f233aa434e391cd2783f0f5 upstream. Presently stage2_apply_range() works on a batch of memory addressed by a stage 2 root table entry for the VM. Depending on the IPA limit of the VM and PAGE_SIZE of the host, this could address a massive range of memory. Some examples: 4 level, 4K paging -> 512 GB batch size 3 level, 64K paging -> 4TB batch size Unsurprisingly, working on such a large range of memory can lead to soft lockups. When running dirty_log_perf_test: ./dirty_log_perf_test -m -2 -s anonymous_thp -b 4G -v 48 watchdog: BUG: soft lockup - CPU#0 stuck for 45s! [dirty_log_perf_:16703] Modules linked in: vfat fat cdc_ether usbnet mii xhci_pci xhci_hcd sha3_generic gq(O) CPU: 0 PID: 16703 Comm: dirty_log_perf_ Tainted: G O 6.0.0-smp-DEV #1 pstate: 80400009 (Nzcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : dcache_clean_inval_poc+0x24/0x38 lr : clean_dcache_guest_page+0x28/0x4c sp : ffff800021763990 pmr_save: 000000e0 x29: ffff800021763990 x28: 0000000000000005 x27: 0000000000000de0 x26: 0000000000000001 x25: 00400830b13bc77f x24: ffffad4f91ead9c0 x23: 0000000000000000 x22: ffff8000082ad9c8 x21: 0000fffafa7bc000 x20: ffffad4f9066ce50 x19: 0000000000000003 x18: ffffad4f92402000 x17: 000000000000011b x16: 000000000000011b x15: 0000000000000124 x14: ffff07ff8301d280 x13: 0000000000000000 x12: 00000000ffffffff x11: 0000000000010001 x10: fffffc0000000000 x9 : ffffad4f9069e580 x8 : 000000000000000c x7 : 0000000000000000 x6 : 000000000000003f x5 : ffff07ffa2076980 x4 : 0000000000000001 x3 : 000000000000003f x2 : 0000000000000040 x1 : ffff0830313bd000 x0 : ffff0830313bcc40 Call trace: dcache_clean_inval_poc+0x24/0x38 stage2_unmap_walker+0x138/0x1ec __kvm_pgtable_walk+0x130/0x1d4 __kvm_pgtable_walk+0x170/0x1d4 __kvm_pgtable_walk+0x170/0x1d4 __kvm_pgtable_walk+0x170/0x1d4 kvm_pgtable_stage2_unmap+0xc4/0xf8 kvm_arch_flush_shadow_memslot+0xa4/0x10c kvm_set_memslot+0xb8/0x454 __kvm_set_memory_region+0x194/0x244 kvm_vm_ioctl_set_memory_region+0x58/0x7c kvm_vm_ioctl+0x49c/0x560 __arm64_sys_ioctl+0x9c/0xd4 invoke_syscall+0x4c/0x124 el0_svc_common+0xc8/0x194 do_el0_svc+0x38/0xc0 el0_svc+0x2c/0xa4 el0t_64_sync_handler+0x84/0xf0 el0t_64_sync+0x1a0/0x1a4 Use the largest supported block mapping for the configured page size as the batch granularity. In so doing the walker is guaranteed to visit a leaf only once. Signed-off-by: Oliver Upton Signed-off-by: Marc Zyngier Link: https://lore.kernel.org/r/20221007234151.461779-3-oliver.upton@linux.dev Signed-off-by: Krister Johansen --- arch/arm64/include/asm/stage2_pgtable.h | 20 -------------------- arch/arm64/kvm/mmu.c | 9 ++++++++- 2 files changed, 8 insertions(+), 21 deletions(-) diff --git a/arch/arm64/include/asm/stage2_pgtable.h b/arch/arm64/include/asm/stage2_pgtable.h index fe341a6578c3..c8dca8ae359c 100644 --- a/arch/arm64/include/asm/stage2_pgtable.h +++ b/arch/arm64/include/asm/stage2_pgtable.h @@ -10,13 +10,6 @@ #include -/* - * PGDIR_SHIFT determines the size a top-level page table entry can map - * and depends on the number of levels in the page table. Compute the - * PGDIR_SHIFT for a given number of levels. - */ -#define pt_levels_pgdir_shift(lvls) ARM64_HW_PGTABLE_LEVEL_SHIFT(4 - (lvls)) - /* * The hardware supports concatenation of up to 16 tables at stage2 entry * level and we use the feature whenever possible, which means we resolve 4 @@ -30,11 +23,6 @@ #define stage2_pgtable_levels(ipa) ARM64_HW_PGTABLE_LEVELS((ipa) - 4) #define kvm_stage2_levels(kvm) VTCR_EL2_LVLS(kvm->arch.vtcr) -/* stage2_pgdir_shift() is the size mapped by top-level stage2 entry for the VM */ -#define stage2_pgdir_shift(kvm) pt_levels_pgdir_shift(kvm_stage2_levels(kvm)) -#define stage2_pgdir_size(kvm) (1ULL << stage2_pgdir_shift(kvm)) -#define stage2_pgdir_mask(kvm) ~(stage2_pgdir_size(kvm) - 1) - /* * kvm_mmmu_cache_min_pages() is the number of pages required to install * a stage-2 translation. We pre-allocate the entry level page table at @@ -42,12 +30,4 @@ */ #define kvm_mmu_cache_min_pages(kvm) (kvm_stage2_levels(kvm) - 1) -static inline phys_addr_t -stage2_pgd_addr_end(struct kvm *kvm, phys_addr_t addr, phys_addr_t end) -{ - phys_addr_t boundary = (addr + stage2_pgdir_size(kvm)) & stage2_pgdir_mask(kvm); - - return (boundary - 1 < end - 1) ? boundary : end; -} - #endif /* __ARM64_S2_PGTABLE_H_ */ diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 38a8095744a0..db667b4ad103 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -31,6 +31,13 @@ static phys_addr_t hyp_idmap_vector; static unsigned long io_map_base; +static phys_addr_t stage2_range_addr_end(phys_addr_t addr, phys_addr_t end) +{ + phys_addr_t size = kvm_granule_size(KVM_PGTABLE_MIN_BLOCK_LEVEL); + phys_addr_t boundary = ALIGN_DOWN(addr + size, size); + + return (boundary - 1 < end - 1) ? boundary : end; +} /* * Release kvm_mmu_lock periodically if the memory region is large. Otherwise, @@ -52,7 +59,7 @@ static int stage2_apply_range(struct kvm *kvm, phys_addr_t addr, if (!pgt) return -EINVAL; - next = stage2_pgd_addr_end(kvm, addr, end); + next = stage2_range_addr_end(addr, end); ret = fn(pgt, addr, next - addr); if (ret) break;