1. 12 Dec, 2017 3 commits
    • Bart Van Assche's avatar
      scsi: core: Fix a scsi_show_rq() NULL pointer dereference · 14e3062f
      Bart Van Assche authored
      Avoid that scsi_show_rq() triggers a NULL pointer dereference if called
      after sd_uninit_command(). Swap the NULL pointer assignment and the
      mempool_free() call in sd_uninit_command() to make it less likely that
      scsi_show_rq() triggers a use-after-free. Note: even with these changes
      scsi_show_rq() can trigger a use-after-free but that's a lesser evil
      than e.g. suppressing debug information for T10 PI Type 2 commands
      completely. This patch fixes the following oops:
      
      BUG: unable to handle kernel NULL pointer dereference at (null)
      IP: scsi_format_opcode_name+0x1a/0x1c0
      CPU: 1 PID: 1881 Comm: cat Not tainted 4.14.0-rc2.blk_mq_io_hang+ #516
      Call Trace:
       __scsi_format_command+0x27/0xc0
       scsi_show_rq+0x5c/0xc0
       __blk_mq_debugfs_rq_show+0x116/0x130
       blk_mq_debugfs_rq_show+0xe/0x10
       seq_read+0xfe/0x3b0
       full_proxy_read+0x54/0x90
       __vfs_read+0x37/0x160
       vfs_read+0x96/0x130
       SyS_read+0x55/0xc0
       entry_SYSCALL_64_fastpath+0x1a/0xa5
      
      [mkp: added Type 2]
      
      Fixes: 0eebd005 ("scsi: Implement blk_mq_ops.show_rq()")
      Reported-by: default avatarMing Lei <ming.lei@redhat.com>
      Signed-off-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
      Cc: James E.J. Bottomley <jejb@linux.vnet.ibm.com>
      Cc: Martin K. Petersen <martin.petersen@oracle.com>
      Cc: Ming Lei <ming.lei@redhat.com>
      Cc: Christoph Hellwig <hch@lst.de>
      Cc: Hannes Reinecke <hare@suse.com>
      Cc: Johannes Thumshirn <jthumshirn@suse.de>
      Cc: stable@vger.kernel.org
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      14e3062f
    • Johannes Thumshirn's avatar
      scsi: MAINTAINERS: change FCoE list to linux-scsi · 3e5c6356
      Johannes Thumshirn authored
      fcoe-devel@open-fcoe.org is defunct and all patches are routed via the
      SCSI tree anyways.
      
      So update MAINTAINERS accordingly.
      Signed-off-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
      Reviewed-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      3e5c6356
    • Jason Yan's avatar
      scsi: libsas: fix length error in sas_smp_handler() · 621f6401
      Jason Yan authored
      The return value of smp_execute_task_sg() is the untransferred residual,
      but bsg_job_done() requires the length of payload received. This makes
      SMP passthrough commands from userland by sg ioctl to libsas get a wrong
      response. The userland tools such as smp_utils failed because of these
      wrong responses:
      
      ~#smp_discover /dev/bsg/expander-2\:13
      response too short, len=0
      ~#smp_discover /dev/bsg/expander-2\:134
      response too short, len=0
      
      Fix this by passing the actual received length to bsg_job_done(). And if
      smp_execute_task_sg() returns 0, this means received length is exactly
      the buffer length.
      
      [mkp: typo]
      
      Fixes: 651a0136 ("scsi: scsi_transport_sas: switch to bsg-lib for SMP passthrough")
      Cc: <stable@vger.kernel.org> # v4.14+
      Signed-off-by: default avatarJason Yan <yanaijie@huawei.com>
      Reported-by: default avatarchenqilin <chenqilin2@huawei.com>
      Tested-by: default avatarchenqilin <chenqilin2@huawei.com>
      CC: Christoph Hellwig <hch@lst.de>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      621f6401
  2. 08 Dec, 2017 2 commits
    • Arnd Bergmann's avatar
      scsi: bfa: fix type conversion warning · 48d83282
      Arnd Bergmann authored
      A regression fix introduced a harmless type mismatch warning:
      
      drivers/scsi/bfa/bfad_bsg.c: In function 'bfad_im_bsg_vendor_request':
      drivers/scsi/bfa/bfad_bsg.c:3137:35: error: initialization of 'struct bfad_im_port_s *' from 'long unsigned int' makes pointer from integer without a cast [-Werror=int-conversion]
        struct bfad_im_port_s *im_port = shost->hostdata[0];
                                         ^~~~~
      drivers/scsi/bfa/bfad_bsg.c: In function 'bfad_im_bsg_els_ct_request':
      drivers/scsi/bfa/bfad_bsg.c:3353:35: error: initialization of 'struct bfad_im_port_s *' from 'long unsigned int' makes pointer from integer without a cast [-Werror=int-conversion]
        struct bfad_im_port_s *im_port = shost->hostdata[0];
      
      This changes the code back to shost_priv() once more, but encapsulates
      it in an inline function to document the rather unusual way of
      using the private data only as a pointer to the previously allocated
      structure.
      
      I did not try to get rid of the extra indirection level entirely,
      which would have been rather invasive and required reworking the entire
      initialization sequence.
      
      Fixes: 45349821 ("scsi: bfa: fix access to bfad_im_port_s")
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
      Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      48d83282
    • Ming Lei's avatar
      scsi: core: run queue if SCSI device queue isn't ready and queue is idle · 7e70aa78
      Ming Lei authored
      Before commit 0df21c86 ("scsi: implement .get_budget and .put_budget
      for blk-mq"), we run queue after 3ms if queue is idle and SCSI device
      queue isn't ready, which is done in handling BLK_STS_RESOURCE. After
      commit 0df21c86 is introduced, queue won't be run any more under
      this situation.
      
      IO hang is observed when timeout happened, and this patch fixes the IO
      hang issue by running queue after delay in scsi_dev_queue_ready, just
      like non-mq. This issue can be triggered by the following script[1].
      
      There is another issue which can be covered by running idle queue: when
      .get_budget() is called on request coming from hctx->dispatch_list, if
      one request just completes during .get_budget(), we can't depend on
      SCSI's restart to make progress any more. This patch fixes the race too.
      
      With this patch, we basically recover to previous behaviour (before
      commit 0df21c86) of handling idle queue when running out of
      resource.
      
      [1] script for test/verify SCSI timeout
      rmmod scsi_debug
      modprobe scsi_debug max_queue=1
      
      DEVICE=`ls -d /sys/bus/pseudo/drivers/scsi_debug/adapter*/host*/target*/*/block/* | head -1 | xargs basename`
      DISK_DIR=`ls -d /sys/block/$DEVICE/device/scsi_disk/*`
      
      echo "using scsi device $DEVICE"
      echo "-1" >/sys/bus/pseudo/drivers/scsi_debug/every_nth
      echo "temporary write through" >$DISK_DIR/cache_type
      echo "128" >/sys/bus/pseudo/drivers/scsi_debug/opts
      echo none > /sys/block/$DEVICE/queue/scheduler
      dd if=/dev/$DEVICE of=/dev/null bs=1M iflag=direct count=1 &
      sleep 5
      echo "0" >/sys/bus/pseudo/drivers/scsi_debug/opts
      wait
      echo "SUCCESS"
      
      Fixes: 0df21c86 ("scsi: implement .get_budget and .put_budget for blk-mq")
      Signed-off-by: default avatarMing Lei <ming.lei@redhat.com>
      Tested-by: default avatarHolger Hoffstätte <holger@applied-asynchrony.com>
      Reviewed-by: default avatarBart Van Assche <bart.vanassche@wdc.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      7e70aa78
  3. 05 Dec, 2017 2 commits
  4. 29 Nov, 2017 4 commits
    • Johannes Thumshirn's avatar
      scsi: bfa: fix access to bfad_im_port_s · 45349821
      Johannes Thumshirn authored
      Commit 'cd21c605 ("scsi: fc: provide fc_bsg_to_shost() helper")'
      changed access to bfa's 'struct bfad_im_port_s' by using shost_priv()
      instead of shost->hostdata[0].
      
      This lead to crashes like in the following back-trace:
      
      task: ffff880046375300 ti: ffff8800a2ef8000 task.ti: ffff8800a2ef8000
      RIP: e030:[<ffffffffa04c8252>]  [<ffffffffa04c8252>] bfa_fcport_get_attr+0x82/0x260 [bfa]
      RSP: e02b:ffff8800a2efba10  EFLAGS: 00010046
      RAX: 575f415441536432 RBX: ffff8800a2efba28 RCX: 0000000000000000
      RDX: 0000000000000000 RSI: ffff8800a2efba28 RDI: ffff880004dc31d8
      RBP: ffff880004dc31d8 R08: 0000000000000000 R09: 0000000000000001
      R10: ffff88011fadc468 R11: 0000000000000001 R12: ffff880004dc31f0
      R13: 0000000000000200 R14: ffff880004dc61d0 R15: ffff880004947a10
      FS:  00007feb1e489700(0000) GS:ffff88011fac0000(0000) knlGS:0000000000000000
      CS:  e033 DS: 0000 ES: 0000 CR0: 000000008005003b
      CR2: 00007ffe14e46c10 CR3: 00000000957b8000 CR4: 0000000000000660
      Stack:
       ffff88001d4da000 ffff880004dc31c0 ffffffffa048a9df ffffffff81e56380
       0000000000000000 0000000000000000 0000000000000000 0000000000000000
      [] bfad_iocmd_ioc_get_info+0x4f/0x220 [bfa]
      [] bfad_iocmd_handler+0xa00/0xd40 [bfa]
      [] bfad_im_bsg_request+0xee/0x1b0 [bfa]
      [] fc_bsg_dispatch+0x10b/0x1b0 [scsi_transport_fc]
      [] bsg_request_fn+0x11d/0x1c0
      [] __blk_run_queue+0x2f/0x40
      [] blk_execute_rq_nowait+0xa8/0x160
      [] blk_execute_rq+0x77/0x120
      [] bsg_ioctl+0x1b6/0x200
      [] do_vfs_ioctl+0x2cd/0x4a0
      [] SyS_ioctl+0x74/0x80
      [] entry_SYSCALL_64_fastpath+0x12/0x6d
      
      Fixes: cd21c605 ("scsi: fc: provide fc_bsg_to_shost() helper")
      Signed-off-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
      Cc: Michal Koutný <mkoutny@suse.com>
      Reviewed-by: default avatarHannes Reinecke <hare@suse.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      45349821
    • Arnd Bergmann's avatar
      scsi: aacraid: address UBSAN warning regression · d1853975
      Arnd Bergmann authored
      As reported by Meelis Roos, my previous patch causes an incorrect
      calculation of the timeout, through an undefined signed integer
      overflow:
      
      [   12.228155] UBSAN: Undefined behaviour in drivers/scsi/aacraid/commsup.c:2514:49
      [   12.228229] signed integer overflow:
      [   12.228283] 964297611 * 250 cannot be represented in type 'long int'
      
      The problem is that doing a multiplication with HZ first and then
      dividing by USEC_PER_SEC worked correctly for 32-bit microseconds,
      but not for 32-bit nanoseconds, which would require up to 41 bits.
      
      This reworks the calculation to first convert the nanoseconds into
      jiffies, which should give us the same result as before and not overflow.
      
      Unfortunately I did not understand the exact intention of the algorithm,
      in particular the part where we add half a second, so it's possible that
      there is still a preexisting problem in this function. I added a comment
      that this would be handled more nicely using usleep_range(), which
      generally works better for waking up at a particular time than the
      current schedule_timeout() based implementation. I did not feel
      comfortable trying to implement that without being sure what the
      intent is here though.
      
      Fixes: 820f1886 ("scsi: aacraid: use timespec64 instead of timeval")
      Tested-by: default avatarMeelis Roos <mroos@linux.ee>
      Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      d1853975
    • Martin Wilck's avatar
      scsi: libfc: fix ELS request handling · fe55e795
      Martin Wilck authored
      The modification of fc_lport_recv_els_req() in commit fcabb09e ("scsi:
      libfc: directly call ELS request handlers") caused certain requests not to be
      handled at all.  Fix that.
      
      Fixes: fcabb09e ("scsi: libfc: directly call ELS request handlers")
      Signed-off-by: default avatarMartin Wilck <mwilck@suse.com>
      Reviewed-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      fe55e795
    • Dan Carpenter's avatar
      scsi: lpfc: Use after free in lpfc_rq_buf_free() · 9816ef6e
      Dan Carpenter authored
      The error message dereferences "rqb_entry" so we need to print it first
      and then free the buffer.
      
      Fixes: 6c621a22 ("scsi: lpfc: Separate NVMET RQ buffer posting from IO resources SGL/iocbq/context")
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Acked-by: default avatarDick Kennedy <dick.kennedy@broadcom.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      9816ef6e
  5. 22 Nov, 2017 4 commits
  6. 21 Nov, 2017 3 commits
    • Guilherme G. Piccoli's avatar
      scsi: aacraid: Prevent crash in case of free interrupt during scsi EH path · e4717292
      Guilherme G. Piccoli authored
      As part of the scsi EH path, aacraid performs a reinitialization of the
      adapter, which encompass freeing resources and IRQs, NULLifying lots of
      pointers, and then initialize it all over again.  We've identified a
      problem during the free IRQ portion of this path if CONFIG_DEBUG_SHIRQ
      is enabled on kernel config file.
      
      Happens that, in case this flag was set, right after free_irq()
      effectively clears the interrupt, it checks if it was requested as
      IRQF_SHARED. In positive case, it performs another call to the IRQ
      handler on driver. Problem is: since aacraid currently free some
      resources *before* freeing the IRQ, once free_irq() path calls the
      handler again (due to CONFIG_DEBUG_SHIRQ), aacraid crashes due to NULL
      pointer dereference with the following trace:
      
        aac_src_intr_message+0xf8/0x740 [aacraid]
        __free_irq+0x33c/0x4a0
        free_irq+0x78/0xb0
        aac_free_irq+0x13c/0x150 [aacraid]
        aac_reset_adapter+0x2e8/0x970 [aacraid]
        aac_eh_reset+0x3a8/0x5d0 [aacraid]
        scsi_try_host_reset+0x74/0x180
        scsi_eh_ready_devs+0xc70/0x1510
        scsi_error_handler+0x624/0xa20
      
      This patch prevents the crash by changing the order of the
      deinitialization in this path of aacraid: first we clear the IRQ, then
      we free other resources. No functional change intended.
      Signed-off-by: default avatarGuilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
      Reviewed-by: default avatarRaghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      e4717292
    • Guilherme G. Piccoli's avatar
      scsi: aacraid: Perform initialization reset only once · d9b6d85a
      Guilherme G. Piccoli authored
      Currently the driver accepts two ways of requesting an initialization
      reset on the adapter: by passing aac_reset_devices module parameter,
      or the generic kernel parameter reset_devices.
      
      It's working as intended...but if we end up reaching a scsi hang and
      the scsi EH mechanism takes place, aacraid performs resets as part of
      the scsi error recovery procedure. These EH routines might reinitialize
      the device, and if we have provided some of the reset parameters in the
      kernel command-line, we again perform an "initialization" reset.
      
      So, to avoid this duplication of resets in case of scsi EH path, this
      patch adds a field to aac_dev struct to keep per-adapter track of the
      init reset request - once it's done, we set it to false and don't
      proactively reset anymore in case of reinitializations.
      Signed-off-by: default avatarGuilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
      Reviewed-by: default avatarRaghava Aditya Renukunta <RaghavaAditya.Renukunta@microsemi.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      d9b6d85a
    • Guilherme G. Piccoli's avatar
      scsi: aacraid: Check for PCI state of device in a generic way · bd257b2f
      Guilherme G. Piccoli authored
      Commit 16ae9dd3 ("scsi: aacraid: Fix for excessive prints on EEH")
      introduced checks about the state of device before any PCI operations in
      the driver. Basically, this prevents it to perform PCI accesses when
      device is in the process of recover from a PCI error. In PowerPC, such
      mechanism is called EEH, and the aforementioned commit introduced checks
      that are based on EEH-specific primitives for that.
      
      The potential problems with this approach are three: first, these checks
      are "locked" to powerpc only - another archs could have error recovery
      methods too, like AER in Intel. Also, the powerpc primitives perform
      expensive FW accesses to validate the precise PCI state of a device.
      Finally, code becomes more complicated and needs ifdef validation based
      on arch config being set.
      
      So, this patch makes use of generic PCI state checks, which are
      lightweight and non-dependent of arch configs - also, it makes the code
      cleaner.
      
      Fixes: 16ae9dd3 ("scsi: aacraid: Fix for excessive prints on EEH")
      Signed-off-by: default avatarGuilherme G. Piccoli <gpiccoli@linux.vnet.ibm.com>
      Reviewed-by: default avatarDave Carroll <david.carroll@microsemi.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      bd257b2f
  7. 16 Nov, 2017 1 commit
  8. 15 Nov, 2017 21 commits
    • Chad Dupuis's avatar
      scsi: bnx2fc: Fix hung task messages when a cleanup response is not received during abort · faae19be
      Chad Dupuis authored
      If a cleanup task is not responded to while we are in bnx2fc_abts_cleanup, it
      will hang the SCSI error handler since we use wait_for_completion instead of
      wait_for_completion_timeout.  So, use wait_for_completion_timeout so that we
      don't hang the SCSI error handler thread forever.
      
      Fixes the call trace:
      
      [183373.131468] INFO: task scsi_eh_16:110146 blocked for more than 120 seconds.
      [183373.131469] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message.
      [183373.131470] scsi_eh_16      D ffff88103f2fca14     0 110146      2 0x00000080
      [183373.131472]  ffff880855e77cb0 0000000000000046 ffff881050654e70 ffff880855e77fd8
      [183373.131474]  ffff880855e77fd8 ffff880855e77fd8 ffff881050654e70 ffff88103f2fcb48
      [183373.131475]  ffff88103f2fcb50 7fffffffffffffff ffff881050654e70 ffff88103f2fca14
      [183373.131477] Call Trace:
      [183373.131479]  [<ffffffff8168b579>] schedule+0x29/0x70
      [183373.131481]  [<ffffffff81688fc9>] schedule_timeout+0x239/0x2d0
      [183373.131486]  [<ffffffff8142821e>] ? __dev_printk+0x3e/0x90
      [183373.131487]  [<ffffffff814282cd>] ? dev_printk+0x5d/0x80
      [183373.131490]  [<ffffffff8168b956>] wait_for_completion+0x116/0x170
      [183373.131492]  [<ffffffff810c4ec0>] ? wake_up_state+0x20/0x20
      [183373.131494]  [<ffffffffa048c234>] bnx2fc_abts_cleanup+0x3d/0x62 [bnx2fc]
      [183373.131497]  [<ffffffffa0483a80>] bnx2fc_eh_abort+0x470/0x580 [bnx2fc]
      [183373.131500]  [<ffffffff814570af>] scsi_error_handler+0x59f/0x8b0
      [183373.131501]  [<ffffffff81456b10>] ? scsi_eh_get_sense+0x250/0x250
      [183373.131503]  [<ffffffff810b052f>] kthread+0xcf/0xe0
      [183373.131505]  [<ffffffff810b0460>] ? kthread_create_on_node+0x140/0x140
      [183373.131507]  [<ffffffff81696418>] ret_from_fork+0x58/0x90
      [183373.131509]  [<ffffffff810b0460>] ? kthread_create_on_node+0x140/0x140
      Signed-off-by: default avatarChad Dupuis <chad.dupuis@cavium.com>
      Reviewed-by: default avatarLaurence Oberman <loberman@redhat.com>
      Tested-by: default avatarLaurence Oberman <loberman@redhat.com>
      Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
      faae19be
    • Linus Torvalds's avatar
      Merge tag 'ipmi-for-4.15' of git://github.com/cminyard/linux-ipmi · 6363b3f3
      Linus Torvalds authored
      Pull IPMI updates from Corey Minyard:
       "This is a fairly large rework of the IPMI code, along with a bunch of
        smaller fixes. The major changes have been in the next tree for a
        couple of months, so they should be good to do in.
      
         - Some users had IPMI systems where the GUID of the IPMI controller
           could change. So rescanning of the GUID was added. The naming of
           some sysfs things was dependent on the GUID, however, so this
           resulted in the sysfs interface code in IPMI changing to remove
           that dependency and name the IPMI BMCs like other sysfs devices.
      
         - The ipmi_si_intf.c code was fairly bloated with all the different
           discovery methods (PCI, ACPI, SMBIOS, OF, platform, module
           parameters, hot add). The structure of how the interfaces were
           added was redone to make them more modular, then the individual
           methods were pulled out into their own files"
      
      * tag 'ipmi-for-4.15' of git://github.com/cminyard/linux-ipmi: (48 commits)
        ipmi_si: Delete an error message for a failed memory allocation in try_smi_init()
        ipmi_si: fix memory leak on new_smi
        ipmi: remove redundant initialization of bmc
        ipmi: pr_err() strings should end with newlines
        ipmi: Clean up some print operations
        ipmi: Make the DMI probe into a generic platform probe
        ipmi: Make the IPMI proc interface configurable
        ipmi_ssif: Add device attrs for the things in proc
        ipmi_si: Add device attrs for the things in proc
        ipmi_si: remove ipmi_smi_alloc() function
        ipmi_si: Move port and mem I/O handling to their own files
        ipmi_si: Get rid of unused spacing and port fields
        ipmi_si: Move PARISC handling to another file
        ipmi_si: Move PCI setup to another file
        ipmi_si: Move platform device handling to another file
        ipmi_si: Move hardcode handling to a separate file.
        ipmi_si: Move the hotmod handling to another file.
        ipmi_si: Change ipmi_si_add_smi() to take just I/O info
        ipmi_si: Move io setup into io structure
        ipmi_si: Move irq setup handling into the io struct
        ...
      6363b3f3
    • Linus Torvalds's avatar
      Merge tag 'pci-v4.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci · 1b6115fb
      Linus Torvalds authored
      Pull PCI updates from Bjorn Helgaas:
      
        - detach driver before tearing down procfs/sysfs (Alex Williamson)
      
        - disable PCIe services during shutdown (Sinan Kaya)
      
        - fix ASPM oops on systems with no Root Ports (Ard Biesheuvel)
      
        - fix ASPM LTR_L1.2_THRESHOLD programming (Bjorn Helgaas)
      
        - fix ASPM Common_Mode_Restore_Time computation (Bjorn Helgaas)
      
        - fix portdrv MSI/MSI-X vector allocation (Dongdong Liu, Bjorn
          Helgaas)
      
        - report non-fatal AER errors only to the affected endpoint (Gabriele
          Paoloni)
      
        - distribute bus numbers, MMIO, and I/O space among hotplug bridges to
          allow more devices to be hot-added (Mika Westerberg)
      
        - fix pciehp races during initialization and surprise link down (Mika
          Westerberg)
      
        - handle surprise-removed devices in PME handling (Qiang)
      
        - support resizable BARs for large graphics devices (Christian König)
      
        - expose SR-IOV offset, stride, and VF device ID via sysfs (Filippo
          Sironi)
      
        - create SR-IOV virtfn/physfn sysfs links before attaching driver
          (Stuart Hayes)
      
        - fix SR-IOV "ARI Capable Hierarchy" restore issue (Tony Nguyen)
      
        - enforce Kconfig IOV/REALLOC dependency (Sascha El-Sharkawy)
      
        - avoid slot reset if bridge itself is broken (Jan Glauber)
      
        - clean up pci_reset_function() path (Jan H. Schönherr)
      
        - make pci_map_rom() fail if the option ROM is invalid (Changbin Du)
      
        - convert timers to timer_setup() (Kees Cook)
      
        - move PCI_QUIRKS to PCI bus Kconfig menu (Randy Dunlap)
      
        - constify pci_dev_type and intel_mid_pci_ops (Bhumika Goyal)
      
        - remove unnecessary pci_dev, pci_bus, resource, pcibios_set_master()
          declarations (Bjorn Helgaas)
      
        - fix endpoint framework overflows and BUG()s (Dan Carpenter)
      
        - fix endpoint framework issues (Kishon Vijay Abraham I)
      
        - avoid broken Cavium CN8xxx bus reset behavior (David Daney)
      
        - extend Cavium ACS capability quirks (Vadim Lomovtsev)
      
        - support Synopsys DesignWare RC in ECAM mode (Ard Biesheuvel)
      
        - turn off dra7xx clocks cleanly on shutdown (Keerthy)
      
        - fix Faraday probe error path (Wei Yongjun)
      
        - support HiSilicon STB SoC PCIe host controller (Jianguo Sun)
      
        - fix Hyper-V interrupt affinity issue (Dexuan Cui)
      
        - remove useless ACPI warning for Hyper-V pass-through devices (Vitaly
          Kuznetsov)
      
        - support multiple MSI on iProc (Sandor Bodo-Merle)
      
        - support Layerscape LS1012a and LS1046a PCIe host controllers (Hou
          Zhiqiang)
      
        - fix Layerscape default error response (Minghuan Lian)
      
        - support MSI on Tango host controller (Marc Gonzalez)
      
        - support Tegra186 PCIe host controller (Manikanta Maddireddy)
      
        - use generic accessors on Tegra when possible (Thierry Reding)
      
        - support V3 Semiconductor PCI host controller (Linus Walleij)
      
      * tag 'pci-v4.15-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci: (85 commits)
        PCI/ASPM: Add L1 Substates definitions
        PCI/ASPM: Reformat ASPM register definitions
        PCI/ASPM: Use correct capability pointer to program LTR_L1.2_THRESHOLD
        PCI/ASPM: Account for downstream device's Port Common_Mode_Restore_Time
        PCI: xgene: Rename xgene_pcie_probe_bridge() to xgene_pcie_probe()
        PCI: xilinx: Rename xilinx_pcie_link_is_up() to xilinx_pcie_link_up()
        PCI: altera: Rename altera_pcie_link_is_up() to altera_pcie_link_up()
        PCI: Fix kernel-doc build warning
        PCI: Fail pci_map_rom() if the option ROM is invalid
        PCI: Move pci_map_rom() error path
        PCI: Move PCI_QUIRKS to the PCI bus menu
        alpha/PCI: Make pdev_save_srm_config() static
        PCI: Remove unused declarations
        PCI: Remove redundant pci_dev, pci_bus, resource declarations
        PCI: Remove redundant pcibios_set_master() declarations
        PCI/PME: Handle invalid data when reading Root Status
        PCI: hv: Use effective affinity mask
        PCI: pciehp: Do not clear Presence Detect Changed during initialization
        PCI: pciehp: Fix race condition handling surprise link down
        PCI: Distribute available resources to hotplug-capable bridges
        ...
      1b6115fb
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma · ad0835a9
      Linus Torvalds authored
      Pull rdma updates from Doug Ledford:
       "This is a fairly plain pull request. Lots of driver updates across the
        stack, a huge number of static analysis cleanups including a close to
        50 patch series from Bart Van Assche, and a number of new features
        inside the stack such as general CQ moderation support.
      
        Nothing really stands out, but there might be a few conflicts as you
        take things in. In particular, the cleanups touched some of the same
        lines as the new timer_setup changes.
      
        Everything in this pull request has been through 0day and at least two
        days of linux-next (since Stephen doesn't necessarily flag new
        errors/warnings until day2). A few more items (about 30 patches) from
        Intel and Mellanox showed up on the list on Tuesday. I've excluded
        those from this pull request, and I'm sure some of them qualify as
        fixes suitable to send any time, but I still have to review them
        fully. If they contain mostly fixes and little or no new development,
        then I will probably send them through by the end of the week just to
        get them out of the way.
      
        There was a break in my acceptance of patches which coincides with the
        computer problems I had, and then when I got things mostly back under
        control I had a backlog of patches to process, which I did mostly last
        Friday and Monday. So there is a larger number of patches processed in
        that timeframe than I was striving for.
      
        Summary:
         - Add iWARP support to qedr driver
         - Lots of misc fixes across subsystem
         - Multiple update series to hns roce driver
         - Multiple update series to hfi1 driver
         - Updates to vnic driver
         - Add kref to wait struct in cxgb4 driver
         - Updates to i40iw driver
         - Mellanox shared pull request
         - timer_setup changes
         - massive cleanup series from Bart Van Assche
         - Two series of SRP/SRPT changes from Bart Van Assche
         - Core updates from Mellanox
         - i40iw updates
         - IPoIB updates
         - mlx5 updates
         - mlx4 updates
         - hns updates
         - bnxt_re fixes
         - PCI write padding support
         - Sparse/Smatch/warning cleanups/fixes
         - CQ moderation support
         - SRQ support in vmw_pvrdma"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (296 commits)
        RDMA/core: Rename kernel modify_cq to better describe its usage
        IB/mlx5: Add CQ moderation capability to query_device
        IB/mlx4: Add CQ moderation capability to query_device
        IB/uverbs: Add CQ moderation capability to query_device
        IB/mlx5: Exposing modify CQ callback to uverbs layer
        IB/mlx4: Exposing modify CQ callback to uverbs layer
        IB/uverbs: Allow CQ moderation with modify CQ
        iw_cxgb4: atomically flush the qp
        iw_cxgb4: only call the cq comp_handler when the cq is armed
        iw_cxgb4: Fix possible circular dependency locking warning
        RDMA/bnxt_re: report vlan_id and sl in qp1 recv completion
        IB/core: Only maintain real QPs in the security lists
        IB/ocrdma_hw: remove unnecessary code in ocrdma_mbx_dealloc_lkey
        RDMA/core: Make function rdma_copy_addr return void
        RDMA/vmw_pvrdma: Add shared receive queue support
        RDMA/core: avoid uninitialized variable warning in create_udata
        RDMA/bnxt_re: synchronize poll_cq and req_notify_cq verbs
        RDMA/bnxt_re: Flush CQ notification Work Queue before destroying QP
        RDMA/bnxt_re: Set QP state in case of response completion errors
        RDMA/bnxt_re: Add memory barriers when processing CQ/EQ entries
        ...
      ad0835a9
    • Linus Torvalds's avatar
      Merge branch 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup · 22714a2b
      Linus Torvalds authored
      Pull cgroup updates from Tejun Heo:
       "Cgroup2 cpu controller support is finally merged.
      
         - Basic cpu statistics support to allow monitoring by default without
           the CPU controller enabled.
      
         - cgroup2 cpu controller support.
      
         - /sys/kernel/cgroup files to help dealing with new / optional
           features"
      
      * 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup:
        cgroup: export list of cgroups v2 features using sysfs
        cgroup: export list of delegatable control files using sysfs
        cgroup: mark @cgrp __maybe_unused in cpu_stat_show()
        MAINTAINERS: relocate cpuset.c
        cgroup, sched: Move basic cpu stats from cgroup.stat to cpu.stat
        sched: Implement interface for cgroup unified hierarchy
        sched: Misc preps for cgroup unified hierarchy interface
        sched/cputime: Add dummy cputime_adjust() implementation for CONFIG_VIRT_CPU_ACCOUNTING_NATIVE
        cgroup: statically initialize init_css_set->dfl_cgrp
        cgroup: Implement cgroup2 basic CPU usage accounting
        cpuacct: Introduce cgroup_account_cputime[_field]()
        sched/cputime: Expose cputime_adjust()
      22714a2b
    • Linus Torvalds's avatar
      Merge branch 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu · 766ec76a
      Linus Torvalds authored
      Pull percpu update from Tejun Heo:
       "Another minor pull request. It only contains one commit which can
        reclaim a bit of memory wasted during boot on UP"
      
      * 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
        percpu: don't forget to free the temporary struct pcpu_alloc_info
      766ec76a
    • Linus Torvalds's avatar
      Merge branch 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq · 0be50036
      Linus Torvalds authored
      Pull workqueue updates from Tejun Heo:
       "There was a commit to make unbound kworkers respect cpu isolation but
        it conflicted with the restructuring of cpu isolation and got
        reverted, so the only thing left is the trivial comment fix.
      
        Will retry the cpu isolation change after this merge window"
      
      * 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq:
        workqueue: Fix comment for unbound workqueue's attrbutes
        Revert "workqueue: respect isolated cpus when queueing an unbound work"
        workqueue: respect isolated cpus when queueing an unbound work
      0be50036
    • Linus Torvalds's avatar
      Merge branch 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata · 1bc03573
      Linus Torvalds authored
      Pull libata updates from Tejun Heo:
       "Nothing too interesting or alarming. Other than a new power saving
        mode addition to ahci and crash fix on a tracepoint, all changes are
        trivial or device-specific"
      
      * 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata: (22 commits)
        ahci: imx: Handle increased read failures for IMX53 temperature sensor in low frequency mode.
        ata: sata_dwc_460ex: Propagate platform device ID to DMA driver
        ata: fixes kernel crash while tracing ata_eh_link_autopsy event
        ata: pata_pdc2027x: Fix space before '[' error.
        libata: fix spelling mistake: 'ambigious' -> 'ambiguous'
        ata: ceva: Add SMMU support for SATA IP
        ata: ceva: Correct the suspend and resume logic for SATA
        ata: ceva: Correct the AXI bus configuration for SATA ports
        ata: ceva: Add CCI support for SATA if CCI is enabled
        ata: ceva: Make RxWaterMark value as module parameter
        ata: ceva: Disable Device Sleep capability
        ata: ceva: Add gen 3 mode support in driver
        ata: ceva: Move sata port phy oob settings to device-tree
        devicetree: bindings: Add sata port phy config parameters in ahci-ceva
        ata: mark expected switch fall-throughs
        ata: sata_mv: remove a redundant assignment to pointer ehi
        ahci: Add support for Cavium's fifth generation SATA controller
        ata: sata_rcar: Use of_device_get_match_data() helper
        libata: make ata_port_type const
        libata: make static arrays const, reduces object code size
        ...
      1bc03573
    • Linus Torvalds's avatar
      Merge tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux · 1be2172e
      Linus Torvalds authored
      Pull module updates from Jessica Yu:
       "Summary of modules changes for the 4.15 merge window:
      
         - treewide module_param_call() cleanup, fix up set/get function
           prototype mismatches, from Kees Cook
      
         - minor code cleanups"
      
      * tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
        module: Do not paper over type mismatches in module_param_call()
        treewide: Fix function prototypes for module_param_call()
        module: Prepare to convert all module_param_call() prototypes
        kernel/module: Delete an error message for a failed memory allocation in add_module_usage()
      1be2172e
    • Linus Torvalds's avatar
      Merge tag 'mailbox-v4.15' of git://git.linaro.org/landing-teams/working/fujitsu/integration · 3c18767a
      Linus Torvalds authored
      Pull mailbox updates from Jassi Brar:
       "Change to POLL api and fixes for FlexRM and OMAP driver.
      
        Summary:
      
         - Core: Prefer ACK method over POLL, if both supported
      
         - Test: use flag instead of special character
      
         - FlexRM: Usual driver internal minor churn
      
         - Omap: fix error path"
      
      * tag 'mailbox-v4.15' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
        mailbox/omap: unregister mbox class
        mailbox: mailbox-test: don't rely on rx_buffer content to signal data ready
        mailbox: reset txdone_method TXDONE_BY_POLL if client knows_txdone
        mailbox: Build Broadcom FlexRM driver as loadable module for iProc SOCs
        mailbox: bcm-flexrm-mailbox: Use common GPL comment header
        mailbox: bcm-flexrm-mailbox: add depends on ARCH_BCM_IPROC
        mailbox: bcm-flexrm-mailbox: Print ring number in errors and warnings
        mailbox: bcm-flexrm-mailbox: Fix FlexRM ring flush sequence
      3c18767a
    • Linus Torvalds's avatar
      Merge tag 'for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply · 19b9aaf8
      Linus Torvalds authored
      Pull power supply and reset updates from Sebastian Reichel:
      
       - misc minor fixes
      
      * tag 'for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply:
        power: supply: cpcap-charger: fix incorrect return value check
        power: supply: replace pr_* with dev_*
        power: supply: pcf50633-charger: remove redundant variable charging_start
        power: supply: generic-adc-battery: remove redundant variable pdata
        power: supply: max8997: Improve a size determination in probe
      19b9aaf8
    • Linus Torvalds's avatar
      Merge tag 'hsi-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi · 6c4ba00c
      Linus Torvalds authored
      Pull HSI updates from Sebastian Reichel:
      
       - add HSI OMAP4 bindings
      
       - misc small fixes
      
      * tag 'hsi-for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi:
        dt-bindings: hsi: add omap4 hsi controller bindings
        HSI: hsi_char: pr_err() strings should end with newlines
        HSI: omap_ssi_core: fix kilo to be "k" not "K"
      6c4ba00c
    • Linus Torvalds's avatar
      Merge tag 'selinux-pr-20171113' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux · 8c38fb5c
      Linus Torvalds authored
      Pull SELinux updates from Paul Moore:
       "Seven SELinux patches for v4.15, although five of the seven are small
        build fixes and cleanups.
      
        Of the remaining two patches, the only one worth really calling out is
        Eric's fix for the SELinux filesystem xattr set/remove code; the other
        patch simply converts the SELinux hash table implementation to use
        kmem_cache.
      
        Eric's setxattr/removexattr tweak converts SELinux back to calling the
        commoncap implementations when the xattr is not SELinux related. The
        immediate win is to fixup filesystem capabilities in user namespaces,
        but it makes things a bit saner overall; more information in the
        commit description"
      
      * tag 'selinux-pr-20171113' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux:
        selinux: remove extraneous initialization of slots_used and max_chain_len
        selinux: remove redundant assignment to len
        selinux: remove redundant assignment to str
        selinux: fix build warning
        selinux: fix build warning by removing the unused sid variable
        selinux: Perform both commoncap and selinux xattr checks
        selinux: Use kmem_cache for hashtab_node
      8c38fb5c
    • Linus Torvalds's avatar
      Merge tag 'audit-pr-20171113' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit · f9bab267
      Linus Torvalds authored
      Pull audit updates from Paul Moore:
       "Another relatively small pull request for audit, nine patches total.
      
        The only real new bit of functionality is the patch from Richard which
        adds the ability to filter records based on the filesystem type.
      
        The remainder are bug fixes and cleanups; the bug fix highlights
        include:
      
         - ensuring that we properly audit init/PID-1 (me)
      
         - allowing the audit daemon to shutdown the kernel/auditd connection
           cleanly by setting the audit PID to zero (Steve)"
      
      * tag 'audit-pr-20171113' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit:
        audit: filter PATH records keyed on filesystem magic
        Audit: remove unused audit_log_secctx function
        audit: Allow auditd to set pid to 0 to end auditing
        audit: Add new syscalls to the perm=w filter
        audit: use audit_set_enabled() in audit_enable()
        audit: convert audit_ever_enabled to a boolean
        audit: don't use simple_strtol() anymore
        audit: initialize the audit subsystem as early as possible
        audit: ensure that 'audit=1' actually enables audit for PID 1
      f9bab267
    • Jann Horn's avatar
      mm/pagewalk.c: report holes in hugetlb ranges · 373c4557
      Jann Horn authored
      This matters at least for the mincore syscall, which will otherwise copy
      uninitialized memory from the page allocator to userspace.  It is
      probably also a correctness error for /proc/$pid/pagemap, but I haven't
      tested that.
      
      Removing the `walk->hugetlb_entry` condition in walk_hugetlb_range() has
      no effect because the caller already checks for that.
      
      This only reports holes in hugetlb ranges to callers who have specified
      a hugetlb_entry callback.
      
      This issue was found using an AFL-based fuzzer.
      
      v2:
       - don't crash on ->pte_hole==NULL (Andrew Morton)
       - add Cc stable (Andrew Morton)
      
      Fixes: 1e25a271 ("mincore: apply page table walker on do_mincore()")
      Signed-off-by: default avatarJann Horn <jannh@google.com>
      Cc: <stable@vger.kernel.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      373c4557
    • Linus Torvalds's avatar
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next · 5bbcc0f5
      Linus Torvalds authored
      Pull networking updates from David Miller:
       "Highlights:
      
         1) Maintain the TCP retransmit queue using an rbtree, with 1GB
            windows at 100Gb this really has become necessary. From Eric
            Dumazet.
      
         2) Multi-program support for cgroup+bpf, from Alexei Starovoitov.
      
         3) Perform broadcast flooding in hardware in mv88e6xxx, from Andrew
            Lunn.
      
         4) Add meter action support to openvswitch, from Andy Zhou.
      
         5) Add a data meta pointer for BPF accessible packets, from Daniel
            Borkmann.
      
         6) Namespace-ify almost all TCP sysctl knobs, from Eric Dumazet.
      
         7) Turn on Broadcom Tags in b53 driver, from Florian Fainelli.
      
         8) More work to move the RTNL mutex down, from Florian Westphal.
      
         9) Add 'bpftool' utility, to help with bpf program introspection.
            From Jakub Kicinski.
      
        10) Add new 'cpumap' type for XDP_REDIRECT action, from Jesper
            Dangaard Brouer.
      
        11) Support 'blocks' of transformations in the packet scheduler which
            can span multiple network devices, from Jiri Pirko.
      
        12) TC flower offload support in cxgb4, from Kumar Sanghvi.
      
        13) Priority based stream scheduler for SCTP, from Marcelo Ricardo
            Leitner.
      
        14) Thunderbolt networking driver, from Amir Levy and Mika Westerberg.
      
        15) Add RED qdisc offloadability, and use it in mlxsw driver. From
            Nogah Frankel.
      
        16) eBPF based device controller for cgroup v2, from Roman Gushchin.
      
        17) Add some fundamental tracepoints for TCP, from Song Liu.
      
        18) Remove garbage collection from ipv6 route layer, this is a
            significant accomplishment. From Wei Wang.
      
        19) Add multicast route offload support to mlxsw, from Yotam Gigi"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (2177 commits)
        tcp: highest_sack fix
        geneve: fix fill_info when link down
        bpf: fix lockdep splat
        net: cdc_ncm: GetNtbFormat endian fix
        openvswitch: meter: fix NULL pointer dereference in ovs_meter_cmd_reply_start
        netem: remove unnecessary 64 bit modulus
        netem: use 64 bit divide by rate
        tcp: Namespace-ify sysctl_tcp_default_congestion_control
        net: Protect iterations over net::fib_notifier_ops in fib_seq_sum()
        ipv6: set all.accept_dad to 0 by default
        uapi: fix linux/tls.h userspace compilation error
        usbnet: ipheth: prevent TX queue timeouts when device not ready
        vhost_net: conditionally enable tx polling
        uapi: fix linux/rxrpc.h userspace compilation errors
        net: stmmac: fix LPI transitioning for dwmac4
        atm: horizon: Fix irq release error
        net-sysfs: trigger netlink notification on ifalias change via sysfs
        openvswitch: Using kfree_rcu() to simplify the code
        openvswitch: Make local function ovs_nsh_key_attr_size() static
        openvswitch: Fix return value check in ovs_meter_cmd_features()
        ...
      5bbcc0f5
    • Linus Torvalds's avatar
      Merge tag 'mips_4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips · 892204e0
      Linus Torvalds authored
      Pull MIPS updates from James Hogan:
       "These are the main MIPS changes for 4.15.
      
        Fixes:
         - ralink: Fix MT7620 PCI build issues (4.5)
         - Disable cmpxchg64() and HAVE_VIRT_CPU_ACCOUNTING_GEN for 32-bit SMP
           (4.1)
         - Fix MIPS64 FP save/restore on 32-bit kernels (4.0)
         - ptrace: Pick up ptrace/seccomp changed syscall numbers (3.19)
         - ralink: Fix MT7628 pinmux (3.19)
         - BCM47XX: Fix LED inversion on WRT54GSv1 (3.17)
         - Fix n32 core dumping as o32 since regset support (3.13)
         - ralink: Drop obsolete USB_ARCH_HAS_HCD select
      
        Build system:
         - Default to "generic" (multiplatform) system type instead of IP22
         - Use generic little endian MIPS32 r2 configuration as default
           defconfig instead of ip22_defconfig
      
        FPU emulation:
         - Fix exception generation for certain R6 FPU instructions
      
        SMP:
         - Allow __cpu_number_map to be larger than NR_CPUS for sparse CPU id
           spaces
      
        Miscellaneous:
         - Add iomem resource for kernel bss section for kexec/kdump
         - Atomics: Nudge writes on bit unlock
         - DT files: Standardise "ok" -> "okay"
      
        Minor cleanups:
         - Define virt_to_pfn()
         - Make thread_saved_pc static
         - Simplify 32-bit sign extension in __read_64bit_c0_split()
         - DMA: Use vma_pages() helper
         - FPU emulation: Replace unsigned with unsigned int
         - MM: Removed unused lastpfn
         - Alchemy: Make clk_ops const
         - Lasat: Use setup_timer() helper
         - ralink: Use BIT() in MT7620 PCI driver
      
        Platform support:
      
        BMIPS:
        - Enable HARDIRQS_SW_RESEND
      
        Broadcom BCM63XX:
        - Add clkdev lookup support
        - Update clk driver, UART driver, DTs to handle named refclk from DTs
        - Split apart various clocks to more closely match hardware
        - Add ethernet clocks
      
        Cavium Octeon:
        - Remove usage of cvmx_wait() in favour of __delay()
      
        ImgTec Pistachio:
        - DT: Drop deprecated dwmmc num-slots property
      
        Ingenic JZ4780:
        - Add NFS root to Ci20 defconfig
        - Add watchdog to Ci20 DT & defconfig, and allow building of watchdog
          driver with this SoC
      
        Generic (multiplatform):
        - Migrate xilfpga (MIPSfpga) platform to the generic platform
      
        Lantiq xway:
        - Fix ASC0/ASC1 clocks"
      
      * tag 'mips_4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/mips: (46 commits)
        MIPS: Add iomem resource for kernel bss section.
        MIPS: cmpxchg64() and HAVE_VIRT_CPU_ACCOUNTING_GEN don't work for 32-bit SMP
        MIPS: BMIPS: Enable HARDIRQS_SW_RESEND
        MIPS: pci: Make use of the BIT() macro inside the mt7620 driver
        MIPS: pci: Remove KERN_WARN instance inside the mt7620 driver
        MIPS: pci: Remove duplicate define in mt7620 driver
        MIPS: ralink: Fix typo in mt7628 pinmux function
        MIPS: ralink: Fix MT7628 pinmux
        MIPS: Fix odd fp register warnings with MIPS64r2
        watchdog: jz4780: Allow selection of jz4740-wdt driver
        MIPS/ptrace: Update syscall nr on register changes
        MIPS/ptrace: Pick up ptrace/seccomp changed syscalls
        MIPS: Fix an n32 core file generation regset support regression
        MIPS: Fix MIPS64 FP save/restore on 32-bit kernels
        MIPS: page.h: Define virt_to_pfn()
        MIPS: Xilfpga: Switch to using generic defconfigs
        MIPS: generic: Add support for MIPSfpga
        MIPS: Set defconfig target to a generic system for 32r2el
        MIPS: Kconfig: Set default MIPS system type as generic
        MIPS: DTS: Remove num-slots from Pistachio SoC
        ...
      892204e0
    • Linus Torvalds's avatar
      Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · c9b012e5
      Linus Torvalds authored
      Pull arm64 updates from Will Deacon:
       "The big highlight is support for the Scalable Vector Extension (SVE)
        which required extensive ABI work to ensure we don't break existing
        applications by blowing away their signal stack with the rather large
        new vector context (<= 2 kbit per vector register). There's further
        work to be done optimising things like exception return, but the ABI
        is solid now.
      
        Much of the line count comes from some new PMU drivers we have, but
        they're pretty self-contained and I suspect we'll have more of them in
        future.
      
        Plenty of acronym soup here:
      
         - initial support for the Scalable Vector Extension (SVE)
      
         - improved handling for SError interrupts (required to handle RAS
           events)
      
         - enable GCC support for 128-bit integer types
      
         - remove kernel text addresses from backtraces and register dumps
      
         - use of WFE to implement long delay()s
      
         - ACPI IORT updates from Lorenzo Pieralisi
      
         - perf PMU driver for the Statistical Profiling Extension (SPE)
      
         - perf PMU driver for Hisilicon's system PMUs
      
         - misc cleanups and non-critical fixes"
      
      * tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (97 commits)
        arm64: Make ARMV8_DEPRECATED depend on SYSCTL
        arm64: Implement __lshrti3 library function
        arm64: support __int128 on gcc 5+
        arm64/sve: Add documentation
        arm64/sve: Detect SVE and activate runtime support
        arm64/sve: KVM: Hide SVE from CPU features exposed to guests
        arm64/sve: KVM: Treat guest SVE use as undefined instruction execution
        arm64/sve: KVM: Prevent guests from using SVE
        arm64/sve: Add sysctl to set the default vector length for new processes
        arm64/sve: Add prctl controls for userspace vector length management
        arm64/sve: ptrace and ELF coredump support
        arm64/sve: Preserve SVE registers around EFI runtime service calls
        arm64/sve: Preserve SVE registers around kernel-mode NEON use
        arm64/sve: Probe SVE capabilities and usable vector lengths
        arm64: cpufeature: Move sys_caps_initialised declarations
        arm64/sve: Backend logic for setting the vector length
        arm64/sve: Signal handling support
        arm64/sve: Support vector length resetting for new processes
        arm64/sve: Core task context handling
        arm64/sve: Low-level CPU setup
        ...
      c9b012e5
    • Linus Torvalds's avatar
      Merge tag 'riscv-for-linus-4.15-arch-v9-premerge' of... · b293fca4
      Linus Torvalds authored
      Merge tag 'riscv-for-linus-4.15-arch-v9-premerge' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/linux
      
      Pull RISC-V architecture support from Palmer Dabbelt:
       "This contains the core RISC-V Linux port, which has been through nine
        rounds of review on various mailing lists. The port is not complete:
        there's some cleanup patches moving through the review process, a
        whole bunch of drivers that need some work, and a lot of feature
        additions that will be needed.
      
        The patches contained in this tag have been through nine rounds of
        review on the various mailing lists. I have some outstanding cleanup
        patches, but since there's been so much review on these patches I
        thought it would be best to submit them as-is and then submit explicit
        cleanup patches so everyone can review them. This first patch set is
        big enough that it's a bit of a pain to constantly rewrite, and it's
        caused a few headaches with various contributors.
      
        The port is definately a work in progress. While what's there builds
        and boots with 4.14, it's a bit hard to actually see anything happen
        because there are no device drivers yet. I maintain a staging branch
        that contains all the device drivers and cleanup that actually works,
        but those patches won't all be ready for a while. I'd like to get what
        we currently have into your tree so everyone can start working from a
        single base -- of particular importance is allowing the glibc
        upstreaming process to proceed so we can sort out any possibly
        lingering user-visible ABI problems we might have.
      
        Copied below is the ChangeLog that contains the history of this patch
        set:
      
         (v9) As per suggestions on our v8 patch set, I've split the core
              architecture code out from our drivers and would like to submit
              this patch set to be included into linux-next, with the goal
              being to be merged in during the next merge window. This patch
              set is based on 4.14-rc2, but if it's better to have it based on
              something else then I can change it around.
      
              This patch set contains just the core arch code for RISC-V, so
              while it builds an nominally boots, you can't print or take an
              interrupt so it's not that useful. If you're looking to actually
              boot a system it would probably be better to use the full patch
              set listed below.
      
              We've collected a handful of tags from reviewers, and the
              remainder of the patch set only got minimal feedback last time.
              Here's what changed:
      
               - We now use the device tree to initialize the timer driver so
                 it's less tighly coupled with the arch port.
      
               - I cleaned up the defconfigs -- there's actually now just one,
                 and it's empty. For now I think we're OK with what the kernel
                 sets as defaults, but I anticipate we'll begin to expand this
                 as people start to use the port more.
      
               - The VDSO symbols version is sane.
      
               - We WFI while spinning in the boot loop.
      
               - A handful of comments have been added.
      
              While there are still a handful of FIXMEs in this patch set,
              we've started to get enough interest from various users and
              contributors that maintaining an out of tree patch set is
              starting to become a big burden. Hopefully the patches are good
              enough to merge now, which will at least get everyone working in
              a more reasonable manner as we clean up the remaining issues.
      
         (v8) I know it may not be the ideal time to submit a patch set right
              now, as it's the middle of the merge window, but things have
              calmed down quite a bit in the last month so I thought it would
              be good to get everyone on the same page. There's been a handful
              of changes since the last patch set, but most of them are fairly
              minor:
      
               - We changed PAGE_OFFSET to allowing mapping more physical
                 memory on 64-bit systems. This is user configurable, as it
                 triggers a different code model that generates slightly less
                 efficient code.
      
               - The device tree binding documentation is back, I'd managed to
                 lose it at some point.
      
               - We now pass the atomic64 test suite
      
               - The SBI timer driver has been refactored.
      
         (v7) It's been a while since my last patch set, but the changes han
              been fairly minimal:
      
               - The PCI cleanup patches have been dropped, we'll do them as a
                 separate patch set later.
      
               - We've the Kconfig entries from CONFIG_ISA_* to
                 CONFIG_RISCV_ISA_*, to make grep easier.
      
               - There have been a handful of memory model related tweaks in
                 I/O land, particularly relating the PCI and the upcoming
                 platform specification. There are significant comments in the
                 relevant files. This is still a WIP, but I think we're close
                 to getting as good as we're going to get until we end up with
                 some more specifications.
      
         (v6) As it's been only a day since the v5 patch set, the changes are
              pretty minimal:
      
               - The patch set is now based on linux-next/master, which I
                 believe is a better base now that we're getting closer to
                 upstream.
      
               - EARLY_PRINTK is no longer an option. Since the SBI console is
                 reasonable, there's no penalty to enabling it (and thus no
                 benefit to disabling it).
      
               - The mmap syscalls were refactored a bit.
      
         (v5) Things have really started to calm down, so this is fairly
              similar to the v4 patch set. The most interesting changes
              include:
      
               - We've moved back to a single patch set.
      
               - SMP support has been fixed, I was accidentally running on a
                 non-SMP configuration. There were various mistakes all over
                 the tree as a result of this.
      
               - The cmpxchg syscalls have been removed, as they were deemed a
                 bad idea. As a result, RISC-V Linux systems mandate the A
                 extension. The corresponding Kconfig entry to enable builds
                 on non-A systems has been removed.
      
               - A few more atomic fixes: mostly fence changes, but those
                 resulted in a handful of additional macros that were no
                 longer necessary.
      
               - riscv_early_sie has been removed.
      
         (v4) There have only been a few changes since the v3 patch set:
      
               - The cmpxchg64 syscall is no longer enabled on 32-bit systems.
                 It's not possible to provide this on SMP systems, and it's
                 not necessary as glibc knows not to call it.
      
               - We provide a ELF_HWCAP so users can determine the ISA of the
                 machine the kernel is running on.
      
               - The multi-line comments are in a better form.
      
               - There were a handful of headers that could be replaced with
                 the asm-generic versions, and a few unnecessary definitions.
      
               - We no longer use printk, but instead use pr_*.
      
               - A few Kconfig and defconfig entries have been cleaned up.
      
         (v3) A highlight of the changes since the v2 patch set includes:
      
               - We've split out all our drivers into separate patch sets,
                 which I've already sent out to the relevant maintainers. I
                 haven't included those patches in this patch set, but some of
                 them are necessary to build our port.
      
               - The patch set is now split up differently: rather than being
                 split per directory it is split per topic. Hopefully this
                 will make it easier to review the port on the mailing list.
                 The split is a bit rough, so you probably still want to look
                 at the patch set as a whole.
      
               - atomic.h has been completely rewritten and is hopefully now
                 correct. I've attempted to sanitize the various other memory
                 model related code as well, and I think it should all be sane
                 now aside from a handful of FIXMEs commented in the code.
      
               - We've changed the cmpexchg syscall to always exist and to not
                 be multiplexed. There is also a VDSO entry for compare and
                 exchange, which allows kernels with the A extension to
                 execute user code without the A extension reasonably fast.
      
               - Our user-visible register state now contains enough space for
                 the Q extension for 128-bit floating point, as well as a few
                 words to allow extensibility to future ISA extensions like
                 the eventual V extension for vectors.
      
               - A handful of driver cleanups, but these have been split into
                 separate patch sets now so I won't duplicate them here.
      
         (v2) A highlight of the changes since the v1 patch set includes:
      
               - We've split out our drivers into the right places, which
                 means now there's a lot more patches. I'll be submitting
                 these patches to various subsystem maintainers and including
                 them in any future RISC-V patch sets until they've been
                 merged.
      
               - The SBI console driver has been completely rewritten to use
                 the HVC helpers and is now significantly smaller.
      
               - We've begun to use weaker barriers as opposed to just the big
                 "fence". There's still some work to do here, specifically:
                  - We need fences in the relaxed MMIO functions.
                  - The non-relaxed MMIO functions are missing R/W bits on their fences.
                  - Many AMOs need the aq and rl bits set.
      
               - We now have thread_info in task_struct. As a result, sscratch
                 now contains TP instead of SP. This was necessary because
                 thread_info is no longer on the stack.
      
               - A few shared routines have been added that we use instead of
                 creating another arch copy"
      Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
      
      * tag 'riscv-for-linus-4.15-arch-v9-premerge' of git://git.kernel.org/pub/scm/linux/kernel/git/palmer/linux:
        RISC-V: Build Infrastructure
        RISC-V: User-facing API
        RISC-V: Paging and MMU
        RISC-V: Device, timer, IRQs, and the SBI
        RISC-V: Task implementation
        RISC-V: ELF and module implementation
        RISC-V: Generic library routines and assembly
        RISC-V: Atomic and Locking Code
        RISC-V: Init and Halt Code
        dt-bindings: RISC-V CPU Bindings
        lib: Add shared copies of some GCC library routines
        MAINTAINERS: Add RISC-V
      b293fca4
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching · 0ef76878
      Linus Torvalds authored
      Pull livepatching updates from Jiri Kosina:
      
       - shadow variables support, allowing livepatches to associate new
         "shadow" fields to existing data structures, from Joe Lawrence
      
       - pre/post patch callbacks API, allowing livepatch writers to register
         callbacks to be called before and after patch application, from Joe
         Lawrence
      
      * 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching:
        livepatch: __klp_disable_patch() should never be called for disabled patches
        livepatch: Correctly call klp_post_unpatch_callback() in error paths
        livepatch: add transition notices
        livepatch: move transition "complete" notice into klp_complete_transition()
        livepatch: add (un)patch callbacks
        livepatch: Small shadow variable documentation fixes
        livepatch: __klp_shadow_get_or_alloc() is local to shadow.c
        livepatch: introduce shadow variable API
      0ef76878
    • Linus Torvalds's avatar
      Merge branch 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/trivial · 9682b3de
      Linus Torvalds authored
      Pull trivial tree updates from Jiri Kosina:
       "The usual rocket-science from trivial tree for 4.15"
      
      * 'for-linus' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/jikos/trivial:
        MAINTAINERS: relinquish kconfig
        MAINTAINERS: Update my email address
        treewide: Fix typos in Kconfig
        kfifo: Fix comments
        init/Kconfig: Fix module signing document location
        misc: ibmasm: Return error on error path
        HID: logitech-hidpp: fix mistake in printk, "feeback" -> "feedback"
        MAINTAINERS: Correct path to uDraw PS3 driver
        tracing: Fix doc mistakes in trace sample
        tracing: Kconfig text fixes for CONFIG_HWLAT_TRACER
        MIPS: Alchemy: Remove reverted CONFIG_NETLINK_MMAP from db1xxx_defconfig
        mm/huge_memory.c: fixup grammar in comment
        lib/xz: Add fall-through comments to a switch statement
      9682b3de