Received-SPF: pass (google.com: domain of linux-kernel+bounces-99720-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223;
Message-ID: <e3953db8-b081-454e-bda1-5ad458044f43@intel.com>
Date: Tue, 12 Mar 2024 14:21:43 +1300
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH 06/21] KVM: x86/mmu: Track shadow MMIO value on a per-VM
 basis
To: Paolo Bonzini <pbonzini@redhat.com>, <linux-kernel@vger.kernel.org>,
	<kvm@vger.kernel.org>
CC: <seanjc@google.com>, <michael.roth@amd.com>, <isaku.yamahata@intel.com>,
	<thomas.lendacky@amd.com>
References: <20240227232100.478238-1-pbonzini@redhat.com>
 <20240227232100.478238-7-pbonzini@redhat.com>
Content-Language: en-US
From: "Huang, Kai" <kai.huang@intel.com>
In-Reply-To: <20240227232100.478238-7-pbonzini@redhat.com>
Content-Type: text/plain; charset="UTF-8"; format=flowed
Content-Transfer-Encoding: 7bit
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?QnJSNFcxSk96bTh3N3IxZHdaVmxRQStka25PQzIyVU4vazNGSHRsVUtyOE1w?=
 =?utf-8?B?Q0xkZ3U2eDNURHFnK1h4a21CU3F5OXVnZ1ZnYTd0T29GN0lDVGRZcytEeW5D?=
 =?utf-8?B?SUgwOGdtV2E2aWtOYXU2UCtlQ0NZKzJ5ZlJEbGFrdk8xSkR1MzNXRFVhc2hr?=
 =?utf-8?B?NGhrREhrNzZWUVZxMTU3Z01jNGM1QkZqbGFiMzJaMEwycjFJVERaZnVqUjJ5?=
 =?utf-8?B?YTVLMmc5Q0s0RFZaSjRRenRGOWU3QjJqTUlvcWNXYjNoZG1vaG8xZnlrdERv?=
 =?utf-8?B?eXRGT3pLRnBrWFd2Y0d1eVdHNkdtSU1GWGNlZWkrS2wrRzJZbnA3U3RyOW1q?=
 =?utf-8?B?NFNFVStYV0w5SWpLa3FrSXhqZlU4NmllT2RrNGZwV0NJMWhLSmp0Q29jdUUr?=
 =?utf-8?B?ZG5xeGRjUDI3SUp6blU1a1lmVjFzNTJHeEo0UnZDVXoyVzRsQnN0RzRya2hY?=
 =?utf-8?B?UUQ3dVhFbENhZnRxNCtjd1FwTnBsRG5IVlhFdHpET3Z6OGMwMzQ5L1BvV0dG?=
 =?utf-8?B?OW9jYWQxVXRhSVF6eERMdGRoSVlBYXMxTTdFbUdRdzI2cEErUTBIWjJQNWpw?=
 =?utf-8?B?K0VIZUtZSEVLSkVueWMxQmF2aHR5K0VjczJCRUcyaW9ERFRJb1dtWDNHOURw?=
 =?utf-8?B?cjhuU1ZHbGtUbUxQTTFyd3VHVzhZSWRZOXRCSFdwMjdNT0EwY1RlcHRDSzll?=
 =?utf-8?B?ekxUU0RHV25GUSsrUzE3TzJuRHpCbVZiRXBtYndYOEQwVkhGcWJjVXo4eHM3?=
 =?utf-8?B?TXlYaDVUdnNQYlhjVkpnVElZbk54L3UvNy9FckdXSVVtaXl5L3pXaW9YZmgx?=
 =?utf-8?B?NWZmMGpNTkdYZUtkYjMyRzFrUlFRRENidFZKaHNCRjM4UFZEWTIyWXNjdlFK?=
 =?utf-8?B?SlNUa205UkhJL1BQdGdGL1dPb28wQy96ZFJpUGJnSUtZVmpuQjMrT3lwbFMx?=
 =?utf-8?B?a1Q1a1hvZGNRM1lOaWpUZkV4YlEzS1hTdlBZMDhhL2MxMUNMbE5Da3lHRjVG?=
 =?utf-8?B?NVhNekN2TW4wL1M4UVdtaVFTNFI1UVRJbDFmZkZoTU9HVTU4aFZydCs4Y2xJ?=
 =?utf-8?B?SWlMYlYwMFJySW5RZW14MTNuaWNPU1NpZFFTOFgweTQrejlMMVh2RXJUYUFH?=
 =?utf-8?B?U1M4dXE4dmtLRWJkc0JPa2pydzdCWWxFMUx3eHIxNjArUmNraFhmUm9kL3F1?=
 =?utf-8?B?S2NqR2h4MitCbHBVK0xEQ0NhUEhoTVRyc1JTSFBEQmt4V2wxWEd1aEtRTzVl?=
 =?utf-8?B?dG1ldys0NDdINFJMYkVqQ0MvUnFYNjdTbG5VL25aTmNBblpxODlBMnl6RnlY?=
 =?utf-8?B?RUtid3JyTE5SV1c2UG45OHU0Ump0VEt2aFo2NHVUOGNxZXFYMXB6YXhnSmda?=
 =?utf-8?B?ZFg0RVkvSmVUSVVCcWE5WU1oa1Q4Yzd1NGhwVCtlVjZSNzFKcWVlUk91K2xC?=
 =?utf-8?B?TlpLbW0rL1FWbmpnWEJISDlqRngwK2tGaEdTbVh3d24vdE12M1Q1YTZSTDZv?=
 =?utf-8?B?cHhpdXhQejRCdXpZZi93Vm5ibUEzTnlNOCtZUDlWYStreXB3ZU1xbXcySmhu?=
 =?utf-8?B?NlBCS1V6VHl5eVF4a3FlMEp1WUtVN1BTcEMxQ3VzeWlONC9xU3kzR05JaWpx?=
 =?utf-8?B?QVVkQmhIZ0lrTzBhR2lsemFtSVZZUXhOQnh4Y0lSMzUwTEFsaDBKV2FVNUlv?=
 =?utf-8?B?d3JveVJpS3dINXdvT05PSFdDa1pvdkRkaGtUSjdpbnNqT283aE52RlRMbHhK?=
 =?utf-8?B?NW5aVFhFYjVOZjJIZHlmVWM5WHhpeVFMM3Vmb1FzQnVHeHEreGNNNlRVc2E2?=
 =?utf-8?B?TCt2SWRxMW0wcHBSbUxIeG13TDh3ZFJlcFpTUFZ6RHFDUnZBWTQ0MkxXSENV?=
 =?utf-8?B?cVRYWUt0QUlXOWczekpqYkxURS9GK3M1dHI5RVZYUVZsS29HSytuUU1RSmxV?=
 =?utf-8?B?WGVDZ215bUJSVFRjWGp1ZUxDMlhFMDF5YXlxN256UFgxV3FMMlRFRUg0bmJU?=
 =?utf-8?B?VW5qMmZyYTVUUllFNlA4NUNqMkRuQ0NvQy81c2ZLTWU0Z05FYWI1RWR6WTNM?=
 =?utf-8?B?enpybVhDVWZmTGNiM25CNzlHZFBhdERQUGRmSVZ3ZHpta1FvL3d3bis1RjVp?=
 =?utf-8?Q?jIgjx0DI3hjgVfGm8h4QxC+lb?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 4bf79df9-cf0f-45be-3fe2-08dc4232cc0c
