From patchwork Sat Sep 17 01:55:21 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yipeng Zou X-Patchwork-Id: 12978955 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 90380ECAAA1 for ; Sat, 17 Sep 2022 02:01:13 +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=SXguZUwRluorkxOtlr239k/yGMw5pBaxowxCZBnxj1w=; b=BeW/swKd0h5Ih8 JQ2C6o9gaEHhYwfZoiQjYdYJYO+j9sDSMKk0qgi6W0gYL4vkicmNZQUjCQVse/kBV08LhFd7aXl6K nGLRn04aC2k66dlVKVgiXZIHdniCKLd+cDMVg/HFEQwxZkfQbY4gI5FjmOXKSyqx/CEeWKRg5iHXe FJHTELVadLkTIX3T5+x3o9j7geaGMa0uAhET+b1IBZIDTlLA0vXU/rRMY9k8+aY/gYpY6yYu+y+IA 1t4AMyOfE4Bs8Hfg6e3NFPaoSjponS45aRc3NBh1FGcSY+kBQ9vl/1lxvkUU8qIM0v3lgXsABoIHH 23FUsNzFu03ghts4ThLw==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oZN7a-001ceo-9I; Sat, 17 Sep 2022 01:59:54 +0000 Received: from szxga03-in.huawei.com ([45.249.212.189]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oZN7H-001cS4-TX; Sat, 17 Sep 2022 01:59:38 +0000 Received: from dggpemm500023.china.huawei.com (unknown [172.30.72.53]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4MTvFw1Z8SzBsPD; Sat, 17 Sep 2022 09:57:24 +0800 (CST) Received: from dggpemm500016.china.huawei.com (7.185.36.25) by dggpemm500023.china.huawei.com (7.185.36.83) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Sat, 17 Sep 2022 09:59:29 +0800 Received: from huawei.com (10.67.175.41) by dggpemm500016.china.huawei.com (7.185.36.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Sat, 17 Sep 2022 09:59:28 +0800 From: Yipeng Zou To: , , , , , , , , , , , , , , , , , , , , , CC: , , Subject: [PATCH 1/2] kprobes: make arch_init_kprobes as weak Date: Sat, 17 Sep 2022 09:55:21 +0800 Message-ID: <20220917015522.44583-2-zouyipeng@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220917015522.44583-1-zouyipeng@huawei.com> References: <20220917015522.44583-1-zouyipeng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.175.41] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm500016.china.huawei.com (7.185.36.25) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220916_185936_309784_8A4121D8 X-CRM114-Status: UNSURE ( 7.84 ) X-CRM114-Notice: Please train this message. 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The function implementation under some arch does nothing. We can mark it with weak attributes to improve. Signed-off-by: Yipeng Zou --- arch/csky/kernel/probes/kprobes.c | 5 ----- arch/riscv/kernel/probes/kprobes.c | 5 ----- arch/s390/kernel/kprobes.c | 5 ----- arch/x86/kernel/kprobes/core.c | 5 ----- kernel/kprobes.c | 5 +++++ 5 files changed, 5 insertions(+), 20 deletions(-) diff --git a/arch/csky/kernel/probes/kprobes.c b/arch/csky/kernel/probes/kprobes.c index 3c6e5c725d81..d31b6ab5cea0 100644 --- a/arch/csky/kernel/probes/kprobes.c +++ b/arch/csky/kernel/probes/kprobes.c @@ -405,8 +405,3 @@ int __kprobes arch_trampoline_kprobe(struct kprobe *p) { return 0; } - -int __init arch_init_kprobes(void) -{ - return 0; -} diff --git a/arch/riscv/kernel/probes/kprobes.c b/arch/riscv/kernel/probes/kprobes.c index e6e950b7cf32..d4577108e5c9 100644 --- a/arch/riscv/kernel/probes/kprobes.c +++ b/arch/riscv/kernel/probes/kprobes.c @@ -362,8 +362,3 @@ int __kprobes arch_trampoline_kprobe(struct kprobe *p) { return 0; } - -int __init arch_init_kprobes(void) -{ - return 0; -} diff --git a/arch/s390/kernel/kprobes.c b/arch/s390/kernel/kprobes.c index 0032bdbe8e3f..aaf9329a7cf4 100644 --- a/arch/s390/kernel/kprobes.c +++ b/arch/s390/kernel/kprobes.c @@ -544,11 +544,6 @@ int kprobe_exceptions_notify(struct notifier_block *self, } NOKPROBE_SYMBOL(kprobe_exceptions_notify); -int __init arch_init_kprobes(void) -{ - return 0; -} - int arch_trampoline_kprobe(struct kprobe *p) { return 0; diff --git a/arch/x86/kernel/kprobes/core.c b/arch/x86/kernel/kprobes/core.c index 4c3c27b6aea3..e26b336f8b18 100644 --- a/arch/x86/kernel/kprobes/core.c +++ b/arch/x86/kernel/kprobes/core.c @@ -1055,11 +1055,6 @@ int __init arch_populate_kprobe_blacklist(void) (unsigned long)__entry_text_end); } -int __init arch_init_kprobes(void) -{ - return 0; -} - int arch_trampoline_kprobe(struct kprobe *p) { return 0; diff --git a/kernel/kprobes.c b/kernel/kprobes.c index ca9d834d0b84..23f6d329b53b 100644 --- a/kernel/kprobes.c +++ b/kernel/kprobes.c @@ -2684,6 +2684,11 @@ void kprobe_free_init_mem(void) mutex_unlock(&kprobe_mutex); } +int __init __weak arch_init_kprobes(void) +{ + return 0; +} + static int __init init_kprobes(void) { int i, err = 0; From patchwork Sat Sep 17 01:55:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yipeng Zou X-Patchwork-Id: 12978957 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 38A96ECAAD8 for ; Sat, 17 Sep 2022 02:01:25 +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=gQDFYJhw7D14geuOXLrb3Yexp3/MlBFaPs4FFdF65XE=; b=36XntxwT4a3dc1 d58MxU8/HmUe6rCf8WCKL59xIXyXlTOBnCRZ47IGdQYe9z3CISmI3AAPqtr8ZVcWWcZFKT6Ktvz7G /Hzu447rgab0uqbRhWVumoLJix6dPiTSNpiVukZE9mq5B6YLtOAhi8t4uF5DumdVaYm+iu2z0VhDG xBMqgbaN4PhQueaPef/qIJju7kp69Jjdnu5AYYDYnabJHeP587WyUoD4tNu9PQiNkZw3SLfw4TX9m mhWkD2ND5C8/pGnsoj56ZSp73OpsJyAKaTiESuUYkq8ElpMF172NSfdAZHlpbQ9Knu4ibGwGPMCDv G0xgbs6NDYdb1FIM8Htg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oZN7n-001cl5-LP; Sat, 17 Sep 2022 02:00:07 +0000 Received: from szxga01-in.huawei.com ([45.249.212.187]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oZN7I-001cT2-IU; Sat, 17 Sep 2022 01:59:38 +0000 Received: from dggpemm500024.china.huawei.com (unknown [172.30.72.54]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4MTvCh2PtNzlVkl; Sat, 17 Sep 2022 09:55:28 +0800 (CST) Received: from dggpemm500016.china.huawei.com (7.185.36.25) by dggpemm500024.china.huawei.com (7.185.36.203) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Sat, 17 Sep 2022 09:59:29 +0800 Received: from huawei.com (10.67.175.41) by dggpemm500016.china.huawei.com (7.185.36.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2375.24; Sat, 17 Sep 2022 09:59:29 +0800 From: Yipeng Zou To: , , , , , , , , , , , , , , , , , , , , , CC: , , Subject: [PATCH 2/2] uprobes: make arch_uprobe_exception_notify as weak Date: Sat, 17 Sep 2022 09:55:22 +0800 Message-ID: <20220917015522.44583-3-zouyipeng@huawei.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20220917015522.44583-1-zouyipeng@huawei.com> References: <20220917015522.44583-1-zouyipeng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.175.41] X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemm500016.china.huawei.com (7.185.36.25) X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220916_185936_982244_E6658252 X-CRM114-Status: UNSURE ( 8.30 ) X-CRM114-Notice: Please train this message. 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The function implementation under some arch does nothing. We can mark it with weak attributes to improve. Signed-off-by: Yipeng Zou --- arch/arm/probes/uprobes/core.c | 6 ------ arch/arm64/kernel/probes/uprobes.c | 6 ------ arch/csky/kernel/probes/uprobes.c | 6 ------ arch/riscv/kernel/probes/uprobes.c | 6 ------ kernel/events/uprobes.c | 6 ++++++ 5 files changed, 6 insertions(+), 24 deletions(-) diff --git a/arch/arm/probes/uprobes/core.c b/arch/arm/probes/uprobes/core.c index f5f790c6e5f8..535ea1b355ed 100644 --- a/arch/arm/probes/uprobes/core.c +++ b/arch/arm/probes/uprobes/core.c @@ -175,12 +175,6 @@ void arch_uprobe_abort_xol(struct arch_uprobe *auprobe, struct pt_regs *regs) instruction_pointer_set(regs, utask->vaddr); } -int arch_uprobe_exception_notify(struct notifier_block *self, - unsigned long val, void *data) -{ - return NOTIFY_DONE; -} - static int uprobe_trap_handler(struct pt_regs *regs, unsigned int instr) { unsigned long flags; diff --git a/arch/arm64/kernel/probes/uprobes.c b/arch/arm64/kernel/probes/uprobes.c index d49aef2657cd..687ede3375a6 100644 --- a/arch/arm64/kernel/probes/uprobes.c +++ b/arch/arm64/kernel/probes/uprobes.c @@ -159,12 +159,6 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, return orig_ret_vaddr; } -int arch_uprobe_exception_notify(struct notifier_block *self, - unsigned long val, void *data) -{ - return NOTIFY_DONE; -} - static int uprobe_breakpoint_handler(struct pt_regs *regs, unsigned long esr) { diff --git a/arch/csky/kernel/probes/uprobes.c b/arch/csky/kernel/probes/uprobes.c index 2d31a12e46cf..67ff13d960e8 100644 --- a/arch/csky/kernel/probes/uprobes.c +++ b/arch/csky/kernel/probes/uprobes.c @@ -132,12 +132,6 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, return ra; } -int arch_uprobe_exception_notify(struct notifier_block *self, - unsigned long val, void *data) -{ - return NOTIFY_DONE; -} - int uprobe_breakpoint_handler(struct pt_regs *regs) { if (uprobe_pre_sstep_notifier(regs)) diff --git a/arch/riscv/kernel/probes/uprobes.c b/arch/riscv/kernel/probes/uprobes.c index c976a21cd4bd..770f16c6e00f 100644 --- a/arch/riscv/kernel/probes/uprobes.c +++ b/arch/riscv/kernel/probes/uprobes.c @@ -131,12 +131,6 @@ arch_uretprobe_hijack_return_addr(unsigned long trampoline_vaddr, return ra; } -int arch_uprobe_exception_notify(struct notifier_block *self, - unsigned long val, void *data) -{ - return NOTIFY_DONE; -} - bool uprobe_breakpoint_handler(struct pt_regs *regs) { if (uprobe_pre_sstep_notifier(regs)) diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index d9e357b7e17c..33e637f7a202 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -2343,6 +2343,12 @@ int uprobe_post_sstep_notifier(struct pt_regs *regs) return 1; } +int __weak arch_uprobe_exception_notify(struct notifier_block *self, + unsigned long val, void *data) +{ + return NOTIFY_DONE; +} + static struct notifier_block uprobe_exception_nb = { .notifier_call = arch_uprobe_exception_notify, .priority = INT_MAX-1, /* notified after kprobes, kgdb */