Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 90954e7b authored by Dmitry Safonov's avatar Dmitry Safonov Committed by Thomas Gleixner
Browse files

x86/coredump: Use pr_reg size, rather that TIF_IA32 flag 



Killed PR_REG_SIZE and PR_REG_PTR macro as we can get regset size
from regset view.
I wish I could also kill PRSTATUS_SIZE nicely.

Suggested-by: default avatarOleg Nesterov <oleg@redhat.com>
Signed-off-by: default avatarDmitry Safonov <dsafonov@virtuozzo.com>
Cc: 0x7f454c46@gmail.com
Cc: linux-mm@kvack.org
Cc: luto@kernel.org
Cc: gorcunov@openvz.org
Cc: xemul@virtuozzo.com
Link: http://lkml.kernel.org/r/20160905133308.28234-5-dsafonov@virtuozzo.com


Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 2eefd878

arch/x86/include/asm/compat.h

+4 −4
Original line number Diff line number Diff line
@@ -275,10 +275,10 @@ struct compat_shmid64_ds { 
#ifdef CONFIG_X86_X32_ABI

typedef struct user_regs_struct compat_elf_gregset_t;



#define PR_REG_SIZE(S) (test_thread_flag(TIF_IA32) ? 68 : 216)

#define PRSTATUS_SIZE(S) (test_thread_flag(TIF_IA32) ? 144 : 296)

#define SET_PR_FPVALID(S,V) \

  do { *(int *) (((void *) &((S)->pr_reg)) + PR_REG_SIZE(0)) = (V); } \

/* Full regset -- prstatus on x32, otherwise on ia32 */

#define PRSTATUS_SIZE(S, R) (R != sizeof(S.pr_reg) ? 144 : 296)

#define SET_PR_FPVALID(S, V, R) \

  do { *(int *) (((void *) &((S)->pr_reg)) + R) = (V); } \

  while (0)



#define COMPAT_USE_64BIT_TIME \

fs/binfmt_elf.c

+8 −15
Original line number Diff line number Diff line
@@ -1624,20 +1624,12 @@ static void do_thread_regset_writeback(struct task_struct *task, 
		regset->writeback(task, regset, 1);

}



#ifndef PR_REG_SIZE

#define PR_REG_SIZE(S) sizeof(S)

#endif



#ifndef PRSTATUS_SIZE

#define PRSTATUS_SIZE(S) sizeof(S)

#endif



#ifndef PR_REG_PTR

#define PR_REG_PTR(S) (&((S)->pr_reg))

#define PRSTATUS_SIZE(S, R) sizeof(S)

#endif



#ifndef SET_PR_FPVALID

#define SET_PR_FPVALID(S, V) ((S)->pr_fpvalid = (V))

#define SET_PR_FPVALID(S, V, R) ((S)->pr_fpvalid = (V))

#endif



static int fill_thread_core_info(struct elf_thread_core_info *t,
@@ -1645,6 +1637,7 @@ static int fill_thread_core_info(struct elf_thread_core_info *t, 
				 long signr, size_t *total)

{

	unsigned int i;

	unsigned int regset_size = view->regsets[0].n * view->regsets[0].size;



	/*

	 * NT_PRSTATUS is the one special case, because the regset data
@@ -1653,12 +1646,11 @@ static int fill_thread_core_info(struct elf_thread_core_info *t, 
	 * We assume that regset 0 is NT_PRSTATUS.

	 */

	fill_prstatus(&t->prstatus, t->task, signr);

	(void) view->regsets[0].get(t->task, &view->regsets[0],

				    0, PR_REG_SIZE(t->prstatus.pr_reg),

				    PR_REG_PTR(&t->prstatus), NULL);

	(void) view->regsets[0].get(t->task, &view->regsets[0], 0, regset_size,

				    &t->prstatus.pr_reg, NULL);



	fill_note(&t->notes[0], "CORE", NT_PRSTATUS,

		  PRSTATUS_SIZE(t->prstatus), &t->prstatus);

		  PRSTATUS_SIZE(t->prstatus, regset_size), &t->prstatus);

	*total += notesize(&t->notes[0]);



	do_thread_regset_writeback(t->task, &view->regsets[0]);
@@ -1688,7 +1680,8 @@ static int fill_thread_core_info(struct elf_thread_core_info *t, 
						  regset->core_note_type,

						  size, data);

				else {

					SET_PR_FPVALID(&t->prstatus, 1);

					SET_PR_FPVALID(&t->prstatus,

							1, regset_size);

					fill_note(&t->notes[i], "CORE",

						  NT_PRFPREG, size, data);

				}