x86/cleanups for v5.2
Subsystems (6)
Linus,
Please pull the latest x86-cleanups-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-cleanups-for-linus
# HEAD: 15854edd193ae5d9daf8f50ce5f9f1724cebe344 x86/pci: Clean up usage of X86_DEV_DMA_OPS
A handful of cleanups: dma-ops cleanups, missing boot time kcalloc() check, a Sparse fix and use struct_size() to simplify a vzalloc() call.
out-of-topic modifications in x86-cleanups-for-linus:
-------------------------------------------------------
drivers/misc/mic/Kconfig # 15854edd193a: x86/pci: Clean up usage of X drivers/pci/controller/Kconfig # 15854edd193a: x86/pci: Clean up usage of X drivers/pci/controller/vmd.c # 15854edd193a: x86/pci: Clean up usage of X
Thanks,
Ingo
------------------>
Christoph Hellwig (2):
x86/Kconfig: Remove the unused X86_DMA_REMAP KConfig symbol x86/pci: Clean up usage of X86_DEV_DMA_OPS
Gustavo A. R. Silva (1):
x86/kexec/crash: Use struct_size() in vzalloc()
Jann Horn (1):
x86/mm/tlb: Define LOADED_MM_SWITCHING with pointer-sized number
Kangjie Lu (1):
x86/platform/uv: Fix missing checks of kcalloc() return values
arch/x86/Kconfig | 8 -------- arch/x86/include/asm/tlbflush.h | 2 +- arch/x86/kernel/crash.c | 3 +-- arch/x86/platform/uv/tlb_uv.c | 7 ++++++- drivers/misc/mic/Kconfig | 4 ++-- drivers/pci/controller/Kconfig | 1 + drivers/pci/controller/vmd.c | 7 ------- 7 files changed, 11 insertions(+), 21 deletions(-)
arch/x86/Kconfig +0 -8
@@ -28,7 +28,6 @@ config X86_64 select MODULES_USE_ELF_RELA select NEED_DMA_MAP_STATE select SWIOTLB - select X86_DEV_DMA_OPS select ARCH_HAS_SYSCALL_WRAPPER #
@@ -703,8 +702,6 @@ config STA2X11 bool "STA2X11 Companion Chip Support" depends on X86_32_NON_STANDARD && PCI select ARCH_HAS_PHYS_TO_DMA - select X86_DEV_DMA_OPS - select X86_DMA_REMAP select SWIOTLB select MFD_STA2X11 select GPIOLIB
@@ -2884,11 +2881,6 @@ config HAVE_ATOMIC_IOMAP config X86_DEV_DMA_OPS bool - depends on X86_64 || STA2X11 - -config X86_DMA_REMAP - bool - depends on STA2X11 config HAVE_GENERIC_GUP def_bool y
arch/x86/include/asm/tlbflush.h +1 -1
@@ -167,7 +167,7 @@ struct tlb_state {*/ struct mm_struct *loaded_mm; -#define LOADED_MM_SWITCHING ((struct mm_struct *)1) +#define LOADED_MM_SWITCHING ((struct mm_struct *)1UL)/* Last user mm for optimizing IBPB */ union {
arch/x86/kernel/crash.c +1 -2
@@ -204,8 +204,7 @@ static struct crash_mem *fill_up_crash_elf_data(void)* another range split. So add extra two slots here. */ nr_ranges +=2 ; - cmem =vzalloc (sizeof (struct crash_mem ) + -sizeof (struct crash_mem_range ) * nr_ranges); + cmem =vzalloc (struct_size (cmem, ranges, nr_ranges));if (!cmem)return NULL ;
arch/x86/platform/uv/tlb_uv.c +6 -1
@@ -2133,14 +2133,19 @@ static int __init summarize_uvhub_sockets(int nuvhubs,*/ static int __init init_per_cpu (int nuvhubs,int base_part_pnode) { -unsigned char *uvhub_mask;struct uvhub_desc *uvhub_descs; +unsigned char *uvhub_mask =NULL ;if (is_uv3_hub () ||is_uv2_hub () ||is_uv1_hub ()) timeout_us =calculate_destination_timeout (); uvhub_descs =kcalloc (nuvhubs,sizeof (struct uvhub_desc ),GFP_KERNEL ); +if (!uvhub_descs) + goto fail; + uvhub_mask =kzalloc ((nuvhubs+7 )/8 ,GFP_KERNEL ); +if (!uvhub_mask) + goto fail;if (get_cpu_topology (base_part_pnode, uvhub_descs, uvhub_mask)) goto fail;
drivers/misc/mic/Kconfig +2 -2
@@ -4,7 +4,7 @@ comment "Intel MIC Bus Driver" config INTEL_MIC_BUS tristate "Intel MIC Bus Driver" - depends on 64BIT && PCI && X86 && X86_DEV_DMA_OPS + depends on 64BIT && PCI && X86 help This option is selected by any driver which registers a device or driver on the MIC Bus, such as CONFIG_INTEL_MIC_HOST,
@@ -21,7 +21,7 @@ comment "SCIF Bus Driver" config SCIF_BUS tristate "SCIF Bus Driver" - depends on 64BIT && PCI && X86 && X86_DEV_DMA_OPS + depends on 64BIT && PCI && X86 help This option is selected by any driver which registers a device or driver on the SCIF Bus, such as CONFIG_INTEL_MIC_HOST
drivers/pci/controller/Kconfig +1 -0
@@ -267,6 +267,7 @@ config PCIE_TANGO_SMP8759 config VMD depends on PCI_MSI && X86_64 && SRCU + select X86_DEV_DMA_OPS tristate "Intel Volume Management Device Driver" ---help--- Adds support for the Intel Volume Management Device (VMD). VMD is a
drivers/pci/controller/vmd.c +0 -7
@@ -95,10 +95,8 @@ struct vmd_dev {struct irq_domain *irq_domain;struct pci_bus *bus; -#ifdef CONFIG_X86_DEV_DMA_OPS struct dma_map_ops dma_ops;struct dma_domain dma_domain; -#endif };static inline struct vmd_dev *vmd_from_bus (struct pci_bus *bus)
@@ -293,7 +291,6 @@ static struct msi_domain_info vmd_msi_domain_info = { .chip = &vmd_msi_controller, }; -#ifdef CONFIG_X86_DEV_DMA_OPS /* * VMD replaces the requester ID with its own. DMA mappings for devices in a * VMD domain need to be mapped for the VMD, not the device requiring
@@ -438,10 +435,6 @@ static void vmd_setup_dma_ops(struct vmd_dev *vmd)add_dma_domain (domain); }#undef ASSIGN_VMD_DMA_OPS -#else -static void vmd_teardown_dma_ops (struct vmd_dev *vmd) {} -static void vmd_setup_dma_ops (struct vmd_dev *vmd) {} -#endif static char __iomem *vmd_cfg_addr (struct vmd_dev *vmd,struct pci_bus *bus,unsigned int devfn,int reg,int len)
The pull request you sent on Mon, 6 May 2019 12:13:51 +0200:
The pull request you sent on Mon, 6 May 2019 12:13:51 +0200:
Quoted 1 line
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.gitx86-cleanups-for-linus
has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/46e80e6c3d456aed2f4c261425ff737bf82ce7bf
Thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/prtracker