From patchwork Tue Jul 9 09:55:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tiezhu Yang X-Patchwork-Id: 13727571 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 28682C2BD09 for ; Tue, 9 Jul 2024 09:56:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=SuU0xbwEMdjd7rpQJWrjvonxYxGk/OI1J2+ifgwvP2c=; b=Soc3P1lY+Q56lp7WuC91Iw25wh zJnzqw010UhiTkBw50flbhFhDycnV2BOMyk0NKZCiRQdvAoZsbc7SCSti6JFBDQrf7iVXmtPZIhkP aPMwfmCuZvn0mRWc2xZ2hoyW9/xypv8fITQXMnG0IHlouXdh6JpGxzOyrHRG/ekjOzEmp/Vus5VUC +Rxk49+keTRX0vo/WMPbcQTBSSPWuB/gApnb7kbCi+p7AQXZVI0b/APwgjnIuxZOGRkx9adU9oUV5 OZQKrOg+ibsj6SbypSm74IPFH3W7zPhJB8m6+vOdwsoXx6n8xMMMyvJqpWaewUygmKoeyv8h+TUXq MBpcX+1A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sR7Zk-00000006hUn-14tM; Tue, 09 Jul 2024 09:55:56 +0000 Received: from desiato.infradead.org ([2001:8b0:10b:1:d65d:64ff:fe57:4e05]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1sR7Z7-00000006hEs-1zdo for linux-arm-kernel@bombadil.infradead.org; Tue, 09 Jul 2024 09:55:17 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=desiato.20200630; h=Content-Transfer-Encoding:MIME-Version :References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=SuU0xbwEMdjd7rpQJWrjvonxYxGk/OI1J2+ifgwvP2c=; b=la1EvN61w3Yo8uPzmG4htg/xnd r/vJE1iqOt9pRjh0R1jA8wHpybChYg9uU5QIg0dxoWktGsa6mCzyhV1hy6MED1BCoTsKBUqmHY8xl bZwc0R7EfZdeLqiTtS/UcEmcLEP3xtbCXFcatIYxjMcLgLQCfNNSC70hUCucDx187GMVsglwBnHyj Az0uyzy3GB6UtWFTL2AqDO/retIFPt6IhKFB/MwcwL3LveUVeUcWgZEXX1sKT9leAmmk+iE7VoBTn VRavhub+gvc1As7VMFQpoFHhtDZAQ16l/bVcXMRHOIChygZTZRpyK+ULqiTGBdEN2m+NaMaAiNduW MfD53nPg==; Received: from mail.loongson.cn ([114.242.206.163]) by desiato.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1sR7Z3-00000000ijy-0d0y for linux-arm-kernel@lists.infradead.org; Tue, 09 Jul 2024 09:55:16 +0000 Received: from loongson.cn (unknown [113.200.148.30]) by gateway (Coremail) with SMTP id _____8DxzfD9CI1mW2ACAA--.7492S3; Tue, 09 Jul 2024 17:55:09 +0800 (CST) Received: from linux.localdomain (unknown [113.200.148.30]) by localhost.localdomain (Coremail) with SMTP id AQAAf8Cxqsb6CI1mgt1AAA--.17645S4; Tue, 09 Jul 2024 17:55:08 +0800 (CST) From: Tiezhu Yang To: Will Deacon , Mark Rutland , Russell King , Catalin Marinas , Oleg Nesterov , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim Cc: linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 2/3] arm: hw_breakpoint: Save privilege of access control via ptrace Date: Tue, 9 Jul 2024 17:55:05 +0800 Message-ID: <20240709095506.9691-3-yangtiezhu@loongson.cn> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20240709095506.9691-1-yangtiezhu@loongson.cn> References: <20240709095506.9691-1-yangtiezhu@loongson.cn> MIME-Version: 1.0 X-CM-TRANSID: AQAAf8Cxqsb6CI1mgt1AAA--.17645S4 X-CM-SenderInfo: p1dqw3xlh2x3gn0dqz5rrqw2lrqou0/ X-Coremail-Antispam: 1Uk129KBj93XoW7CF18JryDGr4kur18ZrWrJFc_yoW8uF1Dp3 sxCw1qqr4DCa10ga9xtrs5Za15C3sFgry2ga4DKw4Yyr1Yvr93GFykGr9I9393tr40q34S qwsYvr42qw47XabCm3ZEXasCq-sJn29KB7ZKAUJUUUU7529EdanIXcx71UUUUU7KY7ZEXa sCq-sGcSsGvfJ3Ic02F40EFcxC0VAKzVAqx4xG6I80ebIjqfuFe4nvWSU5nxnvy29KBjDU 0xBIdaVrnRJUUUB2b4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k26cxKx2 IYs7xG6rWj6s0DM7CIcVAFz4kK6r1Y6r17M28lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48v e4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Xr0_Ar1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI 0_Gr0_Cr1l84ACjcxK6I8E87Iv67AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVCY1x0267AK xVWxJr0_GcWln4kS14v26r1Y6r17M2AIxVAIcxkEcVAq07x20xvEncxIr21l57IF6xkI12 xvs2x26I8E6xACxx1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1q 6rW5McIj6I8E87Iv67AKxVW8JVWxJwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64 vIr41lc7CjxVAaw2AFwI0_JF0_Jw1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_ Jr0_Gr1l4IxYO2xFxVAFwI0_Jrv_JF1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8Gjc xK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r1q6r43MIIYrxkI7VAKI48JMIIF0xvE2Ix0 cI8IcVAFwI0_Gr0_Xr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4j6F4UMIIF0xvE42xK8V AvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxVW8JVWxJwCI42IY6I8E87Iv6xkF7I0E 14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxUxhiSDUUUU X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240709_105514_262301_C568E2EB X-CRM114-Status: GOOD ( 14.53 ) 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 In the current code, decode_ctrl_reg() saves the privilege of access control passed by the ptrace user data, but it is not used anymore, arch_build_bp_info() checks whether bp virtual address is in kernel space to construct hw->ctrl.privilege, it seems not reasonable. The value of ctrl->privilege saved in decode_ctrl_reg() can be used in arch_build_bp_info(), there is no need to check bp virtual address to assign value for hw->ctrl.privilege, just make use of "bp_priv" in the struct perf_event_attr to save the privilege of access control via ptrace for hardware breakpoint. Signed-off-by: Tiezhu Yang --- arch/arm/kernel/hw_breakpoint.c | 4 +--- arch/arm/kernel/ptrace.c | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/kernel/hw_breakpoint.c b/arch/arm/kernel/hw_breakpoint.c index a12efd0f43e8..7720d39473d9 100644 --- a/arch/arm/kernel/hw_breakpoint.c +++ b/arch/arm/kernel/hw_breakpoint.c @@ -568,9 +568,7 @@ static int arch_build_bp_info(struct perf_event *bp, hw->address = attr->bp_addr; /* Privilege */ - hw->ctrl.privilege = ARM_BREAKPOINT_USER; - if (arch_check_bp_in_kernelspace(hw)) - hw->ctrl.privilege |= ARM_BREAKPOINT_PRIV; + hw->ctrl.privilege = attr->bp_priv; /* Enabled? */ hw->ctrl.enabled = !attr->disabled; diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c index c421a899fc84..0d6d6b2a57a0 100644 --- a/arch/arm/kernel/ptrace.c +++ b/arch/arm/kernel/ptrace.c @@ -422,6 +422,7 @@ static struct perf_event *ptrace_hbp_create(struct task_struct *tsk, int type) attr.bp_addr = 0; attr.bp_len = HW_BREAKPOINT_LEN_4; attr.bp_type = type; + attr.bp_priv = ARM_BREAKPOINT_USER; attr.disabled = 1; return register_user_hw_breakpoint(&attr, ptrace_hbptriggered, NULL, @@ -530,6 +531,7 @@ static int ptrace_sethbpregs(struct task_struct *tsk, long num, attr.bp_len = gen_len; attr.bp_type = gen_type; + attr.bp_priv = ctrl.privilege; attr.disabled = !ctrl.enabled; }