From patchwork Tue Feb 11 12:11:27 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fuad Tabba X-Patchwork-Id: 13969541 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 72188C021A6 for ; Tue, 11 Feb 2025 12:11:58 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 65B6928000B; Tue, 11 Feb 2025 07:11:57 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 5E304280004; Tue, 11 Feb 2025 07:11:57 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3E5C128000B; Tue, 11 Feb 2025 07:11:57 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 1C0CD280004 for ; Tue, 11 Feb 2025 07:11:57 -0500 (EST) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id C6036A1558 for ; Tue, 11 Feb 2025 12:11:56 +0000 (UTC) X-FDA: 83107550232.19.253E5B7 Received: from mail-wm1-f74.google.com (mail-wm1-f74.google.com [209.85.128.74]) by imf22.hostedemail.com (Postfix) with ESMTP id F37DFC000A for ; Tue, 11 Feb 2025 12:11:54 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=PSj7ImIG; spf=pass (imf22.hostedemail.com: domain of 3iT6rZwUKCPYrYZZYemmejc.amkjglsv-kkitYai.mpe@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3iT6rZwUKCPYrYZZYemmejc.amkjglsv-kkitYai.mpe@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739275915; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=0Z6E+H+CVdcl32MPqQH2IMjpdY1rfB5MHlrVNopXX+Y=; b=IFGSQGI8r2CRi9CWbzK9nBd5vpK7lB6D0teKObksTLjYICp/Nespeb/9hv7kUBK1CgIwuw 4KlvX0B6IBtkHWoMlxTUN9abZkdPrGt02Y8lFcnFoi9O9KvxYIfWqvPIEYmfj3IsmUbslq ar1m3jLz8ljdZ66j8ybzyQ9Km2v63GM= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=google.com header.s=20230601 header.b=PSj7ImIG; spf=pass (imf22.hostedemail.com: domain of 3iT6rZwUKCPYrYZZYemmejc.amkjglsv-kkitYai.mpe@flex--tabba.bounces.google.com designates 209.85.128.74 as permitted sender) smtp.mailfrom=3iT6rZwUKCPYrYZZYemmejc.amkjglsv-kkitYai.mpe@flex--tabba.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739275915; a=rsa-sha256; cv=none; b=Uz6E+12KfOAN05vthZ0hACiioja1tSygmlOr917lcq6C6HS7UCFScMTrQBhuqiUU6k/zFq h7oW1VYDlkTF4KkEl7Srn0Yh4q0wVAdt3frsW/FRMjUl3FPEirCLdrGmI7e4wiQqQ54DJM x8cvUrc3ZAyC9CDecoKjLORR7TgiOSA= Received: by mail-wm1-f74.google.com with SMTP id 5b1f17b1804b1-4393e89e910so13395695e9.0 for ; Tue, 11 Feb 2025 04:11:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739275913; x=1739880713; darn=kvack.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=0Z6E+H+CVdcl32MPqQH2IMjpdY1rfB5MHlrVNopXX+Y=; b=PSj7ImIGblVYOsFR21Rcj+WQecA6LX3BsiuOX2GP/g6VeXsA3SCy8aUFc9Tob3EkSN dTB5Tt30THQrvPoOU7rOHyDSYncij7Bf0dj8VOUevwKnIgg7cPHYRFpIf73CRv0lfaOV m1UHhpk81T+nZ/uM8BPjsYONvm1unewx8LGXOjgsjnZTNrhaT7ho3tr+pCgwGWlnKqWh /CAJHiYv/qVtn8/u3uY3cz4Czl41wFT5DEg71qPmqMCO23YnIFCe8vW6t2JqzOWUgqsQ BkCk6etlA92jAUTDslmUVeyQCrBlN7AuR8zQZpwDpPK/ejkB/BiQ4+0B+NbhDkAj9t+n s+aQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739275913; x=1739880713; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=0Z6E+H+CVdcl32MPqQH2IMjpdY1rfB5MHlrVNopXX+Y=; b=xKbbgFJWFzS3H7pWvhluzjXLdQzxaQtp+2OuCHYDTzvk7VoqxVi63iTMJVFdKXejbI ug8p+AaIPcPcYpAwHt/WEbFbKYKSHFy1t0MPTGb6DxR0lOZclEoGGCuU4Op4IkeHipkw X/u9P0aEdDMBOWGigqRSSW8C1yKMdrxa6GjS3SwABCUF4UCW9mUhVPrGufi5hB7XxN4x vEiQIsoA9ARW+Z7SVKX4X6rUXdENn7EY4A5X+H4iieaxtgrRYkc2XVwkt0etUQXzOShb aU7LaxVR2UZT2WtxMrWzAEpwyjpa1N4PNxJplju2gcVJ5Eab+7Nqk/wxucWBO2EhsOsF WATg== X-Forwarded-Encrypted: i=1; AJvYcCXZMVb9kgubQ1FLteWONcF6Kjtqk6NtBDUsGP3XmRwd4o5vhegdvFP1OR/fBYoPJaJyTZqEm8Sdmw==@kvack.org X-Gm-Message-State: AOJu0YxhDiZkvBQ/ucL5VT4TvtRmsYvUfiMc/D2Drwcefm/TuixsBjq3 XDs5F/HGR4Co1wXWS5e0YBxVnVygNbDp/t1qOr5JW1pMV62zBsr5PfHSL7k66Dqrz3Gw36iGyw= = X-Google-Smtp-Source: AGHT+IFt5+7gpCuP4nql5X9TS6iRdHHoSwQcx2BpSBXHd9t1p6f34BIlOh4b2HrfUl+cmCslb38pfVfhKw== X-Received: from wmbea8.prod.google.com ([2002:a05:600c:6748:b0:439:42cb:132d]) (user=tabba job=prod-delivery.src-stubby-dispatcher) by 2002:a05:600c:1c8c:b0:434:a468:4a57 with SMTP id 5b1f17b1804b1-439249ca925mr120732765e9.26.1739275913615; Tue, 11 Feb 2025 04:11:53 -0800 (PST) Date: Tue, 11 Feb 2025 12:11:27 +0000 In-Reply-To: <20250211121128.703390-1-tabba@google.com> Mime-Version: 1.0 References: <20250211121128.703390-1-tabba@google.com> X-Mailer: git-send-email 2.48.1.502.g6dc24dfdaf-goog Message-ID: <20250211121128.703390-12-tabba@google.com> Subject: [PATCH v3 11/11] KVM: guest_memfd: selftests: guest_memfd mmap() test when mapping is allowed From: Fuad Tabba To: kvm@vger.kernel.org, linux-arm-msm@vger.kernel.org, linux-mm@kvack.org Cc: pbonzini@redhat.com, chenhuacai@kernel.org, mpe@ellerman.id.au, anup@brainfault.org, paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, seanjc@google.com, viro@zeniv.linux.org.uk, brauner@kernel.org, willy@infradead.org, akpm@linux-foundation.org, xiaoyao.li@intel.com, yilun.xu@intel.com, chao.p.peng@linux.intel.com, jarkko@kernel.org, amoorthy@google.com, dmatlack@google.com, yu.c.zhang@linux.intel.com, isaku.yamahata@intel.com, mic@digikod.net, vbabka@suse.cz, vannapurve@google.com, ackerleytng@google.com, mail@maciej.szmigiero.name, david@redhat.com, michael.roth@amd.com, wei.w.wang@intel.com, liam.merwick@oracle.com, isaku.yamahata@gmail.com, kirill.shutemov@linux.intel.com, suzuki.poulose@arm.com, steven.price@arm.com, quic_eberman@quicinc.com, quic_mnalajal@quicinc.com, quic_tsoni@quicinc.com, quic_svaddagi@quicinc.com, quic_cvanscha@quicinc.com, quic_pderrin@quicinc.com, quic_pheragu@quicinc.com, catalin.marinas@arm.com, james.morse@arm.com, yuzenghui@huawei.com, oliver.upton@linux.dev, maz@kernel.org, will@kernel.org, qperret@google.com, keirf@google.com, roypat@amazon.co.uk, shuah@kernel.org, hch@infradead.org, jgg@nvidia.com, rientjes@google.com, jhubbard@nvidia.com, fvdl@google.com, hughd@google.com, jthoughton@google.com, tabba@google.com X-Rspam-User: X-Stat-Signature: nf5oo1a74a39x85b93tdhgd16icfb974 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: F37DFC000A X-HE-Tag: 1739275914-430874 X-HE-Meta: U2FsdGVkX1+bdqavD9UVRGBzaSPpu7/9RKSf4pV2zUiq6JDg92lIVZrg3lYnuoaXJAoN6rSZ0xs8ZNkj32Nsenl93wuXtGNIpBU+6xTwEFBtndhHEtjZb8hZ5YV61cby+9rl/cWsZiEtCIfIDXPPN9cYy3XLYeANmtMObXeNTVAxIRrNzj3V3RFb6SEnx9CG8rGocKEV3UlJwV9p2xxA/kgEU/XjDHPXi0O+ps6nWCdNIbQXfEQTIErQSu4/BLLMu7mnJFXB88E46Iy1N21hUaR6F0VeY9sc5bxmd8sTqbyNNuE1DnJYq1btzYpkXBGBMyEPQ1hyzb82CeD70Yw3/6b10DoWvNajYvUQbiDy8i5QJ3shSDBa3+N0mMRpBNEhTK91fJZj8NyNH6VrCdqvpq1wY/SzUQ/HPsjGz0Kjfcjjw6DBDQUW3zTPbNy/z77/KId7HL7YODcfh5ZnUt8b1BHnAjVgqxayvpcMd/F1gETmYuqADmWw+sBwQ5CFaceu2SbAoDmPlvBuMQSTCV+Yzny5jeVzN01lmFGwKxYDY1c/HLq/xK07M+jZNNon35Ii25mxAhBZI/h3jchLA8fIiaUtBK/AFDOKWxeRJI8/ovv3BJEyYkCQMX72GfCkyrKwntLZqLXGCqHdp1tmvqrDWazQPA3JPL4ANxmWKtHyNUGiGQaraP1I1vngkTO6t+YpLd5TzeslvAiWzzSvO9Da69W8Bt9jhvG2QGckTsv1HFPSllhbsfrfFVBfqTHhlM0xIKPkNYr6QDAKyi321CwFa/8NaNDHeDLzJNuHisqkhyzjp19h2OzP+QP3lr316opmE9d0SlBhPKJUgmYu8QW9sgmHalexXtDUqSC1omMTy4sXZl6y9F+HiPKPHOSoIO2q8LxZQzf7syeSlGDA2FFU49a/vIILHWnyZhNRbBiVXyUFKkVNOl5ABk1snIifFUgfu5IFbVCFA1LQXDysrmz JsVti5AA CKTZJizt3dyDvN3dBrHFcuqQ733tedIXqSlFlQNtR49AuduA6lV7fr5LUOQJA7zUAJAxVDl1U+r0qVOh++GQM8Sq1binUFi7rCUbcpYvuKKiW6BvAJX/Do6g/Yr/lGGX1TxHYNizOKQFGgA24qVpLvRjOt0LD5Wow4xCHyF0Gjv/uoTRtnMJSUqEwFGngkVKsBi6o2YH7yXamxUEhj/o1q2U1vlcFynh4crPfAKsPjwrpe9IrItyCA4/bUt0BiR9AUktw22/ToYwI+0fzDScRFYQt7wokdDauzsAjH13pAvwZSlfaOLA3au9Z2e756IJzzbFFrewFyqY4X3KezjbXfL8hEZ/nAi1Y+eTLqCmga1hhar3hSa40d18IinM+PGUQhu0Z3+qLaF9YKMWCPfTO4ZudAwVbLZvPJ9RfgeknpivwIUNZeQrAoouuzypGD1o9zq0MeE4dzneKnMLDTe0dYWk5H3/nKwKBprRig6R5AKx7p7rz4sxSnyWzpGI6pBR8Bohsz3jhPTrKAGG35GU04ApCN/MtEicBedLkBbPh9v/GhEO5lC8SPBJA36TC07J9s1kj+LkZFTbvBFVs6CppSG1oJ6BhdimwH7ydLy5+Fyht6IsePTmnPad7b6exPtYXBn18C6ErqaC5BtTmc8P4cBplyQ== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Expand the guest_memfd selftests to include testing mapping guest memory for VM types that support it. Also, build the guest_memfd selftest for aarch64. Signed-off-by: Fuad Tabba --- tools/testing/selftests/kvm/Makefile.kvm | 1 + .../testing/selftests/kvm/guest_memfd_test.c | 75 +++++++++++++++++-- tools/testing/selftests/kvm/lib/kvm_util.c | 3 +- 3 files changed, 71 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/kvm/Makefile.kvm b/tools/testing/selftests/kvm/Makefile.kvm index 4277b983cace..c9a3f30e28dd 100644 --- a/tools/testing/selftests/kvm/Makefile.kvm +++ b/tools/testing/selftests/kvm/Makefile.kvm @@ -160,6 +160,7 @@ TEST_GEN_PROGS_arm64 += coalesced_io_test TEST_GEN_PROGS_arm64 += demand_paging_test TEST_GEN_PROGS_arm64 += dirty_log_test TEST_GEN_PROGS_arm64 += dirty_log_perf_test +TEST_GEN_PROGS_arm64 += guest_memfd_test TEST_GEN_PROGS_arm64 += guest_print_test TEST_GEN_PROGS_arm64 += get-reg-list TEST_GEN_PROGS_arm64 += kvm_create_max_vcpus diff --git a/tools/testing/selftests/kvm/guest_memfd_test.c b/tools/testing/selftests/kvm/guest_memfd_test.c index ce687f8d248f..f1e89f72b89f 100644 --- a/tools/testing/selftests/kvm/guest_memfd_test.c +++ b/tools/testing/selftests/kvm/guest_memfd_test.c @@ -34,12 +34,48 @@ static void test_file_read_write(int fd) "pwrite on a guest_mem fd should fail"); } -static void test_mmap(int fd, size_t page_size) +static void test_mmap_allowed(int fd, size_t total_size) { + size_t page_size = getpagesize(); + const char val = 0xaa; + char *mem; + int ret; + int i; + + mem = mmap(NULL, total_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + TEST_ASSERT(mem != MAP_FAILED, "mmaping() guest memory should pass."); + + memset(mem, val, total_size); + for (i = 0; i < total_size; i++) + TEST_ASSERT_EQ(mem[i], val); + + ret = fallocate(fd, FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE, 0, + page_size); + TEST_ASSERT(!ret, "fallocate the first page should succeed"); + + for (i = 0; i < page_size; i++) + TEST_ASSERT_EQ(mem[i], 0x00); + for (; i < total_size; i++) + TEST_ASSERT_EQ(mem[i], val); + + memset(mem, val, total_size); + for (i = 0; i < total_size; i++) + TEST_ASSERT_EQ(mem[i], val); + + ret = munmap(mem, total_size); + TEST_ASSERT(!ret, "munmap should succeed"); +} + +static void test_mmap_denied(int fd, size_t total_size) +{ + size_t page_size = getpagesize(); char *mem; mem = mmap(NULL, page_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); TEST_ASSERT_EQ(mem, MAP_FAILED); + + mem = mmap(NULL, total_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + TEST_ASSERT_EQ(mem, MAP_FAILED); } static void test_file_size(int fd, size_t page_size, size_t total_size) @@ -170,19 +206,30 @@ static void test_create_guest_memfd_multiple(struct kvm_vm *vm) close(fd1); } -int main(int argc, char *argv[]) +unsigned long get_shared_type(void) { - size_t page_size; +#ifdef __x86_64__ + return KVM_X86_SW_PROTECTED_VM; +#endif +#ifdef __aarch64__ + return KVM_VM_TYPE_ARM_SW_PROTECTED; +#endif + return 0; +} + +void test_vm_type(unsigned long type, bool is_shared) +{ + struct kvm_vm *vm; size_t total_size; + size_t page_size; int fd; - struct kvm_vm *vm; TEST_REQUIRE(kvm_has_cap(KVM_CAP_GUEST_MEMFD)); page_size = getpagesize(); total_size = page_size * 4; - vm = vm_create_barebones(); + vm = vm_create_barebones_type(type); test_create_guest_memfd_invalid(vm); test_create_guest_memfd_multiple(vm); @@ -190,10 +237,26 @@ int main(int argc, char *argv[]) fd = vm_create_guest_memfd(vm, total_size, 0); test_file_read_write(fd); - test_mmap(fd, page_size); + + if (is_shared) + test_mmap_allowed(fd, total_size); + else + test_mmap_denied(fd, total_size); + test_file_size(fd, page_size, total_size); test_fallocate(fd, page_size, total_size); test_invalid_punch_hole(fd, page_size, total_size); close(fd); + kvm_vm_release(vm); +} + +int main(int argc, char *argv[]) +{ + test_vm_type(VM_TYPE_DEFAULT, false); + + if (kvm_has_cap(KVM_CAP_GMEM_SHARED_MEM)) + test_vm_type(get_shared_type(), true); + + return 0; } diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/selftests/kvm/lib/kvm_util.c index 33fefeb3ca44..17aed505746b 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -347,9 +347,8 @@ struct kvm_vm *____vm_create(struct vm_shape shape) } #ifdef __aarch64__ - TEST_ASSERT(!vm->type, "ARM doesn't support test-provided types"); if (vm->pa_bits != 40) - vm->type = KVM_VM_TYPE_ARM_IPA_SIZE(vm->pa_bits); + vm->type |= KVM_VM_TYPE_ARM_IPA_SIZE(vm->pa_bits); #endif vm_open(vm);