From patchwork Tue Jul 11 14:06:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 11869 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp512851vqm; Tue, 11 Jul 2023 07:16:19 -0700 (PDT) X-Google-Smtp-Source: APBJJlF0qYHH5+voTtWq7As6lXFc+x+GrS03JbKgPqYCtMKooh0QZ5vpawA9U38craGpVxb4RlS/ X-Received: by 2002:a17:906:d787:b0:988:a837:327e with SMTP id pj7-20020a170906d78700b00988a837327emr12720208ejb.71.1689084978670; Tue, 11 Jul 2023 07:16:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689084978; cv=none; d=google.com; s=arc-20160816; b=fuWoAiM1iKVfz5Rv0PZSC3ILN21Ncey3Yl52lvDBPJIHAGXtCZpVz8z5Ma4aLDfhX4 VsSWrLRl9MVYk82dANluAHnFn1RRi8LfiwnUc25fTurpltZ/rUhASXfGwVWdbW2Oq0/H MWCAE/0omVcN77nm/lXrGnmygj00zODV5oL+F2nWNafGf58U8lqqFqVaw738ntu73c6O NU8iLBRNqg3/n3TDCImHfYN0rucuJpRYHmIAF6Gl8mvmPkmplYpAVJN3qBcKcSIh0V0d v+vHpC2kBs4j0rFWLdQVFWgjmjUpfI6kx2JY62RdkeWwXGn0yWvJKJKBUy1maBfdQxhH PMOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:subject:cc:to:from:date:user-agent:message-id; bh=QTJn1sZV6MBBL4WTmCgvMByd6xvD9SRNwC4vFqGuZh0=; fh=kgng34H5que7URbu24ZWqKKtWQj+H7d5uaZL8F1DzaU=; b=W1ZjxOyRqczSJhNNjuF+l2aB+VjnwB/b432lshu1scCNQFxGg7wYc3zEkgFcz1JalH f1XMmDzYvpQkuh3gcD9Py2HMYHXr3wWgc7vCvHcc66tK5G2whFgI+BNuAcRwZWA5UXeQ HJxAO9wi1yCm3PzlUDYJtNaBCyGMv9mMha1X+xR8PTaHjN2rkNgt+mvZlZyzC32c9cTB jBp6ysddECOF0f0BDE3yO2keRaZ6rjrPoNxVMe64LGJVm824eQd0sp6SVpSZRVXW95I4 8syniEj8yZAVAAeC7TFVJQaMkIXtfwMskw9drf3fkHjbiybWfyWY43LBnea3ZKrgWuuq UriA== ARC-Authentication-Results: i=1; mx.google.com; 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 Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w11-20020a1709064a0b00b00992e14a0107si2144276eju.246.2023.07.11.07.15.55; Tue, 11 Jul 2023 07:16:18 -0700 (PDT) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233312AbjGKOHT (ORCPT + 99 others); Tue, 11 Jul 2023 10:07:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45246 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233290AbjGKOHS (ORCPT ); Tue, 11 Jul 2023 10:07:18 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CCFEFBC for ; Tue, 11 Jul 2023 07:07:17 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 6354A614E2 for ; Tue, 11 Jul 2023 14:07:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CF426C433C8; Tue, 11 Jul 2023 14:07:16 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qJE1L-0007ka-2I; Tue, 11 Jul 2023 10:07:15 -0400 Message-ID: <20230711140652.217008556@goodmis.org> User-Agent: quilt/0.66 Date: Tue, 11 Jul 2023 10:06:52 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton Subject: [for-linus][PATCH 0/5] tracing: Minor fixes and clean ups X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=no 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: INBOX X-GMAIL-THRID: 1771133970221812924 X-GMAIL-MSGID: 1771133970221812924 Tracing fixes and clean ups: - Fix some missing-prototype warnings - Fix user events struct args (did not include size of struct) When creating a user event, the "struct" keyword is to denote that the size of the field will be passed in. But the parsing failed to handle this case. - Fix sample code for direct trampolines. The sample code for direct trampolines attached to handle_mm_fault(). But the prototype changed and the direct trampoline sample code was not updated. Direct trampolines needs to have the arguments correct otherwise it can fail or crash the system. - Remove unused ftrace_regs_caller_ret() prototype. git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git trace/core Head SHA1: 46b77ea28faeed56f1d1b63f9049c40b9eb3cbf5 Arnd Bergmann (1): tracing: arm64: Avoid missing-prototype warnings Beau Belgrave (1): tracing/user_events: Fix struct arg size match check Florent Revest (2): samples: ftrace: Save required argument registers in sample trampolines arm64: ftrace: Add direct call trampoline samples support YueHaibing (1): x86/ftrace: Remove unsued extern declaration ftrace_regs_caller_ret() ---- arch/arm64/Kconfig | 2 ++ arch/arm64/include/asm/ftrace.h | 4 +++ arch/arm64/include/asm/syscall.h | 3 +++ arch/arm64/kernel/syscall.c | 3 --- arch/x86/kernel/ftrace.c | 1 - include/linux/ftrace.h | 8 ++++++ kernel/trace/fgraph.c | 1 + kernel/trace/ftrace_internal.h | 5 ++-- kernel/trace/trace_events_user.c | 3 +++ kernel/trace/trace_kprobe_selftest.c | 3 +++ samples/ftrace/ftrace-direct-modify.c | 34 ++++++++++++++++++++++++ samples/ftrace/ftrace-direct-multi-modify.c | 40 +++++++++++++++++++++++++++++ samples/ftrace/ftrace-direct-multi.c | 25 ++++++++++++++++++ samples/ftrace/ftrace-direct-too.c | 40 ++++++++++++++++++++++++----- samples/ftrace/ftrace-direct.c | 24 +++++++++++++++++ 15 files changed, 184 insertions(+), 12 deletions(-)