1. 27 11月, 2019 16 次提交
    • L
      Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 3f59dbca
      Linus Torvalds 提交于
      Pull perf updates from Ingo Molnar:
       "The main kernel side changes in this cycle were:
      
         - Various Intel-PT updates and optimizations (Alexander Shishkin)
      
         - Prohibit kprobes on Xen/KVM emulate prefixes (Masami Hiramatsu)
      
         - Add support for LSM and SELinux checks to control access to the
           perf syscall (Joel Fernandes)
      
         - Misc other changes, optimizations, fixes and cleanups - see the
           shortlog for details.
      
        There were numerous tooling changes as well - 254 non-merge commits.
        Here are the main changes - too many to list in detail:
      
         - Enhancements to core tooling infrastructure, perf.data, libperf,
           libtraceevent, event parsing, vendor events, Intel PT, callchains,
           BPF support and instruction decoding.
      
         - There were updates to the following tools:
      
              perf annotate
              perf diff
              perf inject
              perf kvm
              perf list
              perf maps
              perf parse
              perf probe
              perf record
              perf report
              perf script
              perf stat
              perf test
              perf trace
      
         - And a lot of other changes: please see the shortlog and Git log for
           more details"
      
      * 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (279 commits)
        perf parse: Fix potential memory leak when handling tracepoint errors
        perf probe: Fix spelling mistake "addrees" -> "address"
        libtraceevent: Fix memory leakage in copy_filter_type
        libtraceevent: Fix header installation
        perf intel-bts: Does not support AUX area sampling
        perf intel-pt: Add support for decoding AUX area samples
        perf intel-pt: Add support for recording AUX area samples
        perf pmu: When using default config, record which bits of config were changed by the user
        perf auxtrace: Add support for queuing AUX area samples
        perf session: Add facility to peek at all events
        perf auxtrace: Add support for dumping AUX area samples
        perf inject: Cut AUX area samples
        perf record: Add aux-sample-size config term
        perf record: Add support for AUX area sampling
        perf auxtrace: Add support for AUX area sample recording
        perf auxtrace: Move perf_evsel__find_pmu()
        perf record: Add a function to test for kernel support for AUX area sampling
        perf tools: Add kernel AUX area sampling definitions
        perf/core: Make the mlock accounting simple again
        perf report: Jump to symbol source view from total cycles view
        ...
      3f59dbca
    • L
      Merge branch 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · df28204b
      Linus Torvalds 提交于
      Pull EFI updates from Ingo Molnar:
       "The main changes in this cycle were:
      
         - Wire up the EFI RNG code for x86. This enables an additional source
           of entropy during early boot.
      
         - Enable the TPM event log code on ARM platforms.
      
         - Update Ard's email address"
      
      * 'efi-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        efi: libstub/tpm: enable tpm eventlog function for ARM platforms
        x86: efi/random: Invoke EFI_RNG_PROTOCOL to seed the UEFI RNG table
        efi/random: use arch-independent efi_call_proto()
        MAINTAINERS: update Ard's email address to @kernel.org
      df28204b
    • L
      Merge branch 'core-stacktrace-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 3f612813
      Linus Torvalds 提交于
      Pull stacktrace cleanup from Ingo Molnar:
       "A minor cleanup"
      
      * 'core-stacktrace-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        stacktrace: Get rid of unneeded '!!' pattern
      3f612813
    • L
      Revert "vfs: properly and reliably lock f_pos in fdget_pos()" · 2be7d348
      Linus Torvalds 提交于
      This reverts commit 0be0ee71.
      
      I was hoping it would be benign to switch over entirely to FMODE_STREAM,
      and we'd have just a couple of small fixups we'd need, but it looks like
      we're not quite there yet.
      
      While it worked fine on both my desktop and laptop, they are fairly
      similar in other respects, and run mostly the same loads.  Kenneth
      Crudup reports that it seems to break both his vmware installation and
      the KDE upower service.  In both cases apparently leading to timeouts
      due to waitinmg for the f_pos lock.
      
      There are a number of character devices in particular that definitely
      want stream-like behavior, but that currently don't get marked as
      streams, and as a result get the exclusion between concurrent
      read()/write() on the same file descriptor.  Which doesn't work well for
      them.
      
      The most obvious example if this is /dev/console and /dev/tty, which use
      console_fops and tty_fops respectively (and ptmx_fops for the pty master
      side).  It may be that it's just this that causes problems, but we
      clearly weren't ready yet.
      
      Because there's a number of other likely common cases that don't have
      llseek implementations and would seem to act as stream devices:
      
        /dev/fuse		(fuse_dev_operations)
        /dev/mcelog		(mce_chrdev_ops)
        /dev/mei0		(mei_fops)
        /dev/net/tun		(tun_fops)
        /dev/nvme0		(nvme_dev_fops)
        /dev/tpm0		(tpm_fops)
        /proc/self/ns/mnt	(ns_file_operations)
        /dev/snd/pcm*		(snd_pcm_f_ops[])
      
      and while some of these could be trivially automatically detected by the
      vfs layer when the character device is opened by just noticing that they
      have no read or write operations either, it often isn't that obvious.
      
      Some character devices most definitely do use the file position, even if
      they don't allow seeking: the firmware update code, for example, uses
      simple_read_from_buffer() that does use f_pos, but doesn't allow seeking
      back and forth.
      
      We'll revisit this when there's a better way to detect the problem and
      fix it (possibly with a coccinelle script to do more of the FMODE_STREAM
      annotations).
      Reported-by: NKenneth R. Crudup <kenny@panix.com>
      Cc: Kirill Smelkov <kirr@nexedi.com>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      2be7d348
    • L
      Merge branch 'x86-iopl-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · ab851d49
      Linus Torvalds 提交于
      Pull x86 iopl updates from Ingo Molnar:
       "This implements a nice simplification of the iopl and ioperm code that
        Thomas Gleixner discovered: we can implement the IO privilege features
        of the iopl system call by using the IO permission bitmap in
        permissive mode, while trapping CLI/STI/POPF/PUSHF uses in user-space
        if they change the interrupt flag.
      
        This implements that feature, with testing facilities and related
        cleanups"
      
      [ "Simplification" may be an over-statement. The main goal is to avoid
        the cli/sti of iopl by effectively implementing the IO port access
        parts of iopl in terms of ioperm.
      
        This may end up not workign well in case people actually depend on
        cli/sti being available, or if there are mixed uses of iopl and
        ioperm. We will see..       - Linus ]
      
      * 'x86-iopl-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (22 commits)
        x86/ioperm: Fix use of deprecated config option
        x86/entry/32: Clarify register saving in __switch_to_asm()
        selftests/x86/iopl: Extend test to cover IOPL emulation
        x86/ioperm: Extend IOPL config to control ioperm() as well
        x86/iopl: Remove legacy IOPL option
        x86/iopl: Restrict iopl() permission scope
        x86/iopl: Fixup misleading comment
        selftests/x86/ioperm: Extend testing so the shared bitmap is exercised
        x86/ioperm: Share I/O bitmap if identical
        x86/ioperm: Remove bitmap if all permissions dropped
        x86/ioperm: Move TSS bitmap update to exit to user work
        x86/ioperm: Add bitmap sequence number
        x86/ioperm: Move iobitmap data into a struct
        x86/tss: Move I/O bitmap data into a seperate struct
        x86/io: Speedup schedule out of I/O bitmap user
        x86/ioperm: Avoid bitmap allocation if no permissions are set
        x86/ioperm: Simplify first ioperm() invocation logic
        x86/iopl: Cleanup include maze
        x86/tss: Fix and move VMX BUILD_BUG_ON()
        x86/cpu: Unify cpu_init()
        ...
      ab851d49
    • L
      Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 1d872004
      Linus Torvalds 提交于
      Pull x86 asm updates from Ingo Molnar:
       "The main changes in this cycle were:
      
         - Cross-arch changes to move the linker sections for NOTES and
           EXCEPTION_TABLE into the RO_DATA area, where they belong on most
           architectures. (Kees Cook)
      
         - Switch the x86 linker fill byte from x90 (NOP) to 0xcc (INT3), to
           trap jumps into the middle of those padding areas instead of
           sliding execution. (Kees Cook)
      
         - A thorough cleanup of symbol definitions within x86 assembler code.
           The rather randomly named macros got streamlined around a
           (hopefully) straightforward naming scheme:
      
              SYM_START(name, linkage, align...)
              SYM_END(name, sym_type)
      
              SYM_FUNC_START(name)
              SYM_FUNC_END(name)
      
              SYM_CODE_START(name)
              SYM_CODE_END(name)
      
              SYM_DATA_START(name)
              SYM_DATA_END(name)
      
           etc - with about three times of these basic primitives with some
           label, local symbol or attribute variant, expressed via postfixes.
      
           No change in functionality intended. (Jiri Slaby)
      
         - Misc other changes, cleanups and smaller fixes"
      
      * 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (67 commits)
        x86/entry/64: Remove pointless jump in paranoid_exit
        x86/entry/32: Remove unused resume_userspace label
        x86/build/vdso: Remove meaningless CFLAGS_REMOVE_*.o
        m68k: Convert missed RODATA to RO_DATA
        x86/vmlinux: Use INT3 instead of NOP for linker fill bytes
        x86/mm: Report actual image regions in /proc/iomem
        x86/mm: Report which part of kernel image is freed
        x86/mm: Remove redundant address-of operators on addresses
        xtensa: Move EXCEPTION_TABLE to RO_DATA segment
        powerpc: Move EXCEPTION_TABLE to RO_DATA segment
        parisc: Move EXCEPTION_TABLE to RO_DATA segment
        microblaze: Move EXCEPTION_TABLE to RO_DATA segment
        ia64: Move EXCEPTION_TABLE to RO_DATA segment
        h8300: Move EXCEPTION_TABLE to RO_DATA segment
        c6x: Move EXCEPTION_TABLE to RO_DATA segment
        arm64: Move EXCEPTION_TABLE to RO_DATA segment
        alpha: Move EXCEPTION_TABLE to RO_DATA segment
        x86/vmlinux: Move EXCEPTION_TABLE to RO_DATA segment
        x86/vmlinux: Actually use _etext for the end of the text segment
        vmlinux.lds.h: Allow EXCEPTION_TABLE to live in RO_DATA
        ...
      1d872004
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 5c4a1c09
      Linus Torvalds 提交于
      Pull x86 fixes from Ingo Molnar:
       "These are the fixes left over from the v5.4 cycle:
      
         - Various low level 32-bit entry code fixes and improvements by Andy
           Lutomirski, Peter Zijlstra and Thomas Gleixner.
      
         - Fix 32-bit Xen PV breakage, by Jan Beulich"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/entry/32: Fix FIXUP_ESPFIX_STACK with user CR3
        x86/pti/32: Calculate the various PTI cpu_entry_area sizes correctly, make the CPU_ENTRY_AREA_PAGES assert precise
        selftests/x86/sigreturn/32: Invalidate DS and ES when abusing the kernel
        selftests/x86/mov_ss_trap: Fix the SYSENTER test
        x86/entry/32: Fix NMI vs ESPFIX
        x86/entry/32: Unwind the ESPFIX stack earlier on exception entry
        x86/entry/32: Move FIXUP_FRAME after pushing %fs in SAVE_ALL
        x86/entry/32: Use %ss segment where required
        x86/entry/32: Fix IRET exception
        x86/cpu_entry_area: Add guard page for entry stack on 32bit
        x86/pti/32: Size initial_page_table correctly
        x86/doublefault/32: Fix stack canaries in the double fault handler
        x86/xen/32: Simplify ring check in xen_iret_crit_fixup()
        x86/xen/32: Make xen_iret_crit_fixup() independent of frame layout
        x86/stackframe/32: Repair 32-bit Xen PV
      5c4a1c09
    • L
      Merge branch 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 53a07a14
      Linus Torvalds 提交于
      Pull x86 PTI updates from Ingo Molnar:
       "Fix reporting bugs of the MDS and TAA mitigation status, if one or
        both are set via a boot option.
      
        No change to mitigation behavior intended"
      
      * 'x86-pti-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/speculation: Fix redundant MDS mitigation message
        x86/speculation: Fix incorrect MDS/TAA mitigation status
      53a07a14
    • L
      Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · da42761d
      Linus Torvalds 提交于
      Pull x86 platform updates from Ingo Molnar:
       "UV platform updates (with a 'hubless' variant) and Jailhouse updates
        for better UART support"
      
      * 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/jailhouse: Only enable platform UARTs if available
        x86/jailhouse: Improve setup data version comparison
        x86/platform/uv: Account for UV Hubless in is_uvX_hub Ops
        x86/platform/uv: Check EFI Boot to set reboot type
        x86/platform/uv: Decode UVsystab Info
        x86/platform/uv: Add UV Hubbed/Hubless Proc FS Files
        x86/platform/uv: Setup UV functions for Hubless UV Systems
        x86/platform/uv: Add return code to UV BIOS Init function
        x86/platform/uv: Return UV Hubless System Type
        x86/platform/uv: Save OEM_ID from ACPI MADT probe
      da42761d
    • L
      Merge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 1c134b19
      Linus Torvalds 提交于
      Pull x86 mm updates from Ingo Molnar:
       "The main changes in this cycle were:
      
         - A PAT series from Davidlohr Bueso, which simplifies the memtype
           rbtree by using the interval tree helpers. (There's more cleanups
           in this area queued up, but they didn't make the merge window.)
      
         - Also flip over CONFIG_X86_5LEVEL to default-y. This might draw in a
           few more testers, as all the major distros are going to have
           5-level paging enabled by default in their next iterations.
      
         - Misc cleanups"
      
      * 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/mm/pat: Rename pat_rbtree.c to pat_interval.c
        x86/mm/pat: Drop the rbt_ prefix from external memtype calls
        x86/mm/pat: Do not pass 'rb_root' down the memtype tree helper functions
        x86/mm/pat: Convert the PAT tree to a generic interval tree
        x86/mm: Clean up the pmd_read_atomic() comments
        x86/mm: Fix function name typo in pmd_read_atomic() comment
        x86/cpu: Clean up intel_tlb_table[]
        x86/mm: Enable 5-level paging support by default
      1c134b19
    • L
      Merge branch 'x86-kdump-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 24ee25a6
      Linus Torvalds 提交于
      Pull x86 kdump updates from Ingo Molnar:
       "This solves a kdump artifact where encrypted memory contents are
        dumped, instead of unencrypted ones.
      
        The solution also happens to simplify the kdump code, to everyone's
        delight"
      
      * 'x86-kdump-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/crash: Align function arguments on opening braces
        x86/kdump: Remove the backup region handling
        x86/kdump: Always reserve the low 1M when the crashkernel option is specified
        x86/crash: Add a forward declaration of struct kimage
      24ee25a6
    • L
      Merge branch 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 64d6a120
      Linus Torvalds 提交于
      Pull x86 hyperv updates from Ingo Molnar:
       "Misc updates to the hyperv guest code:
      
         - Rework clockevents initialization to better support hibernation
      
         - Allow guests to enable InvariantTSC
      
         - Micro-optimize send_ipi_one"
      
      * 'x86-hyperv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/hyperv: Initialize clockevents earlier in CPU onlining
        x86/hyperv: Allow guests to enable InvariantTSC
        x86/hyperv: Micro-optimize send_ipi_one()
      64d6a120
    • L
      Merge branch 'x86-entry-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · cd4771f7
      Linus Torvalds 提交于
      Pull x86 syscall entry updates from Ingo Molnar:
       "These changes relate to the preparatory cleanup of syscall function
        type signatures - to fix indirect call mismatches with Control-Flow
        Integrity (CFI) checking.
      
        No change in behavior intended"
      
      * 'x86-entry-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/mm: Use the correct function type for native_set_fixmap()
        syscalls/x86: Fix function types in COND_SYSCALL
        syscalls/x86: Use the correct function type for sys_ni_syscall
        syscalls/x86: Use COMPAT_SYSCALL_DEFINE0 for IA32 (rt_)sigreturn
        syscalls/x86: Wire up COMPAT_SYSCALL_DEFINE0
        syscalls/x86: Use the correct function type in SYSCALL_DEFINE0
      cd4771f7
    • L
      Merge branches 'x86-cpu-for-linus' and 'x86-fpu-for-linus' of... · a25bbc26
      Linus Torvalds 提交于
      Merge branches 'x86-cpu-for-linus' and 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
      
      Pull x86 cpu and fpu updates from Ingo Molnar:
      
       - math-emu fixes
      
       - CPUID updates
      
       - sanity-check RDRAND output to see whether the CPU at least pretends
         to produce random data
      
       - various unaligned-access across cachelines fixes in preparation of
         hardware level split-lock detection
      
       - fix MAXSMP constraints to not allow !CPUMASK_OFFSTACK kernels with
         larger than 512 NR_CPUS
      
       - misc FPU related cleanups
      
      * 'x86-cpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/cpu: Align the x86_capability array to size of unsigned long
        x86/cpu: Align cpu_caps_cleared and cpu_caps_set to unsigned long
        x86/umip: Make the comments vendor-agnostic
        x86/Kconfig: Rename UMIP config parameter
        x86/Kconfig: Enforce limit of 512 CPUs with MAXSMP and no CPUMASK_OFFSTACK
        x86/cpufeatures: Add feature bit RDPRU on AMD
        x86/math-emu: Limit MATH_EMULATION to 486SX compatibles
        x86/math-emu: Check __copy_from_user() result
        x86/rdrand: Sanity-check RDRAND output
      
      * 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/fpu: Use XFEATURE_FP/SSE enum values instead of hardcoded numbers
        x86/fpu: Shrink space allocated for xstate_comp_offsets
        x86/fpu: Update stale variable name in comment
      a25bbc26
    • L
      Merge branch 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 85fbf15b
      Linus Torvalds 提交于
      Pull x86 boot updates from Ingo Molnar:
       "The main changes were:
      
         - Extend the boot protocol to allow future extensions without hitting
           the setup_header size limit.
      
         - Add quirk to devicetree systems to disable the RTC unless it's
           listed as a supported device.
      
         - Fix ld.lld linker pedantry"
      
      * 'x86-boot-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/boot: Introduce setup_indirect
        x86/boot: Introduce kernel_info.setup_type_max
        x86/boot: Introduce kernel_info
        x86/init: Allow DT configured systems to disable RTC at boot time
        x86/realmode: Explicitly set entry point via ENTRY in linker script
      85fbf15b
    • L
      Merge branches 'core-objtool-for-linus', 'x86-cleanups-for-linus' and... · fd261590
      Linus Torvalds 提交于
      Merge branches 'core-objtool-for-linus', 'x86-cleanups-for-linus' and 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
      
      Pull x86 objtool, cleanup, and apic updates from Ingo Molnar:
       "Objtool:
      
         - Fix a gawk 5.0 incompatibility in gen-insn-attr-x86.awk. Most
           distros are still on gawk 4.2.x.
      
        Cleanup:
      
         - Misc cleanups, plus the removal of obsolete code such as Calgary
           IOMMU support, which code hasn't seen any real testing in a long
           time and there's no known users left.
      
        apic:
      
         - Two changes: a cleanup and a fix for an (old) race for oneshot
           threaded IRQ handlers"
      
      * 'core-objtool-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/insn: Fix awk regexp warnings
      
      * 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86: Remove unused asm/rio.h
        x86: Fix typos in comments
        x86/pci: Remove #ifdef __KERNEL__ guard from <asm/pci.h>
        x86/pci: Remove pci_64.h
        x86: Remove the calgary IOMMU driver
        x86/apic, x86/uprobes: Correct parameter names in kernel-doc comments
        x86/kdump: Remove the unused crash_copy_backup_region()
        x86/nmi: Remove stale EDAC include leftover
      
      * 'x86-apic-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/ioapic: Rename misnamed functions
        x86/ioapic: Prevent inconsistent state when moving an interrupt
      fd261590
  2. 26 11月, 2019 24 次提交
    • L
      Merge tag 'for-linus-5.5-1' of git://github.com/cminyard/linux-ipmi · be2eca94
      Linus Torvalds 提交于
      Pull IPMI updates from Corey Minyard:
       "Some small fixes accumulated for IPMI, nothing major"
      
      * tag 'for-linus-5.5-1' of git://github.com/cminyard/linux-ipmi:
        ipmi: fix ipmb_poll()'s return type
        ipmi: kill off 'timespec' usage again
        drivers: ipmi: Support for both IPMB Req and Resp
        ipmi: Fix memory leak in __ipmi_bmc_register
        ipmi: bt-bmc: use devm_platform_ioremap_resource() to simplify code
        ipmi: use %*ph to print small buffer
        ipmi: Don't allow device module unload when in use
      be2eca94
    • L
      Merge tag 'i3c/for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux · a11b6969
      Linus Torvalds 提交于
      Pull i3c updates from Boris Brezillon:
       "Minor fixes and MAINTAINERS updates"
      
      * tag 'i3c/for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux:
        MAINTAINERS: add myself as maintainer of Cadence I3C master controller driver
        MAINTAINERS: Mark linux-i3c mailing list moderated
        i3c: Spelling s/dicovered/discovered/
        i3c: master: use i3c_dev_get_master()
      a11b6969
    • L
      Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux · ae2dc032
      Linus Torvalds 提交于
      Pull pcmcia updates from Dominik Brodowski:
       "Just a few odd fixes and improvements to the PCMCIA core"
      
      * 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux:
        pcmcia: remove unused dprintk definition
        pcmcia: include <pcmcia/ds.h> for pcmcia_parse_tuple
        pcmcia: include cs_internal.h for missing declarations
        pcmcia: Use dev_get_drvdata where possible
        pcmcia: clean an indentation issues, remove extraneous spaces
      ae2dc032
    • L
      Merge tag 'spi-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · a86f69d3
      Linus Torvalds 提交于
      Pull spi updates from Mark Brown:
       "Lots of stuff going on in the core for SPI this time around, the two
        big changes both being around time in different forms:
      
         - A rework of delay times from Alexandru Ardelean which makes the
           ways in which they are specified more consistent between drivers so
           that what's available to clients is less dependent on the hardware
           implementation.
      
         - Support for PTP timestamping of transfers from Vladimir Oltean,
           useful for use with precision clocks with SPI control interfaces.
      
         - Big cleanups for the Atmel, PXA2xx and Zynq QSPI drivers"
      
      * tag 'spi-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi: (119 commits)
        dt-bindings: spi: Convert stm32 QSPI bindings to json-schema
        spi: pic32: Retire dma_request_slave_channel_compat()
        spi: Fix Kconfig indentation
        spi: mediatek: add SPI_CS_HIGH support
        spi: st-ssc4: add missed pm_runtime_disable
        spi: tegra20-slink: add missed clk_unprepare
        spi: tegra20-slink: Use dma_request_chan() directly for channel request
        spi: tegra114: Use dma_request_chan() directly for channel request
        spi: s3c64xx: Use dma_request_chan() directly for channel request
        spi: qup: Use dma_request_chan() directly for channel request
        spi: pl022: Use dma_request_chan() directly for channel request
        spi: imx: Use dma_request_chan() directly for channel request
        spi: fsl-lpspi: Use dma_request_chan() directly for channel request
        spi: atmel: Use dma_request_chan() directly for channel request
        spi: at91-usart: Use dma_request_chan() directly for channel request
        spi: fsl-cpm: Correct the free:ing
        spi: Fix regression to return zero on success instead of positive value
        spi: pxa2xx: Add missed security checks
        spi: nxp-fspi: Use devm API to fix missed unregistration of controller
        spi: omap2-mcspi: Remove redundant checks
        ...
      a86f69d3
    • L
      Merge tag 'regulator-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator · d873a0cd
      Linus Torvalds 提交于
      Pull regulator updates from Mark Brown:
       "Another fairly quiet release for the regulator API, some work all
        around including some core work but mostly in specialist or driver
        specific code:
      
         - Fix for powering off boot-on regulators
      
         - Enhancements to the coupled regulator support introduced in the
           last release
      
         - Conversion of a bunch of drivers to the fwnode API for GPIOs
      
         - Mode support for DA9062
      
         - New device support for Qualcomm PM1650, PM8004 and PM895 and
           Silergy SR83X
      
         - Removal of obsolete AB8505 support"
      
      * tag 'regulator-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (49 commits)
        regulator: da9062: Return REGULATOR_MODE_INVALID for invalid mode
        regulator: Fix Kconfig indentation
        regulator: tps6105x: add optional devicetree support
        tps6105x: add optional devicetree support
        regulator: rn5t618: fix rc5t619 ldo10 enable
        regulator: vexpress: Use PTR_ERR_OR_ZERO() to simplify code
        dt-bindings: mfd: da9062: describe buck modes
        regulator: da9062: add of_map_mode support for bucks
        regulator: da9062: refactor buck modes into header
        regulator: stpmic1: Set a default ramp delay value
        regulator: core: Let boot-on regulators be powered off
        regulator: core: Don't try to remove device links if add failed
        regulator: ab8500: Remove SYSCLKREQ from enum ab8505_regulator_id
        regulator: ab8500: Remove AB8505 USB regulator
        regulator: fan53555: add chip id for Silergy SYR83X
        regulator: fixed: add off-on-delay
        dt-bindings: regulator: fixed: add off-on-delay-us property
        regulator: core: Allow generic coupling only for always-on regulators
        regulator: core: Release coupled_rdevs on regulator_init_coupling() error
        regulator: bd70528: Add MODULE_ALIAS to allow module auto loading
        ...
      d873a0cd
    • L
      Merge tag 'regmap-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap · 3b397c7c
      Linus Torvalds 提交于
      Pull regmap update from Mark Brown:
       "Just one patch for this release removing some dead code"
      
      * tag 'regmap-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap:
        regmap: regmap-w1: Drop unreachable code
      3b397c7c
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next · 386403a1
      Linus Torvalds 提交于
      Pull networking updates from David Miller:
       "Another merge window, another pull full of stuff:
      
         1) Support alternative names for network devices, from Jiri Pirko.
      
         2) Introduce per-netns netdev notifiers, also from Jiri Pirko.
      
         3) Support MSG_PEEK in vsock/virtio, from Matias Ezequiel Vara
            Larsen.
      
         4) Allow compiling out the TLS TOE code, from Jakub Kicinski.
      
         5) Add several new tracepoints to the kTLS code, also from Jakub.
      
         6) Support set channels ethtool callback in ena driver, from Sameeh
            Jubran.
      
         7) New SCTP events SCTP_ADDR_ADDED, SCTP_ADDR_REMOVED,
            SCTP_ADDR_MADE_PRIM, and SCTP_SEND_FAILED_EVENT. From Xin Long.
      
         8) Add XDP support to mvneta driver, from Lorenzo Bianconi.
      
         9) Lots of netfilter hw offload fixes, cleanups and enhancements,
            from Pablo Neira Ayuso.
      
        10) PTP support for aquantia chips, from Egor Pomozov.
      
        11) Add UDP segmentation offload support to igb, ixgbe, and i40e. From
            Josh Hunt.
      
        12) Add smart nagle to tipc, from Jon Maloy.
      
        13) Support L2 field rewrite by TC offloads in bnxt_en, from Venkat
            Duvvuru.
      
        14) Add a flow mask cache to OVS, from Tonghao Zhang.
      
        15) Add XDP support to ice driver, from Maciej Fijalkowski.
      
        16) Add AF_XDP support to ice driver, from Krzysztof Kazimierczak.
      
        17) Support UDP GSO offload in atlantic driver, from Igor Russkikh.
      
        18) Support it in stmmac driver too, from Jose Abreu.
      
        19) Support TIPC encryption and auth, from Tuong Lien.
      
        20) Introduce BPF trampolines, from Alexei Starovoitov.
      
        21) Make page_pool API more numa friendly, from Saeed Mahameed.
      
        22) Introduce route hints to ipv4 and ipv6, from Paolo Abeni.
      
        23) Add UDP segmentation offload to cxgb4, Rahul Lakkireddy"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next: (1857 commits)
        libbpf: Fix usage of u32 in userspace code
        mm: Implement no-MMU variant of vmalloc_user_node_flags
        slip: Fix use-after-free Read in slip_open
        net: dsa: sja1105: fix sja1105_parse_rgmii_delays()
        macvlan: schedule bc_work even if error
        enetc: add support Credit Based Shaper(CBS) for hardware offload
        net: phy: add helpers phy_(un)lock_mdio_bus
        mdio_bus: don't use managed reset-controller
        ax88179_178a: add ethtool_op_get_ts_info()
        mlxsw: spectrum_router: Fix use of uninitialized adjacency index
        mlxsw: spectrum_router: After underlay moves, demote conflicting tunnels
        bpf: Simplify __bpf_arch_text_poke poke type handling
        bpf: Introduce BPF_TRACE_x helper for the tracing tests
        bpf: Add bpf_jit_blinding_enabled for !CONFIG_BPF_JIT
        bpf, testing: Add various tail call test cases
        bpf, x86: Emit patchable direct jump as tail call
        bpf: Constant map key tracking for prog array pokes
        bpf: Add poke dependency tracking for prog array maps
        bpf: Add initial poke descriptor table for jit images
        bpf: Move owner type, jited info into array auxiliary data
        ...
      386403a1
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6 · 642356cb
      Linus Torvalds 提交于
      Pull crypto updates from Herbert Xu:
       "API:
         - Add library interfaces of certain crypto algorithms for WireGuard
         - Remove the obsolete ablkcipher and blkcipher interfaces
         - Move add_early_randomness() out of rng_mutex
      
        Algorithms:
         - Add blake2b shash algorithm
         - Add blake2s shash algorithm
         - Add curve25519 kpp algorithm
         - Implement 4 way interleave in arm64/gcm-ce
         - Implement ciphertext stealing in powerpc/spe-xts
         - Add Eric Biggers's scalar accelerated ChaCha code for ARM
         - Add accelerated 32r2 code from Zinc for MIPS
         - Add OpenSSL/CRYPTOGRAMS poly1305 implementation for ARM and MIPS
      
        Drivers:
         - Fix entropy reading failures in ks-sa
         - Add support for sam9x60 in atmel
         - Add crypto accelerator for amlogic GXL
         - Add sun8i-ce Crypto Engine
         - Add sun8i-ss cryptographic offloader
         - Add a host of algorithms to inside-secure
         - Add NPCM RNG driver
         - add HiSilicon HPRE accelerator
         - Add HiSilicon TRNG driver"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6: (285 commits)
        crypto: vmx - Avoid weird build failures
        crypto: lib/chacha20poly1305 - use chacha20_crypt()
        crypto: x86/chacha - only unregister algorithms if registered
        crypto: chacha_generic - remove unnecessary setkey() functions
        crypto: amlogic - enable working on big endian kernel
        crypto: sun8i-ce - enable working on big endian
        crypto: mips/chacha - select CRYPTO_SKCIPHER, not CRYPTO_BLKCIPHER
        hwrng: ks-sa - Enable COMPILE_TEST
        crypto: essiv - remove redundant null pointer check before kfree
        crypto: atmel-aes - Change data type for "lastc" buffer
        crypto: atmel-tdes - Set the IV after {en,de}crypt
        crypto: sun4i-ss - fix big endian issues
        crypto: sun4i-ss - hide the Invalid keylen message
        crypto: sun4i-ss - use crypto_ahash_digestsize
        crypto: sun4i-ss - remove dependency on not 64BIT
        crypto: sun4i-ss - Fix 64-bit size_t warnings on sun4i-ss-hash.c
        MAINTAINERS: Add maintainer for HiSilicon SEC V2 driver
        crypto: hisilicon - add DebugFS for HiSilicon SEC
        Documentation: add DebugFS doc for HiSilicon SEC
        crypto: hisilicon - add SRIOV for HiSilicon SEC
        ...
      642356cb
    • L
      Merge tag 'livepatching-for-5.5' of... · f8387675
      Linus Torvalds 提交于
      Merge tag 'livepatching-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching
      
      Pull livepatching updates from Petr Mladek:
      
       - New API to track system state changes done be livepatch callbacks. It
         helps to maintain compatibility between livepatches.
      
       - Update Kconfig help text. ORC is another reliable unwinder.
      
       - Disable generic selftest timeout. Livepatch selftests have their own
         per-operation fine-grained timeouts.
      
      * tag 'livepatching-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching:
        x86/stacktrace: update kconfig help text for reliable unwinders
        livepatch: Selftests of the API for tracking system state changes
        livepatch: Documentation of the new API for tracking system state changes
        livepatch: Allow to distinguish different version of system state changes
        livepatch: Basic API to track system state changes
        livepatch: Keep replaced patches until post_patch callback is called
        selftests/livepatch: Disable the timeout
      f8387675
    • L
      Merge tag 'printk-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk · 436b2a80
      Linus Torvalds 提交于
      Pull printk updates from Petr Mladek:
      
       - Allow to print symbolic error names via new %pe modifier.
      
       - Use pr_warn() instead of the remaining pr_warning() calls. Fix
         formatting of the related lines.
      
       - Add VSPRINTF entry to MAINTAINERS.
      
      * tag 'printk-for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/pmladek/printk: (32 commits)
        checkpatch: don't warn about new vsprintf pointer extension '%pe'
        MAINTAINERS: Add VSPRINTF
        tools lib api: Renaming pr_warning to pr_warn
        ASoC: samsung: Use pr_warn instead of pr_warning
        lib: cpu_rmap: Use pr_warn instead of pr_warning
        trace: Use pr_warn instead of pr_warning
        dma-debug: Use pr_warn instead of pr_warning
        vgacon: Use pr_warn instead of pr_warning
        fs: afs: Use pr_warn instead of pr_warning
        sh/intc: Use pr_warn instead of pr_warning
        scsi: Use pr_warn instead of pr_warning
        platform/x86: intel_oaktrail: Use pr_warn instead of pr_warning
        platform/x86: asus-laptop: Use pr_warn instead of pr_warning
        platform/x86: eeepc-laptop: Use pr_warn instead of pr_warning
        oprofile: Use pr_warn instead of pr_warning
        of: Use pr_warn instead of pr_warning
        macintosh: Use pr_warn instead of pr_warning
        idsn: Use pr_warn instead of pr_warning
        ide: Use pr_warn instead of pr_warning
        crypto: n2: Use pr_warn instead of pr_warning
        ...
      436b2a80
    • L
      Merge branch 'for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · 1b96a41b
      Linus Torvalds 提交于
      Pull cgroup updates from Tejun Heo:
       "There are several notable changes here:
      
         - Single thread migrating itself has been optimized so that it
           doesn't need threadgroup rwsem anymore.
      
         - Freezer optimization to avoid unnecessary frozen state changes.
      
         - cgroup ID unification so that cgroup fs ino is the only unique ID
           used for the cgroup and can be used to directly look up live
           cgroups through filehandle interface on 64bit ino archs. On 32bit
           archs, cgroup fs ino is still the only ID in use but it is only
           unique when combined with gen.
      
         - selftest and other changes"
      
      * 'for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup: (24 commits)
        writeback: fix -Wformat compilation warnings
        docs: cgroup: mm: Fix spelling of "list"
        cgroup: fix incorrect WARN_ON_ONCE() in cgroup_setup_root()
        cgroup: use cgrp->kn->id as the cgroup ID
        kernfs: use 64bit inos if ino_t is 64bit
        kernfs: implement custom exportfs ops and fid type
        kernfs: combine ino/id lookup functions into kernfs_find_and_get_node_by_id()
        kernfs: convert kernfs_node->id from union kernfs_node_id to u64
        kernfs: kernfs_find_and_get_node_by_ino() should only look up activated nodes
        kernfs: use dumber locking for kernfs_find_and_get_node_by_ino()
        netprio: use css ID instead of cgroup ID
        writeback: use ino_t for inodes in tracepoints
        kernfs: fix ino wrap-around detection
        kselftests: cgroup: Avoid the reuse of fd after it is deallocated
        cgroup: freezer: don't change task and cgroups status unnecessarily
        cgroup: use cgroup->last_bstat instead of cgroup->bstat_pending for consistency
        cgroup: remove cgroup_enable_task_cg_lists() optimization
        cgroup: pids: use atomic64_t for pids->limit
        selftests: cgroup: Run test_core under interfering stress
        selftests: cgroup: Add task migration tests
        ...
      1b96a41b
    • L
      Merge branch 'for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · 9391edee
      Linus Torvalds 提交于
      Pull workqueue updates from Tejun Heo:
       "There have been sporadic reports of sanity checks in
        destroy_workqueue() failing spuriously over the years. This contains
        the fix and its follow-up changes / fixes.
      
        There's also a RCU annotation improvement"
      
      * 'for-5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue: Add RCU annotation for pwq list walk
        workqueue: Fix pwq ref leak in rescuer_thread()
        workqueue: more destroy_workqueue() fixes
        workqueue: Minor follow-ups to the rescuer destruction change
        workqueue: Fix missing kfree(rescuer) in destroy_workqueue()
        workqueue: Fix spurious sanity check failures in destroy_workqueue()
      9391edee
    • L
      Merge tag 'threads-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux · 0acefef5
      Linus Torvalds 提交于
      Pull thread management updates from Christian Brauner:
      
       - A pidfd's fdinfo file currently contains the field "Pid:\t<pid>"
         where <pid> is the pid of the process in the pid namespace of the
         procfs instance the fdinfo file for the pidfd was opened in.
      
         The fdinfo file has now gained a new "NSpid:\t<ns-pid1>[\t<ns-pid2>[...]]"
         field which lists the pids of the process in all child pid namespaces
         provided the pid namespace of the procfs instance it is looked up
         under has an ancestoral relationship with the pid namespace of the
         process. If it does not 0 will be shown and no further pid namespaces
         will be listed. Tests included. (Christian Kellner)
      
       - If the process the pidfd references has already exited, print -1 for
         the Pid and NSpid fields in the pidfd's fdinfo file. Tests included.
         (me)
      
       - Add CLONE_CLEAR_SIGHAND. This lets callers clear all signal handler
         that are not SIG_DFL or SIG_IGN at process creation time. This
         originated as a feature request from glibc to improve performance and
         elimate races in their posix_spawn() implementation. Tests included.
         (me)
      
       - Add support for choosing a specific pid for a process with clone3().
         This is the feature which was part of the thread update for v5.4 but
         after a discussion at LPC in Lisbon we decided to delay it for one
         more cycle in order to make the interface more generic. This has now
         done. It is now possible to choose a specific pid in a whole pid
         namespaces (sub)hierarchy instead of just one pid namespace. In order
         to choose a specific pid the caller must have CAP_SYS_ADMIN in all
         owning user namespaces of the target pid namespaces. Tests included.
         (Adrian Reber)
      
       - Test improvements and extensions. (Andrei Vagin, me)
      
      * tag 'threads-v5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux:
        selftests/clone3: skip if clone3() is ENOSYS
        selftests/clone3: check that all pids are released on error paths
        selftests/clone3: report a correct number of fails
        selftests/clone3: flush stdout and stderr before clone3() and _exit()
        selftests: add tests for clone3() with *set_tid
        fork: extend clone3() to support setting a PID
        selftests: add tests for clone3()
        tests: test CLONE_CLEAR_SIGHAND
        clone3: add CLONE_CLEAR_SIGHAND
        pid: use pid_has_task() in pidfd_open()
        exit: use pid_has_task() in do_wait()
        pid: use pid_has_task() in __change_pid()
        test: verify fdinfo for pidfd of reaped process
        pidfd: check pid has attached task in fdinfo
        pidfd: add tests for NSpid info in fdinfo
        pidfd: add NSpid entries to fdinfo
      0acefef5
    • L
      Merge tag 'edac_for_5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras · 9c91e6a5
      Linus Torvalds 提交于
      Pull EDAC updates from Borislav Petkov:
       "A lot of changes this time around, details below.
      
        From the next cycle onwards, we'll switch the EDAC tree to topic
        branches (instead of a single edac-for-next branch) which should make
        the changes handling more flexible, hopefully. We'll see.
      
        Summary:
      
         - Rework error logging functions to accept a count of errors
           parameter (Hanna Hawa)
      
         - Part one of substantial EDAC core + ghes_edac driver cleanup
           (Robert Richter)
      
         - Print additional useful logging information in skx_* (Tony Luck)
      
         - Improve amd64_edac hw detection + cleanups (Yazen Ghannam)
      
         - Misc cleanups, fixes and code improvements"
      
      * tag 'edac_for_5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras: (35 commits)
        EDAC/altera: Use the Altera System Manager driver
        EDAC/altera: Cleanup the ECC Manager
        EDAC/altera: Use fast register IO for S10 IRQs
        EDAC/ghes: Do not warn when incrementing refcount on 0
        EDAC/Documentation: Describe CPER module definition and DIMM ranks
        EDAC: Unify the mc_event tracepoint call
        EDAC/ghes: Remove intermediate buffer pvt->detail_location
        EDAC/ghes: Fix grain calculation
        EDAC/ghes: Use standard kernel macros for page calculations
        EDAC: Remove misleading comment in struct edac_raw_error_desc
        EDAC/mc: Reduce indentation level in edac_mc_handle_error()
        EDAC/mc: Remove needless zero string termination
        EDAC/mc: Do not BUG_ON() in edac_mc_alloc()
        EDAC: Introduce an mci_for_each_dimm() iterator
        EDAC: Remove EDAC_DIMM_OFF() macro
        EDAC: Replace EDAC_DIMM_PTR() macro with edac_get_dimm() function
        EDAC/amd64: Get rid of the ECC disabled long message
        EDAC/ghes: Fix locking and memory barrier issues
        EDAC/amd64: Check for memory before fully initializing an instance
        EDAC/amd64: Use cached data when checking for ECC
        ...
      9c91e6a5
    • L
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · 752272f1
      Linus Torvalds 提交于
      Pull KVM updates from Paolo Bonzini:
       "ARM:
         - data abort report and injection
         - steal time support
         - GICv4 performance improvements
         - vgic ITS emulation fixes
         - simplify FWB handling
         - enable halt polling counters
         - make the emulated timer PREEMPT_RT compliant
      
        s390:
         - small fixes and cleanups
         - selftest improvements
         - yield improvements
      
        PPC:
         - add capability to tell userspace whether we can single-step the
           guest
         - improve the allocation of XIVE virtual processor IDs
         - rewrite interrupt synthesis code to deliver interrupts in virtual
           mode when appropriate.
         - minor cleanups and improvements.
      
        x86:
         - XSAVES support for AMD
         - more accurate report of nested guest TSC to the nested hypervisor
         - retpoline optimizations
         - support for nested 5-level page tables
         - PMU virtualization optimizations, and improved support for nested
           PMU virtualization
         - correct latching of INITs for nested virtualization
         - IOAPIC optimization
         - TSX_CTRL virtualization for more TAA happiness
         - improved allocation and flushing of SEV ASIDs
         - many bugfixes and cleanups"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (127 commits)
        kvm: nVMX: Relax guest IA32_FEATURE_CONTROL constraints
        KVM: x86: Grab KVM's srcu lock when setting nested state
        KVM: x86: Open code shared_msr_update() in its only caller
        KVM: Fix jump label out_free_* in kvm_init()
        KVM: x86: Remove a spurious export of a static function
        KVM: x86: create mmu/ subdirectory
        KVM: nVMX: Remove unnecessary TLB flushes on L1<->L2 switches when L1 use apic-access-page
        KVM: x86: remove set but not used variable 'called'
        KVM: nVMX: Do not mark vmcs02->apic_access_page as dirty when unpinning
        KVM: vmx: use MSR_IA32_TSX_CTRL to hard-disable TSX on guest that lack it
        KVM: vmx: implement MSR_IA32_TSX_CTRL disable RTM functionality
        KVM: x86: implement MSR_IA32_TSX_CTRL effect on CPUID
        KVM: x86: do not modify masked bits of shared MSRs
        KVM: x86: fix presentation of TSX feature in ARCH_CAPABILITIES
        KVM: PPC: Book3S HV: XIVE: Fix potential page leak on error path
        KVM: PPC: Book3S HV: XIVE: Free previous EQ page when setting up a new one
        KVM: nVMX: Assume TLB entries of L1 and L2 are tagged differently if L0 use EPT
        KVM: x86: Unexport kvm_vcpu_reload_apic_access_page()
        KVM: nVMX: add CR4_LA57 bit to nested CR4_FIXED1
        KVM: nVMX: Use semi-colon instead of comma for exit-handlers initialization
        ...
      752272f1
    • L
      Merge tag 'for-linus-5.5a-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 3f3c8be9
      Linus Torvalds 提交于
      Pull xen updates from Juergen Gross:
      
       - a small series to remove the build constraint of Xen x86 MCE handling
         to 64-bit only
      
       - a bunch of minor cleanups
      
      * tag 'for-linus-5.5a-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        xen: Fix Kconfig indentation
        xen/mcelog: also allow building for 32-bit kernels
        xen/mcelog: add PPIN to record when available
        xen/mcelog: drop __MC_MSR_MCGCAP
        xen/gntdev: Use select for DMA_SHARED_BUFFER
        xen: mm: make xen_mm_init static
        xen: mm: include <xen/xen-ops.h> for missing declarations
      3f3c8be9
    • L
      Merge tag 'mips_5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux · 2981dcf3
      Linus Torvalds 提交于
      Pull MIPS updates from Paul Burton:
       "The main MIPS changes for 5.5:
      
         - Atomics-related code sees some rework & cleanup, most notably
           allowing Loongson LL/SC errata workarounds to be more bulletproof &
           their correctness to be checked at build time.
      
         - Command line setup code is simplified somewhat, resolving various
           corner cases.
      
         - MIPS kernels can now be built with kcov code coverage support.
      
         - We can now build with CONFIG_FORTIFY_SOURCE=y.
      
         - Miscellaneous cleanups.
      
        And some platform specific changes:
      
         - We now disable some broken TLB functionality on certain Ingenic
           systems, and JZ4780 systems gain some devicetree nodes to support
           more devices.
      
         - Loongson support sees a number of cleanups, and we gain initial
           support for Loongson 3A R4 systems.
      
         - We gain support for MediaTek MT7688-based GARDENA Smart Gateway
           systems.
      
         - SGI IP27 (Origin 2*) see a number of fixes, cleanups &
           simplifications.
      
         - SGI IP30 (Octane) systems are now supported"
      
      * tag 'mips_5.5' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux: (107 commits)
        MIPS: SGI-IP27: Enable ethernet phy on second Origin 200 module
        MIPS: PCI: Fix fake subdevice ID for IOC3
        MIPS: Ingenic: Disable abandoned HPTLB function.
        MIPS: PCI: remember nasid changed by set interrupt affinity
        MIPS: SGI-IP27: Fix crash, when CPUs are disabled via nr_cpus parameter
        mips: add support for folded p4d page tables
        mips: drop __pXd_offset() macros that duplicate pXd_index() ones
        mips: fix build when "48 bits virtual memory" is enabled
        MIPS: math-emu: Reuse name array in debugfs_fpuemu()
        MIPS: allow building with kcov coverage
        MIPS: Loongson64: Drop setup_pcimap
        MIPS: Loongson2ef: Convert to early_printk_8250
        MIPS: Drop CPU_SUPPORTS_UNCACHED_ACCELERATED
        MIPS: Loongson{2ef, 32, 64} convert to generic fw cmdline
        MIPS: Drop pmon.h
        MIPS: Loongson: Unify LOONGSON3/LOONGSON64 Kconfig usage
        MIPS: Loongson: Rename LOONGSON1 to LOONGSON32
        MIPS: Loongson: Fix return value of loongson_hwmon_init
        MIPS: add support for SGI Octane (IP30)
        MIPS: PCI: make phys_to_dma/dma_to_phys for pci-xtalk-bridge common
        ...
      2981dcf3
    • L
      Merge tag 'm68k-for-v5.5-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k · 5ef30d74
      Linus Torvalds 提交于
      Pull m68k updates from Geert Uytterhoeven:
      
       - Atari Falcon IDE platform driver conversion for module autoload
      
       - defconfig updates (including enablement of Amiga ICY I2C)
      
       - small fixes and cleanups
      
      * tag 'm68k-for-v5.5-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
        m68k/atari: Convert Falcon IDE drivers to platform drivers
        m68k: defconfig: Enable ICY I2C and LTC2990 on Amiga
        m68k: defconfig: Update defconfigs for v5.4-rc1
        m68k: q40: Fix info-leak in rtc_ioctl
        nubus: Remove cast to void pointer
      5ef30d74
    • L
      Merge branch 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 28fcb77b
      Linus Torvalds 提交于
      Pull RAS updates from Borislav Petkov:
      
       - Fully reworked thermal throttling notifications, there should be no
         more spamming of dmesg (Srinivas Pandruvada and Benjamin Berg)
      
       - More enablement for the Intel-compatible CPUs Zhaoxin (Tony W
         Wang-oc)
      
       - PPIN support for Icelake (Tony Luck)
      
      * 'ras-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/mce/therm_throt: Optimize notifications of thermal throttle
        x86/mce: Add Xeon Icelake to list of CPUs that support PPIN
        x86/mce: Lower throttling MCE messages' priority to warning
        x86/mce: Add Zhaoxin LMCE support
        x86/mce: Add Zhaoxin CMCI support
        x86/mce: Add Zhaoxin MCE support
        x86/mce/amd: Make disable_err_thresholding() static
      28fcb77b
    • L
      Merge branch 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 63c2291f
      Linus Torvalds 提交于
      Pull x86 microcode updates from Borislav Petkov:
       "This converts the late loading method to load the microcode in
        parallel (vs sequentially currently). The patch remained in linux-next
        for the maximum amount of time so that any potential and hard to debug
        fallout be minimized.
      
        Now cloud folks have their milliseconds back but all the normal people
        should use early loading anyway :-)"
      
      * 'x86-microcode-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/microcode/intel: Issue the revision updated message only on the BSP
        x86/microcode: Update late microcode in parallel
        x86/microcode/amd: Fix two -Wunused-but-set-variable warnings
      63c2291f
    • L
      Merge tag 's390-5.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux · ea1f56fa
      Linus Torvalds 提交于
      Pull s390 updates from Vasily Gorbik:
      
       - Adjust PMU device drivers registration to avoid WARN_ON and few other
         perf improvements.
      
       - Enhance tracing in vfio-ccw.
      
       - Few stack unwinder fixes and improvements, convert get_wchan custom
         stack unwinding to generic api usage.
      
       - Fixes for mm helpers issues uncovered with tests validating
         architecture page table helpers.
      
       - Fix noexec bit handling when hardware doesn't support it.
      
       - Fix memleak and unsigned value compared with zero bugs in crypto
         code. Minor code simplification.
      
       - Fix crash during kdump with kasan enabled kernel.
      
       - Switch bug and alternatives from asm to asm_inline to improve
         inlining decisions.
      
       - Use 'depends on cc-option' for MARCH and TUNE options in Kconfig, add
         z13s and z14 ZR1 to TUNE descriptions.
      
       - Minor head64.S simplification.
      
       - Fix physical to logical CPU map for SMT.
      
       - Several cleanups in qdio code.
      
       - Other minor cleanups and fixes all over the code.
      
      * tag 's390-5.5-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (41 commits)
        s390/cpumf: Adjust registration of s390 PMU device drivers
        s390/smp: fix physical to logical CPU map for SMT
        s390/early: move access registers setup in C code
        s390/head64: remove unnecessary vdso_per_cpu_data setup
        s390/early: move control registers setup in C code
        s390/kasan: support memcpy_real with TRACE_IRQFLAGS
        s390/crypto: Fix unsigned variable compared with zero
        s390/pkey: use memdup_user() to simplify code
        s390/pkey: fix memory leak within _copy_apqns_from_user()
        s390/disassembler: don't hide instruction addresses
        s390/cpum_sf: Assign error value to err variable
        s390/cpum_sf: Replace function name in debug statements
        s390/cpum_sf: Use consistant debug print format for sampling
        s390/unwind: drop unnecessary code around calling ftrace_graph_ret_addr()
        s390: add error handling to perf_callchain_kernel
        s390: always inline current_stack_pointer()
        s390/mm: add mm_pxd_folded() checks to pxd_free()
        s390/mm: properly clear _PAGE_NOEXEC bit when it is not supported
        s390/mm: simplify page table helpers for large entries
        s390/mm: make pmd/pud_bad() report large entries as bad
        ...
      ea1f56fa
    • D
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next · 622dc5ad
      David S. Miller 提交于
      Daniel Borkmann says:
      
      ====================
      pull-request: bpf-next 2019-11-26
      
      The following pull-request contains BPF updates for your *net-next* tree.
      
      We've added 2 non-merge commits during the last 1 day(s) which contain
      a total of 2 files changed, 14 insertions(+), 3 deletions(-).
      
      The main changes, 2 small fixes are:
      
      1) Fix libbpf out of tree compilation which complained about unknown u32
         type used in libbpf_find_vmlinux_btf_id() which needs to be __u32 instead,
         from Andrii Nakryiko.
      
      2) Follow-up fix for the prior BPF mmap series where kbuild bot complained
         about missing vmalloc_user_node_flags() for no-MMU, also from Andrii Nakryiko.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      622dc5ad
    • L
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 4ba380f6
      Linus Torvalds 提交于
      Pull arm64 updates from Catalin Marinas:
       "Apart from the arm64-specific bits (core arch and perf, new arm64
        selftests), it touches the generic cow_user_page() (reviewed by
        Kirill) together with a macro for x86 to preserve the existing
        behaviour on this architecture.
      
        Summary:
      
         - On ARMv8 CPUs without hardware updates of the access flag, avoid
           failing cow_user_page() on PFN mappings if the pte is old. The
           patches introduce an arch_faults_on_old_pte() macro, defined as
           false on x86. When true, cow_user_page() makes the pte young before
           attempting __copy_from_user_inatomic().
      
         - Covert the synchronous exception handling paths in
           arch/arm64/kernel/entry.S to C.
      
         - FTRACE_WITH_REGS support for arm64.
      
         - ZONE_DMA re-introduced on arm64 to support Raspberry Pi 4
      
         - Several kselftest cases specific to arm64, together with a
           MAINTAINERS update for these files (moved to the ARM64 PORT entry).
      
         - Workaround for a Neoverse-N1 erratum where the CPU may fetch stale
           instructions under certain conditions.
      
         - Workaround for Cortex-A57 and A72 errata where the CPU may
           speculatively execute an AT instruction and associate a VMID with
           the wrong guest page tables (corrupting the TLB).
      
         - Perf updates for arm64: additional PMU topologies on HiSilicon
           platforms, support for CCN-512 interconnect, AXI ID filtering in
           the IMX8 DDR PMU, support for the CCPI2 uncore PMU in ThunderX2.
      
         - GICv3 optimisation to avoid a heavy barrier when accessing the
           ICC_PMR_EL1 register.
      
         - ELF HWCAP documentation updates and clean-up.
      
         - SMC calling convention conduit code clean-up.
      
         - KASLR diagnostics printed during boot
      
         - NVIDIA Carmel CPU added to the KPTI whitelist
      
         - Some arm64 mm clean-ups: use generic free_initrd_mem(), remove
           stale macro, simplify calculation in __create_pgd_mapping(), typos.
      
         - Kconfig clean-ups: CMDLINE_FORCE to depend on CMDLINE, choice for
           endinanness to help with allmodconfig"
      
      * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (93 commits)
        arm64: Kconfig: add a choice for endianness
        kselftest: arm64: fix spelling mistake "contiguos" -> "contiguous"
        arm64: Kconfig: make CMDLINE_FORCE depend on CMDLINE
        MAINTAINERS: Add arm64 selftests to the ARM64 PORT entry
        arm64: kaslr: Check command line before looking for a seed
        arm64: kaslr: Announce KASLR status on boot
        kselftest: arm64: fake_sigreturn_misaligned_sp
        kselftest: arm64: fake_sigreturn_bad_size
        kselftest: arm64: fake_sigreturn_duplicated_fpsimd
        kselftest: arm64: fake_sigreturn_missing_fpsimd
        kselftest: arm64: fake_sigreturn_bad_size_for_magic0
        kselftest: arm64: fake_sigreturn_bad_magic
        kselftest: arm64: add helper get_current_context
        kselftest: arm64: extend test_init functionalities
        kselftest: arm64: mangle_pstate_invalid_mode_el[123][ht]
        kselftest: arm64: mangle_pstate_invalid_daif_bits
        kselftest: arm64: mangle_pstate_invalid_compat_toggle and common utils
        kselftest: arm64: extend toplevel skeleton Makefile
        drivers/perf: hisi: update the sccl_id/ccl_id for certain HiSilicon platform
        arm64: mm: reserve CMA and crashkernel in ZONE_DMA32
        ...
      4ba380f6
    • L
      Merge tag 'linux-kselftest-5.5-rc1-kunit' of... · e25645b1
      Linus Torvalds 提交于
      Merge tag 'linux-kselftest-5.5-rc1-kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest
      
      Pull kselftest KUnit support gtom Shuah Khan:
       "This adds KUnit, a lightweight unit testing and mocking framework for
        the Linux kernel from Brendan Higgins.
      
        KUnit is not an end-to-end testing framework. It is currently
        supported on UML and sub-systems can write unit tests and run them in
        UML env. KUnit documentation is included in this update.
      
        In addition, this Kunit update adds 3 new kunit tests:
      
         - proc sysctl test from Iurii Zaikin
      
         - the 'list' doubly linked list test from David Gow
      
         - ext4 tests for decoding extended timestamps from Iurii Zaikin
      
        In the future KUnit will be linked to Kselftest framework to provide a
        way to trigger KUnit tests from user-space"
      
      * tag 'linux-kselftest-5.5-rc1-kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest: (23 commits)
        lib/list-test: add a test for the 'list' doubly linked list
        ext4: add kunit test for decoding extended timestamps
        Documentation: kunit: Fix verification command
        kunit: Fix '--build_dir' option
        kunit: fix failure to build without printk
        MAINTAINERS: add proc sysctl KUnit test to PROC SYSCTL section
        kernel/sysctl-test: Add null pointer test for sysctl.c:proc_dointvec()
        MAINTAINERS: add entry for KUnit the unit testing framework
        Documentation: kunit: add documentation for KUnit
        kunit: defconfig: add defconfigs for building KUnit tests
        kunit: tool: add Python wrappers for running KUnit tests
        kunit: test: add tests for KUnit managed resources
        kunit: test: add the concept of assertions
        kunit: test: add tests for kunit test abort
        kunit: test: add support for test abort
        objtool: add kunit_try_catch_throw to the noreturn list
        kunit: test: add initial tests
        lib: enable building KUnit in lib/
        kunit: test: add the concept of expectations
        kunit: test: add assertion printing library
        ...
      e25645b1