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=-8.4 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 DBDA2C33C8C for ; Mon, 6 Jan 2020 17:29:20 +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 AAE7C207FD for ; Mon, 6 Jan 2020 17:29:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="OCaddmN1" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AAE7C207FD Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56692 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioWBr-0002sd-1q for qemu-devel@archiver.kernel.org; Mon, 06 Jan 2020 12:29:19 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:57867) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ioWAk-0001xU-Vu for qemu-devel@nongnu.org; Mon, 06 Jan 2020 12:28:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ioWAj-0004gI-4K for qemu-devel@nongnu.org; Mon, 06 Jan 2020 12:28:10 -0500 Received: from us-smtp-1.mimecast.com ([207.211.31.81]:44267 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 1ioWAj-0004fp-0I for qemu-devel@nongnu.org; Mon, 06 Jan 2020 12:28:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1578331688; 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=wlNJPjsqvXzJEwCsPwx9RYKTE5U9LRNrfxSZIxxyicQ=; b=OCaddmN1I4JisQu3+iqnv+4wXuWn8Xo/vTfnQby5ZZFW7w9m2VAiKpHcK5zAA2RHOMDXJL lTjg6gnHILWUcXtqYEh6DcXMGSRse9+Hk9k879c2I2ZZ6fUJ24iPjP9IAc92TxCm83NEil vHTU2vNYqIYDMtip+wJSc0/f8P2395w= 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-145-o6ql8WFnOJGRHA0CRNCurA-1; Mon, 06 Jan 2020 12:28:06 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id D0A0F911E8 for ; Mon, 6 Jan 2020 17:28:05 +0000 (UTC) Received: from work-vm (ovpn-117-53.ams2.redhat.com [10.36.117.53]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 512A75C1B0; Mon, 6 Jan 2020 17:28:02 +0000 (UTC) Date: Mon, 6 Jan 2020 17:27:59 +0000 From: "Dr. David Alan Gilbert" To: Daniel =?iso-8859-1?Q?P=2E_Berrang=E9?= Subject: Re: [PATCH 058/104] virtiofsd: print log only when priority is high enough Message-ID: <20200106172759.GJ2798@work-vm> References: <20191212163904.159893-1-dgilbert@redhat.com> <20191212163904.159893-59-dgilbert@redhat.com> <20200106151048.GV2930416@redhat.com> <20200106170511.GI2798@work-vm> <20200106172010.GX2930416@redhat.com> MIME-Version: 1.0 In-Reply-To: <20200106172010.GX2930416@redhat.com> User-Agent: Mutt/1.13.0 (2019-11-30) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: o6ql8WFnOJGRHA0CRNCurA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=iso-8859-1 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 207.211.31.81 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: qemu-devel@nongnu.org, stefanha@redhat.com, vgoyal@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" * Daniel P. Berrang=E9 (berrange@redhat.com) wrote: > On Mon, Jan 06, 2020 at 05:05:11PM +0000, Dr. David Alan Gilbert wrote: > > * Daniel P. Berrang=E9 (berrange@redhat.com) wrote: > > > On Thu, Dec 12, 2019 at 04:38:18PM +0000, Dr. David Alan Gilbert (git= ) wrote: > > > > From: Eryu Guan > > > >=20 > > > > Introduce "-o log_level=3D" command line option to specify current = log > > > > level (priority), valid values are "debug info warn err", e.g. > > > >=20 > > > > ./virtiofsd -o log_level=3Ddebug ... > > > >=20 > > > > So only log priority higher than "debug" will be printed to > > > > stderr/syslog. And the default level is info. > > > >=20 > > > > The "-o debug"/"-d" options are kept, and imply debug log level. > > > >=20 > > > > Signed-off-by: Eryu Guan > > > > dgilbert: Reworked for libfuse's log_func > > > > Signed-off-by: Dr. David Alan Gilbert > > > > --- > > > > tools/virtiofsd/fuse_log.c | 4 ++ > > > > tools/virtiofsd/fuse_lowlevel.c | 75 ++++++++------------ > > > > tools/virtiofsd/fuse_lowlevel.h | 1 + > > > > tools/virtiofsd/helper.c | 10 ++- > > > > tools/virtiofsd/passthrough_ll.c | 118 +++++++++++++--------------= ---- > > > > 5 files changed, 92 insertions(+), 116 deletions(-) > > >=20 > > > > diff --git a/tools/virtiofsd/fuse_log.c b/tools/virtiofsd/fuse_log.= c > > > > index 11345f9ec8..79a18a7aaa 100644 > > > > --- a/tools/virtiofsd/fuse_log.c > > > > +++ b/tools/virtiofsd/fuse_log.c > > > > @@ -8,6 +8,10 @@ > > > > * See the file COPYING.LIB > > > > */ > > > > =20 > > > > +#include > > > > +#include > > > > +#include > > > > +#include > > > > #include "fuse_log.h" > > > > =20 > > > > #include > > >=20 > > > Why do we need to add these headers if there are no code changes in t= his > > > file ? > >=20 > > Thanks, those are left overs from an earlier version; I've deleted them= now. > >=20 > > > > diff --git a/tools/virtiofsd/fuse_lowlevel.c b/tools/virtiofsd/fuse= _lowlevel.c > > > > index f3c8bdf7cb..0abb369b3d 100644 > > > > --- a/tools/virtiofsd/fuse_lowlevel.c > > > > +++ b/tools/virtiofsd/fuse_lowlevel.c > > > > @@ -158,19 +158,17 @@ static int fuse_send_msg(struct fuse_session = *se, struct fuse_chan *ch, > > > > struct fuse_out_header *out =3D iov[0].iov_base; > > > > =20 > > > > out->len =3D iov_length(iov, count); > > > > - if (se->debug) { > > > > - if (out->unique =3D=3D 0) { > > > > - fuse_log(FUSE_LOG_DEBUG, "NOTIFY: code=3D%d length=3D%= u\n", out->error, > > > > - out->len); > > > > - } else if (out->error) { > > > > - fuse_log(FUSE_LOG_DEBUG, > > > > - " unique: %llu, error: %i (%s), outsize: %i= \n", > > > > - (unsigned long long)out->unique, out->error, > > > > - strerror(-out->error), out->len); > > > > - } else { > > > > - fuse_log(FUSE_LOG_DEBUG, " unique: %llu, success, ou= tsize: %i\n", > > > > - (unsigned long long)out->unique, out->len); > > > > - } > > > > + if (out->unique =3D=3D 0) { > > > > + fuse_log(FUSE_LOG_DEBUG, "NOTIFY: code=3D%d length=3D%u\n"= , out->error, > > > > + out->len); > > > > + } else if (out->error) { > > > > + fuse_log(FUSE_LOG_DEBUG, > > > > + " unique: %llu, error: %i (%s), outsize: %i\n", > > > > + (unsigned long long)out->unique, out->error, > > > > + strerror(-out->error), out->len); > > > > + } else { > > > > + fuse_log(FUSE_LOG_DEBUG, " unique: %llu, success, outsiz= e: %i\n", > > > > + (unsigned long long)out->unique, out->len); > > > > } > > >=20 > > > Removing all the 'if (se->debug)' checks means that we take the > > > performance hit of calling many logging functions in the common > > > case where debug is disabled. Hopefully 'fuse_log' is smart > > > enough to avoid printf formatting of the msg + args unless > > > it is actually goiing to output the message > >=20 > > It is; we go through fuse_log (fuse_log.c an imported file) that just > > does the va_start and then calls the log_func that was set later in thi= s > > patch and the first thing it does is check the level and exit. >=20 > ok then >=20 > Reviewed-by: Daniel P. Berrang=E9 Thanks! Dave > Regards, > Daniel > --=20 > |: https://berrange.com -o- https://www.flickr.com/photos/dberran= ge :| > |: https://libvirt.org -o- https://fstop138.berrange.c= om :| > |: https://entangle-photo.org -o- https://www.instagram.com/dberran= ge :| -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK