From patchwork Wed Apr 27 18:53:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Long X-Patchwork-Id: 8961981 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id ECF60BF29F for ; Wed, 27 Apr 2016 18:55:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1BAF620253 for ; Wed, 27 Apr 2016 18:55:44 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4233420142 for ; Wed, 27 Apr 2016 18:55:43 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1avUbM-0007Nc-EA; Wed, 27 Apr 2016 18:54:20 +0000 Received: from mail-qg0-x22a.google.com ([2607:f8b0:400d:c04::22a]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1avUal-0006yG-96 for linux-arm-kernel@lists.infradead.org; Wed, 27 Apr 2016 18:53:43 +0000 Received: by mail-qg0-x22a.google.com with SMTP id f74so21038494qge.2 for ; Wed, 27 Apr 2016 11:53:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=3bTlQfindwpC1PrNalDvqmdv/Ghb1zyEhKh81M7knZU=; b=hOlLb2e4toqK3dBq9U4pZTCfOePh4SjbeaeQbN29sS0nhR4vSOupfX/LMazHJwA1+r cOEPLhylX4gnaCC/+jr8mIWZ1eyE+Twcc98xY6lf3JmwMPLEqEcGsBairaNRV3Zebtps m0VRE1m47NtZWAe54WVKfx2qE1P2TaExqPv0k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=3bTlQfindwpC1PrNalDvqmdv/Ghb1zyEhKh81M7knZU=; b=OHmEpCasoNHJDbKlTpEIqjeEqevaF5H+LOD2+nZbx/1hHIFI2bzzY1ZL593r+ofxd/ 0xVFje51vlhD9sFGad7OPGbtf4145AYs9sP04wHCuGXVivFbKFb9eukr1GMZLc+bi46K 3LHIHNgmgZ1jaqccvZS6BP6EMD/4fe5dYAp4JGF3y3WcmGCvwPSoFyZSvs+2yatTD3MY E9V1ZbyPp2ghhjVnEbrEi0zUoVgTPv/LUJCkq2HoYrd+8RodfYkSaKuOfvdMAP3PX8E8 CqEB3as/4Cs5Wx+cFAEL+IQz30n7AzgL2d+1RFkEiOyskyqBh6mMdX5SeuLJ9j2V79kK dzcg== X-Gm-Message-State: AOPr4FV/OZ+JWPH9usoVyO3NwXBSVFPLn8FLOoce40gcsuA39MyfyDxJgz6c/XbVuWTldYJC X-Received: by 10.140.242.210 with SMTP id n201mr10786801qhc.2.1461783202215; Wed, 27 Apr 2016 11:53:22 -0700 (PDT) Received: from solstice.hsd1.nh.comcast.net ([2601:191:8000:f700:ecf0:c045:ec9f:ed60]) by smtp.googlemail.com with ESMTPSA id b18sm1604432qkc.9.2016.04.27.11.53.20 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 27 Apr 2016 11:53:21 -0700 (PDT) From: David Long To: Catalin Marinas , Will Deacon , Sandeepa Prabhu , William Cohen , Pratyush Anand , Steve Capper , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Marc Zyngier Subject: [PATCH v12 06/10] arm64: Treat all entry code as non-kprobe-able Date: Wed, 27 Apr 2016 14:53:01 -0400 Message-Id: <1461783185-9056-7-git-send-email-dave.long@linaro.org> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1461783185-9056-1-git-send-email-dave.long@linaro.org> References: <1461783185-9056-1-git-send-email-dave.long@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160427_115343_414718_BD7D8267 X-CRM114-Status: GOOD ( 12.83 ) X-Spam-Score: -2.7 (--) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Petr Mladek , Viresh Kumar , John Blackwood , Feng Kan , Zi Shen Lim , Dave P Martin , Yang Shi , Vladimir Murzin , Kees Cook , "Suzuki K. Poulose" , Mark Brown , =?UTF-8?q?Alex=20Benn=C3=A9e?= , Ard Biesheuvel , Greg Kroah-Hartman , Mark Salyzyn , James Morse , Christoffer Dall , Andrew Morton , Robin Murphy , Jens Wiklander , Balamurugan Shanmugam MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-5.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Pratyush Anand Entry symbols are not kprobe safe. So blacklist them for kprobing. Signed-off-by: Pratyush Anand --- arch/arm64/kernel/entry.S | 3 +++ arch/arm64/kernel/kprobes.c | 10 ++++++++++ arch/arm64/kernel/vmlinux.lds.S | 1 + 3 files changed, 14 insertions(+) diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 12e8d2b..7d99bed 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -243,6 +243,7 @@ tsk .req x28 // current thread_info * Exception vectors. */ + .pushsection ".entry.text", "ax" .align 11 ENTRY(vectors) ventry el1_sync_invalid // Synchronous EL1t @@ -781,3 +782,5 @@ ENTRY(sys_rt_sigreturn_wrapper) mov x0, sp b sys_rt_sigreturn ENDPROC(sys_rt_sigreturn_wrapper) + + .popsection diff --git a/arch/arm64/kernel/kprobes.c b/arch/arm64/kernel/kprobes.c index dfa1b1f..6a1292b 100644 --- a/arch/arm64/kernel/kprobes.c +++ b/arch/arm64/kernel/kprobes.c @@ -29,6 +29,7 @@ #include #include #include +#include #include "kprobes-arm64.h" @@ -514,6 +515,15 @@ int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs) return 1; } +bool arch_within_kprobe_blacklist(unsigned long addr) +{ + return (addr >= (unsigned long)__kprobes_text_start && + addr < (unsigned long)__kprobes_text_end) || + (addr >= (unsigned long)__entry_text_start && + addr < (unsigned long)__entry_text_end) || + !!search_exception_tables(addr); +} + int __init arch_init_kprobes(void) { return 0; diff --git a/arch/arm64/kernel/vmlinux.lds.S b/arch/arm64/kernel/vmlinux.lds.S index e205789..fb68ff8 100644 --- a/arch/arm64/kernel/vmlinux.lds.S +++ b/arch/arm64/kernel/vmlinux.lds.S @@ -104,6 +104,7 @@ SECTIONS __exception_text_end = .; IRQENTRY_TEXT SOFTIRQENTRY_TEXT + ENTRY_TEXT TEXT_TEXT SCHED_TEXT LOCK_TEXT