From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fra-out-004.esa.eu-central-1.outbound.mail-perimeter.amazon.com (fra-out-004.esa.eu-central-1.outbound.mail-perimeter.amazon.com [3.74.81.189]) (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 111472F7459 for ; Thu, 28 Aug 2025 09:39:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=3.74.81.189 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756373982; cv=none; b=c55Cq1fqiryxWTAQvthjvZrK76gjTxkT51pUEVBKdCQnRrRLA/zbEygyhG7Js7NE+ldbbORNTwRgl65NXHt6XGNvM6sYY+/ZovZ1oRQIJJEddBpjpiYdxJDJt6E2BZi82MJFGkQge0fHiQ3GXyB1TLdUQgLPlI3vw7BURc3M+30= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756373982; c=relaxed/simple; bh=DmIagpWgO2oSc2B+bRyWsRmMy0e5IBuFMLQtHeyV8bs=; h=From:To:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=pxrHxKqhr5d2IxJux6f1QidwXTv19e9nbYbrQVWIrt4qpxJwxyhDPbvlRqTlKVCJvWbKzk6l7ueV4Rgm8b1Bzzoo/YhA6Ae7oYnAjtjnMUawz2LRaTZrxiPYED605+5Tr2mvEEzAPI/mqvxIPS4HLSVMrAycDEEJl5QVscgm8RY= 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=k92f1cQt; arc=none smtp.client-ip=3.74.81.189 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="k92f1cQt" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.co.uk; i=@amazon.co.uk; q=dns/txt; s=amazoncorp2; t=1756373980; x=1787909980; h=from:to:cc:subject:date:message-id:references: in-reply-to:content-transfer-encoding:mime-version; bh=KTZ/VOJbbCjyGaq9AddgILCkPAHpmVIUuRAnTMPHRJE=; b=k92f1cQtDSwrVndkA7vwNwWEqmh7leO2uRwsQhhU3W2sKC7Ny/q39y5w vx9v5Uetq9d+N7O1ogusVA4uCxbScxJUddTZ4PxSS5H9xalJPTzJwRNGs yr/g0aTO1CVLOZEZUa4k5GimUPLsstjCXlOfWI03RCKZW+xG9oiXyOP7o EfN0qO6UQudxJBYCcMta1RSEc4Iv/mFH6IXVL73+bs5rbtUBobNB/rRVQ 3SU05XPqD6YVf754hNzgnwbbrp+i7DNUepIvFeP42Oc/ccUE6c7KhYZJ4 eHCGOH569nRLxbLCyg2/9j5yK3qw4t/x63qYfYfWaphIL97funs/lEuRb g==; X-CSE-ConnectionGUID: u9bjUTy6TKSekmiuaprUTA== X-CSE-MsgGUID: 8rDPM4y3Rdeb1tmBEIF3eA== X-IronPort-AV: E=Sophos;i="6.18,214,1751241600"; d="scan'208";a="1303834" Received: from ip-10-6-6-97.eu-central-1.compute.internal (HELO smtpout.naws.eu-central-1.prod.farcaster.email.amazon.dev) ([10.6.6.97]) by internal-fra-out-004.esa.eu-central-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 28 Aug 2025 09:39:27 +0000 Received: from EX19MTAEUA001.ant.amazon.com [54.240.197.233:20173] by smtpin.naws.eu-central-1.prod.farcaster.email.amazon.dev [10.0.43.161:2525] with esmtp (Farcaster) id f5543d0c-1ca4-4856-a828-4fcfa81cf84a; Thu, 28 Aug 2025 09:39:27 +0000 (UTC) X-Farcaster-Flow-ID: f5543d0c-1ca4-4856-a828-4fcfa81cf84a Received: from EX19D015EUB002.ant.amazon.com (10.252.51.123) by EX19MTAEUA001.ant.amazon.com (10.252.50.223) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.17; Thu, 28 Aug 2025 09:39:24 +0000 Received: from EX19D015EUB004.ant.amazon.com (10.252.51.13) by EX19D015EUB002.ant.amazon.com (10.252.51.123) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.17; Thu, 28 Aug 2025 09:39:24 +0000 Received: from EX19D015EUB004.ant.amazon.com ([fe80::2dc9:7aa9:9cd3:fc8a]) by EX19D015EUB004.ant.amazon.com ([fe80::2dc9:7aa9:9cd3:fc8a%3]) with mapi id 15.02.2562.017; Thu, 28 Aug 2025 09:39:24 +0000 From: "Roy, Patrick" To: "david@redhat.com" , "seanjc@google.com" CC: "Roy, Patrick" , "tabba@google.com" , "ackerleytng@google.com" , "pbonzini@redhat.com" , "kvm@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "kvmarm@lists.linux.dev" , "linux-kernel@vger.kernel.org" , "linux-mm@kvack.org" , "rppt@kernel.org" , "will@kernel.org" , "vbabka@suse.cz" , "Cali, Marco" , "Kalyazin, Nikita" , "Thomson, Jack" , "Manwaring, Derek" Subject: [PATCH v5 06/12] KVM: selftests: load elf via bounce buffer Thread-Topic: [PATCH v5 06/12] KVM: selftests: load elf via bounce buffer Thread-Index: AQHcF/+j1UnlcgO4tUakgBJ2Lj709w== Date: Thu, 28 Aug 2025 09:39:24 +0000 Message-ID: <20250828093902.2719-7-roypat@amazon.co.uk> References: <20250828093902.2719-1-roypat@amazon.co.uk> In-Reply-To: <20250828093902.2719-1-roypat@amazon.co.uk> Accept-Language: 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: kvmarm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 If guest memory is backed using a VMA that does not allow GUP (e.g. a=0A= userspace mapping of guest_memfd when the fd was allocated using=0A= KVM_GMEM_NO_DIRECT_MAP), then directly loading the test ELF binary into=0A= it via read(2) potentially does not work. To nevertheless support=0A= loading binaries in this cases, do the read(2) syscall using a bounce=0A= buffer, and then memcpy from the bounce buffer into guest memory.=0A= =0A= Signed-off-by: Patrick Roy =0A= ---=0A= .../testing/selftests/kvm/include/test_util.h | 1 +=0A= tools/testing/selftests/kvm/lib/elf.c | 8 +++----=0A= tools/testing/selftests/kvm/lib/io.c | 23 +++++++++++++++++++=0A= 3 files changed, 28 insertions(+), 4 deletions(-)=0A= =0A= diff --git a/tools/testing/selftests/kvm/include/test_util.h b/tools/testin= g/selftests/kvm/include/test_util.h=0A= index c6ef895fbd9a..0409b7b96c94 100644=0A= --- a/tools/testing/selftests/kvm/include/test_util.h=0A= +++ b/tools/testing/selftests/kvm/include/test_util.h=0A= @@ -46,6 +46,7 @@ do { \=0A= =0A= ssize_t test_write(int fd, const void *buf, size_t count);=0A= ssize_t test_read(int fd, void *buf, size_t count);=0A= +ssize_t test_read_bounce(int fd, void *buf, size_t count);=0A= int test_seq_read(const char *path, char **bufp, size_t *sizep);=0A= =0A= void __printf(5, 6) test_assert(bool exp, const char *exp_str,=0A= diff --git a/tools/testing/selftests/kvm/lib/elf.c b/tools/testing/selftest= s/kvm/lib/elf.c=0A= index f34d926d9735..e829fbe0a11e 100644=0A= --- a/tools/testing/selftests/kvm/lib/elf.c=0A= +++ b/tools/testing/selftests/kvm/lib/elf.c=0A= @@ -31,7 +31,7 @@ static void elfhdr_get(const char *filename, Elf64_Ehdr *= hdrp)=0A= * the real size of the ELF header.=0A= */=0A= unsigned char ident[EI_NIDENT];=0A= - test_read(fd, ident, sizeof(ident));=0A= + test_read_bounce(fd, ident, sizeof(ident));=0A= TEST_ASSERT((ident[EI_MAG0] =3D=3D ELFMAG0) && (ident[EI_MAG1] =3D=3D ELF= MAG1)=0A= && (ident[EI_MAG2] =3D=3D ELFMAG2) && (ident[EI_MAG3] =3D=3D ELFMAG3),= =0A= "ELF MAGIC Mismatch,\n"=0A= @@ -79,7 +79,7 @@ static void elfhdr_get(const char *filename, Elf64_Ehdr *= hdrp)=0A= offset_rv =3D lseek(fd, 0, SEEK_SET);=0A= TEST_ASSERT(offset_rv =3D=3D 0, "Seek to ELF header failed,\n"=0A= " rv: %zi expected: %i", offset_rv, 0);=0A= - test_read(fd, hdrp, sizeof(*hdrp));=0A= + test_read_bounce(fd, hdrp, sizeof(*hdrp));=0A= TEST_ASSERT(hdrp->e_phentsize =3D=3D sizeof(Elf64_Phdr),=0A= "Unexpected physical header size,\n"=0A= " hdrp->e_phentsize: %x\n"=0A= @@ -146,7 +146,7 @@ void kvm_vm_elf_load(struct kvm_vm *vm, const char *fil= ename)=0A= =0A= /* Read in the program header. */=0A= Elf64_Phdr phdr;=0A= - test_read(fd, &phdr, sizeof(phdr));=0A= + test_read_bounce(fd, &phdr, sizeof(phdr));=0A= =0A= /* Skip if this header doesn't describe a loadable segment. */=0A= if (phdr.p_type !=3D PT_LOAD)=0A= @@ -187,7 +187,7 @@ void kvm_vm_elf_load(struct kvm_vm *vm, const char *fil= ename)=0A= " expected: 0x%jx",=0A= n1, errno, (intmax_t) offset_rv,=0A= (intmax_t) phdr.p_offset);=0A= - test_read(fd, addr_gva2hva(vm, phdr.p_vaddr),=0A= + test_read_bounce(fd, addr_gva2hva(vm, phdr.p_vaddr),=0A= phdr.p_filesz);=0A= }=0A= }=0A= diff --git a/tools/testing/selftests/kvm/lib/io.c b/tools/testing/selftests= /kvm/lib/io.c=0A= index fedb2a741f0b..74419becc8bc 100644=0A= --- a/tools/testing/selftests/kvm/lib/io.c=0A= +++ b/tools/testing/selftests/kvm/lib/io.c=0A= @@ -155,3 +155,26 @@ ssize_t test_read(int fd, void *buf, size_t count)=0A= =0A= return num_read;=0A= }=0A= +=0A= +/* Test read via intermediary buffer=0A= + *=0A= + * Same as test_read, except read(2)s happen into a bounce buffer that is = memcpy'd=0A= + * to buf. For use with buffers that cannot be GUP'd (e.g. guest_memfd VMA= s if=0A= + * guest_memfd was created with GUEST_MEMFD_FLAG_NO_DIRECT_MAP).=0A= + */=0A= +ssize_t test_read_bounce(int fd, void *buf, size_t count)=0A= +{=0A= + void *bounce_buffer;=0A= + ssize_t num_read;=0A= +=0A= + TEST_ASSERT(count >=3D 0, "Unexpected count, count: %li", count);=0A= +=0A= + bounce_buffer =3D malloc(count);=0A= + TEST_ASSERT(bounce_buffer !=3D NULL, "Failed to allocate bounce buffer");= =0A= +=0A= + num_read =3D test_read(fd, bounce_buffer, count);=0A= + memcpy(buf, bounce_buffer, num_read);=0A= + free(bounce_buffer);=0A= +=0A= + return num_read;=0A= +}=0A= -- =0A= 2.50.1=0A= =0A=