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

Commit 3a54450b authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/fpu: Rename 'xsave_hdr' to 'header' 



Code like:

           fpu->state->xsave.xsave_hdr.xstate_bv |= XSTATE_FP;

is an eyesore, because not only is the words 'xsave' and 'state'
are repeated twice times (!), but also because of the 'hdr' and 'bv'
abbreviations that are pretty meaningless at a first glance.

Start cleaning this up by renaming 'xsave_hdr' to 'header'.

Reviewed-by: default avatarBorislav Petkov <bp@alien8.de>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Fenghua Yu <fenghua.yu@intel.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Oleg Nesterov <oleg@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 8dcea8db

arch/x86/include/asm/fpu/internal.h

+1 −1
Original line number Diff line number Diff line
@@ -261,7 +261,7 @@ static inline int fpu_save_init(struct fpu *fpu) 
		/*

		 * xsave header may indicate the init state of the FP.

		 */

		if (!(fpu->state->xsave.xsave_hdr.xstate_bv & XSTATE_FP))

		if (!(fpu->state->xsave.header.xstate_bv & XSTATE_FP))

			return 1;

	} else if (use_fxsr()) {

		fpu_fxsave(fpu);

arch/x86/include/asm/fpu/types.h

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ struct bndcsr { 
	u64				bndstatus;

} __packed;



struct xsave_hdr_struct {

struct xstate_header {

	u64				xstate_bv;

	u64				xcomp_bv;

	u64				reserved[6];
@@ -107,7 +107,7 @@ struct xsave_hdr_struct { 


struct xsave_struct {

	struct i387_fxsave_struct	i387;

	struct xsave_hdr_struct		xsave_hdr;

	struct xstate_header		header;

	struct ymmh_struct		ymmh;

	struct lwp_struct		lwp;

	struct bndreg			bndreg[4];

arch/x86/include/asm/fpu/xsave.h

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ static inline int xsave_user(struct xsave_struct __user *buf) 
	 * Clear the xsave header first, so that reserved fields are

	 * initialized to zero.

	 */

	err = __clear_user(&buf->xsave_hdr, sizeof(buf->xsave_hdr));

	err = __clear_user(&buf->header, sizeof(buf->header));

	if (unlikely(err))

		return -EFAULT;

arch/x86/include/asm/user.h

+5 −5
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ struct user_ymmh_regs { 
	__u32 ymmh_space[64];

};



struct user_xsave_hdr {

struct user_xstate_header {

	__u64 xstate_bv;

	__u64 reserved1[2];

	__u64 reserved2[5];
@@ -41,11 +41,11 @@ struct user_xsave_hdr { 
 * particular process/thread.

 *

 * Also when the user modifies certain state FP/SSE/etc through the

 * ptrace interface, they must ensure that the xsave_hdr.xstate_bv

 * ptrace interface, they must ensure that the header.xstate_bv

 * bytes[512..519] of the memory layout are updated correspondingly.

 * i.e., for example when FP state is modified to a non-init state,

 * xsave_hdr.xstate_bv's bit 0 must be set to '1', when SSE is modified to

 * non-init state, xsave_hdr.xstate_bv's bit 1 must to be set to '1', etc.

 * header.xstate_bv's bit 0 must be set to '1', when SSE is modified to

 * non-init state, header.xstate_bv's bit 1 must to be set to '1', etc.

 */

#define USER_XSTATE_FX_SW_WORDS 6

#define USER_XSTATE_XCR0_WORD	0
@@ -55,7 +55,7 @@ struct user_xstateregs { 
		__u64 fpx_space[58];

		__u64 xstate_fx_sw[USER_XSTATE_FX_SW_WORDS];

	} i387;

	struct user_xsave_hdr xsave_hdr;

	struct user_xstate_header header;

	struct user_ymmh_regs ymmh;

	/* further processor state extensions go here */

};

arch/x86/include/uapi/asm/sigcontext.h

+2 −2
Original line number Diff line number Diff line
@@ -209,7 +209,7 @@ struct sigcontext { 


#endif /* !__i386__ */



struct _xsave_hdr {

struct _header {

	__u64 xstate_bv;

	__u64 reserved1[2];

	__u64 reserved2[5];
@@ -228,7 +228,7 @@ struct _ymmh_state { 
 */

struct _xstate {

	struct _fpstate fpstate;

	struct _xsave_hdr xstate_hdr;

	struct _header xstate_hdr;

	struct _ymmh_state ymmh;

	/* new processor state extensions go here */

};