Received-SPF: pass (google.com: domain of linux-kernel+bounces-148043-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Date: Wed, 17 Apr 2024 15:20:55 +0800
From: Chao Gao <chao.gao@intel.com>
To: <isaku.yamahata@intel.com>
CC: <kvm@vger.kernel.org>, <isaku.yamahata@gmail.com>,
	<linux-kernel@vger.kernel.org>, Sean Christopherson <seanjc@google.com>,
	Paolo Bonzini <pbonzini@redhat.com>, Michael Roth <michael.roth@amd.com>,
	David Matlack <dmatlack@google.com>, Federico Parola
	<federico.parola@polito.it>, Kai Huang <kai.huang@intel.com>
Subject: Re: [PATCH v2 06/10] KVM: x86: Implement kvm_arch_vcpu_map_memory()
Message-ID: <Zh94V8ochIXEkO17@chao-email>
References: <cover.1712785629.git.isaku.yamahata@intel.com>
 <7138a3bc00ea8d3cbe0e59df15f8c22027005b59.1712785629.git.isaku.yamahata@intel.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <7138a3bc00ea8d3cbe0e59df15f8c22027005b59.1712785629.git.isaku.yamahata@intel.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/7Namb08ywM8l3GLlMuNcYPbBipqBZ6k/We6OhgcTq1EmV3NhIbnN7aCE3NB?=
 =?us-ascii?Q?IAdHa1RoygE654NiYlJ77VwXFcv/P4Q96vOth9b0hVaD7cmnFJmikYAlJBII?=
 =?us-ascii?Q?C1UoClk930N8MjYDR0Aho9ZkNm2ZZyqFlBCXTkCHHKTQ3LDOo3ugQOfua+28?=
 =?us-ascii?Q?Tg4TVvna1cwpqX1Aaz92S9gSw3fkKCYaDaAu5q1Sb9Di8enOUnyIcoiItplw?=
 =?us-ascii?Q?laE6o3qFegP5gecqMxJ56NAOJH9c11wbPkIrIYsYjD7DlLOuFWa0IPDqxLgG?=
 =?us-ascii?Q?SBnKSQ5XiX1zJTN7SnepKmNEowGZLol9zCQM4+Fb5l8dznDoZ5s70FqJb43b?=
 =?us-ascii?Q?klFYzFOR/8mHfrHebCQrTKEylBddJi+b0eoQbPc+bOfH5RK3RkLah7PwDvTo?=
 =?us-ascii?Q?Dya0evNjRn5N7oPluOtLg3bW1uzjnbUg1RxswVn+slBGBO6HWQXbTe637Dak?=
 =?us-ascii?Q?ogAoDYlqk7AfW1Ej3gyKqNUr7eiruq8IzKkT/c1H49cQYf4ITWJPuDwGmhhP?=
 =?us-ascii?Q?Jgq3rJ7NBSYxIveuXd6g1B7j5Ol6B51nCMc024wsKg4AKhgTO+ctHdm8HJ7d?=
 =?us-ascii?Q?v4Jgh8MnGsqJ46pcB9glzJfQ8blBQ9Fu9rdupO0nyo91NOg5Re5Oxx8C9PZ8?=
 =?us-ascii?Q?oDkk2QR/7uosjHhIPQ88QcIhgiUJPqU+/yuFaNStTjtVGn216vNfZUmzRCeo?=
 =?us-ascii?Q?WNIm4KOOAuaoxCp2sVhaskpCdO+XSbL8JW2JTfYElfevb95V85NqiZXv5LXv?=
 =?us-ascii?Q?hK8WZ6K7C/4pM8Fk85TMBaFQQF0vGufXSaTOob3CdE9boK6oRFYiKDxGLMV7?=
 =?us-ascii?Q?tAsyoV4hWeyiuhycRakNVClFAed/4etK5/ldAkNo+exDcw2TaoCPquIyIl37?=
 =?us-ascii?Q?Q5xkBvAze8i8EzFXU/eSukxZQTcRqa+UM9B7+HPEfROBpKXX7ME1/uecFh2G?=
 =?us-ascii?Q?2MS+cKncbyQlSA9yh0Qx34xVai0wGDqt/zAfnSGUBxwucQN9zocxPXuW9KRv?=
 =?us-ascii?Q?N/JCj+tdw/8AAnSWfGuE3D1cjYdT2BuTDP8tVzCNBcniKckZoNlnOK2D4N37?=
 =?us-ascii?Q?D/XVbYVzvTOzsqW/ePHy6huU9pHWTRf0IneMh2r7Q5XOCt8dPsmkdoFANPsF?=
 =?us-ascii?Q?vHfJ+5c0lUieFkTAfsLJ7r7QKB5L6Q1pM4YKLE2n2O2islJnu3S9+H9ly13+?=
 =?us-ascii?Q?uSZX3N1N36MvOZYOHb9rcEApwBg6cfRRhalJiL2vEfz9iXoixf7BbdYxTRNl?=
 =?us-ascii?Q?5VfdTVIDO6UrwhNS4jSkCbNuaUpChMjvmhvNNvsnrAfe7fUIbZvaMWxZOncP?=
 =?us-ascii?Q?kDCLK8F9i5WPcLIVEFGHf4hLR65/nVbr6pbJlPOH1NBX8fbcQSfXb3RPBON/?=
 =?us-ascii?Q?bF8D5bAd9cMae8/n8XiVir+kjh0rxa3+iDSDOQEI5AkZvjtlJ47JkbxL6o8j?=
 =?us-ascii?Q?jbvY7I0EzEa458JIHF9rvqCtO0KHC1nWw0sEEMLjAlLweVhB3ImXZ6MAxree?=
 =?us-ascii?Q?w+yQVCPB3Z6AOVX3QGS1aLuN24xqq4ARd/43SjPGpHHEEvnw2n731vJyipjv?=
 =?us-ascii?Q?gBnfYizHiR/4hAk/X181XOGz6hOdOHCCWBIIO9Oj?=
X-MS-Exchange-CrossTenant-Network-Message-Id: c5523c82-2afa-4219-aab9-08dc5eaef048
X-MS-Exchange-CrossTenant-AuthSource: CH3PR11MB8660.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Apr 2024 07:21:03.1926
 (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: u9oltCk+nf6XykpcJO6LodViVK0ui3TBOT9SHJE8/Gmgwvt5Z8xjwnqB+WR7xn7D2ucyK5p4rDFVw7iJKzp34Q==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR11MB6252
X-OriginatorOrg: intel.com

On Wed, Apr 10, 2024 at 03:07:32PM -0700, isaku.yamahata@intel.com wrote:
>From: Isaku Yamahata <isaku.yamahata@intel.com>
>
>Wire KVM_MAP_MEMORY ioctl to kvm_mmu_map_tdp_page() to populate guest
>memory.  When KVM_CREATE_VCPU creates vCPU, it initializes the x86
>KVM MMU part by kvm_mmu_create() and kvm_init_mmu().  vCPU is ready to
>invoke the KVM page fault handler.
>
>Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
>---
>v2:
>- Catch up the change of struct kvm_memory_mapping. (Sean)
>- Removed mapping level check. Push it down into vendor code. (David, Sean)
>- Rename goal_level to level. (Sean)
>- Drop kvm_arch_pre_vcpu_map_memory(), directly call kvm_mmu_reload().
>  (David, Sean)
>- Fixed the update of mapping.
>---
> arch/x86/kvm/x86.c | 30 ++++++++++++++++++++++++++++++
> 1 file changed, 30 insertions(+)
>
>diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c
>index 2d2619d3eee4..2c765de3531e 100644
>--- a/arch/x86/kvm/x86.c
>+++ b/arch/x86/kvm/x86.c
>@@ -4713,6 +4713,7 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext)
> 	case KVM_CAP_VM_DISABLE_NX_HUGE_PAGES:
> 	case KVM_CAP_IRQFD_RESAMPLE:
> 	case KVM_CAP_MEMORY_FAULT_INFO:
>+	case KVM_CAP_MAP_MEMORY:
> 		r = 1;
> 		break;
> 	case KVM_CAP_EXIT_HYPERCALL:
>@@ -5867,6 +5868,35 @@ static int kvm_vcpu_ioctl_enable_cap(struct kvm_vcpu *vcpu,
> 	}
> }
> 
>+int kvm_arch_vcpu_map_memory(struct kvm_vcpu *vcpu,
>+			     struct kvm_memory_mapping *mapping)
>+{
>+	u64 end, error_code = 0;
>+	u8 level = PG_LEVEL_4K;

IIUC, no need to initialize @level here.

>+	int r;
>+
>+	/*
>+	 * Shadow paging uses GVA for kvm page fault.  The first implementation
>+	 * supports GPA only to avoid confusion.
>+	 */
>+	if (!tdp_enabled)
>+		return -EOPNOTSUPP;

This check duplicates the one for vcpu->arch.mmu->page_fault() in patch 5.

>+
>+	/* reload is optimized for repeated call. */
>+	kvm_mmu_reload(vcpu);
>+
>+	r = kvm_tdp_map_page(vcpu, mapping->base_address, error_code, &level);
>+	if (r)
>+		return r;
>+
>+	/* mapping->base_address is not necessarily aligned to level-hugepage. */
>+	end = (mapping->base_address & KVM_HPAGE_MASK(level)) +
>+		KVM_HPAGE_SIZE(level);

maybe
	end = ALIGN(mapping->base_address, KVM_HPAGE_SIZE(level));

>+	mapping->size -= end - mapping->base_address;
>+	mapping->base_address = end;
>+	return r;
>+}
>+
> long kvm_arch_vcpu_ioctl(struct file *filp,
> 			 unsigned int ioctl, unsigned long arg)
> {
>-- 
>2.43.2
>
>