1. 15 Jul, 2017 2 commits
  2. 14 Jul, 2017 12 commits
    • Linus Torvalds's avatar
      Merge tag 'powerpc-4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · deed9deb
      Linus Torvalds authored
      Pull powerpc fixes from Michael Ellerman:
       "Nothing that really stands out, just a bunch of fixes that have come
        in in the last couple of weeks.
      
        None of these are actually fixes for code that is new in 4.13. It's
        roughly half older bugs, with fixes going to stable, and half
        fixes/updates for Power9.
      
        Thanks to: Aneesh Kumar K.V, Anton Blanchard, Balbir Singh, Benjamin
        Herrenschmidt, Madhavan Srinivasan, Michael Neuling, Nicholas Piggin,
        Oliver O'Halloran"
      
      * tag 'powerpc-4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux:
        powerpc/64: Fix atomic64_inc_not_zero() to return an int
        powerpc: Fix emulation of mfocrf in emulate_step()
        powerpc: Fix emulation of mcrf in emulate_step()
        powerpc/perf: Add POWER9 alternate PM_RUN_CYC and PM_RUN_INST_CMPL events
        powerpc/perf: Fix SDAR_MODE value for continous sampling on Power9
        powerpc/asm: Mark cr0 as clobbered in mftb()
        powerpc/powernv: Fix local TLB flush for boot and MCE on POWER9
        powerpc/mm/radix: Synchronize updates to the process table
        powerpc/mm/radix: Properly clear process table entry
        powerpc/powernv: Tell OPAL about our MMU mode on POWER9
        powerpc/kexec: Fix radix to hash kexec due to IAMR/AMOR
      deed9deb
    • Linus Torvalds's avatar
      Merge tag 'ntb-4.13' of git://github.com/jonmason/ntb · ccd5d1b9
      Linus Torvalds authored
      Pull NTB updates from Jon Mason:
       "The major change in the series is a rework of the NTB infrastructure
        to all for IDT hardware to be supported (and resulting fallout from
        that). There are also a few clean-ups, etc.
      
        New IDT NTB driver and changes to the NTB infrastructure to allow for
        this different kind of NTB HW, some style fixes (per Greg KH
        recommendation), and some ntb_test tweaks"
      
      * tag 'ntb-4.13' of git://github.com/jonmason/ntb:
        ntb_netdev: set the net_device's parent
        ntb: Add error path/handling to Debug FS entry creation
        ntb: Add more debugfs support for ntb_perf testing options
        ntb: Remove debug-fs variables from the context structure
        ntb: Add a module option to control affinity of DMA channels
        NTB: Add IDT 89HPESxNTx PCIe-switches support
        ntb_hw_intel: Style fixes: open code macros that just obfuscate code
        ntb_hw_amd: Style fixes: open code macros that just obfuscate code
        NTB: Add ntb.h comments
        NTB: Add PCIe Gen4 link speed
        NTB: Add new Memory Windows API documentation
        NTB: Add Messaging NTB API
        NTB: Alter Scratchpads API to support multi-ports devices
        NTB: Alter MW API to support multi-ports devices
        NTB: Alter link-state API to support multi-port devices
        NTB: Add indexed ports NTB API
        NTB: Make link-state API being declared first
        NTB: ntb_test: add parameter for doorbell bitmask
        NTB: ntb_test: modprobe on remote host
      ccd5d1b9
    • Linus Torvalds's avatar
      Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux · 4d25ec19
      Linus Torvalds authored
      Pull thermal management updates from Zhang Rui:
      
       - Improve thermal cpu_cooling interaction with cpufreq core.
      
         The cpu_cooling driver is designed to use CPU frequency scaling to
         avoid high thermal states for a platform. But it wasn't glued really
         well with cpufreq core.
      
         For example clipped-cpus is copied from the policy structure and its
         much better to use the policy->cpus (or related_cpus) fields directly
         as they may have got updated. Not that things were broken before this
         series, but they can be optimized a bit more.
      
         This series tries to improve interactions between cpufreq core and
         cpu_cooling driver and does some fixes/cleanups to the cpu_cooling
         driver. (Viresh Kumar)
      
       - A couple of fixes and cleanups in thermal core and imx, hisilicon,
         bcm_2835, int340x thermal drivers. (Arvind Yadav, Dan Carpenter,
         Sumeet Pawnikar, Srinivas Pandruvada, Willy WOLFF)
      
      * 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux: (24 commits)
        thermal: bcm2835: fix an error code in probe()
        thermal: hisilicon: Handle return value of clk_prepare_enable
        thermal: imx: Handle return value of clk_prepare_enable
        thermal: int340x: check for sensor when PTYP is missing
        Thermal/int340x: Fix few typos and kernel-doc style
        thermal: fix source code documentation for parameters
        thermal: cpu_cooling: Replace kmalloc with kmalloc_array
        thermal: cpu_cooling: Rearrange struct cpufreq_cooling_device
        thermal: cpu_cooling: 'freq' can't be zero in cpufreq_state2power()
        thermal: cpu_cooling: don't store cpu_dev in cpufreq_cdev
        thermal: cpu_cooling: get_level() can't fail
        thermal: cpu_cooling: create structure for idle time stats
        thermal: cpu_cooling: merge frequency and power tables
        thermal: cpu_cooling: get rid of 'allowed_cpus'
        thermal: cpu_cooling: OPPs are registered for all CPUs
        thermal: cpu_cooling: store cpufreq policy
        cpufreq: create cpufreq_table_count_valid_entries()
        thermal: cpu_cooling: use cpufreq_policy to register cooling device
        thermal: cpu_cooling: get rid of a variable in cpufreq_set_cur_state()
        thermal: cpu_cooling: remove cpufreq_cooling_get_level()
        ...
      4d25ec19
    • Linus Torvalds's avatar
      Merge tag 'mmc-v4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc · 907afe59
      Linus Torvalds authored
      Pull MMC fixes from Ulf Hansson:
       "Here are a couple of mmc fixes intended for v4.13 rc1.
      
        MMC core:
         - Restore some behaviour of MMC_IOC_MULTI_CMD commands
         - Fix using un-initialized variable in mmc_blk_issue_drv_op()
         - Fix mmc block queue cleanup
      
        MMC host:
         - sdhci-acpi: Workaround conflict with PCI wifi on GPD Win handheld
         - tmio-mmc: Fix bad pointer math"
      
      * tag 'mmc-v4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
        mmc: tmio-mmc: fix bad pointer math
        mmc: block: Prevent new req entering queue after its cleanup
        mmc: block: Let MMC_IOC_MULTI_CMD return zero again for zero entries
        mmc: block: Initialize ret in mmc_blk_issue_drv_op() for MMC_DRV_OP_IOCTL
        mmc: sdhci-acpi: Workaround conflict with PCI wifi on GPD Win handheld
      907afe59
    • Linus Torvalds's avatar
      Merge tag 'sound-fix-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 0a264b6d
      Linus Torvalds authored
      Pull sound fixes from Takashi Iwai:
       "Small last-minute fixes for 4.13-rc1: a couple of PCM fixes for m68k,
        a cleanup work for legacy ISA msnd driver, and a few HD-audio new IDs
        and quirks"
      
      * tag 'sound-fix-4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda - Add hdmi id for a Geminilake variant
        ALSA: hda/realtek - New codec device ID for ALC1220
        ALSA: pcm: Simplify check for dma_mmap_coherent() availability
        ALSA: pcm: Protect call to dma_mmap_coherent() by check for HAS_DMA
        ALSA: msnd: Optimize / harden DSP and MIDI loops
        ALSA: hda/realtek - change the location for one of two front microphones
        ALSA: opl4: Move inline before return type
      0a264b6d
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security · 1e5a2b1f
      Linus Torvalds authored
      Pull key handling fixes from James Morris:
       "A minor fix and documentation updates"
      
      * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
        KEYS: Add documentation for asymmetric keyring restrictions
        KEYS: DH: validate __spare field
        modsign: add markers to endif-statements in certs/Makefile
      1e5a2b1f
    • Linus Torvalds's avatar
      Merge tag 'clk-bulk-get-prep-enable' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux · 1430858f
      Linus Torvalds authored
      Pull clk api update from Stephen Boyd:
       "Small patch to add the clk_bulk_prepare_enable() and
        clk_bulk_disable_unprepare() API to the newly introduced
        clk bulk APIs.
      
        It would be good to get this into the -rc1 so that other
        driver trees can use it for code targeted for the next
        merge window"
      
      * tag 'clk-bulk-get-prep-enable' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
        clk: Provide bulk prepare_enable disable_unprepare variants
      1430858f
    • Linus Torvalds's avatar
      Merge tag 'pci-v4.13-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 2931dc7d
      Linus Torvalds authored
      Pull PCI fixes from Bjorn Helgaas:
      
       - fix a typo that broke Rockchip enumeration
      
       - fix a new memory leak in the ARM host bridge failure path
      
      * tag 'pci-v4.13-fixes-1' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci:
        PCI: rockchip: Check for pci_scan_root_bus_bridge() failure correctly
        ARM/PCI: Fix pcibios_init_resource() struct pci_host_bridge leak
      2931dc7d
    • Linus Torvalds's avatar
      Merge tag 'befs-v4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/luisbg/linux-befs · d3c329c7
      Linus Torvalds authored
      Pull single befs fix from Luis de Bethencourt:
       "Very little activity in the befs file system this time since I'm busy
        settling into a new job"
      
      * tag 'befs-v4.13-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/luisbg/linux-befs:
        befs: add kernel-doc formatting for befs_bt_read_super()
      d3c329c7
    • Mat Martineau's avatar
      KEYS: Add documentation for asymmetric keyring restrictions · 7228b66a
      Mat Martineau authored
      Provide more specific examples of keyring restrictions as applied to
      X.509 signature chain verification.
      Signed-off-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
      7228b66a
    • Eric Biggers's avatar
      KEYS: DH: validate __spare field · 4f9dabfa
      Eric Biggers authored
      Syscalls must validate that their reserved arguments are zero and return
      EINVAL otherwise.  Otherwise, it will be impossible to actually use them
      for anything in the future because existing programs may be passing
      garbage in.  This is standard practice when adding new APIs.
      
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarEric Biggers <ebiggers@google.com>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
      4f9dabfa
    • Jarkko Sakkinen's avatar
      modsign: add markers to endif-statements in certs/Makefile · 5ccbdbf9
      Jarkko Sakkinen authored
      It's a bit hard for eye to track certs/Makefile if you are not
      accustomed to it. This commit adds comments to key endif statements in
      order to help to keep the context while reading this file.
      Signed-off-by: default avatarJarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Signed-off-by: default avatarJames Morris <james.l.morris@oracle.com>
      5ccbdbf9
  3. 13 Jul, 2017 26 commits
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-4.13-1' of git://git.linux-nfs.org/projects/anna/linux-nfs · b86faee6
      Linus Torvalds authored
      Pull NFS client updates from Anna Schumaker:
       "Stable bugfixes:
         - Fix -EACCESS on commit to DS handling
         - Fix initialization of nfs_page_array->npages
         - Only invalidate dentries that are actually invalid
      
        Features:
         - Enable NFSoRDMA transparent state migration
         - Add support for lookup-by-filehandle
         - Add support for nfs re-exporting
      
        Other bugfixes and cleanups:
         - Christoph cleaned up the way we declare NFS operations
         - Clean up various internal structures
         - Various cleanups to commits
         - Various improvements to error handling
         - Set the dt_type of . and .. entries in NFS v4
         - Make slot allocation more reliable
         - Fix fscache stat printing
         - Fix uninitialized variable warnings
         - Fix potential list overrun in nfs_atomic_open()
         - Fix a race in NFSoRDMA RPC reply handler
         - Fix return size for nfs42_proc_copy()
         - Fix against MAC forgery timing attacks"
      
      * tag 'nfs-for-4.13-1' of git://git.linux-nfs.org/projects/anna/linux-nfs: (68 commits)
        NFS: Don't run wake_up_bit() when nobody is waiting...
        nfs: add export operations
        nfs4: add NFSv4 LOOKUPP handlers
        nfs: add a nfs_ilookup helper
        nfs: replace d_add with d_splice_alias in atomic_open
        sunrpc: use constant time memory comparison for mac
        NFSv4.2 fix size storage for nfs42_proc_copy
        xprtrdma: Fix documenting comments in frwr_ops.c
        xprtrdma: Replace PAGE_MASK with offset_in_page()
        xprtrdma: FMR does not need list_del_init()
        xprtrdma: Demote "connect" log messages
        NFSv4.1: Use seqid returned by EXCHANGE_ID after state migration
        NFSv4.1: Handle EXCHGID4_FLAG_CONFIRMED_R during NFSv4.1 migration
        xprtrdma: Don't defer MR recovery if ro_map fails
        xprtrdma: Fix FRWR invalidation error recovery
        xprtrdma: Fix client lock-up after application signal fires
        xprtrdma: Rename rpcrdma_req::rl_free
        xprtrdma: Pass only the list of registered MRs to ro_unmap_sync
        xprtrdma: Pre-mark remotely invalidated MRs
        xprtrdma: On invalidation failure, remove MWs from rl_registered
        ...
      b86faee6
    • Linus Torvalds's avatar
      Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending · 48ea2ced
      Linus Torvalds authored
      Pull SCSI target updates from Nicholas Bellinger:
       "It's been usually busy for summer, with most of the efforts centered
        around TCMU developments and various target-core + fabric driver bug
        fixing activities. Not particularly large in terms of LoC, but lots of
        smaller patches from many different folks.
      
        The highlights include:
      
         - ibmvscsis logical partition manager support (Michael Cyr + Bryant
           Ly)
      
         - Convert target/iblock WRITE_SAME to blkdev_issue_zeroout (hch +
           nab)
      
         - Add support for TMR percpu LUN reference counting (nab)
      
         - Fix a potential deadlock between EXTENDED_COPY and iscsi shutdown
           (Bart)
      
         - Fix COMPARE_AND_WRITE caw_sem leak during se_cmd quiesce (Jiang Yi)
      
         - Fix TMCU module removal (Xiubo Li)
      
         - Fix iser-target OOPs during login failure (Andrea Righi + Sagi)
      
         - Breakup target-core free_device backend driver callback (mnc)
      
         - Perform TCMU add/delete/reconfig synchronously (mnc)
      
         - Fix TCMU multiple UIO open/close sequences (mnc)
      
         - Fix TCMU CHECK_CONDITION sense handling (mnc)
      
         - Fix target-core SAM_STAT_BUSY + TASK_SET_FULL handling (mnc + nab)
      
         - Introduce TYPE_ZBC support in PSCSI (Damien Le Moal)
      
         - Fix possible TCMU memory leak + OOPs when recalculating cmd base
           size (Xiubo Li + Bryant Ly + Damien Le Moal + mnc)
      
         - Add login_keys_workaround attribute for non RFC initiators (Robert
           LeBlanc + Arun Easi + nab)"
      
      * 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending: (68 commits)
        iscsi-target: Add login_keys_workaround attribute for non RFC initiators
        Revert "qla2xxx: Fix incorrect tcm_qla2xxx_free_cmd use during TMR ABORT"
        tcmu: clean up the code and with one small fix
        tcmu: Fix possbile memory leak / OOPs when recalculating cmd base size
        target: export lio pgr/alua support as device attr
        target: Fix return sense reason in target_scsi3_emulate_pr_out
        target: Fix cmd size for PR-OUT in passthrough_parse_cdb
        tcmu: Fix dev_config_store
        target: pscsi: Introduce TYPE_ZBC support
        target: Use macro for WRITE_VERIFY_32 operation codes
        target: fix SAM_STAT_BUSY/TASK_SET_FULL handling
        target: remove transport_complete
        pscsi: finish cmd processing from pscsi_req_done
        tcmu: fix sense handling during completion
        target: add helper to copy sense to se_cmd buffer
        target: do not require a transport_complete for SCF_TRANSPORT_TASK_SENSE
        target: make device_mutex and device_list static
        tcmu: Fix flushing cmd entry dcache page
        tcmu: fix multiple uio open/close sequences
        tcmu: drop configured check in destroy
        ...
      48ea2ced
    • Trond Myklebust's avatar
      NFS: Don't run wake_up_bit() when nobody is waiting... · b4f937cf
      Trond Myklebust authored
      "perf lock" shows fairly heavy contention for the bit waitqueue locks
      when doing an I/O heavy workload.
      Use a bit to tell whether or not there has been contention for a lock
      so that we can optimise away the bit waitqueue options in those cases.
      Signed-off-by: default avatarTrond Myklebust <trond.myklebust@primarydata.com>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      b4f937cf
    • Peng Tao's avatar
      nfs: add export operations · 20fa1902
      Peng Tao authored
      This support for opening files on NFS by file handle, both through the
      open_by_handle syscall, and for re-exporting NFS (for example using a
      different version).  The support is very basic for now, as each open by
      handle will have to do an NFSv4 open operation on the wire.  In the
      future this will hopefully be mitigated by an open file cache, as well
      as various optimizations in NFS for this specific case.
      Signed-off-by: default avatarPeng Tao <tao.peng@primarydata.com>
      [hch: incorporated various changes, resplit the patches, new changelog]
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      20fa1902
    • Linus Torvalds's avatar
      Merge tag 'nfsd-4.13' of git://linux-nfs.org/~bfields/linux · 62403005
      Linus Torvalds authored
      Pull nfsd updates from Bruce Fields:
       "Chuck's RDMA update overhauls the "call receive" side of the
        RPC-over-RDMA transport to use the new rdma_rw API.
      
        Christoph cleaned the way nfs operations are declared, removing a
        bunch of function-pointer casts and declaring the operation vectors as
        const.
      
        Christoph's changes touch both client and server, and both client and
        server pulls this time around should be based on the same commits from
        Christoph"
      
      * tag 'nfsd-4.13' of git://linux-nfs.org/~bfields/linux: (53 commits)
        svcrdma: fix an incorrect check on -E2BIG and -EINVAL
        nfsd4: factor ctime into change attribute
        svcrdma: Remove svc_rdma_chunk_ctxt::cc_dir field
        svcrdma: use offset_in_page() macro
        svcrdma: Clean up after converting svc_rdma_recvfrom to rdma_rw API
        svcrdma: Clean-up svc_rdma_unmap_dma
        svcrdma: Remove frmr cache
        svcrdma: Remove unused Read completion handlers
        svcrdma: Properly compute .len and .buflen for received RPC Calls
        svcrdma: Use generic RDMA R/W API in RPC Call path
        svcrdma: Add recvfrom helpers to svc_rdma_rw.c
        sunrpc: Allocate up to RPCSVC_MAXPAGES per svc_rqst
        svcrdma: Don't account for Receive queue "starvation"
        svcrdma: Improve Reply chunk sanity checking
        svcrdma: Improve Write chunk sanity checking
        svcrdma: Improve Read chunk sanity checking
        svcrdma: Remove svc_rdma_marshal.c
        svcrdma: Avoid Send Queue overflow
        svcrdma: Squelch disconnection messages
        sunrpc: Disable splice for krb5i
        ...
      62403005
    • Linus Torvalds's avatar
      Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · 19c6e12c
      Linus Torvalds authored
      Pull ext2, udf, reiserfs fixes from Jan Kara:
       "Several ext2, udf, and reiserfs fixes"
      
      * 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        ext2: Fix memory leak when truncate races ext2_get_blocks
        reiserfs: fix race in prealloc discard
        reiserfs: don't preallocate blocks for extended attributes
        udf: Convert udf_disk_stamp_to_time() to use mktime64()
        udf: Use time64_to_tm for timestamp conversion
        udf: Fix deadlock between writeback and udf_setsize()
        udf: Use i_size_read() in udf_adinicb_writepage()
        udf: Fix races with i_size changes during readpage
        udf: Remove unused UDF_DEFAULT_BLOCKSIZE
      19c6e12c
    • Linus Torvalds's avatar
      Merge tag '4.13-fixes' of git://git.lwn.net/linux · 954e6e03
      Linus Torvalds authored
      Pull documentation fixes from Jonathan Corbet:
       "A set of fixes for various warnings, including the one caused by the
        removal of kernel/rcu/srcu.c. Also correct a stray pointer in
        memory-barriers.txt"
      
      * tag '4.13-fixes' of git://git.lwn.net/linux:
        kokr/memory-barriers.txt: Fix obsolete link to atomic_ops.txt
        memory-barriers.txt: Fix broken link to atomic_ops.txt
        docs: Turn off section numbering for the input docs
        docs: Include uaccess docs from the right file
        docs: Do not include from kernel/rcu/srcu.c
      954e6e03
    • Linus Torvalds's avatar
      Merge tag 'kbuild-v4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild · 80fc6238
      Linus Torvalds authored
      Pull more Kbuild updates from Masahiro Yamada:
      
       - Move generic-y of exported headers to uapi/asm/Kbuild for complete
         de-coupling of UAPI
      
       - Clean up scripts/Makefile.headersinst
      
       - Fix host programs for 32 bit machine with XFS file system
      
      * tag 'kbuild-v4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: (29 commits)
        kbuild: Enable Large File Support for hostprogs
        kbuild: remove wrapper files handling from Makefile.headersinst
        kbuild: split exported generic header creation into uapi-asm-generic
        kbuild: do not include old-kbuild-file from Makefile.headersinst
        xtensa: move generic-y of exported headers to uapi/asm/Kbuild
        unicore32: move generic-y of exported headers to uapi/asm/Kbuild
        tile: move generic-y of exported headers to uapi/asm/Kbuild
        sparc: move generic-y of exported headers to uapi/asm/Kbuild
        sh: move generic-y of exported headers to uapi/asm/Kbuild
        parisc: move generic-y of exported headers to uapi/asm/Kbuild
        openrisc: move generic-y of exported headers to uapi/asm/Kbuild
        nios2: move generic-y of exported headers to uapi/asm/Kbuild
        nios2: remove unneeded arch/nios2/include/(generated/)asm/signal.h
        microblaze: move generic-y of exported headers to uapi/asm/Kbuild
        metag: move generic-y of exported headers to uapi/asm/Kbuild
        m68k: move generic-y of exported headers to uapi/asm/Kbuild
        m32r: move generic-y of exported headers to uapi/asm/Kbuild
        ia64: remove redundant generic-y += kvm_para.h from asm/Kbuild
        hexagon: move generic-y of exported headers to uapi/asm/Kbuild
        h8300: move generic-y of exported headers to uapi/asm/Kbuild
        ...
      80fc6238
    • Linus Torvalds's avatar
      Merge tag 'trace-v4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · bc0f51d3
      Linus Torvalds authored
      Pull more tracing updates from Steven Rostedt:
       "A few more minor updates:
      
         - Show the tgid mappings for user space trace tools to use
      
         - Fix and optimize the comm and tgid cache recording
      
         - Sanitize derived kprobe names
      
         - Ftrace selftest updates
      
         - trace file header fix
      
         - Update of Documentation/trace/ftrace.txt
      
         - Compiler warning fixes
      
         - Fix possible uninitialized variable"
      
      * tag 'trace-v4.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        ftrace: Fix uninitialized variable in match_records()
        ftrace: Remove an unneeded NULL check
        ftrace: Hide cached module code for !CONFIG_MODULES
        tracing: Do note expose stack_trace_filter without DYNAMIC_FTRACE
        tracing: Update Documentation/trace/ftrace.txt
        tracing: Fixup trace file header alignment
        selftests/ftrace: Add a testcase for kprobe event naming
        selftests/ftrace: Add a test to probe module functions
        selftests/ftrace: Update multiple kprobes test for powerpc
        trace/kprobes: Sanitize derived event names
        tracing: Attempt to record other information even if some fail
        tracing: Treat recording tgid for idle task as a success
        tracing: Treat recording comm for idle task as a success
        tracing: Add saved_tgids file to show cached pid to tgid mappings
      bc0f51d3
    • Jeff Layton's avatar
      nfs4: add NFSv4 LOOKUPP handlers · 5b5faaf6
      Jeff Layton authored
      This will be needed in order to implement the get_parent export op
      for nfsd.
      Signed-off-by: default avatarJeff Layton <jeff.layton@primarydata.com>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      5b5faaf6
    • Peng Tao's avatar
      nfs: add a nfs_ilookup helper · f174ff7a
      Peng Tao authored
      This helper will allow to find an existing NFS inode by the file handle
      and fattr.
      Signed-off-by: default avatarPeng Tao <tao.peng@primarydata.com>
      [hch: split from a larger patch]
      Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      f174ff7a
    • Peng Tao's avatar
      nfs: replace d_add with d_splice_alias in atomic_open · 774d9513
      Peng Tao authored
      It's a trival change but follows knfsd export document that asks
      for d_splice_alias during lookup.
      Signed-off-by: default avatarPeng Tao <tao.peng@primarydata.com>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      774d9513
    • Jason A. Donenfeld's avatar
      sunrpc: use constant time memory comparison for mac · 15a8b93f
      Jason A. Donenfeld authored
      Otherwise, we enable a MAC forgery via timing attack.
      Signed-off-by: default avatarJason A. Donenfeld <Jason@zx2c4.com>
      Cc: "J. Bruce Fields" <bfields@fieldses.org>
      Cc: Jeff Layton <jlayton@poochiereds.net>
      Cc: Trond Myklebust <trond.myklebust@primarydata.com>
      Cc: Anna Schumaker <anna.schumaker@netapp.com>
      Cc: linux-nfs@vger.kernel.org
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      15a8b93f
    • Olga Kornievskaia's avatar
      NFSv4.2 fix size storage for nfs42_proc_copy · 1ee48bdd
      Olga Kornievskaia authored
      Return size of COPY is u64 but it was assigned to an "int" status.
      Signed-off-by: default avatarOlga Kornievskaia <kolga@netapp.com>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      1ee48bdd
    • Chuck Lever's avatar
      xprtrdma: Fix documenting comments in frwr_ops.c · 6afafa77
      Chuck Lever authored
      Clean up.
      
      FASTREG and LOCAL_INV WRs are typically not signaled. localinv_wake
      is used for the last LOCAL_INV WR in a chain, which is always
      signaled. The documenting comments should reflect that.
      Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      6afafa77
    • Chuck Lever's avatar
      xprtrdma: Replace PAGE_MASK with offset_in_page() · d933cc32
      Chuck Lever authored
      Clean up.
      
      Reported by: Geliang Tang <geliangtang@gmail.com>
      Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      d933cc32
    • Chuck Lever's avatar
      xprtrdma: FMR does not need list_del_init() · e2f6ef09
      Chuck Lever authored
      Clean up.
      
      Commit 38f1932e ("xprtrdma: Remove FMRs from the unmap list
      after unmapping") utilized list_del_init() to try to prevent some
      list corruption. The corruption was actually caused by the reply
      handler racing with a signal. Now that MR invalidation is properly
      serialized, list_del_init() can safely be replaced.
      Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      e2f6ef09
    • Chuck Lever's avatar
      xprtrdma: Demote "connect" log messages · 173b8f49
      Chuck Lever authored
      Some have complained about the log messages generated when xprtrdma
      opens or closes a connection to a server. When an NFS mount is
      mostly idle these can appear every few minutes as the client idles
      out the connection and reconnects.
      
      Connection and disconnection is a normal part of operation, and not
      exceptional, so change these to dprintk's for now. At some point
      all of these will be converted to tracepoints, but that's for
      another day.
      Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      173b8f49
    • Chuck Lever's avatar
      NFSv4.1: Use seqid returned by EXCHANGE_ID after state migration · 838edb94
      Chuck Lever authored
      Transparent State Migration copies a client's lease state from the
      server where a filesystem used to reside to the server where it now
      resides. When an NFSv4.1 client first contacts that destination
      server, it uses EXCHANGE_ID to detect trunking relationships.
      
      The lease that was copied there is returned to that client, but the
      destination server sets EXCHGID4_FLAG_CONFIRMED_R when replying to
      the client. This is because the lease was confirmed on the source
      server (before it was copied).
      
      When CONFIRMED_R is set, the client throws away the sequence ID
      returned by the server. During a Transparent State Migration, however
      there's no other way for the client to know what sequence ID to use
      with a lease that's been migrated.
      
      Therefore, the client must save and use the contrived slot sequence
      value returned by the destination server even when CONFIRMED_R is
      set.
      
      Note that some servers always return a seqid of 1 after a migration.
      Reported-by: default avatarXuan Qi <xuan.qi@oracle.com>
      Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      Tested-by: default avatarXuan Qi <xuan.qi@oracle.com>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      838edb94
    • Chuck Lever's avatar
      NFSv4.1: Handle EXCHGID4_FLAG_CONFIRMED_R during NFSv4.1 migration · 8dcbec6d
      Chuck Lever authored
      Transparent State Migration copies a client's lease state from the
      server where a filesystem used to reside to the server where it now
      resides. When an NFSv4.1 client first contacts that destination
      server, it uses EXCHANGE_ID to detect trunking relationships.
      
      The lease that was copied there is returned to that client, but the
      destination server sets EXCHGID4_FLAG_CONFIRMED_R when replying to
      the client. This is because the lease was confirmed on the source
      server (before it was copied).
      
      Normally, when CONFIRMED_R is set, a client purges the lease and
      creates a new one. However, that throws away the entire benefit of
      Transparent State Migration.
      
      Therefore, the client must not purge that lease when it is possible
      that Transparent State Migration has occurred.
      Reported-by: default avatarXuan Qi <xuan.qi@oracle.com>
      Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      Tested-by: default avatarXuan Qi <xuan.qi@oracle.com>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      8dcbec6d
    • Chuck Lever's avatar
      xprtrdma: Don't defer MR recovery if ro_map fails · 1f541895
      Chuck Lever authored
      Deferred MR recovery does a DMA-unmapping of the MW. However, ro_map
      invokes rpcrdma_defer_mr_recovery in some error cases where the MW
      has not even been DMA-mapped yet.
      
      Avoid a DMA-unmapping error replacing rpcrdma_defer_mr_recovery.
      
      Also note that if ib_dma_map_sg is asked to map 0 nents, it will
      return 0. So the extra "if (i == 0)" check is no longer needed.
      
      Fixes: 42fe28f6 ("xprtrdma: Do not leak an MW during a DMA ...")
      Fixes: 505bbe64 ("xprtrdma: Refactor MR recovery work queues")
      Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      1f541895
    • Chuck Lever's avatar
      xprtrdma: Fix FRWR invalidation error recovery · 8d75483a
      Chuck Lever authored
      When ib_post_send() fails, all LOCAL_INV WRs past @bad_wr have to be
      examined, and the MRs reset by hand.
      
      I'm not sure how the existing code can work by comparing R_keys.
      Restructure the logic so that instead it walks the chain of WRs,
      starting from the first bad one.
      
      Make sure to wait for completion if at least one WR was actually
      posted. Otherwise, if the ib_post_send fails, we can end up
      DMA-unmapping the MR while LOCAL_INV operations are in flight.
      
      Commit 7a89f9c6 ("xprtrdma: Honor ->send_request API contract")
      added the rdma_disconnect() call site. The disconnect actually
      causes more problems than it solves, and SQ overruns happen only as
      a result of software bugs. So remove it.
      
      Fixes: d7a21c1b ("xprtrdma: Reset MRs in frwr_op_unmap_sync()")
      Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      8d75483a
    • Chuck Lever's avatar
      xprtrdma: Fix client lock-up after application signal fires · 431af645
      Chuck Lever authored
      After a signal, the RPC client aborts synchronous RPCs running on
      behalf of the signaled application.
      
      The server is still executing those RPCs, and will write the results
      back into the client's memory when it's done. By the time the server
      writes the results, that memory is likely being used for other
      purposes. Therefore xprtrdma has to immediately invalidate all
      memory regions used by those aborted RPCs to prevent the server's
      writes from clobbering that re-used memory.
      
      With FMR memory registration, invalidation takes a relatively long
      time. In fact, the invalidation is often still running when the
      server tries to write the results into the memory regions that are
      being invalidated.
      
      This sets up a race between two processes:
      
      1.  After the signal, xprt_rdma_free calls ro_unmap_safe.
      2.  While ro_unmap_safe is still running, the server replies and
          rpcrdma_reply_handler runs, calling ro_unmap_sync.
      
      Both processes invoke ib_unmap_fmr on the same FMR.
      
      The mlx4 driver allows two ib_unmap_fmr calls on the same FMR at
      the same time, but HCAs generally don't tolerate this. Sometimes
      this can result in a system crash.
      
      If the HCA happens to survive, rpcrdma_reply_handler continues. It
      removes the rpc_rqst from rq_list and releases the transport_lock.
      This enables xprt_rdma_free to run in another process, and the
      rpc_rqst is released while rpcrdma_reply_handler is still waiting
      for the ib_unmap_fmr call to finish.
      
      But further down in rpcrdma_reply_handler, the transport_lock is
      taken again, and "rqst" is dereferenced. If "rqst" has already been
      released, this triggers a general protection fault. Since bottom-
      halves are disabled, the system locks up.
      
      Address both issues by reversing the order of the xprt_lookup_rqst
      call and the ro_unmap_sync call. Introduce a separate lookup
      mechanism for rpcrdma_req's to enable calling ro_unmap_sync before
      xprt_lookup_rqst. Now the handler takes the transport_lock once
      and holds it for the XID lookup and RPC completion.
      
      BugLink: https://bugzilla.linux-nfs.org/show_bug.cgi?id=305
      Fixes: 68791649 ('xprtrdma: Invalidate in the RPC reply ... ')
      Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      431af645
    • Chuck Lever's avatar
      xprtrdma: Rename rpcrdma_req::rl_free · a80d66c9
      Chuck Lever authored
      Clean up: I'm about to use the rl_free field for purposes other than
      a free list. So use a more generic name.
      
      This is a refactoring change only.
      
      BugLink: https://bugzilla.linux-nfs.org/show_bug.cgi?id=305
      Fixes: 68791649 ('xprtrdma: Invalidate in the RPC reply ... ')
      Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      a80d66c9
    • Chuck Lever's avatar
      xprtrdma: Pass only the list of registered MRs to ro_unmap_sync · 451d26e1
      Chuck Lever authored
      There are rare cases where an rpcrdma_req can be re-used (via
      rpcrdma_buffer_put) while the RPC reply handler is still running.
      This is due to a signal firing at just the wrong instant.
      
      Since commit 9d6b0409 ("xprtrdma: Place registered MWs on a
      per-req list"), rpcrdma_mws are self-contained; ie., they fully
      describe an MR and scatterlist, and no part of that information is
      stored in struct rpcrdma_req.
      
      As part of closing the above race window, pass only the req's list
      of registered MRs to ro_unmap_sync, rather than the rpcrdma_req
      itself.
      
      Some extra transport header sanity checking is removed. Since the
      client depends on its own recollection of what memory had been
      registered, there doesn't seem to be a way to abuse this change.
      
      And, the check was not terribly effective. If the client had sent
      Read chunks, the "list_empty" test is negative in both of the
      removed cases, which are actually looking for Write or Reply
      chunks.
      
      BugLink: https://bugzilla.linux-nfs.org/show_bug.cgi?id=305
      Fixes: 68791649 ('xprtrdma: Invalidate in the RPC reply ... ')
      Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      451d26e1
    • Chuck Lever's avatar
      xprtrdma: Pre-mark remotely invalidated MRs · 4b196dc6
      Chuck Lever authored
      There are rare cases where an rpcrdma_req and its matched
      rpcrdma_rep can be re-used, via rpcrdma_buffer_put, while the RPC
      reply handler is still using that req. This is typically due to a
      signal firing at just the wrong instant.
      
      As part of closing this race window, avoid using the wrong
      rpcrdma_rep to detect remotely invalidated MRs. Mark MRs as
      invalidated while we are sure the rep is still OK to use.
      
      BugLink: https://bugzilla.linux-nfs.org/show_bug.cgi?id=305
      Fixes: 68791649 ('xprtrdma: Invalidate in the RPC reply ... ')
      Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
      Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
      4b196dc6