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

Commit 4f53ab14 authored by Andy Lutomirski's avatar Andy Lutomirski Committed by Paolo Bonzini
Browse files

x86/asm: Define the kernel TSS limit in a macro 



Rather than open-coding the kernel TSS limit in set_tss_desc(), make
it a real macro near the TSS layout definition.

This is purely a cleanup.

Cc: Thomas Garnier <thgarnie@google.com>
Cc: Jim Mattson <jmattson@google.com>
Signed-off-by: default avatarAndy Lutomirski <luto@kernel.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 06ce521a

arch/x86/include/asm/desc.h

+1 −9
Original line number Diff line number Diff line
@@ -177,16 +177,8 @@ static inline void __set_tss_desc(unsigned cpu, unsigned int entry, void *addr) 
	struct desc_struct *d = get_cpu_gdt_table(cpu);

	tss_desc tss;



	/*

	 * sizeof(unsigned long) coming from an extra "long" at the end

	 * of the iobitmap. See tss_struct definition in processor.h

	 *

	 * -1? seg base+limit should be pointing to the address of the

	 * last valid byte

	 */

	set_tssldt_descriptor(&tss, (unsigned long)addr, DESC_TSS,

			      IO_BITMAP_OFFSET + IO_BITMAP_BYTES +

			      sizeof(unsigned long) - 1);

			      __KERNEL_TSS_LIMIT);

	write_gdt_entry(d, entry, &tss, DESC_TSS);

}

arch/x86/include/asm/processor.h

+10 −0
Original line number Diff line number Diff line
@@ -341,6 +341,16 @@ struct tss_struct { 


DECLARE_PER_CPU_SHARED_ALIGNED(struct tss_struct, cpu_tss);



/*

 * sizeof(unsigned long) coming from an extra "long" at the end

 * of the iobitmap.

 *

 * -1? seg base+limit should be pointing to the address of the

 * last valid byte

 */

#define __KERNEL_TSS_LIMIT	\

	(IO_BITMAP_OFFSET + IO_BITMAP_BYTES + sizeof(unsigned long) - 1)



#ifdef CONFIG_X86_32

DECLARE_PER_CPU(unsigned long, cpu_current_top_of_stack);

#endif