From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=209.85.221.41 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1793116047; b=UrU142N4nC7j6DRsBNbfwL1+H7eR26swzalcM8BWuJCchtWxGuWt8W4POO85sZZjJFS/ pmsMRQN9onC16AgIwMSwf5/CfVetOBLqSNx9liOcaB7NeiJfbhfTzhlZjnqc+8sr36Ew6 F9MU35LCbenuRpXr9t3/KdAc911BMJW7f4S3bv4aKlLgM22V/rHcTByO7ztQXCFadQVRw 5rwtSfVN6mxwdAHsq7UbSH3FzWzMQZXKB282IWH8vRy73AnpYZkQzLXd7Lsi32qIe+wMy KUnwk9kkuHMSBxooGvQMQNfx4Tp+iLBNQo6KYXQBCzjdgcsSXHj3GpkuL+tJCFtUJCg== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1793116047; h=DMARC-Filter:Received:DKIM-Signature:X-Google-DKIM-Signature: X-Forwarded-Encrypted:X-Gm-Message-State:X-Gm-Gg:X-Received:Received: From:To:Cc:Subject:Date:Message-ID:X-Mailer:In-Reply-To:References: MIME-Version:Content-Transfer-Encoding; bh=d2ojhVyA7G70YSFxIWDEXLUjmLV19PosvKcY5O6DkLk=; b=ixCvRDmR6wiXZ1R0POgUYlrBqKTgI47o0R4B4/b3mKTCnWDFObqjy6HKhHCqb85JfGrd 3Tbzqcx5VEajc8qv95gHKDqs1eaItmdFYS70VnZlHWySkkDiWIDn+RgejIPgKUeXIaPSD ai0YLpxDhO07gFniqCrXKG2pQ1V9fanLaAYenGJUmlH84sP55EGcksR54FVSBo8qrKzme G8xyMrpdK5iuhYAaBZUJFwwD+K7Idx5eSayl7cTt/h7pRX8iQpyTHB3FSLsh6yruUTRIf ciMkfQtmtBP8zZonySOlLA7fZrlvVsEEVYf7mF7ZHBbIjwwj/B183vTtaElVQUyg7cw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=XE98cETw; arc=none smtp.remote-ip=209.85.221.41 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature ECDSA (prime256v1) server-digest SHA256) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C4A1B606FCBE for ; Tue, 27 Oct 2026 15:47:26 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.2 smtp.subspace.kernel.org C4A1B606FCBE Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key, unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20260707 header.b=XE98cETw Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-48df8fe8513so3909197f8f.0 for ; Tue, 27 Oct 2026 08:47:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20260707; t=1793116045; x=1793720845; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=d2ojhVyA7G70YSFxIWDEXLUjmLV19PosvKcY5O6DkLk=; b=XE98cETwycVPwnL/v/bcd5mzVDtZPmtiEZJRaNSt2jaeskB0egpb5DUeglpzybAmHm 214b836vOPjlKBFQeDWIHZj9Lio4CSd5bZeslhn76oi/6MQ6+RphFP/hO2dp6L73N0Ub ZEqg3QEaGMPsr9xYxix3xSLymwVnoi4kcxvDhEX2sZqS66MNbylqUoLHiKhh4M2QJYs4 Pzcge3jP8M2kEUJWXBanDnOKMYiTbFDx4eQjO4QXi4JmFq2MA4WBt+TpjokgsK3NVcSS c/QupuT0/h+r4CFaeL5RmWN/gmwiTkm0Kc+sw0QulYS+ujXPCnbZMBlr7I3pLQw+EpcW fZGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20260707; t=1793116045; x=1793720845; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=d2ojhVyA7G70YSFxIWDEXLUjmLV19PosvKcY5O6DkLk=; b=iMxenAKBFfUSfZ614/r4XskkkLHF0+0S4F/AWxW0DhJ0BbEK4QOd2GPKqRJTfblYTw uFnVAuBpgowrL+8cHzUK4d9VSpwfIG+ySIdxfd6DQQrLkVM4uqC4cspFxqz4/c6zyw8C Qd2Panb236/MmHMIQWxxRlEPiiqmOOqjuS5S+wJJlcex4TqfjdEoGQ/V+nGQ/ZBNHcPN +P1WsaCeqETjVCzjpqqYEPJrPFm8F6pRw7k9qVYd3XXZvaCFluI77eQHkY2IWSUKajhq 3Iy+/06BKA48fozRMhpn6Nv7ljaKN6QNrwReT5Uh1B7kn3TwwEqtkPNzhd183IGG/WQt 3JkA== X-Forwarded-Encrypted: i=1; AKwUvBwqB3RltdFMzBfSafTCoR59msPu63U9yXvPZM54cjGLaDK31fU5e1+8anLJohg4/rwsYko8@lists.linux.dev X-Gm-Message-State: AFq9FYIhc42JFOL6y393UaBTuAVoME2PhoSFxvKMymRsmVAQmSS44wYz CnkD5eqXO6LXBzhWIqieDOOyTVJwSVHzFalG3dzx3zZlzVdnt8xS9iFr X-Gm-Gg: AYBFou0jVYet7Fs3tPAnQhnvOd9Oz1ZauQzXJXalcnGChGReHRtt9vDvGWj2JOhAiBC hIEwNhPycNp0sGWw95Q90OcOb1OB8HbnABOHoxQAzV1JTYaxfq7y0/SOhvdSo+HP19bZTrx1VJ4 /lj7zLDc437H6xSn9g+imQip/69KSGHiGbg/acAfvLjYwxCS3UyoYL3dPrT/jytaxHSv3UtyUWh Cdtd6pbXr3SEPGh37mP3I3TN3bOrSPQ27okG9Cr5qZFQgg1nngBdrEbZkrk6hQKISo/j4keES0e s4ha7K50afLVgKWZ+mVgvdOfDr2S1MUjE1eEgT1TfmznbxWIfoZjAg1+n81zE1HrR7rugH4ZCB8 NnAG07R1lsKamAzJpuKpim17Scf92FxkSJ0fYelMs3vzOmPZdCcpRNqfZY0cRDkDihx5Lh7scsR WCVJeDznjAfEhaq+l92+eGGn6SXItzsEi3eNR8XkoNkR+7ocBa1PznSy5UMR9G+kn7+tQ4O2aA5 4rtiKe62CPcoJtl3mtDsLzO8AG/NnqYXGLyl81x/30Qziz31+2aF5pSLmzO+FWdbY5V8TrQI2jh H2OooE3nVLxg1uUJ0rUb6Fk00q+x14MRcgD56Acy1O1OrSqeNF02hK6qCGGTPj7GenIs3EiOepK B03rtUbwGiHLJ/l8/diX+ugLQFLGiyx98uCcqvg6Q7zSI7YDMymTmUGS/yjUds6wkOA== X-Received: by 2002:adf:f284:0:b0:48e:2980:d396 with SMTP id ffacd0b85a97d-48e3eb8d6a5mr16586892f8f.37.1793116044977; Tue, 27 Oct 2026 08:47:24 -0700 (PDT) Received: from dev-dsk-fgriffo-1c-93421965.eu-west-1.amazon.com (54-240-197-234.amazon.com. [54.240.197.234]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-48e3ebcb958sm23845574f8f.21.2026.10.27.08.47.22 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Oct 2026 08:47:24 -0700 (PDT) From: Fred Griffoul To: Ackerley Tng , Paolo Bonzini , Sean Christopherson , Jason Gunthorpe , Kevin Tian Cc: Alex Williamson , Alexander Graf , Alexander Viro , Alexey Kardashevskiy , Andrew Morton , "Aneesh Kumar K . V" , Ashish Kalra , Baolin Wang , Baolu Lu , Bill Wendling , Borislav Petkov , Catalin Marinas , Christian Brauner , =?UTF-8?q?Christian=20K=C3=B6nig?= , Connor Williamson , Dave Hansen , Dave Jiang , David Hildenbrand , David Rientjes , David Woodhouse , Erdem Aktas , Frank van der Linden , Gregory Price , "H . Peter Anvin" , Hugh Dickins , Ingo Molnar , Jacob Pan , James Houghton , Jan Kara , Jianxiong Gao , Joerg Roedel , Joey Gouly , John Starks , Jonathan Corbet , Justin Stitt , Lorenzo Stoakes , Marc Zyngier , Michael Roth , Mike Rapoport , Nathan Chancellor , Nick Desaulniers , Nicolin Chen , Oliver Upton , Pratyush Yadav , Randy Dunlap , Robin Murphy , Samiullah Khawaja , Shuah Khan , Steffen Eiden , Steven Price , Suzuki K Poulose , Tarun Sahu , Thomas Gleixner , Tom Lendacky , Tycho Andersen , Vishal Annapurve , Vlastimil Babka , Will Deacon , Xu Yilun , Yan Zhao , Zenghui Yu , x86@kernel.org, Shuah Khan , Fuad Tabba , kvm@vger.kernel.org, linux-doc@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-mm@kvack.org, llvm@lists.linux.dev, iommu@lists.linux.dev Subject: [RFC PATCH 13/14] samples/kvm: Back absent pages on demand in the sample provider Date: Tue, 27 Oct 2026 15:46:48 +0000 Message-ID: <20261027154649.91571-14-griffoul@gmail.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20261027154649.91571-1-griffoul@gmail.com> References: <20261022-gmem-alternative-providers-v2-0-5dd1dc6c660a@google.com> <20261027154649.91571-1-griffoul@gmail.com> X-Mailing-List: llvm@lists.linux.dev List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Fred Griffoul The sample provider fails get_pfn() for an absent page and keeps its frames on a punch hole, so tests cannot exercise a provider that backs a hole when it is asked for a frame, one that backs more than the page asked for, or one that frees the frames that a punch hole gives back. Add MPS_NEW_FILE_FILL: get_pfn() then backs an absent page with the whole 2 MiB block around it, and put_pfn_range() makes the pages absent again. Assisted-by: Claude:claude-opus-5-5 Signed-off-by: Fred Griffoul --- samples/kvm/mem_provider_sample.c | 29 ++++++++++++++++++++++++----- samples/kvm/mem_provider_sample.h | 9 ++++++++- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/samples/kvm/mem_provider_sample.c b/samples/kvm/mem_provider_sample.c index 670e36207e59..41e0ce5b6bc6 100644 --- a/samples/kvm/mem_provider_sample.c +++ b/samples/kvm/mem_provider_sample.c @@ -41,6 +41,7 @@ struct mps_info { unsigned long *absent; /* taken away by MPS_SET_PRESENT */ unsigned long *readonly; /* set by MPS_SET_READONLY */ + bool fill; /* MPS_NEW_FILE_FILL */ struct inode *gmem_inode; }; @@ -62,8 +63,15 @@ static void mps_gmem_put_pfn_range(void *provider, pgoff_t index, size_t nr_pages) { struct file *resource_file = provider; + struct mps_info *info = resource_file->private_data; + size_t i; - mps_zero_range(resource_file->private_data, index, nr_pages); + mps_zero_range(info, index, nr_pages); + if (!info->fill || index >= info->npages) + return; + /* Lockless, like get_pfn(): guest_memfd holds its invalidate lock. */ + for (i = index; i < min_t(size_t, index + nr_pages, info->npages); i++) + set_bit(i, info->absent); } /* Byte range [offset, offset + len) of @info as page indices. */ @@ -228,7 +236,9 @@ static bool mps_bits_are(unsigned long *bitmap, unsigned long first, /* * The frame behind @index, and the largest aligned block around it that is * present and has the same attributes: the file's frames are contiguous. - * Lockless: a change is followed by kvm_gmem_revoke() or kvm_gmem_restore(). + * Lockless: a change is followed by kvm_gmem_revoke() or kvm_gmem_restore(), + * except a fill, which only gives frames to holes; guest_memfd tells its users + * about the block. */ static int mps_gmem_get_pfn(void *provider, pgoff_t index, unsigned long *pfn, int *max_order, u32 *attrs) @@ -241,8 +251,16 @@ static int mps_gmem_get_pfn(void *provider, pgoff_t index, unsigned long *pfn, if (index >= info->npages) return -EINVAL; - if (test_bit(index, info->absent)) - return -EFAULT; + if (test_bit(index, info->absent)) { + unsigned long first = ALIGN_DOWN(index, PTRS_PER_PMD); + unsigned long i; + + if (!info->fill) + return -EFAULT; + /* Absent pages are zeroed already. */ + for (i = first; i < min(first + PTRS_PER_PMD, info->npages); i++) + clear_bit(i, info->absent); + } ro = test_bit(index, info->readonly); *pfn = info->base_pfn + index; @@ -307,7 +325,7 @@ static long mps_ctl_new_file(void __user *uarg) if (copy_from_user(&nf, uarg, sizeof(nf))) return -EFAULT; - if (nf.flags || nf.pad) + if ((nf.flags & ~MPS_NEW_FILE_FILL) || nf.pad) return -EINVAL; if (!nf.size || !PAGE_ALIGNED(nf.size)) return -EINVAL; @@ -337,6 +355,7 @@ static long mps_ctl_new_file(void __user *uarg) info->cma_pages = pages; info->base_pfn = page_to_pfn(pages); info->npages = npages; + info->fill = nf.flags & MPS_NEW_FILE_FILL; mutex_init(&info->lock); fd = get_unused_fd_flags(O_CLOEXEC); diff --git a/samples/kvm/mem_provider_sample.h b/samples/kvm/mem_provider_sample.h index 57f494dc46fa..45ec9605b593 100644 --- a/samples/kvm/mem_provider_sample.h +++ b/samples/kvm/mem_provider_sample.h @@ -19,11 +19,18 @@ * Returns the provider fd. */ struct mps_new_file { - __u32 flags; /* Reserved, must be 0 */ + __u32 flags; /* MPS_NEW_FILE_* */ __u32 pad; __u64 size; /* bytes, page aligned */ }; +/* + * get_pfn() backs an absent page, with every page of the 2 MiB block around + * it, instead of failing, and put_pfn_range() takes the pages back: a + * provider that allocates on demand and frees on a punch hole, for tests. + */ +#define MPS_NEW_FILE_FILL (1U << 0) + #define MPS_NEW_FILE \ _IOW(MPS_IOCTL_BASE, 5, struct mps_new_file) -- 2.47.3