X-MS-Exchange-CrossTenant-AuthSource: BL1PR11MB5978.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Mar 2024 01:21:52.0449
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: JyrrIUa0ImKEXsP+mSRkoouliCsOax8IKnlqPC558gkGTp+zpjVdaps9leFNJKHlt3k8ORzkUpHcbcwsGzTDNA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA2PR11MB4908
X-OriginatorOrg: intel.com


On 28/02/2024 12:20 pm, Paolo Bonzini wrote:
> From: Sean Christopherson <seanjc@google.com>
> 
> TDX will use a different shadow PTE entry value for MMIO from VMX.  Add > members to kvm_arch and track value for MMIO per-VM instead of global
"members" -> "member".

> variables.  

"variables" -> "variable".

By using the per-VM EPT entry value for MMIO, the existing VMX
> logic is kept working.  Introduce a separate setter function so that guest
> TD can override later.

"guest TD can override " -> "KVM can override for TDX guest".

> 
> Signed-off-by: Sean Christopherson <seanjc@google.com>
> Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
> Message-Id: <229a18434e5d83f45b1fcd7bf1544d79db1becb6.1705965635.git.isaku.yamahata@intel.com>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>   arch/x86/include/asm/kvm_host.h |  2 ++
>   arch/x86/kvm/mmu.h              |  1 +
>   arch/x86/kvm/mmu/mmu.c          |  8 +++++---
>   arch/x86/kvm/mmu/spte.c         | 10 ++++++++--
>   arch/x86/kvm/mmu/spte.h         |  4 ++--
>   arch/x86/kvm/mmu/tdp_mmu.c      |  6 +++---
>   6 files changed, 21 insertions(+), 10 deletions(-)
> 
> diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
> index 85dc0f7d09e3..a4514c2ef0ec 100644
> --- a/arch/x86/include/asm/kvm_host.h
> +++ b/arch/x86/include/asm/kvm_host.h
> @@ -1313,6 +1313,8 @@ struct kvm_arch {
>   	 */
>   	spinlock_t mmu_unsync_pages_lock;
>   
> +	u64 shadow_mmio_value;
> +
>   	struct iommu_domain *iommu_domain;
>   	bool iommu_noncoherent;
>   #define __KVM_HAVE_ARCH_NONCOHERENT_DMA
> diff --git a/arch/x86/kvm/mmu.h b/arch/x86/kvm/mmu.h
> index 60f21bb4c27b..2c54ba5b0a28 100644
> --- a/arch/x86/kvm/mmu.h
> +++ b/arch/x86/kvm/mmu.h
> @@ -101,6 +101,7 @@ static inline u8 kvm_get_shadow_phys_bits(void)
>   }
>   
>   void kvm_mmu_set_mmio_spte_mask(u64 mmio_value, u64 mmio_mask, u64 access_mask);
> +void kvm_mmu_set_mmio_spte_value(struct kvm *kvm, u64 mmio_value);
>   void kvm_mmu_set_me_spte_mask(u64 me_value, u64 me_mask);
>   void kvm_mmu_set_ept_masks(bool has_ad_bits, bool has_exec_only);
>   
> diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c
> index b5baf11359ad..195e46a1f00f 100644
> --- a/arch/x86/kvm/mmu/mmu.c
> +++ b/arch/x86/kvm/mmu/mmu.c
> @@ -2515,7 +2515,7 @@ static int mmu_page_zap_pte(struct kvm *kvm, struct kvm_mmu_page *sp,
>   				return kvm_mmu_prepare_zap_page(kvm, child,
>   								invalid_list);
>   		}
> -	} else if (is_mmio_spte(pte)) {
> +	} else if (is_mmio_spte(kvm, pte)) {
>   		mmu_spte_clear_no_track(spte);
>   	}
>   	return 0;
> @@ -4197,7 +4197,7 @@ static int handle_mmio_page_fault(struct kvm_vcpu *vcpu, u64 addr, bool direct)
>   	if (WARN_ON_ONCE(reserved))
>   		return -EINVAL;
>   
> -	if (is_mmio_spte(spte)) {
> +	if (is_mmio_spte(vcpu->kvm, spte)) {
>   		gfn_t gfn = get_mmio_spte_gfn(spte);
>   		unsigned int access = get_mmio_spte_access(spte);
>   
> @@ -4813,7 +4813,7 @@ EXPORT_SYMBOL_GPL(kvm_mmu_new_pgd);
>   static bool sync_mmio_spte(struct kvm_vcpu *vcpu, u64 *sptep, gfn_t gfn,
>   			   unsigned int access)
>   {
> -	if (unlikely(is_mmio_spte(*sptep))) {
> +	if (unlikely(is_mmio_spte(vcpu->kvm, *sptep))) {
>   		if (gfn != get_mmio_spte_gfn(*sptep)) {
>   			mmu_spte_clear_no_track(sptep);
>   			return true;
> @@ -6320,6 +6320,8 @@ static bool kvm_has_zapped_obsolete_pages(struct kvm *kvm)
>   
>   void kvm_mmu_init_vm(struct kvm *kvm)
>   {
> +
> +	kvm->arch.shadow_mmio_value = shadow_mmio_value;

Unintended blank line.

[...]

Acked-by: Kai Huang <kai.huang@intel.com>