Received-SPF: pass (google.com: domain of linux-kernel+bounces-92301-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161;
Date: Tue, 5 Mar 2024 19:09:15 +0800
From: Yan Zhao <yan.y.zhao@intel.com>
To: Sagi Shahar <sagis@google.com>
CC: <linux-kselftest@vger.kernel.org>, Ackerley Tng <ackerleytng@google.com>,
	Ryan Afranji <afranji@google.com>, Erdem Aktas <erdemaktas@google.com>,
	"Isaku Yamahata" <isaku.yamahata@intel.com>, Sean Christopherson
	<seanjc@google.com>, Paolo Bonzini <pbonzini@redhat.com>, Shuah Khan
	<shuah@kernel.org>, "Peter Gonda" <pgonda@google.com>, Haibo Xu
	<haibo1.xu@intel.com>, Chao Peng <chao.p.peng@linux.intel.com>, Vishal
 Annapurve <vannapurve@google.com>, Roger Wang <runanwang@google.com>, Vipin
 Sharma <vipinsh@google.com>, <jmattson@google.com>, <dmatlack@google.com>,
	<linux-kernel@vger.kernel.org>, <kvm@vger.kernel.org>, <linux-mm@kvack.org>
Subject: Re: [RFC PATCH v5 22/29] KVM: selftests: Add functions to allow
 mapping as shared
Message-ID: <Zeb9W1ig6dFKXAgj@yzhao56-desk.sh.intel.com>
Reply-To: Yan Zhao <yan.y.zhao@intel.com>
References: <20231212204647.2170650-1-sagis@google.com>
 <20231212204647.2170650-23-sagis@google.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <20231212204647.2170650-23-sagis@google.com>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?pdmVSu93Kqt0/9kDeV+FEtcHVGyk2T++tm42l1V7hSMSDwZEZ16oS4Ly3p/q?=
 =?us-ascii?Q?0Oxl5LUhuR8lJN2b96tLSM2hEVJpnDpL1VO/OZ5HJxD+Ozft6i7339c/Yxq4?=
 =?us-ascii?Q?P4D8GzTnzlWrlKnvWIim5RYuzhcq3/NGQGE0k8D1wGML2ufcSLETX95tR7v1?=
 =?us-ascii?Q?sGftuYVQrqrqYr/cilcq7Zc8Zq50iDfWdlFyru1DU3cA8tXiRN9Mq/Nttkfe?=
 =?us-ascii?Q?9yvtocTqYko03we2sNhp7nswl3PUUoWCJZ2OLU0YQdKxFIGwb1jh1W/xGQYE?=
 =?us-ascii?Q?kNQBmmohQ5uONaLIrNVbuvo2W8N/wExkIWYt918gz5yIkOdJ6KCyrN7yOgFO?=
 =?us-ascii?Q?AbJlZS+h7uRsQNJ05JVGMm8iyubBNMDkoAl9649pSvWF5DYBDngN0nO/X+D+?=
 =?us-ascii?Q?ijT2Ur/51JuQ+6eoSeVq0yXlY+Y62eRGYZrXg02roF58ypTeZFPDnkfHid0j?=
 =?us-ascii?Q?iIfJK9O/nh4PAG19ofyRSw2sM8LMtO0kwD2+819b4nNmCB0m9Wje5uJjO8I4?=
 =?us-ascii?Q?kyKvpZJP2gSdkMaWke06OSTbMT1A4ZVrBojvn/HZv6INOvg/AkI+rxPe2pZT?=
 =?us-ascii?Q?SpLHQp6wrN3S+gZR8YifTYg8IIn8gel88hkKQYvVdBuwF61tPNKBt6qoLJmF?=
 =?us-ascii?Q?uzC42xvZy81uy7S0J9m3B6+DiYACSZxtsJRWot8yuKFbW4SvAJwLxfgQj6s9?=
 =?us-ascii?Q?/ZEcFl5+OQwwvehL3LlkG5kiTAxoz7a8ynkh8XVN+tJ6e8trogzR/+uIk8yt?=
 =?us-ascii?Q?QMknIufhsZij/aXHgU2QHiMG9q+I2qnKTa38U2i3ChHR1tXiM9CmEv33L1Qx?=
 =?us-ascii?Q?7X3hAoaSc7nbSq3pmLsJNyYbziA4jWLaiGO7Si8AHyU9//xbiSJxf+FcTfUU?=
 =?us-ascii?Q?Vk2CxYT9yPuIk0TijDa+l1h0HKFR5fSomLSOd1s0VIUoVtEc/N2nIxvoDvxx?=
 =?us-ascii?Q?9OXDW5MDGHJdTL7eVYcISB7NmbM8T+RRe+LogGOQbZlHgCUhLC80vHhpJ1fP?=
 =?us-ascii?Q?ezP77x3zEMpJMMS6TE4JwlBSn0V/pBE4JS/GYC55DI8BTsi26ya/pdVAYPfa?=
 =?us-ascii?Q?a+darqnjhLrqZQLS6fNeRWWyrMBJvoqccoVwhv1swkxVuzviUf9Uuvbq9mAt?=
 =?us-ascii?Q?fYIVvwF7o9CAnYo8JRiY3VAwU57asbTtnvG9cBrhZb34/TZqvbzHhYIOmRL3?=
 =?us-ascii?Q?frfeQzKTGD+mp0Vr6D7RmL2KHjTrbnaobsgF3UYsFlmUaOzYupfNEZGtHN3d?=
 =?us-ascii?Q?tG3wKY3Ir6VU0lGp+VPMWEM9DnMNNBb3E2hsGw3TI2+WWWjb4pzYXPYRXv2/?=
 =?us-ascii?Q?0OjdDJ6DQGXo1CbWZwWVtemb7FrZYwezzvR2773YEt/9bmVVxl5a5DztPft4?=
 =?us-ascii?Q?j7IoRULSGiZreWFMJtWEyeHrnoPmx8In4aNNdwIxCElgo2vRBmxl25yGFf+G?=
 =?us-ascii?Q?xcAzvOcFVf7y6iJx5ufY7ZwIm+P7XDJQ2pgOqU1wMcFa4kEqPgQxLeRV2HNc?=
 =?us-ascii?Q?dxQwch89yXLA+XuuKiLSXBoUqCjKUUKVNWczgAPLaeNAWxuagMBNV3UeKDH9?=
 =?us-ascii?Q?mj0Zhr5ipvHqUjgoqc017r084OrrsNCx/kvcx2ig?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 037e96c1-0d2e-4dfd-2c2c-08dc3d08de02
X-MS-Exchange-CrossTenant-AuthSource: DS7PR11MB5966.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Mar 2024 11:39:07.4767
 (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: RXpC8icWmQgRUZ1UOCyrXTRmPpV0jag3xRs7NfYhFLYR++oBY+BlfvgLKGLzd6iTxxiXJ1qJdc2I9oYgXJfsAA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR11MB7071
X-OriginatorOrg: intel.com

On Tue, Dec 12, 2023 at 12:46:37PM -0800, Sagi Shahar wrote:
> From: Ackerley Tng <ackerleytng@google.com>
> 
> Signed-off-by: Ackerley Tng <ackerleytng@google.com>
> Signed-off-by: Ryan Afranji <afranji@google.com>
> Signed-off-by: Sagi Shahar <sagis@google.com>
> ---
>  .../selftests/kvm/include/kvm_util_base.h     | 24 ++++++++++++++
>  tools/testing/selftests/kvm/lib/kvm_util.c    | 32 +++++++++++++++++++
>  .../selftests/kvm/lib/x86_64/processor.c      | 15 +++++++--
>  3 files changed, 69 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/testing/selftests/kvm/include/kvm_util_base.h b/tools/testing/selftests/kvm/include/kvm_util_base.h
> index b353617fcdd1..efd7ae8abb20 100644
> --- a/tools/testing/selftests/kvm/include/kvm_util_base.h
> +++ b/tools/testing/selftests/kvm/include/kvm_util_base.h
> @@ -574,6 +574,8 @@ vm_vaddr_t vm_vaddr_alloc_page(struct kvm_vm *vm);
>  
>  void virt_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,
>  	      unsigned int npages);
> +void virt_map_shared(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,
> +		     unsigned int npages);
>  void *addr_gpa2hva(struct kvm_vm *vm, vm_paddr_t gpa);
>  void *addr_gva2hva(struct kvm_vm *vm, vm_vaddr_t gva);
>  vm_paddr_t addr_hva2gpa(struct kvm_vm *vm, void *hva);
> @@ -1034,6 +1036,28 @@ static inline void virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr
>  	virt_arch_pg_map(vm, vaddr, paddr);
>  }
>  
> +/*
> + * VM Virtual Page Map as Shared
> + *
> + * Input Args:
> + *   vm - Virtual Machine
> + *   vaddr - VM Virtual Address
> + *   paddr - VM Physical Address
> + *   memslot - Memory region slot for new virtual translation tables
> + *
> + * Output Args: None
> + *
> + * Return: None
> + *
> + * Within @vm, creates a virtual translation for the page starting
> + * at @vaddr to the page starting at @paddr.
> + */
> +void virt_arch_pg_map_shared(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr);
> +
> +static inline void virt_pg_map_shared(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr)
> +{
> +	virt_arch_pg_map_shared(vm, vaddr, paddr);
> +}
>  
>  /*
>   * Address Guest Virtual to Guest Physical
> diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c
> index 4f1ae0f1eef0..28780fa1f0f2 100644
> --- a/tools/testing/selftests/kvm/lib/kvm_util.c
> +++ b/tools/testing/selftests/kvm/lib/kvm_util.c
> @@ -1573,6 +1573,38 @@ void virt_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,
>  	}
>  }
>  
> +/*
> + * Map a range of VM virtual address to the VM's physical address as shared
> + *
> + * Input Args:
> + *   vm - Virtual Machine
> + *   vaddr - Virtuall address to map
> + *   paddr - VM Physical Address
> + *   npages - The number of pages to map
> + *
> + * Output Args: None
> + *
> + * Return: None
> + *
> + * Within the VM given by @vm, creates a virtual translation for
> + * @npages starting at @vaddr to the page range starting at @paddr.
> + */
> +void virt_map_shared(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,
> +		     unsigned int npages)
> +{
> +	size_t page_size = vm->page_size;
> +	size_t size = npages * page_size;
> +
> +	TEST_ASSERT(vaddr + size > vaddr, "Vaddr overflow");
> +	TEST_ASSERT(paddr + size > paddr, "Paddr overflow");
> +
> +	while (npages--) {
> +		virt_pg_map_shared(vm, vaddr, paddr);
> +		vaddr += page_size;
> +		paddr += page_size;
> +	}
> +}
Set vm->vpages_mapped as what's done in virt_map() ?

