From: Paul Walmsley <paul.walmsley@sifive.com>
To: Christoph Hellwig <hch@lst.de>
Cc: linux-riscv@lists.infradead.org,
Palmer Dabbelt <palmer@sifive.com>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH 7/9] riscv: remove duplicate macros from ptrace.h
Date: Thu, 25 Apr 2019 12:13:18 -0700 (PDT) [thread overview]
Message-ID: <alpine.DEB.2.21.9999.1904251208140.17442@viisi.sifive.com> (raw)
In-Reply-To: <20190411115623.5749-8-hch@lst.de>
On Thu, 11 Apr 2019, Christoph Hellwig wrote:
> No need to have two names for the same thing.
>
> Signed-off-by: Christoph Hellwig <hch@lst.de>
This is probably worth cleaning up across the entire tree.
asm-{generic,x86,arm64,powerpc}/ptrace.h all define similar GET_IP/SET_IP
macros - although it seems that arch/riscv is the only architecture that
uses them.
- Paul
> ---
> arch/riscv/include/asm/ptrace.h | 21 ++++++---------------
> arch/riscv/kernel/stacktrace.c | 8 ++++----
> arch/riscv/kernel/traps.c | 2 +-
> 3 files changed, 11 insertions(+), 20 deletions(-)
>
> diff --git a/arch/riscv/include/asm/ptrace.h b/arch/riscv/include/asm/ptrace.h
> index d35ec2f41381..9c867a4bac83 100644
> --- a/arch/riscv/include/asm/ptrace.h
> +++ b/arch/riscv/include/asm/ptrace.h
> @@ -70,47 +70,38 @@ struct pt_regs {
>
>
> /* Helpers for working with the instruction pointer */
> -#define GET_IP(regs) ((regs)->sepc)
> -#define SET_IP(regs, val) (GET_IP(regs) = (val))
> -
> static inline unsigned long instruction_pointer(struct pt_regs *regs)
> {
> - return GET_IP(regs);
> + return regs->sepc;
> }
> static inline void instruction_pointer_set(struct pt_regs *regs,
> unsigned long val)
> {
> - SET_IP(regs, val);
> + regs->sepc = val;
> }
>
> #define profile_pc(regs) instruction_pointer(regs)
>
> /* Helpers for working with the user stack pointer */
> -#define GET_USP(regs) ((regs)->sp)
> -#define SET_USP(regs, val) (GET_USP(regs) = (val))
> -
> static inline unsigned long user_stack_pointer(struct pt_regs *regs)
> {
> - return GET_USP(regs);
> + return regs->sp;
> }
> static inline void user_stack_pointer_set(struct pt_regs *regs,
> unsigned long val)
> {
> - SET_USP(regs, val);
> + regs->sp = val;
> }
>
> /* Helpers for working with the frame pointer */
> -#define GET_FP(regs) ((regs)->s0)
> -#define SET_FP(regs, val) (GET_FP(regs) = (val))
> -
> static inline unsigned long frame_pointer(struct pt_regs *regs)
> {
> - return GET_FP(regs);
> + return regs->s0;
> }
> static inline void frame_pointer_set(struct pt_regs *regs,
> unsigned long val)
> {
> - SET_FP(regs, val);
> + regs->s0 = val;
> }
>
> static inline unsigned long regs_return_value(struct pt_regs *regs)
> diff --git a/arch/riscv/kernel/stacktrace.c b/arch/riscv/kernel/stacktrace.c
> index a4b1d94371a0..25fe0ff81f9e 100644
> --- a/arch/riscv/kernel/stacktrace.c
> +++ b/arch/riscv/kernel/stacktrace.c
> @@ -33,9 +33,9 @@ static void notrace walk_stackframe(struct task_struct *task,
> unsigned long fp, sp, pc;
>
> if (regs) {
> - fp = GET_FP(regs);
> - sp = GET_USP(regs);
> - pc = GET_IP(regs);
> + fp = frame_pointer(regs);
> + sp = user_stack_pointer(regs);
> + pc = instruction_pointer(regs);
> } else if (task == NULL || task == current) {
> const register unsigned long current_sp __asm__ ("sp");
> fp = (unsigned long)__builtin_frame_address(0);
> @@ -83,7 +83,7 @@ static void notrace walk_stackframe(struct task_struct *task,
>
> if (regs) {
> sp = GET_USP(regs);
> - pc = GET_IP(regs);
> + pc = instruction_pointer(regs);
> } else if (task == NULL || task == current) {
> const register unsigned long current_sp __asm__ ("sp");
> sp = current_sp;
> diff --git a/arch/riscv/kernel/traps.c b/arch/riscv/kernel/traps.c
> index 24a9333dda2c..86731a2fa218 100644
> --- a/arch/riscv/kernel/traps.c
> +++ b/arch/riscv/kernel/traps.c
> @@ -70,7 +70,7 @@ void do_trap(struct pt_regs *regs, int signo, int code,
> && printk_ratelimit()) {
> pr_info("%s[%d]: unhandled signal %d code 0x%x at 0x" REG_FMT,
> tsk->comm, task_pid_nr(tsk), signo, code, addr);
> - print_vma_addr(KERN_CONT " in ", GET_IP(regs));
> + print_vma_addr(KERN_CONT " in ", instruction_pointer(regs));
> pr_cont("\n");
> show_regs(regs);
> }
> --
> 2.20.1
>
>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv
>
_______________________________________________
linux-riscv mailing list
linux-riscv@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-riscv
next prev parent reply other threads:[~2019-04-25 19:13 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-11 11:56 misc cleanups Christoph Hellwig
2019-04-11 11:56 ` [PATCH 1/9] riscv: use asm-generic/extable.h Christoph Hellwig
2019-04-25 19:00 ` Paul Walmsley
2019-04-11 11:56 ` [PATCH 2/9] riscv: remove dead big endian code Christoph Hellwig
2019-04-11 15:40 ` Nick Kossifidis
2019-04-11 15:47 ` Christoph Hellwig
2019-04-11 16:08 ` Nick Kossifidis
2019-04-11 16:31 ` Christoph Hellwig
2019-04-11 16:47 ` Nick Kossifidis
2019-04-12 6:07 ` Christoph Hellwig
2019-04-11 11:56 ` [PATCH 3/9] riscv: remove CONFIG_RISCV_ISA_A Christoph Hellwig
2019-04-11 12:21 ` Andreas Schwab
2019-04-12 1:23 ` Palmer Dabbelt
2019-04-12 5:51 ` Christoph Hellwig
2019-04-11 11:56 ` [PATCH 4/9] riscv: turn mm_segment_t into a struct Christoph Hellwig
2019-04-11 11:56 ` [PATCH 5/9] riscv: simplify stack pointer setup in head.S Christoph Hellwig
2019-04-11 20:54 ` Atish Patra
2019-04-11 11:56 ` [PATCH 6/9] riscv: also clear all pending interrupts when booting Christoph Hellwig
2019-04-11 15:43 ` Nick Kossifidis
2019-04-11 18:52 ` Atish Patra
2019-04-11 11:56 ` [PATCH 7/9] riscv: remove duplicate macros from ptrace.h Christoph Hellwig
2019-04-11 15:46 ` Nick Kossifidis
2019-04-11 15:55 ` Nick Kossifidis
2019-04-11 16:03 ` Nick Kossifidis
2019-04-11 16:17 ` Christoph Hellwig
2019-04-11 16:38 ` Nick Kossifidis
2019-04-11 16:06 ` Christoph Hellwig
2019-04-25 19:13 ` Paul Walmsley [this message]
2019-04-25 19:54 ` Christoph Hellwig
2019-04-25 20:05 ` Paul Walmsley
2019-04-11 11:56 ` [PATCH 8/9] riscv: print the unexpected interrupt cause Christoph Hellwig
2019-04-11 15:52 ` Nick Kossifidis
2019-04-11 15:54 ` Christoph Hellwig
2019-04-25 18:59 ` Paul Walmsley
2019-04-11 11:56 ` [PATCH 9/9] riscv: call pm_power_off from machine_halt / machine_power_off Christoph Hellwig
2019-04-11 18:53 ` Atish Patra
2019-04-25 19:57 ` Paul Walmsley
2019-05-21 10:33 ` Andreas Schwab
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=alpine.DEB.2.21.9999.1904251208140.17442@viisi.sifive.com \
--to=paul.walmsley@sifive.com \
--cc=hch@lst.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-riscv@lists.infradead.org \
--cc=palmer@sifive.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).