From nobody Wed Feb 11 07:50:06 2026 Received: from mail-pj1-f74.google.com (mail-pj1-f74.google.com [209.85.216.74]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E38DE38F24F for ; Mon, 2 Feb 2026 22:30:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770071447; cv=none; b=OgeUTg1bk0iPpq/FQnoowbLCiO7E0m5/IfB1LdKOYisBaQ/lW9mowngtW0TnSOJfQGIlvJzvEWcWhwuhyEncrTzyoZ8VTREdPMczvtrVWLwQD6zk7gTwGJk0/cWyg7bRO8G5fv5DEzxVLFzsyeiCJIyVZ/HzLHDTO/Og9Y+kkiw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770071447; c=relaxed/simple; bh=/dWMpq6vE/7HkK6yE2U3JYfQaSrCbMYJZFUDKCzqBMc=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=XF+cfiYCjGFcGCGoh4jYf2u35Mfcb5RxmFjqo1XTYlSoI8RqRGa0PngjqhUglRCZd4msL0EKJDvDSTYU19c3NLXSaA6NcDyG/1j/wgQx0NGxFKur0mwYTCoCO/fHvVoe07zu4ApCBsrnhGWexqneShGO0l/fbgBsN46yr/JvCzQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--ackerleytng.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=U2DNGNOK; arc=none smtp.client-ip=209.85.216.74 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--ackerleytng.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="U2DNGNOK" Received: by mail-pj1-f74.google.com with SMTP id 98e67ed59e1d1-35449510446so3088759a91.0 for ; Mon, 02 Feb 2026 14:30:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1770071445; x=1770676245; darn=vger.kernel.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=CUQIYjzitQKlRJasc2c/7ZSNL/xGsJJinByZkwdMusA=; b=U2DNGNOKK6otz95PiYFOKVgsyHNIQksSRnlIaN0j1ex2jxeIcj+eK8l0oZXluImRe2 KJrav+HclgFkFfqEHH9nArdsKVMIxHlsNWiUCzzjOu01yEq4L2QX6U0rr42CtAvI7qrq qcQyETwdeL+KTiki3XKuE0PmG5LATgTz7T3u29aaGg/DsiBqP9knndX7/h53DH+6tUgn GGxQue5e15fkWwZ6ZLkAN6OgOGP/FXI+q0dW6uMcLtU4wAvcZCkDD2HUXs38lmrNH214 boQAo11jZcIE6Ztx6p1aeNut1Kpz32ZxJfhudElzesC62yhZ7CuIhlqzIt09+/NwXsUl uN8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1770071445; x=1770676245; 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=CUQIYjzitQKlRJasc2c/7ZSNL/xGsJJinByZkwdMusA=; b=OmJdfh4WenkVsG1G3eF/jPX+F4I40YeYU31E5R3aiYy2K7PyCIuPhquGQ5GrL3dpP4 k3jdtAqAM7kZpFHJeGJaoC0c1w4NO4nP1ic+3LiKj05vV1p0tja1BjFWm/xEcMFjOqrp 9w2rh51gdL1TlNUNSmm4+7FGImw/qjz7+57KJ3yF05nvusI4ZgC/ZSImEhWGs8KWw4MP cC/bK14kIZ9O356OHLidiPpTwAzt0k82yPu/qOEBFNlLH3ZjYsr+EGnZS4pHawfuU0m3 haq5BKsgUOt9ke6cEHNOQihzPeTgFpS20EOtCNhC7V9rtWvsH+0/icWbW1jm2xdDaEpR zzjA== X-Forwarded-Encrypted: i=1; AJvYcCXA2T40fYT9eisY79z0htdirDNVxfO7sjD+ww8gAvLgkT5z5Vcx5OXAxzBckS6S8eYcmraSyhvHmDqa02k=@vger.kernel.org X-Gm-Message-State: AOJu0YzaqOSw5/KKYXNWHjIplK5E9vYtUF+OeSF9DanDA7HzNG2o2+h7 /aXZy72B7g4AMRcUgRKOp9ScOHQrg4P6ButedjUIizaJJGuSxhnsfc6j2DSo+7FWD4svQdttUJ8 qqlO3DL+SNNnWvI37xN2ZPYZyHA== X-Received: from pjva4.prod.google.com ([2002:a17:90a:d804:b0:352:d931:fa5b]) (user=ackerleytng job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:2e4a:b0:33f:f22c:8602 with SMTP id 98e67ed59e1d1-3543b3d64fdmr12780204a91.26.1770071445347; Mon, 02 Feb 2026 14:30:45 -0800 (PST) Date: Mon, 2 Feb 2026 14:29:52 -0800 In-Reply-To: Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.53.0.rc1.225.gd81095ad13-goog Message-ID: Subject: [RFC PATCH v2 14/37] KVM: selftests: Rename guest_memfd{,_offset} to gmem_{fd,offset} From: Ackerley Tng To: kvm@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-trace-kernel@vger.kernel.org, x86@kernel.org Cc: aik@amd.com, andrew.jones@linux.dev, binbin.wu@linux.intel.com, bp@alien8.de, brauner@kernel.org, chao.p.peng@intel.com, chao.p.peng@linux.intel.com, chenhuacai@kernel.org, corbet@lwn.net, dave.hansen@linux.intel.com, david@kernel.org, hpa@zytor.com, ira.weiny@intel.com, jgg@nvidia.com, jmattson@google.com, jroedel@suse.de, jthoughton@google.com, maobibo@loongson.cn, mathieu.desnoyers@efficios.com, maz@kernel.org, mhiramat@kernel.org, michael.roth@amd.com, mingo@redhat.com, mlevitsk@redhat.com, oupton@kernel.org, pankaj.gupta@amd.com, pbonzini@redhat.com, prsampat@amd.com, qperret@google.com, ricarkol@google.com, rick.p.edgecombe@intel.com, rientjes@google.com, rostedt@goodmis.org, seanjc@google.com, shivankg@amd.com, shuah@kernel.org, steven.price@arm.com, tabba@google.com, tglx@linutronix.de, vannapurve@google.com, vbabka@suse.cz, willy@infradead.org, wyihan@google.com, yan.y.zhao@intel.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Sean Christopherson Rename local variables and function parameters for the guest memory file descriptor and its offset to use a "gmem_" prefix instead of "guest_memfd_". No functional change intended. Signed-off-by: Sean Christopherson --- tools/testing/selftests/kvm/lib/kvm_util.c | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/testing/selftests/kvm/lib/kvm_util.c b/tools/testing/sel= ftests/kvm/lib/kvm_util.c index 1d69baf900a2..6daeb4f945a0 100644 --- a/tools/testing/selftests/kvm/lib/kvm_util.c +++ b/tools/testing/selftests/kvm/lib/kvm_util.c @@ -914,7 +914,7 @@ void vm_set_user_memory_region(struct kvm_vm *vm, uint3= 2_t slot, uint32_t flags, =20 int __vm_set_user_memory_region2(struct kvm_vm *vm, uint32_t slot, uint32_= t flags, uint64_t gpa, uint64_t size, void *hva, - uint32_t guest_memfd, uint64_t guest_memfd_offset) + uint32_t gmem_fd, uint64_t gmem_offset) { struct kvm_userspace_memory_region2 region =3D { .slot =3D slot, @@ -922,8 +922,8 @@ int __vm_set_user_memory_region2(struct kvm_vm *vm, uin= t32_t slot, uint32_t flag .guest_phys_addr =3D gpa, .memory_size =3D size, .userspace_addr =3D (uintptr_t)hva, - .guest_memfd =3D guest_memfd, - .guest_memfd_offset =3D guest_memfd_offset, + .guest_memfd =3D gmem_fd, + .guest_memfd_offset =3D gmem_offset, }; =20 TEST_REQUIRE_SET_USER_MEMORY_REGION2(); @@ -933,10 +933,10 @@ int __vm_set_user_memory_region2(struct kvm_vm *vm, u= int32_t slot, uint32_t flag =20 void vm_set_user_memory_region2(struct kvm_vm *vm, uint32_t slot, uint32_t= flags, uint64_t gpa, uint64_t size, void *hva, - uint32_t guest_memfd, uint64_t guest_memfd_offset) + uint32_t gmem_fd, uint64_t gmem_offset) { int ret =3D __vm_set_user_memory_region2(vm, slot, flags, gpa, size, hva, - guest_memfd, guest_memfd_offset); + gmem_fd, gmem_offset); =20 TEST_ASSERT(!ret, "KVM_SET_USER_MEMORY_REGION2 failed, errno =3D %d (%s)", errno, strerror(errno)); @@ -946,7 +946,7 @@ void vm_set_user_memory_region2(struct kvm_vm *vm, uint= 32_t slot, uint32_t flags /* FIXME: This thing needs to be ripped apart and rewritten. */ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_backing_src_type src_type, uint64_t gpa, uint32_t slot, uint64_t npages, uint32_t flags, - int guest_memfd, uint64_t guest_memfd_offset) + int gmem_fd, uint64_t gmem_offset) { int ret; struct userspace_mem_region *region; @@ -1029,12 +1029,12 @@ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_back= ing_src_type src_type, region->mmap_size +=3D alignment; =20 if (flags & KVM_MEM_GUEST_MEMFD) { - if (guest_memfd < 0) { - uint32_t guest_memfd_flags =3D 0; + if (gmem_fd < 0) { + uint32_t gmem_flags =3D 0; =20 - TEST_ASSERT(!guest_memfd_offset, + TEST_ASSERT(!gmem_offset, "Offset must be zero when creating new guest_memfd"); - guest_memfd =3D vm_create_guest_memfd(vm, mem_size, guest_memfd_flags); + gmem_fd =3D vm_create_guest_memfd(vm, mem_size, gmem_flags); } else { /* * Install a unique fd for each memslot so that the fd @@ -1042,11 +1042,11 @@ void vm_mem_add(struct kvm_vm *vm, enum vm_mem_back= ing_src_type src_type, * needing to track if the fd is owned by the framework * or by the caller. */ - guest_memfd =3D kvm_dup(guest_memfd); + gmem_fd =3D kvm_dup(gmem_fd); } =20 - region->region.guest_memfd =3D guest_memfd; - region->region.guest_memfd_offset =3D guest_memfd_offset; + region->region.guest_memfd =3D gmem_fd; + region->region.guest_memfd_offset =3D gmem_offset; } else { region->region.guest_memfd =3D -1; } --=20 2.53.0.rc1.225.gd81095ad13-goog