1. 17 3月, 2016 7 次提交
    • L
      Merge tag 'pci-v4.6-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 63e30271
      Linus Torvalds 提交于
      Pull PCI updates from Bjorn Helgaas:
       "PCI changes for v4.6:
      
        Enumeration:
         - Disable IO/MEM decoding for devices with non-compliant BARs (Bjorn Helgaas)
         - Mark Broadwell-EP Home Agent & PCU as having non-compliant BARs (Bjorn Helgaas
      
        Resource management:
         - Mark shadow copy of VGA ROM as IORESOURCE_PCI_FIXED (Bjorn Helgaas)
         - Don't assign or reassign immutable resources (Bjorn Helgaas)
         - Don't enable/disable ROM BAR if we're using a RAM shadow copy (Bjorn Helgaas)
         - Set ROM shadow location in arch code, not in PCI core (Bjorn Helgaas)
         - Remove arch-specific IORESOURCE_ROM_SHADOW size from sysfs (Bjorn Helgaas)
         - ia64: Use ioremap() instead of open-coded equivalent (Bjorn Helgaas)
         - ia64: Keep CPU physical (not virtual) addresses in shadow ROM resource (Bjorn Helgaas)
         - MIPS: Keep CPU physical (not virtual) addresses in shadow ROM resource (Bjorn Helgaas)
         - Remove unused IORESOURCE_ROM_COPY and IORESOURCE_ROM_BIOS_COPY (Bjorn Helgaas)
         - Don't leak memory if sysfs_create_bin_file() fails (Bjorn Helgaas)
         - rcar: Remove PCI_PROBE_ONLY handling (Lorenzo Pieralisi)
         - designware: Remove PCI_PROBE_ONLY handling (Lorenzo Pieralisi)
      
        Virtualization:
         - Wait for up to 1000ms after FLR reset (Alex Williamson)
         - Support SR-IOV on any function type (Kelly Zytaruk)
         - Add ACS quirk for all Cavium devices (Manish Jaggi)
      
        AER:
         - Rename pci_ops_aer to aer_inj_pci_ops (Bjorn Helgaas)
         - Restore pci_ops pointer while calling original pci_ops (David Daney)
         - Fix aer_inject error codes (Jean Delvare)
         - Use dev_warn() in aer_inject (Jean Delvare)
         - Log actual error causes in aer_inject (Jean Delvare)
         - Log aer_inject error injections (Jean Delvare)
      
        VPD:
         - Prevent VPD access for buggy devices (Babu Moger)
         - Move pci_read_vpd() and pci_write_vpd() close to other VPD code (Bjorn Helgaas)
         - Move pci_vpd_release() from header file to pci/access.c (Bjorn Helgaas)
         - Remove struct pci_vpd_ops.release function pointer (Bjorn Helgaas)
         - Rename VPD symbols to remove unnecessary "pci22" (Bjorn Helgaas)
         - Fold struct pci_vpd_pci22 into struct pci_vpd (Bjorn Helgaas)
         - Sleep rather than busy-wait for VPD access completion (Bjorn Helgaas)
         - Update VPD definitions (Hannes Reinecke)
         - Allow access to VPD attributes with size 0 (Hannes Reinecke)
         - Determine actual VPD size on first access (Hannes Reinecke)
      
        Generic host bridge driver:
         - Move structure definitions to separate header file (David Daney)
         - Add pci_host_common_probe(), based on gen_pci_probe() (David Daney)
         - Expose pci_host_common_probe() for use by other drivers (David Daney)
      
        Altera host bridge driver:
         - Fix altera_pcie_link_is_up() (Ley Foon Tan)
      
        Cavium ThunderX host bridge driver:
         - Add PCIe host driver for ThunderX processors (David Daney)
         - Add driver for ThunderX-pass{1,2} on-chip devices (David Daney)
      
        Freescale i.MX6 host bridge driver:
         - Add DT bindings to configure PHY Tx driver settings (Justin Waters)
         - Move imx6_pcie_reset_phy() near other PHY handling functions (Lucas Stach)
         - Move PHY reset into imx6_pcie_establish_link() (Lucas Stach)
         - Remove broken Gen2 workaround (Lucas Stach)
         - Move link up check into imx6_pcie_wait_for_link() (Lucas Stach)
      
        Freescale Layerscape host bridge driver:
         - Add "fsl,ls2085a-pcie" compatible ID (Yang Shi)
      
        Intel VMD host bridge driver:
         - Attach VMD resources to parent domain's resource tree (Jon Derrick)
         - Set bus resource start to 0 (Keith Busch)
      
        Microsoft Hyper-V host bridge driver:
         - Add fwnode_handle to x86 pci_sysdata (Jake Oshins)
         - Look up IRQ domain by fwnode_handle (Jake Oshins)
         - Add paravirtual PCI front-end for Microsoft Hyper-V VMs (Jake Oshins)
      
        NVIDIA Tegra host bridge driver:
         - Add pci_ops.{add,remove}_bus() callbacks (Thierry Reding)
         - Implement ->{add,remove}_bus() callbacks (Thierry Reding)
         - Remove unused struct tegra_pcie.num_ports field (Thierry Reding)
         - Track bus -> CPU mapping (Thierry Reding)
         - Remove misleading PHYS_OFFSET (Thierry Reding)
      
        Renesas R-Car host bridge driver:
         - Depend on ARCH_RENESAS, not ARCH_SHMOBILE (Simon Horman)
      
        Synopsys DesignWare host bridge driver:
         - ARC: Add PCI support (Joao Pinto)
         - Add generic dw_pcie_wait_for_link() (Joao Pinto)
         - Add default link up check if sub-driver doesn't override (Joao Pinto)
         - Add driver for prototyping kits based on ARC SDP (Joao Pinto)
      
        TI Keystone host bridge driver:
         - Defer probing if devm_phy_get() returns -EPROBE_DEFER (Shawn Lin)
      
        Xilinx AXI host bridge driver:
         - Use of_pci_get_host_bridge_resources() to parse DT (Bharat Kumar Gogada)
         - Remove dependency on ARM-specific struct hw_pci (Bharat Kumar Gogada)
         - Don't call pci_fixup_irqs() on Microblaze (Bharat Kumar Gogada)
         - Update Zynq binding with Microblaze node (Bharat Kumar Gogada)
         - microblaze: Support generic Xilinx AXI PCIe Host Bridge IP driver (Bharat Kumar Gogada)
      
        Xilinx NWL host bridge driver:
         - Add support for Xilinx NWL PCIe Host Controller (Bharat Kumar Gogada)
      
        Miscellaneous:
         - Check device_attach() return value always (Bjorn Helgaas)
         - Move pci_set_flags() from asm-generic/pci-bridge.h to linux/pci.h (Bjorn Helgaas)
         - Remove includes of empty asm-generic/pci-bridge.h (Bjorn Helgaas)
         - ARM64: Remove generated include of asm-generic/pci-bridge.h (Bjorn Helgaas)
         - Remove empty asm-generic/pci-bridge.h (Bjorn Helgaas)
         - Remove includes of asm/pci-bridge.h (Bjorn Helgaas)
         - Consolidate PCI DMA constants and interfaces in linux/pci-dma-compat.h (Bjorn Helgaas)
         - unicore32: Remove unused HAVE_ARCH_PCI_SET_DMA_MASK definition (Bjorn Helgaas)
         - Cleanup pci/pcie/Kconfig whitespace (Andreas Ziegler)
         - Include pci/hotplug Kconfig directly from pci/Kconfig (Bjorn Helgaas)
         - Include pci/pcie/Kconfig directly from pci/Kconfig (Bogicevic Sasa)
         - frv: Remove stray pci_{alloc,free}_consistent() declaration (Christoph Hellwig)
         - Move pci_dma_* helpers to common code (Christoph Hellwig)
         - Add PCI_CLASS_SERIAL_USB_DEVICE definition (Heikki Krogerus)
         - Add QEMU top-level IDs for (sub)vendor & device (Robin H. Johnson)
         - Fix broken URL for Dell biosdevname (Naga Venkata Sai Indubhaskar Jupudi)"
      
      * tag 'pci-v4.6-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (94 commits)
        PCI: Add PCI_CLASS_SERIAL_USB_DEVICE definition
        PCI: designware: Add driver for prototyping kits based on ARC SDP
        PCI: designware: Add default link up check if sub-driver doesn't override
        PCI: designware: Add generic dw_pcie_wait_for_link()
        PCI: Cleanup pci/pcie/Kconfig whitespace
        PCI: Simplify pci_create_attr() control flow
        PCI: Don't leak memory if sysfs_create_bin_file() fails
        PCI: Simplify sysfs ROM cleanup
        PCI: Remove unused IORESOURCE_ROM_COPY and IORESOURCE_ROM_BIOS_COPY
        MIPS: Loongson 3: Keep CPU physical (not virtual) addresses in shadow ROM resource
        MIPS: Loongson 3: Use temporary struct resource * to avoid repetition
        ia64/PCI: Keep CPU physical (not virtual) addresses in shadow ROM resource
        ia64/PCI: Use ioremap() instead of open-coded equivalent
        ia64/PCI: Use temporary struct resource * to avoid repetition
        PCI: Clean up pci_map_rom() whitespace
        PCI: Remove arch-specific IORESOURCE_ROM_SHADOW size from sysfs
        PCI: thunder: Add driver for ThunderX-pass{1,2} on-chip devices
        PCI: thunder: Add PCIe host driver for ThunderX processors
        PCI: generic: Expose pci_host_common_probe() for use by other drivers
        PCI: generic: Add pci_host_common_probe(), based on gen_pci_probe()
        ...
      63e30271
    • L
      Merge tag 'pm+acpi-4.6-rc1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 277edbab
      Linus Torvalds 提交于
      Pull power management and ACPI updates from Rafael Wysocki:
       "This time the majority of changes go into cpufreq and they are
        significant.
      
        First off, the way CPU frequency updates are triggered is different
        now.  Instead of having to set up and manage a deferrable timer for
        each CPU in the system to evaluate and possibly change its frequency
        periodically, cpufreq governors set up callbacks to be invoked by the
        scheduler on a regular basis (basically on utilization updates).  The
        "old" governors, "ondemand" and "conservative", still do all of their
        work in process context (although that is triggered by the scheduler
        now), but intel_pstate does it all in the callback invoked by the
        scheduler with no need for any additional asynchronous processing.
      
        Of course, this eliminates the overhead related to the management of
        all those timers, but also it allows the cpufreq governor code to be
        simplified quite a bit.  On top of that, the common code and data
        structures used by the "ondemand" and "conservative" governors are
        cleaned up and made more straightforward and some long-standing and
        quite annoying problems are addressed.  In particular, the handling of
        governor sysfs attributes is modified and the related locking becomes
        more fine grained which allows some concurrency problems to be avoided
        (particularly deadlocks with the core cpufreq code).
      
        In principle, the new mechanism for triggering frequency updates
        allows utilization information to be passed from the scheduler to
        cpufreq.  Although the current code doesn't make use of it, in the
        works is a new cpufreq governor that will make decisions based on the
        scheduler's utilization data.  That should allow the scheduler and
        cpufreq to work more closely together in the long run.
      
        In addition to the core and governor changes, cpufreq drivers are
        updated too.  Fixes and optimizations go into intel_pstate, the
        cpufreq-dt driver is updated on top of some modification in the
        Operating Performance Points (OPP) framework and there are fixes and
        other updates in the powernv cpufreq driver.
      
        Apart from the cpufreq updates there is some new ACPICA material,
        including a fix for a problem introduced by previous ACPICA updates,
        and some less significant changes in the ACPI code, like CPPC code
        optimizations, ACPI processor driver cleanups and support for loading
        ACPI tables from initrd.
      
        Also updated are the generic power domains framework, the Intel RAPL
        power capping driver and the turbostat utility and we have a bunch of
        traditional assorted fixes and cleanups.
      
        Specifics:
      
         - Redesign of cpufreq governors and the intel_pstate driver to make
           them use callbacks invoked by the scheduler to trigger CPU
           frequency evaluation instead of using per-CPU deferrable timers for
           that purpose (Rafael Wysocki).
      
         - Reorganization and cleanup of cpufreq governor code to make it more
           straightforward and fix some concurrency problems in it (Rafael
           Wysocki, Viresh Kumar).
      
         - Cleanup and improvements of locking in the cpufreq core (Viresh
           Kumar).
      
         - Assorted cleanups in the cpufreq core (Rafael Wysocki, Viresh
           Kumar, Eric Biggers).
      
         - intel_pstate driver updates including fixes, optimizations and a
           modification to make it enable enable hardware-coordinated P-state
           selection (HWP) by default if supported by the processor (Philippe
           Longepe, Srinivas Pandruvada, Rafael Wysocki, Viresh Kumar, Felipe
           Franciosi).
      
         - Operating Performance Points (OPP) framework updates to improve its
           handling of voltage regulators and device clocks and updates of the
           cpufreq-dt driver on top of that (Viresh Kumar, Jon Hunter).
      
         - Updates of the powernv cpufreq driver to fix initialization and
           cleanup problems in it and correct its worker thread handling with
           respect to CPU offline, new powernv_throttle tracepoint (Shilpasri
           Bhat).
      
         - ACPI cpufreq driver optimization and cleanup (Rafael Wysocki).
      
         - ACPICA updates including one fix for a regression introduced by
           previos changes in the ACPICA code (Bob Moore, Lv Zheng, David Box,
           Colin Ian King).
      
         - Support for installing ACPI tables from initrd (Lv Zheng).
      
         - Optimizations of the ACPI CPPC code (Prashanth Prakash, Ashwin
           Chaugule).
      
         - Support for _HID(ACPI0010) devices (ACPI processor containers) and
           ACPI processor driver cleanups (Sudeep Holla).
      
         - Support for ACPI-based enumeration of the AMBA bus (Graeme Gregory,
           Aleksey Makarov).
      
         - Modification of the ACPI PCI IRQ management code to make it treat
           255 in the Interrupt Line register as "not connected" on x86 (as
           per the specification) and avoid attempts to use that value as a
           valid interrupt vector (Chen Fan).
      
         - ACPI APEI fixes related to resource leaks (Josh Hunt).
      
         - Removal of modularity from a few ACPI drivers (BGRT, GHES,
           intel_pmic_crc) that cannot be built as modules in practice (Paul
           Gortmaker).
      
         - PNP framework update to make it treat ACPI_RESOURCE_TYPE_SERIAL_BUS
           as a valid resource type (Harb Abdulhamid).
      
         - New device ID (future AMD I2C controller) in the ACPI driver for
           AMD SoCs (APD) and in the designware I2C driver (Xiangliang Yu).
      
         - Assorted ACPI cleanups (Colin Ian King, Kaiyen Chang, Oleg Drokin).
      
         - cpuidle menu governor optimization to avoid a square root
           computation in it (Rasmus Villemoes).
      
         - Fix for potential use-after-free in the generic device properties
           framework (Heikki Krogerus).
      
         - Updates of the generic power domains (genpd) framework including
           support for multiple power states of a domain, fixes and debugfs
           output improvements (Axel Haslam, Jon Hunter, Laurent Pinchart,
           Geert Uytterhoeven).
      
         - Intel RAPL power capping driver updates to reduce IPI overhead in
           it (Jacob Pan).
      
         - System suspend/hibernation code cleanups (Eric Biggers, Saurabh
           Sengar).
      
         - Year 2038 fix for the process freezer (Abhilash Jindal).
      
         - turbostat utility updates including new features (decoding of more
           registers and CPUID fields, sub-second intervals support, GFX MHz
           and RC6 printout, --out command line option), fixes (syscall jitter
           detection and workaround, reductioin of the number of syscalls
           made, fixes related to Xeon x200 processors, compiler warning
           fixes) and cleanups (Len Brown, Hubert Chrzaniuk, Chen Yu)"
      
      * tag 'pm+acpi-4.6-rc1-1' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: (182 commits)
        tools/power turbostat: bugfix: TDP MSRs print bits fixing
        tools/power turbostat: correct output for MSR_NHM_SNB_PKG_CST_CFG_CTL dump
        tools/power turbostat: call __cpuid() instead of __get_cpuid()
        tools/power turbostat: indicate SMX and SGX support
        tools/power turbostat: detect and work around syscall jitter
        tools/power turbostat: show GFX%rc6
        tools/power turbostat: show GFXMHz
        tools/power turbostat: show IRQs per CPU
        tools/power turbostat: make fewer systems calls
        tools/power turbostat: fix compiler warnings
        tools/power turbostat: add --out option for saving output in a file
        tools/power turbostat: re-name "%Busy" field to "Busy%"
        tools/power turbostat: Intel Xeon x200: fix turbo-ratio decoding
        tools/power turbostat: Intel Xeon x200: fix erroneous bclk value
        tools/power turbostat: allow sub-sec intervals
        ACPI / APEI: ERST: Fixed leaked resources in erst_init
        ACPI / APEI: Fix leaked resources
        intel_pstate: Do not skip samples partially
        intel_pstate: Remove freq calculation from intel_pstate_calc_busy()
        intel_pstate: Move intel_pstate_calc_busy() into get_target_pstate_use_performance()
        ...
      277edbab
    • L
      Merge branch 'akpm' (patches from Andrew) · 271ecc52
      Linus Torvalds 提交于
      Merge first patch-bomb from Andrew Morton:
      
       - some misc things
      
       - ofs2 updates
      
       - about half of MM
      
       - checkpatch updates
      
       - autofs4 update
      
      * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (120 commits)
        autofs4: fix string.h include in auto_dev-ioctl.h
        autofs4: use pr_xxx() macros directly for logging
        autofs4: change log print macros to not insert newline
        autofs4: make autofs log prints consistent
        autofs4: fix some white space errors
        autofs4: fix invalid ioctl return in autofs4_root_ioctl_unlocked()
        autofs4: fix coding style line length in autofs4_wait()
        autofs4: fix coding style problem in autofs4_get_set_timeout()
        autofs4: coding style fixes
        autofs: show pipe inode in mount options
        kallsyms: add support for relative offsets in kallsyms address table
        kallsyms: don't overload absolute symbol type for percpu symbols
        x86: kallsyms: disable absolute percpu symbols on !SMP
        checkpatch: fix another left brace warning
        checkpatch: improve UNSPECIFIED_INT test for bare signed/unsigned uses
        checkpatch: warn on bare unsigned or signed declarations without int
        checkpatch: exclude asm volatile from complex macro check
        mm: memcontrol: drop unnecessary lru locking from mem_cgroup_migrate()
        mm: migrate: consolidate mem_cgroup_migrate() calls
        mm/compaction: speed up pageblock_pfn_to_page() when zone is contiguous
        ...
      271ecc52
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · aa6865d8
      Linus Torvalds 提交于
      Pull m68k updates from Geert Uytterhoeven.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k: Fix misspellings in comments.
        m68k: Use conventional function parameters for do_sigreturn
        zorro: Use kobj_to_dev()
      aa6865d8
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · 72aafdf0
      Linus Torvalds 提交于
      Pull s390 updates from Martin Schwidefsky:
      
       - Add the CPU id for the new z13s machine
      
       - Add a s390 specific XOR template for RAID-5 checksumming based on the
         XC instruction.  Remove all other alternatives, XC is always faster
      
       - The merge of our four different stack tracers into a single one
      
       - Tidy up the code related to page tables, several large inline
         functions are now out-of-line.  Bloat-o-meter reports ~11K text size
         reduction
      
       - A binary interface for the priviledged CLP instruction to retrieve
         the hardware view of the installed PCI functions
      
       - Improvements for the dasd format code
      
       - Bug fixes and cleanups
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (31 commits)
        s390/pci: enforce fmb page boundary rule
        s390: fix floating pointer register corruption (again)
        s390/cpumf: add missing lpp magic initialization
        s390: Fix misspellings in comments
        s390/mm: split arch/s390/mm/pgtable.c
        s390/mm: uninline pmdp_xxx functions from pgtable.h
        s390/mm: uninline ptep_xxx functions from pgtable.h
        s390/pci: add ioctl interface for CLP
        s390: Use pr_warn instead of pr_warning
        s390/dasd: remove casts to dasd_*_private
        s390/dasd: Refactor dasd format functions
        s390/dasd: Simplify code in format logic
        s390/dasd: Improve dasd format code
        s390/percpu: remove this_cpu_cmpxchg_double_4
        s390/cpumf: Improve guest detection heuristics
        s390/fault: merge report_user_fault implementations
        s390/dis: use correct escape sequence for '%' character
        s390/kvm: simplify set_guest_storage_key
        s390/oprofile: add z13/z13s model numbers
        s390: add z13s model number to z13 elf platform
        ...
      72aafdf0
    • L
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32 · 1c8e85b1
      Linus Torvalds 提交于
      Pull AVR32 updates from Hans-Christian Egtvedt.
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
        avr32: fix asm operand constraint in cmpxchg()
        avr32: wire up copy_file_range syscall
      1c8e85b1
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 10dc3747
      Linus Torvalds 提交于
      Pull KVM updates from Paolo Bonzini:
       "One of the largest releases for KVM...  Hardly any generic
        changes, but lots of architecture-specific updates.
      
        ARM:
         - VHE support so that we can run the kernel at EL2 on ARMv8.1 systems
         - PMU support for guests
         - 32bit world switch rewritten in C
         - various optimizations to the vgic save/restore code.
      
        PPC:
         - enabled KVM-VFIO integration ("VFIO device")
         - optimizations to speed up IPIs between vcpus
         - in-kernel handling of IOMMU hypercalls
         - support for dynamic DMA windows (DDW).
      
        s390:
         - provide the floating point registers via sync regs;
         - separated instruction vs.  data accesses
         - dirty log improvements for huge guests
         - bugfixes and documentation improvements.
      
        x86:
         - Hyper-V VMBus hypercall userspace exit
         - alternative implementation of lowest-priority interrupts using
           vector hashing (for better VT-d posted interrupt support)
         - fixed guest debugging with nested virtualizations
         - improved interrupt tracking in the in-kernel IOAPIC
         - generic infrastructure for tracking writes to guest
           memory - currently its only use is to speedup the legacy shadow
           paging (pre-EPT) case, but in the future it will be used for
           virtual GPUs as well
         - much cleanup (LAPIC, kvmclock, MMU, PIT), including ubsan fixes"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (217 commits)
        KVM: x86: remove eager_fpu field of struct kvm_vcpu_arch
        KVM: x86: disable MPX if host did not enable MPX XSAVE features
        arm64: KVM: vgic-v3: Only wipe LRs on vcpu exit
        arm64: KVM: vgic-v3: Reset LRs at boot time
        arm64: KVM: vgic-v3: Do not save an LR known to be empty
        arm64: KVM: vgic-v3: Save maintenance interrupt state only if required
        arm64: KVM: vgic-v3: Avoid accessing ICH registers
        KVM: arm/arm64: vgic-v2: Make GICD_SGIR quicker to hit
        KVM: arm/arm64: vgic-v2: Only wipe LRs on vcpu exit
        KVM: arm/arm64: vgic-v2: Reset LRs at boot time
        KVM: arm/arm64: vgic-v2: Do not save an LR known to be empty
        KVM: arm/arm64: vgic-v2: Move GICH_ELRSR saving to its own function
        KVM: arm/arm64: vgic-v2: Save maintenance interrupt state only if required
        KVM: arm/arm64: vgic-v2: Avoid accessing GICH registers
        KVM: s390: allocate only one DMA page per VM
        KVM: s390: enable STFLE interpretation only if enabled for the guest
        KVM: s390: wake up when the VCPU cpu timer expires
        KVM: s390: step the VCPU timer while in enabled wait
        KVM: s390: protect VCPU cpu timer with a seqcount
        KVM: s390: step VCPU cpu timer during kvm_run ioctl
        ...
      10dc3747
  2. 16 3月, 2016 33 次提交
    • L
      Merge tag 'edac_for_4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp · 047486d8
      Linus Torvalds 提交于
      Pull EDAC updates from Borislav Petkov:
      
       - Altera: L2 cache and On-Chip RAM support (Thor Thayer).
      
       - EDAC: Workqueue handling cleanups (Borislav Petkov).
      
       - Xgene: Register bus error handling (Loc Ho).
      
       - Misc small fixes.
      
      * tag 'edac_for_4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp:
        ARM: socfpga: Enable OCRAM ECC on startup
        ARM: socfpga: Enable L2 cache ECC on startup
        ARM: dts: Add Altera L2 Cache and OCRAM EDAC entries
        EDAC, altera: Add Altera L2 cache and OCRAM support
        EDAC: Use edac_debugfs_remove_recursive() in edac_debugfs_exit()
        EDAC, mpc85xx: Silence unused variable warning
        EDAC: Cleanup/sync workqueue functions
        EDAC: Kill workqueue setup/teardown functions
        EDAC: Balance workqueue setup and teardown
        arm64: Update the APM X-Gene EDAC node with the RB register resource
        EDAC, xgene: Add missing SoC register bus error handling
        Documentation, EDAC: Update xgene binding for missing register bus
        EDAC, amd64_edac: Shift wrapping issue in f1x_get_norm_dct_addr()
      047486d8
    • L
      Merge tag 'leds_for_4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds · 9256d5a3
      Linus Torvalds 提交于
      Pull LED updates from Jacek Anaszewski:
       "LED core improvements:
         - Fix misleading comment after workqueue removal from drivers
         - Avoid error message when a USB LED device is unplugged
         - Add helpers for calling brightness_set(_blocking)
      
        LED triggers:
         - Simplify led_trigger_store by using sysfs_streq()
      
        LED class drivers improvements:
         - Improve wording and formatting in a comment: lp3944
         - Fix return value check in create_gpio_led(): leds-gpio
         - Use GPIOF_OUT_INIT_LOW instead of hardcoded zero: leds-gpio
         - Use devm_led_classdev_register(): leds-lm3533, leds-lm3533,
           leds-lp8788, leds-wm831x-status, leds-s3c24xx, leds-s3c24xx,
           leds-max8997.
      
        New LED class driver:
         - Add driver for the ISSI IS31FL32xx family of LED controllers.
      
        Device Tree documentation:
         - of: Add vendor prefixes for Integrated Silicon Solutions Inc.
           (issi) and Si-En Technology (si-en).
         - DT: Add common bindings for Si-En Technology SN3216/18 and
           IS31FL32xx family of LED controllers, since they seem to be the
           same hardware, just rebranded"
      
      * tag 'leds_for_4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds:
        leds: triggers: simplify led_trigger_store
        leds: max8997: Use devm_led_classdev_register
        leds: da903x: Use devm_led_classdev_register
        leds: s3c24xx: Use devm_led_classdev_register
        leds: wm831x-status: Use devm_led_classdev_register
        leds: lp8788: Use devm_led_classdev_register
        leds: 88pm860x: Use devm_led_classdev_register
        leds: Add SN3218 and SN3216 support to the IS31FL32XX driver
        of: Add vendor prefix for Si-En Technology
        leds: Add driver for the ISSI IS31FL32xx family of LED controllers
        DT: leds: Add binding for the ISSI IS31FL32xx family of LED controllers
        DT: Add vendor prefix for Integrated Silicon Solutions Inc.
        leds: lm3533: Use devm_led_classdev_register
        leds: gpio: Use GPIOF_OUT_INIT_LOW instead of hardcoded zero
        leds: core: add helpers for calling brightness_set(_blocking)
        leds: leds-gpio: Fix return value check in create_gpio_led()
        leds: lp3944: improve wording and formatting in a comment
        leds: core: avoid error message when a USB LED device is unplugged
        leds: core: fix misleading comment after workqueue removal from drivers
      9256d5a3
    • L
      Merge tag 'rtc-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux · 13f6f62f
      Linus Torvalds 提交于
      Pull RTC updates from Alexandre Belloni:
       "Core:
         - New sysfs interface to set and read clock offset
         - Drivers can now be both I2C and SPI (see pcf2127 and ds3232)
      
        New drivers:
         - Alphascale ASM9260
         - Epson RX6110SA
         - Maxim max20024 and max77620 (in max77686)
         - Microchip PIC32
         - NXP pcf2129 (in pcf2127)
      
        Subsystem wide cleanups:
         - remove IRQF_EARLY_RESUME when unecessary
      
        Drivers:
         - ds1307: clock output, temperature sensor and wakeup-source support
         - ds1685: actually spin forever in poweroff error path
         - ds3232: many cleanups
         - ds3234: merged in ds3232
         - hym8563: fix invalid year calculation
         - max77686: many cleanups
         - max77802 merged in max77686
         - pcf2123: cleanups and offset support
         - pcf85063: cleanups
         - pcf8523: propely handle oscillator stop bit
         - rv3029: many cleanups, trickle charger and temperature sensor support
         - rv8803: convert spin_lock to mutex_lock
         - rx8025: many fixes
         - vr41xx: restore alarm_irq_enable"
      
      * tag 'rtc-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux: (86 commits)
        rtc: pcf2127: add pcf2129 device id
        rtc: pcf2127: add support for spi interface
        rtc: pcf2127: convert to use regmap
        rtc: rv3029: Add thermometer hwmon support
        rtc: rv3029: Add update_bits helper for eeprom access
        rtc: ds1685: actually spin forever in poweroff error path
        rtc: hym8563: fix invalid year calculation
        rtc: ds3232: use rtc->ops_lock to protect alarm operations
        rtc: ds3232: fix issue when irq is shared several devices
        rtc: ds3232: remove unused UIE code
        rtc: ds3232: add register access error checks
        rtc: ds3232: fix read on /dev/rtc after RTC_AIE_ON
        rtc: merge ds3232 and ds3234
        rtc: ds3232: convert to use regmap
        rtc: pxa: fix Kconfig indentation
        rtc: rv3029: Add device tree property for trickle charger
        rtc: rv3029: Add functions for EEPROM access
        rtc: rv3029: Add i2c register update-bits helper
        rtc: rv3029: Add missing register definitions
        rtc: rv3029: Add "rv3029" I2C device id
        ...
      13f6f62f
    • L
      Merge tag 'hwmon-for-linus-v4.6' of... · f0718cea
      Linus Torvalds 提交于
      Merge tag 'hwmon-for-linus-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
      
      Pull hwmon updates from Guenter Roeck:
       - New drivers for NSA320 and LTC2990
       - Added support for ADM1278 to adm1275 driver
       - Added support for ncpXXxh103 to ntc_thermistor driver
       - Renamed vexpress hwmon implementation
       - Minor cleanups and improvements
      
      * tag 'hwmon-for-linus-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
        hwmon: Create an NSA320 hardware monitoring driver
        hwmon: Define binding for the nsa320-hwmon driver
        hwmon: (adm1275) Add support for ADM1278
        hwmon: (ntc_thermistor) Add support for ncpXXxh103
        Doc: hwmon: Fix typo "montoring" in hwmon
        ARM: dts: vfxxx: Add iio_hwmon node for ADC temperature channel
        ARM: dts: Change iio_hwmon nodes to use hypen in node names
        hwmon: (iio_hwmon) Allow the driver to accept hypen in device tree node names
        hwmon: Add LTC2990 sensor driver
        hwmon: (vexpress) rename vexpress hwmon implementation
      f0718cea
    • L
      Merge tag 'regulator-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · 555f8160
      Linus Torvalds 提交于
      Pull regulator updates from Mark Brown:
       "This has been an extremely quiet release for the regulator API, aside
        from bugfixes and small enhancements the only thing that really stands
        out are the new drivers for Action Semiconductors ACT8945A, HiSilicon
        HI665x, and the Maxim MAX20024 and MAX77620"
      
      * tag 'regulator-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (46 commits)
        regulator: pwm: Add support to have multiple instance of pwm regulator
        regulator: pwm: Fix calculation of voltage-to-duty cycle
        regulator: of: Use of_property_read_u32() for reading min/max
        regulator: pv88060: fix incorrect clear of event register
        regulator: pv88090: fix incorrect clear of event register
        regulator: max77620: Add support to configure active-discharge
        regulator: core: Add support for active-discharge configuration
        regulator: helper: Add helper to configure active-discharge using regmap
        regulator: core: Add support for active-discharge configuration
        regulator: DT: Add DT property for active-discharge configuration
        regulator: act8865: Specify fixed voltage of 3.3V for ACT8600's REG9
        regulator: act8865: Rename platform_data field to init_data
        regulator: act8865: Remove "static" from local variable
        ASoC: cs4271: add regulator consumer support
        regulator: max77620: Remove duplicate module alias
        regulator: max77620: Eliminate duplicate code
        regulator: max77620: Remove unused fields
        regulator: core: fix crash in error path of regulator_register
        regulator: core: Request GPIO before creating sysfs entries
        regulator: gpio: don't print error on EPROBE_DEFER
        ...
      555f8160
    • L
      Merge tag 'regmap-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap · b7aae4a9
      Linus Torvalds 提交于
      Pull regmap updates from Mark Brown:
       "This has been a very busy release for regmap, not just in cleaning up
        the mess we got ourselves into with the endianness handling but also
        in other areas too:
      
         - Fixes for the endianness handling so that we now explicitly default
           to little endian (the code used to do this by accident).  This
           fixes handling of explictly specified endianness on big endian
           systems.
      
         - Optimisation of the implementation of register striding.
      
         - A refectoring of the _update_bits() code to reduce duplication.
      
         - Fixes and enhancements for the interrupt implementation which make
           it easier to use in a wider range of systems"
      
      * tag 'regmap-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap: (28 commits)
        regmap: irq: add devm apis for regmap_{add,del}_irq_chip
        regmap: replace regmap_write_bits()
        regmap: irq: Enable irq retriggering for nested irqs
        regmap: add regmap_fields_force_xxx() macros
        regmap: add regmap_field_force_xxx() macros
        regmap: merge regmap_fields_update_bits() into macro
        regmap: merge regmap_fields_write() into macro
        regmap: add regmap_fields_update_bits_base()
        regmap: merge regmap_field_update_bits() into macro
        regmap: merge regmap_field_write() into macro
        regmap: add regmap_field_update_bits_base()
        regmap: merge regmap_update_bits_check_async() into macro
        regmap: merge regmap_update_bits_check() into macro
        regmap: merge regmap_update_bits_async() into macro
        regmap: merge regmap_update_bits() into macro
        regmap: add regmap_update_bits_base()
        regcache: flat: Introduce register strider order
        regcache: Introduce the index parsing API by stride order
        regmap: core: Introduce register stride order
        regmap: irq: add devm apis for regmap_{add,del}_irq_chip
        ...
      b7aae4a9
    • L
      Merge tag 'spi-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · ff280e36
      Linus Torvalds 提交于
      Pull spi updates from Mark Brown:
       "Not the biggest set of changes for SPI but a bit of a pickup in
        activity on the core:
      
         - Support for memory mapped read from flash devices via a SPI
           controller.
      
         - The beginnings of a message rewriting framework in the core which
           should in time allow us to support transforming messages to work
           around the limits of controllers or optimise the performance for
           controllers transparently to calling drivers.
      
         - Updates to the PXA2xx, the main functional change being to improve
           the ACPI support.
      
         - A new driver for the Analog Devices AXI SPI engine"
      
      * tag 'spi-v4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (66 commits)
        spi: Add gfp parameter to kernel-doc to fix build warning
        spi: Fix htmldocs build error due struct spi_replaced_transfers
        spi: rockchip: covert rsd_nsecs to u32 type
        spi: rockchip: header file cleanup
        spi: xilinx: Add devicetree binding for spi-xilinx
        spi: respect the maximum segment size of DMA device
        spi: rockchip: check requesting dma channel with EPROBE_DEFER
        spi: rockchip: migrate to dmaengine_terminate_async
        spi: rockchip: check return value of dmaengine_prep_slave_sg
        spi: core: Fix deadlock when sending messages
        spi/rockchip: fix endian mode for 16-bit transfers
        spi/rockchip: Make sure spi clk is on in rockchip_spi_set_cs
        spi: pxa2xx: Use newer more explicit DMAengine terminate API
        spi: pxa2xx: Add support for Intel Broxton B-Step
        spi: lp-8841: return correct error code from probe
        spi: imx: drop bogus tests for rx/tx bufs in DMA transfer
        spi: imx: set MX51_ECSPI_CTRL_SMC bit in setup function
        spi: imx: make some register defines simpler
        spi: imx: remove unnecessary bit clearing in mx51_ecspi_config
        spi: imx: add support for all SPI word width for DMA
        ...
      ff280e36
    • L
      Merge tag 'pinctrl-v4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 5ca5446e
      Linus Torvalds 提交于
      Pull pin control updates from Linus Walleij:
       "An almost purely driver related set of changes with no major changes
        to the framework, only one patch adding an unlocked version of the
        pinctrl_find_gpio_range_from_pin() library call.
      
        New drivers:
         - ST Microelectronics STM32 MCU support: this is a non-MMU low-end
           platform for IoT things (etc).
         - Microchip PIC32 MCU support: same story as for STM32.
      
        New subdrivers:
         - Allwinner SunXi H3 R_PIO controller support.
         - Qualcomm IPQ4019 support.
         - MediaTek MT2701 and MT7623.
         - Allwinner A64
      
        Non-critical fixes:
         - gpio_disable_free() for the Vybrid.
         - pinctrl single: use a separate lockdep class.
      
        Misc:
         - Substantial cleanups and rewrites for the Super-H PFC driver and
           subdrivers.
         - Various fixes and cleanups, especially Paul Gortmakers work to make
           nonmodular drivers nonmodular"
      
      * tag 'pinctrl-v4.6-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl: (75 commits)
        pinctrl: single: Use a separate lockdep class
        drivers: pinctrl: add driver for Allwinner A64 SoC
        pinctrl: Broadcom Northstar2 pinctrl device tree bindings
        pinctrl: amlogic: Make driver independent from two-domain configuration
        pinctrl: amlogic: Separate some pin functions for Meson8 / Meson8b
        pinctrl: at91: use __maybe_unused to hide pm functions
        pinctrl: sh-pfc: core: don't open code of_device_get_match_data()
        pinctrl: uniphier: rename CONFIG options and file names
        pinctrl: sunxi: make A80 explicitly non-modular
        pinctrl: stm32: make explicitly non-modular
        pinctrl: sh-pfc: make explicitly non-modular
        pinctrl: meson: make explicitly non-modular
        pinctrl: pinctrl-mt6397 driver explicitly non-modular
        pinctrl: sunxi: does not need module.h
        pinctrl: pxa2xx: export symbols
        pinctrl: sunxi: Change mux setting on PI irq pins
        pinctrl: sunxi: Remove non existing irq's
        pinctrl: imx: attach iomuxc device to gpr syscon
        pinctrl-bcm2835: Fix cut-and-paste error in "pull" parsing
        pinctrl: lpc1850-scu: document nxp,gpio-pin-interrupt
        ...
      5ca5446e
    • I
      autofs4: fix string.h include in auto_dev-ioctl.h · 63c06227
      Ian Kent 提交于
      Since including linux/string.h will now do the right thing remove the
      conditional check.
      Signed-off-by: NIan Kent <raven@themaw.net>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      63c06227
    • I
      autofs4: use pr_xxx() macros directly for logging · 8a78d593
      Ian Kent 提交于
      Use the standard pr_xxx() log macros directly for log prints instead of
      the AUTOFS_XXX() macros.
      Signed-off-by: NIan Kent <ikent@redhat.com>
      Cc: Joe Perches <joe@perches.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8a78d593
    • I
      autofs4: change log print macros to not insert newline · 90967c87
      Ian Kent 提交于
      Common kernel coding practice is to include the newline of log prints
      within the log text rather than hidden away in a macro.
      
      To avoid introducing inconsistencies as changes are made change the log
      macros to not include the newline.
      Signed-off-by: NIan Kent <raven@themaw.net>
      Cc: Joe Perches <joe@perches.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      90967c87
    • I
      autofs4: make autofs log prints consistent · cab49f9e
      Ian Kent 提交于
      Use the pr_*() print in AUTOFS_*() macros instead of printks and include
      the module name in log message macros.  Also use the AUTOFS_*() macros
      everywhere instead of raw printks.
      Signed-off-by: NIan Kent <raven@themaw.net>
      Cc: Joe Perches <joe@perches.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      cab49f9e
    • I
      autofs4: fix some white space errors · 0266725a
      Ian Kent 提交于
      Fix some white space format errors.
      Signed-off-by: NIan Kent <raven@themaw.net>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      0266725a
    • I
      autofs4: fix invalid ioctl return in autofs4_root_ioctl_unlocked() · e3cd8067
      Ian Kent 提交于
      The return from an ioctl if an invalid ioctl is passed in should be
      EINVAL not ENOSYS.
      Signed-off-by: NIan Kent <raven@themaw.net>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e3cd8067
    • I
      autofs4: fix coding style line length in autofs4_wait() · b3f67a98
      Ian Kent 提交于
      The need for this is questionable but checkpatch.pl complains about the
      line length and it's a straightfoward change.
      Signed-off-by: NIan Kent <raven@themaw.net>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      b3f67a98
    • I
      autofs4: fix coding style problem in autofs4_get_set_timeout() · aa330ddc
      Ian Kent 提交于
      Refactor autofs4_get_set_timeout() to eliminate coding style error.
      Signed-off-by: NIan Kent <raven@themaw.net>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      aa330ddc
    • I
      autofs4: coding style fixes · e9a7c2f1
      Ian Kent 提交于
      Try and make the coding style completely consistent throughtout the
      autofs module and inline with kernel coding style recommendations.
      Signed-off-by: NIan Kent <raven@themaw.net>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e9a7c2f1
    • S
      autofs: show pipe inode in mount options · c83aa55d
      Stanislav Kinsburskiy 提交于
      This is required for CRIU (Checkpoint Restart In Userspace) to migrate a
      mount point when write end in user space is closed.
      
      Below is a brief description of the problem.
      
      To migrate a non-catatonic autofs mount point, one has to restore the
      control pipe between kernel and autofs master process.
      
      One of the autofs masters is systemd, which closes pipe write end after
      passing it to the kernel with mount call.
      
      To be able to restore the systemd control pipe one has to know which
      read pipe end in systemd corresponds to the write pipe end in the
      kernel.  The pipe "fd" in mount options is not enough because it was
      closed and probably replaced by some other descriptor.
      
      Thus, some other attribute is required to be able to find the read pipe
      end.  The best attribute to use to find the correct pipe end is inode
      number becuase it's unique for the whole system and can't be reused
      while the autofs mount exists.
      
      This attribute can also be used to recognize a situation where an autofs
      mount has no master (no process with specified "pgrp" or no file
      descriptor with "pipe_ino", specified in autofs mount options).
      Signed-off-by: NStanislav Kinsburskiy <skinsbursky@virtuozzo.com>
      Signed-off-by: NIan Kent <raven@themaw.net>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      c83aa55d
    • A
      kallsyms: add support for relative offsets in kallsyms address table · 2213e9a6
      Ard Biesheuvel 提交于
      Similar to how relative extables are implemented, it is possible to emit
      the kallsyms table in such a way that it contains offsets relative to
      some anchor point in the kernel image rather than absolute addresses.
      
      On 64-bit architectures, it cuts the size of the kallsyms address table
      in half, since offsets between kernel symbols can typically be expressed
      in 32 bits.  This saves several hundreds of kilobytes of permanent
      .rodata on average.  In addition, the kallsyms address table is no
      longer subject to dynamic relocation when CONFIG_RELOCATABLE is in
      effect, so the relocation work done after decompression now doesn't have
      to do relocation updates for all these values.  This saves up to 24
      bytes (i.e., the size of a ELF64 RELA relocation table entry) per value,
      which easily adds up to a couple of megabytes of uncompressed __init
      data on ppc64 or arm64.  Even if these relocation entries typically
      compress well, the combined size reduction of 2.8 MB uncompressed for a
      ppc64_defconfig build (of which 2.4 MB is __init data) results in a ~500
      KB space saving in the compressed image.
      
      Since it is useful for some architectures (like x86) to retain the
      ability to emit absolute values as well, this patch also adds support
      for capturing both absolute and relative values when
      KALLSYMS_ABSOLUTE_PERCPU is in effect, by emitting absolute per-cpu
      addresses as positive 32-bit values, and addresses relative to the
      lowest encountered relative symbol as negative values, which are
      subtracted from the runtime address of this base symbol to produce the
      actual address.
      
      Support for the above is enabled by default for all architectures except
      IA-64 and Tile-GX, whose symbols are too far apart to capture in this
      manner.
      Signed-off-by: NArd Biesheuvel <ard.biesheuvel@linaro.org>
      Tested-by: NGuenter Roeck <linux@roeck-us.net>
      Reviewed-by: NKees Cook <keescook@chromium.org>
      Tested-by: NKees Cook <keescook@chromium.org>
      Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
      Cc: Michael Ellerman <mpe@ellerman.id.au>
      Cc: Ingo Molnar <mingo@kernel.org>
      Cc: H. Peter Anvin <hpa@zytor.com>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Michal Marek <mmarek@suse.cz>
      Cc: Rusty Russell <rusty@rustcorp.com.au>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      2213e9a6
    • A
      kallsyms: don't overload absolute symbol type for percpu symbols · 8c996940
      Ard Biesheuvel 提交于
      Commit c6bda7c9 ("kallsyms: fix percpu vars on x86-64 with
      relocation") overloaded the 'A' (absolute) symbol type to signify that a
      symbol is not subject to dynamic relocation.  However, the original A
      type does not imply that at all, and depending on the version of the
      toolchain, many A type symbols are emitted that are in fact relative to
      the kernel text, i.e., if the kernel is relocated at runtime, these
      symbols should be updated as well.
      
      For instance, on sparc32, the following symbols are emitted as absolute
      (kindly provided by Guenter Roeck):
      
        f035a420 A _etext
        f03d9000 A _sdata
        f03de8c4 A jiffies
        f03f8860 A _edata
        f03fc000 A __init_begin
        f041bdc8 A __init_text_end
        f0423000 A __bss_start
        f0423000 A __init_end
        f044457d A __bss_stop
        f044457d A _end
      
      On x86_64, similar behavior can be observed:
      
        ffffffff81a00000 A __end_rodata_hpage_align
        ffffffff81b19000 A __vvar_page
        ffffffff81d3d000 A _end
      
      Even if only a couple of them pass the symbol range check that results
      in them to be taken into account for the final kallsyms symbol table, it
      is obvious that 'A' does not mean the symbol does not need to be updated
      at relocation time, and overloading its meaning to signify that is
      perhaps not a good idea.
      
      So instead, add a new percpu_absolute member to struct sym_entry, and
      when --absolute-percpu is in effect, use it to record symbols whose
      addresses should be emitted as final values rather than values that
      still require relocation at runtime.  That way, we can drop the check
      against the 'A' type.
      Signed-off-by: NArd Biesheuvel <ard.biesheuvel@linaro.org>
      Tested-by: NGuenter Roeck <linux@roeck-us.net>
      Reviewed-by: NKees Cook <keescook@chromium.org>
      Tested-by: NKees Cook <keescook@chromium.org>
      Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
      Cc: Michael Ellerman <mpe@ellerman.id.au>
      Cc: Ingo Molnar <mingo@kernel.org>
      Cc: H. Peter Anvin <hpa@zytor.com>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Michal Marek <mmarek@suse.cz>
      Acked-by: NRusty Russell <rusty@rustcorp.com.au>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      8c996940
    • A
      x86: kallsyms: disable absolute percpu symbols on !SMP · 4d5d5664
      Ard Biesheuvel 提交于
      scripts/kallsyms.c has a special --absolute-percpu command line option
      which deals with the zero based per cpu offsets that are used when
      building for SMP on x86_64.  This means that the option should only be
      passed in that case, so add a Kconfig symbol with the correct predicate,
      and use that instead.
      Signed-off-by: NArd Biesheuvel <ard.biesheuvel@linaro.org>
      Tested-by: NGuenter Roeck <linux@roeck-us.net>
      Reviewed-by: NKees Cook <keescook@chromium.org>
      Tested-by: NKees Cook <keescook@chromium.org>
      Acked-by: NRusty Russell <rusty@rustcorp.com.au>
      Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
      Cc: Michael Ellerman <mpe@ellerman.id.au>
      Cc: Ingo Molnar <mingo@kernel.org>
      Cc: H. Peter Anvin <hpa@zytor.com>
      Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
      Cc: Michal Marek <mmarek@suse.cz>
      Cc: Arnd Bergmann <arnd@arndb.de>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      4d5d5664
    • G
      checkpatch: fix another left brace warning · 6b8c69e4
      Geyslan G. Bem 提交于
      This patch escapes a regex that uses left brace.
      
      Using checkpatch.pl with Perl 5.22.0 generates the warning: "Unescaped
      left brace in regex is deprecated, passed through in regex;"
      
      Comment from regcomp.c in Perl source: "Currently we don't warn when the
      lbrace is at the start of a construct.  This catches it in the middle of
      a literal string, or when it's the first thing after something like
      "\b"."
      
      This works as a complement to 4e5d56bd ("checkpatch: fix left brace
      warning").
      Signed-off-by: NGeyslan G. Bem <geyslan@gmail.com>
      Signed-off-by: NJoe Perches <joe@perches.com>
      Suggested-by: NPeter Senna Tschudin <peter.senna@gmail.com>
      Cc: Eddie Kovsky <ewk@edkovsky.org>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      6b8c69e4
    • J
      checkpatch: improve UNSPECIFIED_INT test for bare signed/unsigned uses · 207a8e84
      Joe Perches 提交于
      Improve the test to allow casts to (unsigned) or (signed) to be found
      and fixed if desired.
      Signed-off-by: NJoe Perches <joe@perches.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      207a8e84
    • J
      checkpatch: warn on bare unsigned or signed declarations without int · a1ce18e4
      Joe Perches 提交于
      Kernel style prefers "unsigned int <foo>" over "unsigned <foo>" and
      "signed int <foo>" over "signed <foo>".
      
      Emit a warning for these simple signed/unsigned <foo> declarations.  Fix
      it too if desired.
      Signed-off-by: NJoe Perches <joe@perches.com>
      Acked-by: NDavid S. Miller <davem@davemloft.net>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      a1ce18e4
    • J
      checkpatch: exclude asm volatile from complex macro check · 42e15293
      Joe Perches 提交于
      asm volatile and all its variants like __asm__ __volatile__ ("<foo>")
      are reported as errors with "Macros with with complex values should be
      enclosed in parentheses".
      
      Make an exception for these asm volatile macro definitions by converting
      the "asm volatile" to "asm_volatile" so it appears as a single function
      call and the error isn't reported.
      Signed-off-by: NJoe Perches <joe@perches.com>
      Reported-by: NJeff Merkey <linux.mdb@gmail.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      42e15293
    • J
      mm: memcontrol: drop unnecessary lru locking from mem_cgroup_migrate() · 9cf7666a
      Johannes Weiner 提交于
      Migration accounting in the memory controller used to have to handle
      both oldpage and newpage being on the LRU already; fuse's page cache
      replacement used to pass a recycled newpage that had been uncharged but
      not freed and removed from the LRU, and the memcg migration code used to
      uncharge oldpage to "pass on" the existing charge to newpage.
      
      Nowadays, pages are no longer uncharged when truncated from the page
      cache, but rather only at free time, so if a LRU page is recycled in
      page cache replacement it'll also still be charged.  And we bail out of
      the charge transfer altogether in that case.  Tell commit_charge() that
      we know newpage is not on the LRU, to avoid taking the zone->lru_lock
      unnecessarily from the migration path.
      
      But also, oldpage is no longer uncharged inside migration.  We only use
      oldpage for its page->mem_cgroup and page size, so we don't care about
      its LRU state anymore either.  Remove any mention from the kernel doc.
      Signed-off-by: NJohannes Weiner <hannes@cmpxchg.org>
      Suggested-by: NHugh Dickins <hughd@google.com>
      Acked-by: NVladimir Davydov <vdavydov@virtuozzo.com>
      Acked-by: NMichal Hocko <mhocko@suse.com>
      Cc: Mateusz Guzik <mguzik@redhat.com>
      Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      9cf7666a
    • J
      mm: migrate: consolidate mem_cgroup_migrate() calls · 74485cf2
      Johannes Weiner 提交于
      Rather than scattering mem_cgroup_migrate() calls all over the place,
      have a single call from a safe place where every migration operation
      eventually ends up in - migrate_page_copy().
      Signed-off-by: NJohannes Weiner <hannes@cmpxchg.org>
      Suggested-by: NHugh Dickins <hughd@google.com>
      Acked-by: NVladimir Davydov <vdavydov@virtuozzo.com>
      Acked-by: NMichal Hocko <mhocko@suse.com>
      Cc: Mateusz Guzik <mguzik@redhat.com>
      Cc: Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      74485cf2
    • J
      mm/compaction: speed up pageblock_pfn_to_page() when zone is contiguous · 7cf91a98
      Joonsoo Kim 提交于
      There is a performance drop report due to hugepage allocation and in
      there half of cpu time are spent on pageblock_pfn_to_page() in
      compaction [1].
      
      In that workload, compaction is triggered to make hugepage but most of
      pageblocks are un-available for compaction due to pageblock type and
      skip bit so compaction usually fails.  Most costly operations in this
      case is to find valid pageblock while scanning whole zone range.  To
      check if pageblock is valid to compact, valid pfn within pageblock is
      required and we can obtain it by calling pageblock_pfn_to_page().  This
      function checks whether pageblock is in a single zone and return valid
      pfn if possible.  Problem is that we need to check it every time before
      scanning pageblock even if we re-visit it and this turns out to be very
      expensive in this workload.
      
      Although we have no way to skip this pageblock check in the system where
      hole exists at arbitrary position, we can use cached value for zone
      continuity and just do pfn_to_page() in the system where hole doesn't
      exist.  This optimization considerably speeds up in above workload.
      
      Before vs After
        Max: 1096 MB/s vs 1325 MB/s
        Min: 635 MB/s 1015 MB/s
        Avg: 899 MB/s 1194 MB/s
      
      Avg is improved by roughly 30% [2].
      
      [1]: http://www.spinics.net/lists/linux-mm/msg97378.html
      [2]: https://lkml.org/lkml/2015/12/9/23
      
      [akpm@linux-foundation.org: don't forget to restore zone->contiguous on error path, per Vlastimil]
      Signed-off-by: NJoonsoo Kim <iamjoonsoo.kim@lge.com>
      Reported-by: NAaron Lu <aaron.lu@intel.com>
      Acked-by: NVlastimil Babka <vbabka@suse.cz>
      Tested-by: NAaron Lu <aaron.lu@intel.com>
      Cc: Mel Gorman <mgorman@suse.de>
      Cc: Rik van Riel <riel@redhat.com>
      Cc: David Rientjes <rientjes@google.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      7cf91a98
    • J
      mm/compaction: pass only pageblock aligned range to pageblock_pfn_to_page · e1409c32
      Joonsoo Kim 提交于
      pageblock_pfn_to_page() is used to check there is valid pfn and all
      pages in the pageblock is in a single zone.  If there is a hole in the
      pageblock, passing arbitrary position to pageblock_pfn_to_page() could
      cause to skip whole pageblock scanning, instead of just skipping the
      hole page.  For deterministic behaviour, it's better to always pass
      pageblock aligned range to pageblock_pfn_to_page().  It will also help
      further optimization on pageblock_pfn_to_page() in the following patch.
      Signed-off-by: NJoonsoo Kim <iamjoonsoo.kim@lge.com>
      Cc: Aaron Lu <aaron.lu@intel.com>
      Cc: David Rientjes <rientjes@google.com>
      Cc: Mel Gorman <mgorman@suse.de>
      Cc: Rik van Riel <riel@redhat.com>
      Acked-by: NVlastimil Babka <vbabka@suse.cz>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      e1409c32
    • J
      mm/compaction: fix invalid free_pfn and compact_cached_free_pfn · 623446e4
      Joonsoo Kim 提交于
      free_pfn and compact_cached_free_pfn are the pointer that remember
      restart position of freepage scanner.  When they are reset or invalid,
      we set them to zone_end_pfn because freepage scanner works in reverse
      direction.  But, because zone range is defined as [zone_start_pfn,
      zone_end_pfn), zone_end_pfn is invalid to access.  Therefore, we should
      not store it to free_pfn and compact_cached_free_pfn.  Instead, we need
      to store zone_end_pfn - 1 to them.  There is one more thing we should
      consider.  Freepage scanner scan reversely by pageblock unit.  If
      free_pfn and compact_cached_free_pfn are set to middle of pageblock, it
      regards that sitiation as that it already scans front part of pageblock
      so we lose opportunity to scan there.  To fix-up, this patch do
      round_down() to guarantee that reset position will be pageblock aligned.
      
      Note that thanks to the current pageblock_pfn_to_page() implementation,
      actual access to zone_end_pfn doesn't happen until now.  But, following
      patch will change pageblock_pfn_to_page() so this patch is needed from
      now on.
      Signed-off-by: NJoonsoo Kim <iamjoonsoo.kim@lge.com>
      Acked-by: NDavid Rientjes <rientjes@google.com>
      Acked-by: NVlastimil Babka <vbabka@suse.cz>
      Cc: Aaron Lu <aaron.lu@intel.com>
      Cc: Mel Gorman <mgorman@suse.de>
      Cc: Rik van Riel <riel@redhat.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      623446e4
    • A
      mm/memblock.c: remove unnecessary memblock_type variable · 5aa17480
      Alexander Kuleshov 提交于
      We define struct memblock_type *type in the memblock_add_region() and
      memblock_reserve_region() functions only for passing it to the
      memlock_add_range() and memblock_reserve_range() functions.  Let's
      remove these variables and will pass a type directly.
      Signed-off-by: NAlexander Kuleshov <kuleshovmail@gmail.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      5aa17480
    • C
      x86: also use debug_pagealloc_enabled() for free_init_pages · a75e1f63
      Christian Borntraeger 提交于
      we want to couple all debugging features with debug_pagealloc_enabled()
      and not with the config option CONFIG_DEBUG_PAGEALLOC.
      Signed-off-by: NChristian Borntraeger <borntraeger@de.ibm.com>
      Suggested-by: NDavid Rientjes <rientjes@google.com>
      Acked-by: NDavid Rientjes <rientjes@google.com>
      Reviewed-by: NThomas Gleixner <tglx@linutronix.de>
      Cc: Laura Abbott <labbott@fedoraproject.org>
      Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
      Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      a75e1f63
    • C
      s390: query dynamic DEBUG_PAGEALLOC setting · 10917b83
      Christian Borntraeger 提交于
      We can use debug_pagealloc_enabled() to check if we can map the identity
      mapping with 1MB/2GB pages as well as to print the current setting in
      dump_stack.
      Signed-off-by: NChristian Borntraeger <borntraeger@de.ibm.com>
      Reviewed-by: NHeiko Carstens <heiko.carstens@de.ibm.com>
      Cc: Thomas Gleixner <tglx@linutronix.de>
      Acked-by: NDavid Rientjes <rientjes@google.com>
      Cc: Laura Abbott <labbott@fedoraproject.org>
      Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
      Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      10917b83