> +
>  /*
>   * Address VM Physical to Host Virtual
>   *
> diff --git a/tools/testing/selftests/kvm/lib/x86_64/processor.c b/tools/testing/selftests/kvm/lib/x86_64/processor.c
> index 566d82829da4..aa2a57ddb8d3 100644
> --- a/tools/testing/selftests/kvm/lib/x86_64/processor.c
> +++ b/tools/testing/selftests/kvm/lib/x86_64/processor.c
> @@ -190,7 +190,8 @@ static uint64_t *virt_create_upper_pte(struct kvm_vm *vm,
>  	return pte;
>  }
>  
> -void __virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, int level)
> +static void ___virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,
> +			   int level, bool protected)
>  {
>  	const uint64_t pg_size = PG_LEVEL_SIZE(level);
>  	uint64_t *pml4e, *pdpe, *pde;
> @@ -235,17 +236,27 @@ void __virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, int level)
>  		    "PTE already present for 4k page at vaddr: 0x%lx\n", vaddr);
>  	*pte = PTE_PRESENT_MASK | PTE_WRITABLE_MASK | (paddr & PHYSICAL_PAGE_MASK);
>  
> -	if (vm_is_gpa_protected(vm, paddr))
> +	if (protected)
>  		*pte |= vm->arch.c_bit;
>  	else
>  		*pte |= vm->arch.s_bit;
>  }
>  
> +void __virt_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr, int level)
> +{
> +	___virt_pg_map(vm, vaddr, paddr, level, vm_is_gpa_protected(vm, paddr));
> +}
> +
>  void virt_arch_pg_map(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr)
>  {
>  	__virt_pg_map(vm, vaddr, paddr, PG_LEVEL_4K);
>  }
>  
> +void virt_arch_pg_map_shared(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr)
> +{
> +	___virt_pg_map(vm, vaddr, paddr, PG_LEVEL_4K, false);
> +}
> +
>  void virt_map_level(struct kvm_vm *vm, uint64_t vaddr, uint64_t paddr,
>  		    uint64_t nr_bytes, int level)
>  {
> -- 
> 2.43.0.472.g3155946c3a-goog
> 
>