From: Pedro Franco de Carvalho <pedromfc@linux.vnet.ibm.com>
To: linuxppc-dev@lists.ozlabs.org, mpe@ellerman.id.au
Subject: [PATCH 2/2] powerpc: Use helper function to flush TM state in ptrace
Date: Tue, 19 Jun 2018 16:54:29 -0300 [thread overview]
Message-ID: <20180619195429.22925-2-pedromfc@linux.vnet.ibm.com> (raw)
In-Reply-To: <87d0wvtolp.fsf@concordia.ellerman.id.au>
This patch updates the get/set regset functions that flush tm, fpu and
altvec state when TM is available and active to use a helper function.
Signed-off-by: Pedro Franco de Carvalho <pedromfc@linux.vnet.ibm.com>
---
arch/powerpc/kernel/ptrace.c | 104 ++++++++++++-------------------------------
1 file changed, 28 insertions(+), 76 deletions(-)
diff --git a/arch/powerpc/kernel/ptrace.c b/arch/powerpc/kernel/ptrace.c
index 0d56857e1e89..84fa97587850 100644
--- a/arch/powerpc/kernel/ptrace.c
+++ b/arch/powerpc/kernel/ptrace.c
@@ -845,17 +845,10 @@ static int tm_cgpr_get(struct task_struct *target,
unsigned int pos, unsigned int count,
void *kbuf, void __user *ubuf)
{
- int ret;
-
- if (!cpu_has_feature(CPU_FTR_TM))
- return -ENODEV;
-
- if (!MSR_TM_ACTIVE(target->thread.regs->msr))
- return -ENODATA;
+ int ret = tm_flush_if_active(target);
- flush_tmregs_to_thread(target);
- flush_fp_to_thread(target);
- flush_altivec_to_thread(target);
+ if (ret)
+ return ret;
ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,
&target->thread.ckpt_regs,
@@ -910,17 +903,11 @@ static int tm_cgpr_set(struct task_struct *target,
const void *kbuf, const void __user *ubuf)
{
unsigned long reg;
- int ret;
-
- if (!cpu_has_feature(CPU_FTR_TM))
- return -ENODEV;
- if (!MSR_TM_ACTIVE(target->thread.regs->msr))
- return -ENODATA;
+ int ret = tm_flush_if_active(target);
- flush_tmregs_to_thread(target);
- flush_fp_to_thread(target);
- flush_altivec_to_thread(target);
+ if (ret)
+ return ret;
ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
&target->thread.ckpt_regs,
@@ -1014,15 +1001,10 @@ static int tm_cfpr_get(struct task_struct *target,
u64 buf[33];
int i;
- if (!cpu_has_feature(CPU_FTR_TM))
- return -ENODEV;
-
- if (!MSR_TM_ACTIVE(target->thread.regs->msr))
- return -ENODATA;
+ int ret = tm_flush_if_active(target);
- flush_tmregs_to_thread(target);
- flush_fp_to_thread(target);
- flush_altivec_to_thread(target);
+ if (ret)
+ return ret;
/* copy to local buffer then write that out */
for (i = 0; i < 32 ; i++)
@@ -1060,15 +1042,10 @@ static int tm_cfpr_set(struct task_struct *target,
u64 buf[33];
int i;
- if (!cpu_has_feature(CPU_FTR_TM))
- return -ENODEV;
-
- if (!MSR_TM_ACTIVE(target->thread.regs->msr))
- return -ENODATA;
+ int ret = tm_flush_if_active(target);
- flush_tmregs_to_thread(target);
- flush_fp_to_thread(target);
- flush_altivec_to_thread(target);
+ if (ret)
+ return ret;
for (i = 0; i < 32; i++)
buf[i] = target->thread.TS_CKFPR(i);
@@ -1131,20 +1108,12 @@ static int tm_cvmx_get(struct task_struct *target,
unsigned int pos, unsigned int count,
void *kbuf, void __user *ubuf)
{
- int ret;
-
- BUILD_BUG_ON(TVSO(vscr) != TVSO(vr[32]));
-
- if (!cpu_has_feature(CPU_FTR_TM))
- return -ENODEV;
+ int ret = tm_flush_if_active(target);
- if (!MSR_TM_ACTIVE(target->thread.regs->msr))
- return -ENODATA;
+ if (ret)
+ return ret;
- /* Flush the state */
- flush_tmregs_to_thread(target);
- flush_fp_to_thread(target);
- flush_altivec_to_thread(target);
+ BUILD_BUG_ON(TVSO(vscr) != TVSO(vr[32]));
ret = user_regset_copyout(&pos, &count, &kbuf, &ubuf,
&target->thread.ckvr_state, 0,
@@ -1193,19 +1162,12 @@ static int tm_cvmx_set(struct task_struct *target,
unsigned int pos, unsigned int count,
const void *kbuf, const void __user *ubuf)
{
- int ret;
-
- BUILD_BUG_ON(TVSO(vscr) != TVSO(vr[32]));
-
- if (!cpu_has_feature(CPU_FTR_TM))
- return -ENODEV;
+ int ret = tm_flush_if_active(target);
- if (!MSR_TM_ACTIVE(target->thread.regs->msr))
- return -ENODATA;
+ if (ret)
+ return ret;
- flush_tmregs_to_thread(target);
- flush_fp_to_thread(target);
- flush_altivec_to_thread(target);
+ BUILD_BUG_ON(TVSO(vscr) != TVSO(vr[32]));
ret = user_regset_copyin(&pos, &count, &kbuf, &ubuf,
&target->thread.ckvr_state, 0,
@@ -1276,18 +1238,13 @@ static int tm_cvsx_get(struct task_struct *target,
void *kbuf, void __user *ubuf)
{
u64 buf[32];
- int ret, i;
+ int i;
- if (!cpu_has_feature(CPU_FTR_TM))
- return -ENODEV;
+ int ret = tm_flush_if_active(target);
- if (!MSR_TM_ACTIVE(target->thread.regs->msr))
- return -ENODATA;
+ if (ret)
+ return ret;
- /* Flush the state */
- flush_tmregs_to_thread(target);
- flush_fp_to_thread(target);
- flush_altivec_to_thread(target);
flush_vsx_to_thread(target);
for (i = 0; i < 32 ; i++)
@@ -1324,18 +1281,13 @@ static int tm_cvsx_set(struct task_struct *target,
const void *kbuf, const void __user *ubuf)
{
u64 buf[32];
- int ret, i;
+ int i;
- if (!cpu_has_feature(CPU_FTR_TM))
- return -ENODEV;
+ int ret = tm_flush_if_active(target);
- if (!MSR_TM_ACTIVE(target->thread.regs->msr))
- return -ENODATA;
+ if (ret)
+ return ret;
- /* Flush the state */
- flush_tmregs_to_thread(target);
- flush_fp_to_thread(target);
- flush_altivec_to_thread(target);
flush_vsx_to_thread(target);
for (i = 0; i < 32 ; i++)
--
2.13.6
next prev parent reply other threads:[~2018-06-19 19:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-07 15:25 [RFC PATCH 0/5] powerpc: Misc. ptrace regset fixes Pedro Franco de Carvalho
2018-06-07 15:25 ` [RFC PATCH 1/5] powerpc: Fix inverted active predicate for setting the EBB regset Pedro Franco de Carvalho
2018-06-13 2:15 ` Michael Ellerman
2018-06-13 4:09 ` Michael Ellerman
2018-06-14 13:52 ` Pedro Franco de Carvalho
2018-06-07 15:25 ` [RFC PATCH 2/5] powerpc: Flush checkpointed gpr state for 32-bit processes in ptrace Pedro Franco de Carvalho
2018-06-13 2:19 ` Michael Ellerman
2018-06-14 13:55 ` Pedro Franco de Carvalho
2018-06-19 19:54 ` [PATCH 1/2] " Pedro Franco de Carvalho
2024-03-12 8:07 ` Christophe Leroy
2018-06-19 19:54 ` Pedro Franco de Carvalho [this message]
2018-06-07 15:25 ` [RFC PATCH 3/5] powerpc: Fix pmu get/set functions Pedro Franco de Carvalho
2018-06-07 15:25 ` [RFC PATCH 4/5] powerpc: Add VSX regset to compat_regsets Pedro Franco de Carvalho
2018-06-07 15:25 ` [RFC PATCH 5/5] powerpc: Add PMU " Pedro Franco de Carvalho
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=20180619195429.22925-2-pedromfc@linux.vnet.ibm.com \
--to=pedromfc@linux.vnet.ibm.com \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
/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).