From nobody Fri Oct 3 11:28:55 2025 Delivered-To: importer@patchew.org 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; Authentication-Results: mx.zohomail.com; dkim=pass; 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=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1579807907; cv=none; d=zohomail.com; s=zohoarc; b=JnGFNeG82PIeUzeoLHT1FxdqdVXWhgynMbgV526NWqfE49YQPsCIH08mEct6E3EjS4n880Tru/Cj6U5dQAvj1+AI2tDDf5xj//pbWhDoJpIG1r5tPEt4p5Uw8UAHZdrTdgiL4zZNpJDnlxIgsYu73yjQi0cIDhQXvBVoDB1aJc8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579807907; h=Content-Type:Content-Transfer-Encoding:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=I24qiScxZIlbZghmzV5IGz3tbAkotYcSQUQCVFodY9M=; b=dtIhf3NmXc3uNWQBCYOf8Tq5xKTIcyyHMs7MAAYgxTLSPSigqA+kdTXAQeD8h+POhAveMHEVremsnJ0SvlGZsFv3S/R2szk0P5Mo1kpQik+b4a1ughJd6KNLQQ5c3VGSEnpSckSasGH4VQS3Na5t4rtg1GvplVwXNeS5NM07LVg= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; 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=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579807907096341.53786277516724; Thu, 23 Jan 2020 11:31:47 -0800 (PST) Received: from localhost ([::1]:35798 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuiCf-0005ag-PG for importer@patchew.org; Thu, 23 Jan 2020 14:31:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42159) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iufeV-0005ev-VM for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:48:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iufeU-0007Tr-J7 for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:48:19 -0500 Received: from us-smtp-2.mimecast.com ([205.139.110.61]:49509 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iufeU-0007SP-Fw for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:48:18 -0500 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-382-_hZbUwGtO6WFeqzE-sb7ZA-1; Thu, 23 Jan 2020 11:48:11 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E5805190B2D8 for ; Thu, 23 Jan 2020 16:48:10 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-116-110.ams2.redhat.com [10.36.116.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id DF6C428993; Thu, 23 Jan 2020 16:48:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579798098; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=I24qiScxZIlbZghmzV5IGz3tbAkotYcSQUQCVFodY9M=; b=ERwMZRqAmTZg7kUb/6m70gi2AjIkjNmCvoGWlt0wo3N8QYYIX6e7OGCVgCDwzkUQUnQ2vt JTYvj2HTBXPPWSXKRwhpIipWdhy1iXBxBZb8gNPMqiWW6/PWaHhG6dHL6SjQZUnS/MWAJk PbR6wek6BEt68h+DUjAFXLOjQKbEU8o= From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com Subject: [PULL 069/108] virtiofsd: passthrough_ll: control readdirplus Date: Thu, 23 Jan 2020 16:45:51 +0000 Message-Id: <20200123164630.91498-70-dgilbert@redhat.com> In-Reply-To: <20200123164630.91498-1-dgilbert@redhat.com> References: <20200123164630.91498-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: _hZbUwGtO6WFeqzE-sb7ZA-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.61 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: Miklos Szeredi Signed-off-by: Miklos Szeredi Reviewed-by: Misono Tomohiro Signed-off-by: Dr. David Alan Gilbert --- tools/virtiofsd/helper.c | 4 ++++ tools/virtiofsd/passthrough_ll.c | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/tools/virtiofsd/helper.c b/tools/virtiofsd/helper.c index 6d50a46a7e..14f5d70c10 100644 --- a/tools/virtiofsd/helper.c +++ b/tools/virtiofsd/helper.c @@ -153,6 +153,10 @@ void fuse_cmdline_help(void) " allowed (default: 10)\n" " -o norace disable racy fallback\n" " default: false\n" + " -o readdirplus|no_readdirplus\n" + " enable/disable readirplus\n" + " default: readdirplus except wit= h " + "cache=3Dnever\n" ); } =20 diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index 6480c517dc..8b1784ff7b 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -117,6 +117,8 @@ struct lo_data { double timeout; int cache; int timeout_set; + int readdirplus_set; + int readdirplus_clear; struct lo_inode root; /* protected by lo->mutex */ struct lo_map ino_map; /* protected by lo->mutex */ struct lo_map dirp_map; /* protected by lo->mutex */ @@ -140,6 +142,8 @@ static const struct fuse_opt lo_opts[] =3D { { "cache=3Dauto", offsetof(struct lo_data, cache), CACHE_NORMAL }, { "cache=3Dalways", offsetof(struct lo_data, cache), CACHE_ALWAYS }, { "norace", offsetof(struct lo_data, norace), 1 }, + { "readdirplus", offsetof(struct lo_data, readdirplus_set), 1 }, + { "no_readdirplus", offsetof(struct lo_data, readdirplus_clear), 1 }, FUSE_OPT_END }; static bool use_syslog =3D false; @@ -478,7 +482,8 @@ static void lo_init(void *userdata, struct fuse_conn_in= fo *conn) fuse_log(FUSE_LOG_DEBUG, "lo_init: activating flock locks\n"); conn->want |=3D FUSE_CAP_FLOCK_LOCKS; } - if (lo->cache =3D=3D CACHE_NEVER) { + if ((lo->cache =3D=3D CACHE_NEVER && !lo->readdirplus_set) || + lo->readdirplus_clear) { fuse_log(FUSE_LOG_DEBUG, "lo_init: disabling readdirplus\n"); conn->want &=3D ~FUSE_CAP_READDIRPLUS; } --=20 2.24.1