From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 7596B39524E for ; Fri, 26 Jun 2026 17:46:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782495997; cv=none; b=I9TO96P+wBvVwYSIUSKDNpZMhRKn5QySVfLmaivpAhs2sYmck/pRIV6wZcfoqj7TxBHrR+co6e8Tu+Z2Q3UM+SQriJaKbiCM4xq4w0YOOxELKFVR9lzMRU66KzzRZGCh5KKMzjY07MxHaBZCy9bOxDJHSci59mKj6yuuGU1U+V0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1782495997; c=relaxed/simple; bh=b8QVOIKLan9yq832oH2Egu6sdAJpbT6DrHtWhrkgxBI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lEgJGGtYQZujeN4Z+SdSifSuoHiqjn2GICLVqMNmwXPg/u6mHuOv1OUbz7SB6LhQAb69k2ly3oyx/cHIouivTFqNWFX6w+9gtS2pWZscOdXqfg9FRW5CDe8hdP55LfppArN+fTePNE2l4HX3ooy8VUy8qhmT7DkZTMDzkny7Lvs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=FDWydgTd; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=ViPa65Vf; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="FDWydgTd"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="ViPa65Vf" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1782495989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=UMU4Vfx0eRb3lQlGhmviCet5Divd/GCVj5w0pP3Lgu4=; b=FDWydgTd0Q6G5z07eUI+VLDWuhbjNJDNjZNu/F2KVVq3Mxiqg/9OIEmbbIxrEZ2QXBaFLL OEmmBgL8M/svMVQCLBBM+DqAIMoWMx56tS5O1rof2M+kpjtnJa716M9w1hqZHmVL44ublo alqnmjPWC4Q8g2ihkZoR6rBVwpuAo9o= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-544-fzwTP20CO4qFeJQD3I7CiQ-1; Fri, 26 Jun 2026 13:46:28 -0400 X-MC-Unique: fzwTP20CO4qFeJQD3I7CiQ-1 X-Mimecast-MFC-AGG-ID: fzwTP20CO4qFeJQD3I7CiQ_1782495987 Received: by mail-wm1-f70.google.com with SMTP id 5b1f17b1804b1-4927023fb36so1885605e9.1 for ; Fri, 26 Jun 2026 10:46:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1782495987; x=1783100787; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=UMU4Vfx0eRb3lQlGhmviCet5Divd/GCVj5w0pP3Lgu4=; b=ViPa65Vfy5xZZZ5o4M4PCbQlCW7iMDRcE/GKJrmE6Cj45Kp2Pgv7D5hpjVSdN4wGBJ BxdGMPXkAzkARDPIYU1Lrpy0oxqdT8xn0iz5nMxjJaLuXFcEwPlUCO/riJPiOwQVa1Iw o8EBZ908/7JMNYTG5EYt8RSZ2e3FiQGPb19VPoXMJQZQYVCPC1GIqi1BFj+ArkzFw89X O7yswohCpA4V5chBCLTudQ1nQImhiNZSx+xuffiUxZ4CHrHS0gMywylUElXqfHfBFi/f pN1gildh2ZJYwIHkz/qdtq+EcsySjNGFCQjYdXGTj+CsvzTk0Bf+RxeXpNGJlmCjV9ui iOYg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1782495987; x=1783100787; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=UMU4Vfx0eRb3lQlGhmviCet5Divd/GCVj5w0pP3Lgu4=; b=CoNB2D0D/p2SjwUC2U2ypTSqSBcsD/VFiIxj3hUG4HljvLb8ns1dMceT7BSovTtOKr zQrGd7m7GTAjg/aqMABEDfrbyKpFQIjvbWubNM5tbCU3sxgE17xb4jjEPkVE01Lr/Q8B uhjuV5y0WCz50Fgnnoy9JTyCJTN9gbX25kkgNLIRB/iYz9o2L/QuNWAQJc7bZa6cY+u+ 92AZ2LyymiquCDxzFB7F/26bnjMvcFRxkcRLJYbfJ+EKYXe5XBEY+cJo4urNMp8yP3Z0 Ci8EzFaZS0EYF4QVaQe5EES9XfSiu7jMtf+KngWALrXtmXvJlNOMrgZzH6qyf5A4zsND vaGQ== X-Gm-Message-State: AOJu0YwIy3eidCJ7rv+/KLwprsm4+Y1YrLri6JbNmLjq25ipW5zvFDxn OQHWw9YHuet8rcWf4qM7xXYFphLJwxpfqs6qoHEyBP6uUleJKCbRl3V3WfhTpqG/+ZKouO90Oee 24YaddGGl9j1ieCdMsQjlVwnwP0/rsDns9t1YV+duvhtwbeLVihk/y1XZOY8NelSzeiFOhV65uj cYtlfmFLDNyj0b6SswxvOObMBnapEKRS0xQkla4teHRjt7VGUsMg== X-Gm-Gg: AfdE7cloQUaZoi8qDAznCzsap5IX6nrjeRj7oxpnHQHPOwFSRs6zZeffM7xmw+G24Ls Ij7sEmdcX6UyH4XtVdLYoEJCakOlJlsYi8lzp7t3CxWTJddbBTyNIHLc2yOdGJJq2/CIJI6xkVi FDXcRmdFapYzNaXI2HgqjpVBfcPw4MuDRYGpXDJdlzKCUyLeUZf9c1S5aATkfSTI1vGVoV/3VVy azf3BExwunGUs9WpMqaoy19dVz362wWlZdYfPhsz2/232GN4O4eq6r6q7sQQnXeBmG3prtCEeyE GA9b1MR+a+YarF48Vt8hVEGfdX3Pz0DoLz6YPPb6bMs/waas3RhLVmoD2JuoK41mrY/yvc9Ezse caVCmOw9PU0gLy/sghziWGNGp4F9B6ZUa+/oSMAuQxbqVq30MVglfzK2bLZpkYNHAhKOZBNRkLD cZL2pWwwm7CjsHi8w1 X-Received: by 2002:a05:600c:a403:b0:490:b2c9:e284 with SMTP id 5b1f17b1804b1-49266899836mr101222335e9.30.1782495987102; Fri, 26 Jun 2026 10:46:27 -0700 (PDT) X-Received: by 2002:a05:600c:a403:b0:490:b2c9:e284 with SMTP id 5b1f17b1804b1-49266899836mr101222125e9.30.1782495986729; Fri, 26 Jun 2026 10:46:26 -0700 (PDT) Received: from [192.168.10.48] ([151.95.124.208]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-49269086ab7sm133015395e9.13.2026.06.26.10.46.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 26 Jun 2026 10:46:26 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org, stable@vger.kernel.org Cc: David Matlack , Lai Jiangshan Subject: [PATCH 5.15.y v2 2/8] KVM: x86/mmu: Stop passing "direct" to mmu_alloc_root() Date: Fri, 26 Jun 2026 19:46:13 +0200 Message-ID: <20260626174620.1819772-3-pbonzini@redhat.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260626174620.1819772-1-pbonzini@redhat.com> References: <20260626174620.1819772-1-pbonzini@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: David Matlack commit 86938ab6925b8fe174ca6abf397e6ea9d3c054a4 upstream. The "direct" argument is vcpu->arch.mmu->root_role.direct, because unlike non-root page tables, it's impossible to have a direct root in an indirect MMU. So just use that. Suggested-by: Lai Jiangshan Signed-off-by: David Matlack Message-Id: <20220516232138.1783324-4-dmatlack@google.com> Signed-off-by: Paolo Bonzini --- arch/x86/kvm/mmu/mmu.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index c03c4341a87f..bd7650380ad9 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -3409,8 +3409,9 @@ static int mmu_check_root(struct kvm_vcpu *vcpu, gfn_t root_gfn) } static hpa_t mmu_alloc_root(struct kvm_vcpu *vcpu, gfn_t gfn, gva_t gva, - u8 level, bool direct) + u8 level) { + bool direct = vcpu->arch.mmu->mmu_role.base.direct; struct kvm_mmu_page *sp; sp = kvm_mmu_get_page(vcpu, gfn, gva, level, direct, ACC_ALL); @@ -3436,7 +3437,7 @@ static int mmu_alloc_direct_roots(struct kvm_vcpu *vcpu) root = kvm_tdp_mmu_get_vcpu_root_hpa(vcpu); mmu->root_hpa = root; } else if (shadow_root_level >= PT64_ROOT_4LEVEL) { - root = mmu_alloc_root(vcpu, 0, 0, shadow_root_level, true); + root = mmu_alloc_root(vcpu, 0, 0, shadow_root_level); mmu->root_hpa = root; } else if (shadow_root_level == PT32E_ROOT_LEVEL) { if (WARN_ON_ONCE(!mmu->pae_root)) { @@ -3448,7 +3449,7 @@ static int mmu_alloc_direct_roots(struct kvm_vcpu *vcpu) WARN_ON_ONCE(IS_VALID_PAE_ROOT(mmu->pae_root[i])); root = mmu_alloc_root(vcpu, i << (30 - PAGE_SHIFT), - i << 30, PT32_ROOT_LEVEL, true); + i << 30, PT32_ROOT_LEVEL); mmu->pae_root[i] = root | PT_PRESENT_MASK | shadow_me_mask; } @@ -3511,7 +3512,7 @@ static int mmu_alloc_shadow_roots(struct kvm_vcpu *vcpu) */ if (mmu->root_level >= PT64_ROOT_4LEVEL) { root = mmu_alloc_root(vcpu, root_gfn, 0, - mmu->shadow_root_level, false); + mmu->shadow_root_level); mmu->root_hpa = root; goto set_root_pgd; } @@ -3557,7 +3558,7 @@ static int mmu_alloc_shadow_roots(struct kvm_vcpu *vcpu) } root = mmu_alloc_root(vcpu, root_gfn, i << 30, - PT32_ROOT_LEVEL, false); + PT32_ROOT_LEVEL); mmu->pae_root[i] = root | pm_mask; } -- 2.54.0