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

Commit 053de044 authored by Glauber de Oliveira Costa's avatar Glauber de Oliveira Costa Committed by Ingo Molnar
Browse files

x86: get rid of _MASK flags 



There's no need for the *_MASK flags (TF_MASK, IF_MASK, etc), found in
processor.h (both _32 and _64). They have a one-to-one mapping with the
EFLAGS value. This patch removes the definitions, and use the already
existent X86_EFLAGS_ version when applicable.

[ roland@redhat.com: KVM build fixes. ]

Signed-off-by: default avatarGlauber de Oliveira Costa <gcosta@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 73018a66

arch/x86/ia32/ia32_signal.c

+2 −2
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka, 
	regs->ss = __USER32_DS;



	set_fs(USER_DS);

	regs->flags &= ~TF_MASK;

	regs->flags &= ~X86_EFLAGS_TF;

	if (test_thread_flag(TIF_SINGLESTEP))

		ptrace_notify(SIGTRAP);
@@ -601,7 +601,7 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, 
	regs->ss = __USER32_DS;



	set_fs(USER_DS);

	regs->flags &= ~TF_MASK;

	regs->flags &= ~X86_EFLAGS_TF;

	if (test_thread_flag(TIF_SINGLESTEP))

		ptrace_notify(SIGTRAP);

arch/x86/kernel/kprobes.c

