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=-13.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,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 D2A51C32771 for ; Wed, 22 Jan 2020 21:26:55 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8F8DB24676 for ; Wed, 22 Jan 2020 21:26:55 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ZcMY/2xP" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726796AbgAVV0z (ORCPT ); Wed, 22 Jan 2020 16:26:55 -0500 Received: from mail-ed1-f67.google.com ([209.85.208.67]:44588 "EHLO mail-ed1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725827AbgAVV0y (ORCPT ); Wed, 22 Jan 2020 16:26:54 -0500 Received: by mail-ed1-f67.google.com with SMTP id bx28so1089270edb.11; Wed, 22 Jan 2020 13:26:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=7NWYL+Ed0eej5tqq6Nr2hELijUhmsFmkPkaeZ7to9rY=; b=ZcMY/2xPscgj0Susje/mJzF5D0Gk3JKC7tzFkovTQUpyi9hozbNt68PVcyfCms6aha 8BbwvtszrRnGFjpxh0iZCVUAc4pJWFgPjkvM1a7IyUOHYNM6V/S0exKjYNuxaJLn6P3p H8yl40ZRn9ogmrez9sx7sxwXD8Y3AJCJNki2+n/UkMQ6SR5MmHZV4JofwOO1uJEvO84w jYoXnn6Su2Jctsvkk5qg0nwcNNzejAUURWBqxKj46Asy3TaeIHeNb4nk3ggF6+zGuCcA 8Buch9fBPzj0GBa8QiFTZuydlNo4O1OOc3Z8MwP6SN+HHg4yx+1c8UkKVSV2uAGPpcRL Vp/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=7NWYL+Ed0eej5tqq6Nr2hELijUhmsFmkPkaeZ7to9rY=; b=RpxIu8qS+UB1//3l8DYlVaWmH6EQEBZP8W4WZ2X6cOO0VzfVlmiHbAnB5sA6KPQCXW l5pXdaUVsZx5+TsIMFYnlcYPTAGayBVLGmcLSPfTtPtYWnJeewQzhUhJEnveU19zNZpM 5j+ZcWhZhWy8ytXKFKSGDX/DRrZv7rEMPXA/TG8we7oqFZzI6mMDXnwcLH+JeRBoeXkN q/K8YCt06DOn4ucPJ+0xVSF/YDkiCqjAbqslhLq2qK1I8BEWtbV96dMjs0N67+bF6BpF 2DWAe9mCGffvtPa/wjQe18ZK34UzeDPILfepn0P7ZPaj2MUV+5Cu1t8c8/U56+uO1e4B eUWg== X-Gm-Message-State: APjAAAU/W1JReANlXdQXnJ1nr8DocjVNNTjqsPLyAtuOn3FpuPAv60oR uB95kpXhEjKJmD/iHbugsPw= X-Google-Smtp-Source: APXvYqwjcnyhwnZdaof3q66y/urTMhmhXFM2U3gHW0JoXfUbTroA2rYs1AsjPg1iTijvKOTYRrc0Qg== X-Received: by 2002:a50:f382:: with SMTP id g2mr4539545edm.260.1579728411621; Wed, 22 Jan 2020 13:26:51 -0800 (PST) Received: from [192.168.2.145] (79-139-233-37.dynamic.spd-mgts.ru. [79.139.233.37]) by smtp.googlemail.com with ESMTPSA id h16sm345ejc.89.2020.01.22.13.26.49 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 22 Jan 2020 13:26:50 -0800 (PST) Subject: Re: [tip: core/kprobes] arm/ftrace: Use __patch_text() To: linux-kernel@vger.kernel.org, tip-bot2 for Peter Zijlstra , linux-tip-commits@vger.kernel.org, Will Deacon , "Peter Zijlstra (Intel)" , Thierry Reding , Jon Hunter Cc: Andy Lutomirski , Borislav Petkov , Brian Gerst , Denys Vlasenko , "H. Peter Anvin" , Linus Torvalds , Mark Rutland , Thomas Gleixner , ard.biesheuvel@linaro.org, james.morse@arm.com, rabin@rab.in, Ingo Molnar , x86 , "linux-tegra@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" References: <20191113092636.GG4131@hirez.programming.kicks-ass.net> <157544841563.21853.2859696202562513480.tip-bot2@tip-bot2> From: Dmitry Osipenko Message-ID: <10cbfd9e-2f1f-0a0c-0160-afe6c2ccbebd@gmail.com> Date: Thu, 23 Jan 2020 00:26:46 +0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.3.0 MIME-Version: 1.0 In-Reply-To: <157544841563.21853.2859696202562513480.tip-bot2@tip-bot2> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 04.12.2019 11:33, tip-bot2 for Peter Zijlstra пишет: > The following commit has been merged into the core/kprobes branch of tip: > > Commit-ID: 5a735583b764750726621b0396d03e4782911b77 > Gitweb: https://git.kernel.org/tip/5a735583b764750726621b0396d03e4782911b77 > Author: Peter Zijlstra > AuthorDate: Tue, 15 Oct 2019 21:07:35 +02:00 > Committer: Ingo Molnar > CommitterDate: Wed, 27 Nov 2019 07:44:25 +01:00 > > arm/ftrace: Use __patch_text() > > Instead of flipping text protection, use the patch_text infrastructure > that uses a fixmap alias where required. > > This removes the last user of set_all_modules_text_*(). > > Tested-by: Will Deacon > Signed-off-by: Peter Zijlstra (Intel) > Cc: Andy Lutomirski > Cc: Borislav Petkov > Cc: Brian Gerst > Cc: Denys Vlasenko > Cc: H. Peter Anvin > Cc: Linus Torvalds > Cc: Mark Rutland > Cc: Peter Zijlstra > Cc: Thomas Gleixner > Cc: ard.biesheuvel@linaro.org > Cc: james.morse@arm.com > Cc: rabin@rab.in > Link: https://lkml.kernel.org/r/20191113092636.GG4131@hirez.programming.kicks-ass.net > Signed-off-by: Ingo Molnar > --- > arch/arm/kernel/Makefile | 4 ++-- > arch/arm/kernel/ftrace.c | 10 ++-------- > 2 files changed, 4 insertions(+), 10 deletions(-) > > diff --git a/arch/arm/kernel/Makefile b/arch/arm/kernel/Makefile > index 8cad594..a885172 100644 > --- a/arch/arm/kernel/Makefile > +++ b/arch/arm/kernel/Makefile > @@ -49,8 +49,8 @@ obj-$(CONFIG_HAVE_ARM_SCU) += smp_scu.o > obj-$(CONFIG_HAVE_ARM_TWD) += smp_twd.o > obj-$(CONFIG_ARM_ARCH_TIMER) += arch_timer.o > obj-$(CONFIG_FUNCTION_TRACER) += entry-ftrace.o > -obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o insn.o > -obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o insn.o > +obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o insn.o patch.o > +obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o insn.o patch.o > obj-$(CONFIG_JUMP_LABEL) += jump_label.o insn.o patch.o > obj-$(CONFIG_KEXEC) += machine_kexec.o relocate_kernel.o > # Main staffs in KPROBES are in arch/arm/probes/ . > diff --git a/arch/arm/kernel/ftrace.c b/arch/arm/kernel/ftrace.c > index bda949f..2a5ff69 100644 > --- a/arch/arm/kernel/ftrace.c > +++ b/arch/arm/kernel/ftrace.c > @@ -22,6 +22,7 @@ > #include > #include > #include > +#include > > #ifdef CONFIG_THUMB2_KERNEL > #define NOP 0xf85deb04 /* pop.w {lr} */ > @@ -35,9 +36,7 @@ static int __ftrace_modify_code(void *data) > { > int *command = data; > > - set_kernel_text_rw(); > ftrace_modify_all_code(*command); > - set_kernel_text_ro(); > > return 0; > } > @@ -59,13 +58,11 @@ static unsigned long adjust_address(struct dyn_ftrace *rec, unsigned long addr) > > int ftrace_arch_code_modify_prepare(void) > { > - set_all_modules_text_rw(); > return 0; > } > > int ftrace_arch_code_modify_post_process(void) > { > - set_all_modules_text_ro(); > /* Make sure any TLB misses during machine stop are cleared. */ > flush_tlb_all(); > return 0; > @@ -97,10 +94,7 @@ static int ftrace_modify_code(unsigned long pc, unsigned long old, > return -EINVAL; > } > > - if (probe_kernel_write((void *)pc, &new, MCOUNT_INSN_SIZE)) > - return -EPERM; > - > - flush_icache_range(pc, pc + MCOUNT_INSN_SIZE); > + __patch_text((void *)pc, new); > > return 0; > } > Hello, NVIDIA Tegra20/30 are not booting with CONFIG_FTRACE=y, but even with CONFIG_FTRACE=n things are not working well. Reverting this patch and "module: Remove set_all_modules_text_*()" (to fix compilation) helps. [ 13.363523] 8<--- cut here --- [ 13.366887] Unable to handle kernel paging request at virtual address 3e24fca3 [ 13.370342] pgd = f9397380 [ 13.373625] [3e24fca3] *pgd=00000000 [ 13.377274] Internal error: Oops: 5 [#1] SMP THUMB2 [ 13.381086] Modules linked in: [ 13.384372] CPU: 1 PID: 209 Comm: systemd-journal Not tainted 5.5.0-rc7-next-20200122-00177-g9b7833ca2e7a #983 [ 13.387929] Hardware name: NVIDIA Tegra SoC (Flattened Device Tree) [ 13.391500] PC is at __seccomp_filter+0x86/0x370 [ 13.395103] LR is at __seccomp_filter+0x77/0x370 [ 13.398584] pc : [] lr : [] psr: 600e0033 [ 13.402211] sp : ee6f3ee0 ip : ee6f3f20 fp : ee6f2000 [ 13.405769] r10: ffff0000 r9 : 7fff0000 r8 : ee6f3f20 [ 13.409844] r7 : 7fff0000 r6 : ee6b7280 r5 : 00000014 r4 : 7fff0000 [ 13.413776] r3 : 3e24fc7f r2 : 00000000 r1 : 3e24fca7 r0 : ee6f3f20 [ 13.417382] Flags: nZCv IRQs on FIQs on Mode SVC_32 ISA Thumb Segment none [ 13.420991] Control: 50c5387d Table: 2e76404a DAC: 00000051 [ 13.424667] Process systemd-journal (pid: 209, stack limit = 0x90194d37) [ 13.428331] Stack: (0xee6f3ee0 to 0xee6f4000) [ 13.432082] 3ee0: 00000008 00000000 c0fa23a8 c0c65958 00000008 000000c5 00000006 00000000 [ 13.435959] 3f00: 00000004 00000002 00000000 00000000 00000014 b6f5d4d0 edc96ee8 ee600908 [ 13.439786] 3f20: 00000006 40000028 b6e3cd56 00000000 00000014 00000000 00000002 00000000 [ 13.444285] 3f40: 00000000 00000000 00000000 00000000 00000014 00000000 b6f5d4d0 00000000 [ 13.448432] 3f60: 00000000 9445a58a 00000000 00000014 ffffe000 00000000 00000006 c01011e4 [ 13.452202] 3f80: ee6f2000 00000080 00000000 c01080d5 00000014 b6f5d4d0 00000000 00000006 [ 13.456025] 3fa0: c01011e4 c0101195 00000014 b6f5d4d0 00000014 00000002 00000000 00000000 [ 13.459872] 3fc0: 00000014 b6f5d4d0 00000000 00000006 b6f5d4e0 befa5610 00000002 00000000 [ 13.463736] 3fe0: 00000006 befa5518 b6eb6c7d b6e3cd56 800e0030 00000014 00000000 00000000 [ 13.467570] [] (__seccomp_filter) from [] (syscall_trace_enter+0x45/0xac) [ 13.471520] [] (syscall_trace_enter) from [] (__sys_trace+0x9/0x34) [ 13.475592] Exception stack(0xee6f3fa8 to 0xee6f3ff0) [ 13.480012] 3fa0: 00000014 b6f5d4d0 00000014 00000002 00000000 00000000 [ 13.484127] 3fc0: 00000014 b6f5d4d0 00000000 00000006 b6f5d4e0 befa5610 00000002 00000000 [ 13.488248] 3fe0: 00000006 befa5518 b6eb6c7d b6e3cd56 [ 13.492318] Code: 68f3 4640 f103 0128 (6a5b) 4798 [ 13.496597] ---[ end trace 2190b04c04a417a2 ]--- [ 13.520493] note: systemd-journal[209] exited with preempt_count 1 [ 13.532782] systemd[1]: systemd-journald.service: Service has no hold-off time (RestartSec=0), scheduling restart. [ 13.538055] systemd[1]: systemd-journald.service: Scheduled restart job, restart counter is at 1. [ 13.544960] systemd[1]: Stopped Journal Service. [ 13.555123] systemd[1]: Condition check resulted in Journal Audit Socket being skipped. [ 13.566066] systemd[1]: Starting Journal Service... [ 13.786668] systemd[1]: Started Journal Service. [ 22.013861] BUG: Bad rss-counter state mm:26c62bde type:MM_ANONPAGES val:170 This "Bad rss-counter" seems to be a new problem and unrelated to the offending patch, I don't recall seeing it in next-20200117 and earlier.