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 E0D77EB64D8 for ; Wed, 14 Jun 2023 14:24:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6BCBC6B0072; Wed, 14 Jun 2023 10:24:32 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6936E6B0074; Wed, 14 Jun 2023 10:24:32 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 582938E0001; Wed, 14 Jun 2023 10:24:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 499696B0072 for ; Wed, 14 Jun 2023 10:24:32 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 19153806A1 for ; Wed, 14 Jun 2023 14:24:32 +0000 (UTC) X-FDA: 80901573984.09.92DA68B Received: from mail-pf1-f173.google.com (mail-pf1-f173.google.com [209.85.210.173]) by imf07.hostedemail.com (Postfix) with ESMTP id 150AA40025 for ; Wed, 14 Jun 2023 14:24:29 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=QFVWHvQ4; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf07.hostedemail.com: domain of isaku.yamahata@gmail.com designates 209.85.210.173 as permitted sender) smtp.mailfrom=isaku.yamahata@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1686752670; 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=OeHuGk36iAi9FOib4LSEuZFMwIiKSgOuCZrmCC6ygDM=; b=CTODdM9EdqSiDGcLEBBuh96IVVzG9tiQJBqcMQBFKwmaQUcovFjKe8ZRQ7NsfeZlM5aoI/ irSTE0mzUBFzn/2piPkphEm6m79PTDgUkRC4oT6tOfbZV9LRggy1CfERhqW2dsRZRv1xvD hkL6Vow81lkD9I1tA4o7nHV6CaX512E= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=QFVWHvQ4; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf07.hostedemail.com: domain of isaku.yamahata@gmail.com designates 209.85.210.173 as permitted sender) smtp.mailfrom=isaku.yamahata@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1686752670; a=rsa-sha256; cv=none; b=aFaaBTcv66kvWwHI7MYZXlPSzoXaTAIrbiGaUWblUrJj/zf2upJwhB4JbBgM8CReITVIO1 Pc6J/JE/hPyqEUaJy1FSnD5fQQHY8gc9wTDNSBaGSc1+RXNavXDJOp6yjoFzc0ADvQP+vt VtHGrvIk5glRkfFKL49zsg0Mbj9HPTM= Received: by mail-pf1-f173.google.com with SMTP id d2e1a72fcca58-651e298be3fso7042605b3a.2 for ; Wed, 14 Jun 2023 07:24:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686752669; x=1689344669; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=OeHuGk36iAi9FOib4LSEuZFMwIiKSgOuCZrmCC6ygDM=; b=QFVWHvQ4FVT4k/YpETceISLCQLKSRQLGXyiPykxrKYX7KOYnDwTGAVh15Gr7cN4Gvo 8G7VeSRCWGuCAFZphJp9YUsMGb2LYzbA+o7fD/pXjmdiN2Wvm5Wb9Ol13xQhIw3e2ucM LAI4NEIJ6/d60vVlv0qvKzX53o+BS/wDAIZFmLy49cFFPGFABrjrbAxZTjP8B+LCOhQ/ Ang+dAMFLtN5MMv7n/hhb1w4iNGBIVfmCB33E9zius7nO3FsETszUVg5DIzIBeYeEWmA dbsDDwoSoejiXKpS9l7wTDaflW30K+KejUncLBeBeaUfYLXYeqvalqjrReooPKPYFjDe RL7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686752669; x=1689344669; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=OeHuGk36iAi9FOib4LSEuZFMwIiKSgOuCZrmCC6ygDM=; b=Ei8c2mcDvAC4ZxadQ+nP7xKg8l6yXVwr1vSAI84djSRLBWnZey1TASuLWbkIM+YRFC T7q0uzbw/OlSsImmilOETWhHiTY3hPCV5U3eOJ4CVZ9XBM64RLKbto3ANse3nGPP7O7x rm93WegWUV+Jedi/Fl5tcfd0JqFrBcHGjnGMPkZiCSgqq9ODyHqvtkSFbtiMAQUdae8u 8JJuw7BYVDvH3HLxqgn6M0VwTRHZpGeP4vi+C+U5Urm3dFMJk08ZrpDtsBKd3MGgLKEE 8YmCRyCxidRNe5u8V5oyviPTeM5drl4EaqeuNJ6r3lQlghEsYHHTrwrlLii7YnKaVi/2 Zh1w== X-Gm-Message-State: AC+VfDykh2kCsbU3SASCFqRwvjDQO9fFKv9kGfIcsn1x2RdHm6eami4g ep0DdYsIYMO4rvngvArbjgc= X-Google-Smtp-Source: ACHHUZ5XuSVorTt0n5Kbv+qYZgeGRCldqLkkmHj+Fft0QsEK+SkVoy/Fm/1ZGl+VFauor6vJg0+xCw== X-Received: by 2002:a05:6a20:72ac:b0:10c:2349:459d with SMTP id o44-20020a056a2072ac00b0010c2349459dmr2242690pzk.11.1686752668433; Wed, 14 Jun 2023 07:24:28 -0700 (PDT) Received: from localhost ([192.55.54.50]) by smtp.gmail.com with ESMTPSA id l7-20020a62be07000000b0063b7f3250e9sm10418609pff.7.2023.06.14.07.24.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jun 2023 07:24:27 -0700 (PDT) Date: Wed, 14 Jun 2023 07:24:26 -0700 From: Isaku Yamahata To: Michael Roth Cc: kvm@vger.kernel.org, linux-coco@lists.linux.dev, linux-mm@kvack.org, linux-crypto@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, mingo@redhat.com, jroedel@suse.de, thomas.lendacky@amd.com, hpa@zytor.com, ardb@kernel.org, pbonzini@redhat.com, seanjc@google.com, vkuznets@redhat.com, jmattson@google.com, luto@kernel.org, dave.hansen@linux.intel.com, slp@redhat.com, pgonda@google.com, peterz@infradead.org, srinivas.pandruvada@linux.intel.com, rientjes@google.com, dovmurik@linux.ibm.com, tobin@ibm.com, bp@alien8.de, vbabka@suse.cz, kirill@shutemov.name, ak@linux.intel.com, tony.luck@intel.com, marcorr@google.com, sathyanarayanan.kuppuswamy@linux.intel.com, alpergun@google.com, dgilbert@redhat.com, jarkko@kernel.org, ashish.kalra@amd.com, nikunj.dadhania@amd.com, liam.merwick@oracle.com, zhi.a.wang@intel.com, isaku.yamahata@gmail.com Subject: Re: [PATCH RFC v9 03/51] KVM: x86: Use full 64-bit error code for kvm_mmu_do_page_fault Message-ID: <20230614142426.GQ2244082@ls.amr.corp.intel.com> References: <20230612042559.375660-1-michael.roth@amd.com> <20230612042559.375660-4-michael.roth@amd.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20230612042559.375660-4-michael.roth@amd.com> X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: 150AA40025 X-Stat-Signature: i4duzpcyhu7dhaenjj3e67tmker6pear X-Rspam-User: X-HE-Tag: 1686752669-142938 X-HE-Meta: U2FsdGVkX19l7jEFyjEwiBP+i/T23KQu6/SQtbwoLnO3RujTXAaC43rjUHI4iGlfm9hDIKvW3E2nX6AV0ilwZ+awcgJIM/z3AA2ggoMCC979D2cOA6eXCgxezN3VgNOeqtF2Zei8egpQV0rYmh8/EZFegNWX198lxiSTmsg/NI5dtjfoG+6gcDmiESbTOtHwCn6rpoyh4EWupsY/hRAu7QSfy0aTkhe+KUq8AZo6n+4fV7rh7QX7bukCDtPLh2vn1l27lOmj4nqsuIWqAwbQjoCXUcaR2LGfpoGYPgNh4A2yl6QGMTZsOwnMZCW9Wm/FVDOyYhNrU6EGimzh+6wCr8URPm8nhHVWKtpp37knq8JlkXxrsfbntWFJxVK0iHvX9LI1jOgac6EEguaEKPXnbK+tH5Yyhmq1+NA0fW+7Ae8W9LwO9fuQFhBN6J5EO35eLnV/hj7EXifbOpSJf/UD/Z49GXNvhKF29jWVhcfqjgDmNCfaDnK1iZmO26MwkzBpSIzoux1Aks2W6cuCnZWW5nut68pj5cO5xcr0e7qUJN5Z52W+wICEDvKzML8xiBuFlqXJUPJcutsZQMN7yjiF9Vmg9W+yOfLv3z8NE1Kqn+kXwx//9zS4XLGBd6xed0J7hxAcMYYZxSHjmDar9XWpGrk0Dh+K3J0BvicK6ySxxqwApwE/5TmbzF+solACj8T8WXRmfK/hWStGzjeQaySa6bJmPiq04vBCQs7GL5AJepfKvJjkRZFxYH8ON90wOJkGwPFRQD2LxTfpLCdZAOC2iLdfo6MRxI3l1elTAd4/9rVsuS6EsU8OruqoCcoxPa7mHGclFaXxYL6kOptTHJubAuet5JVJ2SDyfR2dGljiNcEVPxLdRwnUQYJDHeWqisMS4pt+f62ehV54vPN1owobPELVCLWSqeCcgXto6Uq03n60+9wIzAmQKajWiD13kRh6QmgECzyS261e297T0/0 pLRLr1f/ LJIT9JKYaZO4wuN1ZMfJUB1qdm9hkeY/B77TZkhqi0y0VYVH8RD4TIrEmsceuYqc3RG4kCf5T93cPiFew187RO3yd2u5HhPZhbSb3UKmvQVlofXi6G+g64uFi7RZBC9DI/OytYWCyCINEA81+9RIptwGSCNEiTjzqUoSnFboQvWTmmpq1eEjUiQdPjBwnvMwhdbHYWiIIa0EXlQG86SgaFY8u+ETeRyx6KI4i42XIMqLmly8/2WzPw3i4PezwjLWNXpPn1s2z5CU+EEOdvUNf4PyE7DAAxh3rEshkELqJ0Xru7yv2MUNw2TaU4vmMDfCd5jj0qNAF1xYS1lWosRHBKTZL03d0vdn0V8WmRyPR7ZUHGp525snIFFxpv6STRZYPIW4isbaskk8UdShxxiqCS8WwJ/UcNxOKKHXnRDicwlgbMiIzMB2M8Ro1qTn4Qz23ZoWdGc75ZBrSQGvTmUE4mSaY1GmQWXaCiABPjPLgKn3xk8wuoxPmWzcU/q2eMQ7FEfHrjoqmlR4n+ipA8HjwnEAYLVcYQtWSN3OvRn/4XW0WF4V00b/VkcfewNFiiwyFG+oprO9kyckhMg5ymjUWkZhHvpboeRf+DSGnVczXkzJEZeI= 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: On Sun, Jun 11, 2023 at 11:25:11PM -0500, Michael Roth wrote: > The upper bits will be needed in some cases to distinguish between > nested page faults for private/shared pages, so pass along the full > 64-bit value. > > Signed-off-by: Michael Roth > --- > arch/x86/kvm/mmu/mmu.c | 3 +-- > arch/x86/kvm/mmu/mmu_internal.h | 4 ++-- > 2 files changed, 3 insertions(+), 4 deletions(-) > > diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c > index c54672ad6cbc..0d3983b9aa7e 100644 > --- a/arch/x86/kvm/mmu/mmu.c > +++ b/arch/x86/kvm/mmu/mmu.c > @@ -5829,8 +5829,7 @@ int noinline kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, u64 err > } > > if (r == RET_PF_INVALID) { > - r = kvm_mmu_do_page_fault(vcpu, cr2_or_gpa, > - lower_32_bits(error_code), false, > + r = kvm_mmu_do_page_fault(vcpu, cr2_or_gpa, error_code, false, > &emulation_type); > if (KVM_BUG_ON(r == RET_PF_INVALID, vcpu->kvm)) > return -EIO; > diff --git a/arch/x86/kvm/mmu/mmu_internal.h b/arch/x86/kvm/mmu/mmu_internal.h > index f1786698ae00..780b91e1da9f 100644 > --- a/arch/x86/kvm/mmu/mmu_internal.h > +++ b/arch/x86/kvm/mmu/mmu_internal.h > @@ -283,11 +283,11 @@ enum { > }; > > static inline int kvm_mmu_do_page_fault(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, > - u32 err, bool prefetch, int *emulation_type) > + u64 err, bool prefetch, int *emulation_type) > { > struct kvm_page_fault fault = { > .addr = cr2_or_gpa, > - .error_code = err, > + .error_code = lower_32_bits(err), > .exec = err & PFERR_FETCH_MASK, > .write = err & PFERR_WRITE_MASK, > .present = err & PFERR_PRESENT_MASK, > -- > 2.25.1 Hi. I'd like to pass around 64bit for TDX and come up with the following one. Does it work for you? >From 53273b67e9be09129d35ac00cf9ce739d3fb4e2c Mon Sep 17 00:00:00 2001 Message-Id: <53273b67e9be09129d35ac00cf9ce739d3fb4e2c.1686752340.git.isaku.yamahata@intel.com> From: Isaku Yamahata Date: Fri, 17 Mar 2023 12:58:42 -0700 Subject: [PATCH] KVM: x86/mmu: Pass round full 64-bit error code for the KVM page fault In some cases the full 64-bit error code for the KVM page fault will be needed to make this determination, so also update kvm_mmu_do_page_fault() to accept the full 64-bit value so it can be plumbed through to the callback. The upper 32 bits of error code is discarded at kvm_mmu_page_fault() by lower_32_bits(). Now it's passed down as full 64 bits. It turns out that only FNAME(page_fault) depends on it. Move lower_32_bits() into FNAME(page_fault). The accesses of fault->error_code are as follows - FNAME(page_fault): change to explicitly use lower_32_bits() - kvm_tdp_page_fault(): explicit mask with PFERR_LEVEL_MASK - kvm_mmu_page_fault(): explicit mask with PFERR_RSVD_MASK, PFERR_NESTED_GUEST_PAGE - mmutrace: changed u32 -> u64 - pgprintk(): change %x -> %llx Signed-off-by: Isaku Yamahata --- arch/x86/kvm/mmu.h | 2 +- arch/x86/kvm/mmu/mmu.c | 7 +++---- arch/x86/kvm/mmu/mmu_internal.h | 4 ++-- arch/x86/kvm/mmu/mmutrace.h | 2 +- arch/x86/kvm/mmu/paging_tmpl.h | 4 ++-- 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/arch/x86/kvm/mmu.h b/arch/x86/kvm/mmu.h index 6cc2558e977d..b6c9c2e27d0b 100644 --- a/arch/x86/kvm/mmu.h +++ b/arch/x86/kvm/mmu.h @@ -176,7 +176,7 @@ static inline void kvm_mmu_refresh_passthrough_bits(struct kvm_vcpu *vcpu, } kvm_pfn_t kvm_mmu_map_tdp_page(struct kvm_vcpu *vcpu, gpa_t gpa, - u32 error_code, int max_level); + u64 error_code, int max_level); /* * Check if a given access (described through the I/D, W/R and U/S bits of a diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 2c6d9d8d2c10..e4457eaa10a9 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -4941,7 +4941,7 @@ static int direct_page_fault(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault static int nonpaging_page_fault(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault) { - pgprintk("%s: gva %llx error %x\n", __func__, fault->addr, fault->error_code); + pgprintk("%s: gva %llx error %llx\n", __func__, fault->addr, fault->error_code); /* This path builds a PAE pagetable, we can map 2mb pages at maximum. */ fault->max_level = PG_LEVEL_2M; @@ -5062,7 +5062,7 @@ int kvm_tdp_page_fault(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault) } kvm_pfn_t kvm_mmu_map_tdp_page(struct kvm_vcpu *vcpu, gpa_t gpa, - u32 error_code, int max_level) + u64 error_code, int max_level) { int r; struct kvm_page_fault fault = (struct kvm_page_fault) { @@ -6317,8 +6317,7 @@ int noinline kvm_mmu_page_fault(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, u64 err } if (r == RET_PF_INVALID) { - r = kvm_mmu_do_page_fault(vcpu, cr2_or_gpa, - lower_32_bits(error_code), false, + r = kvm_mmu_do_page_fault(vcpu, cr2_or_gpa, error_code, false, &emulation_type); if (KVM_BUG_ON(r == RET_PF_INVALID, vcpu->kvm)) return -EIO; diff --git a/arch/x86/kvm/mmu/mmu_internal.h b/arch/x86/kvm/mmu/mmu_internal.h index 2d8a5df56f20..979fd7c26610 100644 --- a/arch/x86/kvm/mmu/mmu_internal.h +++ b/arch/x86/kvm/mmu/mmu_internal.h @@ -342,7 +342,7 @@ static inline bool is_nx_huge_page_enabled(struct kvm *kvm) struct kvm_page_fault { /* arguments to kvm_mmu_do_page_fault. */ const gpa_t addr; - const u32 error_code; + const u64 error_code; const bool prefetch; /* Derived from error_code. */ @@ -437,7 +437,7 @@ enum { }; static inline int kvm_mmu_do_page_fault(struct kvm_vcpu *vcpu, gpa_t cr2_or_gpa, - u32 err, bool prefetch, int *emulation_type) + u64 err, bool prefetch, int *emulation_type) { struct kvm_page_fault fault = { .addr = cr2_or_gpa, diff --git a/arch/x86/kvm/mmu/mmutrace.h b/arch/x86/kvm/mmu/mmutrace.h index 2d7555381955..2e77883c92f6 100644 --- a/arch/x86/kvm/mmu/mmutrace.h +++ b/arch/x86/kvm/mmu/mmutrace.h @@ -261,7 +261,7 @@ TRACE_EVENT( TP_STRUCT__entry( __field(int, vcpu_id) __field(gpa_t, cr2_or_gpa) - __field(u32, error_code) + __field(u64, error_code) __field(u64 *, sptep) __field(u64, old_spte) __field(u64, new_spte) diff --git a/arch/x86/kvm/mmu/paging_tmpl.h b/arch/x86/kvm/mmu/paging_tmpl.h index d87f95245ee9..8aeafd9178ac 100644 --- a/arch/x86/kvm/mmu/paging_tmpl.h +++ b/arch/x86/kvm/mmu/paging_tmpl.h @@ -758,7 +758,7 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault struct guest_walker walker; int r; - pgprintk("%s: addr %llx err %x\n", __func__, fault->addr, fault->error_code); + pgprintk("%s: addr %llx err %llx\n", __func__, fault->addr, fault->error_code); WARN_ON_ONCE(fault->is_tdp); /* @@ -767,7 +767,7 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, struct kvm_page_fault *fault * The bit needs to be cleared before walking guest page tables. */ r = FNAME(walk_addr)(&walker, vcpu, fault->addr, - fault->error_code & ~PFERR_RSVD_MASK); + lower_32_bits(fault->error_code) & ~PFERR_RSVD_MASK); /* * The page is not mapped by the guest. Let the guest handle it. -- 2.25.1 -- Isaku Yamahata