1. 26 4月, 2020 3 次提交
  2. 25 4月, 2020 34 次提交
    • L
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · ab51cac0
      Linus Torvalds 提交于
      Pull networking fixes from David Miller:
      
       1) Fix memory leak in netfilter flowtable, from Roi Dayan.
      
       2) Ref-count leaks in netrom and tipc, from Xiyu Yang.
      
       3) Fix warning when mptcp socket is never accepted before close, from
          Florian Westphal.
      
       4) Missed locking in ovs_ct_exit(), from Tonghao Zhang.
      
       5) Fix large delays during PTP synchornization in cxgb4, from Rahul
          Lakkireddy.
      
       6) team_mode_get() can hang, from Taehee Yoo.
      
       7) Need to use kvzalloc() when allocating fw tracer in mlx5 driver,
          from Niklas Schnelle.
      
       8) Fix handling of bpf XADD on BTF memory, from Jann Horn.
      
       9) Fix BPF_STX/BPF_B encoding in x86 bpf jit, from Luke Nelson.
      
      10) Missing queue memory release in iwlwifi pcie code, from Johannes
          Berg.
      
      11) Fix NULL deref in macvlan device event, from Taehee Yoo.
      
      12) Initialize lan87xx phy correctly, from Yuiko Oshino.
      
      13) Fix looping between VRF and XFRM lookups, from David Ahern.
      
      14) etf packet scheduler assumes all sockets are full sockets, which is
          not necessarily true. From Eric Dumazet.
      
      15) Fix mptcp data_fin handling in RX path, from Paolo Abeni.
      
      16) fib_select_default() needs to handle nexthop objects, from David
          Ahern.
      
      17) Use GFP_ATOMIC under spinlock in mac80211_hwsim, from Wei Yongjun.
      
      18) vxlan and geneve use wrong nlattr array, from Sabrina Dubroca.
      
      19) Correct rx/tx stats in bcmgenet driver, from Doug Berger.
      
      20) BPF_LDX zero-extension is encoded improperly in x86_32 bpf jit, fix
          from Luke Nelson.
      
      * git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (100 commits)
        selftests/bpf: Fix a couple of broken test_btf cases
        tools/runqslower: Ensure own vmlinux.h is picked up first
        bpf: Make bpf_link_fops static
        bpftool: Respect the -d option in struct_ops cmd
        selftests/bpf: Add test for freplace program with expected_attach_type
        bpf: Propagate expected_attach_type when verifying freplace programs
        bpf: Fix leak in LINK_UPDATE and enforce empty old_prog_fd
        bpf, x86_32: Fix logic error in BPF_LDX zero-extension
        bpf, x86_32: Fix clobbering of dst for BPF_JSET
        bpf, x86_32: Fix incorrect encoding in BPF_LDX zero-extension
        bpf: Fix reStructuredText markup
        net: systemport: suppress warnings on failed Rx SKB allocations
        net: bcmgenet: suppress warnings on failed Rx SKB allocations
        macsec: avoid to set wrong mtu
        mac80211: sta_info: Add lockdep condition for RCU list usage
        mac80211: populate debugfs only after cfg80211 init
        net: bcmgenet: correct per TX/RX ring statistics
        net: meth: remove spurious copyright text
        net: phy: bcm84881: clear settings on link down
        chcr: Fix CPU hard lockup
        ...
      ab51cac0
    • D
      Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf · 167ff131
      David S. Miller 提交于
      Alexei Starovoitov says:
      
      ====================
      pull-request: bpf 2020-04-24
      
      The following pull-request contains BPF updates for your *net* tree.
      
      We've added 17 non-merge commits during the last 5 day(s) which contain
      a total of 19 files changed, 203 insertions(+), 85 deletions(-).
      
      The main changes are:
      
      1) link_update fix, from Andrii.
      
      2) libbpf get_xdp_id fix, from David.
      
      3) xadd verifier fix, from Jann.
      
      4) x86-32 JIT fixes, from Luke and Wang.
      
      5) test_btf fix, from Stanislav.
      
      6) freplace verifier fix, from Toke.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      167ff131
    • S
      selftests/bpf: Fix a couple of broken test_btf cases · e1cebd84
      Stanislav Fomichev 提交于
      Commit 51c39bb1 ("bpf: Introduce function-by-function verification")
      introduced function linkage flag and changed the error message from
      "vlen != 0" to "Invalid func linkage" and broke some fake BPF programs.
      
      Adjust the test accordingly.
      
      AFACT, the programs don't really need any arguments and only look
      at BTF for maps, so let's drop the args altogether.
      
      Before:
      BTF raw test[103] (func (Non zero vlen)): do_test_raw:3703:FAIL expected
      err_str:vlen != 0
      magic: 0xeb9f
      version: 1
      flags: 0x0
      hdr_len: 24
      type_off: 0
      type_len: 72
      str_off: 72
      str_len: 10
      btf_total_size: 106
      [1] INT (anon) size=4 bits_offset=0 nr_bits=32 encoding=SIGNED
      [2] INT (anon) size=4 bits_offset=0 nr_bits=32 encoding=(none)
      [3] FUNC_PROTO (anon) return=0 args=(1 a, 2 b)
      [4] FUNC func type_id=3 Invalid func linkage
      
      BTF libbpf test[1] (test_btf_haskv.o): libbpf: load bpf program failed:
      Invalid argument
      libbpf: -- BEGIN DUMP LOG ---
      libbpf:
      Validating test_long_fname_2() func#1...
      Arg#0 type PTR in test_long_fname_2() is not supported yet.
      processed 0 insns (limit 1000000) max_states_per_insn 0 total_states 0
      peak_states 0 mark_read 0
      
      libbpf: -- END LOG --
      libbpf: failed to load program 'dummy_tracepoint'
      libbpf: failed to load object 'test_btf_haskv.o'
      do_test_file:4201:FAIL bpf_object__load: -4007
      BTF libbpf test[2] (test_btf_newkv.o): libbpf: load bpf program failed:
      Invalid argument
      libbpf: -- BEGIN DUMP LOG ---
      libbpf:
      Validating test_long_fname_2() func#1...
      Arg#0 type PTR in test_long_fname_2() is not supported yet.
      processed 0 insns (limit 1000000) max_states_per_insn 0 total_states 0
      peak_states 0 mark_read 0
      
      libbpf: -- END LOG --
      libbpf: failed to load program 'dummy_tracepoint'
      libbpf: failed to load object 'test_btf_newkv.o'
      do_test_file:4201:FAIL bpf_object__load: -4007
      BTF libbpf test[3] (test_btf_nokv.o): libbpf: load bpf program failed:
      Invalid argument
      libbpf: -- BEGIN DUMP LOG ---
      libbpf:
      Validating test_long_fname_2() func#1...
      Arg#0 type PTR in test_long_fname_2() is not supported yet.
      processed 0 insns (limit 1000000) max_states_per_insn 0 total_states 0
      peak_states 0 mark_read 0
      
      libbpf: -- END LOG --
      libbpf: failed to load program 'dummy_tracepoint'
      libbpf: failed to load object 'test_btf_nokv.o'
      do_test_file:4201:FAIL bpf_object__load: -4007
      
      Fixes: 51c39bb1 ("bpf: Introduce function-by-function verification")
      Signed-off-by: NStanislav Fomichev <sdf@google.com>
      Signed-off-by: NAlexei Starovoitov <ast@kernel.org>
      Link: https://lore.kernel.org/bpf/20200422003753.124921-1-sdf@google.com
      e1cebd84
    • A
      tools/runqslower: Ensure own vmlinux.h is picked up first · dfc55ace
      Andrii Nakryiko 提交于
      Reorder include paths to ensure that runqslower sources are picking up
      vmlinux.h, generated by runqslower's own Makefile. When runqslower is built
      from selftests/bpf, due to current -I$(BPF_INCLUDE) -I$(OUTPUT) ordering, it
      might pick up not-yet-complete vmlinux.h, generated by selftests Makefile,
      which could lead to compilation errors like [0]. So ensure that -I$(OUTPUT)
      goes first and rely on runqslower's Makefile own dependency chain to ensure
      vmlinux.h is properly completed before source code relying on it is compiled.
      
        [0] https://travis-ci.org/github/libbpf/libbpf/jobs/677905925Signed-off-by: NAndrii Nakryiko <andriin@fb.com>
      Signed-off-by: NAlexei Starovoitov <ast@kernel.org>
      Link: https://lore.kernel.org/bpf/20200422012407.176303-1-andriin@fb.com
      dfc55ace
    • Z
      bpf: Make bpf_link_fops static · 6f302bfb
      Zou Wei 提交于
      Fix the following sparse warning:
      
      kernel/bpf/syscall.c:2289:30: warning: symbol 'bpf_link_fops' was not declared. Should it be static?
      Reported-by: NHulk Robot <hulkci@huawei.com>
      Signed-off-by: NZou Wei <zou_wei@huawei.com>
      Signed-off-by: NAlexei Starovoitov <ast@kernel.org>
      Acked-by: NAndrii Nakryiko <andriin@fb.com>
      Link: https://lore.kernel.org/bpf/1587609160-117806-1-git-send-email-zou_wei@huawei.com
      6f302bfb
    • M
      bpftool: Respect the -d option in struct_ops cmd · 32e4c6f4
      Martin KaFai Lau 提交于
      In the prog cmd, the "-d" option turns on the verifier log.
      This is missed in the "struct_ops" cmd and this patch fixes it.
      
      Fixes: 65c93628 ("bpftool: Add struct_ops support")
      Signed-off-by: NMartin KaFai Lau <kafai@fb.com>
      Signed-off-by: NAlexei Starovoitov <ast@kernel.org>
      Reviewed-by: NQuentin Monnet <quentin@isovalent.com>
      Link: https://lore.kernel.org/bpf/20200424182911.1259355-1-kafai@fb.com
      32e4c6f4
    • T
      selftests/bpf: Add test for freplace program with expected_attach_type · 1d8a0af5
      Toke Høiland-Jørgensen 提交于
      This adds a new selftest that tests the ability to attach an freplace
      program to a program type that relies on the expected_attach_type of the
      target program to pass verification.
      Signed-off-by: NToke Høiland-Jørgensen <toke@redhat.com>
      Signed-off-by: NAlexei Starovoitov <ast@kernel.org>
      Link: https://lore.kernel.org/bpf/158773526831.293902.16011743438619684815.stgit@toke.dk
      1d8a0af5
    • T
      bpf: Propagate expected_attach_type when verifying freplace programs · 03f87c0b
      Toke Høiland-Jørgensen 提交于
      For some program types, the verifier relies on the expected_attach_type of
      the program being verified in the verification process. However, for
      freplace programs, the attach type was not propagated along with the
      verifier ops, so the expected_attach_type would always be zero for freplace
      programs.
      
      This in turn caused the verifier to sometimes make the wrong call for
      freplace programs. For all existing uses of expected_attach_type for this
      purpose, the result of this was only false negatives (i.e., freplace
      functions would be rejected by the verifier even though they were valid
      programs for the target they were replacing). However, should a false
      positive be introduced, this can lead to out-of-bounds accesses and/or
      crashes.
      
      The fix introduced in this patch is to propagate the expected_attach_type
      to the freplace program during verification, and reset it after that is
      done.
      
      Fixes: be8704ff ("bpf: Introduce dynamic program extensions")
      Signed-off-by: NToke Høiland-Jørgensen <toke@redhat.com>
      Signed-off-by: NAlexei Starovoitov <ast@kernel.org>
      Link: https://lore.kernel.org/bpf/158773526726.293902.13257293296560360508.stgit@toke.dk
      03f87c0b
    • A
      bpf: Fix leak in LINK_UPDATE and enforce empty old_prog_fd · 4adb7a4a
      Andrii Nakryiko 提交于
      Fix bug of not putting bpf_link in LINK_UPDATE command.
      Also enforce zeroed old_prog_fd if no BPF_F_REPLACE flag is specified.
      Signed-off-by: NAndrii Nakryiko <andriin@fb.com>
      Signed-off-by: NAlexei Starovoitov <ast@kernel.org>
      Link: https://lore.kernel.org/bpf/20200424052045.4002963-1-andriin@fb.com
      4adb7a4a
    • W
      bpf, x86_32: Fix logic error in BPF_LDX zero-extension · 5ca1ca01
      Wang YanQing 提交于
      When verifier_zext is true, we don't need to emit code
      for zero-extension.
      
      Fixes: 836256bf ("x32: bpf: eliminate zero extension code-gen")
      Signed-off-by: NWang YanQing <udknight@gmail.com>
      Signed-off-by: NAlexei Starovoitov <ast@kernel.org>
      Link: https://lore.kernel.org/bpf/20200423050637.GA4029@udknight
      5ca1ca01
    • L
      bpf, x86_32: Fix clobbering of dst for BPF_JSET · 50fe7ebb
      Luke Nelson 提交于
      The current JIT clobbers the destination register for BPF_JSET BPF_X
      and BPF_K by using "and" and "or" instructions. This is fine when the
      destination register is a temporary loaded from a register stored on
      the stack but not otherwise.
      
      This patch fixes the problem (for both BPF_K and BPF_X) by always loading
      the destination register into temporaries since BPF_JSET should not
      modify the destination register.
      
      This bug may not be currently triggerable as BPF_REG_AX is the only
      register not stored on the stack and the verifier uses it in a limited
      way.
      
      Fixes: 03f5781b ("bpf, x86_32: add eBPF JIT compiler for ia32")
      Signed-off-by: NXi Wang <xi.wang@gmail.com>
      Signed-off-by: NLuke Nelson <luke.r.nels@gmail.com>
      Signed-off-by: NAlexei Starovoitov <ast@kernel.org>
      Acked-by: NWang YanQing <udknight@gmail.com>
      Link: https://lore.kernel.org/bpf/20200422173630.8351-2-luke.r.nels@gmail.com
      50fe7ebb
    • L
      bpf, x86_32: Fix incorrect encoding in BPF_LDX zero-extension · 5fa9a98f
      Luke Nelson 提交于
      The current JIT uses the following sequence to zero-extend into the
      upper 32 bits of the destination register for BPF_LDX BPF_{B,H,W},
      when the destination register is not on the stack:
      
        EMIT3(0xC7, add_1reg(0xC0, dst_hi), 0);
      
      The problem is that C7 /0 encodes a MOV instruction that requires a 4-byte
      immediate; the current code emits only 1 byte of the immediate. This
      means that the first 3 bytes of the next instruction will be treated as
      the rest of the immediate, breaking the stream of instructions.
      
      This patch fixes the problem by instead emitting "xor dst_hi,dst_hi"
      to clear the upper 32 bits. This fixes the problem and is more efficient
      than using MOV to load a zero immediate.
      
      This bug may not be currently triggerable as BPF_REG_AX is the only
      register not stored on the stack and the verifier uses it in a limited
      way, and the verifier implements a zero-extension optimization. But the
      JIT should avoid emitting incorrect encodings regardless.
      
      Fixes: 03f5781b ("bpf, x86_32: add eBPF JIT compiler for ia32")
      Signed-off-by: NXi Wang <xi.wang@gmail.com>
      Signed-off-by: NLuke Nelson <luke.r.nels@gmail.com>
      Signed-off-by: NAlexei Starovoitov <ast@kernel.org>
      Reviewed-by: NH. Peter Anvin (Intel) <hpa@zytor.com>
      Acked-by: NWang YanQing <udknight@gmail.com>
      Link: https://lore.kernel.org/bpf/20200422173630.8351-1-luke.r.nels@gmail.com
      5fa9a98f
    • J
      bpf: Fix reStructuredText markup · a33d3147
      Jakub Wilk 提交于
      The patch fixes:
      $ scripts/bpf_helpers_doc.py > bpf-helpers.rst
      $ rst2man bpf-helpers.rst > bpf-helpers.7
      bpf-helpers.rst:1105: (WARNING/2) Inline strong start-string without end-string.
      Signed-off-by: NJakub Wilk <jwilk@jwilk.net>
      Signed-off-by: NAlexei Starovoitov <ast@kernel.org>
      Reviewed-by: NQuentin Monnet <quentin@isovalent.com>
      Link: https://lore.kernel.org/bpf/20200422082324.2030-1-jwilk@jwilk.net
      a33d3147
    • D
      net: systemport: suppress warnings on failed Rx SKB allocations · 3554e54a
      Doug Berger 提交于
      The driver is designed to drop Rx packets and reclaim the buffers
      when an allocation fails, and the network interface needs to safely
      handle this packet loss. Therefore, an allocation failure of Rx
      SKBs is relatively benign.
      
      However, the output of the warning message occurs with a high
      scheduling priority that can cause excessive jitter/latency for
      other high priority processing.
      
      This commit suppresses the warning messages to prevent scheduling
      problems while retaining the failure count in the statistics of
      the network interface.
      Signed-off-by: NDoug Berger <opendmb@gmail.com>
      Acked-by: NFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3554e54a
    • D
      net: bcmgenet: suppress warnings on failed Rx SKB allocations · ecaeceb8
      Doug Berger 提交于
      The driver is designed to drop Rx packets and reclaim the buffers
      when an allocation fails, and the network interface needs to safely
      handle this packet loss. Therefore, an allocation failure of Rx
      SKBs is relatively benign.
      
      However, the output of the warning message occurs with a high
      scheduling priority that can cause excessive jitter/latency for
      other high priority processing.
      
      This commit suppresses the warning messages to prevent scheduling
      problems while retaining the failure count in the statistics of
      the network interface.
      Signed-off-by: NDoug Berger <opendmb@gmail.com>
      Acked-by: NFlorian Fainelli <f.fainelli@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ecaeceb8
    • T
      macsec: avoid to set wrong mtu · 7f327080
      Taehee Yoo 提交于
      When a macsec interface is created, the mtu is calculated with the lower
      interface's mtu value.
      If the mtu of lower interface is lower than the length, which is needed
      by macsec interface, macsec's mtu value will be overflowed.
      So, if the lower interface's mtu is too low, macsec interface's mtu
      should be set to 0.
      
      Test commands:
          ip link add dummy0 mtu 10 type dummy
          ip link add macsec0 link dummy0 type macsec
          ip link show macsec0
      
      Before:
          11: macsec0@dummy0: <BROADCAST,MULTICAST,M-DOWN> mtu 4294967274
      After:
          11: macsec0@dummy0: <BROADCAST,MULTICAST,M-DOWN> mtu 0
      
      Fixes: c09440f7 ("macsec: introduce IEEE 802.1AE driver")
      Signed-off-by: NTaehee Yoo <ap420073@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7f327080
    • L
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 5ef58e29
      Linus Torvalds 提交于
      Pull SCSI fixes from James Bottomley:
       "Two minor fixes: one to update a Kconfig reference and the other to
        fix a resource leak on an error path in sg"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        scsi: Update referenced link to cdrtools
        scsi: sg: add sg_remove_request in sg_write
      5ef58e29
    • L
      Merge tag 'pm-5.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 8e9ccd0f
      Linus Torvalds 提交于
      Pull power management fixes from Rafael Wysocki:
       "Restore an optimization related to asynchronous suspend and resume of
        devices during system-wide power transitions that was disabled by
        mistake (Kai-Heng Feng) and update the pm-graph suite of power
        management utilities (Todd Brandt)"
      
      * tag 'pm-5.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        PM: sleep: core: Switch back to async_schedule_dev()
        pm-graph v5.6
      8e9ccd0f
    • L
      Merge tag 'pnp-5.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 5be35f7f
      Linus Torvalds 提交于
      Pull PNP cleanup from Rafael Wysocki:
       "Make the PNP code use list_for_each_entry() in a few places instead of
        open-coding it (Jason Gunthorpe)"
      
      * tag 'pnp-5.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        pnp: Use list_for_each_entry() instead of open coding
      5be35f7f
    • L
      Merge tag 'acpi-5.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 9dc5d985
      Linus Torvalds 提交于
      Pull ACPI fixes from Rafael Wysocki:
       "Drop a lid status quirk for Asus T200TA that is not necessary any more
        and clean up a resource management inconsistency in the PCI IRQ link
        configuration code.
      
        Both changes from Hans de Goede"
      
      * tag 'acpi-5.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        ACPI: button: Drop no longer necessary Asus T200TA lid_init_state quirk
        ACPI/PCI: pci_link: use extended_irq union member when setting ext-irq shareable
      9dc5d985
    • L
      mm: check that mm is still valid in madvise() · bc0c4d1e
      Linus Torvalds 提交于
      IORING_OP_MADVISE can end up basically doing mprotect() on the VM of
      another process, which means that it can race with our crazy core dump
      handling which accesses the VM state without holding the mmap_sem
      (because it incorrectly thinks that it is the final user).
      
      This is clearly a core dumping problem, but we've never fixed it the
      right way, and instead have the notion of "check that the mm is still
      ok" using mmget_still_valid() after getting the mmap_sem for writing in
      any situation where we're not the original VM thread.
      
      See commit 04f5866e ("coredump: fix race condition between
      mmget_not_zero()/get_task_mm() and core dumping") for more background on
      this whole mmget_still_valid() thing.  You might want to have a barf bag
      handy when you do.
      
      We're discussing just fixing this properly in the only remaining core
      dumping routines.  But even if we do that, let's make do_madvise() do
      the right thing, and then when we fix core dumping, we can remove all
      these mmget_still_valid() checks.
      Reported-and-tested-by: NJann Horn <jannh@google.com>
      Fixes: c1ca757b ("io_uring: add IORING_OP_MADVISE")
      Acked-by: NJens Axboe <axboe@kernel.dk>
      Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
      bc0c4d1e
    • D
      Merge tag 'mac80211-for-net-2020-04-24' of... · c651b461
      David S. Miller 提交于
      Merge tag 'mac80211-for-net-2020-04-24' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211
      
      Johannes Berg says:
      
      ====================
      Just three changes:
       * fix a wrong GFP_KERNEL in hwsim
       * fix the debugfs mess after the mac80211 registration race fix
       * suppress false-positive RCU list lockdep warnings
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c651b461
    • D
      Merge tag 'wireless-drivers-2020-04-24' of... · 0303b3a1
      David S. Miller 提交于
      Merge tag 'wireless-drivers-2020-04-24' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers
      
      Kalle Valo says:
      
      ====================
      wireless-drivers fixes for v5.7
      
      Second set of fixes for v5.7. Quite a few iwlwifi fixes and some
      maintainers file updates.
      
      iwlwifi
      
      * fix a bug with kmemdup() error handling
      
      * fix a DMA pool warning about unfreed memory
      
      * fix beacon statistics
      
      * fix a theoritical bug in device initialisation
      
      * fix queue limit handling and inactive TID removal
      
      * disable ACK Enabled Aggregation which was enabled by accident
      
      * fix transmit power setting reading from BIOS with certain versions
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      0303b3a1
    • L
      Merge tag 'io_uring-5.7-2020-04-24' of git://git.kernel.dk/linux-block · aee1a009
      Linus Torvalds 提交于
      Pull io_uring fix from Jens Axboe:
       "Single fixup for a change that went into -rc2"
      
      * tag 'io_uring-5.7-2020-04-24' of git://git.kernel.dk/linux-block:
        io_uring: only restore req->work for req that needs do completion
      aee1a009
    • L
      Merge tag 'libata-5.7-2020-04-24' of git://git.kernel.dk/linux-block · 81da3d3c
      Linus Torvalds 提交于
      Pull libata fixlet from Jens Axboe:
       "Minor spelling error fix for libata"
      
      * tag 'libata-5.7-2020-04-24' of git://git.kernel.dk/linux-block:
        ata: sata_inic162x fix a spelling issue
      81da3d3c
    • L
      Merge tag 'block-5.7-2020-04-24' of git://git.kernel.dk/linux-block · 3d29cb17
      Linus Torvalds 提交于
      Pull block fixes from Jens Axboe:
       "A few fixes/changes that should go into this release:
      
         - null_blk zoned fixes (Damien)
      
         - blkdev_close() sync improvement (Douglas)
      
         - Fix regression in blk-iocost that impacted (at least) systemtap
           (Waiman)
      
         - Comment fix, header removal (Zhiqiang, Jianpeng)"
      
      * tag 'block-5.7-2020-04-24' of git://git.kernel.dk/linux-block:
        null_blk: Cleanup zoned device initialization
        null_blk: Fix zoned command handling
        block: remove unused header
        blk-iocost: Fix error on iocost_ioc_vrate_adj
        bdev: Reduce time holding bd_mutex in sync in blkdev_close()
        buffer: remove useless comment and WB_REASON_FREE_MORE_MEM, reason.
      3d29cb17
    • L
      Merge tag 'trace-v5.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · da5de55d
      Linus Torvalds 提交于
      Pull tracing fixes from Steven Rostedt:
       "A few tracing fixes:
      
         - Two fixes for memory leaks detected by kmemleak
      
         - Removal of some dead code
      
         - A few local functions turned static"
      
      * tag 'trace-v5.7-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
        tracing: Convert local functions in tracing_map.c to static
        tracing: Remove DECLARE_TRACE_NOARGS
        ftrace: Fix memory leak caused by not freeing entry in unregister_ftrace_direct()
        tracing: Fix memory leaks in trace_events_hist.c
      da5de55d
    • R
      Merge branch 'acpi-pci' · 0db0d142
      Rafael J. Wysocki 提交于
      * acpi-pci:
        ACPI/PCI: pci_link: use extended_irq union member when setting ext-irq shareable
      0db0d142
    • L
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 4544db3f
      Linus Torvalds 提交于
      Pull arm64 fixes from Catalin Marinas:
      
       - Ensure context synchronisation after a write to APIAKey.
      
       - Fix bullet list formatting in Documentation/arm64/amu.rst to
         eliminate doc warnings.
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        Documentation: arm64: fix amu.rst doc warnings
        arm64: sync kernel APIAKey when installing
      4544db3f
    • R
      Merge branch 'pm-tools' · 4bee16d7
      Rafael J. Wysocki 提交于
      * pm-tools:
        pm-graph v5.6
      4bee16d7
    • L
      Merge tag 'kbuild-fixes-v5.7' of... · b9916af7
      Linus Torvalds 提交于
      Merge tag 'kbuild-fixes-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
      
      Pull Kbuild fixes from Masahiro Yamada:
      
       - fix scripts/config to properly handle ':' in string type CONFIG
         options
      
       - fix unneeded rebuilds of DT schema check rule
      
       - git rid of ordering dependency between <linux/vermagic.h> and
         <linux/module.h> to fix build errors in some network drivers
      
       - clean up generated headers of host arch with 'make ARCH=um mrproper'
      
      * tag 'kbuild-fixes-v5.7' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
        h8300: ignore vmlinux.lds
        Documentation: kbuild: fix the section title format
        um: ensure `make ARCH=um mrproper` removes arch/$(SUBARCH)/include/generated/
        arch: split MODULE_ARCH_VERMAGIC definitions out to <asm/vermagic.h>
        kbuild: fix DT binding schema rule again to avoid needless rebuilds
        scripts/config: allow colons in option strings for sed
      b9916af7
    • L
      Merge tag 'afs-fixes-20200424' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs · 9a195628
      Linus Torvalds 提交于
      Pull misc AFS fixes from David Howells:
       "Three miscellaneous fixes to the afs filesystem:
      
         - Remove some struct members that aren't used, aren't set or aren't
           read, plus a wake up that nothing ever waits for.
      
         - Actually set the AFS_SERVER_FL_HAVE_EPOCH flag so that the code
           that depends on it can work.
      
         - Make a couple of waits uninterruptible if they're done for an
           operation that isn't supposed to be interruptible"
      
      * tag 'afs-fixes-20200424' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs:
        afs: Make record checking use TASK_UNINTERRUPTIBLE when appropriate
        afs: Fix to actually set AFS_SERVER_FL_HAVE_EPOCH
        afs: Remove some unused bits
      9a195628
    • L
      Merge tag 'sound-5.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · b4ecf26e
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "This became a slightly big pull request, as the accumulated ASoC fixes
        are included here. Some highlights:
      
         - Revert of ASoC DAI startup changes that caused regression on some
           x86 platforms
      
         - Regression fix in HD-audio power management and driver blacklist
      
         - A collection of ASoC DAPM and topology fixes
      
         - Continued USB-audio fixes and quirks
      
         - Lots of small device-specific fixes
      
         - Rockchip S/PDIF DT stuff update for validation issues"
      
      * tag 'sound-5.7-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound: (51 commits)
        ALSA: hda: Always use jackpoll helper for jack update after resume
        ALSA: hda/realtek - Add new codec supported for ALC245
        ALSA: usb-audio: Fix usb audio refcnt leak when getting spdif
        ALSA: usb-audio: Add connector notifier delegation
        ALSA: usb-audio: Apply async workaround for Scarlett 2i4 2nd gen
        ASoC: wm8960: Fix wrong clock after suspend & resume
        ALSA: usx2y: Fix potential NULL dereference
        ALSA: usb-audio: Add quirk for Focusrite Scarlett 2i2
        ASoC: wm89xx: Add missing dependency
        ASoC: dapm: fixup dapm kcontrol widget
        ASoC: rsnd: Fix "status check failed" spam for multi-SSI
        ASoC: rsnd: Don't treat master SSI in multi SSI setup as parent
        ASoC: meson: gx-card: fix codec-to-codec link setup
        ASoC: meson: axg-card: fix codec-to-codec link setup
        ALSA: usb-audio: Add static mapping table for ALC1220-VB-based mobos
        ALSA: hda: Remove ASUS ROG Zenith from the blacklist
        ALSA: hda/realtek - Fix unexpected init_amp override
        ALSA: usb-audio: Filter out unsupported sample rates on Focusrite devices
        ASoC: SOF: Intel: add min/max channels for SSP on Baytrail/Broadwell
        ASoC: stm32: sai: fix sai probe
        ...
      b4ecf26e
    • L
      Merge tag 'drm-fixes-2020-04-24' of git://anongit.freedesktop.org/drm/drm · 88412a4e
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Weekly regular fixes for drm, The usual rc3 uptick here, but nothing
        too crazy or notable.
      
        core:
         - mst: zero pbn when releasing vcpi slots
      
        amdgpu:
         - Fix resume issue on renoir
         - Thermal fix for older CI dGPUs
         - Fix some fallout from dropping drm load/unload callbacks
      
        i915:
         - Tigerlake Workaround - disabling media recompression (Matt)
         - Fix RPS interrupts for right GPU frequency (Chris)
         - HDCP fix prime check (Oliver)
         - Tigerlake Thunderbolt power well fix (Matt)
         - Tigerlake DP link training fixes (Jose)
         - Documentation sphinx build fix (Jani)
         - Fix enable_dpcd_backlight modparam (Lyude)
      
        analogix-dp:
         - binding fix
      
        meson:
         - remove unneeded error message
      
        bindings:
         - fix warnings
         - fix lvds binding
      
        scheduler:
         - thread racing fix
      
        tidss:
         - use after free fix"
      
      * tag 'drm-fixes-2020-04-24' of git://anongit.freedesktop.org/drm/drm:
        drm/i915/dpcd_bl: Unbreak enable_dpcd_backlight modparam
        drm/i915: fix Sphinx build duplicate label warning
        drm/i915/display: Load DP_TP_CTL/STATUS offset before use it
        drm/i915/tgl: TBT AUX should use TC power well ops
        drm/i915: HDCP: fix Ri prime check done during link check
        drm/i915/gt: Update PMINTRMSK holding fw
        drm/i915/tgl: Add Wa_14010477008:tgl
        drm/tidss: fix crash related to accessing freed memory
        drm/dp_mst: Zero assigned PBN when releasing VCPI slots
        drm/amdgpu/display: give aux i2c buses more meaningful names
        drm/amdgpu/display: fix aux registration (v2)
        drm/amdgpu: Correctly initialize thermal controller for GPUs with Powerplay table v0 (e.g Hawaii)
        drm/amd/powerplay: fix resume failed as smu table initialize early exit
        drm/scheduler: fix drm_sched_get_cleanup_job
        drm/meson: Delete an error message in meson_dw_hdmi_bind()
        drm/bridge: anx6345: set correct BPC for display_info of connector
        dt-bindings: display: allow port and ports in panel-lvds
        dt-bindings: display: xpp055c272: Remove the reg property
        dt-bindings: display: ltk500hd1829: Remove the reg property
        drm/bridge: analogix_dp: Split bind() into probe() and real bind()
      88412a4e
  3. 24 4月, 2020 3 次提交
    • D
      afs: Make record checking use TASK_UNINTERRUPTIBLE when appropriate · c4bfda16
      David Howells 提交于
      When an operation is meant to be done uninterruptibly (such as
      FS.StoreData), we should not be allowing volume and server record checking
      to be interrupted.
      
      Fixes: d2ddc776 ("afs: Overhaul volume and server record caching and fileserver rotation")
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      c4bfda16
    • D
      afs: Fix to actually set AFS_SERVER_FL_HAVE_EPOCH · 69cf3978
      David Howells 提交于
      AFS keeps track of the epoch value from the rxrpc protocol to note (a) when
      a fileserver appears to have restarted and (b) when different endpoints of
      a fileserver do not appear to be associated with the same fileserver
      (ie. all probes back from a fileserver from all of its interfaces should
      carry the same epoch).
      
      However, the AFS_SERVER_FL_HAVE_EPOCH flag that indicates that we've
      received the server's epoch is never set, though it is used.
      
      Fix this to set the flag when we first receive an epoch value from a probe
      sent to the filesystem client from the fileserver.
      
      Fixes: 3bf0fb6f ("afs: Probe multiple fileservers simultaneously")
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      69cf3978
    • D
      afs: Remove some unused bits · be59167c
      David Howells 提交于
      Remove three bits:
      
       (1) afs_server::no_epoch is neither set nor used.
      
       (2) afs_server::have_result is set and a wakeup is applied to it, but
           nothing looks at it or waits on it.
      
       (3) afs_vl_dump_edestaddrreq() prints afs_addr_list::probed, but nothing
           sets it for VL servers.
      Signed-off-by: NDavid Howells <dhowells@redhat.com>
      be59167c