+9 −9
Original line number Diff line number Diff line
@@ -387,9 +387,9 @@ static void __kprobes set_current_kprobe(struct kprobe *p, struct pt_regs *regs, 
{

	__get_cpu_var(current_kprobe) = p;

	kcb->kprobe_saved_flags = kcb->kprobe_old_flags

		= (regs->flags & (TF_MASK | IF_MASK));

		= (regs->flags & (X86_EFLAGS_TF | X86_EFLAGS_IF));

	if (is_IF_modifier(p->ainsn.insn))

		kcb->kprobe_saved_flags &= ~IF_MASK;

		kcb->kprobe_saved_flags &= ~X86_EFLAGS_IF;

}



static __always_inline void clear_btf(void)
@@ -407,8 +407,8 @@ static __always_inline void restore_btf(void) 
static void __kprobes prepare_singlestep(struct kprobe *p, struct pt_regs *regs)

{

	clear_btf();

	regs->flags |= TF_MASK;

	regs->flags &= ~IF_MASK;

	regs->flags |= X86_EFLAGS_TF;

	regs->flags &= ~X86_EFLAGS_IF;

	/*single step inline if the instruction is an int3*/

	if (p->opcode == BREAKPOINT_INSTRUCTION)

		regs->ip = (unsigned long)p->addr;
@@ -454,7 +454,7 @@ static int __kprobes kprobe_handler(struct pt_regs *regs) 
		if (p) {

			if (kcb->kprobe_status == KPROBE_HIT_SS &&

				*p->ainsn.insn == BREAKPOINT_INSTRUCTION) {

				regs->flags &= ~TF_MASK;

				regs->flags &= ~X86_EFLAGS_TF;

				regs->flags |= kcb->kprobe_saved_flags;

				goto no_kprobe;

#ifdef CONFIG_X86_64
@@ -749,10 +749,10 @@ static void __kprobes resume_execution(struct kprobe *p, 
		insn++;

#endif



	regs->flags &= ~TF_MASK;

	regs->flags &= ~X86_EFLAGS_TF;

	switch (*insn) {

	case 0x9c:	/* pushfl */

		*tos &= ~(TF_MASK | IF_MASK);

		*tos &= ~(X86_EFLAGS_TF | X86_EFLAGS_IF);

		*tos |= kcb->kprobe_old_flags;

		break;

	case 0xc2:	/* iret/ret/lret */
@@ -852,7 +852,7 @@ static int __kprobes post_kprobe_handler(struct pt_regs *regs) 
	 * will have TF set, in which case, continue the remaining processing

	 * of do_debug, as if this is not a probe hit.

	 */

	if (regs->flags & TF_MASK)

	if (regs->flags & X86_EFLAGS_TF)

		return 0;



	return 1;
@@ -982,7 +982,7 @@ int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs) 
	 */

	memcpy(kcb->jprobes_stack, (kprobe_opcode_t *)addr,

	       MIN_STACK_SIZE(addr));

	regs->flags &= ~IF_MASK;

	regs->flags &= ~X86_EFLAGS_IF;

	trace_hardirqs_off();

	regs->ip = (unsigned long)(jp->entry);

	return 1;

arch/x86/kernel/signal_64.c

+2 −2
Original line number Diff line number Diff line
@@ -295,7 +295,7 @@ static int setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, 
	   see include/asm-x86_64/uaccess.h for details. */

	set_fs(USER_DS);



	regs->flags &= ~TF_MASK;

	regs->flags &= ~X86_EFLAGS_TF;

	if (test_thread_flag(TIF_SINGLESTEP))

		ptrace_notify(SIGTRAP);

#ifdef DEBUG_SIG
@@ -463,7 +463,7 @@ do_notify_resume(struct pt_regs *regs, void *unused, __u32 thread_info_flags) 
	       

	/* Pending single-step? */

	if (thread_info_flags & _TIF_SINGLESTEP) {

		regs->flags |= TF_MASK;

		regs->flags |= X86_EFLAGS_TF;

		clear_thread_flag(TIF_SINGLESTEP);

	}

arch/x86/kernel/traps_64.c

+1 −1
Original line number Diff line number Diff line
@@ -904,7 +904,7 @@ asmlinkage void __kprobes do_debug(struct pt_regs * regs, 


clear_TF_reenable:

	set_tsk_thread_flag(tsk, TIF_SINGLESTEP);

	regs->flags &= ~TF_MASK;

	regs->flags &= ~X86_EFLAGS_TF;

	preempt_conditional_cli(regs);

}

drivers/kvm/vmx.c

+4 −4
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ static unsigned long vmx_get_rflags(struct kvm_vcpu *vcpu) 
static void vmx_set_rflags(struct kvm_vcpu *vcpu, unsigned long rflags)

{

	if (vcpu->rmode.active)

		rflags |= IOPL_MASK | X86_EFLAGS_VM;

		rflags |= X86_EFLAGS_IOPL | X86_EFLAGS_VM;

	vmcs_writel(GUEST_RFLAGS, rflags);

}
@@ -1050,7 +1050,7 @@ static void enter_pmode(struct kvm_vcpu *vcpu) 
	vmcs_write32(GUEST_TR_AR_BYTES, vcpu->rmode.tr.ar);



	flags = vmcs_readl(GUEST_RFLAGS);

	flags &= ~(IOPL_MASK | X86_EFLAGS_VM);

	flags &= ~(X86_EFLAGS_IOPL | X86_EFLAGS_VM);

	flags |= (vcpu->rmode.save_iopl << IOPL_SHIFT);

	vmcs_writel(GUEST_RFLAGS, flags);
@@ -1107,9 +1107,9 @@ static void enter_rmode(struct kvm_vcpu *vcpu) 
	vmcs_write32(GUEST_TR_AR_BYTES, 0x008b);



	flags = vmcs_readl(GUEST_RFLAGS);

	vcpu->rmode.save_iopl = (flags & IOPL_MASK) >> IOPL_SHIFT;

	vcpu->rmode.save_iopl = (flags & X86_EFLAGS_IOPL) >> IOPL_SHIFT;



	flags |= IOPL_MASK | X86_EFLAGS_VM;

	flags |= X86_EFLAGS_IOPL | X86_EFLAGS_VM;



	vmcs_writel(GUEST_RFLAGS, flags);

	vmcs_writel(GUEST_CR4, vmcs_readl(GUEST_CR4) | X86_CR4_VME);