From: "Chang S. Bae" <chang.seok.bae@intel.com>
To: x86@kernel.org
Cc: luto@kernel.org, ak@linux.intel.com, hpa@zytor.com,
markus.t.metzger@intel.com, tony.luck@intel.com,
ravi.v.shankar@intel.com, linux-kernel@vger.kernel.org,
chang.seok.bae@intel.com
Subject: [PATCH 05/15] x86/ptrace: A new macro to get an offset of user_regs_struct
Date: Mon, 19 Mar 2018 10:49:17 -0700 [thread overview]
Message-ID: <1521481767-22113-6-git-send-email-chang.seok.bae@intel.com> (raw)
In-Reply-To: <1521481767-22113-1-git-send-email-chang.seok.bae@intel.com>
Proliferation of offsetof() for user_regs_struct is trimmed
down with the USER_REGS_OFFSET macro.
Signed-off-by: Chang S. Bae <chang.seok.bae@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
cc: Andy Lutomirski <luto@kernel.org>
---
arch/x86/kernel/ptrace.c | 78 +++++++++++++++++++++++++-----------------------
1 file changed, 40 insertions(+), 38 deletions(-)
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
index b2f0beb..d8a1e1b 100644
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
@@ -149,6 +149,8 @@ static inline bool invalid_selector(u16 value)
return unlikely(value != 0 && (value & SEGMENT_RPL_MASK) != USER_RPL);
}
+#define USER_REGS_OFFSET(r) offsetof(struct user_regs_struct, r)
+
#ifdef CONFIG_X86_32
#define FLAG_MASK FLAG_MASK_32
@@ -194,7 +196,7 @@ static u16 get_segment_reg(struct task_struct *task, unsigned long offset)
* Returning the value truncates it to 16 bits.
*/
unsigned int retval;
- if (offset != offsetof(struct user_regs_struct, gs))
+ if (offset != USER_REGS_OFFSET(gs))
retval = *pt_regs_access(task_pt_regs(task), offset);
else {
if (task == current)
@@ -224,8 +226,8 @@ static int set_segment_reg(struct task_struct *task,
* safely use invalid selectors) from a kernel trap frame.
*/
switch (offset) {
- case offsetof(struct user_regs_struct, cs):
- case offsetof(struct user_regs_struct, ss):
+ case USER_REGS_OFFSET(cs):
+ case USER_REGS_OFFSET(ss):
if (unlikely(value == 0))
return -EIO;
@@ -233,7 +235,7 @@ static int set_segment_reg(struct task_struct *task,
*pt_regs_access(task_pt_regs(task), offset) = value;
break;
- case offsetof(struct user_regs_struct, gs):
+ case USER_REGS_OFFSET(gs):
if (task == current)
set_user_gs(task_pt_regs(task), value);
else
@@ -261,34 +263,34 @@ static u16 get_segment_reg(struct task_struct *task, unsigned long offset)
unsigned int seg;
switch (offset) {
- case offsetof(struct user_regs_struct, fs):
+ case USER_REGS_OFFSET(fs):
if (task == current) {
/* Older gas can't assemble movq %?s,%r?? */
asm("movl %%fs,%0" : "=r" (seg));
return seg;
}
return task->thread.fsindex;
- case offsetof(struct user_regs_struct, gs):
+ case USER_REGS_OFFSET(gs):
if (task == current) {
asm("movl %%gs,%0" : "=r" (seg));
return seg;
}
return task->thread.gsindex;
- case offsetof(struct user_regs_struct, ds):
+ case USER_REGS_OFFSET(ds):
if (task == current) {
asm("movl %%ds,%0" : "=r" (seg));
return seg;
}
return task->thread.ds;
- case offsetof(struct user_regs_struct, es):
+ case USER_REGS_OFFSET(es):
if (task == current) {
asm("movl %%es,%0" : "=r" (seg));
return seg;
}
return task->thread.es;
- case offsetof(struct user_regs_struct, cs):
- case offsetof(struct user_regs_struct, ss):
+ case USER_REGS_OFFSET(cs):
+ case USER_REGS_OFFSET(ss):
break;
}
return *pt_regs_access(task_pt_regs(task), offset);
@@ -304,22 +306,22 @@ static int set_segment_reg(struct task_struct *task,
return -EIO;
switch (offset) {
- case offsetof(struct user_regs_struct,fs):
+ case USER_REGS_OFFSET(fs):
task->thread.fsindex = value;
if (task == current)
loadsegment(fs, task->thread.fsindex);
break;
- case offsetof(struct user_regs_struct,gs):
+ case USER_REGS_OFFSET(gs):
task->thread.gsindex = value;
if (task == current)
load_gs_index(task->thread.gsindex);
break;
- case offsetof(struct user_regs_struct,ds):
+ case USER_REGS_OFFSET(ds):
task->thread.ds = value;
if (task == current)
loadsegment(ds, task->thread.ds);
break;
- case offsetof(struct user_regs_struct,es):
+ case USER_REGS_OFFSET(es):
task->thread.es = value;
if (task == current)
loadsegment(es, task->thread.es);
@@ -328,12 +330,12 @@ static int set_segment_reg(struct task_struct *task,
/*
* Can't actually change these in 64-bit mode.
*/
- case offsetof(struct user_regs_struct,cs):
+ case USER_REGS_OFFSET(cs):
if (unlikely(value == 0))
return -EIO;
task_pt_regs(task)->cs = value;
break;
- case offsetof(struct user_regs_struct,ss):
+ case USER_REGS_OFFSET(ss):
if (unlikely(value == 0))
return -EIO;
task_pt_regs(task)->ss = value;
@@ -381,19 +383,19 @@ static int putreg(struct task_struct *child,
unsigned long offset, unsigned long value)
{
switch (offset) {
- case offsetof(struct user_regs_struct, cs):
- case offsetof(struct user_regs_struct, ds):
- case offsetof(struct user_regs_struct, es):
- case offsetof(struct user_regs_struct, fs):
- case offsetof(struct user_regs_struct, gs):
- case offsetof(struct user_regs_struct, ss):
+ case USER_REGS_OFFSET(cs):
+ case USER_REGS_OFFSET(ds):
+ case USER_REGS_OFFSET(es):
+ case USER_REGS_OFFSET(fs):
+ case USER_REGS_OFFSET(gs):
+ case USER_REGS_OFFSET(ss):
return set_segment_reg(child, offset, value);
- case offsetof(struct user_regs_struct, flags):
+ case USER_REGS_OFFSET(flags):
return set_flags(child, value);
#ifdef CONFIG_X86_64
- case offsetof(struct user_regs_struct,fs_base):
+ case USER_REGS_OFFSET(fs_base):
if (value >= TASK_SIZE_MAX)
return -EIO;
/*
@@ -403,7 +405,7 @@ static int putreg(struct task_struct *child,
if (child->thread.fsbase != value)
return write_task_fsbase(child, value);
return 0;
- case offsetof(struct user_regs_struct,gs_base):
+ case USER_REGS_OFFSET(gs_base):
/*
* Exactly the same here as the %fs handling above.
*/
@@ -422,21 +424,21 @@ static int putreg(struct task_struct *child,
static unsigned long getreg(struct task_struct *task, unsigned long offset)
{
switch (offset) {
- case offsetof(struct user_regs_struct, cs):
- case offsetof(struct user_regs_struct, ds):
- case offsetof(struct user_regs_struct, es):
- case offsetof(struct user_regs_struct, fs):
- case offsetof(struct user_regs_struct, gs):
- case offsetof(struct user_regs_struct, ss):
+ case USER_REGS_OFFSET(cs):
+ case USER_REGS_OFFSET(ds):
+ case USER_REGS_OFFSET(es):
+ case USER_REGS_OFFSET(fs):
+ case USER_REGS_OFFSET(gs):
+ case USER_REGS_OFFSET(ss):
return get_segment_reg(task, offset);
- case offsetof(struct user_regs_struct, flags):
+ case USER_REGS_OFFSET(flags):
return get_flags(task);
#ifdef CONFIG_X86_64
- case offsetof(struct user_regs_struct, fs_base):
+ case USER_REGS_OFFSET(fs_base):
return read_task_fsbase(task);
- case offsetof(struct user_regs_struct, gs_base):
+ case USER_REGS_OFFSET(gs_base):
return read_task_gsbase(task);
#endif
}
@@ -885,7 +887,7 @@ long arch_ptrace(struct task_struct *child, long request,
#define SEG32(rs) \
case offsetof(struct user32, regs.rs): \
return set_segment_reg(child, \
- offsetof(struct user_regs_struct, rs), \
+ USER_REGS_OFFSET(rs), \
value); \
break
@@ -959,7 +961,7 @@ static int putreg32(struct task_struct *child, unsigned regno, u32 value)
#define SEG32(rs) \
case offsetof(struct user32, regs.rs): \
*val = get_segment_reg(child, \
- offsetof(struct user_regs_struct, rs)); \
+ USER_REGS_OFFSET(rs)); \
break
static int getreg32(struct task_struct *child, unsigned regno, u32 *val)
@@ -1153,7 +1155,7 @@ static long x32_arch_ptrace(struct task_struct *child,
ret = -EIO;
if ((addr & (sizeof(data) - 1)) || addr >= sizeof(struct user) ||
- addr < offsetof(struct user_regs_struct, cs))
+ addr < USER_REGS_OFFSET(cs))
break;
tmp = 0; /* Default return condition */
@@ -1174,7 +1176,7 @@ static long x32_arch_ptrace(struct task_struct *child,
case PTRACE_POKEUSR:
ret = -EIO;
if ((addr & (sizeof(data) - 1)) || addr >= sizeof(struct user) ||
- addr < offsetof(struct user_regs_struct, cs))
+ addr < USER_REGS_OFFSET(cs))
break;
if (addr < sizeof(struct user_regs_struct))
--
2.7.4
next prev parent reply other threads:[~2018-03-19 20:56 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-19 17:49 [PATCH 00/15] x86: Enable FSGSBASE instructions Chang S. Bae
2018-03-19 17:49 ` [PATCH 01/15] x86/fsgsbase/64: Introduce FS/GS base helper functions Chang S. Bae
2018-03-19 17:49 ` [PATCH 02/15] x86/fsgsbase/64: Make ptrace read FS/GS base accurately Chang S. Bae
2018-03-19 17:49 ` [PATCH 03/15] x86/fsgsbase/64: Use FS/GS base helpers in core dump Chang S. Bae
2018-03-19 17:49 ` [PATCH 04/15] x86/fsgsbase/64: Factor out load FS/GS segments from __switch_to Chang S. Bae
2018-03-19 17:49 ` Chang S. Bae [this message]
2018-03-19 17:49 ` [PATCH 06/15] x86/fsgsbase/64: Add putregs() to handle multiple elements' setting Chang S. Bae
2018-03-19 17:49 ` [PATCH 07/15] x86/fsgsbase/64: putregs() in a reverse order Chang S. Bae
2018-03-19 17:49 ` [PATCH 08/15] x86/fsgsbase/64: Add 'unsafe_fsgsbase' to enable CR4.FSGSBASE Chang S. Bae
2018-03-19 17:49 ` [PATCH 09/15] x86/fsgsbase/64: Add intrinsics/macros for FSGSBASE instructions Chang S. Bae
2018-03-19 17:49 ` [PATCH 10/15] x86/fsgsbase/64: Enable FSGSBASE instructions in helper functions Chang S. Bae
2018-03-19 17:49 ` [PATCH 11/15] x86/fsgsbase/64: Preserve FS/GS state in __switch_to if FSGSBASE is on Chang S. Bae
2018-03-19 17:49 ` [PATCH 12/15] x86/fsgsbase/64: When copying a thread, use FSGSBASE if enabled Chang S. Bae
2018-03-19 17:49 ` [PATCH 13/15] x86/fsgsbase/64: With FSGSBASE, compare GS bases on paranoid_entry Chang S. Bae
2018-03-19 20:05 ` Dave Hansen
2018-03-19 21:12 ` Bae, Chang Seok
2018-03-20 10:16 ` David Laight
2018-03-20 20:07 ` H. Peter Anvin
2018-03-20 20:36 ` Bae, Chang Seok
2018-03-21 0:36 ` Andy Lutomirski
2018-03-21 21:56 ` H. Peter Anvin
2018-03-20 14:58 ` Andy Lutomirski
2018-03-20 16:33 ` Bae, Chang Seok
2018-03-20 17:03 ` Bae, Chang Seok
2018-03-21 22:03 ` H. Peter Anvin
2018-03-22 1:37 ` Andy Lutomirski
2018-03-19 17:49 ` [PATCH 14/15] x86/fsgsbase/64: Support legacy behavior when FS/GS updated by ptracer Chang S. Bae
2018-03-20 15:04 ` Andy Lutomirski
2018-03-20 16:33 ` Bae, Chang Seok
2018-03-21 0:47 ` Andy Lutomirski
2018-03-21 7:01 ` Metzger, Markus T
2018-03-22 1:39 ` Andy Lutomirski
2018-03-21 15:11 ` Bae, Chang Seok
2018-03-22 1:40 ` Andy Lutomirski
2018-03-22 15:45 ` Bae, Chang Seok
2018-03-22 16:07 ` Andy Lutomirski
2018-03-22 16:46 ` Bae, Chang Seok
2018-03-22 16:53 ` Andy Lutomirski
2018-03-22 21:17 ` Bae, Chang Seok
2018-03-22 21:28 ` Andy Lutomirski
2018-03-19 17:49 ` [PATCH 15/15] x86/fsgsbase/64: Enable FSGSBASE by default and add a chicken bit Chang S. Bae
2018-03-20 15:05 ` [PATCH 00/15] x86: Enable FSGSBASE instructions Andy Lutomirski
2018-03-20 15:06 ` Andy Lutomirski
2018-03-20 16:33 ` Bae, Chang Seok
2018-03-21 0:40 ` Andy Lutomirski
2018-03-21 15:15 ` Bae, Chang Seok
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=1521481767-22113-6-git-send-email-chang.seok.bae@intel.com \
--to=chang.seok.bae@intel.com \
--cc=ak@linux.intel.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=luto@kernel.org \
--cc=markus.t.metzger@intel.com \
--cc=ravi.v.shankar@intel.com \
--cc=tony.luck@intel.com \
--cc=x86@kernel.org \
/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).