From patchwork Tue Jul 11 14:06:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 118560 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:a6b2:0:b0:3e4:2afc:c1 with SMTP id c18csp516326vqm; Tue, 11 Jul 2023 07:21:04 -0700 (PDT) X-Google-Smtp-Source: APBJJlGO7fQpuR0aylb3MHGBAwPJsqgJqg4Anyuu48PZ++kvpfD+U+tBGT9pLCH51XdXnzQfCMWs X-Received: by 2002:a19:8c1e:0:b0:4fb:73ba:5d9c with SMTP id o30-20020a198c1e000000b004fb73ba5d9cmr11687668lfd.17.1689085264135; Tue, 11 Jul 2023 07:21:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689085264; cv=none; d=google.com; s=arc-20160816; b=IyIA9j6IBP3P8mbwluHbaI5MC4hwSc++Ivcq95z2SKSWpW4NVrCE2PIlmeLSk98UdF kUu+BiARUZZ3ziXVoW1qNcT/Q4PcQx2kLI+G/GAhRmB6irkVDKkWfLMql0ubO1veuX3f 1PW+ohMFJ7w9xnGrFIVJhiQ9ZAwsMPRrX7tQTjQ3VQCMbadniuFmhymIPNIqopuU4yt9 WdyiG9gfF9bOKMHbZ/3AidkZ1frXpgXo2Yhj8/pmrA4KlA1XVfTyibnLem3rkEkkpt5a eyE3stIR5tM0oPKOLxUQ7V011rEA+dpbACgT81g7boR34B2oLFeYJqkSgQzBz2wDuvpN zCEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:subject:cc:to:from:date :user-agent:message-id; bh=yUDWrsgesx3VD2jEQTrI0sQJOvv5Vo/2M3T+FgkO2GY=; fh=PbSDfFPWZgOEX51dPuGpo40lEYcroumT/3Jb/1CBElQ=; b=yjCwT+kCJ02UWO5oMqln3+oJbLtgRrkIqbvyNpf1vgp/+GDK/3NZ4TgN3fOErI1daS v/coppAOM3VBTkfsRpvOkdSWT00632MQh6Zr4GROJwgQOXglzPhJ2RECp3qqYAcKhx3T l3Cpy+mWYl84AZpP90g7+L7k3tinLpXkR9XWOPNYok/1M8GxMU5kCh+88qjM3TfhFyMQ SRZwwYS49mH4KfiHG1+MZxz5TqxJTg258jaxST+CKaovtsca3MbbMoa2vNGVArwNA/vH 2BmARL/PnjtB+oTrc6Cr4N18k1UcWvFczJ1LT2ShAqUi4sUGpxrRtf6Dm/El/q5r20wJ NCGg== 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 x20-20020a170906711400b00993a68a3af4si1990753ejj.563.2023.07.11.07.20.36; Tue, 11 Jul 2023 07:21:04 -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 S233318AbjGKOHW (ORCPT + 99 others); Tue, 11 Jul 2023 10:07:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45260 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233294AbjGKOHT (ORCPT ); Tue, 11 Jul 2023 10:07:19 -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 0D17BE3; Tue, 11 Jul 2023 07:07:18 -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 971EF6150B; Tue, 11 Jul 2023 14:07:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0C92DC433C7; Tue, 11 Jul 2023 14:07:17 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qJE1L-0007lB-2z; Tue, 11 Jul 2023 10:07:15 -0400 Message-ID: <20230711140715.745095758@goodmis.org> User-Agent: quilt/0.66 Date: Tue, 11 Jul 2023 10:06:53 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , stable@vger.kernel.org, Catalin Marinas , Florent Revest Subject: [for-linus][PATCH 1/5] samples: ftrace: Save required argument registers in sample trampolines References: <20230711140652.217008556@goodmis.org> MIME-Version: 1.0 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: 1771134269870311678 X-GMAIL-MSGID: 1771134269870311678 From: Florent Revest The ftrace-direct-too sample traces the handle_mm_fault function whose signature changed since the introduction of the sample. Since: commit bce617edecad ("mm: do page fault accounting in handle_mm_fault") handle_mm_fault now has 4 arguments. Therefore, the sample trampoline should save 4 argument registers. s390 saves all argument registers already so it does not need a change but x86_64 needs an extra push and pop. This also evolves the signature of the tracing function to make it mirror the signature of the traced function. Link: https://lkml.kernel.org/r/20230427140700.625241-2-revest@chromium.org Cc: stable@vger.kernel.org Fixes: bce617edecad ("mm: do page fault accounting in handle_mm_fault") Reviewed-by: Steven Rostedt (Google) Reviewed-by: Mark Rutland Acked-by: Catalin Marinas Signed-off-by: Florent Revest Signed-off-by: Steven Rostedt (Google) --- samples/ftrace/ftrace-direct-too.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/samples/ftrace/ftrace-direct-too.c b/samples/ftrace/ftrace-direct-too.c index a05bc2cc2261..7986033887f6 100644 --- a/samples/ftrace/ftrace-direct-too.c +++ b/samples/ftrace/ftrace-direct-too.c @@ -5,14 +5,14 @@ #include #include -extern void my_direct_func(struct vm_area_struct *vma, - unsigned long address, unsigned int flags); +extern void my_direct_func(struct vm_area_struct *vma, unsigned long address, + unsigned int flags, struct pt_regs *regs); -void my_direct_func(struct vm_area_struct *vma, - unsigned long address, unsigned int flags) +void my_direct_func(struct vm_area_struct *vma, unsigned long address, + unsigned int flags, struct pt_regs *regs) { - trace_printk("handle mm fault vma=%p address=%lx flags=%x\n", - vma, address, flags); + trace_printk("handle mm fault vma=%p address=%lx flags=%x regs=%p\n", + vma, address, flags, regs); } extern void my_tramp(void *); @@ -34,7 +34,9 @@ asm ( " pushq %rdi\n" " pushq %rsi\n" " pushq %rdx\n" +" pushq %rcx\n" " call my_direct_func\n" +" popq %rcx\n" " popq %rdx\n" " popq %rsi\n" " popq %rdi\n"