Commit 160729af authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_misc_for_v5.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull misc x86 changes from Borislav Petkov:

 - Use the proper interface for the job: get_unaligned() instead of
   memcpy() in the insn decoder

 - A randconfig build fix

* tag 'x86_misc_for_v5.16_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/insn: Use get_unaligned() instead of memcpy()
  x86/Kconfig: Fix an unused variable error in dell-smm-hwmon
parents e0f4c59d f96b4675

arch/x86/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -1266,7 +1266,8 @@ config TOSHIBA 


config I8K

	tristate "Dell i8k legacy laptop support"

	select HWMON

	depends on HWMON

	depends on PROC_FS

	select SENSORS_DELL_SMM

	help

	  This option enables legacy /proc/i8k userspace interface in hwmon

arch/x86/lib/insn.c

+3 −2
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#endif

#include <asm/inat.h> /*__ignore_sync_check__ */

#include <asm/insn.h> /* __ignore_sync_check__ */

#include <asm/unaligned.h> /* __ignore_sync_check__ */



#include <linux/errno.h>

#include <linux/kconfig.h>
@@ -37,10 +38,10 @@ 
	((insn)->next_byte + sizeof(t) + n <= (insn)->end_kaddr)



#define __get_next(t, insn)	\

	({ t r; memcpy(&r, insn->next_byte, sizeof(t)); insn->next_byte += sizeof(t); leXX_to_cpu(t, r); })

	({ t r = get_unaligned((t *)(insn)->next_byte); (insn)->next_byte += sizeof(t); leXX_to_cpu(t, r); })



#define __peek_nbyte_next(t, insn, n)	\

	({ t r; memcpy(&r, (insn)->next_byte + n, sizeof(t)); leXX_to_cpu(t, r); })

	({ t r = get_unaligned((t *)(insn)->next_byte + n); leXX_to_cpu(t, r); })



#define get_next(t, insn)	\

	({ if (unlikely(!validate_next(t, insn, 0))) goto err_out; __get_next(t, insn); })

tools/arch/x86/lib/insn.c

+3 −2
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#endif

#include "../include/asm/inat.h" /* __ignore_sync_check__ */

#include "../include/asm/insn.h" /* __ignore_sync_check__ */

#include "../include/asm-generic/unaligned.h" /* __ignore_sync_check__ */



#include <linux/errno.h>

#include <linux/kconfig.h>
@@ -37,10 +38,10 @@ 
	((insn)->next_byte + sizeof(t) + n <= (insn)->end_kaddr)



#define __get_next(t, insn)	\

	({ t r; memcpy(&r, insn->next_byte, sizeof(t)); insn->next_byte += sizeof(t); leXX_to_cpu(t, r); })

	({ t r = get_unaligned((t *)(insn)->next_byte); (insn)->next_byte += sizeof(t); leXX_to_cpu(t, r); })



#define __peek_nbyte_next(t, insn, n)	\

	({ t r; memcpy(&r, (insn)->next_byte + n, sizeof(t)); leXX_to_cpu(t, r); })

	({ t r = get_unaligned((t *)(insn)->next_byte + n); leXX_to_cpu(t, r); })



#define get_next(t, insn)	\

	({ if (unlikely(!validate_next(t, insn, 0))) goto err_out; __get_next(t, insn); })

tools/include/asm-generic/unaligned.h

0 → 100644
+23 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-or-later */

/*

 * Copied from the kernel sources to tools/perf/:

 */



#ifndef __TOOLS_LINUX_ASM_GENERIC_UNALIGNED_H

#define __TOOLS_LINUX_ASM_GENERIC_UNALIGNED_H



#define __get_unaligned_t(type, ptr) ({						\

	const struct { type x; } __packed *__pptr = (typeof(__pptr))(ptr);	\

	__pptr->x;								\

})



#define __put_unaligned_t(type, val, ptr) do {					\

	struct { type x; } __packed *__pptr = (typeof(__pptr))(ptr);		\

	__pptr->x = (val);							\

} while (0)



#define get_unaligned(ptr)	__get_unaligned_t(typeof(*(ptr)), (ptr))

#define put_unaligned(val, ptr) __put_unaligned_t(typeof(*(ptr)), (val), (ptr))



#endif /* __TOOLS_LINUX_ASM_GENERIC_UNALIGNED_H */

tools/perf/util/intel-pt-decoder/Build

+2 −0
Original line number Diff line number Diff line
@@ -18,3 +18,5 @@ CFLAGS_intel-pt-insn-decoder.o += -I$(OUTPUT)util/intel-pt-decoder 
ifeq ($(CC_NO_CLANG), 1)

  CFLAGS_intel-pt-insn-decoder.o += -Wno-override-init

endif



CFLAGS_intel-pt-insn-decoder.o += -Wno-packed