From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) (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 88FDD4052AE for ; Wed, 26 Aug 2026 09:19:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.199 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787735963; cv=none; b=F11YnIy+tQnMmwtLCGx/oIPnnQq1BPk8OdYFRPZKvqlTs+P/7s6Gl8qI3LHTiEdrmqzvGdfphvbm2EbVRWwtfMuR8lR2h0l4PETYyE0SeEAWRm10sysQqCQxA4zTUPW+jY63w4gwVMfp7WcQtw6/abt3hMNv7GqJymJi5aklrQw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787735963; c=relaxed/simple; bh=aNpKmkec8/mPoC6VqfSFdL89LVrYPgyUp4I7FMfqF28=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=B7K+YTU0NFGgDzUnuhdPrlE3cCqBhkoEU1QSrqEg6rLoCg1nbHlHrgCRcPkqTwoKVx4wTxYLehRHkmPELkB2HEf+bhaP6Wq4Fc2ZHp1p7s6fhcNaDEC8/zgybnv98MSe/0FDkIL1y/7LXX6CZ9PcpL15aQCnee3cOD3bYmi+DTc= 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=PMy1esxN; arc=none smtp.client-ip=209.85.214.199 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="PMy1esxN" Received: by mail-pl1-f199.google.com with SMTP id d9443c01a7336-2cfe48ca1efso12958645ad.0 for ; Wed, 26 Aug 2026 02:19:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1787735958; x=1788340758; darn=lists.linux.dev; h=content-type:cc:to:from:subject:message-id:references:mime-version :in-reply-to:date:from:to:cc:subject:date:message-id:reply-to :content-type; bh=PLqZOLBapggAgTh0v8ToB3YKqPPya91M3lrmoBKPLbM=; b=PMy1esxNISRwGw2GtSBqs10GpCKl0JadIyxk77bCLgENGaiSVT+pxvqNKZNqSPDgjk w1teBW44NidcJWMt3iRsYiKZwjdutvrUw33/j/61oG8URPiqhMK2a66VWE1Y1OOxCjc3 q1m+4Ldi6xsR6bqyal4PKguMKUv0NEQ9uiFZy9igpYLyxFOEgYeh468RDmMtWm0spPS1 d32GQBKeWGKDkgRMzUiBiubVlt2XT6g2Y4mWvtTwBD8/TIbLm3vYPSeG8yflwngels7f cAQANG5ib2mMFyB68ezzJMju24kLGu7Eq50lXiKTbneOeFF6pqcuE9f5iPYRiddtz6Nx yVoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1787735958; x=1788340758; h=content-type: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:content-type; bh=PLqZOLBapggAgTh0v8ToB3YKqPPya91M3lrmoBKPLbM=; b=os5nwtQCY/frwxV1ZoWPb16ptgyEPim1yDM8S/bP24UqAmqsFq2+Ry0rRSsR4oPYNM K/w4RW0S/SK02/SkYg8er/GzK+SZuTh6DepX93kGSkv4Nsk1sq19Zp5R9g8mEfyN8/bV FpfYn2QaZ5kBdIlpLRvuEH/wpuk1poXTEC5/LV211+YGMu1oZ6LOZc4LhS5mdh/4XyvE 0rFwNbonHufI8oSvCBXv16P3NRXIGjIr1sAy6vfGGZODyKnkQgsGKITKtlxjRG2Oq72H 4AI1aALwco/cHCKJZX49s8DLhbs7KDuuurzhT/iZfgryXkp0/mKkgYNUFiq20QT17FIi BfeQ== X-Forwarded-Encrypted: i=1; AHgh+RqvHXalxDXSP3f+IfBJ6eONO7UhyIFblh/pxpXTvnM8jmAdD2qsejZKyAYy1dcL/XNkzABx2igoay+F@lists.linux.dev X-Gm-Message-State: AFuF++m9FgWe2OG++G4vvssu9r/gM47cR9URij4StBl9DJGV26Jp1KWr EVDHGNIzDOq43GT+cV/+UFe3jQBL866+kLZLwgTbeqiidB4S8Wvv6bvqT60Zx/ENjrsAB8R6LCt +TAcc1JzWsmfUg7G2l86O+Nk8Cw== X-Received: from plkh12.prod.google.com ([2002:a17:903:19ec:b0:2d6:e427:73fc]) (user=ackerleytng job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:1a45:b0:2cc:d6de:d597 with SMTP id d9443c01a7336-2d707a9fecbmr93482805ad.7.1787735957517; Wed, 26 Aug 2026 02:19:17 -0700 (PDT) Date: Wed, 26 Aug 2026 09:18:39 +0000 In-Reply-To: <20260826-gmem-inplace-conversion-v11-0-0a15d8a799aa@google.com> Precedence: bulk X-Mailing-List: linux-coco@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260826-gmem-inplace-conversion-v11-0-0a15d8a799aa@google.com> X-Developer-Key: i=ackerleytng@google.com; a=ed25519; pk=sAZDYXdm6Iz8FHitpHeFlCMXwabodTm7p8/3/8xUxuU= X-Developer-Signature: v=1; a=ed25519-sha256; t=1787735885; l=2853; i=ackerleytng@google.com; s=20260225; h=from:subject:message-id; bh=KrfHutYDID9ZpS/QrQgxXNh2ivfNp+DkdslA3yVHWOg=; b=AvojirCrTsfwdIbnWA5buIntUCOjUNcNGy9Bkh8lUDQsgnH2HyYawXH79uUJxeFFALY27Ytjx awXjeiPTATiBTlEnjkf3iDdDkOOiMl8oaR9xK+2t16BzXlg+JCNL7Kl X-Mailer: b4 0.16.0 Message-ID: <20260826-gmem-inplace-conversion-v11-41-0a15d8a799aa@google.com> Subject: [PATCH v11 41/46] KVM: selftests: Provide common function to set memory attributes From: Ackerley Tng To: aik@amd.com, andrew.jones@linux.dev, binbin.wu@linux.intel.com, brauner@kernel.org, chao.p.peng@linux.intel.com, david@kernel.org, jmattson@google.com, jthoughton@google.com, michael.roth@amd.com, oupton@kernel.org, pankaj.gupta@amd.com, qperret@google.com, rick.p.edgecombe@intel.com, rientjes@google.com, shivankg@amd.com, steven.price@arm.com, willy@infradead.org, wyihan@google.com, yan.y.zhao@intel.com, forkloop@google.com, pratyush@kernel.org, suzuki.poulose@arm.com, aneesh.kumar@kernel.org, liam@infradead.org, Paolo Bonzini , Sean Christopherson , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, "H. Peter Anvin" , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Jonathan Corbet , Shuah Khan , Shuah Khan , Vishal Annapurve , Andrew Morton , Chris Li , Kairui Song , Kemeng Shi , Nhat Pham , Barry Song , Axel Rasmussen , Yuanchu Xie , Wei Xu , Youngjun Park , Qi Zheng , Shakeel Butt , Kiryl Shutsemau , Baoquan He , Jason Gunthorpe , John Hubbard , Peter Xu , tarunsahu@google.com, Fuad Tabba , Vlastimil Babka Cc: kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, linux-coco@lists.linux.dev, Ackerley Tng Content-Type: text/plain; charset="utf-8" From: Sean Christopherson Introduce vm_mem_set_memory_attributes(), which handles setting of memory attributes for a range of guest physical addresses, regardless of whether the attributes should be set via guest_memfd or via the memory attributes at the VM level. Refactor existing vm_mem_set_{shared,private} functions to use the new function. Opportunistically update the size parameter to use size_t instead of u64. Signed-off-by: Sean Christopherson Reviewed-by: Fuad Tabba Tested-by: Shivank Garg Co-developed-by: Ackerley Tng Signed-off-by: Ackerley Tng --- tools/testing/selftests/kvm/include/kvm_util.h | 46 +++++++++++++++++++------- 1 file changed, 34 insertions(+), 12 deletions(-) diff --git a/tools/testing/selftests/kvm/include/kvm_util.h b/tools/testing/selftests/kvm/include/kvm_util.h index 795c9eb311071..777fa3dbf88d6 100644 --- a/tools/testing/selftests/kvm/include/kvm_util.h +++ b/tools/testing/selftests/kvm/include/kvm_util.h @@ -454,18 +454,6 @@ static inline void vm_set_memory_attributes(struct kvm_vm *vm, gpa_t gpa, vm_ioctl(vm, KVM_SET_MEMORY_ATTRIBUTES, &attr); } -static inline void vm_mem_set_private(struct kvm_vm *vm, gpa_t gpa, - u64 size) -{ - vm_set_memory_attributes(vm, gpa, size, KVM_MEMORY_ATTRIBUTE_PRIVATE); -} - -static inline void vm_mem_set_shared(struct kvm_vm *vm, gpa_t gpa, - u64 size) -{ - vm_set_memory_attributes(vm, gpa, size, 0); -} - static inline int __gmem_set_memory_attributes(int fd, u64 offset, size_t size, u64 attributes, u64 *error_offset) @@ -532,6 +520,40 @@ static inline void gmem_set_shared(int fd, u64 offset, size_t size) gmem_set_memory_attributes(fd, offset, size, 0); } +static inline void vm_mem_set_memory_attributes(struct kvm_vm *vm, gpa_t gpa, + size_t size, u64 attrs) +{ + if (kvm_has_gmem_attributes) { + gpa_t end = gpa + size; + off_t fd_offset; + gpa_t addr; + size_t len; + int fd; + + for (addr = gpa; addr < end; addr += len) { + fd = kvm_gpa_to_guest_memfd(vm, addr, &fd_offset, &len); + len = min(end - addr, len); + + gmem_set_memory_attributes(fd, fd_offset, len, attrs); + } + } else { + vm_set_memory_attributes(vm, gpa, size, attrs); + } +} + +static inline void vm_mem_set_private(struct kvm_vm *vm, gpa_t gpa, + size_t size) +{ + vm_mem_set_memory_attributes(vm, gpa, size, + KVM_MEMORY_ATTRIBUTE_PRIVATE); +} + +static inline void vm_mem_set_shared(struct kvm_vm *vm, gpa_t gpa, + size_t size) +{ + vm_mem_set_memory_attributes(vm, gpa, size, 0); +} + void vm_guest_mem_fallocate(struct kvm_vm *vm, gpa_t gpa, u64 size, bool punch_hole); -- 2.55.0.887.g758fc8c411-goog