From patchwork Fri Jan 27 13:05:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xim X-Patchwork-Id: 49400 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp840668wrn; Fri, 27 Jan 2023 05:44:56 -0800 (PST) X-Google-Smtp-Source: AK7set+YWRSZMWurlkF5bWLlx4yc2hMJqlf+6/OZjc5ZkrPzcEBbrvtQcBYyyPcG+lvNQMxwr6vb X-Received: by 2002:a17:903:41cc:b0:196:37a4:775b with SMTP id u12-20020a17090341cc00b0019637a4775bmr9730483ple.33.1674827096148; Fri, 27 Jan 2023 05:44:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674827096; cv=none; d=google.com; s=arc-20160816; b=rj4n0e2K/HiaS3YuJ1IkxuK+RnaIymWBdMyH8kgL+/80FCZn1AZozzYEoYZ1uXFHLA i7rKIum9SJICYmDbQyM2wB8XGZ/1R6dQzNTVYSb36UoPqGRDD/dg2fSayuYAYED9sctT 5S2I3DMH2B+PiJVaCnkF858mb12EvSqvHAfyfPvtxkznj3ZIgNGTZJZS4EUXKugbT5Xr oALt39KkkxWKxqG2P9Z2r9FJBJfBpo7LRikQSxVnf1tbGYYfqZ+PQ05H4lIw8xy8+A6y oCWeNDWl1YTtTBnFa6Nid3+UVdzCkTBuy5YOhEsj6vm9J0rCPOFxZ4hMPYFPThY5pLU/ /uvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=MqhfdXTgtu30q1U/PQdFXcenAVNGicwfj+rqLk/0IiU=; b=pBH2nGljZcwHQdjKuJuekvmJzYIEmjyDBdg2fbfj8OintKs8km81sec7rh1WH7HtVb 5j46kfhsV8nnLwV5JrpDyUw60Xe0wVOnd6VQD4cyFaee7j3rXVNBdHNwTWuxLyeaS1Zu XELrlx7Yr5Sj8yOqKnms3I9o+2PZjE4niJj74G3XFfnF3M3LhXh7Wq7dUPz2q7wcsiCF SPBOGupUYbB3eQjGkYSyZqiHMTzAjjgPyXNdP89h3eX2tK2pn9HGuxU6iD57De6SvOYP zXLhrjzKXs+OwAqkCiJmrEvobU7kVDOPzZLEJfP1h1lyv9e6uhf7RwQ6E3YGMT3YVTf9 Kv5w== 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 j19-20020a633c13000000b004c697f2f114si4402384pga.190.2023.01.27.05.44.43; Fri, 27 Jan 2023 05:44:56 -0800 (PST) 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 S234608AbjA0NSp (ORCPT + 99 others); Fri, 27 Jan 2023 08:18:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35222 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234704AbjA0NSY (ORCPT ); Fri, 27 Jan 2023 08:18:24 -0500 Received: from cstnet.cn (smtp80.cstnet.cn [159.226.251.80]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 5BF5C2B089 for ; Fri, 27 Jan 2023 05:17:56 -0800 (PST) Received: from cgk-Precision-3650-Tower.. (unknown [219.141.235.82]) by APP-01 (Coremail) with SMTP id qwCowADX3Eg9zNNjDyF3Ag--.52827S16; Fri, 27 Jan 2023 21:06:11 +0800 (CST) From: Chen Guokai To: paul.walmsley@sifive.com, palmer@dabbelt.com, aou@eecs.berkeley.edu, rostedt@goodmis.org, mingo@redhat.com, sfr@canb.auug.org.au Cc: linux-riscv@lists.infradead.org, linux-kernel@vger.kernel.org, liaochang1@huawei.com Subject: [PATCH v6 12/13] riscv/kprobe: Move exception related symbols to .kprobe_blacklist Date: Fri, 27 Jan 2023 21:05:40 +0800 Message-Id: <20230127130541.1250865-13-chenguokai17@mails.ucas.ac.cn> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230127130541.1250865-1-chenguokai17@mails.ucas.ac.cn> References: <20230127130541.1250865-1-chenguokai17@mails.ucas.ac.cn> MIME-Version: 1.0 X-CM-TRANSID: qwCowADX3Eg9zNNjDyF3Ag--.52827S16 X-Coremail-Antispam: 1UD129KBjvJXoW7uw45Xw18uF45WrWrKF18uFg_yoW8uw4kpF 4DCrn5WrWrWryfC34ayr1DuayxJwn5Ww4ayr1ruFWrAF42grW8Awn0v3yDXryIgF4xW3yr uF109rWYga4UX37anT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPKb7Iv0xC_tr1lb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I2 0VC2zVCF04k26cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI 8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28C jxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVW8JVW5JwA2z4x0Y4vE2Ix0cI 8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_Gr1j6F4UJwA2z4x0Y4vE x4A2jsIEc7CjxVAFwI0_Gr1j6F4UJwAac4AC62xK8xCEY4vEwIxC4wAS0I0E0xvYzxvE52 x082IY62kv0487Mc02F40EFcxC0VAKzVAqx4xG6I80ewAv7VC0I7IYx2IY67AKxVWUJVWU GwAv7VC2z280aVAFwI0_Jr0_Gr1lOx8S6xCaFVCjc4AY6r1j6r4UM4x0Y48IcxkI7VAKI4 8JMxkIecxEwVAFwVW5GwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC2 0s026c02F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI 0_Jw0_GFylIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVW8JVW5JwCI42IY6xIIjxv2 0xvEc7CjxVAFwI0_Gr1j6F4UJwCI42IY6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z2 80aVAFwI0_Gr0_Cr1lIxAIcVC2z280aVCY1x0267AKxVW8Jr0_Cr1UYxBIdaVFxhVjvjDU 0xZFpf9x07jzmhrUUUUU= X-Originating-IP: [219.141.235.82] X-CM-SenderInfo: xfkh0w5xrntxyrx6ztxlovh3xfdvhtffof0/1tbiAwkEE2PTrr4g2AAAsF X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,RCVD_IN_MSPIKE_H2, SPF_HELO_PASS,SPF_PASS autolearn=ham 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756183497615935197?= X-GMAIL-MSGID: =?utf-8?q?1756183497615935197?= From: Liao Chang Due to the generic exception entry and exit code is part of the critical path for kprobe breakpoint and uprobe syscall entry, set a kprobe on the assembly symbols in entry.S result in kernel stack overflow crash, hence it has to explicitly blacklist it, requiring a new _ASM_NOKPROBE() asm helper. Signed-off-by: Liao Chang Reviewed-by: Björn Töpel --- arch/riscv/include/asm/asm.h | 10 ++++++++++ arch/riscv/kernel/entry.S | 12 ++++++++++++ arch/riscv/kernel/mcount.S | 1 + 3 files changed, 23 insertions(+) diff --git a/arch/riscv/include/asm/asm.h b/arch/riscv/include/asm/asm.h index 816e753de636..5d9f13d8b809 100644 --- a/arch/riscv/include/asm/asm.h +++ b/arch/riscv/include/asm/asm.h @@ -81,6 +81,16 @@ .endr .endm +#ifdef CONFIG_KPROBES +#define _ASM_NOKPROBE(entry) \ + .pushsection "_kprobe_blacklist", "aw" ; \ + .balign SZREG ; \ + REG_ASM entry ; \ + .popsection +#else +#define _ASM_NOKPROBE(entry) +#endif + #endif /* __ASSEMBLY__ */ #endif /* _ASM_RISCV_ASM_H */ diff --git a/arch/riscv/kernel/entry.S b/arch/riscv/kernel/entry.S index 99d38fdf8b18..9e8882a78523 100644 --- a/arch/riscv/kernel/entry.S +++ b/arch/riscv/kernel/entry.S @@ -606,3 +606,15 @@ ENTRY(__user_rt_sigreturn) scall END(__user_rt_sigreturn) #endif + +_ASM_NOKPROBE(handle_exception) +_ASM_NOKPROBE(_restore_kernel_tpsp) +_ASM_NOKPROBE(_save_context) +_ASM_NOKPROBE(ret_from_exception) +_ASM_NOKPROBE(ret_from_syscall) +_ASM_NOKPROBE(__switch_to) +_ASM_NOKPROBE(ret_from_syscall_rejected) +_ASM_NOKPROBE(restore_all) +_ASM_NOKPROBE(resume_kernel) +_ASM_NOKPROBE(resume_userspace) +_ASM_NOKPROBE(check_syscall_nr) diff --git a/arch/riscv/kernel/mcount.S b/arch/riscv/kernel/mcount.S index 30102aadc4d7..7393b8895ef3 100644 --- a/arch/riscv/kernel/mcount.S +++ b/arch/riscv/kernel/mcount.S @@ -54,6 +54,7 @@ ENTRY(ftrace_stub) #endif ret ENDPROC(ftrace_stub) +_ASM_NOKPROBE(MCOUNT_NAME) #ifdef CONFIG_FUNCTION_GRAPH_TRACER ENTRY(return_to_handler)