From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-qk1-f171.google.com (mail-qk1-f171.google.com [209.85.222.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 79B4C29B200 for ; Tue, 5 Aug 2025 19:40:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.171 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754422816; cv=none; b=dX1oHWQjMfhkSxplfjdHaEQm3abxhz55r4HQyBDh/pJZjI1BinYqvJIK6Gu5HexiKw/bsQ5BdSY9XrS0FyP058iavQ9X78vv6NWX/5c7iw/gt0HWPbwbq1e6ZJ8s9rxPpinu169bas2XdaTBRYktbuUROjV9vzh7B7IT9iGMVSE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1754422816; c=relaxed/simple; bh=pH8wkOotqE0cBRSa0KbFERwDeYY+i5YxpVrEk0g2r9Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sS0sqdVbszaT6QOIMwBEZyiniBQs56BuFfzhuyQLq/s83nuwtQEL8hNP6UKqnrKOPidB4MGxS7fmX6yfrGphxBVdnWwcS6SrpgcXrra1wLYZeordu+E2s45XLwahQ2nL1XOJeHqYWFfKWzIDRNZ4prT3A488ohp3cexYIhoOujQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com; spf=pass smtp.mailfrom=rivosinc.com; dkim=pass (2048-bit key) header.d=rivosinc.com header.i=@rivosinc.com header.b=Ydz0xc1k; arc=none smtp.client-ip=209.85.222.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=rivosinc.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=rivosinc.com header.i=@rivosinc.com header.b="Ydz0xc1k" Received: by mail-qk1-f171.google.com with SMTP id af79cd13be357-7e32cf22fdfso540789885a.0 for ; Tue, 05 Aug 2025 12:40:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc.com; s=google; t=1754422813; x=1755027613; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sy5rnGanwjtyLCbaD47CPjt7MxkuRZTNweHSGmibXvc=; b=Ydz0xc1kVfwyk/Z1z9QVrki0bvBb5DgxXoTDaHCYynsiWLWNvxPmTUWpc5qPGGyFvL Fkp61IGRhiVMOXo/bmiUJhou6fskdA+m+HYqjMrVJVkOcw+dUXrsmaCboCnzMHOUCsrT j6tf4TnCWyjzvqMhK8AWk6hBwyz4xeEF9QuInHuOW08WkylCX2D14PE5Yrww0OvvPgwK 4pcr4WvOZEMD328I7o+0vc3wuhybCa5gLmdfD7O39GhWCx5HmAwvTtZcrj7R+wPLiCHg 75eB3UKUoBWGCAxOhmix3X9WBJf+jd9vBoHsQlJs2p4I8TWO6Mc+32sq9d5RFeA3A1HD ytig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754422813; x=1755027613; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sy5rnGanwjtyLCbaD47CPjt7MxkuRZTNweHSGmibXvc=; b=woweE+opo7Gvnudmhs91S/TOQleRzBvCGF9aySRnpWiG+NbIcL1Vj6oiPO4+ueUWl1 VER9aQShIoknsYAPwI5hnz+iw5Uo7yciX3AzfaiXAd4dluLaG4BXnrR8frU1WppMNcfM FuVyOkwLEUvQQ1ilM0r8Mh8eHzWtx4kslROKH2nE6gs/KYvO5u1m/ELRQqus/rvdn8lj eXVo2OCTArGhBSRX4Ccuq56AO92aU68dkHzdMM8nalWHi+CmHWVNs0OFVIN6xN+zU0xo GqZ1ZQkrbwApsCKOhsEoSULliWp8k5puzmOws0Hs7APQh9lwnSJzuShIMdxUATVVGLP7 6YVA== X-Forwarded-Encrypted: i=1; AJvYcCVtmaD4rRiaT/KQLCw5dm8SNRUzsYiX3Om8nb+42TuBtEx2HhEXBHAO2jO4Mmvhd9APnXay6+1bWXfz7Fv21yE=@vger.kernel.org X-Gm-Message-State: AOJu0YyWZCdZtJC/Jg8BxtxzNKMdkxm6G3EB07JPvOEteUb6sKuoGLGK sSv8rK7jHtY/CRyWglPQvyoySG+DgK0WcGEsYtk3XiNewL6PknARMzaz8tIJ1gBnLy8= X-Gm-Gg: ASbGncuXyqttUHa+945N6GMzU8s6DtUwZeftBWS2ykVrc6hVX4TWwfv8OgGG8c9s8zH fpMcj0A2gApd3KMiW0gONDAGO98ljuK9k7TqmN8tKfu0a50/hZRVyykbENBGQRkQ15IM++Cn/0p WrPsFqVyOb66q0itJauxHCMEae4TwRCtfqpe2tKBD+bQX5xOh4BBOOQalpE95MEcMQTK/pP3tjv zdb7weNc4L+Sq7g5YyVsOcdF7+6YFgE2UFkycPvDhTZFJ4pe7LLzKbT8NCYUWU9epgVZQiL0NkF KfcxiMFRSYjxVpqv05Do5GRKhcD8FymG65kfrPR8UfKZZ3iotT+KXKTGQ9rCjwttv5W9yxquval KgJsRNh154Z31clG4a1HsKjbhrNABrmjeZFiOoMT6Bzfdj3Y2Ge2CtYIlsDnu/g8ui9pe7pmsh7 tTCkNepA== X-Google-Smtp-Source: AGHT+IG6XA8VhHC/9Z5t7TyajoGN/5DDGuOO01JZMGKppPhvnVQsp/F8STKyDdgm3AlZG+FdD4n6KA== X-Received: by 2002:a05:620a:1707:b0:7e8:15b2:3f20 with SMTP id af79cd13be357-7e815b24106mr5235285a.1.1754422813351; Tue, 05 Aug 2025 12:40:13 -0700 (PDT) Received: from jesse-lt.jtp-bos.lab (pool-108-26-215-125.bstnma.fios.verizon.net. [108.26.215.125]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7e67f7064b0sm717855685a.54.2025.08.05.12.40.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Aug 2025 12:40:13 -0700 (PDT) From: Jesse Taube To: linux-riscv@lists.infradead.org Cc: Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Oleg Nesterov , Kees Cook , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , "Liang, Kan" , Shuah Khan , Jesse Taube , Himanshu Chauhan , Charlie Jenkins , Samuel Holland , Conor Dooley , Deepak Gupta , Andrew Jones , Atish Patra , Anup Patel , Mayuresh Chitale , Evan Green , WangYuli , Huacai Chen , Arnd Bergmann , Andrew Morton , Luis Chamberlain , "Mike Rapoport (Microsoft)" , Nam Cao , Yunhui Cui , Joel Granados , =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= , Sebastian Andrzej Siewior , Celeste Liu , Chunyan Zhang , Nylon Chen , Thomas Gleixner , =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= , Vincenzo Frascino , Joey Gouly , Akihiko Odaki , Ravi Bangoria , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-perf-users@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH 7/8] riscv: ptrace: Add hw breakpoint regset Date: Tue, 5 Aug 2025 12:39:54 -0700 Message-ID: <20250805193955.798277-8-jesse@rivosinc.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250805193955.798277-1-jesse@rivosinc.com> References: <20250805193955.798277-1-jesse@rivosinc.com> Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Add ability to setup hw breakpoints using REGSET use the __riscv_hwdebug_state structure to configure breakpoints. Signed-off-by: Jesse Taube --- RFC -> V1: - New commit --- arch/riscv/kernel/ptrace.c | 59 ++++++++++++++++++++++++++++++++++ include/uapi/linux/elf.h | 2 ++ tools/include/uapi/linux/elf.h | 1 + 3 files changed, 62 insertions(+) diff --git a/arch/riscv/kernel/ptrace.c b/arch/riscv/kernel/ptrace.c index e097e6a61910..fbd0097ec168 100644 --- a/arch/riscv/kernel/ptrace.c +++ b/arch/riscv/kernel/ptrace.c @@ -33,6 +33,9 @@ enum riscv_regset { #ifdef CONFIG_RISCV_ISA_SUPM REGSET_TAGGED_ADDR_CTRL, #endif +#ifdef CONFIG_HAVE_HW_BREAKPOINT + REGSET_HW_BREAK +#endif }; static int riscv_gpr_get(struct task_struct *target, @@ -280,7 +283,53 @@ static long ptrace_sethbpregs(struct task_struct *child, unsigned long idx, return -EFAULT; return ptrace_hbp_set(child, idx, &state); +} +static int hw_break_set(struct task_struct *target, + const struct user_regset *regset, + unsigned int pos, unsigned int count, + const void *kbuf, const void __user *ubuf) +{ + struct __riscv_hwdebug_state state; + int ret, idx, offset, limit; + + idx = offset = 0; + limit = regset->n * regset->size; + while (count && offset < limit) { + if (count < sizeof(state)) + return -EINVAL; + + ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, &state, + offset, offset + sizeof(state)); + if (ret) + return ret; + ret = ptrace_hbp_set(target, idx, &state); + if (ret) + return ret; + offset += sizeof(state); + idx++; + } + + return 0; +} + +static int hw_break_get(struct task_struct *target, + const struct user_regset *regset, + struct membuf to) +{ + int ret, idx = 0; + struct __riscv_hwdebug_state state; + + while (to.left) { + ret = ptrace_hbp_get(target, idx, &state); + if (ret) + return ret; + + membuf_write(&to, &state, sizeof(state)); + idx++; + } + + return 0; } #endif @@ -324,6 +373,16 @@ static const struct user_regset riscv_user_regset[] = { .set = tagged_addr_ctrl_set, }, #endif +#ifdef CONFIG_HAVE_HW_BREAKPOINT + [REGSET_HW_BREAK] = { + .core_note_type = NT_RISCV_HW_BREAK, + .n = sizeof(struct __riscv_hwdebug_state) / sizeof(unsigned long), + .size = sizeof(unsigned long), + .align = sizeof(unsigned long), + .regset_get = hw_break_get, + .set = hw_break_set, + }, +#endif }; static const struct user_regset_view riscv_user_native_view = { diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h index 819ded2d39de..7a32073e0d68 100644 --- a/include/uapi/linux/elf.h +++ b/include/uapi/linux/elf.h @@ -545,6 +545,8 @@ typedef struct elf64_shdr { #define NT_RISCV_VECTOR 0x901 /* RISC-V vector registers */ #define NN_RISCV_TAGGED_ADDR_CTRL "LINUX" #define NT_RISCV_TAGGED_ADDR_CTRL 0x902 /* RISC-V tagged address control (prctl()) */ +#define NN_RISCV_HW_BREAK "LINUX" +#define NT_RISCV_HW_BREAK 0x903 /* RISC-V hardware breakpoint registers */ #define NN_LOONGARCH_CPUCFG "LINUX" #define NT_LOONGARCH_CPUCFG 0xa00 /* LoongArch CPU config registers */ #define NN_LOONGARCH_CSR "LINUX" diff --git a/tools/include/uapi/linux/elf.h b/tools/include/uapi/linux/elf.h index 5834b83d7f9a..b5f35df1de7a 100644 --- a/tools/include/uapi/linux/elf.h +++ b/tools/include/uapi/linux/elf.h @@ -460,6 +460,7 @@ typedef struct elf64_shdr { #define NT_RISCV_CSR 0x900 /* RISC-V Control and Status Registers */ #define NT_RISCV_VECTOR 0x901 /* RISC-V vector registers */ #define NT_RISCV_TAGGED_ADDR_CTRL 0x902 /* RISC-V tagged address control (prctl()) */ +#define NT_RISCV_HW_BREAK 0x903 /* RISC-V hardware breakpoint registers */ #define NT_LOONGARCH_CPUCFG 0xa00 /* LoongArch CPU config registers */ #define NT_LOONGARCH_CSR 0xa01 /* LoongArch control and status registers */ #define NT_LOONGARCH_LSX 0xa02 /* LoongArch Loongson SIMD Extension registers */ -- 2.43.0 From mboxrd@z Thu Jan 1 00:00:00 1970 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 B9391C87FCB for ; Tue, 5 Aug 2025 19:40:22 +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=ZgSEqDta55INLhNcwSyBJ/GWvI8V1FqXC2KOGkCuRPo=; b=RXZy8ddgM3oUhy WvQi5G6ikqEf+2aXToYE6a3lFnaIAoHDxAr7/9fGIMsYRdni08OleH8UddVL0DCmO6Fy5Za1OGU76 9tAgXZsZ375AZHW0i4n+bWwm3bOnRJIGes5A5qBaK6WAs/OyyJdmhay6V62NVs4eqkrrP45RBbMBc GAJd3oJNs0XF1JdVOqRg2DujGmyKuIZ5GjJ2ynpwI5p8F3a4/RxYYzLSzwqosHNVgOjyYG36Wh84D lWTJj+OhmP1JFXhsAFnCs1anM7esZomfDjMba9qp/hWmrJx03D5hjTcAri52IpzSXFU/zlXm/HCRz YB4LsW9hZXbpzb7prI2A==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98.2 #2 (Red Hat Linux)) id 1ujNWD-0000000DgkL-1XNJ; Tue, 05 Aug 2025 19:40:17 +0000 Received: from mail-qk1-x72a.google.com ([2607:f8b0:4864:20::72a]) by bombadil.infradead.org with esmtps (Exim 4.98.2 #2 (Red Hat Linux)) id 1ujNWA-0000000Dgg1-2O1L for linux-riscv@lists.infradead.org; Tue, 05 Aug 2025 19:40:15 +0000 Received: by mail-qk1-x72a.google.com with SMTP id af79cd13be357-7e32cf22fdfso540790185a.0 for ; Tue, 05 Aug 2025 12:40:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rivosinc.com; s=google; t=1754422813; x=1755027613; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sy5rnGanwjtyLCbaD47CPjt7MxkuRZTNweHSGmibXvc=; b=fpSn0M9YYgzDzzk4vpYbinZFo6SDqCSqdbzaHj/GiVs380NnakscxXVyEvP5fsdffM KP6t3D2fDU5JkDwTLb/fqz8HESOi5M3ND0OsE3crG+y1hFc07Fyp//iNK78UetH8Uas8 1mwy5cRAd2PZEo0mx0nE/Y/RcLKP4rhuI1+EQtFLV/pYK/un26IJd3UEu0mBbspZJMRT b9XH+NqR9/Cad6gnHGUme0aqhExSmUZY03GcaUe4D1iix9AnDwPJ0bS+y7j7SZXszALq SB17z1KRfGTvzqOs8Dd2a8S63m8bCPX4w4lEJtedAwZ2EnIdsDs5VLzcPCrhPIFGqU/O 23/w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1754422813; x=1755027613; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sy5rnGanwjtyLCbaD47CPjt7MxkuRZTNweHSGmibXvc=; b=Olok44dJ4cwc2WQZZX9K0vXj3lnrpwpcR8kg2vbkbW5OvpUw8CgYKWDcq8h/3d0F5v xCmoE2iU3LqWckT9KdbGK/ZTZO5c7duSPHUoqrII9aoBKhPCGdXscsNmXRuws2yBtLl0 vTDdfBfiVrf028nzfEO3i0gSPCMNSws951/Iz3u31CuRpfvLlO17hDpqjGgYv1CGjcOU cjTqskWz2jeaA9u+w+xwm1y6d957exKJsHQnwiqCF8Uv69RGGyOCYWDnSkLZwcrziB35 dcl7lK+ICKcT0KPAUpLATkIgFcG8O/+NhibjMHk6jK3zaBTidFWX1U5vwc/35qeE+icz fXcw== X-Gm-Message-State: AOJu0YyjfIyF0TBPyygTBowh+TO1M3LUcF7XIKVdtOCns4qOVjejzSB7 605eBEMUxvdRENldwkV42yTUiLguVnzjBcNgK3f2YFjoZ4UCfdzbHWPk45Sry3sI7aPRXtImmGM BaA35 X-Gm-Gg: ASbGncvYSETbmMblkEtphl2ymtG0dMstvG7ls4xeIBzvXHlX8+QUqPp94yGAc5sT5bD Gt+QIBf6yZEuDMYaqbcNSbVgF6Yl2G1b2ue/KLRN7eiNOgZBxYVoStVNSAo5cuy4/v1ffY+A5b8 OQ/JhKWcF0qjLfByaENRk7X6e2qNiYsvsYfjHKKhncKGtgJ2hfQqoLz8c3n+zRQcXaMFrLl+jxJ xxD1Y3je+n4u1RWnobpbn2LqKb4xThuatox4niCZZotB+W4olx9flXBcHqPs8yyox0Hfqqja9Cu cOVewU5vIT3yu0FAq4RCCPjA8Z7PcD+8GeYKuXoYyDJNVLcyuncRmPO2BnKDJ4sUAEe1hqbORoV YMFl7vFg0dLS4yAPSbORmj8qF7FZ2BpjWQU9YzhK7tN1lNbMQHr75ENqWQY1IZ1mHGd+STE9LhJ 4SkhFv0g== X-Google-Smtp-Source: AGHT+IG6XA8VhHC/9Z5t7TyajoGN/5DDGuOO01JZMGKppPhvnVQsp/F8STKyDdgm3AlZG+FdD4n6KA== X-Received: by 2002:a05:620a:1707:b0:7e8:15b2:3f20 with SMTP id af79cd13be357-7e815b24106mr5235285a.1.1754422813351; Tue, 05 Aug 2025 12:40:13 -0700 (PDT) Received: from jesse-lt.jtp-bos.lab (pool-108-26-215-125.bstnma.fios.verizon.net. [108.26.215.125]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7e67f7064b0sm717855685a.54.2025.08.05.12.40.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Aug 2025 12:40:13 -0700 (PDT) From: Jesse Taube To: linux-riscv@lists.infradead.org Cc: Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Oleg Nesterov , Kees Cook , Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , "Liang, Kan" , Shuah Khan , Jesse Taube , Himanshu Chauhan , Charlie Jenkins , Samuel Holland , Conor Dooley , Deepak Gupta , Andrew Jones , Atish Patra , Anup Patel , Mayuresh Chitale , Evan Green , WangYuli , Huacai Chen , Arnd Bergmann , Andrew Morton , Luis Chamberlain , "Mike Rapoport (Microsoft)" , Nam Cao , Yunhui Cui , Joel Granados , =?UTF-8?q?Cl=C3=A9ment=20L=C3=A9ger?= , Sebastian Andrzej Siewior , Celeste Liu , Chunyan Zhang , Nylon Chen , Thomas Gleixner , =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= , Vincenzo Frascino , Joey Gouly , Akihiko Odaki , Ravi Bangoria , linux-kernel@vger.kernel.org, linux-mm@kvack.org, linux-perf-users@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH 7/8] riscv: ptrace: Add hw breakpoint regset Date: Tue, 5 Aug 2025 12:39:54 -0700 Message-ID: <20250805193955.798277-8-jesse@rivosinc.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250805193955.798277-1-jesse@rivosinc.com> References: <20250805193955.798277-1-jesse@rivosinc.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250805_124014_612206_09591C99 X-CRM114-Status: GOOD ( 17.90 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org Add ability to setup hw breakpoints using REGSET use the __riscv_hwdebug_state structure to configure breakpoints. Signed-off-by: Jesse Taube --- RFC -> V1: - New commit --- arch/riscv/kernel/ptrace.c | 59 ++++++++++++++++++++++++++++++++++ include/uapi/linux/elf.h | 2 ++ tools/include/uapi/linux/elf.h | 1 + 3 files changed, 62 insertions(+) diff --git a/arch/riscv/kernel/ptrace.c b/arch/riscv/kernel/ptrace.c index e097e6a61910..fbd0097ec168 100644 --- a/arch/riscv/kernel/ptrace.c +++ b/arch/riscv/kernel/ptrace.c @@ -33,6 +33,9 @@ enum riscv_regset { #ifdef CONFIG_RISCV_ISA_SUPM REGSET_TAGGED_ADDR_CTRL, #endif +#ifdef CONFIG_HAVE_HW_BREAKPOINT + REGSET_HW_BREAK +#endif }; static int riscv_gpr_get(struct task_struct *target, @@ -280,7 +283,53 @@ static long ptrace_sethbpregs(struct task_struct *child, unsigned long idx, return -EFAULT; return ptrace_hbp_set(child, idx, &state); +} +static int hw_break_set(struct task_struct *target, + const struct user_regset *regset, + unsigned int pos, unsigned int count, + const void *kbuf, const void __user *ubuf) +{ + struct __riscv_hwdebug_state state; + int ret, idx, offset, limit; + + idx = offset = 0; + limit = regset->n * regset->size; + while (count && offset < limit) { + if (count < sizeof(state)) + return -EINVAL; + + ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf, &state, + offset, offset + sizeof(state)); + if (ret) + return ret; + ret = ptrace_hbp_set(target, idx, &state); + if (ret) + return ret; + offset += sizeof(state); + idx++; + } + + return 0; +} + +static int hw_break_get(struct task_struct *target, + const struct user_regset *regset, + struct membuf to) +{ + int ret, idx = 0; + struct __riscv_hwdebug_state state; + + while (to.left) { + ret = ptrace_hbp_get(target, idx, &state); + if (ret) + return ret; + + membuf_write(&to, &state, sizeof(state)); + idx++; + } + + return 0; } #endif @@ -324,6 +373,16 @@ static const struct user_regset riscv_user_regset[] = { .set = tagged_addr_ctrl_set, }, #endif +#ifdef CONFIG_HAVE_HW_BREAKPOINT + [REGSET_HW_BREAK] = { + .core_note_type = NT_RISCV_HW_BREAK, + .n = sizeof(struct __riscv_hwdebug_state) / sizeof(unsigned long), + .size = sizeof(unsigned long), + .align = sizeof(unsigned long), + .regset_get = hw_break_get, + .set = hw_break_set, + }, +#endif }; static const struct user_regset_view riscv_user_native_view = { diff --git a/include/uapi/linux/elf.h b/include/uapi/linux/elf.h index 819ded2d39de..7a32073e0d68 100644 --- a/include/uapi/linux/elf.h +++ b/include/uapi/linux/elf.h @@ -545,6 +545,8 @@ typedef struct elf64_shdr { #define NT_RISCV_VECTOR 0x901 /* RISC-V vector registers */ #define NN_RISCV_TAGGED_ADDR_CTRL "LINUX" #define NT_RISCV_TAGGED_ADDR_CTRL 0x902 /* RISC-V tagged address control (prctl()) */ +#define NN_RISCV_HW_BREAK "LINUX" +#define NT_RISCV_HW_BREAK 0x903 /* RISC-V hardware breakpoint registers */ #define NN_LOONGARCH_CPUCFG "LINUX" #define NT_LOONGARCH_CPUCFG 0xa00 /* LoongArch CPU config registers */ #define NN_LOONGARCH_CSR "LINUX" diff --git a/tools/include/uapi/linux/elf.h b/tools/include/uapi/linux/elf.h index 5834b83d7f9a..b5f35df1de7a 100644 --- a/tools/include/uapi/linux/elf.h +++ b/tools/include/uapi/linux/elf.h @@ -460,6 +460,7 @@ typedef struct elf64_shdr { #define NT_RISCV_CSR 0x900 /* RISC-V Control and Status Registers */ #define NT_RISCV_VECTOR 0x901 /* RISC-V vector registers */ #define NT_RISCV_TAGGED_ADDR_CTRL 0x902 /* RISC-V tagged address control (prctl()) */ +#define NT_RISCV_HW_BREAK 0x903 /* RISC-V hardware breakpoint registers */ #define NT_LOONGARCH_CPUCFG 0xa00 /* LoongArch CPU config registers */ #define NT_LOONGARCH_CSR 0xa01 /* LoongArch control and status registers */ #define NT_LOONGARCH_LSX 0xa02 /* LoongArch Loongson SIMD Extension registers */ -- 2.43.0 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv