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.1 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,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 27193C433B4 for ; Thu, 6 May 2021 17:53:36 +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 4FDF8610F7 for ; Thu, 6 May 2021 17:53:35 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4FDF8610F7 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]:36184 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1leiBq-0007pJ-8n for qemu-devel@archiver.kernel.org; Thu, 06 May 2021 13:53:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:42234) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lei4S-0002ji-3f for qemu-devel@nongnu.org; Thu, 06 May 2021 13:45:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:54121) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lei4J-00027l-Qw for qemu-devel@nongnu.org; Thu, 06 May 2021 13:45:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620323146; 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=IePvEvPeL033P28HZdNcfUrkE2gslptJOVgW9Q95Lew=; b=JqTW0flPIBX2P8/5JTtiPrlXlxlSZ79ld1XZ/6WTGXE7NaHJEjcqmJ9ThXmk3jk9RPjpr8 2xNAr4G53IDnE8RS8Gypp5q1L1ZTr0G0k2PHpLvPzpRBTF5a52sTvG22EIK7FHPslc32fg jO32rZvhJKCP4VT8Yb+MlZyrlzOuJgg= 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-526-bK4gtUvjOlGeZp8iEM6j-A-1; Thu, 06 May 2021 13:45:42 -0400 X-MC-Unique: bK4gtUvjOlGeZp8iEM6j-A-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id B4314180F168; Thu, 6 May 2021 17:45:41 +0000 (UTC) Received: from work-vm (ovpn-115-37.ams2.redhat.com [10.36.115.37]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 07D1F60C25; Thu, 6 May 2021 17:45:21 +0000 (UTC) Date: Thu, 6 May 2021 18:45:19 +0100 From: "Dr. David Alan Gilbert" To: Daniel =?iso-8859-1?Q?P=2E_Berrang=E9?= Subject: Re: [PATCH 7/7] virtiofsd: use GDateTime for formatting timestamp for debug messages Message-ID: References: <20210505103702.521457-1-berrange@redhat.com> <20210505103702.521457-8-berrange@redhat.com> MIME-Version: 1.0 In-Reply-To: User-Agent: Mutt/2.0.6 (2021-03-06) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -34 X-Spam_score: -3.5 X-Spam_bar: --- X-Spam_report: (-3.5 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.69, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable 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: Kevin Wolf , Jiri Pirko , qemu-block@nongnu.org, Juan Quintela , Markus Armbruster , Jason Wang , qemu-devel@nongnu.org, Laurent Vivier , virtio-fs@redhat.com, Gerd Hoffmann , Stefan Hajnoczi , Max Reitz , Brad Smith Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" * Dr. David Alan Gilbert (dgilbert@redhat.com) wrote: > * Dr. David Alan Gilbert (dgilbert@redhat.com) wrote: > > * Daniel P. Berrangé (berrange@redhat.com) wrote: > > > The GDateTime APIs provided by GLib avoid portability pitfalls, such > > > as some platforms where 'struct timeval.tv_sec' field is still 'long' > > > instead of 'time_t'. When combined with automatic cleanup, GDateTime > > > often results in simpler code too. > > > > > > Signed-off-by: Daniel P. Berrangé > > > > Reviewed-by: Dr. David Alan Gilbert > > Queued this 7/7 via virtiofsd Hi Dan, I've had to drop this because it triggers seccomp: #0 0x00007f0afec4d21b in readlink () from /lib64/libc.so.6 #1 0x00007f0afeecff24 in g_file_read_link () from /lib64/libglib-2.0.so.0 #2 0x00007f0afef16390 in g_time_zone_new_identifier () from /lib64/libglib-2.0.so.0 #3 0x00007f0afef16fe8 in g_time_zone_new_local () from /lib64/libglib-2.0.so.0 #4 0x00007f0afeec9520 in g_date_time_new_now_local () from /lib64/libglib-2.0.so.0 #5 0x000055a6bd6bc27a in log_func (level=FUSE_LOG_INFO, fmt=0x55a6bd6e3cda "%s: Entry\n", ap=0x7ffece4b2f50) at ../tools/virtiofsd/passthrough_ll.c:3578 #6 0x000055a6bd6b3dd5 in fuse_log (level=level@entry=FUSE_LOG_INFO, fmt=fmt@entry=0x55a6bd6e3cda "%s: Entry\n") at ../tools/virtiofsd/fuse_log.c:37 #7 0x000055a6bd6ba9fd in virtio_loop (se=se@entry=0x55a6bee29a30) at ../tools/virtiofsd/fuse_virtio.c:878 #8 0x000055a6bd6b2017 in main (argc=, argv=) at ../tools/virtiofsd/passthrough_ll.c:3868 so you either need to add seccomp rules and/or persuade it not to moan; maybe dropping down to UTC would work. Dave > > > --- > > > tools/virtiofsd/passthrough_ll.c | 25 ++++--------------------- > > > 1 file changed, 4 insertions(+), 21 deletions(-) > > > > > > diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c > > > index 1553d2ef45..cdd224918c 100644 > > > --- a/tools/virtiofsd/passthrough_ll.c > > > +++ b/tools/virtiofsd/passthrough_ll.c > > > @@ -3558,10 +3558,6 @@ static void setup_nofile_rlimit(unsigned long rlimit_nofile) > > > static void log_func(enum fuse_log_level level, const char *fmt, va_list ap) > > > { > > > g_autofree char *localfmt = NULL; > > > - struct timespec ts; > > > - struct tm tm; > > > - char sec_fmt[sizeof "2020-12-07 18:17:54"]; > > > - char zone_fmt[sizeof "+0100"]; > > > > > > if (current_log_level < level) { > > > return; > > > @@ -3573,23 +3569,10 @@ static void log_func(enum fuse_log_level level, const char *fmt, va_list ap) > > > localfmt = g_strdup_printf("[ID: %08ld] %s", syscall(__NR_gettid), > > > fmt); > > > } else { > > > - /* try formatting a broken-down timestamp */ > > > - if (clock_gettime(CLOCK_REALTIME, &ts) != -1 && > > > - localtime_r(&ts.tv_sec, &tm) != NULL && > > > - strftime(sec_fmt, sizeof sec_fmt, "%Y-%m-%d %H:%M:%S", > > > - &tm) != 0 && > > > - strftime(zone_fmt, sizeof zone_fmt, "%z", &tm) != 0) { > > > - localfmt = g_strdup_printf("[%s.%02ld%s] [ID: %08ld] %s", > > > - sec_fmt, > > > - ts.tv_nsec / (10L * 1000 * 1000), > > > - zone_fmt, syscall(__NR_gettid), > > > - fmt); > > > - } else { > > > - /* fall back to a flat timestamp */ > > > - localfmt = g_strdup_printf("[%" PRId64 "] [ID: %08ld] %s", > > > - get_clock(), syscall(__NR_gettid), > > > - fmt); > > > - } > > > + g_autoptr(GDateTime) now = g_date_time_new_now_local(); > > > + g_autofree char *nowstr = g_date_time_format(now, "%Y-%m-%d %H:%M:%S.%f%z"); > > > + localfmt = g_strdup_printf("[%s] [ID: %08ld] %s", > > > + nowstr, syscall(__NR_gettid), fmt); > > > } > > > fmt = localfmt; > > > } > > > -- > > > 2.31.1 > > > > > -- > > Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK > > > > > -- > Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK