From patchwork Tue Aug 17 16:27:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1517766 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=LFsX9rmS; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GpxJy3CYVz9sVq; Wed, 18 Aug 2021 02:27:46 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mG1wF-0003vO-Ff; Tue, 17 Aug 2021 16:27:43 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mG1wA-0003ut-IY for kernel-team@lists.ubuntu.com; Tue, 17 Aug 2021 16:27:38 +0000 Received: from mail-pj1-f71.google.com (mail-pj1-f71.google.com [209.85.216.71]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id 686EA3F339 for ; Tue, 17 Aug 2021 16:27:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1629217658; bh=fb4uAqIj9vvti5i3HkxNM1nAkCBEYLxwDLnieiGrUug=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=LFsX9rmSfKGXou160Ou0vXMaswATql2GZreT13F5dqONRw/ZHV+qtqjuJnTLI7gRi HAWuA+NNzkOMxa2fKl6DdWuTh8Ur8gEcgXpiRBiHeCA6S3Pts1mjEYnqypvAZMc6Zm MYXWaqK8Aeqk5mPPenxVR+iawUh1FngR654HbWW9TcjbkpIk+SZKEnFCSuRaUkoacj 5T89Z2TuiuKB5f0aod7nUYQSQc4tE49uP2SCud/96ir3PBrOvgziPdOg3sSkTrGCOs uVGU3MBptMvNpTYvOEJp8qp5N6z0ELbzlTGt9jxuJW9j2yqIMsb8i+i5y45zzsZaYZ ij4kZByoYzm2w== Received: by mail-pj1-f71.google.com with SMTP id j14-20020a17090a318e00b001796382f0caso7656095pjb.5 for ; Tue, 17 Aug 2021 09:27:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fb4uAqIj9vvti5i3HkxNM1nAkCBEYLxwDLnieiGrUug=; b=ULuo6l38IRKs7T4zMVLQJkeRkmi/B4GYeVTj9ir6pa9ek+2XCr8mJ3Z8Kaj8zd4twx V2QwyfIQpSDGy211rXubju+Xv7xxW1qStborAEhe+SwXg0wbuioWCso3AyUbgzRxVh04 8pkdQw8k+4fHNXGpDUWyColX3m99wwWgJ6oHvdeMj0IwWt3NBYfWuIKVfZ1DA835vdvO y4ZR2flk2bzdZijoYEvg19ARtenBKSKiiSaJtyUrKZYR46eIHjF2jjVoHM3Xm+cvmLKb Lg9rlbVaQf5szRjdsbzugvzLeGzE9HnGBEIf9MrTKwM+IuE2b6UEFU7tx6ph1oFJGnf7 z2wg== X-Gm-Message-State: AOAM531+EpD3pugBvGUET1Z96yoDW0/QQ/X5lx4pI79nQoVH7e/isTsd d9ck1eiozpqDa59HrG2nf+fVi1QXVteUtXV3RwcgVW/AC5I3UhRFLWouzHMSKTaIkBhJ5RU5/PC odTWcoqH/LzDZG+LhxFEsNP3Hi3iE3NjFKO7nIJSotQ== X-Received: by 2002:a17:90a:a382:: with SMTP id x2mr4522536pjp.86.1629217656879; Tue, 17 Aug 2021 09:27:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwvpCKCloEucBkYyWOU/SZ7kVCxocjuJ/k2xwBPVJoKehpDUedWo6rHLshfKn9U7I8uJVHrrQ== X-Received: by 2002:a17:90a:a382:: with SMTP id x2mr4522478pjp.86.1629217656153; Tue, 17 Aug 2021 09:27:36 -0700 (PDT) Received: from localhost ([2a01:4b00:85fd:d700:a595:a19f:5b88:1e93]) by smtp.gmail.com with ESMTPSA id x4sm3347957pfc.191.2021.08.17.09.27.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Aug 2021 09:27:35 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [HIRSUTE][linux-riscv][PATCH 1/3] riscv: Fixup wrong ftrace remove cflag Date: Tue, 17 Aug 2021 17:27:18 +0100 Message-Id: <20210817162720.126460-2-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210817162720.126460-1-dimitri.ledkov@canonical.com> References: <20210817162720.126460-1-dimitri.ledkov@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: cascardo@canonical.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Guo Ren We must use $(CC_FLAGS_FTRACE) instead of directly using -pg. It will cause -fpatchable-function-entry error. Signed-off-by: Guo Ren Signed-off-by: Palmer Dabbelt (cherry picked from commit 67d945778099b14324811fe67c5aff2cda7a7ad5) Signed-off-by: Dimitri John Ledkov --- arch/riscv/kernel/Makefile | 4 ++-- arch/riscv/mm/Makefile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile index f6caf4d9ca..22c66dde18 100644 --- a/arch/riscv/kernel/Makefile +++ b/arch/riscv/kernel/Makefile @@ -4,8 +4,8 @@ # ifdef CONFIG_FTRACE -CFLAGS_REMOVE_ftrace.o = -pg -CFLAGS_REMOVE_patch.o = -pg +CFLAGS_REMOVE_ftrace.o = $(CC_FLAGS_FTRACE) +CFLAGS_REMOVE_patch.o = $(CC_FLAGS_FTRACE) endif extra-y += head.o diff --git a/arch/riscv/mm/Makefile b/arch/riscv/mm/Makefile index c0185e556c..6b4b7ec1bd 100644 --- a/arch/riscv/mm/Makefile +++ b/arch/riscv/mm/Makefile @@ -2,7 +2,7 @@ CFLAGS_init.o := -mcmodel=medany ifdef CONFIG_FTRACE -CFLAGS_REMOVE_init.o = -pg +CFLAGS_REMOVE_init.o = $(CC_FLAGS_FTRACE) endif KCOV_INSTRUMENT_init.o := n From patchwork Tue Aug 17 16:27:19 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1517768 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=BYnB73YM; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GpxKC53Hwz9sRN; Wed, 18 Aug 2021 02:27:59 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mG1wS-0003yX-MS; Tue, 17 Aug 2021 16:27:56 +0000 Received: from smtp-relay-canonical-1.internal ([10.131.114.174] helo=smtp-relay-canonical-1.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mG1wM-0003xW-SX for kernel-team@lists.ubuntu.com; Tue, 17 Aug 2021 16:27:50 +0000 Received: from mail-pl1-f200.google.com (mail-pl1-f200.google.com [209.85.214.200]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPS id B3D6C3F105 for ; Tue, 17 Aug 2021 16:27:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1629217670; bh=XpRD9irsHfoZT06t7exEKvhgKIj/MF3j+MUTj6/iZfA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BYnB73YMpsVc1oGdUvPXvGdPpvDy8OY1lqQm3VL6OP8mwKEneFdta+5P5NlgHzC0U XCmlsLzEQvYu6YOggA4ZpBh26/QNF9mNQL43rWXGU4HBx4+2A1yNAfVkx+PNrl5OYQ 4t2LJ3P55iWJ4ObHRNAuL9iLC0waMI40E3K2gjYsMd7faD7osD5l8mXXaAvkVwAG0p +juzWZDbgrKdHmJNOVJez2u5b0uArE8JyqO+t4xnxabg4nSjJuiNEnKpGMnyiMdMlu J+1yYzG/jqnatfjLxBhvqLbNa65BHG6iR+ZCFlO9zCNa+WqniOzhgOv5caVmpCEeFy p7/o/Pto7qEmA== Received: by mail-pl1-f200.google.com with SMTP id p7-20020a170902b087b029012c2879a885so13599342plr.6 for ; Tue, 17 Aug 2021 09:27:50 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XpRD9irsHfoZT06t7exEKvhgKIj/MF3j+MUTj6/iZfA=; b=kLTm9qi+VVFw3e7csPh9n2F+srFz1V5YFUwHruIR7qTukpBK/aHv/3nelztQx3wflm 8irz5ESMlhDgy2iK7/X2/XTPiq5+nrWAgbWJS++Jh1Qd51favIPt0tj+lLZ98HFk/95X RT6zsUrtyXLb5I/JsmRCbqytDFTx+Arg+q3Z3ZH4iUSbMt7Tl/lMP1v05/apJ7p5PSmn pSQh1/APewEQf37mQPvl48F2sh8HacoalLsX/DuP/gfqgoo6hWZLGvvk18NsOqWZVqlP QouLmLdLEgFjDIvv7Cqb9CKab3B8eq22saZ8ft1S2YazURYMg/jvPGlvIxwFpB/1ABDm Cx1Q== X-Gm-Message-State: AOAM532HYNx/bK0ulCRGq8tgz+jWcBLW1EqGIhpXMgoj0F3witWNV/M6 JDW+dTJ0mEi80yOCwKSY4W1CxCfAIf+OKTkdN6nMJrPBvk41AM9dcUveqo93D6LSKoHEjCExokv sUO/h5wQP63d3NnZHU0pN1qJP5NkHK4Kn1UcxjJwLjg== X-Received: by 2002:a17:90a:af88:: with SMTP id w8mr4454520pjq.104.1629217667864; Tue, 17 Aug 2021 09:27:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzzWkGz0YG1KA0Iq0FNupN28hA/FsSMuk2sktH124PJiIAlKRS7L/4MAdBRne/p5kBrZB8rJw== X-Received: by 2002:a17:90a:af88:: with SMTP id w8mr4454206pjq.104.1629217663266; Tue, 17 Aug 2021 09:27:43 -0700 (PDT) Received: from localhost ([2a01:4b00:85fd:d700:a595:a19f:5b88:1e93]) by smtp.gmail.com with ESMTPSA id f5sm3129227pfn.134.2021.08.17.09.27.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Aug 2021 09:27:42 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [HIRSUTE][linux-riscv][PATCH 2/3] riscv: Fixup patch_text panic in ftrace Date: Tue, 17 Aug 2021 17:27:19 +0100 Message-Id: <20210817162720.126460-3-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210817162720.126460-1-dimitri.ledkov@canonical.com> References: <20210817162720.126460-1-dimitri.ledkov@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: cascardo@canonical.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Guo Ren Just like arm64, we can't trace the function in the patch_text path. Here is the bug log: [ 45.234334] Unable to handle kernel paging request at virtual address ffffffd38ae80900 [ 45.242313] Oops [#1] [ 45.244600] Modules linked in: [ 45.247678] CPU: 0 PID: 11 Comm: migration/0 Not tainted 5.9.0-00025-g9b7db83-dirty #215 [ 45.255797] epc: ffffffe00021689a ra : ffffffe00021718e sp : ffffffe01afabb58 [ 45.262955] gp : ffffffe00136afa0 tp : ffffffe01af94d00 t0 : 0000000000000002 [ 45.270200] t1 : 0000000000000000 t2 : 0000000000000001 s0 : ffffffe01afabc08 [ 45.277443] s1 : ffffffe0013718a8 a0 : 0000000000000000 a1 : ffffffe01afabba8 [ 45.284686] a2 : 0000000000000000 a3 : 0000000000000000 a4 : c4c16ad38ae80900 [ 45.291929] a5 : 0000000000000000 a6 : 0000000000000000 a7 : 0000000052464e43 [ 45.299173] s2 : 0000000000000001 s3 : ffffffe000206a60 s4 : ffffffe000206a60 [ 45.306415] s5 : 00000000000009ec s6 : ffffffe0013718a8 s7 : c4c16ad38ae80900 [ 45.313658] s8 : 0000000000000004 s9 : 0000000000000001 s10: 0000000000000001 [ 45.320902] s11: 0000000000000003 t3 : 0000000000000001 t4 : ffffffffd192fe79 [ 45.328144] t5 : ffffffffb8f80000 t6 : 0000000000040000 [ 45.333472] status: 0000000200000100 badaddr: ffffffd38ae80900 cause: 000000000000000f [ 45.341514] ---[ end trace d95102172248fdcf ]--- [ 45.346176] note: migration/0[11] exited with preempt_count 1 (gdb) x /2i $pc => 0xffffffe00021689a <__do_proc_dointvec+196>: sd zero,0(s7) 0xffffffe00021689e <__do_proc_dointvec+200>: li s11,0 (gdb) bt 0 __do_proc_dointvec (tbl_data=0x0, table=0xffffffe01afabba8, write=0, buffer=0x0, lenp=0x7bf897061f9a0800, ppos=0x4, conv=0x0, data=0x52464e43) at kernel/sysctl.c:581 1 0xffffffe00021718e in do_proc_dointvec (data=, conv=, ppos=, lenp=, buffer=, write=, table=) at kernel/sysctl.c:964 2 proc_dointvec_minmax (ppos=, lenp=, buffer=, write=, table=) at kernel/sysctl.c:964 3 proc_do_static_key (table=, write=1, buffer=0x0, lenp=0x0, ppos=0x7bf897061f9a0800) at kernel/sysctl.c:1643 4 0xffffffe000206792 in ftrace_make_call (rec=, addr=) at arch/riscv/kernel/ftrace.c:109 5 0xffffffe0002c9c04 in __ftrace_replace_code (rec=0xffffffe01ae40c30, enable=3) at kernel/trace/ftrace.c:2503 6 0xffffffe0002ca0b2 in ftrace_replace_code (mod_flags=) at kernel/trace/ftrace.c:2530 7 0xffffffe0002ca26a in ftrace_modify_all_code (command=5) at kernel/trace/ftrace.c:2677 8 0xffffffe0002ca30e in __ftrace_modify_code (data=) at kernel/trace/ftrace.c:2703 9 0xffffffe0002c13b0 in multi_cpu_stop (data=0x0) at kernel/stop_machine.c:224 10 0xffffffe0002c0fde in cpu_stopper_thread (cpu=) at kernel/stop_machine.c:491 11 0xffffffe0002343de in smpboot_thread_fn (data=0x0) at kernel/smpboot.c:165 12 0xffffffe00022f8b4 in kthread (_create=0xffffffe01af0c040) at kernel/kthread.c:292 13 0xffffffe000201fac in handle_exception () at arch/riscv/kernel/entry.S:236 0xffffffe00020678a <+114>: auipc ra,0xffffe 0xffffffe00020678e <+118>: jalr -118(ra) # 0xffffffe000204714 0xffffffe000206792 <+122>: snez a0,a0 (gdb) disassemble patch_text_nosync Dump of assembler code for function patch_text_nosync: 0xffffffe000204714 <+0>: addi sp,sp,-32 0xffffffe000204716 <+2>: sd s0,16(sp) 0xffffffe000204718 <+4>: sd ra,24(sp) 0xffffffe00020471a <+6>: addi s0,sp,32 0xffffffe00020471c <+8>: auipc ra,0x0 0xffffffe000204720 <+12>: jalr -384(ra) # 0xffffffe00020459c 0xffffffe000204724 <+16>: beqz a0,0xffffffe00020472e 0xffffffe000204726 <+18>: ld ra,24(sp) 0xffffffe000204728 <+20>: ld s0,16(sp) 0xffffffe00020472a <+22>: addi sp,sp,32 0xffffffe00020472c <+24>: ret 0xffffffe00020472e <+26>: sd a0,-24(s0) 0xffffffe000204732 <+30>: auipc ra,0x4 0xffffffe000204736 <+34>: jalr -1464(ra) # 0xffffffe00020817a 0xffffffe00020473a <+38>: ld a0,-24(s0) 0xffffffe00020473e <+42>: ld ra,24(sp) 0xffffffe000204740 <+44>: ld s0,16(sp) 0xffffffe000204742 <+46>: addi sp,sp,32 0xffffffe000204744 <+48>: ret (gdb) disassemble flush_icache_all-4 Dump of assembler code for function flush_icache_all: 0xffffffe00020817a <+0>: addi sp,sp,-8 0xffffffe00020817c <+2>: sd ra,0(sp) 0xffffffe00020817e <+4>: auipc ra,0xfffff 0xffffffe000208182 <+8>: jalr -1822(ra) # 0xffffffe000206a60 0xffffffe000208186 <+12>: ld ra,0(sp) 0xffffffe000208188 <+14>: addi sp,sp,8 0xffffffe00020818a <+0>: addi sp,sp,-16 0xffffffe00020818c <+2>: sd s0,0(sp) 0xffffffe00020818e <+4>: sd ra,8(sp) 0xffffffe000208190 <+6>: addi s0,sp,16 0xffffffe000208192 <+8>: li a0,0 0xffffffe000208194 <+10>: auipc ra,0xfffff 0xffffffe000208198 <+14>: jalr -410(ra) # 0xffffffe000206ffa 0xffffffe00020819c <+18>: ld s0,0(sp) 0xffffffe00020819e <+20>: ld ra,8(sp) 0xffffffe0002081a0 <+22>: addi sp,sp,16 0xffffffe0002081a2 <+24>: ret (gdb) frame 5 (rec=0xffffffe01ae40c30, enable=3) at kernel/trace/ftrace.c:2503 2503 return ftrace_make_call(rec, ftrace_addr); (gdb) p /x rec->ip $2 = 0xffffffe00020817a -> flush_icache_all ! When we modified flush_icache_all's patchable-entry with ftrace_caller: - Insert ftrace_caller at flush_icache_all prologue. - Call flush_icache_all to sync I/Dcache, but flush_icache_all is just we modified by half. Link: https://lore.kernel.org/linux-riscv/CAJF2gTT=oDWesWe0JVWvTpGi60-gpbNhYLdFWN_5EbyeqoEDdw@mail.gmail.com/T/#t Signed-off-by: Guo Ren Reviewed-by: Atish Patra Signed-off-by: Palmer Dabbelt (cherry picked from commit 5ad84adf5456313e285734102367c861c436c5ed) Signed-off-by: Dimitri John Ledkov --- arch/riscv/kernel/Makefile | 1 + arch/riscv/mm/Makefile | 1 + 2 files changed, 2 insertions(+) diff --git a/arch/riscv/kernel/Makefile b/arch/riscv/kernel/Makefile index 22c66dde18..4eee315d79 100644 --- a/arch/riscv/kernel/Makefile +++ b/arch/riscv/kernel/Makefile @@ -6,6 +6,7 @@ ifdef CONFIG_FTRACE CFLAGS_REMOVE_ftrace.o = $(CC_FLAGS_FTRACE) CFLAGS_REMOVE_patch.o = $(CC_FLAGS_FTRACE) +CFLAGS_REMOVE_sbi.o = $(CC_FLAGS_FTRACE) endif extra-y += head.o diff --git a/arch/riscv/mm/Makefile b/arch/riscv/mm/Makefile index 6b4b7ec1bd..7ebaef10ea 100644 --- a/arch/riscv/mm/Makefile +++ b/arch/riscv/mm/Makefile @@ -3,6 +3,7 @@ CFLAGS_init.o := -mcmodel=medany ifdef CONFIG_FTRACE CFLAGS_REMOVE_init.o = $(CC_FLAGS_FTRACE) +CFLAGS_REMOVE_cacheflush.o = $(CC_FLAGS_FTRACE) endif KCOV_INSTRUMENT_init.o := n From patchwork Tue Aug 17 16:27:20 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dimitri John Ledkov X-Patchwork-Id: 1517769 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=canonical.com header.i=@canonical.com header.a=rsa-sha256 header.s=20210705 header.b=ZidjoHCk; dkim-atps=neutral Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4GpxKJ7253z9sRK; Wed, 18 Aug 2021 02:28:04 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1mG1wX-0003zy-1l; Tue, 17 Aug 2021 16:28:01 +0000 Received: from smtp-relay-canonical-0.internal ([10.131.114.83] helo=smtp-relay-canonical-0.canonical.com) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1mG1wQ-0003xr-Gr for kernel-team@lists.ubuntu.com; Tue, 17 Aug 2021 16:27:54 +0000 Received: from mail-pj1-f70.google.com (mail-pj1-f70.google.com [209.85.216.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-0.canonical.com (Postfix) with ESMTPS id E9A733F09F for ; Tue, 17 Aug 2021 16:27:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1629217673; bh=7/3Af/XS9TW1h3WxAHwQagghzesKsNR5Jbno4P49LVU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZidjoHCkx1bYdSXyhWPvR9AWHDQRK/hXcN6MVxs2u4kHkAgLMfPVlrVo+scqWT44p aZ+7e2gtlhgH3Uga4pP6Yo9Rvt/j3k44AtYf9bX8U32hZ4ZTJ0OrAPin2Ou2AovpfZ AGG4DOplZKQ7QAYrHT+JYWi7Lunl2eIbFL8Ts3hodWzhvG+OUgxdgRga7cD45yY+lH /SZuI0X5XvkRLvbjAqY16etA8WXwnw4wuMNDXR2rKTDNewOD/FLCBK0PgRHynwe6Sf TR+gwCBRw8eIbZbMFWmRdscPwGDTj2eSEw4ItqFuh8QheXfB5jaSP9HSEzw7ffR1Wa Tb/fWekr9OK3g== Received: by mail-pj1-f70.google.com with SMTP id s9-20020a17090aa10900b001797c5272b4so3020122pjp.7 for ; Tue, 17 Aug 2021 09:27:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7/3Af/XS9TW1h3WxAHwQagghzesKsNR5Jbno4P49LVU=; b=RgUJ3uLd77HjQDKE0OmDfMN+kFVgWzO4+tmXfIH5s5PZwDkajHc83M+UnZ4/qntv2S Q3BYfne1QRpGJVKjTkJWLndHQVHRBwb20FKHzAX2873dOPTJFdewtjj4qpOmYfMJFqF2 i+VumrdRqe9rsL77TbbsiX0W3Y/GeLpSQRHVx6oOSW1jEMrQ6+Ao3abaanELLVW/5zzC adCkYSbpAzqPmpoBafWIy7J5ifoB+Dmt8ZFAONEhW/Dv1VMHeYf5r2d8SrKod1ABL/jh u41hs6LUNDDc3n1ggTQFY7IbpRuyrPNw5O2xtE+JqvaZQHERWemm1AlKvz9nk8xPOxnY j7BA== X-Gm-Message-State: AOAM533p07VCJzqokfzv3NGHlsBr/KliVSlSQmTu2xQWMs/Eit2QYykh M4yHuH8vS3yuRt5GIKeoBCLyxq4yhjR0Bs6aW+VOwMcxWd1g0NIEgCCWP7KvkMaNZ4h77vx4F0j VTmF4qj7G359wI0AbNKaw1KlHYx4V4PvtYT3Jm6TKrA== X-Received: by 2002:a17:902:9a46:b029:12c:9aae:daac with SMTP id x6-20020a1709029a46b029012c9aaedaacmr3524475plv.78.1629217672402; Tue, 17 Aug 2021 09:27:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyG+XtM3POvbB4qEek1+5O2LDRAU9+JCn0ZgRU05zwD3vCLcVluhpkBnHDF68LkxbrCKYg/GQ== X-Received: by 2002:a17:902:9a46:b029:12c:9aae:daac with SMTP id x6-20020a1709029a46b029012c9aaedaacmr3524463plv.78.1629217672014; Tue, 17 Aug 2021 09:27:52 -0700 (PDT) Received: from localhost ([2a01:4b00:85fd:d700:a595:a19f:5b88:1e93]) by smtp.gmail.com with ESMTPSA id c15sm2687977pjr.22.2021.08.17.09.27.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Aug 2021 09:27:51 -0700 (PDT) From: Dimitri John Ledkov To: kernel-team@lists.ubuntu.com Subject: [HIRSUTE][linux-riscv][PATCH 3/3] Revert "UBUNTU: SAUCE: RISC-V: prevent sbi_send_cpumask_ipi race with ftrace" Date: Tue, 17 Aug 2021 17:27:20 +0100 Message-Id: <20210817162720.126460-4-dimitri.ledkov@canonical.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210817162720.126460-1-dimitri.ledkov@canonical.com> References: <20210817162720.126460-1-dimitri.ledkov@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: cascardo@canonical.com Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" Superseded by removing ftrace support from all sbi.c functions. This reverts commit 1f5805ebfb2e783e16e91644501749a4771500db. Signed-off-by: Dimitri John Ledkov --- arch/riscv/kernel/sbi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/riscv/kernel/sbi.c b/arch/riscv/kernel/sbi.c index 9f85f0656f..b8f82c73de 100644 --- a/arch/riscv/kernel/sbi.c +++ b/arch/riscv/kernel/sbi.c @@ -562,7 +562,7 @@ long sbi_get_impid(void) return __sbi_base_ecall(SBI_EXT_BASE_GET_MIMPID); } -static void notrace sbi_send_cpumask_ipi(const struct cpumask *target) +static void sbi_send_cpumask_ipi(const struct cpumask *target) { struct cpumask hartid_mask;