]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/blobdiff - arch/ia64/kernel/ptrace.c
[ia64] access_uarea(): stop bothering with gpregs_[gs]et()
[mirror_ubuntu-jammy-kernel.git] / arch / ia64 / kernel / ptrace.c
index 82aaacf64583e97bfff2909735cd9ca180af076e..e0813c8e4b47f693ebec9e3ee4a3408b484adb69 100644 (file)
@@ -1273,52 +1273,43 @@ struct regset_getset {
        int ret;
 };
 
+static const ptrdiff_t pt_offsets[32] =
+{
+#define R(n) offsetof(struct pt_regs, r##n)
+       [0] = -1, R(1), R(2), R(3),
+       [4] = -1, [5] = -1, [6] = -1, [7] = -1,
+       R(8), R(9), R(10), R(11), R(12), R(13), R(14), R(15),
+       R(16), R(17), R(18), R(19), R(20), R(21), R(22), R(23),
+       R(24), R(25), R(26), R(27), R(28), R(29), R(30), R(31),
+#undef R
+};
+
 static int
 access_elf_gpreg(struct task_struct *target, struct unw_frame_info *info,
                unsigned long addr, unsigned long *data, int write_access)
 {
-       struct pt_regs *pt;
-       unsigned long *ptr = NULL;
-       int ret;
-       char nat = 0;
+       struct pt_regs *pt = task_pt_regs(target);
+       unsigned reg = addr / sizeof(unsigned long);
+       ptrdiff_t d = pt_offsets[reg];
 
-       pt = task_pt_regs(target);
-       switch (addr) {
-       case ELF_GR_OFFSET(1):
-               ptr = &pt->r1;
-               break;
-       case ELF_GR_OFFSET(2):
-       case ELF_GR_OFFSET(3):
-               ptr = (void *)&pt->r2 + (addr - ELF_GR_OFFSET(2));
-               break;
-       case ELF_GR_OFFSET(4) ... ELF_GR_OFFSET(7):
+       if (d >= 0) {
+               unsigned long *ptr = (void *)pt + d;
+               if (write_access)
+                       *ptr = *data;
+               else
+                       *data = *ptr;
+               return 0;
+       } else {
+               char nat = 0;
                if (write_access) {
                        /* read NaT bit first: */
                        unsigned long dummy;
-
-                       ret = unw_get_gr(info, addr/8, &dummy, &nat);
+                       int ret = unw_get_gr(info, reg, &dummy, &nat);
                        if (ret < 0)
                                return ret;
                }
-               return unw_access_gr(info, addr/8, data, &nat, write_access);
-       case ELF_GR_OFFSET(8) ... ELF_GR_OFFSET(11):
-               ptr = (void *)&pt->r8 + addr - ELF_GR_OFFSET(8);
-               break;
-       case ELF_GR_OFFSET(12):
-       case ELF_GR_OFFSET(13):
-               ptr = (void *)&pt->r12 + addr - ELF_GR_OFFSET(12);
-               break;
-       case ELF_GR_OFFSET(14):
-               ptr = &pt->r14;
-               break;
-       case ELF_GR_OFFSET(15):
-               ptr = &pt->r15;
+               return unw_access_gr(info, reg, data, &nat, write_access);
        }
-       if (write_access)
-               *ptr = *data;
-       else
-               *data = *ptr;
-       return 0;
 }
 
 static int
@@ -1490,7 +1481,7 @@ static int
 access_elf_reg(struct task_struct *target, struct unw_frame_info *info,
                unsigned long addr, unsigned long *data, int write_access)
 {
-       if (addr >= ELF_GR_OFFSET(1) && addr <= ELF_GR_OFFSET(15))
+       if (addr >= ELF_GR_OFFSET(1) && addr <= ELF_GR_OFFSET(31))
                return access_elf_gpreg(target, info, addr, data, write_access);
        else if (addr >= ELF_BR_OFFSET(0) && addr <= ELF_BR_OFFSET(7))
                return access_elf_breg(target, info, addr, data, write_access);
@@ -1500,10 +1491,7 @@ access_elf_reg(struct task_struct *target, struct unw_frame_info *info,
 
 void do_gpregs_get(struct unw_frame_info *info, void *arg)
 {
-       struct pt_regs *pt;
        struct regset_getset *dst = arg;
-       elf_greg_t tmp[16];
-       unsigned int i, index, min_copy;
 
        if (unw_unwind_to_user(info) < 0)
                return;
@@ -1526,160 +1514,70 @@ void do_gpregs_get(struct unw_frame_info *info, void *arg)
                                                      &dst->u.get.kbuf,
                                                      &dst->u.get.ubuf,
                                                      0, ELF_GR_OFFSET(1));
-               if (dst->ret || dst->count == 0)
-                       return;
-       }
-
-       /* gr1 - gr15 */
-       if (dst->count > 0 && dst->pos < ELF_GR_OFFSET(16)) {
-               index = (dst->pos - ELF_GR_OFFSET(1)) / sizeof(elf_greg_t);
-               min_copy = ELF_GR_OFFSET(16) > (dst->pos + dst->count) ?
-                        (dst->pos + dst->count) : ELF_GR_OFFSET(16);
-               for (i = dst->pos; i < min_copy; i += sizeof(elf_greg_t),
-                               index++)
-                       if (access_elf_reg(dst->target, info, i,
-                                               &tmp[index], 0) < 0) {
-                               dst->ret = -EIO;
-                               return;
-                       }
-               dst->ret = user_regset_copyout(&dst->pos, &dst->count,
-                               &dst->u.get.kbuf, &dst->u.get.ubuf, tmp,
-                               ELF_GR_OFFSET(1), ELF_GR_OFFSET(16));
-               if (dst->ret || dst->count == 0)
-                       return;
-       }
-
-       /* r16-r31 */
-       if (dst->count > 0 && dst->pos < ELF_NAT_OFFSET) {
-               pt = task_pt_regs(dst->target);
-               dst->ret = user_regset_copyout(&dst->pos, &dst->count,
-                               &dst->u.get.kbuf, &dst->u.get.ubuf, &pt->r16,
-                               ELF_GR_OFFSET(16), ELF_NAT_OFFSET);
-               if (dst->ret || dst->count == 0)
+               if (dst->ret)
                        return;
        }
 
-       /* nat, pr, b0 - b7 */
-       if (dst->count > 0 && dst->pos < ELF_CR_IIP_OFFSET) {
-               index = (dst->pos - ELF_NAT_OFFSET) / sizeof(elf_greg_t);
-               min_copy = ELF_CR_IIP_OFFSET > (dst->pos + dst->count) ?
-                        (dst->pos + dst->count) : ELF_CR_IIP_OFFSET;
-               for (i = dst->pos; i < min_copy; i += sizeof(elf_greg_t),
-                               index++)
-                       if (access_elf_reg(dst->target, info, i,
-                                               &tmp[index], 0) < 0) {
+       while (dst->count && dst->pos < ELF_AR_END_OFFSET) {
+               unsigned int n, from, to;
+               elf_greg_t tmp[16];
+
+               from = dst->pos;
+               to = from + min(dst->count, (unsigned)sizeof(tmp));
+               if (to > ELF_AR_END_OFFSET)
+                       to = ELF_AR_END_OFFSET;
+               for (n = 0; from < to; from += sizeof(elf_greg_t), n++) {
+                       if (access_elf_reg(dst->target, info, from,
+                                               &tmp[n], 0) < 0) {
                                dst->ret = -EIO;
                                return;
                        }
+               }
                dst->ret = user_regset_copyout(&dst->pos, &dst->count,
                                &dst->u.get.kbuf, &dst->u.get.ubuf, tmp,
-                               ELF_NAT_OFFSET, ELF_CR_IIP_OFFSET);
-               if (dst->ret || dst->count == 0)
+                               dst->pos, to);
+               if (dst->ret)
                        return;
        }
-
-       /* ip cfm psr ar.rsc ar.bsp ar.bspstore ar.rnat
-        * ar.ccv ar.unat ar.fpsr ar.pfs ar.lc ar.ec ar.csd ar.ssd
-        */
-       if (dst->count > 0 && dst->pos < (ELF_AR_END_OFFSET)) {
-               index = (dst->pos - ELF_CR_IIP_OFFSET) / sizeof(elf_greg_t);
-               min_copy = ELF_AR_END_OFFSET > (dst->pos + dst->count) ?
-                        (dst->pos + dst->count) : ELF_AR_END_OFFSET;
-               for (i = dst->pos; i < min_copy; i += sizeof(elf_greg_t),
-                               index++)
-                       if (access_elf_reg(dst->target, info, i,
-                                               &tmp[index], 0) < 0) {
-                               dst->ret = -EIO;
-                               return;
-                       }
-               dst->ret = user_regset_copyout(&dst->pos, &dst->count,
-                               &dst->u.get.kbuf, &dst->u.get.ubuf, tmp,
-                               ELF_CR_IIP_OFFSET, ELF_AR_END_OFFSET);
-       }
 }
 
 void do_gpregs_set(struct unw_frame_info *info, void *arg)
 {
-       struct pt_regs *pt;
        struct regset_getset *dst = arg;
-       elf_greg_t tmp[16];
-       unsigned int i, index;
 
        if (unw_unwind_to_user(info) < 0)
                return;
 
+       if (!dst->count)
+               return;
        /* Skip r0 */
-       if (dst->count > 0 && dst->pos < ELF_GR_OFFSET(1)) {
+       if (dst->pos < ELF_GR_OFFSET(1)) {
                dst->ret = user_regset_copyin_ignore(&dst->pos, &dst->count,
                                                       &dst->u.set.kbuf,
                                                       &dst->u.set.ubuf,
                                                       0, ELF_GR_OFFSET(1));
-               if (dst->ret || dst->count == 0)
-                       return;
-       }
-
-       /* gr1-gr15 */
-       if (dst->count > 0 && dst->pos < ELF_GR_OFFSET(16)) {
-               i = dst->pos;
-               index = (dst->pos - ELF_GR_OFFSET(1)) / sizeof(elf_greg_t);
-               dst->ret = user_regset_copyin(&dst->pos, &dst->count,
-                               &dst->u.set.kbuf, &dst->u.set.ubuf, tmp,
-                               ELF_GR_OFFSET(1), ELF_GR_OFFSET(16));
                if (dst->ret)
                        return;
-               for ( ; i < dst->pos; i += sizeof(elf_greg_t), index++)
-                       if (access_elf_reg(dst->target, info, i,
-                                               &tmp[index], 1) < 0) {
-                               dst->ret = -EIO;
-                               return;
-                       }
-               if (dst->count == 0)
-                       return;
        }
 
-       /* gr16-gr31 */
-       if (dst->count > 0 && dst->pos < ELF_NAT_OFFSET) {
-               pt = task_pt_regs(dst->target);
-               dst->ret = user_regset_copyin(&dst->pos, &dst->count,
-                               &dst->u.set.kbuf, &dst->u.set.ubuf, &pt->r16,
-                               ELF_GR_OFFSET(16), ELF_NAT_OFFSET);
-               if (dst->ret || dst->count == 0)
-                       return;
-       }
+       while (dst->count && dst->pos < ELF_AR_END_OFFSET) {
+               unsigned int n, from, to;
+               elf_greg_t tmp[16];
 
-       /* nat, pr, b0 - b7 */
-       if (dst->count > 0 && dst->pos < ELF_CR_IIP_OFFSET) {
-               i = dst->pos;
-               index = (dst->pos - ELF_NAT_OFFSET) / sizeof(elf_greg_t);
+               from = dst->pos;
+               to = from + sizeof(tmp);
+               if (to > ELF_AR_END_OFFSET)
+                       to = ELF_AR_END_OFFSET;
+               /* get up to 16 values */
                dst->ret = user_regset_copyin(&dst->pos, &dst->count,
                                &dst->u.set.kbuf, &dst->u.set.ubuf, tmp,
-                               ELF_NAT_OFFSET, ELF_CR_IIP_OFFSET);
+                               from, to);
                if (dst->ret)
                        return;
-               for (; i < dst->pos; i += sizeof(elf_greg_t), index++)
-                       if (access_elf_reg(dst->target, info, i,
-                                               &tmp[index], 1) < 0) {
-                               dst->ret = -EIO;
-                               return;
-                       }
-               if (dst->count == 0)
-                       return;
-       }
-
-       /* ip cfm psr ar.rsc ar.bsp ar.bspstore ar.rnat
-        * ar.ccv ar.unat ar.fpsr ar.pfs ar.lc ar.ec ar.csd ar.ssd
-        */
-       if (dst->count > 0 && dst->pos < (ELF_AR_END_OFFSET)) {
-               i = dst->pos;
-               index = (dst->pos - ELF_CR_IIP_OFFSET) / sizeof(elf_greg_t);
-               dst->ret = user_regset_copyin(&dst->pos, &dst->count,
-                               &dst->u.set.kbuf, &dst->u.set.ubuf, tmp,
-                               ELF_CR_IIP_OFFSET, ELF_AR_END_OFFSET);
-               if (dst->ret)
-                       return;
-               for ( ; i < dst->pos; i += sizeof(elf_greg_t), index++)
-                       if (access_elf_reg(dst->target, info, i,
-                                               &tmp[index], 1) < 0) {
+               /* now copy them into registers */
+               for (n = 0; from < dst->pos; from += sizeof(elf_greg_t), n++)
+                       if (access_elf_reg(dst->target, info, from,
+                                               &tmp[n], 1) < 0) {
                                dst->ret = -EIO;
                                return;
                        }
@@ -2038,15 +1936,14 @@ access_uarea(struct task_struct *child, unsigned long addr,
        }
 
        if (pos != -1) {
-               if (write_access)
-                       ret = gpregs_set(child, NULL, pos,
-                               sizeof(unsigned long), data, NULL);
-               else
-                       ret = gpregs_get(child, NULL, pos,
-                               sizeof(unsigned long), data, NULL);
-               if (ret != 0)
-                       return -1;
-               return 0;
+               struct unw_frame_info info;
+
+               memset(&info, 0, sizeof(info));
+               unw_init_from_blocked_task(&info, child);
+               if (unw_unwind_to_user(&info) < 0)
+                       return 0;
+
+               return access_elf_reg(child, &info, pos, data, write_access);
        }
 
        /* access debug registers */