From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from iad-out-007.esa.us-east-1.outbound.mail-perimeter.amazon.com (iad-out-007.esa.us-east-1.outbound.mail-perimeter.amazon.com [3.221.209.22]) (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 5E2BB3DB655 for ; Fri, 10 Apr 2026 15:20:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=3.221.209.22 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775834422; cv=none; b=D4wm9lOzvsFilgxnmHbD2UoWL6vOD3VJlSdELENATkUzSGUgoPq5CKvBAYAfGy3cpv3e0+LzUgS3/TLOrXS4Q9zNVPno6GZmu6bcLwd7QPVxdY1BANCnlxsBS5WCQp1hLF3wsDXHmkwuOaPBpXfd63ftNmsRUyjjJaMSnOddva0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775834422; c=relaxed/simple; bh=knPeu1W0BA3zuT9MtZJn6NaWJ1xMRpPMTA0D0dLeA6Y=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=YSAENDbgVBKmLIngwldgSz/1MqwlC5vGZopjs1Qw/kE+OZ3+Rc0yTGvkbrnXyqI7Q1NX4wENCQOor5Ug0Sm0qRzwPMZrEJAg/e78I0uxJj5Z1kZQDDEjGoj/LUd9G3w4q2S5/z7SfiXUuMLEI/II5ksnhlM18IdQmzMKNQCs7w0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.co.uk; spf=pass smtp.mailfrom=amazon.co.uk; dkim=pass (2048-bit key) header.d=amazon.co.uk header.i=@amazon.co.uk header.b=WLOIFfJL; arc=none smtp.client-ip=3.221.209.22 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.co.uk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.co.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amazon.co.uk header.i=@amazon.co.uk header.b="WLOIFfJL" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.co.uk; i=@amazon.co.uk; q=dns/txt; s=amazoncorp2; t=1775834421; x=1807370421; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=a53EAdE3OmtPzmnkX5XyMGwkjzljlnNgIi86usdTTgg=; b=WLOIFfJLExiwd74Q8GZONSoVG0Bb1in0x7+bmQApUrCDILT1HGjwSIZp WpeH49iasBo4Y678yZvCi+0ctfc/RUF3is2XHjql6JlNOcMSUCNxqRC8a INIQox7CG34843tuLyjPnPIUq16d3Fivgbc7NBVZbTWwb05cKXB7P3DXz k5vYOGYASDgFq+tRQ9i4lWQng4mu6/sTwy/bkMw8zNeqUZ3amIXero5qh rAaWOqGaI6MjAN4UfhOoXXCLPlvinZCrP8uB/g4sYAhtuaFipHWjucUDs rapTQfwbVa4jgNY/PGyM3dvxQSqufKVyw7qABQy7HSpE0VhXbXMYTcxnW g==; X-CSE-ConnectionGUID: WCGnBV+0RN+Ajwtdhgj5iQ== X-CSE-MsgGUID: JMm9U4M7TG+TJ9EHYAKHfw== X-IronPort-AV: E=Sophos;i="6.23,171,1770595200"; d="scan'208";a="15990007" Received: from ip-10-4-17-41.ec2.internal (HELO smtpout.naws.us-east-1.prod.farcaster.email.amazon.dev) ([10.4.17.41]) by internal-iad-out-007.esa.us-east-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 10 Apr 2026 15:20:20 +0000 Received: from EX19MTAUEA001.ant.amazon.com [72.21.196.67:9796] by smtpin.naws.us-east-1.prod.farcaster.email.amazon.dev [10.0.32.14:2525] with esmtp (Farcaster) id 8c1658fd-28af-49dc-b9d8-142e33a5c35a; Fri, 10 Apr 2026 15:20:20 +0000 (UTC) X-Farcaster-Flow-ID: 8c1658fd-28af-49dc-b9d8-142e33a5c35a Received: from EX19D027UEC003.ant.amazon.com (10.252.137.250) by EX19MTAUEA001.ant.amazon.com (10.252.134.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.37; Fri, 10 Apr 2026 15:20:19 +0000 Received: from EX19D027UEC003.ant.amazon.com (10.252.137.250) by EX19D027UEC003.ant.amazon.com (10.252.137.250) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.37; Fri, 10 Apr 2026 15:20:19 +0000 Received: from EX19D027UEC003.ant.amazon.com ([fe80::887f:519b:ba73:21d]) by EX19D027UEC003.ant.amazon.com ([fe80::887f:519b:ba73:21d%3]) with mapi id 15.02.2562.037; Fri, 10 Apr 2026 15:20:19 +0000 From: "Kalyazin, Nikita" To: "kvm@vger.kernel.org" , "linux-doc@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "kvmarm@lists.linux.dev" , "linux-fsdevel@vger.kernel.org" , "linux-mm@kvack.org" , "bpf@vger.kernel.org" , "linux-kselftest@vger.kernel.org" , "kernel@xen0n.name" , "linux-riscv@lists.infradead.org" , "linux-s390@vger.kernel.org" , "loongarch@lists.linux.dev" , "linux-pm@vger.kernel.org" CC: "pbonzini@redhat.com" , "corbet@lwn.net" , "maz@kernel.org" , "oupton@kernel.org" , "joey.gouly@arm.com" , "suzuki.poulose@arm.com" , "yuzenghui@huawei.com" , "catalin.marinas@arm.com" , "will@kernel.org" , "seanjc@google.com" , "tglx@kernel.org" , "mingo@redhat.com" , "bp@alien8.de" , "dave.hansen@linux.intel.com" , "x86@kernel.org" , "hpa@zytor.com" , "luto@kernel.org" , "peterz@infradead.org" , "willy@infradead.org" , "akpm@linux-foundation.org" , "david@kernel.org" , "lorenzo.stoakes@oracle.com" , "vbabka@kernel.org" , "rppt@kernel.org" , "surenb@google.com" , "mhocko@suse.com" , "ast@kernel.org" , "daniel@iogearbox.net" , "andrii@kernel.org" , "martin.lau@linux.dev" , "eddyz87@gmail.com" , "song@kernel.org" , "yonghong.song@linux.dev" , "john.fastabend@gmail.com" , "kpsingh@kernel.org" , "sdf@fomichev.me" , "haoluo@google.com" , "jolsa@kernel.org" , "jgg@ziepe.ca" , "jhubbard@nvidia.com" , "peterx@redhat.com" , "jannh@google.com" , "pfalcato@suse.de" , "skhan@linuxfoundation.org" , "riel@surriel.com" , "ryan.roberts@arm.com" , "jgross@suse.com" , "yu-cheng.yu@intel.com" , "kas@kernel.org" , "coxu@redhat.com" , "ackerleytng@google.com" , "yosry@kernel.org" , "ajones@ventanamicro.com" , "maobibo@loongson.cn" , "tabba@google.com" , "prsampat@amd.com" , "wu.fei9@sanechips.com.cn" , "mlevitsk@redhat.com" , "jmattson@google.com" , "jthoughton@google.com" , "agordeev@linux.ibm.com" , "alex@ghiti.fr" , "aou@eecs.berkeley.edu" , "borntraeger@linux.ibm.com" , "chenhuacai@kernel.org" , "baolu.lu@linux.intel.com" , "dev.jain@arm.com" , "gor@linux.ibm.com" , "hca@linux.ibm.com" , "palmer@dabbelt.com" , "pjw@kernel.org" , "shijie@os.amperecomputing.com" , "svens@linux.ibm.com" , "thuth@redhat.com" , "yang@os.amperecomputing.com" , "Liam.Howlett@oracle.com" , "urezki@gmail.com" , "zhengqi.arch@bytedance.com" , "gerald.schaefer@linux.ibm.com" , "jiayuan.chen@shopee.com" , "lenb@kernel.org" , "pavel@kernel.org" , "rafael@kernel.org" , "yangyicong@hisilicon.com" , "vannapurve@google.com" , "jackmanb@google.com" , "patrick.roy@linux.dev" , "Thomson, Jack" , "Itazuri, Takahiro" , "Manwaring, Derek" , "Kalyazin, Nikita" Subject: [PATCH v12 14/16] KVM: selftests: cover GUEST_MEMFD_FLAG_NO_DIRECT_MAP in existing selftests Thread-Topic: [PATCH v12 14/16] KVM: selftests: cover GUEST_MEMFD_FLAG_NO_DIRECT_MAP in existing selftests Thread-Index: AQHcyP2KnkH5rbnwD06iHKAPBNZ/4Q== Date: Fri, 10 Apr 2026 15:20:18 +0000 Message-ID: <20260410151746.61150-15-kalyazin@amazon.com> References: <20260410151746.61150-1-kalyazin@amazon.com> In-Reply-To: <20260410151746.61150-1-kalyazin@amazon.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Precedence: bulk X-Mailing-List: linux-doc@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Patrick Roy =0A= =0A= Extend mem conversion selftests to cover the scenario that the guest can=0A= fault in and write gmem-backed guest memory even if its direct map=0A= removed. Also cover the new flag in guest_memfd_test.c tests.=0A= =0A= Signed-off-by: Patrick Roy =0A= Signed-off-by: Nikita Kalyazin =0A= ---=0A= tools/testing/selftests/kvm/guest_memfd_test.c | 17 ++++++++++++++++-=0A= .../kvm/x86/private_mem_conversions_test.c | 7 ++++---=0A= 2 files changed, 20 insertions(+), 4 deletions(-)=0A= =0A= diff --git a/tools/testing/selftests/kvm/guest_memfd_test.c b/tools/testing= /selftests/kvm/guest_memfd_test.c=0A= index cc329b57ce2e..64c1200c182e 100644=0A= --- a/tools/testing/selftests/kvm/guest_memfd_test.c=0A= +++ b/tools/testing/selftests/kvm/guest_memfd_test.c=0A= @@ -403,6 +403,17 @@ static void test_guest_memfd(unsigned long vm_type)=0A= __test_guest_memfd(vm, GUEST_MEMFD_FLAG_MMAP |=0A= GUEST_MEMFD_FLAG_INIT_SHARED);=0A= =0A= + if (flags & GUEST_MEMFD_FLAG_NO_DIRECT_MAP) {=0A= + __test_guest_memfd(vm, GUEST_MEMFD_FLAG_NO_DIRECT_MAP);=0A= + if (flags & GUEST_MEMFD_FLAG_MMAP)=0A= + __test_guest_memfd(vm, GUEST_MEMFD_FLAG_NO_DIRECT_MAP |=0A= + GUEST_MEMFD_FLAG_MMAP);=0A= + if (flags & GUEST_MEMFD_FLAG_INIT_SHARED)=0A= + __test_guest_memfd(vm, GUEST_MEMFD_FLAG_NO_DIRECT_MAP |=0A= + GUEST_MEMFD_FLAG_MMAP |=0A= + GUEST_MEMFD_FLAG_INIT_SHARED);=0A= + }=0A= +=0A= kvm_vm_free(vm);=0A= }=0A= =0A= @@ -445,10 +456,14 @@ static void test_guest_memfd_guest(void)=0A= TEST_ASSERT(vm_check_cap(vm, KVM_CAP_GUEST_MEMFD_FLAGS) & GUEST_MEMFD_FLA= G_INIT_SHARED,=0A= "Default VM type should support INIT_SHARED, supported flags =3D 0x%= x",=0A= vm_check_cap(vm, KVM_CAP_GUEST_MEMFD_FLAGS));=0A= + TEST_ASSERT(vm_check_cap(vm, KVM_CAP_GUEST_MEMFD_FLAGS) & GUEST_MEMFD_FLA= G_NO_DIRECT_MAP,=0A= + "Default VM type should support NO_DIRECT_MAP, supported flags =3D 0= x%x",=0A= + vm_check_cap(vm, KVM_CAP_GUEST_MEMFD_FLAGS));=0A= =0A= size =3D vm->page_size;=0A= fd =3D vm_create_guest_memfd(vm, size, GUEST_MEMFD_FLAG_MMAP |=0A= - GUEST_MEMFD_FLAG_INIT_SHARED);=0A= + GUEST_MEMFD_FLAG_INIT_SHARED |=0A= + GUEST_MEMFD_FLAG_NO_DIRECT_MAP);=0A= vm_set_user_memory_region2(vm, slot, KVM_MEM_GUEST_MEMFD, gpa, size, NULL= , fd, 0);=0A= =0A= mem =3D kvm_mmap(size, PROT_READ | PROT_WRITE, MAP_SHARED, fd);=0A= diff --git a/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c= b/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c=0A= index 1969f4ab9b28..8767cb4a037e 100644=0A= --- a/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c=0A= +++ b/tools/testing/selftests/kvm/x86/private_mem_conversions_test.c=0A= @@ -367,7 +367,7 @@ static void *__test_mem_conversions(void *__vcpu)=0A= }=0A= =0A= static void test_mem_conversions(enum vm_mem_backing_src_type src_type, ui= nt32_t nr_vcpus,=0A= - uint32_t nr_memslots)=0A= + uint32_t nr_memslots, uint64_t gmem_flags)=0A= {=0A= /*=0A= * Allocate enough memory so that each vCPU's chunk of memory can be=0A= @@ -394,7 +394,7 @@ static void test_mem_conversions(enum vm_mem_backing_sr= c_type src_type, uint32_t=0A= =0A= vm_enable_cap(vm, KVM_CAP_EXIT_HYPERCALL, (1 << KVM_HC_MAP_GPA_RANGE));= =0A= =0A= - memfd =3D vm_create_guest_memfd(vm, memfd_size, 0);=0A= + memfd =3D vm_create_guest_memfd(vm, memfd_size, gmem_flags);=0A= =0A= for (i =3D 0; i < nr_memslots; i++)=0A= vm_mem_add(vm, src_type, BASE_DATA_GPA + slot_size * i,=0A= @@ -474,7 +474,8 @@ int main(int argc, char *argv[])=0A= }=0A= }=0A= =0A= - test_mem_conversions(src_type, nr_vcpus, nr_memslots);=0A= + test_mem_conversions(src_type, nr_vcpus, nr_memslots, 0);=0A= + test_mem_conversions(src_type, nr_vcpus, nr_memslots, GUEST_MEMFD_FLAG_NO= _DIRECT_MAP);=0A= =0A= return 0;=0A= }=0A= -- =0A= 2.50.1=0A= =0A=