1. 19 Nov, 2021 9 commits
  2. 18 Nov, 2021 31 commits
    • Linus Torvalds's avatar
      Merge tag 'thermal-5.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · e26dd976
      Linus Torvalds authored
      Pull thermal control fixes from Rafael Wysocki:
       "These fix the handling of thermal zones during system resume and
        disable building of the int340x thermal driver on 32-bit.
      
        Specifics:
      
         - Prevent the previous high and low thermal zone trip values from
           being retained over a system suspend-resume cycle (Manaf
           Meethalavalappu Pallikunhi)
      
         - Prevent the int340x thermal driver from being built in 32-bit
           kernel configurations, because running it on 32-bit is questionable
           (Arnd Bergmann)"
      
      * tag 'thermal-5.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        thermal: core: Reset previous low and high trip during thermal zone init
        thermal: int340x: Limit Kconfig to 64-bit
      e26dd976
    • Linus Torvalds's avatar
      Merge tag 'pm-5.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 18e2befa
      Linus Torvalds authored
      Pull power management fixes from Rafael Wysocki:
       "These fix a system-wide suspend issue in the DTPM framework and
        improve the Energy Model documentation.
      
        Specifics:
      
         - Fix system suspend handling in DTPM when it is enabled, but not
           actually used (Daniel Lezcano)
      
         - Describe the new cpufreq callback for Energy Model registration and
           explain the "advanced" and "simple" EM variants in the EM
           documentation (Lukasz Luba)"
      
      * tag 'pm-5.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        Documentation: power: Describe 'advanced' and 'simple' EM models
        Documentation: power: Add description about new callback for EM registration
        powercap: DTPM: Fix suspend failure and kernel warning
      18e2befa
    • Linus Torvalds's avatar
      Merge tag 'acpi-5.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 17e10707
      Linus Torvalds authored
      Pull ACPI fix from Rafael Wysocki:
       "Revert the change attempting to release PM resources blocked by unused
        ACPI objects after device enumeration, because it caused boot issues
        to appear on multiple systems"
      
      * tag 'acpi-5.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        Revert "ACPI: scan: Release PM resources blocked by unused objects"
      17e10707
    • Linus Torvalds's avatar
      Merge tag 'platform-drivers-x86-v5.16-2' of... · d1c2b55d
      Linus Torvalds authored
      Merge tag 'platform-drivers-x86-v5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86
      
      Pull x86 platform driver fixes from Hans de Goede:
       "Various build- and bug-fixes as well as one hardware-id addition"
      
      * tag 'platform-drivers-x86-v5.16-2' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86:
        platform/x86: thinkpad_acpi: fix documentation for adaptive keyboard
        platform/x86: thinkpad_acpi: Fix WWAN device disabled issue after S3 deep
        platform/x86: thinkpad_acpi: Add support for dual fan control
        platform/x86: think-lmi: Abort probe on analyze failure
        platform/x86: dell-wmi-descriptor: disable by default
        platform/x86: samsung-laptop: Fix typo in a comment
        platform/x86: hp_accel: Fix an error handling path in 'lis3lv02d_probe()'
        platform/x86: amd-pmc: Make CONFIG_AMD_PMC depend on RTC_CLASS
        platform/mellanox: mlxreg-lc: fix error code in mlxreg_lc_create_static_devices()
      d1c2b55d
    • Linus Torvalds's avatar
      Merge tag 'spi-fix-v5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi · ea229296
      Linus Torvalds authored
      Pull spi fixes from Mark Brown:
       "A few small fixes for v5.16, one in the core for an issue with
        handling of controller unregistration that was introduced with the
        fixes for registering nested SPI controllers and a few more minor
        device specific ones"
      
      * tag 'spi-fix-v5.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
        spi: fix use-after-free of the add_lock mutex
        spi: spi-geni-qcom: fix error handling in spi_geni_grab_gpi_chan()
        spi: lpspi: Silence error message upon deferred probe
        spi: cadence-quadspi: fix write completion support
      ea229296
    • Nick Terrell's avatar
      lib: zstd: Don't add -O3 to cflags · 7416cdc9
      Nick Terrell authored
      After the update to zstd-1.4.10 passing -O3 is no longer necessary to
      get good performance from zstd. Using the default optimization level -O2
      is sufficient to get good performance.
      
      I've measured no significant change to compression speed, and a ~1%
      decompression speed loss, which is acceptable.
      
      This fixes the reported parisc -Wframe-larger-than=1536 errors [0]. The
      gcc-8-hppa-linux-gnu compiler performed very poorly with -O3, generating
      stacks that are ~3KB. With -O2 these same functions generate stacks in
      the < 100B, completely fixing the problem. Function size deltas are
      listed below:
      
      ZSTD_compressBlock_fast_extDict_generic: 3800 -> 68
      ZSTD_compressBlock_fast: 2216 -> 40
      ZSTD_compressBlock_fast_dictMatchState: 1848 ->  64
      ZSTD_compressBlock_doubleFast_extDict_generic: 3744 -> 76
      ZSTD_fillDoubleHashTable: 3252 -> 0
      ZSTD_compressBlock_doubleFast: 5856 -> 36
      ZSTD_compressBlock_doubleFast_dictMatchState: 5380 -> 84
      ZSTD_copmressBlock_lazy2: 2420 -> 72
      
      Additionally, this improves the reported code bloat [1]. With gcc-11
      bloat-o-meter shows an 80KB code size improvement:
      
      ```
      > ../scripts/bloat-o-meter vmlinux.old vmlinux
      add/remove: 31/8 grow/shrink: 24/155 up/down: 25734/-107924 (-82190)
      Total: Before=6418562, After=6336372, chg -1.28%
      ```
      
      Compared to before the zstd-1.4.10 update we see a total code size
      regression of 105KB, down from 374KB at v5.16-rc1:
      
      ```
      > ../scripts/bloat-o-meter vmlinux.old vmlinux
      add/remove: 292/62 grow/shrink: 56/88 up/down: 235009/-127487 (107522)
      Total: Before=6228850, After=6336372, chg +1.73%
      ```
      
      [0] https://lkml.org/lkml/2021/11/15/710
      [1] https://lkml.org/lkml/2021/11/14/189
      
      Link: https://lore.kernel.org/r/20211117014949.1169186-4-nickrterrell@gmail.com/
      Link: https://lore.kernel.org/r/20211117201459.1194876-4-nickrterrell@gmail.com/Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Tested-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Reviewed-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarNick Terrell <terrelln@fb.com>
      7416cdc9
    • Nick Terrell's avatar
      lib: zstd: Don't inline functions in zstd_opt.c · 1974990c
      Nick Terrell authored
      `zstd_opt.c` contains the match finder for the highest compression
      levels. These levels are already very slow, and are unlikely to be used
      in the kernel. If they are used, they shouldn't be used in latency
      sensitive workloads, so slowing them down shouldn't be a big deal.
      
      This saves 188 KB of the 288 KB regression reported by Geert Uytterhoeven [0].
      I've also opened an issue upstream [1] so that we can properly tackle
      the code size issue in `zstd_opt.c` for all users, and can hopefully
      remove this hack in the next zstd version we import.
      
      Bloat-o-meter output on x86-64:
      
      ```
      > ../scripts/bloat-o-meter vmlinux.old vmlinux
      add/remove: 6/5 grow/shrink: 1/9 up/down: 16673/-209939 (-193266)
      Function                                     old     new   delta
      ZSTD_compressBlock_opt_generic.constprop       -    7559   +7559
      ZSTD_insertBtAndGetAllMatches                  -    6304   +6304
      ZSTD_insertBt1                                 -    1731   +1731
      ZSTD_storeSeq                                  -     693    +693
      ZSTD_BtGetAllMatches                           -     255    +255
      ZSTD_updateRep                                 -     128    +128
      ZSTD_updateTree                               96      99      +3
      ZSTD_insertAndFindFirstIndexHash3             81       -     -81
      ZSTD_setBasePrices.constprop                  98       -     -98
      ZSTD_litLengthPrice.constprop                138       -    -138
      ZSTD_count                                   362     181    -181
      ZSTD_count_2segments                        1407     938    -469
      ZSTD_insertBt1.constprop                    2689       -   -2689
      ZSTD_compressBlock_btultra2                19990     423  -19567
      ZSTD_compressBlock_btultra                 19633      15  -19618
      ZSTD_initStats_ultra                       19825       -  -19825
      ZSTD_compressBlock_btopt                   20374      12  -20362
      ZSTD_compressBlock_btopt_extDict           29984      12  -29972
      ZSTD_compressBlock_btultra_extDict         30718      15  -30703
      ZSTD_compressBlock_btopt_dictMatchState    32689      12  -32677
      ZSTD_compressBlock_btultra_dictMatchState   33574      15  -33559
      Total: Before=6611828, After=6418562, chg -2.92%
      ```
      
      [0] https://lkml.org/lkml/2021/11/14/189
      [1] https://github.com/facebook/zstd/issues/2862
      
      Link: https://lore.kernel.org/r/20211117014949.1169186-3-nickrterrell@gmail.com/
      Link: https://lore.kernel.org/r/20211117201459.1194876-3-nickrterrell@gmail.com/Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Tested-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Reviewed-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarNick Terrell <terrelln@fb.com>
      1974990c
    • Nick Terrell's avatar
      lib: zstd: Fix unused variable warning · ae8d67b2
      Nick Terrell authored
      The variable `litLengthSum` is only used by an `assert()`, so when
      asserts are disabled the compiler doesn't see any usage and warns.
      
      This issue is already fixed upstream by PR #2838 [0]. It was reported
      by the Kernel test robot in [1].
      
      Another approach would be to change zstd's disabled `assert()`
      definition to use the argument in a disabled branch, instead of
      ignoring the argument. I've avoided this approach because there are
      some small changes necessary to get zstd to build, and I would
      want to thoroughly re-test for performance, since that is slightly
      changing the code in every function in zstd. It seems like a
      trivial change, but some functions are pretty sensitive to small
      changes. However, I think it is a valid approach that I would
      like to see upstream take, so I've opened Issue #2868 to attempt
      this upstream.
      
      Lastly, I've chosen not to use __maybe_unused because all code
      in lib/zstd/ must eventually be upstreamed. Upstream zstd can't
      use __maybe_unused because it isn't portable across all compilers.
      
      [0] https://github.com/facebook/zstd/pull/2838
      [1] https://lore.kernel.org/linux-mm/202111120312.833wII4i-lkp@intel.com/T/
      [2] https://github.com/facebook/zstd/issues/2868
      
      Link: https://lore.kernel.org/r/20211117014949.1169186-2-nickrterrell@gmail.com/
      Link: https://lore.kernel.org/r/20211117201459.1194876-2-nickrterrell@gmail.com/Reported-by: default avatarkernel test robot <lkp@intel.com>
      Signed-off-by: default avatarNick Terrell <terrelln@fb.com>
      ae8d67b2
    • Linus Torvalds's avatar
      Merge tag 'net-5.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · 8d0112ac
      Linus Torvalds authored
      Pull networking fixes from Jakub Kicinski:
       "Including fixes from bpf, mac80211.
      
        Current release - regressions:
      
         - devlink: don't throw an error if flash notification sent before
           devlink visible
      
         - page_pool: Revert "page_pool: disable dma mapping support...",
           turns out there are active arches who need it
      
        Current release - new code bugs:
      
         - amt: cancel delayed_work synchronously in amt_fini()
      
        Previous releases - regressions:
      
         - xsk: fix crash on double free in buffer pool
      
         - bpf: fix inner map state pruning regression causing program
           rejections
      
         - mac80211: drop check for DONT_REORDER in __ieee80211_select_queue,
           preventing mis-selecting the best effort queue
      
         - mac80211: do not access the IV when it was stripped
      
         - mac80211: fix radiotap header generation, off-by-one
      
         - nl80211: fix getting radio statistics in survey dump
      
         - e100: fix device suspend/resume
      
        Previous releases - always broken:
      
         - tcp: fix uninitialized access in skb frags array for Rx 0cp
      
         - bpf: fix toctou on read-only map's constant scalar tracking
      
         - bpf: forbid bpf_ktime_get_coarse_ns and bpf_timer_* in tracing
           progs
      
         - tipc: only accept encrypted MSG_CRYPTO msgs
      
         - smc: transfer remaining wait queue entries during fallback, fix
           missing wake ups
      
         - udp: validate checksum in udp_read_sock() (when sockmap is used)
      
         - sched: act_mirred: drop dst for the direction from egress to
           ingress
      
         - virtio_net_hdr_to_skb: count transport header in UFO, prevent
           allowing bad skbs into the stack
      
         - nfc: reorder the logic in nfc_{un,}register_device, fix unregister
      
         - ipsec: check return value of ipv6_skip_exthdr
      
         - usb: r8152: add MAC passthrough support for more Lenovo Docks"
      
      * tag 'net-5.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (96 commits)
        ptp: ocp: Fix a couple NULL vs IS_ERR() checks
        net: ethernet: dec: tulip: de4x5: fix possible array overflows in type3_infoblock()
        net: tulip: de4x5: fix the problem that the array 'lp->phy[8]' may be out of bound
        ipv6: check return value of ipv6_skip_exthdr
        e100: fix device suspend/resume
        devlink: Don't throw an error if flash notification sent before devlink visible
        page_pool: Revert "page_pool: disable dma mapping support..."
        ethernet: hisilicon: hns: hns_dsaf_misc: fix a possible array overflow in hns_dsaf_ge_srst_by_port()
        octeontx2-af: debugfs: don't corrupt user memory
        NFC: add NCI_UNREG flag to eliminate the race
        NFC: reorder the logic in nfc_{un,}register_device
        NFC: reorganize the functions in nci_request
        tipc: check for null after calling kmemdup
        i40e: Fix display error code in dmesg
        i40e: Fix creation of first queue by omitting it if is not power of two
        i40e: Fix warning message and call stack during rmmod i40e driver
        i40e: Fix ping is lost after configuring ADq on VF
        i40e: Fix changing previously set num_queue_pairs for PFs
        i40e: Fix NULL ptr dereference on VSI filter sync
        i40e: Fix correct max_pkt_size on VF RX queue
        ...
      8d0112ac
    • Linus Torvalds's avatar
      Merge tag 'for-5.16-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux · 6fdf8864
      Linus Torvalds authored
      Pull btrfs fixes from David Sterba:
       "Several xes and one old ioctl deprecation. Namely there's fix for
        crashes/warnings with lzo compression that was suspected to be caused
        by first pull merge resolution, but it was a different bug.
      
        Summary:
      
         - regression fix for a crash in lzo due to missing boundary checks of
           the page array
      
         - fix crashes on ARM64 due to missing barriers when synchronizing
           status bits between work queues
      
         - silence lockdep when reading chunk tree during mount
      
         - fix false positive warning in integrity checker on devices with
           disabled write caching
      
         - fix signedness of bitfields in scrub
      
         - start deprecation of balance v1 ioctl"
      
      * tag 'for-5.16-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux:
        btrfs: deprecate BTRFS_IOC_BALANCE ioctl
        btrfs: make 1-bit bit-fields of scrub_page unsigned int
        btrfs: check-integrity: fix a warning on write caching disabled disk
        btrfs: silence lockdep when reading chunk tree during mount
        btrfs: fix memory ordering between normal and ordered work functions
        btrfs: fix a out-of-bound access in copy_compressed_data_to_page()
      6fdf8864
    • Linus Torvalds's avatar
      Merge tag 'fs_for_v5.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · db850a9b
      Linus Torvalds authored
      Pull UDF fix from Jan Kara:
       "A fix for a long-standing UDF bug where we were not properly
        validating directory position inside readdir"
      
      * tag 'fs_for_v5.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        udf: Fix crash after seekdir
      db850a9b
    • Linus Torvalds's avatar
      Merge tag 'fs.idmapped.v5.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux · 7cf7eed1
      Linus Torvalds authored
      Pull setattr idmapping fix from Christian Brauner:
       "This contains a simple fix for setattr. When determining the validity
        of the attributes the ia_{g,u}id fields contain the value that will be
        written to inode->i_{g,u}id. When the {g,u}id attribute of the file
        isn't altered and the caller's fs{g,u}id matches the current {g,u}id
        attribute the attribute change is allowed.
      
        The value in ia_{g,u}id does already account for idmapped mounts and
        will have taken the relevant idmapping into account. So in order to
        verify that the {g,u}id attribute isn't changed we simple need to
        compare the ia_{g,u}id value against the inode's i_{g,u}id value.
      
        This only has any meaning for idmapped mounts as idmapping helpers are
        idempotent without them. And for idmapped mounts this really only has
        a meaning when circular idmappings are used, i.e. mappings where e.g.
        id 1000 is mapped to id 1001 and id 1001 is mapped to id 1000. Such
        ciruclar mappings can e.g. be useful when sharing the same home
        directory between multiple users at the same time.
      
        Before this patch we could end up denying legitimate attribute changes
        and allowing invalid attribute changes when circular mappings are
        used. To even get into this situation the caller must've been
        privileged both to create that mapping and to create that idmapped
        mount.
      
        This hasn't been seen in the wild anywhere but came up when expanding
        the fstest suite during work on a series of hardening patches. All
        idmapped fstests pass without any regressions and we're adding new
        tests to verify the behavior of circular mappings.
      
        The new tests can be found at [1]"
      
      Link: https://lore.kernel.org/linux-fsdevel/20211109145713.1868404-2-brauner@kernel.org [1]
      
      * tag 'fs.idmapped.v5.16-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux:
        fs: handle circular mappings correctly
      7cf7eed1
    • Linus Torvalds's avatar
      Merge tag 'for-5.16/parisc-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux · a6a6d227
      Linus Torvalds authored
      Pull parisc fixes from Helge Deller:
       "parisc bug and warning fixes and wire up futex_waitv.
      
        Fix some warnings which showed up with allmodconfig builds, a revert
        of a change to the sigreturn trampoline which broke signal handling,
        wire up futex_waitv and add CONFIG_PRINTK_TIME=y to 32bit defconfig"
      
      * tag 'for-5.16/parisc-4' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
        parisc: Enable CONFIG_PRINTK_TIME=y in 32bit defconfig
        Revert "parisc: Reduce sigreturn trampoline to 3 instructions"
        parisc: Wrap assembler related defines inside __ASSEMBLY__
        parisc: Wire up futex_waitv
        parisc: Include stringify.h to avoid build error in crypto/api.c
        parisc/sticon: fix reverse colors
      a6a6d227
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm · c46e8ece
      Linus Torvalds authored
      Pull KVM fixes from Paolo Bonzini:
       "Selftest changes:
      
         - Cleanups for the perf test infrastructure and mapping hugepages
      
         - Avoid contention on mmap_sem when the guests start to run
      
         - Add event channel upcall support to xen_shinfo_test
      
        x86 changes:
      
         - Fixes for Xen emulation
      
         - Kill kvm_map_gfn() / kvm_unmap_gfn() and broken gfn_to_pfn_cache
      
         - Fixes for migration of 32-bit nested guests on 64-bit hypervisor
      
         - Compilation fixes
      
         - More SEV cleanups
      
        Generic:
      
         - Cap the return value of KVM_CAP_NR_VCPUS to both KVM_CAP_MAX_VCPUS
           and num_online_cpus(). Most architectures were only using one of
           the two"
      
      * tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm: (42 commits)
        KVM: x86: Cap KVM_CAP_NR_VCPUS by KVM_CAP_MAX_VCPUS
        KVM: s390: Cap KVM_CAP_NR_VCPUS by num_online_cpus()
        KVM: RISC-V: Cap KVM_CAP_NR_VCPUS by KVM_CAP_MAX_VCPUS
        KVM: PPC: Cap KVM_CAP_NR_VCPUS by KVM_CAP_MAX_VCPUS
        KVM: MIPS: Cap KVM_CAP_NR_VCPUS by KVM_CAP_MAX_VCPUS
        KVM: arm64: Cap KVM_CAP_NR_VCPUS by kvm_arm_default_max_vcpus()
        KVM: x86: Assume a 64-bit hypercall for guests with protected state
        selftests: KVM: Add /x86_64/sev_migrate_tests to .gitignore
        riscv: kvm: fix non-kernel-doc comment block
        KVM: SEV: Fix typo in and tweak name of cmd_allowed_from_miror()
        KVM: SEV: Drop a redundant setting of sev->asid during initialization
        KVM: SEV: WARN if SEV-ES is marked active but SEV is not
        KVM: SEV: Set sev_info.active after initial checks in sev_guest_init()
        KVM: SEV: Disallow COPY_ENC_CONTEXT_FROM if target has created vCPUs
        KVM: Kill kvm_map_gfn() / kvm_unmap_gfn() and gfn_to_pfn_cache
        KVM: nVMX: Use a gfn_to_hva_cache for vmptrld
        KVM: nVMX: Use kvm_read_guest_offset_cached() for nested VMCS check
        KVM: x86/xen: Use sizeof_field() instead of open-coding it
        KVM: nVMX: Use kvm_{read,write}_guest_cached() for shadow_vmcs12
        KVM: x86/xen: Fix get_attr of KVM_XEN_ATTR_TYPE_SHARED_INFO
        ...
      c46e8ece
    • Rafael J. Wysocki's avatar
      Merge branch 'thermal-int340x' · b49e0015
      Rafael J. Wysocki authored
      Merge int340x thermal driver Kconfig fix for 5.16-rc2.
      
      * thermal-int340x:
        thermal: int340x: Limit Kconfig to 64-bit
      b49e0015
    • Rafael J. Wysocki's avatar
      Merge branch 'powercap' · 47b577ae
      Rafael J. Wysocki authored
      Merge a Dynamic Thermal Power Management (DTPM) framework fix for
      5.16-rc2.
      
      * powercap:
        powercap: DTPM: Fix suspend failure and kernel warning
      47b577ae
    • Linus Torvalds's avatar
      Merge tag 'docs-5.16-2' of git://git.lwn.net/linux · 4ae275bc
      Linus Torvalds authored
      Pull documentation fixes from Jonathan Corbet:
       "A handful of documentation fixes for 5.16"
      
      * tag 'docs-5.16-2' of git://git.lwn.net/linux:
        Documentation/process: fix a cross reference
        Documentation: update vcpu-requests.rst reference
        docs: accounting: update delay-accounting.rst reference
        libbpf: update index.rst reference
        docs: filesystems: Fix grammatical error "with" to "which"
        doc/zh_CN: fix a translation error in management-style
        docs: ftrace: fix the wrong path of tracefs
        Documentation: arm: marvell: Fix link to armada_1000_pb.pdf document
        Documentation: arm: marvell: Put Armada XP section between Armada 370 and 375
        Documentation: arm: marvell: Add some links to homepage / product infos
        docs: Update Sphinx requirements
      4ae275bc
    • Linus Torvalds's avatar
      Merge tag 'printk-for-5.16-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux · 7d5775d4
      Linus Torvalds authored
      Pull printk fixes from Petr Mladek:
      
       - Try to flush backtraces from other CPUs also on the local one. This
         was a regression caused by printk_safe buffers removal.
      
       - Remove header dependency warning.
      
      * tag 'printk-for-5.16-fixup' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux:
        printk: Remove printk.h inclusion in percpu.h
        printk: restore flushing of NMI buffers on remote CPUs after NMI backtraces
      7d5775d4
    • Dan Carpenter's avatar
      ptp: ocp: Fix a couple NULL vs IS_ERR() checks · c7521d3a
      Dan Carpenter authored
      The ptp_ocp_get_mem() function does not return NULL, it returns error
      pointers.
      
      Fixes: 773bda96 ("ptp: ocp: Expose various resources on the timecard.")
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c7521d3a
    • Teng Qi's avatar
      net: ethernet: dec: tulip: de4x5: fix possible array overflows in type3_infoblock() · 0fa68da7
      Teng Qi authored
      The definition of macro MOTO_SROM_BUG is:
        #define MOTO_SROM_BUG    (lp->active == 8 && (get_unaligned_le32(
        dev->dev_addr) & 0x00ffffff) == 0x3e0008)
      
      and the if statement
        if (MOTO_SROM_BUG) lp->active = 0;
      
      using this macro indicates lp->active could be 8. If lp->active is 8 and
      the second comparison of this macro is false. lp->active will remain 8 in:
        lp->phy[lp->active].gep = (*p ? p : NULL); p += (2 * (*p) + 1);
        lp->phy[lp->active].rst = (*p ? p : NULL); p += (2 * (*p) + 1);
        lp->phy[lp->active].mc  = get_unaligned_le16(p); p += 2;
        lp->phy[lp->active].ana = get_unaligned_le16(p); p += 2;
        lp->phy[lp->active].fdx = get_unaligned_le16(p); p += 2;
        lp->phy[lp->active].ttm = get_unaligned_le16(p); p += 2;
        lp->phy[lp->active].mci = *p;
      
      However, the length of array lp->phy is 8, so array overflows can occur.
      To fix these possible array overflows, we first check lp->active and then
      return -EINVAL if it is greater or equal to ARRAY_SIZE(lp->phy) (i.e. 8).
      Reported-by: default avatarTOTE Robot <oslab@tsinghua.edu.cn>
      Signed-off-by: default avatarTeng Qi <starmiku1207184332@gmail.com>
      Reviewed-by: default avatarArnd Bergmann <arnd@arndb.de>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0fa68da7
    • zhangyue's avatar
      net: tulip: de4x5: fix the problem that the array 'lp->phy[8]' may be out of bound · 61217be8
      zhangyue authored
      In line 5001, if all id in the array 'lp->phy[8]' is not 0, when the
      'for' end, the 'k' is 8.
      
      At this time, the array 'lp->phy[8]' may be out of bound.
      Signed-off-by: default avatarzhangyue <zhangyue1@kylinos.cn>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      61217be8
    • David S. Miller's avatar
      Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net- · 4e5d2124
      David S. Miller authored
      queue
      
      Tony Nguyen says:
      
      ====================
      Intel Wired LAN Driver Updates 2021-11-17
      
      This series contains updates to i40e driver only.
      
      Eryk adds accounting for VLAN header in packet size when VF port VLAN is
      configured. He also fixes TC queue distribution when the user has changed
      queue counts as well as for configuration of VF ADQ which caused dropped
      packets.
      
      Michal adds tracking for when a VSI is being released to prevent null
      pointer dereference when managing filters.
      
      Karen ensures PF successfully initiates VF requested reset which could
      cause a call trace otherwise.
      
      Jedrzej moves validation of channel queue value earlier to prevent
      partial configuration when the value is invalid.
      
      Grzegorz corrects the reported error when adding filter fails.
      ====================
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      4e5d2124
    • Jordy Zomer's avatar
      ipv6: check return value of ipv6_skip_exthdr · 5f9c55c8
      Jordy Zomer authored
      The offset value is used in pointer math on skb->data.
      Since ipv6_skip_exthdr may return -1 the pointer to uh and th
      may not point to the actual udp and tcp headers and potentially
      overwrite other stuff. This is why I think this should be checked.
      
      EDIT:  added {}'s, thanks Kees
      Signed-off-by: default avatarJordy Zomer <jordy@pwning.systems>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      5f9c55c8
    • Jesse Brandeburg's avatar
      e100: fix device suspend/resume · 5d2ca2e1
      Jesse Brandeburg authored
      As reported in [1], e100 was no longer working for suspend/resume
      cycles. The previous commit mentioned in the fixes appears to have
      broken things and this attempts to practice best known methods for
      device power management and keep wake-up working while allowing
      suspend/resume to work. To do this, I reorder a little bit of code
      and fix the resume path to make sure the device is enabled.
      
      [1] https://bugzilla.kernel.org/show_bug.cgi?id=214933
      
      Fixes: 69a74aef ("e100: use generic power management")
      Cc: Vaibhav Gupta <vaibhavgupta40@gmail.com>
      Reported-by: default avatarAlexey Kuznetsov <axet@me.com>
      Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
      Tested-by: default avatarAlexey Kuznetsov <axet@me.com>
      Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      5d2ca2e1
    • Leon Romanovsky's avatar
      devlink: Don't throw an error if flash notification sent before devlink visible · fec1faf2
      Leon Romanovsky authored
      The mlxsw driver calls to various devlink flash routines even before
      users can get any access to the devlink instance itself. For example,
      mlxsw_core_fw_rev_validate() one of such functions.
      
      __mlxsw_core_bus_device_register
       -> mlxsw_core_fw_rev_validate
        -> mlxsw_core_fw_flash
         -> mlxfw_firmware_flash
          -> mlxfw_status_notify
           -> devlink_flash_update_status_notify
            -> __devlink_flash_update_notify
             -> WARN_ON(...)
      
      It causes to the WARN_ON to trigger warning about devlink not registered.
      
      Fixes: cf530217 ("devlink: Notify users when objects are accessible")
      Reported-by: default avatarDanielle Ratson <danieller@nvidia.com>
      Tested-by: default avatarDanielle Ratson <danieller@nvidia.com>
      Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
      Acked-by: default avatarJakub Kicinski <kuba@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      fec1faf2
    • Yunsheng Lin's avatar
      page_pool: Revert "page_pool: disable dma mapping support..." · f915b75b
      Yunsheng Lin authored
      This reverts commit d00e60ee.
      
      As reported by Guillaume in [1]:
      Enabling LPAE always enables CONFIG_ARCH_DMA_ADDR_T_64BIT
      in 32-bit systems, which breaks the bootup proceess when a
      ethernet driver is using page pool with PP_FLAG_DMA_MAP flag.
      As we were hoping we had no active consumers for such system
      when we removed the dma mapping support, and LPAE seems like
      a common feature for 32 bits system, so revert it.
      
      1. https://www.spinics.net/lists/netdev/msg779890.html
      
      Fixes: d00e60ee ("page_pool: disable dma mapping support for 32-bit arch with 64-bit DMA")
      Signed-off-by: default avatarYunsheng Lin <linyunsheng@huawei.com>
      Reported-by: default avatar"kernelci.org bot" <bot@kernelci.org>
      Tested-by: default avatar"kernelci.org bot" <bot@kernelci.org>
      Acked-by: default avatarJesper Dangaard Brouer <brouer@redhat.com>
      Acked-by: default avatarIlias Apalodimas <ilias.apalodimas@linaro.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f915b75b
    • Teng Qi's avatar
      ethernet: hisilicon: hns: hns_dsaf_misc: fix a possible array overflow in... · a66998e0
      Teng Qi authored
      ethernet: hisilicon: hns: hns_dsaf_misc: fix a possible array overflow in hns_dsaf_ge_srst_by_port()
      
      The if statement:
        if (port >= DSAF_GE_NUM)
              return;
      
      limits the value of port less than DSAF_GE_NUM (i.e., 8).
      However, if the value of port is 6 or 7, an array overflow could occur:
        port_rst_off = dsaf_dev->mac_cb[port]->port_rst_off;
      
      because the length of dsaf_dev->mac_cb is DSAF_MAX_PORT_NUM (i.e., 6).
      
      To fix this possible array overflow, we first check port and if it is
      greater than or equal to DSAF_MAX_PORT_NUM, the function returns.
      Reported-by: default avatarTOTE Robot <oslab@tsinghua.edu.cn>
      Signed-off-by: default avatarTeng Qi <starmiku1207184332@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a66998e0
    • Petr Mladek's avatar
      bf6d0d1e
    • Helge Deller's avatar
      9412f5aa
    • Helge Deller's avatar
      Revert "parisc: Reduce sigreturn trampoline to 3 instructions" · 79df39d5
      Helge Deller authored
      This reverts commit e4f2006f.
      
      This patch shows problems with signal handling. Revert it for now.
      Signed-off-by: default avatarHelge Deller <deller@gmx.de>
      Cc: <stable@vger.kernel.org> # v5.15
      79df39d5
    • Helge Deller's avatar
      parisc: Wrap assembler related defines inside __ASSEMBLY__ · 4017b230
      Helge Deller authored
      Building allmodconfig shows errors in the gpu/drm/msm snapdragon drivers,
      because a COND() define is used there which conflicts with the COND() for
      PA-RISC assembly.  Although the snapdragon driver isn't relevant for parisc, it
      is nevertheless compiled when CONFIG_COMPILE_TEST is defined.
      
      Move the COND() define and other PA-RISC mnemonics inside the #ifdef
      __ASSEMBLY__ part to avoid this conflict.
      Signed-off-by: default avatarHelge Deller <deller@gmx.de>
      Reported-by: default avatarkernel test robot <lkp@intel.com>
      4017b230