From nobody Wed Feb 11 23:44:04 2026 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (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 C89584D9E6 for ; Fri, 29 Mar 2024 01:54:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711677280; cv=none; b=MKB0U6f+taAVAxSgYy84RpzkHB6BWe0pPRKOWYihN+UQg68emcnytDkmrMi+QO8OGg5d34fqLKeHh+gW4yxucptUOSSgbT8F2zpUM7qgoJiW5AjBbsqBbrGCYI+xL12v/Dirsjk24M/xRPiF4tjGzGOJAEBchbYr2Fgd/MpZUgI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711677280; c=relaxed/simple; bh=1hYhQpZqd0XXYm/HQ/QbQPqNdnFO8JyYjGoojTz6Mc4=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=FKfXayP9folc/ZgI0rC82PnlM/PFFNqpZaxl+6IqvF9Yx1/oJtvx60dbJexCiNLtGpu3jWgaymqrbkicdvI56/lD7MkcWxmH4RnHwB/C99WtBg0+ysinUBHPO/NiJFv3RDyPnywPgsbfAPIEo6VZbm3pH1FxAi/b0lNIrqIvwhE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--drosen.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=ccCqjfS/; arc=none smtp.client-ip=209.85.128.202 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--drosen.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="ccCqjfS/" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-608ad239f8fso26661577b3.0 for ; Thu, 28 Mar 2024 18:54:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1711677277; x=1712282077; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=IkEzYxlv6dr5xmGlGpopV2VX8GvnZFbvgbTbydYSehc=; b=ccCqjfS/bjdQ2N4Gv/Yi+fO22id8bxq5vZ01OLRgusUt1k4HCQjDvvM8MBwIFQjvjt 2fVHtGXFACvmj8i5xmTEoaZJDP/4kl+/0EniEN5tZ9MTGIgJf7WneX6fwNx3mI4gdc/l b+kJvNddTdq3ztRiPudLHHQfBLqlWB1GAGlGS8YzCAqbWZZMkepBYkZQfWfYqbevccA/ ygbNNOJTS5SP86TiF6VNXUV+tLXse9mo2/LqEHnSw0FT/K2idP1wG3j+pRYeMAWLz88g 6gsmAXaN7rJyVByztSYaQa5FPsb6UkFujI3Cs0yl2CJRQdgZGNQkpMScUSbHGoRRGUaD Ws8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711677277; x=1712282077; h=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; bh=IkEzYxlv6dr5xmGlGpopV2VX8GvnZFbvgbTbydYSehc=; b=BPLrIbClInKbUdIKiXzdkLeVSbw1M1rIcFlm0C7vwhV3ZBQcj75vJH7IXD727U7nuM YOY2FfHSCtoWSziTP+s5R23mU1hBwarlraop3AvAFbTS+AEINvbl1fg6OU1p0LZ8aU6r kzgQLHoiz3DTtEGVUwgDaee6sq6D/LyhMGidyJBLsJypih+HYXDSpW10JYl3axeLlBiY 362GyDq/Sudf/6iaFmZQ8rvct30baVw+iB7AVOgC0eL/iOMxbT7ARLgOj0681eoztPbt Q9k9LXHuyKa7HtabIy3erRdDLucjbhxsEThZISLBtQ3fFCC1PAxz5d33BGC69wEcW8WQ SJCQ== X-Forwarded-Encrypted: i=1; AJvYcCUcx+zA1CtsW5AezM73gz3s5eQ6BZDp6V7jYkxJhPYXdWcrnAwSCTrqCf/cXOqoA5oGZ1l2sGKIITIvNhy9RNs/zLgEPIh33j+o9Rvs X-Gm-Message-State: AOJu0Yyu9oaw5DTnhMW/5fUW9Z8CPl9Q7O6yL84jLIHozsfQIXkAQl8m AwUPFslIz7o5bH7W2QR1YbRrj3xkKGbCnjnhKpURUrFyYZfL8e30+7z1FS8A3X0pnUmH8wVDWiy VsQ== X-Google-Smtp-Source: AGHT+IG4o1CxL8Bjxr6xpQB23/9k8WNGx/uQfnx3fQAYtxSCzfzM/VJ9Weo4asX0Z+rhcZDoXimryo87d4s= X-Received: from drosen.mtv.corp.google.com ([2620:15c:211:201:fcce:d6ab:804c:b94b]) (user=drosen job=sendgmr) by 2002:a0d:d897:0:b0:611:a624:12ea with SMTP id a145-20020a0dd897000000b00611a62412eamr287238ywe.0.1711677277090; Thu, 28 Mar 2024 18:54:37 -0700 (PDT) Date: Thu, 28 Mar 2024 18:53:32 -0700 In-Reply-To: <20240329015351.624249-1-drosen@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240329015351.624249-1-drosen@google.com> X-Mailer: git-send-email 2.44.0.478.gd926399ef9-goog Message-ID: <20240329015351.624249-18-drosen@google.com> Subject: [RFC PATCH v4 17/36] fuse-bpf: Add attr support From: Daniel Rosenberg To: Miklos Szeredi , bpf@vger.kernel.org, Alexei Starovoitov Cc: Amir Goldstein , linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-unionfs@vger.kernel.org, Daniel Borkmann , John Fastabend , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Eduard Zingerman , Yonghong Song , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Shuah Khan , Jonathan Corbet , Joanne Koong , Mykola Lysenko , Christian Brauner , kernel-team@android.com, Daniel Rosenberg , Paul Lawrence Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This adds backing support for FUSE_GETATTR, FUSE_SETATTR, and FUSE_STATFS Signed-off-by: Daniel Rosenberg Signed-off-by: Paul Lawrence --- fs/fuse/backing.c | 296 ++++++++++++++++++++++++++++++++++++++++++++++ fs/fuse/dir.c | 67 ++--------- fs/fuse/fuse_i.h | 102 ++++++++++++++++ fs/fuse/inode.c | 17 +-- 4 files changed, 412 insertions(+), 70 deletions(-) diff --git a/fs/fuse/backing.c b/fs/fuse/backing.c index 79f14634ae6a..e426268aa4e6 100644 --- a/fs/fuse/backing.c +++ b/fs/fuse/backing.c @@ -2054,6 +2054,302 @@ int fuse_bpf_unlink(int *out, struct inode *dir, st= ruct dentry *entry) dir, entry); } =20 +struct fuse_getattr_args { + struct fuse_getattr_in in; + struct fuse_attr_out out; +}; + +static int fuse_getattr_initialize_in(struct bpf_fuse_args *fa, struct fus= e_getattr_args *args, + const struct dentry *entry, struct kstat *stat, + u32 request_mask, unsigned int flags) +{ + args->in =3D (struct fuse_getattr_in) { + .getattr_flags =3D flags, + .fh =3D -1, /* TODO is this OK? */ + }; + + *fa =3D (struct bpf_fuse_args) { + .info =3D (struct bpf_fuse_meta_info) { + .nodeid =3D get_node_id(entry->d_inode), + .opcode =3D FUSE_GETATTR, + }, + .in_numargs =3D 1, + .in_args[0] =3D (struct bpf_fuse_arg) { + .size =3D sizeof(args->in), + .value =3D &args->in, + }, + }; + + return 0; +} + +static int fuse_getattr_initialize_out(struct bpf_fuse_args *fa, struct fu= se_getattr_args *args, + const struct dentry *entry, struct kstat *stat, + u32 request_mask, unsigned int flags) +{ + args->out =3D (struct fuse_attr_out) { 0 }; + + fa->out_numargs =3D 1; + fa->out_args[0] =3D (struct bpf_fuse_arg) { + .size =3D sizeof(args->out), + .value =3D &args->out, + }; + + return 0; +} + +/* TODO: unify with overlayfs */ +static inline int fuse_do_getattr(const struct path *path, struct kstat *s= tat, + u32 request_mask, unsigned int flags) +{ + if (flags & AT_GETATTR_NOSEC) + return vfs_getattr_nosec(path, stat, request_mask, flags); + return vfs_getattr(path, stat, request_mask, flags); +} + +static int fuse_getattr_backing(struct bpf_fuse_args *fa, int *out, + const struct dentry *entry, struct kstat *stat, + u32 request_mask, unsigned int flags) +{ + struct path *backing_path =3D &get_fuse_dentry(entry)->backing_path; + struct inode *backing_inode =3D backing_path->dentry->d_inode; + struct fuse_attr_out *fao =3D fa->out_args[0].value; + struct kstat tmp; + + if (!stat) + stat =3D &tmp; + + *out =3D fuse_do_getattr(backing_path, stat, request_mask, flags); + + if (!*out) + fuse_stat_to_attr(get_fuse_conn(entry->d_inode), backing_inode, + stat, &fao->attr); + + return 0; +} + +static int finalize_attr(struct inode *inode, struct fuse_attr_out *outarg, + u64 attr_version, struct kstat *stat) +{ + int err =3D 0; + + if (fuse_invalid_attr(&outarg->attr) || + ((inode->i_mode ^ outarg->attr.mode) & S_IFMT)) { + fuse_make_bad(inode); + err =3D -EIO; + } else { + fuse_change_attributes(inode, &outarg->attr, NULL, + ATTR_TIMEOUT(outarg), attr_version); + if (stat) + fuse_fillattr(inode, &outarg->attr, stat); + } + return err; +} + +static int fuse_getattr_finalize(struct bpf_fuse_args *fa, int *out, + const struct dentry *entry, struct kstat *stat, + u32 request_mask, unsigned int flags) +{ + struct fuse_attr_out *outarg =3D fa->out_args[0].value; + struct inode *inode =3D entry->d_inode; + u64 attr_version =3D fuse_get_attr_version(get_fuse_mount(inode)->fc); + + /* TODO: Ensure this doesn't happen if we had an error getting attrs in + * backing. + */ + *out =3D finalize_attr(inode, outarg, attr_version, stat); + return 0; +} + +int fuse_bpf_getattr(int *out, struct inode *inode, const struct dentry *e= ntry, struct kstat *stat, + u32 request_mask, unsigned int flags) +{ + return bpf_fuse_backing(inode, struct fuse_getattr_args, out, + fuse_getattr_initialize_in, fuse_getattr_initialize_out, + fuse_getattr_backing, fuse_getattr_finalize, + entry, stat, request_mask, flags); +} + +static void fattr_to_iattr(struct fuse_conn *fc, + const struct fuse_setattr_in *arg, + struct iattr *iattr) +{ + unsigned int fvalid =3D arg->valid; + + if (fvalid & FATTR_MODE) + iattr->ia_valid |=3D ATTR_MODE, iattr->ia_mode =3D arg->mode; + if (fvalid & FATTR_UID) { + iattr->ia_valid |=3D ATTR_UID; + iattr->ia_uid =3D make_kuid(fc->user_ns, arg->uid); + } + if (fvalid & FATTR_GID) { + iattr->ia_valid |=3D ATTR_GID; + iattr->ia_gid =3D make_kgid(fc->user_ns, arg->gid); + } + if (fvalid & FATTR_SIZE) + iattr->ia_valid |=3D ATTR_SIZE, iattr->ia_size =3D arg->size; + if (fvalid & FATTR_ATIME) { + iattr->ia_valid |=3D ATTR_ATIME; + iattr->ia_atime.tv_sec =3D arg->atime; + iattr->ia_atime.tv_nsec =3D arg->atimensec; + if (!(fvalid & FATTR_ATIME_NOW)) + iattr->ia_valid |=3D ATTR_ATIME_SET; + } + if (fvalid & FATTR_MTIME) { + iattr->ia_valid |=3D ATTR_MTIME; + iattr->ia_mtime.tv_sec =3D arg->mtime; + iattr->ia_mtime.tv_nsec =3D arg->mtimensec; + if (!(fvalid & FATTR_MTIME_NOW)) + iattr->ia_valid |=3D ATTR_MTIME_SET; + } + if (fvalid & FATTR_CTIME) { + iattr->ia_valid |=3D ATTR_CTIME; + iattr->ia_ctime.tv_sec =3D arg->ctime; + iattr->ia_ctime.tv_nsec =3D arg->ctimensec; + } +} + +struct fuse_setattr_args { + struct fuse_setattr_in in; + struct fuse_attr_out out; +}; + +static int fuse_setattr_initialize_in(struct bpf_fuse_args *fa, struct fus= e_setattr_args *args, + struct dentry *dentry, struct iattr *attr, struct file *file) +{ + struct fuse_conn *fc =3D get_fuse_conn(dentry->d_inode); + + *args =3D (struct fuse_setattr_args) { 0 }; + iattr_to_fattr(fc, attr, &args->in, true); + + *fa =3D (struct bpf_fuse_args) { + .info =3D (struct bpf_fuse_meta_info) { + .opcode =3D FUSE_SETATTR, + .nodeid =3D get_node_id(dentry->d_inode), + }, + .in_numargs =3D 1, + .in_args[0].size =3D sizeof(args->in), + .in_args[0].value =3D &args->in, + }; + + return 0; +} + +static int fuse_setattr_initialize_out(struct bpf_fuse_args *fa, struct fu= se_setattr_args *args, + struct dentry *dentry, struct iattr *attr, struct file *file) +{ + fa->out_numargs =3D 1; + fa->out_args[0].size =3D sizeof(args->out); + fa->out_args[0].value =3D &args->out; + + return 0; +} + +static int fuse_setattr_backing(struct bpf_fuse_args *fa, int *out, + struct dentry *dentry, struct iattr *attr, struct file *file) +{ + struct fuse_conn *fc =3D get_fuse_conn(dentry->d_inode); + const struct fuse_setattr_in *fsi =3D fa->in_args[0].value; + struct iattr new_attr =3D { 0 }; + struct path *backing_path =3D &get_fuse_dentry(dentry)->backing_path; + + fattr_to_iattr(fc, fsi, &new_attr); + /* TODO: Some info doesn't get saved by the attr->fattr->attr transition + * When we actually allow the bpf to change these, we may have to consider + * the extra flags more, or pass more info into the bpf. Until then we can + * keep everything except for ATTR_FILE, since we'd need a file on the + * lower fs. For what it's worth, neither f2fs nor ext4 make use of that + * even if it is present. + */ + new_attr.ia_valid =3D attr->ia_valid & ~ATTR_FILE; + inode_lock(d_inode(backing_path->dentry)); + *out =3D notify_change(&nop_mnt_idmap, backing_path->dentry, &new_attr, + NULL); + inode_unlock(d_inode(backing_path->dentry)); + + if (*out =3D=3D 0 && (new_attr.ia_valid & ATTR_SIZE)) + i_size_write(dentry->d_inode, new_attr.ia_size); + return 0; +} + +static int fuse_setattr_finalize(struct bpf_fuse_args *fa, int *out, + struct dentry *dentry, struct iattr *attr, struct file *file) +{ + return 0; +} + +int fuse_bpf_setattr(int *out, struct inode *inode, struct dentry *dentry,= struct iattr *attr, struct file *file) +{ + return bpf_fuse_backing(inode, struct fuse_setattr_args, out, + fuse_setattr_initialize_in, fuse_setattr_initialize_out, + fuse_setattr_backing, fuse_setattr_finalize, + dentry, attr, file); +} + +static int fuse_statfs_initialize_in(struct bpf_fuse_args *fa, struct fuse= _statfs_out *out, + struct dentry *dentry, struct kstatfs *buf) +{ + *fa =3D (struct bpf_fuse_args) { + .info =3D (struct bpf_fuse_meta_info) { + .nodeid =3D get_node_id(d_inode(dentry)), + .opcode =3D FUSE_STATFS, + }, + }; + + return 0; +} + +static int fuse_statfs_initialize_out(struct bpf_fuse_args *fa, struct fus= e_statfs_out *out, + struct dentry *dentry, struct kstatfs *buf) +{ + *out =3D (struct fuse_statfs_out) { 0 }; + + fa->out_numargs =3D 1; + fa->out_args[0].size =3D sizeof(*out); + fa->out_args[0].value =3D out; + + return 0; +} + +static int fuse_statfs_backing(struct bpf_fuse_args *fa, int *out, + struct dentry *dentry, struct kstatfs *buf) +{ + struct path backing_path; + struct fuse_statfs_out *fso =3D fa->out_args[0].value; + + *out =3D 0; + get_fuse_backing_path(dentry, &backing_path); + if (!backing_path.dentry) + return -EBADF; + *out =3D vfs_statfs(&backing_path, buf); + path_put(&backing_path); + buf->f_type =3D FUSE_SUPER_MAGIC; + + //TODO Provide postfilter opportunity to modify + if (!*out) + convert_statfs_to_fuse(&fso->st, buf); + + return 0; +} + +static int fuse_statfs_finalize(struct bpf_fuse_args *fa, int *out, + struct dentry *dentry, struct kstatfs *buf) +{ + struct fuse_statfs_out *fso =3D fa->out_args[0].value; + + if (!fa->info.error_in) + convert_fuse_statfs(buf, &fso->st); + return 0; +} + +int fuse_bpf_statfs(int *out, struct inode *inode, struct dentry *dentry, = struct kstatfs *buf) +{ + return bpf_fuse_backing(dentry->d_inode, struct fuse_statfs_out, out, + fuse_statfs_initialize_in, fuse_statfs_initialize_out, + fuse_statfs_backing, fuse_statfs_finalize, + dentry, buf); +} + struct fuse_read_args { struct fuse_read_in in; struct fuse_read_out out; diff --git a/fs/fuse/dir.c b/fs/fuse/dir.c index 0426243d9345..77d231ab1d9c 100644 --- a/fs/fuse/dir.c +++ b/fs/fuse/dir.c @@ -1256,7 +1256,7 @@ static int fuse_link(struct dentry *entry, struct ino= de *newdir, return err; } =20 -static void fuse_fillattr(struct inode *inode, struct fuse_attr *attr, +void fuse_fillattr(struct inode *inode, struct fuse_attr *attr, struct kstat *stat) { unsigned int blkbits; @@ -1414,6 +1414,7 @@ static int fuse_do_getattr(struct inode *inode, struc= t kstat *stat, } =20 static int fuse_update_get_attr(struct inode *inode, struct file *file, + const struct path *path, struct kstat *stat, u32 request_mask, unsigned int flags) { @@ -1424,6 +1425,8 @@ static int fuse_update_get_attr(struct inode *inode, = struct file *file, u32 inval_mask =3D READ_ONCE(fi->inval_mask); u32 cache_mask =3D fuse_get_cache_mask(inode); =20 + if (fuse_bpf_getattr(&err, inode, path->dentry, stat, request_mask, flags= )) + return err; =20 /* FUSE only supports basic stats and possibly btime */ request_mask &=3D STATX_BASIC_STATS | STATX_BTIME; @@ -1469,7 +1472,7 @@ static int fuse_update_get_attr(struct inode *inode, = struct file *file, =20 int fuse_update_attributes(struct inode *inode, struct file *file, u32 mas= k) { - return fuse_update_get_attr(inode, file, NULL, mask, 0); + return fuse_update_get_attr(inode, file, &file->f_path, NULL, mask, 0); } =20 int fuse_reverse_inval_entry(struct fuse_conn *fc, u64 parent_nodeid, @@ -1833,58 +1836,6 @@ static long fuse_dir_compat_ioctl(struct file *file,= unsigned int cmd, FUSE_IOCTL_COMPAT | FUSE_IOCTL_DIR); } =20 -static inline bool update_mtime(unsigned int ivalid, bool trust_local_mtim= e) -{ - /* Always update if mtime is explicitly set */ - if (ivalid & ATTR_MTIME_SET) - return true; - - /* Or if kernel i_mtime is the official one */ - if (trust_local_mtime) - return true; - - /* If it's an open(O_TRUNC) or an ftruncate(), don't update */ - if ((ivalid & ATTR_SIZE) && (ivalid & (ATTR_OPEN | ATTR_FILE))) - return false; - - /* In all other cases update */ - return true; -} - -static void iattr_to_fattr(struct fuse_conn *fc, struct iattr *iattr, - struct fuse_setattr_in *arg, bool trust_local_cmtime) -{ - unsigned ivalid =3D iattr->ia_valid; - - if (ivalid & ATTR_MODE) - arg->valid |=3D FATTR_MODE, arg->mode =3D iattr->ia_mode; - if (ivalid & ATTR_UID) - arg->valid |=3D FATTR_UID, arg->uid =3D from_kuid(fc->user_ns, iattr-= >ia_uid); - if (ivalid & ATTR_GID) - arg->valid |=3D FATTR_GID, arg->gid =3D from_kgid(fc->user_ns, iattr-= >ia_gid); - if (ivalid & ATTR_SIZE) - arg->valid |=3D FATTR_SIZE, arg->size =3D iattr->ia_size; - if (ivalid & ATTR_ATIME) { - arg->valid |=3D FATTR_ATIME; - arg->atime =3D iattr->ia_atime.tv_sec; - arg->atimensec =3D iattr->ia_atime.tv_nsec; - if (!(ivalid & ATTR_ATIME_SET)) - arg->valid |=3D FATTR_ATIME_NOW; - } - if ((ivalid & ATTR_MTIME) && update_mtime(ivalid, trust_local_cmtime)) { - arg->valid |=3D FATTR_MTIME; - arg->mtime =3D iattr->ia_mtime.tv_sec; - arg->mtimensec =3D iattr->ia_mtime.tv_nsec; - if (!(ivalid & ATTR_MTIME_SET) && !trust_local_cmtime) - arg->valid |=3D FATTR_MTIME_NOW; - } - if ((ivalid & ATTR_CTIME) && trust_local_cmtime) { - arg->valid |=3D FATTR_CTIME; - arg->ctime =3D iattr->ia_ctime.tv_sec; - arg->ctimensec =3D iattr->ia_ctime.tv_nsec; - } -} - /* * Prevent concurrent writepages on inode * @@ -1999,6 +1950,9 @@ int fuse_do_setattr(struct dentry *dentry, struct iat= tr *attr, bool trust_local_cmtime =3D is_wb; bool fault_blocked =3D false; =20 + if (fuse_bpf_setattr(&err, inode, dentry, attr, file)) + return err; + if (!fc->default_permissions) attr->ia_valid |=3D ATTR_FORCE; =20 @@ -2178,7 +2132,8 @@ static int fuse_setattr(struct mnt_idmap *idmap, stru= ct dentry *entry, * ia_mode calculation may have used stale i_mode. * Refresh and recalculate. */ - ret =3D fuse_do_getattr(inode, NULL, file); + if (!fuse_bpf_getattr(&ret, inode, entry, NULL, 0, 0)) + ret =3D fuse_do_getattr(inode, NULL, file); if (ret) return ret; =20 @@ -2235,7 +2190,7 @@ static int fuse_getattr(struct mnt_idmap *idmap, return -EACCES; } =20 - return fuse_update_get_attr(inode, NULL, stat, request_mask, flags); + return fuse_update_get_attr(inode, NULL, path, stat, request_mask, flags); } =20 static const struct inode_operations fuse_dir_inode_operations =3D { diff --git a/fs/fuse/fuse_i.h b/fs/fuse/fuse_i.h index 8bd78a52a6b5..61a17071ab02 100644 --- a/fs/fuse/fuse_i.h +++ b/fs/fuse/fuse_i.h @@ -1460,6 +1460,10 @@ int fuse_bpf_file_read_iter(ssize_t *out, struct ino= de *inode, struct kiocb *ioc int fuse_bpf_file_write_iter(ssize_t *out, struct inode *inode, struct kio= cb *iocb, struct iov_iter *from); int fuse_bpf_file_fallocate(int *out, struct inode *inode, struct file *fi= le, int mode, loff_t offset, loff_t length); int fuse_bpf_lookup(struct dentry **out, struct inode *dir, struct dentry = *entry, unsigned int flags); +int fuse_bpf_getattr(int *out, struct inode *inode, const struct dentry *e= ntry, struct kstat *stat, + u32 request_mask, unsigned int flags); +int fuse_bpf_setattr(int *out, struct inode *inode, struct dentry *dentry,= struct iattr *attr, struct file *file); +int fuse_bpf_statfs(int *out, struct inode *inode, struct dentry *dentry, = struct kstatfs *buf); int fuse_bpf_readdir(int *out, struct inode *inode, struct file *file, str= uct dir_context *ctx); int fuse_bpf_access(int *out, struct inode *inode, int mask); =20 @@ -1559,6 +1563,22 @@ static inline int fuse_bpf_lookup(struct dentry **ou= t, struct inode *dir, struct return 0; } =20 +static inline int fuse_bpf_getattr(int *out, struct inode *inode, const st= ruct dentry *entry, struct kstat *stat, + u32 request_mask, unsigned int flags) +{ + return 0; +} + +static inline int fuse_bpf_setattr(int *out, struct inode *inode, struct d= entry *dentry, struct iattr *attr, struct file *file) +{ + return 0; +} + +static inline int fuse_bpf_statfs(int *out, struct inode *inode, struct de= ntry *dentry, struct kstatfs *buf) +{ + return 0; +} + static inline int fuse_bpf_readdir(int *out, struct inode *inode, struct f= ile *file, struct dir_context *ctx) { return 0; @@ -1577,6 +1597,88 @@ int fuse_handle_backing(struct fuse_bpf_entry *fbe, = struct path *backing_path); =20 int fuse_revalidate_backing(struct dentry *entry, unsigned int flags); =20 +static inline bool update_mtime(unsigned int ivalid, bool trust_local_mtim= e) +{ + /* Always update if mtime is explicitly set */ + if (ivalid & ATTR_MTIME_SET) + return true; + + /* Or if kernel i_mtime is the official one */ + if (trust_local_mtime) + return true; + + /* If it's an open(O_TRUNC) or an ftruncate(), don't update */ + if ((ivalid & ATTR_SIZE) && (ivalid & (ATTR_OPEN | ATTR_FILE))) + return false; + + /* In all other cases update */ + return true; +} + +void fuse_fillattr(struct inode *inode, struct fuse_attr *attr, + struct kstat *stat); + +static inline void iattr_to_fattr(struct fuse_conn *fc, struct iattr *iatt= r, + struct fuse_setattr_in *arg, bool trust_local_cmtime) +{ + unsigned int ivalid =3D iattr->ia_valid; + + if (ivalid & ATTR_MODE) + arg->valid |=3D FATTR_MODE, arg->mode =3D iattr->ia_mode; + if (ivalid & ATTR_UID) + arg->valid |=3D FATTR_UID, arg->uid =3D from_kuid(fc->user_ns, iattr-= >ia_uid); + if (ivalid & ATTR_GID) + arg->valid |=3D FATTR_GID, arg->gid =3D from_kgid(fc->user_ns, iattr-= >ia_gid); + if (ivalid & ATTR_SIZE) + arg->valid |=3D FATTR_SIZE, arg->size =3D iattr->ia_size; + if (ivalid & ATTR_ATIME) { + arg->valid |=3D FATTR_ATIME; + arg->atime =3D iattr->ia_atime.tv_sec; + arg->atimensec =3D iattr->ia_atime.tv_nsec; + if (!(ivalid & ATTR_ATIME_SET)) + arg->valid |=3D FATTR_ATIME_NOW; + } + if ((ivalid & ATTR_MTIME) && update_mtime(ivalid, trust_local_cmtime)) { + arg->valid |=3D FATTR_MTIME; + arg->mtime =3D iattr->ia_mtime.tv_sec; + arg->mtimensec =3D iattr->ia_mtime.tv_nsec; + if (!(ivalid & ATTR_MTIME_SET) && !trust_local_cmtime) + arg->valid |=3D FATTR_MTIME_NOW; + } + if ((ivalid & ATTR_CTIME) && trust_local_cmtime) { + arg->valid |=3D FATTR_CTIME; + arg->ctime =3D iattr->ia_ctime.tv_sec; + arg->ctimensec =3D iattr->ia_ctime.tv_nsec; + } +} + +static inline void convert_statfs_to_fuse(struct fuse_kstatfs *attr, struc= t kstatfs *stbuf) +{ + attr->bsize =3D stbuf->f_bsize; + attr->frsize =3D stbuf->f_frsize; + attr->blocks =3D stbuf->f_blocks; + attr->bfree =3D stbuf->f_bfree; + attr->bavail =3D stbuf->f_bavail; + attr->files =3D stbuf->f_files; + attr->ffree =3D stbuf->f_ffree; + attr->namelen =3D stbuf->f_namelen; + /* fsid is left zero */ +} + +static inline void convert_fuse_statfs(struct kstatfs *stbuf, struct fuse_= kstatfs *attr) +{ + stbuf->f_type =3D FUSE_SUPER_MAGIC; + stbuf->f_bsize =3D attr->bsize; + stbuf->f_frsize =3D attr->frsize; + stbuf->f_blocks =3D attr->blocks; + stbuf->f_bfree =3D attr->bfree; + stbuf->f_bavail =3D attr->bavail; + stbuf->f_files =3D attr->files; + stbuf->f_ffree =3D attr->ffree; + stbuf->f_namelen =3D attr->namelen; + /* fsid is left zero */ +} + #ifdef CONFIG_FUSE_BPF int __init fuse_bpf_init(void); void __exit fuse_bpf_cleanup(void); diff --git a/fs/fuse/inode.c b/fs/fuse/inode.c index 825b65117126..bc504e0d0e80 100644 --- a/fs/fuse/inode.c +++ b/fs/fuse/inode.c @@ -696,20 +696,6 @@ static void fuse_send_destroy(struct fuse_mount *fm) } } =20 -static void convert_fuse_statfs(struct kstatfs *stbuf, struct fuse_kstatfs= *attr) -{ - stbuf->f_type =3D FUSE_SUPER_MAGIC; - stbuf->f_bsize =3D attr->bsize; - stbuf->f_frsize =3D attr->frsize; - stbuf->f_blocks =3D attr->blocks; - stbuf->f_bfree =3D attr->bfree; - stbuf->f_bavail =3D attr->bavail; - stbuf->f_files =3D attr->files; - stbuf->f_ffree =3D attr->ffree; - stbuf->f_namelen =3D attr->namelen; - /* fsid is left zero */ -} - static int fuse_statfs(struct dentry *dentry, struct kstatfs *buf) { struct super_block *sb =3D dentry->d_sb; @@ -723,6 +709,9 @@ static int fuse_statfs(struct dentry *dentry, struct ks= tatfs *buf) return 0; } =20 + if (fuse_bpf_statfs(&err, dentry->d_inode, dentry, buf)) + return err; + memset(&outarg, 0, sizeof(outarg)); args.in_numargs =3D 0; args.opcode =3D FUSE_STATFS; --=20 2.44.0.478.gd926399ef9-goog