From mboxrd@z Thu Jan 1 00:00:00 1970 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3AD60C3ABDA for ; Wed, 14 May 2025 23:45:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 368008D000C; Wed, 14 May 2025 19:43:47 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 2EE938D0001; Wed, 14 May 2025 19:43:47 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 16AA38D000C; Wed, 14 May 2025 19:43:47 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id E98708D0001 for ; Wed, 14 May 2025 19:43:46 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 31D02E2CC8 for ; Wed, 14 May 2025 23:43:48 +0000 (UTC) X-FDA: 83443143336.01.EE72979 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) by imf11.hostedemail.com (Postfix) with ESMTP id 68AD040003 for ; Wed, 14 May 2025 23:43:46 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=dyVwI1Xn; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf11.hostedemail.com: domain of 3sSolaAsKCOIEGOIVPIcXRKKSSKPI.GSQPMRYb-QQOZEGO.SVK@flex--ackerleytng.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3sSolaAsKCOIEGOIVPIcXRKKSSKPI.GSQPMRYb-QQOZEGO.SVK@flex--ackerleytng.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747266226; a=rsa-sha256; cv=none; b=kT81UQnYmAL5TGnW+IzkyI/zK83X3MLFPzGzEDtrIvqOl0bpUX1gV1aT2ookuQzq2H2zJ0 SKyAaXgQDQVsQeEpetzarQnyrj1X0In2nmxT+KLRbNPT6WrGUg83iRqWHr3Ykh2ufZnqJ3 zdoYRMHS91fJvfh0PjcKhoLfmEuolD4= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=dyVwI1Xn; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf11.hostedemail.com: domain of 3sSolaAsKCOIEGOIVPIcXRKKSSKPI.GSQPMRYb-QQOZEGO.SVK@flex--ackerleytng.bounces.google.com designates 209.85.216.74 as permitted sender) smtp.mailfrom=3sSolaAsKCOIEGOIVPIcXRKKSSKPI.GSQPMRYb-QQOZEGO.SVK@flex--ackerleytng.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747266226; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=n2xHpbJgtJxOVMnodYqV0AgaR/C3WrhDv288edrMISE=; b=YoyYnD2CFUUuxKkeqXVhrGfwIsdkcMtSvmPc52akDNwkHvknu25OvM0tESJTLGmpZcQHYj kgAwE0R2+Q0cSvs/ufoovAnz4SjUbaTRtbmxYkWyRGNdJi1D3D6iKS4bvcRXs9lirhSOir QaoVbI7tKVun+OYTxjStJsE+3AreK1U= Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-30ab450d918so524467a91.2 for ; Wed, 14 May 2025 16:43:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1747266225; x=1747871025; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=n2xHpbJgtJxOVMnodYqV0AgaR/C3WrhDv288edrMISE=; b=dyVwI1XnDHIlSqJy5DWev6PoeyvzCuTzOjrQOc+E9+LfyInTFZ24moAgILpjEjZ2zv g33HxIs02iLysQx5ItlniW24I05oKR6r+jJH7X74pGLb8vSGzgvrwZtKAKe0FuoPW8OM HNnud+FUc5jR3aTi0QrUr+Qe+yrhjd1yZcy+bmBbfQOIawhkvqEf1Pily6SqRmG8j87J dmpveBtHHw+/Ni/P+Up9XJtOzexZYmPsnbMrbnm/P/gYICezENcmh9vXXoDBFREhu3vM 8Jb3dQUIGsvxqWaqX15cJGWu/l5JIz0AiwVhe4EX+pne8RgBiOZvvqruQiwZhYmYCCOt e7BQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747266225; x=1747871025; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=n2xHpbJgtJxOVMnodYqV0AgaR/C3WrhDv288edrMISE=; b=KQ4KVftiS4kr2SsGQt4gv8OAKY9v6Qw+n/67jQPumxdvwuqQM2Anz1n4P7gxJ3ms0U SX3jAmJKuaIVOCTLzxWueqJlovkM+DXlTzeqMvwZUpe/sYKKBOxVhtfGt87nUAKpHAzs y3GGzTNMXn1n4ZoGrBDQWRHPiRuDcsNnZ5Dyf3ab7XqJqDLEiGeXZUb/GQvgc5e5mJmv Ki4ZSn5jS60AHdkemfyWk4MEptPMXt8aEg2ayOruGc6ksR7YC4z/2SZGwKsrhhefWP+D KD5aCwTMk6aZ4dn7WJ5JvhbLOeyHFhHOqQK8PMvo8gRg09gL8kIAcLjwZtN/a6TcUm7q +VFg== X-Forwarded-Encrypted: i=1; AJvYcCXau6BeC1oMtiXb5aMHn+/OBFYk8fKA+JXyTbDYSZWYu92WUjLxFa5LBvhEPcqMUh59iVqzlZDgBw==@kvack.org X-Gm-Message-State: AOJu0YxLjdtVwFOHY2y4y7Ueowew7kNzeI3raEx4uUtmEK+VbP3/Rg8J AHV2fs8WTtT/agbyO/WXc0lzJubBrGl1jIoTr3gfy+QEG94O7bTrhZ7aYfD7JQ9DKYvb/48sZpb 9fAPsRe+CDo3XRiCfXCZ56A== X-Google-Smtp-Source: AGHT+IEnxUnflQCwANEToR4+zQJiUqjf1j7XWon+tqwv5PtG2ghVVngVh87NrGZhCVUyi9zCtLfCOzjpKjbtnaQ2Wg== X-Received: from pjn6.prod.google.com ([2002:a17:90b:5706:b0:30a:9720:ea33]) (user=ackerleytng job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:6c6:b0:30e:ee6:6745 with SMTP id 98e67ed59e1d1-30e2e5b6599mr8868127a91.10.1747266225334; Wed, 14 May 2025 16:43:45 -0700 (PDT) Date: Wed, 14 May 2025 16:42:10 -0700 In-Reply-To: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.49.0.1045.g170613ef41-goog Message-ID: <4acb9139318e3ae35d61ed7da9d41db2e328dc40.1747264138.git.ackerleytng@google.com> Subject: [RFC PATCH v2 31/51] KVM: x86: Set disallow_lpage on base_gfn and guest_memfd pgoff misalignment From: Ackerley Tng To: kvm@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, x86@kernel.org, linux-fsdevel@vger.kernel.org Cc: ackerleytng@google.com, aik@amd.com, ajones@ventanamicro.com, akpm@linux-foundation.org, amoorthy@google.com, anthony.yznaga@oracle.com, anup@brainfault.org, aou@eecs.berkeley.edu, bfoster@redhat.com, binbin.wu@linux.intel.com, brauner@kernel.org, catalin.marinas@arm.com, chao.p.peng@intel.com, chenhuacai@kernel.org, dave.hansen@intel.com, david@redhat.com, dmatlack@google.com, dwmw@amazon.co.uk, erdemaktas@google.com, fan.du@intel.com, fvdl@google.com, graf@amazon.com, haibo1.xu@intel.com, hch@infradead.org, hughd@google.com, ira.weiny@intel.com, isaku.yamahata@intel.com, jack@suse.cz, james.morse@arm.com, jarkko@kernel.org, jgg@ziepe.ca, jgowans@amazon.com, jhubbard@nvidia.com, jroedel@suse.de, jthoughton@google.com, jun.miao@intel.com, kai.huang@intel.com, keirf@google.com, kent.overstreet@linux.dev, kirill.shutemov@intel.com, liam.merwick@oracle.com, maciej.wieczor-retman@intel.com, mail@maciej.szmigiero.name, maz@kernel.org, mic@digikod.net, michael.roth@amd.com, mpe@ellerman.id.au, muchun.song@linux.dev, nikunj@amd.com, nsaenz@amazon.es, oliver.upton@linux.dev, palmer@dabbelt.com, pankaj.gupta@amd.com, paul.walmsley@sifive.com, pbonzini@redhat.com, pdurrant@amazon.co.uk, peterx@redhat.com, pgonda@google.com, pvorel@suse.cz, qperret@google.com, quic_cvanscha@quicinc.com, quic_eberman@quicinc.com, quic_mnalajal@quicinc.com, quic_pderrin@quicinc.com, quic_pheragu@quicinc.com, quic_svaddagi@quicinc.com, quic_tsoni@quicinc.com, richard.weiyang@gmail.com, rick.p.edgecombe@intel.com, rientjes@google.com, roypat@amazon.co.uk, rppt@kernel.org, seanjc@google.com, shuah@kernel.org, steven.price@arm.com, steven.sistare@oracle.com, suzuki.poulose@arm.com, tabba@google.com, thomas.lendacky@amd.com, usama.arif@bytedance.com, vannapurve@google.com, vbabka@suse.cz, viro@zeniv.linux.org.uk, vkuznets@redhat.com, wei.w.wang@intel.com, will@kernel.org, willy@infradead.org, xiaoyao.li@intel.com, yan.y.zhao@intel.com, yilun.xu@intel.com, yuzenghui@huawei.com, zhiquan1.li@intel.com Content-Type: text/plain; charset="UTF-8" X-Stat-Signature: ye5n3d9ki6donbcx33awk35mhofnq6he X-Rspam-User: X-Rspamd-Queue-Id: 68AD040003 X-Rspamd-Server: rspam06 X-HE-Tag: 1747266226-142706 X-HE-Meta: U2FsdGVkX1/LtM6+Mw4M88GHUCeWstXuOlN1p8TMkxtSve0YHn+x5yOgn6KQKUn5qlnTs4HgJP1v6mVGE1iC9RsDyE2t1qUN5NzmqMJlikRQneA4fOT7/xl1NNZ3UaHAOTgeQvylRScncrTpO6zTmVqCoLcLha9tZjfTAhK85+b8ONOMq3e8B+S0N6OU38PGRGiQJ/AZ8KtsJmcf7/wQi1e2JvT81BKemhQh0NoH89nfiBAqO64dqZRHhZXktlME9sr8oKxKTD+sFHtbvgpmd5Cokvsk5kyvtsNRfXetCyZnk5A70NJAyYLHxRashvH4NKSsMnsRoxPKw7htzdo/G8A+2hP0wF2po/1KRCFkmxv8/6SpX69FtxIjlb9WzXXtDtmFwEI09QiT3fPoAaqGYsiCdmYz2GB7xEG7W1ogerXfH0GWrWTSo/wPgnnXvT0G2POSN7u58ktRcxnsK8xPzJUyqM4k9Wzxy5SDHmuLE4D+EU6jC3yAfx2+G8wlyG3s/qphS4Og5gV6TLfbx8pHesoPo4HcDwqjEqyiBXTWkMVdjQwRzCIe3xkszAtPZoSUVbyduz46F085u9+hEfaC0BhqL0cWmlVW8glmb8DnMqEvHxSZ/fInz497aZRVzERn90fRwQruMJ4L27YF5IM+MpBe8+yix9vWo/rQDGzE2q9p+Q7VNM/X+sqf8byLRlGZJpPBpoAPQabxllXf3SiBRuTJS8e4ay7wh9oSNFCxaTbl6s2E5JTLbtyGLXFeEE7lpLjNrk99xJstiFyNMiEQB9IhBiUjaCVjcIzkrhGrZ6D+WdKwz4LB5H71SN+AibC9Qze5LHS21tbUao7ZtQEWwF3bOuoh+ndnU7ZhLKCTII1vollGre5sLlnk19Eax/W1MRxarmmI/2BNXHsSoVmFgAkxsdmP2HZxfOFSvp87SslWtqzTTQkPN9O/49FrAeupPatHkrYNG2JGyBuEbot QsIuIzeM 6HpT7bE1iwZhAEovKaGu7Qfgusb7kUHp8yWHDDOSZK9KFoT2qX2wJRXSe2J+gKmnWsW3WUFg0ckg8PfB1xRMmXs3Y9fiiffvE+CQYggjw6TEFwrrsmE5I8UZUzpnwfGWo+Mga96c+qJLrFiMZXeEJmvJsxjYYs8rL+oRS2NQsICVkP6LFd2er+emdHoBRd2JNqCD7XHwYb5+qO7rtwrNNoquXWuJWp4tiydkAwV3RWbUqv5yAadOQ67PfqywHr40OZls6f+qJnuKecgzQY3AugdACvu4bdKt1V/4zXJbbtoh4Lh0YlgRzna8ECbPNbIvsqXOhPY0ONw+W28tykqHkNBjEWRIxwdRJV6NyFVXo1PHwYsMt6+Qd1n9D6B6SD68p3XUd3G9UG0zLjQyH6E7in2NUh3WEoNUdFNbJ8y43eSwOqdyWyhrpEzr2HmWKy8ul9ZWW6nN4wYxHZTAAi3MWaUsXVwiOI3eYdVgtW4nBPa2RDivkWrODVuj4K4H4Ew7G9tAOfozlOXjTl4Tx9ToSQZjT1ktj6WlImmqTJQmhyylXiYHMasUVM8YWWkmiToY3xTeN1gkWYZWfBCChS2Mn4cv4Zk2g9EN8ujzorypmY5SGMs42MpryGKLh7sc9R7vg4LSN4wspvtQhvhFgPawVdtgQU/Army23psHYSo8VsBUovHtPHFkP4k52sfNO22RFNhg3 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: When slot->base_gfn and userspace_addr are not aligned wrt each other, large page support is disabled for the entire memslot. This patch applies the same logic for when slot->base_gfn and gmem.pgoff are not aligned wrt each other. Change-Id: Iab21b8995e77beae6dbadc3b623a1e9e07e6dce6 Signed-off-by: Ackerley Tng --- arch/x86/kvm/x86.c | 53 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 44 insertions(+), 9 deletions(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 12433b1e755b..ee0e3420cc17 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -12950,6 +12950,46 @@ int memslot_rmap_alloc(struct kvm_memory_slot *slot, unsigned long npages) return 0; } +static inline bool kvm_is_level_aligned(u64 value, int level) +{ + return IS_ALIGNED(value, KVM_PAGES_PER_HPAGE(level)); +} + +static inline bool +kvm_should_allow_lpage_for_slot(struct kvm_memory_slot *slot, int level) +{ + bool gfn_and_userspace_addr_aligned; + unsigned long ugfn; + + ugfn = slot->userspace_addr >> PAGE_SHIFT; + + /* + * If addresses are not aligned wrt each other, then large page mapping + * cannot be allowed for the slot since page tables only allow guest to + * host translations to function at fixed levels. + */ + gfn_and_userspace_addr_aligned = + kvm_is_level_aligned(slot->base_gfn ^ ugfn, level); + + /* + * If slot->userspace_addr is 0 (disabled), 0 is always aligned so the + * check is deferred to gmem.pgoff. + */ + if (!gfn_and_userspace_addr_aligned) + return false; + + if (kvm_slot_has_gmem(slot)) { + bool gfn_and_gmem_pgoff_aligned; + + gfn_and_gmem_pgoff_aligned = kvm_is_level_aligned( + slot->base_gfn ^ slot->gmem.pgoff, level); + + return gfn_and_gmem_pgoff_aligned; + } + + return true; +} + static int kvm_alloc_memslot_metadata(struct kvm *kvm, struct kvm_memory_slot *slot) { @@ -12971,7 +13011,6 @@ static int kvm_alloc_memslot_metadata(struct kvm *kvm, for (i = 1; i < KVM_NR_PAGE_SIZES; ++i) { struct kvm_lpage_info *linfo; - unsigned long ugfn; int lpages; int level = i + 1; @@ -12983,16 +13022,12 @@ static int kvm_alloc_memslot_metadata(struct kvm *kvm, slot->arch.lpage_info[i - 1] = linfo; - if (slot->base_gfn & (KVM_PAGES_PER_HPAGE(level) - 1)) + if (!kvm_is_level_aligned(slot->base_gfn, level)) linfo[0].disallow_lpage = 1; - if ((slot->base_gfn + npages) & (KVM_PAGES_PER_HPAGE(level) - 1)) + if (!kvm_is_level_aligned(slot->base_gfn + npages, level)) linfo[lpages - 1].disallow_lpage = 1; - ugfn = slot->userspace_addr >> PAGE_SHIFT; - /* - * If the gfn and userspace address are not aligned wrt each - * other, disable large page support for this slot. - */ - if ((slot->base_gfn ^ ugfn) & (KVM_PAGES_PER_HPAGE(level) - 1)) { + + if (!kvm_should_allow_lpage_for_slot(slot, level)) { unsigned long j; for (j = 0; j < lpages; ++j) -- 2.49.0.1045.g170613ef41-goog