From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_2 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 23938C433DB for ; Wed, 3 Feb 2021 14:22:48 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C3FAD64F51 for ; Wed, 3 Feb 2021 14:22:46 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C3FAD64F51 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=kaod.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:40324 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1l7J3N-0001xz-If for qemu-devel@archiver.kernel.org; Wed, 03 Feb 2021 09:22:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:43768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l7J1T-0000tk-J7 for qemu-devel@nongnu.org; Wed, 03 Feb 2021 09:20:47 -0500 Received: from 7.mo51.mail-out.ovh.net ([46.105.33.25]:37319) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1l7J1Q-0006WB-SS for qemu-devel@nongnu.org; Wed, 03 Feb 2021 09:20:47 -0500 Received: from mxplan5.mail.ovh.net (unknown [10.109.156.13]) by mo51.mail-out.ovh.net (Postfix) with ESMTPS id E67B824B294; Wed, 3 Feb 2021 15:20:41 +0100 (CET) Received: from kaod.org (37.59.142.95) by DAG8EX1.mxp5.local (172.16.2.71) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2106.2; Wed, 3 Feb 2021 15:20:38 +0100 Authentication-Results: garm.ovh; auth=pass (GARM-95G001f8f67480-0256-4c3a-bf87-0a60eaa29bff, 14764A637080470E006017DF0F40374BD57DCD59) smtp.auth=groug@kaod.org X-OVh-ClientIp: 78.197.208.248 Date: Wed, 3 Feb 2021 15:20:35 +0100 From: Greg Kurz To: Stefan Hajnoczi Subject: Re: [PATCH v4 1/3] virtiofsd: extract lo_do_open() from lo_open() Message-ID: <20210203152035.374924b9@bahia.lan> In-Reply-To: <20210203113719.83633-2-stefanha@redhat.com> References: <20210203113719.83633-1-stefanha@redhat.com> <20210203113719.83633-2-stefanha@redhat.com> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit X-Originating-IP: [37.59.142.95] X-ClientProxiedBy: DAG6EX2.mxp5.local (172.16.2.52) To DAG8EX1.mxp5.local (172.16.2.71) X-Ovh-Tracer-GUID: 58704edf-4f51-40a7-8a0f-8bd0e12b5a2f X-Ovh-Tracer-Id: 12770238222482315698 X-VR-SPAMSTATE: OK X-VR-SPAMSCORE: -100 X-VR-SPAMCAUSE: gggruggvucftvghtrhhoucdtuddrgeduledrgedvgdeivdcutefuodetggdotefrodftvfcurfhrohhfihhlvgemucfqggfjpdevjffgvefmvefgnecuuegrihhlohhuthemucehtddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenucfjughrpeffhffvuffkjghfofggtgfgihesthejredtredtvdenucfhrhhomhepifhrvghgucfmuhhriicuoehgrhhouhhgsehkrghougdrohhrgheqnecuggftrfgrthhtvghrnhepfedutdeijeejveehkeeileetgfelteekteehtedtieefffevhffflefftdefleejnecukfhppedtrddtrddtrddtpdefjedrheelrddugedvrdelheenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhhouggvpehsmhhtphdqohhuthdphhgvlhhopehmgihplhgrnhehrdhmrghilhdrohhvhhdrnhgvthdpihhnvghtpedtrddtrddtrddtpdhmrghilhhfrhhomhepghhrohhugheskhgrohgurdhorhhgpdhrtghpthhtohepshhlphesrhgvughhrghtrdgtohhm Received-SPF: pass client-ip=46.105.33.25; envelope-from=groug@kaod.org; helo=7.mo51.mail-out.ovh.net X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-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: mszeredi@redhat.com, Daniel Berrange , slp@redhat.com, qemu-devel@nongnu.org, "Dr. David Alan Gilbert" , virtio-fs@redhat.com, P J P , Laszlo Ersek , vgoyal@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Wed, 3 Feb 2021 11:37:17 +0000 Stefan Hajnoczi wrote: > Both lo_open() and lo_create() have similar code to open a file. Extract > a common lo_do_open() function from lo_open() that will be used by > lo_create() in a later commit. > > Since lo_do_open() does not otherwise need fuse_req_t req, convert > lo_add_fd_mapping() to use struct lo_data *lo instead. > > Signed-off-by: Stefan Hajnoczi > --- With the s/ENOMEM/-ENOMEM/ change in lo_do_open() suggested by patchew, Reviewed-by: Greg Kurz > tools/virtiofsd/passthrough_ll.c | 73 ++++++++++++++++++++------------ > 1 file changed, 46 insertions(+), 27 deletions(-) > > diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c > index 5fb36d9407..e63cbd3fb7 100644 > --- a/tools/virtiofsd/passthrough_ll.c > +++ b/tools/virtiofsd/passthrough_ll.c > @@ -459,17 +459,17 @@ static void lo_map_remove(struct lo_map *map, size_t key) > } > > /* Assumes lo->mutex is held */ > -static ssize_t lo_add_fd_mapping(fuse_req_t req, int fd) > +static ssize_t lo_add_fd_mapping(struct lo_data *lo, int fd) > { > struct lo_map_elem *elem; > > - elem = lo_map_alloc_elem(&lo_data(req)->fd_map); > + elem = lo_map_alloc_elem(&lo->fd_map); > if (!elem) { > return -1; > } > > elem->fd = fd; > - return elem - lo_data(req)->fd_map.elems; > + return elem - lo->fd_map.elems; > } > > /* Assumes lo->mutex is held */ > @@ -1651,6 +1651,38 @@ static void update_open_flags(int writeback, int allow_direct_io, > } > } > > +static int lo_do_open(struct lo_data *lo, struct lo_inode *inode, > + struct fuse_file_info *fi) > +{ > + char buf[64]; > + ssize_t fh; > + int fd; > + > + update_open_flags(lo->writeback, lo->allow_direct_io, fi); > + > + sprintf(buf, "%i", inode->fd); > + fd = openat(lo->proc_self_fd, buf, fi->flags & ~O_NOFOLLOW); > + if (fd == -1) { > + return -errno; > + } > + > + pthread_mutex_lock(&lo->mutex); > + fh = lo_add_fd_mapping(lo, fd); > + pthread_mutex_unlock(&lo->mutex); > + if (fh == -1) { > + close(fd); > + return ENOMEM; > + } > + > + fi->fh = fh; > + if (lo->cache == CACHE_NONE) { > + fi->direct_io = 1; > + } else if (lo->cache == CACHE_ALWAYS) { > + fi->keep_cache = 1; > + } > + return 0; > +} > + > static void lo_create(fuse_req_t req, fuse_ino_t parent, const char *name, > mode_t mode, struct fuse_file_info *fi) > { > @@ -1691,7 +1723,7 @@ static void lo_create(fuse_req_t req, fuse_ino_t parent, const char *name, > ssize_t fh; > > pthread_mutex_lock(&lo->mutex); > - fh = lo_add_fd_mapping(req, fd); > + fh = lo_add_fd_mapping(lo, fd); > pthread_mutex_unlock(&lo->mutex); > if (fh == -1) { > close(fd); > @@ -1892,38 +1924,25 @@ static void lo_fsyncdir(fuse_req_t req, fuse_ino_t ino, int datasync, > > static void lo_open(fuse_req_t req, fuse_ino_t ino, struct fuse_file_info *fi) > { > - int fd; > - ssize_t fh; > - char buf[64]; > struct lo_data *lo = lo_data(req); > + struct lo_inode *inode = lo_inode(req, ino); > + int err; > > fuse_log(FUSE_LOG_DEBUG, "lo_open(ino=%" PRIu64 ", flags=%d)\n", ino, > fi->flags); > > - update_open_flags(lo->writeback, lo->allow_direct_io, fi); > - > - sprintf(buf, "%i", lo_fd(req, ino)); > - fd = openat(lo->proc_self_fd, buf, fi->flags & ~O_NOFOLLOW); > - if (fd == -1) { > - return (void)fuse_reply_err(req, errno); > - } > - > - pthread_mutex_lock(&lo->mutex); > - fh = lo_add_fd_mapping(req, fd); > - pthread_mutex_unlock(&lo->mutex); > - if (fh == -1) { > - close(fd); > - fuse_reply_err(req, ENOMEM); > + if (!inode) { > + fuse_reply_err(req, EBADF); > return; > } > > - fi->fh = fh; > - if (lo->cache == CACHE_NONE) { > - fi->direct_io = 1; > - } else if (lo->cache == CACHE_ALWAYS) { > - fi->keep_cache = 1; > + err = lo_do_open(lo, inode, fi); > + lo_inode_put(lo, &inode); > + if (err) { > + fuse_reply_err(req, err); > + } else { > + fuse_reply_open(req, fi); > } > - fuse_reply_open(req, fi); > } > > static void lo_release(fuse_req_t req, fuse_ino_t ino,