From mboxrd@z Thu Jan 1 00:00:00 1970 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 BDB2DC8303F for ; Thu, 29 Aug 2024 11:07:40 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0F9806B0098; Thu, 29 Aug 2024 07:07:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0A8D36B009A; Thu, 29 Aug 2024 07:07:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E8B796B009B; Thu, 29 Aug 2024 07:07:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id C4F946B0098 for ; Thu, 29 Aug 2024 07:07:39 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 5C765AA24B for ; Thu, 29 Aug 2024 11:07:39 +0000 (UTC) X-FDA: 82505007438.05.FB19DD0 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf01.hostedemail.com (Postfix) with ESMTP id 9C22740010 for ; Thu, 29 Aug 2024 11:07:35 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=HsxGaqxd; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=JICkBGpj; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=HsxGaqxd; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=JICkBGpj; dmarc=none; spf=pass (imf01.hostedemail.com: domain of jack@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=jack@suse.cz ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1724929583; a=rsa-sha256; cv=none; b=puJ/5G3WzM3NXj0h/olQTQHtgyH62BWvlAqosn2dp9hrXL5KxaR+VsntmBTrvjqfiQdXgA +H49vukyWyqH1QZFOBEFsDyPAlB4ROan3cUTW1xO2L0A53k+WEC2qPuDBww1qQr+CG3Vaw YKlrxrQq+KuCXLonnD+TFPlhQKhcB88= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=HsxGaqxd; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=JICkBGpj; dkim=pass header.d=suse.cz header.s=susede2_rsa header.b=HsxGaqxd; dkim=pass header.d=suse.cz header.s=susede2_ed25519 header.b=JICkBGpj; dmarc=none; spf=pass (imf01.hostedemail.com: domain of jack@suse.cz designates 195.135.223.130 as permitted sender) smtp.mailfrom=jack@suse.cz ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1724929583; 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=QGQyecD4Fs4QjNPzlLpf3/Z6m6nnwdjllpvvpDrD1u0=; b=w3GWsVQZShUW1AdzHtKloAGAXyFWgtaC6QNQztwIKL0XaSIBQ1C+73jdArzmoHTBHHf0Oe CZXqqXrlqecdlN4l7tLnhv6oJWUFrP2hvGQyqQJx+kz6wYPOw+gAbbgPDAA9jhMKgb5ksM jBzs2Rp5ihQDkHp1A5eimoPePuCVEGY= Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 0B82E21B3F; Thu, 29 Aug 2024 11:07:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1724929654; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=QGQyecD4Fs4QjNPzlLpf3/Z6m6nnwdjllpvvpDrD1u0=; b=HsxGaqxdDcxgyrnkxL6HX06Fir1irthGucVgnz5B9VzDbNR5pdPXUaP9Y/9Y5Z9QjH+FNa Hmcum8vUX9w9i6Y9pXI00RVHgrjqd21RtdP/JSyTcEVEFSsBeUVvtaQ/jFYdFX1JCYGkDh 5X4jzf34QFxfXx8tEW1N7uOeku80JC0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1724929654; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=QGQyecD4Fs4QjNPzlLpf3/Z6m6nnwdjllpvvpDrD1u0=; b=JICkBGpjNsqvf87Tce++GMEjC7W8trbJ/NunTCHlxpT4alrm+g+O0FMwvBMnN+0dZN0fyQ JFpYQi61M0aWh2BQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1724929654; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=QGQyecD4Fs4QjNPzlLpf3/Z6m6nnwdjllpvvpDrD1u0=; b=HsxGaqxdDcxgyrnkxL6HX06Fir1irthGucVgnz5B9VzDbNR5pdPXUaP9Y/9Y5Z9QjH+FNa Hmcum8vUX9w9i6Y9pXI00RVHgrjqd21RtdP/JSyTcEVEFSsBeUVvtaQ/jFYdFX1JCYGkDh 5X4jzf34QFxfXx8tEW1N7uOeku80JC0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1724929654; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=QGQyecD4Fs4QjNPzlLpf3/Z6m6nnwdjllpvvpDrD1u0=; b=JICkBGpjNsqvf87Tce++GMEjC7W8trbJ/NunTCHlxpT4alrm+g+O0FMwvBMnN+0dZN0fyQ JFpYQi61M0aWh2BQ== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id EF8E6139B0; Thu, 29 Aug 2024 11:07:33 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id brMkOnVW0GYIEwAAD6G6ig (envelope-from ); Thu, 29 Aug 2024 11:07:33 +0000 Received: by quack3.suse.cz (Postfix, from userid 1000) id 8CB35A0965; Thu, 29 Aug 2024 13:07:18 +0200 (CEST) Date: Thu, 29 Aug 2024 13:07:18 +0200 From: Jan Kara To: Josef Bacik Cc: kernel-team@fb.com, linux-fsdevel@vger.kernel.org, jack@suse.cz, amir73il@gmail.com, brauner@kernel.org, linux-xfs@vger.kernel.org, gfs2@lists.linux.dev, linux-bcachefs@vger.kernel.org, linux-mm@kvack.org Subject: Re: [PATCH v4 13/16] fsnotify: generate pre-content permission event on page fault Message-ID: <20240829110718.tyhbodz5i6jx7gcr@quack3> References: <4be573448ff9f15e6fb55e41fa6453b655d8a467.1723670362.git.josef@toxicpanda.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4be573448ff9f15e6fb55e41fa6453b655d8a467.1723670362.git.josef@toxicpanda.com> X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 9C22740010 X-Stat-Signature: p6bmwwke4oxefwy99eqp8opranqa9qph X-Rspam-User: X-HE-Tag: 1724929655-98367 X-HE-Meta: U2FsdGVkX18Pic0RwNGZb5/2YCSpDwzjUOrHm+LmH0nU6Hpz9qZTfpYbPkUtIrV6njooKthMZXLU1k5Ye864NIiV21kE4ld0K8tJdMFdjQ4+UEgU9z20kpAmJnirPviI0W7obRxluYrAwLTIMn/x6eUYXELbPQIFmWOZq5YL44UaUA45eQ+fhO6tTeUEFn4N5SvPCy35O9nyGI+0hs4EpB24PW/1BgMVfTyIuJ/0WlZIGu2QACp0T3MGwaGseGvfsnKGR/Cla1Gs3CyhaaMxPSsGfZxS+WaHPxCbWlHpyC1TTIp1X8Cr1D54t0f9KBciLa/J40R+JXoOODI3L08c+v62+qR3hZcPalZDwgIKXmCq0wqx5tYw4wD3kN68BrECrOjYlaUJodKMjBfMq0iemOjRym7X0p6aW+GacT25de4AWoRwcRT+oiOx36Qx+ou279Ed7qWsGtISEUfA+YrWx68BT4i8QuOm06T9KM1ZmYUPKR4iYSv6sZwLrbwvcmqqjJ+H3AGYMXlkLWssJrWi8b5E6Yr06gV6nrfPMva765zGbHb6nlwiazDpuA1F/qoID54/FC1Wgdl6WXW6dDdGc9zOg/XjnWx9zaSUp2I/UGclaFToJU9QAGREV/lewkEpOGuUIc/lm6jgGMltcjkAmT1c8JXY27kcueXI8gsfDYcRuCRyWJg8aa1zvCr3NwChFKSEM5idnXjV2rHX/dwc2ADu7jWSiUnwuk2ArgQY8aGXNDqhKVUisUkMcMM+T6EIOwADaKIaK27TEaXv+qHzVvok/Fi0c7EJVUx+DTD+0bqSSlj0cuOfpBqBfirXm3kD31Hbju74WdzBOmA7fKXhAGsoO9co11CI0JUYh1fOEUI7GliB+VaJM+UKVqf+/snjarXjBaY6h7/tSF7eSN/7c6j2IPmYTfK0gqczWxo423oZnRSsNph7wMm50sfFwUMWd++27ZNTSBAUpIC4BYB Silt1hpt 2d16aRjf1A0AJgU5+xX+QazY0YRXhwU/cMFGXp0S9igAn5lfyXqW1uNGk8wk+/rIVQmPDAJHein82AaQjVg87uHsv7WR7EW4Krv9Af28PRxurjNgqR+QFRFJm+OQa1etUitH6MGPVNVeVvf9j5+zmsgpHz2uH8N+SvwQvc0X/SvNuIUFmZODEremmV5hQRKrDR2WuwcDNsa5lQjeEQ9Fk1uxR7zbT3TD+Y8DNi32BKyiGEOqCrV+t2kmx8weRv3TMzIFHnYR1d9jyeRxv7UoinRwHZcsAidIhk4Il0hzlMpZbQ3LoWMpVeoARTswfFF00sytWGknP31owbYWbLDCQsKcvjmGQkIqjcdHCbOzZRbdQl/e0/OX8GmDLZKaD+olXIvublW/czBwgcajEngawZu80Gg== 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: On Wed 14-08-24 17:25:31, Josef Bacik wrote: > FS_PRE_ACCESS or FS_PRE_MODIFY will be generated on page fault depending > on the faulting method. > > This pre-content event is meant to be used by hierarchical storage > managers that want to fill in the file content on first read access. > > Export a simple helper that file systems that have their own ->fault() > will use, and have a more complicated helper to be do fancy things with > in filemap_fault. > > Signed-off-by: Josef Bacik Looks good to me. Just let's CC MM guys for awareness about changes to filemap_fault(). Honza > --- > include/linux/mm.h | 1 + > mm/filemap.c | 116 ++++++++++++++++++++++++++++++++++++++++++--- > 2 files changed, 110 insertions(+), 7 deletions(-) > > diff --git a/include/linux/mm.h b/include/linux/mm.h > index ab3d78116043..3e190f0a0997 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -3503,6 +3503,7 @@ extern vm_fault_t filemap_fault(struct vm_fault *vmf); > extern vm_fault_t filemap_map_pages(struct vm_fault *vmf, > pgoff_t start_pgoff, pgoff_t end_pgoff); > extern vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf); > +extern vm_fault_t filemap_maybe_emit_fsnotify_event(struct vm_fault *vmf); > > extern unsigned long stack_guard_gap; > /* Generic expand stack which grows the stack according to GROWS{UP,DOWN} */ > diff --git a/mm/filemap.c b/mm/filemap.c > index 8b1684b62177..50e88e47dff3 100644 > --- a/mm/filemap.c > +++ b/mm/filemap.c > @@ -46,6 +46,7 @@ > #include > #include > #include > +#include > #include > #include > #include "internal.h" > @@ -3112,13 +3113,13 @@ static int lock_folio_maybe_drop_mmap(struct vm_fault *vmf, struct folio *folio, > * that. If we didn't pin a file then we return NULL. The file that is > * returned needs to be fput()'ed when we're done with it. > */ > -static struct file *do_sync_mmap_readahead(struct vm_fault *vmf) > +static struct file *do_sync_mmap_readahead(struct vm_fault *vmf, > + struct file *fpin) > { > struct file *file = vmf->vma->vm_file; > struct file_ra_state *ra = &file->f_ra; > struct address_space *mapping = file->f_mapping; > DEFINE_READAHEAD(ractl, file, ra, mapping, vmf->pgoff); > - struct file *fpin = NULL; > unsigned long vm_flags = vmf->vma->vm_flags; > unsigned int mmap_miss; > > @@ -3190,12 +3191,12 @@ static struct file *do_sync_mmap_readahead(struct vm_fault *vmf) > * was pinned if we have to drop the mmap_lock in order to do IO. > */ > static struct file *do_async_mmap_readahead(struct vm_fault *vmf, > - struct folio *folio) > + struct folio *folio, > + struct file *fpin) > { > struct file *file = vmf->vma->vm_file; > struct file_ra_state *ra = &file->f_ra; > DEFINE_READAHEAD(ractl, file, ra, file->f_mapping, vmf->pgoff); > - struct file *fpin = NULL; > unsigned int mmap_miss; > > /* See comment in do_sync_mmap_readahead. */ > @@ -3260,6 +3261,93 @@ static vm_fault_t filemap_fault_recheck_pte_none(struct vm_fault *vmf) > return ret; > } > > +/* > + * If we have pre-content watches on this file we will need to emit an event for > + * this range. We will handle dropping the lock and emitting the event. > + * > + * If FAULT_FLAG_RETRY_NOWAIT is set then we'll return VM_FAULT_RETRY. > + * > + * If no event was emitted then *fpin will be NULL and we will return 0. > + * > + * If any error occurred we will return VM_FAULT_SIGBUS, *fpin could still be > + * set and will need to have fput() called on it. > + * > + * If we emitted the event then we will return 0 and *fpin will be set, this > + * must have fput() called on it, and the caller must call VM_FAULT_RETRY after > + * any other operations it does in order to re-fault the page and make sure the > + * appropriate locking is maintained. > + * > + * Return: the appropriate vm_fault_t return code, 0 on success. > + */ > +static vm_fault_t __filemap_maybe_emit_fsnotify_event(struct vm_fault *vmf, > + struct file **fpin) > +{ > + struct file *file = vmf->vma->vm_file; > + loff_t pos = vmf->pgoff << PAGE_SHIFT; > + int mask = (vmf->flags & FAULT_FLAG_WRITE) ? MAY_WRITE : MAY_ACCESS; > + int ret; > + > + /* > + * We already did this and now we're retrying with everything locked, > + * don't emit the event and continue. > + */ > + if (vmf->flags & FAULT_FLAG_TRIED) > + return 0; > + > + /* No watches, return NULL. */ > + if (!fsnotify_file_has_pre_content_watches(file)) > + return 0; > + > + /* We are NOWAIT, we can't wait, just return EAGAIN. */ > + if (vmf->flags & FAULT_FLAG_RETRY_NOWAIT) > + return VM_FAULT_RETRY; > + > + /* > + * If this fails then we're not allowed to drop the fault lock, return a > + * SIGBUS so we don't errantly populate pagecache with bogus data for > + * this file. > + */ > + *fpin = maybe_unlock_mmap_for_io(vmf, *fpin); > + if (*fpin == NULL) > + return VM_FAULT_SIGBUS; > + > + /* > + * We can't fput(*fpin) at this point because we could have been passed > + * in fpin from a previous call. > + */ > + ret = fsnotify_file_area_perm(*fpin, mask, &pos, PAGE_SIZE); > + if (ret) > + return VM_FAULT_SIGBUS; > + > + return 0; > +} > + > +/** > + * filemap_maybe_emit_fsnotify_event - maybe emit a pre-content event. > + * @vmf: struct vm_fault containing details of the fault. > + * > + * If we have a pre-content watch on this file we will emit an event for this > + * range. If we return anything the fault caller should return immediately, we > + * will return VM_FAULT_RETRY if we had to emit an event, which will trigger the > + * fault again and then the fault handler will run the second time through. > + * > + * Return: a bitwise-OR of %VM_FAULT_ codes, 0 if nothing happened. > + */ > +vm_fault_t filemap_maybe_emit_fsnotify_event(struct vm_fault *vmf) > +{ > + struct file *fpin = NULL; > + vm_fault_t ret; > + > + ret = __filemap_maybe_emit_fsnotify_event(vmf, &fpin); > + if (fpin) { > + fput(fpin); > + if (!ret) > + ret = VM_FAULT_RETRY; > + } > + return ret; > +} > +EXPORT_SYMBOL_GPL(filemap_maybe_emit_fsnotify_event); > + > /** > * filemap_fault - read in file data for page fault handling > * @vmf: struct vm_fault containing details of the fault > @@ -3299,6 +3387,17 @@ vm_fault_t filemap_fault(struct vm_fault *vmf) > if (unlikely(index >= max_idx)) > return VM_FAULT_SIGBUS; > > + /* > + * If we have pre-content watchers then we need to generate events on > + * page fault so that we can populate any data before the fault. > + */ > + ret = __filemap_maybe_emit_fsnotify_event(vmf, &fpin); > + if (unlikely(ret)) { > + if (fpin) > + fput(fpin); > + return ret; > + } > + > /* > * Do we have something in the page cache already? > */ > @@ -3309,21 +3408,24 @@ vm_fault_t filemap_fault(struct vm_fault *vmf) > * the lock. > */ > if (!(vmf->flags & FAULT_FLAG_TRIED)) > - fpin = do_async_mmap_readahead(vmf, folio); > + fpin = do_async_mmap_readahead(vmf, folio, fpin); > if (unlikely(!folio_test_uptodate(folio))) { > filemap_invalidate_lock_shared(mapping); > mapping_locked = true; > } > } else { > ret = filemap_fault_recheck_pte_none(vmf); > - if (unlikely(ret)) > + if (unlikely(ret)) { > + if (fpin) > + goto out_retry; > return ret; > + } > > /* No page in the page cache at all */ > count_vm_event(PGMAJFAULT); > count_memcg_event_mm(vmf->vma->vm_mm, PGMAJFAULT); > ret = VM_FAULT_MAJOR; > - fpin = do_sync_mmap_readahead(vmf); > + fpin = do_sync_mmap_readahead(vmf, fpin); > retry_find: > /* > * See comment in filemap_create_folio() why we need > -- > 2.43.0 > -- Jan Kara SUSE Labs, CR