From patchwork Tue Nov 3 13:49:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean-Philippe Brucker X-Patchwork-Id: 11877587 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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT 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 0F79AC2D0A3 for ; Tue, 3 Nov 2020 13:54:41 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8BC7221D91 for ; Tue, 3 Nov 2020 13:54:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="d3Shgek7"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="H008eiFH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8BC7221D91 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=78lK1m/PUaOeFoz6JnNHTAgJwp+8Nj8odxL8w48/lA4=; b=d3Shgek7gxlNR8zjHXgmu7Sk3 XIydx74+IVm4uyxvgSlw5icrcJUyfl08LclSCWKTlB0Twj1He/DMKeIg37/1OfN+S+43GsJlwPhNT LLSmYZaxKr8fH2nRIevnNQgHpxMatud8qQ6EYOh+1OqUlZx2yqxyq+MbvAgnSsd+WGHwUyGTTrQAz DcBuWZaTm5nVqwjb3w2KC/tY/pMGogI8B4TbiAbMoPVkEYGb6aqeR7/mB7gEGConghNyhj7aKhaR3 TzlNs+wIBIWicKBZ0vIW92zAhckwm1VzkOm4IG0N8Fo0mP/2YzFAamDlhJlvCACqb+nmBq8HodTjn TrNUvnA4A==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kZwkN-0000Ry-7b; Tue, 03 Nov 2020 13:53:15 +0000 Received: from mail-ed1-x542.google.com ([2a00:1450:4864:20::542]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kZwkL-0000Qt-1V for linux-arm-kernel@lists.infradead.org; Tue, 03 Nov 2020 13:53:13 +0000 Received: by mail-ed1-x542.google.com with SMTP id a15so9514253edy.1 for ; Tue, 03 Nov 2020 05:53:12 -0800 (PST) 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 :mime-version:content-transfer-encoding; bh=jFJruwybpDmjvCxNrGCncgB6UjSi7mlvHclNCpVQuM8=; b=H008eiFHJj+VJfWAU6lUJPvsejGN55We50GBiTuE59NwZUg21x1OoRrZXwvcv9iQCC 4y0nUqFcR371BuZgPjKxoa614k3w4D7F7PlDqEbUI2iFFNwYMFPtLaw7qBE7EUlB+23h ivCPcvI56ez2JEj9vr1p1iTnV+YVT89zvYFFrjMGmmZ0zd7iZgTaMTd7H/Wvt7ExAOzg QrsBSBJyVQ58l1AfCAhIopTk+9QIcsxTZDkB690BAOmz8DqgQYn1//2To+W2DIs7oEQJ xIrfO6reTVkP2FPaHSw9fUDLYeg+yg5EsSlpyYxfs92O2oLAei2WKsFXArXBBHz3xUme KeYw== 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=jFJruwybpDmjvCxNrGCncgB6UjSi7mlvHclNCpVQuM8=; b=YrUiPNBG7XRzl7BlrqJYEtpCIIjJNaEX+won0DBjxCCJ6QgA8rIqyoICyWtT2G+DP3 TApnNP6wP6VscxY/8MhAIoxKYwmxTPGzItJB2cItL2qmoAELrUXLGvYQHmxxcEeYomtm oTcIBGFtgQZ2AJyW/dGsqbdyUvR7K0r9JzdcAoqV8JcP/+I2Sd3ylLx03kBpJdFnFHJi fYPywBPpQTWWJgFoK3vkQ4sC52SUWiwgebZvfYXKcL8kTkNwEvo1HkuoKWDRTWe2nnnb Vr9MRJAY+2wWAQ6bF0TjndBpf8VKEtzJ0xj9/RwGbv+9vv+W7CZ6FEX2KDTDLpBeo0Ch TL3A== X-Gm-Message-State: AOAM530pU72mjqbor+bxMDgJIOi6lgrjQNsWOZBVIF29+CYZoxGKFSns pJ99NHy3zc9I8vASo71mV3+A0w== X-Google-Smtp-Source: ABdhPJwUiyl5gkpe7tFNE1unM/FaAVG/3jllyf+svqhJpLQ+AlsfW0+HqgfG0wBKBiw2YMzMoTyttQ== X-Received: by 2002:a05:6402:a53:: with SMTP id bt19mr11395572edb.26.1604411591685; Tue, 03 Nov 2020 05:53:11 -0800 (PST) Received: from localhost.localdomain ([2001:1715:4e26:a7e0:116c:c27a:3e7f:5eaf]) by smtp.gmail.com with ESMTPSA id a10sm11746880edu.78.2020.11.03.05.53.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Nov 2020 05:53:11 -0800 (PST) From: Jean-Philippe Brucker To: catalin.marinas@arm.com, will@kernel.org Subject: [PATCH v2 2/2] arm64: kprobes: Remove redundant kprobe_step_ctx Date: Tue, 3 Nov 2020 14:49:04 +0100 Message-Id: <20201103134900.337243-2-jean-philippe@linaro.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201103134900.337243-1-jean-philippe@linaro.org> References: <20201103134900.337243-1-jean-philippe@linaro.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201103_085313_190657_05632E84 X-CRM114-Status: GOOD ( 19.78 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jean-Philippe Brucker , mhiramat@kernel.org, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Masami Hiramatsu The kprobe_step_ctx (kcb->ss_ctx) has ss_pending and match_addr, but those are redundant because those can be replaced by KPROBE_HIT_SS and &cur_kprobe->ainsn.api.insn[1] respectively. To simplify the code, remove the kprobe_step_ctx. Reviewed-by: Jean-Philippe Brucker Signed-off-by: Masami Hiramatsu Acked-by: Will Deacon --- arch/arm64/include/asm/kprobes.h | 7 ---- arch/arm64/kernel/probes/kprobes.c | 53 +++++++----------------------- 2 files changed, 12 insertions(+), 48 deletions(-) diff --git a/arch/arm64/include/asm/kprobes.h b/arch/arm64/include/asm/kprobes.h index 8699ce30f587..5d38ff4a4806 100644 --- a/arch/arm64/include/asm/kprobes.h +++ b/arch/arm64/include/asm/kprobes.h @@ -28,18 +28,11 @@ struct prev_kprobe { unsigned int status; }; -/* Single step context for kprobe */ -struct kprobe_step_ctx { - unsigned long ss_pending; - unsigned long match_addr; -}; - /* per-cpu kprobe control block */ struct kprobe_ctlblk { unsigned int kprobe_status; unsigned long saved_irqflag; struct prev_kprobe prev_kprobe; - struct kprobe_step_ctx ss_ctx; }; void arch_remove_kprobe(struct kprobe *); diff --git a/arch/arm64/kernel/probes/kprobes.c b/arch/arm64/kernel/probes/kprobes.c index f11a1a1f7026..89c64ada8732 100644 --- a/arch/arm64/kernel/probes/kprobes.c +++ b/arch/arm64/kernel/probes/kprobes.c @@ -34,7 +34,7 @@ DEFINE_PER_CPU(struct kprobe *, current_kprobe) = NULL; DEFINE_PER_CPU(struct kprobe_ctlblk, kprobe_ctlblk); static void __kprobes -post_kprobe_handler(struct kprobe_ctlblk *, struct pt_regs *); +post_kprobe_handler(struct kprobe *, struct kprobe_ctlblk *, struct pt_regs *); static void __kprobes arch_prepare_ss_slot(struct kprobe *p) { @@ -68,7 +68,7 @@ static void __kprobes arch_simulate_insn(struct kprobe *p, struct pt_regs *regs) p->ainsn.api.handler((u32)p->opcode, (long)p->addr, regs); /* single step simulated, now go for post processing */ - post_kprobe_handler(kcb, regs); + post_kprobe_handler(p, kcb, regs); } int __kprobes arch_prepare_kprobe(struct kprobe *p) @@ -177,19 +177,6 @@ static void __kprobes kprobes_restore_local_irqflag(struct kprobe_ctlblk *kcb, regs->pstate |= kcb->saved_irqflag; } -static void __kprobes -set_ss_context(struct kprobe_ctlblk *kcb, unsigned long addr) -{ - kcb->ss_ctx.ss_pending = true; - kcb->ss_ctx.match_addr = addr + sizeof(kprobe_opcode_t); -} - -static void __kprobes clear_ss_context(struct kprobe_ctlblk *kcb) -{ - kcb->ss_ctx.ss_pending = false; - kcb->ss_ctx.match_addr = 0; -} - static void __kprobes setup_singlestep(struct kprobe *p, struct pt_regs *regs, struct kprobe_ctlblk *kcb, int reenter) @@ -209,7 +196,6 @@ static void __kprobes setup_singlestep(struct kprobe *p, /* prepare for single stepping */ slot = (unsigned long)p->ainsn.api.insn; - set_ss_context(kcb, slot); /* mark pending ss */ kprobes_save_local_irqflag(kcb, regs); instruction_pointer_set(regs, slot); } else { @@ -243,13 +229,8 @@ static int __kprobes reenter_kprobe(struct kprobe *p, } static void __kprobes -post_kprobe_handler(struct kprobe_ctlblk *kcb, struct pt_regs *regs) +post_kprobe_handler(struct kprobe *cur, struct kprobe_ctlblk *kcb, struct pt_regs *regs) { - struct kprobe *cur = kprobe_running(); - - if (!cur) - return; - /* return addr restore if non-branching insn */ if (cur->ainsn.api.restore != 0) instruction_pointer_set(regs, cur->ainsn.api.restore); @@ -364,33 +345,23 @@ static void __kprobes kprobe_handler(struct pt_regs *regs) */ } -static int __kprobes -kprobe_ss_hit(struct kprobe_ctlblk *kcb, unsigned long addr) -{ - if ((kcb->ss_ctx.ss_pending) - && (kcb->ss_ctx.match_addr == addr)) { - clear_ss_context(kcb); /* clear pending ss */ - return DBG_HOOK_HANDLED; - } - /* not ours, kprobes should ignore it */ - return DBG_HOOK_ERROR; -} - static int __kprobes kprobe_breakpoint_ss_handler(struct pt_regs *regs, unsigned int esr) { struct kprobe_ctlblk *kcb = get_kprobe_ctlblk(); - int retval; - - /* return error if this is not our step */ - retval = kprobe_ss_hit(kcb, instruction_pointer(regs)); + unsigned long addr = instruction_pointer(regs); + struct kprobe *cur = kprobe_running(); - if (retval == DBG_HOOK_HANDLED) { + if (cur && (kcb->kprobe_status == KPROBE_HIT_SS) + && ((unsigned long)&cur->ainsn.api.insn[1] == addr)) { kprobes_restore_local_irqflag(kcb, regs); - post_kprobe_handler(kcb, regs); + post_kprobe_handler(cur, kcb, regs); + + return DBG_HOOK_HANDLED; } - return retval; + /* not ours, kprobes should ignore it */ + return DBG_HOOK_ERROR; } static struct break_hook kprobes_break_ss_hook = {