From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from dragonfly.birch.relay.mailchannels.net (dragonfly.birch.relay.mailchannels.net [23.83.209.51]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 51EB0522B for ; Tue, 19 Dec 2023 03:19:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=templeofstupid.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=templeofstupid.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=templeofstupid.com header.i=@templeofstupid.com header.b="e6Y9TrZI" X-Sender-Id: dreamhost|x-authsender|kjlx@templeofstupid.com Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id 8E3F34C1AB6 for ; Tue, 19 Dec 2023 03:11:15 +0000 (UTC) Received: from pdx1-sub0-mail-a284.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 2DA264C1A6C for ; Tue, 19 Dec 2023 03:11:15 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1702955475; a=rsa-sha256; cv=none; b=dNrsGY5chRr16asYV1vEQ6xXreBl1OpMI7KgE7ODe/sj+SqbF+3p/otHXIPfn79jAc2cbT 0ba+fkdnfDZLAcoYsgCYo7dPo84A2dYgudOFXD1MzBkhfWpt45RHe0i1wSOBNcXjUqeBRw mveVoPnmS3SjTKgMm/1KW3+zm0uNBLX/gg5UprTuWj3JW5g8JP0zmv0VMJSzgWDBVPTPwk 6IaK8S+hSKZHqu8CnJbz8nBpAB9odlXqkEnW6lGBrrGlKRD48jqE8h+HEGzyrjwsrCFnGV Viyr0DxenAlzJ/6tOT5sunMmHvxOQi/qRu3dUFprOQd1tmUL4LuTBf4dv/YfwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1702955475; h=from:from:reply-to:subject:subject: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:dkim-signature; bh=3ILJVSkzhMMu+AsLMW/5pBaWQA1WfOaX+c91Ys4iI3U=; b=ljd6aDpkO8hEdg7aqoP5ausZXzanrE0G/Qk8K0CPeMb7BWl79rtrY3Ij5vu+cdaUKE9Lue +Uwjty+8J9EXpb6OB8By3lQ7R7ebwDiV5vRNh5rIzqZfpcGwFhtAGwRrVVl4iQCFC/awHZ 790IHdZTydrPnq1Aidw+WnhI1o+AKsACMraw+GPnFGZq051je3xomTF3XyLI2RGc83Jehu RTRHXq8GYebrO+jNRqGeImiUkIqXHyPJgMBhpz1gJRpn3Hg9xU7Vv7m/A2o+uP9xETMhm+ DpIuGadZ83C0e9Ky1Qm3p6xvWllo2Ge4fbqK68UHI2OuSsu16uOVZWBcEvIT6Q== ARC-Authentication-Results: i=1; rspamd-856c7f878f-zt9zl; auth=pass smtp.auth=dreamhost smtp.mailfrom=kjlx@templeofstupid.com X-Sender-Id: dreamhost|x-authsender|kjlx@templeofstupid.com X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|kjlx@templeofstupid.com X-MailChannels-Auth-Id: dreamhost X-Abiding-Exultant: 5c40b9b25f508ea8_1702955475417_3202564472 X-MC-Loop-Signature: 1702955475417:1001806149 X-MC-Ingress-Time: 1702955475417 Received: from pdx1-sub0-mail-a284.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.124.185.70 (trex/6.9.2); Tue, 19 Dec 2023 03:11:15 +0000 Received: from kmjvbox.templeofstupid.com (c-73-222-159-162.hsd1.ca.comcast.net [73.222.159.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kjlx@templeofstupid.com) by pdx1-sub0-mail-a284.dreamhost.com (Postfix) with ESMTPSA id 4SvMCk6MhDzK7 for ; Mon, 18 Dec 2023 19:11:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=templeofstupid.com; s=dreamhost; t=1702955475; bh=3ILJVSkzhMMu+AsLMW/5pBaWQA1WfOaX+c91Ys4iI3U=; h=Date:From:To:Cc:Subject:Content-Type; b=e6Y9TrZI2TRD+j5ux8TabtOiqkW+OGtUBUeKmyTpO4QBigorBse5NKC8poMVqKuIs lFgUsgtiX7Q0bbF3bmEbaTie8wFS3/pzsEfxj7jz10q6tjj0Vx72iParROcVXn6qg/ RDg1DW/TAoigSzNP0D9SYqJaUu+e0pfje9WxI96p1x2dlv4zenFFsScsWAaNZhSakT M0l9HcdU5C7DT/FbxNr6r1ZNhJp4kyUNIzE9Xcq8Rb8SMphHALFDCAs7eybY0oqGul Y6oLjVLSDjHW4exD2Y9TSigw8Er943Vr8U54T4nGOPfy/Po2++8OuG9+9ifx9ZbFyu w3mYDQIHxMgXA== Received: from johansen (uid 1000) (envelope-from kjlx@templeofstupid.com) id e01c0 by kmjvbox.templeofstupid.com (DragonFly Mail Agent v0.12); Mon, 18 Dec 2023 19:10:41 -0800 Date: Mon, 18 Dec 2023 19:10:41 -0800 From: Krister Johansen To: stable@vger.kernel.org Cc: gregkh@linuxfoundation.org, mszeredi@redhat.com Subject: [PATCH 5.15.y] fuse: share lookup state between submount and its parent Message-ID: <20231219031041.GB2608@templeofstupid.com> References: <2023121709-gout-brick-e85e@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <2023121709-gout-brick-e85e@gregkh> commit c4d361f66ac91db8fc65061a9671682f61f4ca9d upstream. Fuse submounts do not perform a lookup for the nodeid that they inherit from their parent. Instead, the code decrements the nlookup on the submount's fuse_inode when it is instantiated, and no forget is performed when a submount root is evicted. Trouble arises when the submount's parent is evicted despite the submount itself being in use. In this author's case, the submount was in a container and deatched from the initial mount namespace via a MNT_DEATCH operation. When memory pressure triggered the shrinker, the inode from the parent was evicted, which triggered enough forgets to render the submount's nodeid invalid. Since submounts should still function, even if their parent goes away, solve this problem by sharing refcounted state between the parent and its submount. When all of the references on this shared state reach zero, it's safe to forget the final lookup of the fuse nodeid. Signed-off-by: Krister Johansen Cc: stable@vger.kernel.org Fixes: 1866d779d5d2 ("fuse: Allow fuse_fill_super_common() for submounts") Signed-off-by: Miklos Szeredi Signed-off-by: Krister Johansen --- fs/fuse/fuse_i.h | 15 ++++++++++ fs/fuse/inode.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 87 insertions(+), 3 deletions(-) diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index c3a87586a15f..4b8f094345e1 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -63,6 +63,19 @@ struct fuse_forget_link { struct fuse_forget_link *next; }; +/* Submount lookup tracking */ +struct fuse_submount_lookup { + /** Refcount */ + refcount_t count; + + /** Unique ID, which identifies the inode between userspace + * and kernel */ + u64 nodeid; + + /** The request used for sending the FORGET message */ + struct fuse_forget_link *forget; +}; + /** FUSE inode */ struct fuse_inode { /** Inode data */ @@ -155,6 +168,8 @@ struct fuse_inode { */ struct fuse_inode_dax *dax; #endif + /** Submount specific lookup tracking */ + struct fuse_submount_lookup *submount_lookup; }; /** FUSE inode state bits */ diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 50365143f50e..97dc24557bf2 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -69,6 +69,24 @@ struct fuse_forget_link *fuse_alloc_forget(void) return kzalloc(sizeof(struct fuse_forget_link), GFP_KERNEL_ACCOUNT); } +static struct fuse_submount_lookup *fuse_alloc_submount_lookup(void) +{ + struct fuse_submount_lookup *sl; + + sl = kzalloc(sizeof(struct fuse_submount_lookup), GFP_KERNEL_ACCOUNT); + if (!sl) + return NULL; + sl->forget = fuse_alloc_forget(); + if (!sl->forget) + goto out_free; + + return sl; + +out_free: + kfree(sl); + return NULL; +} + static struct inode *fuse_alloc_inode(struct super_block *sb) { struct fuse_inode *fi; @@ -84,6 +102,7 @@ static struct inode *fuse_alloc_inode(struct super_block *sb) fi->attr_version = 0; fi->orig_ino = 0; fi->state = 0; + fi->submount_lookup = NULL; mutex_init(&fi->mutex); spin_lock_init(&fi->lock); fi->forget = fuse_alloc_forget(); @@ -114,6 +133,17 @@ static void fuse_free_inode(struct inode *inode) kmem_cache_free(fuse_inode_cachep, fi); } +static void fuse_cleanup_submount_lookup(struct fuse_conn *fc, + struct fuse_submount_lookup *sl) +{ + if (!refcount_dec_and_test(&sl->count)) + return; + + fuse_queue_forget(fc, sl->forget, sl->nodeid, 1); + sl->forget = NULL; + kfree(sl); +} + static void fuse_evict_inode(struct inode *inode) { struct fuse_inode *fi = get_fuse_inode(inode); @@ -133,6 +163,11 @@ static void fuse_evict_inode(struct inode *inode) fi->nlookup); fi->forget = NULL; } + + if (fi->submount_lookup) { + fuse_cleanup_submount_lookup(fc, fi->submount_lookup); + fi->submount_lookup = NULL; + } } if (S_ISREG(inode->i_mode) && !fuse_is_bad(inode)) { WARN_ON(!list_empty(&fi->write_files)); @@ -279,6 +314,13 @@ void fuse_change_attributes(struct inode *inode, struct fuse_attr *attr, } } +static void fuse_init_submount_lookup(struct fuse_submount_lookup *sl, + u64 nodeid) +{ + sl->nodeid = nodeid; + refcount_set(&sl->count, 1); +} + static void fuse_init_inode(struct inode *inode, struct fuse_attr *attr) { inode->i_mode = attr->mode & S_IFMT; @@ -336,12 +378,22 @@ struct inode *fuse_iget(struct super_block *sb, u64 nodeid, */ if (fc->auto_submounts && (attr->flags & FUSE_ATTR_SUBMOUNT) && S_ISDIR(attr->mode)) { + struct fuse_inode *fi; + inode = new_inode(sb); if (!inode) return NULL; fuse_init_inode(inode, attr); - get_fuse_inode(inode)->nodeid = nodeid; + fi = get_fuse_inode(inode); + fi->nodeid = nodeid; + fi->submount_lookup = fuse_alloc_submount_lookup(); + if (!fi->submount_lookup) { + iput(inode); + return NULL; + } + /* Sets nlookup = 1 on fi->submount_lookup->nlookup */ + fuse_init_submount_lookup(fi->submount_lookup, nodeid); inode->i_flags |= S_AUTOMOUNT; goto done; } @@ -364,11 +416,11 @@ struct inode *fuse_iget(struct super_block *sb, u64 nodeid, iput(inode); goto retry; } -done: fi = get_fuse_inode(inode); spin_lock(&fi->lock); fi->nlookup++; spin_unlock(&fi->lock); +done: fuse_change_attributes(inode, attr, attr_valid, attr_version); return inode; @@ -1380,6 +1432,8 @@ static int fuse_fill_super_submount(struct super_block *sb, struct super_block *parent_sb = parent_fi->inode.i_sb; struct fuse_attr root_attr; struct inode *root; + struct fuse_submount_lookup *sl; + struct fuse_inode *fi; fuse_sb_defaults(sb); fm->sb = sb; @@ -1402,12 +1456,27 @@ static int fuse_fill_super_submount(struct super_block *sb, * its nlookup should not be incremented. fuse_iget() does * that, though, so undo it here. */ - get_fuse_inode(root)->nlookup--; + fi = get_fuse_inode(root); + fi->nlookup--; + sb->s_d_op = &fuse_dentry_operations; sb->s_root = d_make_root(root); if (!sb->s_root) return -ENOMEM; + /* + * Grab the parent's submount_lookup pointer and take a + * reference on the shared nlookup from the parent. This is to + * prevent the last forget for this nodeid from getting + * triggered until all users have finished with it. + */ + sl = parent_fi->submount_lookup; + WARN_ON(!sl); + if (sl) { + refcount_inc(&sl->count); + fi->submount_lookup = sl; + } + return 0; } -- 2.25.1