On Wed, Nov 29, 2023 at 7:22 AM Amir Goldstein <amir73il@xxxxxxxxx> wrote: > > On Tue, Nov 28, 2023 at 11:43 PM Josef Bacik <josef@xxxxxxxxxxxxxx> wrote: > > > > On Tue, Nov 28, 2023 at 06:52:00PM +0200, Amir Goldstein wrote: > > > On Tue, Nov 28, 2023 at 4:55 PM Josef Bacik <josef@xxxxxxxxxxxxxx> wrote: > > > > > > > > On Tue, Nov 28, 2023 at 01:05:50PM +0200, Amir Goldstein wrote: > > > > > On Mon, Nov 27, 2023 at 9:11 PM Josef Bacik <josef@xxxxxxxxxxxxxx> wrote: > > > > > > > > > > > > On Mon, Nov 20, 2023 at 06:59:47PM +0200, Amir Goldstein wrote: > > > > > > > On Mon, Nov 20, 2023 at 4:06 PM Jan Kara <jack@xxxxxxx> wrote: > > > > > > > > > > > > > > > > Hi Amir, > > > > > > > > > > > > > > > > sorry for a bit delayed reply, I did not get to "swapping in" HSM > > > > > > > > discussion during the Plumbers conference :) > > > > > > > > > > > > > > > > On Mon 13-11-23 13:50:03, Amir Goldstein wrote: > > > > > > > > > On Wed, Aug 23, 2023 at 7:31 PM Amir Goldstein <amir73il@xxxxxxxxx> wrote: > > > > > > > > > > On Wed, Aug 23, 2023 at 5:37 PM Jan Kara <jack@xxxxxxx> wrote: > > > > > > > > > > > > Recap for new people joining this thread. > > > > > > > > > > > > > > > > > > > > > > > > The following deadlock is possible in upstream kernel > > > > > > > > > > > > if fanotify permission event handler tries to make > > > > > > > > > > > > modifications to the filesystem it is watching in the context > > > > > > > > > > > > of FAN_ACCESS_PERM handling in some cases: > > > > > > > > > > > > > > > > > > > > > > > > P1 P2 P3 > > > > > > > > > > > > ----------- ------------ ------------ > > > > > > > > > > > > do_sendfile(fs1.out_fd, fs1.in_fd) > > > > > > > > > > > > -> sb_start_write(fs1.sb) > > > > > > > > > > > > -> do_splice_direct() freeze_super(fs1.sb) > > > > > > > > > > > > -> rw_verify_area() -> sb_wait_write(fs1.sb) ...... > > > > > > > > > > > > -> security_file_permission() > > > > > > > > > > > > -> fsnotify_perm() --> FAN_ACCESS_PERM > > > > > > > > > > > > -> do_unlinkat(fs1.dfd, ...) > > > > > > > > > > > > -> sb_start_write(fs1.sb) ...... > > > > > > > > > > > > > > > > > > > > > > > > start-write-safe patches [1] (not posted) are trying to solve this > > > > > > > > > > > > deadlock and prepare the ground for a new set of permission events > > > > > > > > > > > > with cleaner/safer semantics. > > > > > > > > > > > > > > > > > > > > > > > > The cases described above of sendfile from a file in loop mounted > > > > > > > > > > > > image over fs1 or overlayfs over fs1 into a file in fs1 can still > > > > > > > > > > > > deadlock despite the start-write-safe patches [1]. > > > > > > > > > > > > > > > > > > > > > > Yep, nice summary. > > > > > > > > ... > > > > > > > > > > > > > As I wrote above I don't like the abuse of FMODE_NONOTIFY much. > > > > > > > > > > > > > FMODE_NONOTIFY means we shouldn't generate new fanotify events when using > > > > > > > > > > > > > this fd. It says nothing about freeze handling or so. Furthermore as you > > > > > > > > > > > > > observe FMODE_NONOTIFY cannot be set by userspace but practically all > > > > > > > > > > > > > current fanotify users need to also do IO on other files in order to handle > > > > > > > > > > > > > fanotify event. So ideally we'd have a way to do IO to other files in a > > > > > > > > > > > > > manner safe wrt freezing. We could just update handling of RWF_NOWAIT flag > > > > > > > > > > > > > to only trylock freeze protection - that actually makes a lot of sense to > > > > > > > > > > > > > me. The question is whether this is enough or not. > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > Maybe, but RWF_NOWAIT doesn't take us far enough, because writing > > > > > > > > > > > > to a file is not the only thing that HSM needs to do. > > > > > > > > > > > > Eventually, event handler for lookup permission events should be > > > > > > > > > > > > able to also create files without blocking on vfs level freeze protection. > > > > > > > > > > > > > > > > > > > > > > So this is what I wanted to clarify. The lookup permission event never gets > > > > > > > > > > > called under a freeze protection so the deadlock doesn't exist there. In > > > > > > > > > > > principle the problem exists only for access and modify events where we'd > > > > > > > > > > > be filling in file data and thus RWF_NOWAIT could be enough. > > > > > > > > > > > > > > > > > > > > Yes, you are right. > > > > > > > > > > It is possible that RWF_NOWAIT could be enough. > > > > > > > > > > > > > > > > > > > > But the discovery of the loop/ovl corner cases has shaken my > > > > > > > > > > confidence is the ability to guarantee that freeze protection is not > > > > > > > > > > held somehow indirectly. > > > > > > > > > > > > > > > > > > > > If I am not mistaken, FAN_OPEN_PERM suffers from the exact > > > > > > > > > > same ovl corner case, because with splice from ovl1 to fs1, > > > > > > > > > > fs1 freeze protection is held and: > > > > > > > > > > ovl_splice_read(ovl1.file) > > > > > > > > > > ovl_real_fdget() > > > > > > > > > > ovl_open_realfile(fs1.file) > > > > > > > > > > ... security_file_open(fs1.file) > > > > > > > > > > > > > > > > > > > > > That being > > > > > > > > > > > said I understand this may be assuming too much about the implementations > > > > > > > > > > > of HSM daemons and as you write, we might want to provide a way to do IO > > > > > > > > > > > not blocking on freeze protection from any hook. But I wanted to point this > > > > > > > > > > > out explicitly so that it's a conscious decision. > > > > > > > > > > > > > > > > > > > > > > > > > > > > > I agree and I'd like to explain using an example, why RWF_NOWAIT is > > > > > > > > > not enough for HSM needs. > > > > > > > > > > > > > > > > > > The reason is that often, when HSM needs to handle filling content > > > > > > > > > in FAN_PRE_ACCESS, it is not just about writing to the accessed file. > > > > > > > > > HSM needs to be able to avoid blocking on freeze protection > > > > > > > > > for any operations on the filesystem, not just pwrite(). > > > > > > > > > > > > > > > > > > For example, the POC HSM code [1], stores the DATA_DIR_fd > > > > > > > > > from the lookup event and uses it in the handling of access events to > > > > > > > > > update the metadata files that store which parts of the file were already > > > > > > > > > filled (relying of fiemap is not always a valid option). > > > > > > > > > > > > > > > > > > That is the reason that in the POC patches [2], FMODE_NONOTIFY > > > > > > > > > is propagated from dirfd to an fd opened with openat(dirfd, ...), so > > > > > > > > > HSM has an indirect way to get a FMODE_NONOTIFY fd on any file. > > > > > > > > > > > > > > > > > > Another use case is that HSM may want to download content to a > > > > > > > > > temp file on the same filesystem, verify the downloaded content and > > > > > > > > > then clone the data into the accessed file range. > > > > > > > > > > > > > > > > > > I think that a PF_ flag (see below) would work best for all those cases. > > > > > > > > > > > > > > > > Ok, I agree that just using RWF_NOWAIT from the HSM daemon need not be > > > > > > > > enough for all sensible usecases to avoid deadlocks with freezing. However > > > > > > > > note that if we want to really properly handle all possible operations, we > > > > > > > > need to start handling error from all sb_start_write() and > > > > > > > > file_start_write() calls and there are quite a few of those. > > > > > > > > > > > > > > > > > > > > > > Darn, forgot about those. > > > > > > > I am starting to reconsider adding a freeze level. > > > > > > > I cannot shake the feeling that there is a simpler solution that escapes us... > > > > > > > Maybe fs anti-freeze (see blow). > > > > > > > > > > > > > > > > > > > In theory, I am not saying we should do it, but as a thought experiment: > > > > > > > > > > > > if the requirement from permission event handler is that is must use a > > > > > > > > > > > > O_PATH | FMODE_NONOTIFY event->fd provided in the event to make > > > > > > > > > > > > any filesystem modifications, then instead of aiming for NOWAIT > > > > > > > > > > > > semantics using sb_start_write_trylock(), we could use a freeze level > > > > > > > > > > > > SB_FREEZE_FSNOTIFY between > > > > > > > > > > > > SB_FREEZE_WRITE and SB_FREEZE_PAGEFAULT. > > > > > > > > > > > > > > > > > > > > > > > > As a matter of fact, HSM is kind of a "VFS FAULT", so as long as we > > > > > > > > > > > > make it clear how userspace should avoid nesting "VFS faults" there is > > > > > > > > > > > > a model that can solve the deadlock correctly. > > > > > > > > > > > > > > > > > > > > > > OK, yes, in principle another freeze level which could be used by handlers > > > > > > > > > > > of fanotify permission events would solve the deadlock as well. Just you > > > > > > > > > > > seem to like to tie this functionality to the particular fd returned from > > > > > > > > > > > fanotify and I'm not convinced that is a good idea. What if the application > > > > > > > > > > > needs to do write to some other location besides the one fd it got passed > > > > > > > > > > > from fanotify event? E.g. imagine it wants to fetch a whole subtree on > > > > > > > > > > > first access to any file in a subtree. Or maybe it wants to write to some > > > > > > > > > > > DB file containing current state or something like that. > > > > > > > > > > > > > > > > > > > > > > One solution I can imagine is to create an open flag that can be specified > > > > > > > > > > > on open which would result in the special behavior wrt fs freezing. If the > > > > > > > > > > > special behavior would be just trylocking the freeze protection then it > > > > > > > > > > > would be really easy. If the behaviour would be another freeze protection > > > > > > > > > > > level, then we'd need to make sure we don't generate another fanotify > > > > > > > > > > > permission event with such fd - autorejecting any such access is an obvious > > > > > > > > > > > solution but I'm not sure if practical for applications. > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > I had also considered marking the listener process with the FSNOTIFY > > > > > > > > > > context and enforcing this context on fanotify_read(). > > > > > > > > > > In a way, this is similar to the NOIO and NOFS process context. > > > > > > > > > > It could be used to both act as a stronger form of FMODE_NONOTIFY > > > > > > > > > > and to activate the desired freeze protection behavior > > > > > > > > > > (whether trylock or SB_FREEZE_FSNOTIFY level). > > > > > > > > > > > > > > > > > > > > > > > > > > > > My feeling is that the best approach would be a PF_NOWAIT task flag: > > > > > > > > > > > > > > > > > > - PF_NOWAIT will prevent blocking on freeze protection > > > > > > > > > - PF_NOWAIT + FMODE_NOWAIT would imply RWF_NOWAIT > > > > > > > > > - PF_NOWAIT could be auto-set on the reader of a permission event > > > > > > > > > - PF_NOWAIT could be set on init of group FAN_CLASS_PRE_PATH > > > > > > > > > - We could add user API to set this personality explicitly to any task > > > > > > > > > - PF_NOWAIT without FMODE_NONOTIFY denies permission events > > > > > > > > > > > > > > > > > > Please let me know if you agree with this design and if so, > > > > > > > > > which of the methods to set PF_NOWAIT are a must for the first version > > > > > > > > > in your opinion? > > > > > > > > > > > > > > > > Yeah, the PF flag could work. It can be set for the process(es) responsible > > > > > > > > for processing the fanotify events and filling in filesystem contents. I > > > > > > > > don't think automatic setting of this flag is desirable though as it has > > > > > > > > quite wide impact and some of the consequences could be surprising. I > > > > > > > > rather think it should be a conscious decision when setting up the process > > > > > > > > processing the events. So I think API to explicitly set / clear the flag > > > > > > > > would be the best. Also I think it would be better to capture in the name > > > > > > > > that this is really about fs freezing. So maybe PF_NOWAIT_FREEZE or > > > > > > > > something like that? > > > > > > > > > > > > > > > > > > > > > > Sure. > > > > > > > > > > > > > > > Also we were thinking about having an open(2) flag for this (instead of PF > > > > > > > > flag) in the past. That would allow finer granularity control of the > > > > > > > > behavior but I guess you are worried that it would not cover all the needed > > > > > > > > operations? > > > > > > > > > > > > > > > > > > > > > > Yeh, it seems like an API that is going to be harder to write safe HSM > > > > > > > programs with. > > > > > > > > > > > > > > > > Do you think we should use this method to fix the existing deadlocks > > > > > > > > > with FAN_OPEN_PERM and FAN_ACCESS_PERM? without opt-in? > > > > > > > > > > > > > > > > No, I think if someone cares about these, they should explicitly set the > > > > > > > > PF flag in their task processing the events. > > > > > > > > > > > > > > > > > > > > > > OK. > > > > > > > > > > > > > > I see an exit hatch in this statement - > > > > > > > If we are going leave the responsibility to avoid deadlock in corner > > > > > > > cases completely in the hands of the application, then I do not feel > > > > > > > morally obligated to create the PF_NOWAIT_FREEZE API *before* > > > > > > > providing the first HSM API. > > > > > > > > > > > > > > If the HSM application is running in a controlled system, on a filesystem > > > > > > > where fsfreeze is not expected or not needed, then a fully functional and > > > > > > > safe HSM does not require PF_NOWAIT_FREEZE API. > > > > > > > > > > > > > > Perhaps an API to make an fs unfreezable is just as practical and a much > > > > > > > easier option for the first version of HSM API? > > > > > > > > > > > > > > Imagine that HSM opens an fd and sends an EXCLUSIVE_FSFREEZER > > > > > > > ioctl. Then no other task can freeze the fs, for as long as the fd is open > > > > > > > apart from the HSM itself using this fd. > > > > > > > > > > > > > > HSM itself can avoid deadlocks if it collaborates the fs freezes with > > > > > > > making fs modifications from within HSM events. > > > > > > > > > > > > > > Do you think that may be an acceptable way out or the corner? > > > > > > > > > > > > This is kind of a corner case that I think is acceptable to just leave up to > > > > > > application developers. Speaking as a potential consumer of this work we don't > > > > > > use fsfreeze so aren't concerned wit this in practice, and arguably if you're > > > > > > using this interface you know what you're doing. As long as the sharp edge is > > > > > > well documented I think that's fine for v1. > > > > > > > > > > > > > > > > I agree that this is good enough for v1. > > > > > The only question is can we (and should we) do better than good enough for v1. > > > > > > > > > > > Long term I like the EXCLUSIVE_FSFREEZER option, noting Christian's comment > > > > > > about the xfs scrubbing use case. We all know that "freeze this file system" is > > > > > > an operation that is going to take X amount of time, so as long as we provide > > > > > > the application a way to block fsfreeze to avoid the deadlock then I think > > > > > > that's a reasonable solution. Additionally it would allow us an avenue to > > > > > > gracefully handle errors. If we race and see that the fs is already frozen well > > > > > > then we can go back to the HSM with an error saying he's out of luck, and he can > > > > > > return -EAGAIN or something through fanotify to unwind and try again later. > > > > > > > > > > > > > > > > Actually, "fs is already frozen" is not a deadlock case. > > > > > If "fs is already frozen" then fsfreeze was successful and HSM should just > > > > > wait in line like everyone else until fs is unfrozen. > > > > > > > > > > The deadlock case is "fs is being frozen" (i.e. sb->s_writers.frozen is > > > > > in state SB_FREEZE_WRITE), which cannot make progress because > > > > > an existing holder of sb write is blocked on an HSM event, which in turn > > > > > is trying to start a new sb write. > > > > > > > > Right, and now I'm confused. You have your patchset to re-order the permission > > > > checks to before the sb_start_write(), so an HSM watching FAN_OPEN_PERM is no > > > > longer holding the sb write lock and thus can't deadlock, correct? > > > > > > Correct. > > > > > > > > > > > The new things you are proposing (FAN_PRE_ACESS and FAN_PRE_MODIFY) also do not > > > > happen inside of an sb_start_write(), correct? > > > > > > > > > > Almost correct. > > > > > > The callers of the security_file_permission() hook do not hold sb_start_write() > > > *directly*, but it can be held *indirectly* in splice(file_in_fs1, file_in_fs2). > > > That is the corner case I was trying to explain. > > > > > > When fs1 (splice source fs) is a loop mounted fs and the loop image file > > > is on fs2 (a.k.a the "host" fs), which also happens to be to splice dest fs, > > > splice grabs sb_start_write() on fs2. > > > > > > After the patches in vfs.rw, splice() no longer calls security_file_permission() > > > directly on the file in the loop mounted fs1, but the reads from loopdev > > > translate to reads on the image file, which can call security_file_permission() > > > on the loop image file on the "host" fs (fs2), while sb_start_write() is held. > > > > > > IOW, if HSM needs to fill the content on the loop image file and fsfreeze on > > > the "host" fs that is the destination of splice, gets in the middle, there is > > > a chance for a deadlock, because freeze will never make progress and > > > HSM filling of the loop image file is blocked. > > > > > > Yes, it is a corner case, but it exists and a similar one exists with a splice > > > from an overlayfs file into a file on a "host" fs, which also happens to be the > > > lower layer of overlayfs (I have a test case that triggered this). > > > > > > > I had to still draw this on my whiteboard to make sure I understood it properly, > > so I'm going to draw it here to make sure I did actually understand it, because > > it is indeed quite complex if I'm understanding you correctly. > > > > We have the following > > > > File A on FS 1 which is a loopback device backed by File B on FS 2 > > B is the normal file on FS2, so I guess you meant to say backed by file C > > > File B on FS 2 which is a normal file > > > > We have an HSM watching FS1 to populate files. > > > > sendfile(A, B); > > > > This does > > > > file_start_write(FS2); > > > > Then we start to read from A to populate the page, this triggers the HSM, which > > then wants to write to FS1. > > > > At this point some other process calls fsfreeze(FS2), and now we're deadlocked, > > because the HSM is stuck at sb_start_write(FS2) trying to write to the FS1 which > > is backed by FS2, but we're already holding file_start_write(FS2) because of > > splice. > > > > Is this correct? > > Yes, this is correct. > I was describing a different variant of deadlock when FS2 is watched by HSM > and HSM wants to write to the image file C upon reading from file A. > > There are many variants of this, but the root cause is operating of file A > while holding sb_start_write() on file B on another fs. > > > > > If it is, I think the best thing to do is actually push the file_start_write() > > deeper into the splice work. Do something like the patch I've applied below, > > which is wildly untested and uncompiled. However I think this closes this > > deadlock in a nice clean way, because we're reading and then writing, and we > > don't have to worry about any shenanigans under the read path because we only > > hold the sb_write_start() when we do the actual write part. Does that make > > sense? > > That makes a lot of sense! > > I think this is the correct way out of the deadlock corner case. > I will amend the patch and test it. > > Thanks for getting me out of tunnel vision ;) > > Some comments for myself below... > > > > > diff --git a/fs/overlayfs/copy_up.c b/fs/overlayfs/copy_up.c > > index 4382881b0709..f37bb41551fe 100644 > > --- a/fs/overlayfs/copy_up.c > > +++ b/fs/overlayfs/copy_up.c > > @@ -230,6 +230,19 @@ static int ovl_copy_fileattr(struct inode *inode, const struct path *old, > > return ovl_real_fileattr_set(new, &newfa); > > } > > > > +static int ovl_splice_actor(struct pipe_inode_info *pipe, > > + struct splice_desc *sd) > > +{ > > + struct file *file = sd->u.file; > > + long ret; > > + > > + ovl_start_write(file_dentry(file)); > > + ret = vfs_do_splice_from(pipe, file, sd->opos, sd->total_len, > > + sd->flags); > > + ovl_end_write(file_dentry(file)); > > + return ret; > > +} > > + On second look, this custom ovl actor is not needed at all. ovl_start_write(file_dentry(file)) is completely equivalent to file_start_write(file) in this context, so no need to export any actor. OTOH, generic_copy_file_range() and ceph (from ->copy_file_range()) call do_splice_direct() with file_start_write() held and this is a bit harder to untangle. The easy solution is to export do_splice_copy_file_range(), which is a variant of do_splice_direct() with an actor that does not take file_start_write(). The good thing about copy_file_range() is that it is only allowed across sb for filesystems with ->copy_file_range(), so if we ban HSM events on those filesystems, the freeze deadlock is averted. I don't think we need to support HSM events on fuse/ceph/cifs/nfs/ovl anyway, even if some of them do not allow cross sb copy. Thanks, Amir.