From nobody Fri Oct 3 11:25:02 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=1579806491; cv=none; d=zohomail.com; s=zohoarc; b=hMPXSuxvvCROhhM18IFJYpOA11eznmnC7gHiYC7eVkQo4oyB+TuJnxKTZwL3+Bt0chl2A6xM6FeSFU0dSWNLpyeP4o2no2YSt71GOjcGtArbOIGvy4DA+sDZIacuSaR9bFSRuo/zfSpphKj89eBAXvHnB6sAeuY5nvIDAGcqTZU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579806491; 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=qShNWf35tmc6YSFybHWSCOvYBzhSa1CQWXZKP8VjPDE=; b=FwmXHbjzv3wtLX+bjKawcBoTeyz3wvIYFYSmQo7WDXNsSGtp1zFwEe/G2SjCGnvq+jb+UMUePzMnzdl/VmZZ6EQ/fJH3lQVkaMffrGT+z7w9n7Qxemq0RdJvrOKmyqtdBuuTcIhcR40lIx3SJjHole9s4AMxCWWmiFpp7o/Cyc0= 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 1579806491812559.2263292648909; Thu, 23 Jan 2020 11:08:11 -0800 (PST) Received: from localhost ([::1]:35300 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuhpq-0001I5-3e for importer@patchew.org; Thu, 23 Jan 2020 14:08:10 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42719) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuff7-0006LD-68 for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:48:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iuff6-0000L8-2C for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:48:57 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:58816 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iuff5-0000Kp-Vl for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:48:56 -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-155-O5zSMASUP2SzPTGxth4K1w-1; Thu, 23 Jan 2020 11:48:54 -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 222C6108BD0C for ; Thu, 23 Jan 2020 16:48:53 +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 6F05D19C69; Thu, 23 Jan 2020 16:48:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579798135; 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=qShNWf35tmc6YSFybHWSCOvYBzhSa1CQWXZKP8VjPDE=; b=eMTdtjWyhs7bURVPTaJk0xbyZ3cRJi2fgkUfijNwe1vzRzUvwXKpDcDExr1vPCF6FAiwx7 dEjXlz1VY3uKjW4RWSX82we0hqlwqTD+Aa2UPvJxp0MSic2Lt4ylXzVCaBiYKCGzCLOW4D xn6UThd75rjmFzUqcXtaBKTYWvQ6Bpw= From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com Subject: [PULL 105/108] virtiofsd: Convert lo_destroy to take the lo->mutex lock itself Date: Thu, 23 Jan 2020 16:46:27 +0000 Message-Id: <20200123164630.91498-106-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: O5zSMASUP2SzPTGxth4K1w-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: 207.211.31.120 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: "Dr. David Alan Gilbert" lo_destroy was relying on some implicit knowledge of the locking; we can avoid this if we create an unref_inode that doesn't take the lock and then grab it for the whole of the lo_destroy. Suggested-by: Vivek Goyal Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Philippe Mathieu-Daud=C3=A9 Signed-off-by: Dr. David Alan Gilbert --- tools/virtiofsd/passthrough_ll.c | 31 +++++++++++++++++-------------- 1 file changed, 17 insertions(+), 14 deletions(-) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index eb001b9d1e..fc15d61510 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -1344,14 +1344,13 @@ static void lo_unlink(fuse_req_t req, fuse_ino_t pa= rent, const char *name) lo_inode_put(lo, &inode); } =20 -static void unref_inode_lolocked(struct lo_data *lo, struct lo_inode *inod= e, - uint64_t n) +/* To be called with lo->mutex held */ +static void unref_inode(struct lo_data *lo, struct lo_inode *inode, uint64= _t n) { if (!inode) { return; } =20 - pthread_mutex_lock(&lo->mutex); assert(inode->nlookup >=3D n); inode->nlookup -=3D n; if (!inode->nlookup) { @@ -1362,15 +1361,24 @@ static void unref_inode_lolocked(struct lo_data *lo= , struct lo_inode *inode, } g_hash_table_destroy(inode->posix_locks); pthread_mutex_destroy(&inode->plock_mutex); - pthread_mutex_unlock(&lo->mutex); =20 /* Drop our refcount from lo_do_lookup() */ lo_inode_put(lo, &inode); - } else { - pthread_mutex_unlock(&lo->mutex); } } =20 +static void unref_inode_lolocked(struct lo_data *lo, struct lo_inode *inod= e, + uint64_t n) +{ + if (!inode) { + return; + } + + pthread_mutex_lock(&lo->mutex); + unref_inode(lo, inode, n); + pthread_mutex_unlock(&lo->mutex); +} + static void lo_forget_one(fuse_req_t req, fuse_ino_t ino, uint64_t nlookup) { struct lo_data *lo =3D lo_data(req); @@ -2458,13 +2466,7 @@ static void lo_destroy(void *userdata) { struct lo_data *lo =3D (struct lo_data *)userdata; =20 - /* - * Normally lo->mutex must be taken when traversing lo->inodes but - * lo_destroy() is a serialized request so no races are possible here. - * - * In addition, we cannot acquire lo->mutex since unref_inode() takes = it - * too and this would result in a recursive lock. - */ + pthread_mutex_lock(&lo->mutex); while (true) { GHashTableIter iter; gpointer key, value; @@ -2475,8 +2477,9 @@ static void lo_destroy(void *userdata) } =20 struct lo_inode *inode =3D value; - unref_inode_lolocked(lo, inode, inode->nlookup); + unref_inode(lo, inode, inode->nlookup); } + pthread_mutex_unlock(&lo->mutex); } =20 static struct fuse_lowlevel_ops lo_oper =3D { --=20 2.24.1