From patchwork Mon Dec 5 10:21:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 29633 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2171522wrr; Mon, 5 Dec 2022 02:37:45 -0800 (PST) X-Google-Smtp-Source: AA0mqf6ucLUQPwSUgDexk9kBp+FijfRTo2y+8R13zSgTLhoYMQmg0izNwppgfBIZ90Iww2ti9xEo X-Received: by 2002:a17:90a:b901:b0:219:de90:bdc4 with SMTP id p1-20020a17090ab90100b00219de90bdc4mr2654642pjr.18.1670236665536; Mon, 05 Dec 2022 02:37:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1670236665; cv=none; d=google.com; s=arc-20160816; b=A0K4xbwvaHgvR5NegZN+istJ9A1SJhtwJd4egY5X+34mAvy2iEXSZQm82CG/7NDiwn FGaAJ0tSe7Jp8FyMJaxltFbatfGS4di9CcYLO43YND9Jqo3K4r7HthOJsM9jps9dbyNL m2s56IvvGNMrCdRUuP2wEldXGZ2JH684IFfzUgYigpziIeivaknXXkLHk/+Yw/O7Ux+y DUUu9kdrnUO76l8dNlLjjXYUtcMcilktGhx1nZMMM1w09SuNMxJQWhDeKbYgpClzmyl1 H4PBb4Gsfp6+6wASpOtdZhmyK53rudCMxmtaNigqNPpFiryjm37lm1DpjpKlAthqiRU6 CV1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:message-id:date:cc:to:from:subject:organization :dkim-signature; bh=Tz1CTZfjZXf6X6nP9mO/30eW25Wox/j1ITKdav6l++Y=; b=Vb4hDdRBvJSsAH2xUVIQfkCGr6/tb1Mav003rdYcj6Ub9LSXa0epChqIXq/93TB0fH QTzqo/AhRhX1vzuMfqncgNzM37wJILDoPcQCSTmFLxJR/d/N+7SS05kTfzxbuqu9kYzL xfLbUcJVGjhUrjzvzEpkn3BzYsR8d7RZXnU0BpQbZyev5Yd0QJV42VLzObwMWa0JpFSZ 1jmdBjXJkH2GnUz6T1P77NFTd9HnYX8d+w7L+j/3/Lujfb2cifL0+0umD8UsTbI2Few8 ZN4isOJpXS3RTQvN3VzgufG0f+loiAqdefjpCmKRdnOeIU+dzVhdibrCloOTyTNSdnCb RDgQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=P7PVDssq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mr14-20020a17090b238e00b00218c111625csi16404817pjb.150.2022.12.05.02.37.32; Mon, 05 Dec 2022 02:37:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=P7PVDssq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230514AbiLEKYn (ORCPT + 99 others); Mon, 5 Dec 2022 05:24:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57154 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230265AbiLEKXA (ORCPT ); Mon, 5 Dec 2022 05:23:00 -0500 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5689518E24 for ; Mon, 5 Dec 2022 02:22:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1670235719; 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; bh=Tz1CTZfjZXf6X6nP9mO/30eW25Wox/j1ITKdav6l++Y=; b=P7PVDssqdGKNEZQSNptGjJKUOUggBJeuoiPBPiLNpFuPZsVEj7gBBFUrqb41r71qhff4f8 GcMKao8xNYs+I6ed6eRS7REcmTXWUfTC2zXvz1tqmTGBWP6syMF3RhmqlZ5b3zeWdy2khA waGJ/0q4EzxWroeskHleE0O9MPatlvw= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-328-hPQmErVbOWqpoDTAgFsznA-1; Mon, 05 Dec 2022 05:21:56 -0500 X-MC-Unique: hPQmErVbOWqpoDTAgFsznA-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E849E101A52A; Mon, 5 Dec 2022 10:21:55 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.33.36.17]) by smtp.corp.redhat.com (Postfix) with ESMTP id 66D1AC19145; Mon, 5 Dec 2022 10:21:55 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 Subject: [PATCH v2] trace: Fix some checker warnings From: David Howells To: rostedt@goodmis.org, mhiramat@kernel.org Cc: dhowells@redhat.com, linux-kernel@vger.kernel.org Date: Mon, 05 Dec 2022 10:21:52 +0000 Message-ID: <167023571258.382307.15314866482834835192.stgit@warthog.procyon.org.uk> User-Agent: StGit/1.5 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.8 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1751370081604792288?= X-GMAIL-MSGID: =?utf-8?q?1751370081604792288?= Fix some checker warnings in the trace code by adding __printf attributes to a number of trace functions and their declarations. Changes: ======== ver #2) - Dropped the fix for the unconditional tracing_max_lat_fops decl[1]. Signed-off-by: David Howells cc: Steven Rostedt cc: Masami Hiramatsu Link: https://lore.kernel.org/r/20221205180617.9b9d3971cbe06ee536603523@kernel.org/ [1] Link: https://lore.kernel.org/r/166992525941.1716618.13740663757583361463.stgit@warthog.procyon.org.uk/ # v1 Acked-by: Masami Hiramatsu (Google) --- include/linux/trace_events.h | 3 ++- include/linux/trace_seq.h | 3 ++- kernel/trace/trace.h | 2 +- kernel/trace/trace_output.c | 5 +++-- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/include/linux/trace_events.h b/include/linux/trace_events.h index 20749bd9db71..112b08ca2c5c 100644 --- a/include/linux/trace_events.h +++ b/include/linux/trace_events.h @@ -235,7 +235,8 @@ void tracing_record_taskinfo_sched_switch(struct task_struct *prev, void tracing_record_cmdline(struct task_struct *task); void tracing_record_tgid(struct task_struct *task); -int trace_output_call(struct trace_iterator *iter, char *name, char *fmt, ...); +int trace_output_call(struct trace_iterator *iter, char *name, char *fmt, ...) + __printf(3, 4); struct event_filter; diff --git a/include/linux/trace_seq.h b/include/linux/trace_seq.h index 5a2c650d9e1c..0c4c7587d6c3 100644 --- a/include/linux/trace_seq.h +++ b/include/linux/trace_seq.h @@ -97,7 +97,8 @@ extern int trace_seq_hex_dump(struct trace_seq *s, const char *prefix_str, const void *buf, size_t len, bool ascii); #else /* CONFIG_TRACING */ -static inline void trace_seq_printf(struct trace_seq *s, const char *fmt, ...) +static inline __printf(2, 3) +void trace_seq_printf(struct trace_seq *s, const char *fmt, ...) { } static inline void diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index d42e24507152..ecc6120116da 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -615,7 +615,7 @@ void trace_buffer_unlock_commit_nostack(struct trace_buffer *buffer, bool trace_is_tracepoint_string(const char *str); const char *trace_event_format(struct trace_iterator *iter, const char *fmt); void trace_check_vprintf(struct trace_iterator *iter, const char *fmt, - va_list ap); + va_list ap) __printf(2, 0); int trace_empty(struct trace_iterator *iter); diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c index 67f47ea27921..7039cd883c8b 100644 --- a/kernel/trace/trace_output.c +++ b/kernel/trace/trace_output.c @@ -323,8 +323,9 @@ void trace_event_printf(struct trace_iterator *iter, const char *fmt, ...) } EXPORT_SYMBOL(trace_event_printf); -static int trace_output_raw(struct trace_iterator *iter, char *name, - char *fmt, va_list ap) +static __printf(3, 0) +int trace_output_raw(struct trace_iterator *iter, char *name, + char *fmt, va_list ap) { struct trace_seq *s = &iter->seq;