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 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 650B9C77B73 for ; Thu, 27 Apr 2023 14:08:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=5Hm3lIMMwtGmn03gBggNIkfUolJEbDwn2wpiXCICgDQ=; b=WSZuW/4L98A4zD e+o+DCLTULuAWxggfrvcP7ZowQm3ijvFJ37h7r9TRpD6cD/EA0GrK1J+gvJFJ5hyPGDI3YnT7bbf7 Q36F6dukmMAVQ3ivhGVK/WeqjNg++Qh6NtrJ9sWk/r3TaG7TVcdbpX0vLCnCyApwmYMCZFsT0CKuy nYxoKuWbW7iLOcRB5qINTjcNrVhVuo45+KsT5y/2O/im+7OXkJvb9v6UNrVSB2P3Vd2vHKh0ytiNz ahx04qrlEmaoSlBO80esIHo7Dg1VnEGZh4VeyJMYmYeJ6vb52QwzjZwWcNaXXV8Nph0btnoP6JZDV YLV886qXhfbUswuY+pmA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1ps2HM-006i42-0o; Thu, 27 Apr 2023 14:07:24 +0000 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1ps2HJ-006i2Q-2k for linux-arm-kernel@lists.infradead.org; Thu, 27 Apr 2023 14:07:23 +0000 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-3f1738d0d4cso56049195e9.1 for ; Thu, 27 Apr 2023 07:07:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1682604435; x=1685196435; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6ljaeRoUOTvHIOJot1r8A0oYKDFB5aJ471vIxa1FpUA=; b=n2vmdIIcATMu0p/U3Y9qlWt92NaIMfpiymvMTwLsveBJ6eMt1rIB+zLqcdVH3hDZ/M xGhPa6SClrcyLbDeaoPAFNn1+84tAUrDY1bYDCCON3INglGx9mdkH2IPSN+k2Dx9h1dG xwSyV2P5U9DY3WcxB2z6EnPeAhaWNWHKoQmQo= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682604435; x=1685196435; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6ljaeRoUOTvHIOJot1r8A0oYKDFB5aJ471vIxa1FpUA=; b=jquxSgcDrr5PAZHmQwIXc86GJNtpCjDkBnM35ePH0BVJx8E/sA4/7F4ZiRIuq6hyvc hqiIEaK4TIjKARm1BjAQ36fHRFUDo0myDjBHhyDiKS3Rt+G9tt3t2JuIRE6tWHu33NI/ 7eBenebhZLRJWHJJEs64JtO7KrYLiDuLWhhLHzobuJaFvBdObiL0tgezKpHQOv9vQDB9 nxqaaeG6cbMfmAV9Gg8jEY/5UVQanxIWcjcl/wzx+5yDPYvc1dSfxcsIcYx5PTGM5/S1 ugiDenyGWiR9KtoLU7cO95cvE4OGo75nUlNflyq5TANvhlRKvUFsmBKgimVcIeXPBi7h VKwQ== X-Gm-Message-State: AC+VfDy9CyrnZPwkYa+7mL96tyDnCJ2iLsfrasWKxtpB14H/VXM8DYYM +1cl4I3yGg7q9lVXqGpqB1REDzwohoZfaj+qm7g= X-Google-Smtp-Source: ACHHUZ63aLZF9qLE/R+yf6CA+SBXn8FRQZNn/+Wxaq8wFNNi0ft9sxhrCC0qJXmBGxwOotWT7veVqw== X-Received: by 2002:a05:600c:2046:b0:3f1:9134:f28b with SMTP id p6-20020a05600c204600b003f19134f28bmr1665373wmg.19.1682604435148; Thu, 27 Apr 2023 07:07:15 -0700 (PDT) Received: from revest.zrh.corp.google.com ([2a00:79e0:9d:6:a66d:4f2c:7ce5:e8ea]) by smtp.gmail.com with ESMTPSA id c21-20020a7bc855000000b003f17300c7dcsm21285075wml.48.2023.04.27.07.07.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 27 Apr 2023 07:07:14 -0700 (PDT) From: Florent Revest To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linux-trace-kernel@vger.kernel.org Cc: rostedt@goodmis.org, mhiramat@kernel.org, mark.rutland@arm.com, kpsingh@kernel.org, xukuohai@huaweicloud.com, Florent Revest , stable@vger.kernel.org Subject: [PATCH 1/2] samples: ftrace: Save required argument registers in sample trampolines Date: Thu, 27 Apr 2023 16:06:59 +0200 Message-ID: <20230427140700.625241-2-revest@chromium.org> X-Mailer: git-send-email 2.40.1.495.gc816e09b53d-goog In-Reply-To: <20230427140700.625241-1-revest@chromium.org> References: <20230427140700.625241-1-revest@chromium.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20230427_070721_889387_C0556D44 X-CRM114-Status: GOOD ( 12.00 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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. 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 Signed-off-by: Florent Revest --- 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 f28e7b99840f..71ed4ee8cb4a 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" -- 2.40.1.495.gc816e09b53d-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel