From nobody Fri Apr 4 05:55:00 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1741626701470457.1899189599685; Mon, 10 Mar 2025 10:11:41 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1trgf6-0003U5-5W; Mon, 10 Mar 2025 13:11:33 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1trgeq-0003LA-Fg for qemu-devel@nongnu.org; Mon, 10 Mar 2025 13:11:16 -0400 Received: from us-smtp-delivery-44.mimecast.com ([205.139.111.44]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1trgeo-00016h-Dl for qemu-devel@nongnu.org; Mon, 10 Mar 2025 13:11:16 -0400 Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-12-1RrpHN4ZO22wRJtVb7lT0w-1; Mon, 10 Mar 2025 13:11:09 -0400 Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (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) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 59E61180882E; Mon, 10 Mar 2025 17:11:08 +0000 (UTC) Received: from bahia.redhat.com (unknown [10.22.64.233]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 0C5CC18001DE; Mon, 10 Mar 2025 17:11:06 +0000 (UTC) X-MC-Unique: 1RrpHN4ZO22wRJtVb7lT0w-1 X-Mimecast-MFC-AGG-ID: 1RrpHN4ZO22wRJtVb7lT0w_1741626668 From: Greg Kurz To: qemu-devel@nongnu.org Cc: Christian Schoenebeck , Greg Kurz Subject: [PATCH 2/4] 9pfs: Don't use file descriptors in core code Date: Mon, 10 Mar 2025 18:10:59 +0100 Message-ID: <20250310171101.138380-3-groug@kaod.org> In-Reply-To: <20250310171101.138380-1-groug@kaod.org> References: <20250310171101.138380-1-groug@kaod.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 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: softfail client-ip=205.139.111.44; envelope-from=groug@kaod.org; helo=us-smtp-delivery-44.mimecast.com X-Spam_score_int: -14 X-Spam_score: -1.5 X-Spam_bar: - X-Spam_report: (-1.5 / 5.0 requ) BAYES_00=-1.9, PDS_OTHER_BAD_TLD=0.47, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_SOFTFAIL=0.665 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1741626703342019000 Content-Type: text/plain; charset="utf-8" v9fs_getattr() currently peeks into V9fsFidOpenState to know if a fid has a valid file descriptor or directory stream. Even though the fields are accessible, this is an implementation detail of the local backend that should not be manipulated directly by the server code. Abstract that with a new has_valid_handle() backend operation. Make the existing local_fid_fd() helper more robust so that it can cope with P9_FID_NONE or a null directory stream and reuse it. Signed-off-by: Greg Kurz --- fsdev/file-op-9p.h | 1 + hw/9pfs/9p-local.c | 12 +++++++++--- hw/9pfs/9p-synth.c | 6 ++++++ hw/9pfs/9p.c | 9 ++++++--- 4 files changed, 22 insertions(+), 6 deletions(-) diff --git a/fsdev/file-op-9p.h b/fsdev/file-op-9p.h index 4997677460e8..39fee185f4ce 100644 --- a/fsdev/file-op-9p.h +++ b/fsdev/file-op-9p.h @@ -164,6 +164,7 @@ struct FileOperations { int (*renameat)(FsContext *ctx, V9fsPath *olddir, const char *old_name, V9fsPath *newdir, const char *new_name); int (*unlinkat)(FsContext *ctx, V9fsPath *dir, const char *name, int f= lags); + bool (*has_valid_handle)(int fid_type, V9fsFidOpenState *fs); }; =20 #endif diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c index c4366c867988..03e5304ef888 100644 --- a/hw/9pfs/9p-local.c +++ b/hw/9pfs/9p-local.c @@ -768,11 +768,11 @@ out: =20 static int local_fid_fd(int fid_type, V9fsFidOpenState *fs) { - int fd; + int fd =3D -1; =20 - if (fid_type =3D=3D P9_FID_DIR) { + if (fid_type =3D=3D P9_FID_DIR && fs->dir.stream !=3D NULL) { fd =3D dirfd(fs->dir.stream); - } else { + } else if (fid_type =3D=3D P9_FID_FILE) { fd =3D fs->fd; } =20 @@ -1576,6 +1576,11 @@ static int local_parse_opts(QemuOpts *opts, FsDriver= Entry *fse, Error **errp) return 0; } =20 +static bool local_has_valid_handle(int fid_type, V9fsFidOpenState *fs) +{ + return local_fid_fd(fid_type, fs) !=3D -1; +} + FileOperations local_ops =3D { .parse_opts =3D local_parse_opts, .init =3D local_init, @@ -1613,4 +1618,5 @@ FileOperations local_ops =3D { .name_to_path =3D local_name_to_path, .renameat =3D local_renameat, .unlinkat =3D local_unlinkat, + .has_valid_handle =3D local_has_valid_handle, }; diff --git a/hw/9pfs/9p-synth.c b/hw/9pfs/9p-synth.c index 2abaf3a2918a..fa0b187a1b80 100644 --- a/hw/9pfs/9p-synth.c +++ b/hw/9pfs/9p-synth.c @@ -615,6 +615,11 @@ static int synth_init(FsContext *ctx, Error **errp) return 0; } =20 +static bool synth_has_valid_handle(int fid_type, V9fsFidOpenState *fs) +{ + return false; +} + FileOperations synth_ops =3D { .init =3D synth_init, .lstat =3D synth_lstat, @@ -650,4 +655,5 @@ FileOperations synth_ops =3D { .name_to_path =3D synth_name_to_path, .renameat =3D synth_renameat, .unlinkat =3D synth_unlinkat, + .has_valid_handle =3D synth_has_valid_handle, }; diff --git a/hw/9pfs/9p.c b/hw/9pfs/9p.c index 7cad2bce6209..969fb2f8c494 100644 --- a/hw/9pfs/9p.c +++ b/hw/9pfs/9p.c @@ -1574,6 +1574,11 @@ out_nofid: pdu_complete(pdu, err); } =20 +static bool fid_has_valid_handle(V9fsState *s, V9fsFidState *fidp) +{ + return s->ops->has_valid_handle(fidp->fid_type, &fidp->fs); +} + static void coroutine_fn v9fs_getattr(void *opaque) { int32_t fid; @@ -1596,9 +1601,7 @@ static void coroutine_fn v9fs_getattr(void *opaque) retval =3D -ENOENT; goto out_nofid; } - if ((fidp->fid_type =3D=3D P9_FID_FILE && fidp->fs.fd !=3D -1) || - (fidp->fid_type =3D=3D P9_FID_DIR && fidp->fs.dir.stream)) - { + if (fid_has_valid_handle(pdu->s, fidp)) { retval =3D v9fs_co_fstat(pdu, fidp, &stbuf); } else { retval =3D v9fs_co_lstat(pdu, &fidp->path, &stbuf); --=20 2.48.1