1. 25 10月, 2019 3 次提交
    • L
      Merge tag 'acpi-5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 7f65d354
      Linus Torvalds 提交于
      Pull ACPI fix from Rafael Wysocki:
       "Fix locking issue in the error code path of a function that belongs to
        the sysfs interface exposed by the ACPI NFIT handling code (Dan
        Carpenter)"
      
      * tag 'acpi-5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI: NFIT: Fix unlock on error in scrub_show()
      7f65d354
    • L
      Merge tag 'pm-5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 5fa2845f
      Linus Torvalds 提交于
      Pull power management fixes from Rafael Wysocki:
       "These fix problems related to frequency limits management in cpufreq
        that were introduced during the 5.3 cycle (when PM QoS had started to
        be used for that), fix a few issues in the OPP (operating performance
        points) library code and fix up the recently added haltpoll cpuidle
        driver.
      
        The cpufreq changes are somewhat bigger that I would like them to be
        at this stage of the cycle, but the problems fixed by them include
        crashes on boot and shutdown in some cases (among other things) and in
        my view it is better to address the root of the issue right away.
      
        Specifics:
      
         - Using device PM QoS of CPU devices for managing frequency limits in
           cpufreq does not work, so introduce frequency QoS (based on the
           original low-level PM QoS) for this purpose, switch cpufreq and
           related code over to using it and fix a race involving deferred
           updates of frequency limits on top of that (Rafael Wysocki, Sudeep
           Holla).
      
         - Avoid calling regulator_enable()/disable() from the OPP framework
           to avoid side-effects on boot-enabled regulators that may change
           their initial voltage due to performing initial voltage balancing
           without all restrictions from the consumers (Marek Szyprowski).
      
         - Avoid a kref management issue in the OPP library code and drop an
           incorrectly added lockdep_assert_held() from it (Viresh Kumar).
      
         - Make the recently added haltpoll cpuidle driver take the 'idle='
           override into account as appropriate (Zhenzhong Duan)"
      
      * tag 'pm-5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        opp: Reinitialize the list_kref before adding the static OPPs again
        cpufreq: Cancel policy update work scheduled before freeing
        cpuidle: haltpoll: Take 'idle=' override into account
        opp: core: Revert "add regulators enable and disable"
        PM: QoS: Drop frequency QoS types from device PM QoS
        cpufreq: Use per-policy frequency QoS
        PM: QoS: Introduce frequency QoS
        opp: of: drop incorrect lockdep_assert_held()
      5fa2845f
    • L
      Merge tag 'gfs2-v5.4-rc4.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 · 65b15b7f
      Linus Torvalds 提交于
      Pull gfs2 fix from Andreas Gruenbacher:
       "Fix a memory leak introduced in -rc1"
      
      * tag 'gfs2-v5.4-rc4.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
        gfs2: Fix memory leak when gfs2meta's fs_context is freed
      65b15b7f
  2. 24 10月, 2019 8 次提交
    • A
      gfs2: Fix memory leak when gfs2meta's fs_context is freed · 30aecae8
      Andrew Price 提交于
      gfs2 and gfs2meta share an ->init_fs_context function which allocates an
      args structure stored in fc->fs_private. gfs2 registers a ->free
      function to free this memory when the fs_context is cleaned up, but
      there was not one registered for gfs2meta, causing a leak.
      
      Register a ->free function for gfs2meta. The existing gfs2_fc_free
      function does what we need.
      
      Reported-by: syzbot+c2fdfd2b783754878fb6@syzkaller.appspotmail.com
      Fixes: 1f52aa08 ("gfs2: Convert gfs2 to fs_context")
      Signed-off-by: NAndrew Price <anprice@redhat.com>
      Signed-off-by: NBob Peterson <rpeterso@redhat.com>
      Signed-off-by: NAndreas Gruenbacher <agruenba@redhat.com>
      30aecae8
    • R
      Merge branches 'pm-cpuidle' and 'pm-opp' · 767d2d71
      Rafael J. Wysocki 提交于
      * pm-cpuidle:
        cpuidle: haltpoll: Take 'idle=' override into account
      
      * pm-opp:
        opp: Reinitialize the list_kref before adding the static OPPs again
        opp: core: Revert "add regulators enable and disable"
        opp: of: drop incorrect lockdep_assert_held()
      767d2d71
    • L
      Merge tag 'mfd-fixes-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd · f116b966
      Linus Torvalds 提交于
      Pull MFD fix from Lee Jones:
       "Fix broken support for BananaPi-r2"
      
      * tag 'mfd-fixes-5.4' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd:
        mfd: mt6397: Fix probe after changing mt6397-core
      f116b966
    • L
      Merge tag 'sound-5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · f632bfaa
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "This is a usual small bump in the middle, we've got a set of ASoC
        fixes in this week as shown in diffstat.
      
        The only change in the core stuff is about (somewhat minor) PCM
        debugfs error handling. The major changes are rather for Intel SOF and
        topology coverage, as well as other platform (rockchip, samsung, stm)
        and codec fixes.
      
        As non-ASoC changes, a couple of new HD-audio chip fixes and a typo
        correction of USB-audio driver validation code are found"
      
      * tag 'sound-5.4-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (29 commits)
        ALSA: hda: Add Tigerlake/Jasperlake PCI ID
        ALSA: usb-audio: Fix copy&paste error in the validator
        ALSA: hda/realtek - Add support for ALC711
        ASoC: SOF: control: return true when kcontrol values change
        ASoC: stm32: sai: fix sysclk management on shutdown
        ASoC: Intel: sof-rt5682: add a check for devm_clk_get
        ASoC: rsnd: Reinitialize bit clock inversion flag for every format setting
        ASoC: simple_card_utils.h: Fix potential multiple redefinition error
        ASoC: msm8916-wcd-digital: add missing MIX2 path for RX1/2
        ASoC: core: Fix pcm code debugfs error
        ASoc: rockchip: i2s: Fix RPM imbalance
        ASoC: wm_adsp: Don't generate kcontrols without READ flags
        ASoC: intel: bytcr_rt5651: add null check to support_button_press
        ASoC: intel: sof_rt5682: add remove function to disable jack
        ASoC: rt5682: add NULL handler to set_jack function
        ASoC: intel: sof_rt5682: use separate route map for dmic
        ASoC: SOF: Intel: hda: Disable DMI L1 entry during capture
        ASoC: SOF: Intel: initialise and verify FW crash dump data.
        ASoC: SOF: Intel: hda: fix warnings during FW load
        ASoC: SOF: pcm: harden PCM STOP sequence
        ...
      f632bfaa
    • F
      mfd: mt6397: Fix probe after changing mt6397-core · 603d9299
      Frank Wunderlich 提交于
      Part 3 from this series [1] was not merged due to wrong splitting
      and breaks mt6323 pmic on bananapi-r2
      
      dmesg prints this line and at least switch is not initialized on bananapi-r2
      
      mt6397 1000d000.pwrap:mt6323: unsupported chip: 0x0
      
      this patch contains only the probe-changes and chip_data structs
      from original part 3 by Hsin-Hsiung Wang
      
      [1] https://patchwork.kernel.org/project/linux-mediatek/list/?series=164155
      
      Fixes: a4872e80 ("mfd: mt6397: Extract IRQ related code from core driver")
      Signed-off-by: NFrank Wunderlich <frank-w@public-files.de>
      Signed-off-by: NLee Jones <lee.jones@linaro.org>
      603d9299
    • L
      Merge tag 'trace-v5.4-rc3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · fa8a74de
      Linus Torvalds 提交于
      Pull tracing fixes from Steven Rostedt:
       "Two minor fixes:
      
         - A race in perf trace initialization (missing mutexes)
      
         - Minor fix to represent gfp_t in synthetic events as properly
           signed"
      
      * tag 'trace-v5.4-rc3-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Fix race in perf_trace_buf initialization
        tracing: Fix "gfp_t" format for synthetic events
      fa8a74de
    • L
      Merge tag 'vfio-v5.4-rc5' of git://github.com/awilliam/linux-vfio · 64131618
      Linus Torvalds 提交于
      Pull VFIO fixlet from Alex Williamson:
       "Fix (false) uninitialized variable warning (Joerg Roedel)"
      
      * tag 'vfio-v5.4-rc5' of git://github.com/awilliam/linux-vfio:
        vfio/type1: Initialize resv_msi_base
      64131618
    • L
      Merge tag 'regulator-fix-v5.4-rc4' of... · deed1d44
      Linus Torvalds 提交于
      Merge tag 'regulator-fix-v5.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
      
      Pull regulator fixes from Mark Brown:
       "There are a few core fixes here around error handling and handling if
        suspend mode configuration and some driver specific fixes here but the
        most important change is the fix to the fixed-regulator DT schema
        conversion introduced during the last merge window.
      
        That fixes one of the last two errors preventing successful execution
        of "make dt_binding_check" which will be enormously helpful for DT
        schema development"
      
      * tag 'regulator-fix-v5.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
        regulator: qcom-rpmh: Fix PMIC5 BoB min voltage
        regulator: pfuze100-regulator: Variable "val" in pfuze100_regulator_probe() could be uninitialized
        regulator: lochnagar: Add on_off_delay for VDDCORE
        regulator: ti-abb: Fix timeout in ti_abb_wait_txdone/ti_abb_clear_all_txdone
        regulator: da9062: fix suspend_enable/disable preparation
        dt-bindings: fixed-regulator: fix compatible enum
        regulator: fixed: Prevent NULL pointer dereference when !CONFIG_OF
        regulator: core: make regulator_register() EPROBE_DEFER aware
        regulator: of: fix suspend-min/max-voltage parsing
      deed1d44
  3. 23 10月, 2019 8 次提交
  4. 22 10月, 2019 6 次提交
    • T
      ALSA: usb-audio: Fix copy&paste error in the validator · ba8bf096
      Takashi Iwai 提交于
      The recently introduced USB-audio descriptor validator had a stupid
      copy&paste error that may lead to an unexpected overlook of too short
      descriptors for processing and extension units.  It's likely the cause
      of the report triggered by syzkaller fuzzer.  Let's fix it.
      
      Fixes: 57f87706 ("ALSA: usb-audio: More validations of descriptor units")
      Reported-by: syzbot+0620f79a1978b1133fd7@syzkaller.appspotmail.com
      Link: https://lore.kernel.org/r/s5hsgnkdbsl.wl-tiwai@suse.deSigned-off-by: NTakashi Iwai <tiwai@suse.de>
      ba8bf096
    • L
      Merge tag 'pinctrl-v5.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl · 3b7c59a1
      Linus Torvalds 提交于
      Pull pin control fixes from Linus Walleij:
       "Here is a bunch of pin control fixes. I was lagging behind on this
        one, some fixes should have come in earlier, sorry about that.
      
        Anyways here it is, pretty straight-forward fixes, the Strago fix
        stand out as something serious affecting a lot of machines.
      
        Summary:
         - Handle multiple instances of Intel chips without complaining.
         - Restore the Intel Strago DMI workaround
         - Make the Armada 37xx handle pins over 32
         - Fix the polarity of the LED group on Armada 37xx
         - Fix an off-by-one bug in the NS2 driver
         - Fix error path for iproc's platform_get_irq()
         - Fix error path on the STMFX driver
         - Fix a typo in the Berlin AS370 driver
         - Fix up misc errors in the Aspeed 2600 BMC support
         - Fix a stray SPDX tag"
      
      * tag 'pinctrl-v5.4-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
        pinctrl: aspeed-g6: Rename SD3 to EMMC and rework pin groups
        pinctrl: aspeed-g6: Fix UART13 group pinmux
        pinctrl: aspeed-g6: Make SIG_DESC_CLEAR() behave intuitively
        pinctrl: aspeed-g6: Fix I3C3/I3C4 pinmux configuration
        pinctrl: aspeed-g6: Fix I2C14 SDA description
        pinctrl: aspeed-g6: Sort pins for sanity
        dt-bindings: pinctrl: aspeed-g6: Rework SD3 function and groups
        pinctrl: berlin: as370: fix a typo s/spififib/spdifib
        pinctrl: armada-37xx: swap polarity on LED group
        pinctrl: stmfx: fix null pointer on remove
        pinctrl: iproc: allow for error from platform_get_irq()
        pinctrl: ns2: Fix off by one bugs in ns2_pinmux_enable()
        pinctrl: bcm-iproc: Use SPDX header
        pinctrl: armada-37xx: fix control of pins 32 and up
        pinctrl: cherryview: restore Strago DMI workaround for all versions
        pinctrl: intel: Allocate IRQ chip dynamic
      3b7c59a1
    • Z
      cpuidle: haltpoll: Take 'idle=' override into account · 31d85140
      Zhenzhong Duan 提交于
      Currenly haltpoll isn't aware of the 'idle=' override, the priority is
      'idle=poll' > haltpoll > 'idle=halt'. When 'idle=poll' is used, cpuidle
      driver is bypassed but current_driver in sys still shows 'haltpoll'.
      
      When 'idle=halt' is used, haltpoll takes precedence and makes
      'idle=halt' have no effect.
      
      Add a check to prevent the haltpoll driver from loading if 'idle=' is
      present.
      Signed-off-by: NZhenzhong Duan <zhenzhong.duan@oracle.com>
      Co-developed-by: NJoao Martins <joao.m.martins@oracle.com>
      [ rjw: Subject ]
      Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      31d85140
    • D
      ACPI: NFIT: Fix unlock on error in scrub_show() · edffc70f
      Dan Carpenter 提交于
      We change the locking in this function and forgot to update this error
      path so we are accidentally still holding the "dev->lockdep_mutex".
      
      Fixes: 87a30e1f ("driver-core, libnvdimm: Let device subsystems add local lockdep coverage")
      Signed-off-by: NDan Carpenter <dan.carpenter@oracle.com>
      Reviewed-by: NIra Weiny <ira.weiny@intel.com>
      Acked-by: NDan Williams <dan.j.williams@intel.com>
      Cc: 5.3+ <stable@vger.kernel.org> # 5.3+
      Signed-off-by: NRafael J. Wysocki <rafael.j.wysocki@intel.com>
      edffc70f
    • P
      tracing: Fix race in perf_trace_buf initialization · 6b1340cc
      Prateek Sood 提交于
      A race condition exists while initialiazing perf_trace_buf from
      perf_trace_init() and perf_kprobe_init().
      
            CPU0                                        CPU1
      perf_trace_init()
        mutex_lock(&event_mutex)
          perf_trace_event_init()
            perf_trace_event_reg()
              total_ref_count == 0
      	buf = alloc_percpu()
              perf_trace_buf[i] = buf
              tp_event->class->reg() //fails       perf_kprobe_init()
      	goto fail                              perf_trace_event_init()
                                                       perf_trace_event_reg()
              fail:
      	  total_ref_count == 0
      
                                                         total_ref_count == 0
                                                         buf = alloc_percpu()
                                                         perf_trace_buf[i] = buf
                                                         tp_event->class->reg()
                                                         total_ref_count++
      
                free_percpu(perf_trace_buf[i])
                perf_trace_buf[i] = NULL
      
      Any subsequent call to perf_trace_event_reg() will observe total_ref_count > 0,
      causing the perf_trace_buf to be always NULL. This can result in perf_trace_buf
      getting accessed from perf_trace_buf_alloc() without being initialized. Acquiring
      event_mutex in perf_kprobe_init() before calling perf_trace_event_init() should
      fix this race.
      
      The race caused the following bug:
      
       Unable to handle kernel paging request at virtual address 0000003106f2003c
       Mem abort info:
         ESR = 0x96000045
         Exception class = DABT (current EL), IL = 32 bits
         SET = 0, FnV = 0
         EA = 0, S1PTW = 0
       Data abort info:
         ISV = 0, ISS = 0x00000045
         CM = 0, WnR = 1
       user pgtable: 4k pages, 39-bit VAs, pgdp = ffffffc034b9b000
       [0000003106f2003c] pgd=0000000000000000, pud=0000000000000000
       Internal error: Oops: 96000045 [#1] PREEMPT SMP
       Process syz-executor (pid: 18393, stack limit = 0xffffffc093190000)
       pstate: 80400005 (Nzcv daif +PAN -UAO)
       pc : __memset+0x20/0x1ac
       lr : memset+0x3c/0x50
       sp : ffffffc09319fc50
      
        __memset+0x20/0x1ac
        perf_trace_buf_alloc+0x140/0x1a0
        perf_trace_sys_enter+0x158/0x310
        syscall_trace_enter+0x348/0x7c0
        el0_svc_common+0x11c/0x368
        el0_svc_handler+0x12c/0x198
        el0_svc+0x8/0xc
      
      Ramdumps showed the following:
        total_ref_count = 3
        perf_trace_buf = (
            0x0 -> NULL,
            0x0 -> NULL,
            0x0 -> NULL,
            0x0 -> NULL)
      
      Link: http://lkml.kernel.org/r/1571120245-4186-1-git-send-email-prsood@codeaurora.org
      
      Cc: stable@vger.kernel.org
      Fixes: e12f03d7 ("perf/core: Implement the 'perf_kprobe' PMU")
      Acked-by: NSong Liu <songliubraving@fb.com>
      Signed-off-by: NPrateek Sood <prsood@codeaurora.org>
      Signed-off-by: NSteven Rostedt (VMware) <rostedt@goodmis.org>
      6b1340cc
    • A
      ARM: 8926/1: v7m: remove register save to stack before svc · 2ecb2879
      afzal mohammed 提交于
      r0-r3 & r12 registers are saved & restored, before & after svc
      respectively. Intention was to preserve those registers across thread to
      handler mode switch.
      
      On v7-M, hardware saves the register context upon exception in AAPCS
      complaint way. Restoring r0-r3 & r12 is done from stack location where
      hardware saves it, not from the location on stack where these registers
      were saved.
      
      To clarify, on stm32f429 discovery board:
      
      1. before svc, sp - 0x90009ff8
      2. r0-r3,r12 saved to 0x90009ff8 - 0x9000a00b
      3. upon svc, h/w decrements sp by 32 & pushes registers onto stack
      4. after svc,  sp - 0x90009fd8
      5. r0-r3,r12 restored from 0x90009fd8 - 0x90009feb
      
      Above means r0-r3,r12 is not restored from the location where they are
      saved, but since hardware pushes the registers onto stack, the registers
      are restored correctly.
      
      Note that during register saving to stack (step 2), it goes past
      0x9000a000. And it seems, based on objdump, there are global symbols
      residing there, and it perhaps can cause issues on a non-XIP Kernel
      (on XIP, data section is setup later).
      
      Based on the analysis above, manually saving registers onto stack is at
      best no-op and at worst can cause data section corruption. Hence remove
      storing of registers onto stack before svc.
      
      Fixes: b70cd406 ("ARM: 8671/1: V7M: Preserve registers across switch from Thread to Handler mode")
      Signed-off-by: Nafzal mohammed <afzal.mohd.ma@gmail.com>
      Acked-by: NVladimir Murzin <vladimir.murzin@arm.com>
      Signed-off-by: NRussell King <rmk+kernel@armlinux.org.uk>
      2ecb2879
  5. 21 10月, 2019 8 次提交
  6. 20 10月, 2019 7 次提交
    • L
      Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 4fe34d61
      Linus Torvalds 提交于
      Pull x86 fixes from Thomas Gleixner:
       "A small set of x86 fixes:
      
         - Prevent a NULL pointer dereference in the X2APIC code in case of a
           CPU hotplug failure.
      
         - Prevent boot failures on HP superdome machines by invalidating the
           level2 kernel pagetable entries outside of the kernel area as
           invalid so BIOS reserved space won't be touched unintentionally.
      
           Also ensure that memory holes are rounded up to the next PMD
           boundary correctly.
      
         - Enable X2APIC support on Hyper-V to prevent boot failures.
      
         - Set the paravirt name when running on Hyper-V for consistency
      
         - Move a function under the appropriate ifdef guard to prevent build
           warnings"
      
      * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        x86/boot/acpi: Move get_cmdline_acpi_rsdp() under #ifdef guard
        x86/hyperv: Set pv_info.name to "Hyper-V"
        x86/apic/x2apic: Fix a NULL pointer deref when handling a dying cpu
        x86/hyperv: Make vapic support x2apic mode
        x86/boot/64: Round memory hole size up to next PMD page
        x86/boot/64: Make level2_kernel_pgt pages invalid outside kernel area
      4fe34d61
    • L
      Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 81c4bc31
      Linus Torvalds 提交于
      Pull irq fixes from Thomas Gleixner:
       "A small set of irq chip driver fixes and updates:
      
         - Update the SIFIVE PLIC interrupt driver to use the fasteoi handler
           to address the shortcomings of the existing flow handling which was
           prone to lose interrupts
      
         - Use the proper limit for GIC interrupt line numbers
      
         - Add retrigger support for the recently merged Anapurna Labs Fabric
           interrupt controller to make it complete
      
         - Enable the ATMEL AIC5 interrupt controller driver on the new
           SAM9X60 SoC"
      
      * 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        irqchip/sifive-plic: Switch to fasteoi flow
        irqchip/gic-v3: Fix GIC_LINE_NR accessor
        irqchip/atmel-aic5: Add support for sam9x60 irqchip
        irqchip/al-fic: Add support for irq retrigger
      81c4bc31
    • L
      Merge branch 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 188768f3
      Linus Torvalds 提交于
      Pull hrtimer fixlet from Thomas Gleixner:
       "A single commit annotating the lockcless access to timer->base with
        READ_ONCE() and adding the WRITE_ONCE() counterparts for completeness"
      
      * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        hrtimer: Annotate lockless access to timer->base
      188768f3
    • L
      Merge branch 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 589f1222
      Linus Torvalds 提交于
      Pull stop-machine fix from Thomas Gleixner:
       "A single fix, amending stop machine with WRITE/READ_ONCE() to address
        the fallout of KCSAN"
      
      * 'core-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
        stop_machine: Avoid potential race behaviour
      589f1222
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · 531e93d1
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
       "I was battling a cold after some recent trips, so quite a bit piled up
        meanwhile, sorry about that.
      
        Highlights:
      
         1) Fix fd leak in various bpf selftests, from Brian Vazquez.
      
         2) Fix crash in xsk when device doesn't support some methods, from
            Magnus Karlsson.
      
         3) Fix various leaks and use-after-free in rxrpc, from David Howells.
      
         4) Fix several SKB leaks due to confusion of who owns an SKB and who
            should release it in the llc code. From Eric Biggers.
      
         5) Kill a bunc of KCSAN warnings in TCP, from Eric Dumazet.
      
         6) Jumbo packets don't work after resume on r8169, as the BIOS resets
            the chip into non-jumbo mode during suspend. From Heiner Kallweit.
      
         7) Corrupt L2 header during MPLS push, from Davide Caratti.
      
         8) Prevent possible infinite loop in tc_ctl_action, from Eric
            Dumazet.
      
         9) Get register bits right in bcmgenet driver, based upon chip
            version. From Florian Fainelli.
      
        10) Fix mutex problems in microchip DSA driver, from Marek Vasut.
      
        11) Cure race between route lookup and invalidation in ipv4, from Wei
            Wang.
      
        12) Fix performance regression due to false sharing in 'net'
            structure, from Eric Dumazet"
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (145 commits)
        net: reorder 'struct net' fields to avoid false sharing
        net: dsa: fix switch tree list
        net: ethernet: dwmac-sun8i: show message only when switching to promisc
        net: aquantia: add an error handling in aq_nic_set_multicast_list
        net: netem: correct the parent's backlog when corrupted packet was dropped
        net: netem: fix error path for corrupted GSO frames
        macb: propagate errors when getting optional clocks
        xen/netback: fix error path of xenvif_connect_data()
        net: hns3: fix mis-counting IRQ vector numbers issue
        net: usb: lan78xx: Connect PHY before registering MAC
        vsock/virtio: discard packets if credit is not respected
        vsock/virtio: send a credit update when buffer size is changed
        mlxsw: spectrum_trap: Push Ethernet header before reporting trap
        net: ensure correct skb->tstamp in various fragmenters
        net: bcmgenet: reset 40nm EPHY on energy detect
        net: bcmgenet: soft reset 40nm EPHYs before MAC init
        net: phy: bcm7xxx: define soft_reset for 40nm EPHY
        net: bcmgenet: don't set phydev->link from MAC
        net: Update address for MediaTek ethernet driver in MAINTAINERS
        ipv4: fix race condition between route lookup and invalidation
        ...
      531e93d1
    • E
      net: reorder 'struct net' fields to avoid false sharing · 2a06b898
      Eric Dumazet 提交于
      Intel test robot reported a ~7% regression on TCP_CRR tests
      that they bisected to the cited commit.
      
      Indeed, every time a new TCP socket is created or deleted,
      the atomic counter net->count is touched (via get_net(net)
      and put_net(net) calls)
      
      So cpus might have to reload a contended cache line in
      net_hash_mix(net) calls.
      
      We need to reorder 'struct net' fields to move @hash_mix
      in a read mostly cache line.
      
      We move in the first cache line fields that can be
      dirtied often.
      
      We probably will have to address in a followup patch
      the __randomize_layout that was added in linux-4.13,
      since this might break our placement choices.
      
      Fixes: 355b9855 ("netns: provide pure entropy for net_hash_mix()")
      Signed-off-by: NEric Dumazet <edumazet@google.com>
      Reported-by: Nkernel test robot <oliver.sang@intel.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      2a06b898
    • V
      net: dsa: fix switch tree list · 50c7d2ba
      Vivien Didelot 提交于
      If there are multiple switch trees on the device, only the last one
      will be listed, because the arguments of list_add_tail are swapped.
      
      Fixes: 83c0afae ("net: dsa: Add new binding implementation")
      Signed-off-by: NVivien Didelot <vivien.didelot@gmail.com>
      Reviewed-by: NFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      50c7d2ba