From nobody Mon Feb 9 13:38:32 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1627657476519701.664393453187; Fri, 30 Jul 2021 08:04:36 -0700 (PDT) Received: from localhost ([::1]:54520 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1m9U3u-0007rU-Ko for importer@patchew.org; Fri, 30 Jul 2021 11:04:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:49148) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9U24-0005Tw-PL for qemu-devel@nongnu.org; Fri, 30 Jul 2021 11:02:40 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:37311) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1m9U20-0007hY-RF for qemu-devel@nongnu.org; Fri, 30 Jul 2021 11:02:39 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-155-uTs2fGvYOmyr9GgFT4W4fQ-1; Fri, 30 Jul 2021 11:02:32 -0400 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CA4B310B0B07 for ; Fri, 30 Jul 2021 15:02:08 +0000 (UTC) Received: from localhost (unknown [10.39.193.62]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C17E618A50; Fri, 30 Jul 2021 15:02:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1627657354; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=beYdEtSEak1AFqrUwAMHq2FzEzVChIPfwG0NrMmknx0=; b=jHVl8OJ7YUAr3Zm3b56oRYzmES3AYlxJ8du8KKU0tCHGX3SlLAuSB7WfT+BTTdcS5GrvSw S2kaSNO/6AmBQgTYFvXwmLrSyhtw3M+YNVABEIqrCUnSvdSjV3eia9XXeNOM5IrbYSILfs Kxvi5eTA5EwLG4kBSXQSMhDBURGAC/0= X-MC-Unique: uTs2fGvYOmyr9GgFT4W4fQ-1 From: Max Reitz To: qemu-devel@nongnu.org, virtio-fs@redhat.com Subject: [PATCH v3 04/10] virtiofsd: Add lo_inode_fd() helper Date: Fri, 30 Jul 2021 17:01:28 +0200 Message-Id: <20210730150134.216126-5-mreitz@redhat.com> In-Reply-To: <20210730150134.216126-1-mreitz@redhat.com> References: <20210730150134.216126-1-mreitz@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=mreitz@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=216.205.24.124; envelope-from=mreitz@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.717, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Hajnoczi , "Dr . David Alan Gilbert" , Vivek Goyal , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1627657524010100001 Content-Type: text/plain; charset="utf-8" Once we let lo_inode.fd be optional, we will need its users to open the file handle stored in lo_inode instead. This function will do that. For now, it just returns lo_inode.fd, though. Signed-off-by: Max Reitz --- tools/virtiofsd/passthrough_ll.c | 150 +++++++++++++++++++++++++------ 1 file changed, 125 insertions(+), 25 deletions(-) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index a444c3a7e2..86b901cf19 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -635,6 +635,16 @@ static struct lo_inode *lo_inode(fuse_req_t req, fuse_= ino_t ino) return elem->inode; } =20 +static int lo_inode_fd(const struct lo_inode *inode, TempFd *tfd) +{ + *tfd =3D (TempFd) { + .fd =3D inode->fd, + .owned =3D false, + }; + + return 0; +} + /* * TODO Remove this helper and force callers to hold an inode refcount unt= il * they are done with the fd. This will be done in a later patch to make @@ -822,11 +832,11 @@ static int lo_fi_fd(fuse_req_t req, struct fuse_file_= info *fi) static void lo_setattr(fuse_req_t req, fuse_ino_t ino, struct stat *attr, int valid, struct fuse_file_info *fi) { + g_auto(TempFd) inode_fd =3D TEMP_FD_INIT; int saverr; char procname[64]; struct lo_data *lo =3D lo_data(req); struct lo_inode *inode; - int ifd; int res; int fd =3D -1; =20 @@ -836,7 +846,11 @@ static void lo_setattr(fuse_req_t req, fuse_ino_t ino,= struct stat *attr, return; } =20 - ifd =3D inode->fd; + res =3D lo_inode_fd(inode, &inode_fd); + if (res < 0) { + saverr =3D -res; + goto out_err; + } =20 /* If fi->fh is invalid we'll report EBADF later */ if (fi) { @@ -847,7 +861,7 @@ static void lo_setattr(fuse_req_t req, fuse_ino_t ino, = struct stat *attr, if (fi) { res =3D fchmod(fd, attr->st_mode); } else { - sprintf(procname, "%i", ifd); + sprintf(procname, "%i", inode_fd.fd); res =3D fchmodat(lo->proc_self_fd, procname, attr->st_mode, 0); } if (res =3D=3D -1) { @@ -859,12 +873,13 @@ static void lo_setattr(fuse_req_t req, fuse_ino_t ino= , struct stat *attr, uid_t uid =3D (valid & FUSE_SET_ATTR_UID) ? attr->st_uid : (uid_t)= -1; gid_t gid =3D (valid & FUSE_SET_ATTR_GID) ? attr->st_gid : (gid_t)= -1; =20 - saverr =3D drop_security_capability(lo, ifd); + saverr =3D drop_security_capability(lo, inode_fd.fd); if (saverr) { goto out_err; } =20 - res =3D fchownat(ifd, "", uid, gid, AT_EMPTY_PATH | AT_SYMLINK_NOF= OLLOW); + res =3D fchownat(inode_fd.fd, "", uid, gid, + AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW); if (res =3D=3D -1) { saverr =3D errno; goto out_err; @@ -943,7 +958,7 @@ static void lo_setattr(fuse_req_t req, fuse_ino_t ino, = struct stat *attr, if (fi) { res =3D futimens(fd, tv); } else { - sprintf(procname, "%i", inode->fd); + sprintf(procname, "%i", inode_fd.fd); res =3D utimensat(lo->proc_self_fd, procname, tv, 0); } if (res =3D=3D -1) { @@ -1058,7 +1073,8 @@ static int lo_do_lookup(fuse_req_t req, fuse_ino_t pa= rent, const char *name, struct fuse_entry_param *e, struct lo_inode **inodep) { - int newfd; + g_auto(TempFd) dir_fd =3D TEMP_FD_INIT; + int newfd =3D -1; int res; int saverr; uint64_t mnt_id; @@ -1088,7 +1104,13 @@ static int lo_do_lookup(fuse_req_t req, fuse_ino_t p= arent, const char *name, name =3D "."; } =20 - newfd =3D openat(dir->fd, name, O_PATH | O_NOFOLLOW); + res =3D lo_inode_fd(dir, &dir_fd); + if (res < 0) { + saverr =3D -res; + goto out; + } + + newfd =3D openat(dir_fd.fd, name, O_PATH | O_NOFOLLOW); if (newfd =3D=3D -1) { goto out_err; } @@ -1155,6 +1177,7 @@ static int lo_do_lookup(fuse_req_t req, fuse_ino_t pa= rent, const char *name, =20 out_err: saverr =3D errno; +out: if (newfd !=3D -1) { close(newfd); } @@ -1312,6 +1335,7 @@ static void lo_mknod_symlink(fuse_req_t req, fuse_ino= _t parent, const char *name, mode_t mode, dev_t rdev, const char *link) { + g_auto(TempFd) dir_fd =3D TEMP_FD_INIT; int res; int saverr; struct lo_data *lo =3D lo_data(req); @@ -1335,12 +1359,18 @@ static void lo_mknod_symlink(fuse_req_t req, fuse_i= no_t parent, return; } =20 + res =3D lo_inode_fd(dir, &dir_fd); + if (res < 0) { + saverr =3D -res; + goto out; + } + saverr =3D lo_change_cred(req, &old, lo->change_umask && !S_ISLNK(mode= )); if (saverr) { goto out; } =20 - res =3D mknod_wrapper(dir->fd, name, link, mode, rdev); + res =3D mknod_wrapper(dir_fd.fd, name, link, mode, rdev); =20 saverr =3D errno; =20 @@ -1388,6 +1418,8 @@ static void lo_symlink(fuse_req_t req, const char *li= nk, fuse_ino_t parent, static void lo_link(fuse_req_t req, fuse_ino_t ino, fuse_ino_t parent, const char *name) { + g_auto(TempFd) inode_fd =3D TEMP_FD_INIT; + g_auto(TempFd) parent_fd =3D TEMP_FD_INIT; int res; struct lo_data *lo =3D lo_data(req); struct lo_inode *parent_inode; @@ -1413,18 +1445,31 @@ static void lo_link(fuse_req_t req, fuse_ino_t ino,= fuse_ino_t parent, goto out_err; } =20 + res =3D lo_inode_fd(inode, &inode_fd); + if (res < 0) { + errno =3D -res; + goto out_err; + } + + res =3D lo_inode_fd(parent_inode, &parent_fd); + if (res < 0) { + errno =3D -res; + goto out_err; + } + memset(&e, 0, sizeof(struct fuse_entry_param)); e.attr_timeout =3D lo->timeout; e.entry_timeout =3D lo->timeout; =20 - sprintf(procname, "%i", inode->fd); - res =3D linkat(lo->proc_self_fd, procname, parent_inode->fd, name, + sprintf(procname, "%i", inode_fd.fd); + res =3D linkat(lo->proc_self_fd, procname, parent_fd.fd, name, AT_SYMLINK_FOLLOW); if (res =3D=3D -1) { goto out_err; } =20 - res =3D fstatat(inode->fd, "", &e.attr, AT_EMPTY_PATH | AT_SYMLINK_NOF= OLLOW); + res =3D fstatat(inode_fd.fd, "", &e.attr, + AT_EMPTY_PATH | AT_SYMLINK_NOFOLLOW); if (res =3D=3D -1) { goto out_err; } @@ -1453,23 +1498,33 @@ out_err: static struct lo_inode *lookup_name(fuse_req_t req, fuse_ino_t parent, const char *name) { + g_auto(TempFd) dir_fd =3D TEMP_FD_INIT; int res; uint64_t mnt_id; struct stat attr; struct lo_data *lo =3D lo_data(req); struct lo_inode *dir =3D lo_inode(req, parent); + struct lo_inode *inode =3D NULL; =20 if (!dir) { - return NULL; + goto out; } =20 - res =3D do_statx(lo, dir->fd, name, &attr, AT_SYMLINK_NOFOLLOW, &mnt_i= d); - lo_inode_put(lo, &dir); + res =3D lo_inode_fd(dir, &dir_fd); + if (res < 0) { + goto out; + } + + res =3D do_statx(lo, dir_fd.fd, name, &attr, AT_SYMLINK_NOFOLLOW, &mnt= _id); if (res =3D=3D -1) { - return NULL; + goto out; } =20 - return lo_find(lo, &attr, mnt_id); + inode =3D lo_find(lo, &attr, mnt_id); + +out: + lo_inode_put(lo, &dir); + return inode; } =20 static void lo_rmdir(fuse_req_t req, fuse_ino_t parent, const char *name) @@ -1505,6 +1560,8 @@ static void lo_rename(fuse_req_t req, fuse_ino_t pare= nt, const char *name, fuse_ino_t newparent, const char *newname, unsigned int flags) { + g_auto(TempFd) parent_fd =3D TEMP_FD_INIT; + g_auto(TempFd) newparent_fd =3D TEMP_FD_INIT; int res; struct lo_inode *parent_inode; struct lo_inode *newparent_inode; @@ -1537,12 +1594,24 @@ static void lo_rename(fuse_req_t req, fuse_ino_t pa= rent, const char *name, goto out; } =20 + res =3D lo_inode_fd(parent_inode, &parent_fd); + if (res < 0) { + fuse_reply_err(req, -res); + goto out; + } + + res =3D lo_inode_fd(newparent_inode, &newparent_fd); + if (res < 0) { + fuse_reply_err(req, -res); + goto out; + } + if (flags) { #ifndef SYS_renameat2 fuse_reply_err(req, EINVAL); #else - res =3D syscall(SYS_renameat2, parent_inode->fd, name, - newparent_inode->fd, newname, flags); + res =3D syscall(SYS_renameat2, parent_fd.fd, name, + newparent_fd.fd, newname, flags); if (res =3D=3D -1 && errno =3D=3D ENOSYS) { fuse_reply_err(req, EINVAL); } else { @@ -1552,7 +1621,7 @@ static void lo_rename(fuse_req_t req, fuse_ino_t pare= nt, const char *name, goto out; } =20 - res =3D renameat(parent_inode->fd, name, newparent_inode->fd, newname); + res =3D renameat(parent_fd.fd, name, newparent_fd.fd, newname); =20 fuse_reply_err(req, res =3D=3D -1 ? errno : 0); out: @@ -2037,6 +2106,7 @@ static int lo_do_open(struct lo_data *lo, struct lo_i= node *inode, static void lo_create(fuse_req_t req, fuse_ino_t parent, const char *name, mode_t mode, struct fuse_file_info *fi) { + g_auto(TempFd) parent_fd =3D TEMP_FD_INIT; int fd =3D -1; struct lo_data *lo =3D lo_data(req); struct lo_inode *parent_inode; @@ -2059,6 +2129,12 @@ static void lo_create(fuse_req_t req, fuse_ino_t par= ent, const char *name, return; } =20 + err =3D lo_inode_fd(parent_inode, &parent_fd); + if (err < 0) { + err =3D -err; + goto out; + } + err =3D lo_change_cred(req, &old, lo->change_umask); if (err) { goto out; @@ -2067,7 +2143,7 @@ static void lo_create(fuse_req_t req, fuse_ino_t pare= nt, const char *name, update_open_flags(lo->writeback, lo->allow_direct_io, fi); =20 /* Try to create a new file but don't open existing files */ - fd =3D openat(parent_inode->fd, name, fi->flags | O_CREAT | O_EXCL, mo= de); + fd =3D openat(parent_fd.fd, name, fi->flags | O_CREAT | O_EXCL, mode); err =3D fd =3D=3D -1 ? errno : 0; =20 lo_restore_cred(&old, lo->change_umask); @@ -2929,6 +3005,7 @@ static int remove_blocked_xattrs(struct lo_data *lo, = char *xattr_list, static void lo_getxattr(fuse_req_t req, fuse_ino_t ino, const char *in_nam= e, size_t size) { + g_auto(TempFd) inode_fd =3D TEMP_FD_INIT; struct lo_data *lo =3D lo_data(req); g_autofree char *value =3D NULL; char procname[64]; @@ -2997,7 +3074,12 @@ static void lo_getxattr(fuse_req_t req, fuse_ino_t i= no, const char *in_name, ret =3D fgetxattr(fd, name, value, size); saverr =3D ret =3D=3D -1 ? errno : 0; } else { - sprintf(procname, "%i", inode->fd); + ret =3D lo_inode_fd(inode, &inode_fd); + if (ret < 0) { + saverr =3D -ret; + goto out; + } + sprintf(procname, "%i", inode_fd.fd); /* fchdir should not fail here */ FCHDIR_NOFAIL(lo->proc_self_fd); ret =3D getxattr(procname, name, value, size); @@ -3035,6 +3117,7 @@ out: =20 static void lo_listxattr(fuse_req_t req, fuse_ino_t ino, size_t size) { + g_auto(TempFd) inode_fd =3D TEMP_FD_INIT; struct lo_data *lo =3D lo_data(req); g_autofree char *value =3D NULL; char procname[64]; @@ -3073,7 +3156,12 @@ static void lo_listxattr(fuse_req_t req, fuse_ino_t = ino, size_t size) ret =3D flistxattr(fd, value, size); saverr =3D ret =3D=3D -1 ? errno : 0; } else { - sprintf(procname, "%i", inode->fd); + ret =3D lo_inode_fd(inode, &inode_fd); + if (ret < 0) { + saverr =3D -ret; + goto out; + } + sprintf(procname, "%i", inode_fd.fd); /* fchdir should not fail here */ FCHDIR_NOFAIL(lo->proc_self_fd); ret =3D listxattr(procname, value, size); @@ -3170,6 +3258,7 @@ static void lo_setxattr(fuse_req_t req, fuse_ino_t in= o, const char *in_name, const char *value, size_t size, int flags, uint32_t extra_flags) { + g_auto(TempFd) inode_fd =3D TEMP_FD_INIT; char procname[64]; const char *name; char *mapped_name; @@ -3229,7 +3318,12 @@ static void lo_setxattr(fuse_req_t req, fuse_ino_t i= no, const char *in_name, goto out; } } else { - sprintf(procname, "%i", inode->fd); + ret =3D lo_inode_fd(inode, &inode_fd); + if (ret < 0) { + saverr =3D -ret; + goto out; + } + sprintf(procname, "%i", inode_fd.fd); /* fchdir should not fail here */ FCHDIR_NOFAIL(lo->proc_self_fd); } @@ -3286,6 +3380,7 @@ out: =20 static void lo_removexattr(fuse_req_t req, fuse_ino_t ino, const char *in_= name) { + g_auto(TempFd) inode_fd =3D TEMP_FD_INIT; char procname[64]; const char *name; char *mapped_name; @@ -3337,7 +3432,12 @@ static void lo_removexattr(fuse_req_t req, fuse_ino_= t ino, const char *in_name) ret =3D fremovexattr(fd, name); saverr =3D ret =3D=3D -1 ? errno : 0; } else { - sprintf(procname, "%i", inode->fd); + ret =3D lo_inode_fd(inode, &inode_fd); + if (ret < 0) { + saverr =3D -ret; + goto out; + } + sprintf(procname, "%i", inode_fd.fd); /* fchdir should not fail here */ FCHDIR_NOFAIL(lo->proc_self_fd); ret =3D removexattr(procname, name); --=20 2.31.1