1. 04 Jan, 2021 2 commits
    • David Howells's avatar
      afs: Fix directory entry size calculation · 366911cd
      David Howells authored
      The number of dirent records used by an AFS directory entry should be
      calculated using the assumption that there is a 16-byte name field in the
      first block, rather than a 20-byte name field (which is actually the case).
      This miscalculation is historic and effectively standard, so we have to use
      it.
      
      The calculation we need to use is:
      
      	1 + (((strlen(name) + 1) + 15) >> 5)
      
      where we are adding one to the strlen() result to account for the NUL
      termination.
      
      Fix this by the following means:
      
       (1) Create an inline function to do the calculation for a given name
           length.
      
       (2) Use the function to calculate the number of records used for a dirent
           in afs_dir_iterate_block().
      
           Use this to move the over-end check out of the loop since it only
           needs to be done once.
      
           Further use this to only go through the loop for the 2nd+ records
           composing an entry.  The only test there now is for if the record is
           allocated - and we already checked the first block at the top of the
           outer loop.
      
       (3) Add a max name length check in afs_dir_iterate_block().
      
       (4) Make afs_edit_dir_add() and afs_edit_dir_remove() use the function
           from (1) to calculate the number of blocks rather than doing it
           incorrectly themselves.
      
      Fixes: 63a4681f ("afs: Locally edit directory data for mkdir/create/unlink/...")
      Fixes: ^1da177e4 ("Linux-2.6.12-rc2")
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Tested-by: default avatarMarc Dionne <marc.dionne@auristor.com>
      366911cd
    • David Howells's avatar
      afs: Work around strnlen() oops with CONFIG_FORTIFIED_SOURCE=y · 26982a89
      David Howells authored
      AFS has a structured layout in its directory contents (AFS dirs are
      downloaded as files and parsed locally by the client for lookup/readdir).
      The slots in the directory are defined by union afs_xdr_dirent.  This,
      however, only directly allows a name of a length that will fit into that
      union.  To support a longer name, the next 1-8 contiguous entries are
      annexed to the first one and the name flows across these.
      
      afs_dir_iterate_block() uses strnlen(), limited to the space to the end of
      the page, to find out how long the name is.  This worked fine until
      6a39e62a.  With that commit, the compiler determines the size of the
      array and asserts that the string fits inside that array.  This is a
      problem for AFS because we *expect* it to overflow one or more arrays.
      
      A similar problem also occurs in afs_dir_scan_block() when a directory file
      is being locally edited to avoid the need to redownload it.  There strlen()
      was being used safely because each page has the last byte set to 0 when the
      file is downloaded and validated (in afs_dir_check_page()).
      
      Fix this by changing the afs_xdr_dirent union name field to an
      indeterminate-length array and dropping the overflow field.
      
      (Note that whilst looking at this, I realised that the calculation of the
      number of slots a dirent used is non-standard and not quite right, but I'll
      address that in a separate patch.)
      
      The issue can be triggered by something like:
      
              touch /afs/example.com/thisisaveryveryverylongname
      
      and it generates a report that looks like:
      
              detected buffer overflow in strnlen
              ------------[ cut here ]------------
              kernel BUG at lib/string.c:1149!
              ...
              RIP: 0010:fortify_panic+0xf/0x11
              ...
              Call Trace:
               afs_dir_iterate_block+0x12b/0x35b
               afs_dir_iterate+0x14e/0x1ce
               afs_do_lookup+0x131/0x417
               afs_lookup+0x24f/0x344
               lookup_open.isra.0+0x1bb/0x27d
               open_last_lookups+0x166/0x237
               path_openat+0xe0/0x159
               do_filp_open+0x48/0xa4
               ? kmem_cache_alloc+0xf5/0x16e
               ? __clear_close_on_exec+0x13/0x22
               ? _raw_spin_unlock+0xa/0xb
               do_sys_openat2+0x72/0xde
               do_sys_open+0x3b/0x58
               do_syscall_64+0x2d/0x3a
               entry_SYSCALL_64_after_hwframe+0x44/0xa9
      
      Fixes: 6a39e62a ("lib: string.h: detect intra-object overflow in fortified string functions")
      Reported-by: default avatarMarc Dionne <marc.dionne@auristor.com>
      Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
      Tested-by: default avatarMarc Dionne <marc.dionne@auristor.com>
      cc: Daniel Axtens <dja@axtens.net>
      26982a89
  2. 18 Dec, 2020 4 commits
    • Linus Torvalds's avatar
      Merge tag 'gpio-v5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio · a409ed15
      Linus Torvalds authored
      Pull GPIO updates from Linus Walleij:
       "This is the bulk of the GPIO changes for the v5.11 kernel cycle:
      
        Core changes:
      
         - Retired the old set-up function for GPIO IRQ chips. All chips now
           use the template struct gpio_irq_chip and pass that to the core to
           be set up alongside the gpio_chip. We can finally get rid of the
           old cruft.
      
         - Some refactoring and clean up of the core code.
      
         - Support edge event timestamps to be stamped using REALTIME (wall
           clock) timestamps. We have found solid use cases for this, so we
           support it.
      
        New drivers:
      
         - MStar MSC313 GPIO driver.
      
         - HiSilicon GPIO driver.
      
        Driver improvements:
      
         - The PCA953x driver now also supports the NXP PCAL9554B/C chips.
      
         - The mockup driver can now be probed from the device tree which is
           pretty useful for virtual prototyping of devices.
      
         - The Rcar driver now supports .get_multiple()
      
         - The MXC driver dropped some legacy and became a pure device tree
           client.
      
         - The Exar driver was moved over to the IDA interface for
           enumerating, and also switched over to using regmap for register
           access"
      
      * tag 'gpio-v5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio: (87 commits)
        MAINTAINERS: Remove reference to non-existing file
        gpio: hisi: Do not require ACPI for COMPILE_TEST
        MAINTAINERS: Add maintainer for HiSilicon GPIO driver
        gpio: gpio-hisi: Add HiSilicon GPIO support
        gpio: cs5535: Simplify the return expression of cs5535_gpio_probe()
        gpiolib: irq hooks: fix recursion in gpiochip_irq_unmask
        dt-bindings: mt7621-gpio: convert bindings to YAML format
        gpiolib: cdev: Flag invalid GPIOs as used
        gpio: put virtual gpio device into their own submenu
        drivers: gpio: amd8111: use SPDX-License-Identifier
        drivers: gpio: amd8111: prefer dev_err()/dev_info() over raw printk
        drivers: gpio: bt8xx: prefer dev_err()/dev_warn() over of raw printk
        gpio: Add TODO item for debugfs interface
        gpio: just plain warning when nonexisting gpio requested
        tools: gpio: add option to report wall-clock time to gpio-event-mon
        tools: gpio: add support for reporting realtime event clock to lsgpio
        gpiolib: cdev: allow edge event timestamps to be configured as REALTIME
        gpio: msc313: MStar MSC313 GPIO driver
        dt-bindings: gpio: Binding for MStar MSC313 GPIO controller
        dt-bindings: gpio: Add a binding header for the MSC313 GPIO driver
        ...
      a409ed15
    • Linus Torvalds's avatar
      Merge tag 'for-linus-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml · 345b17ac
      Linus Torvalds authored
      Pull UML updates from Richard Weinberger:
      
       - IRQ handling cleanups
      
       - Support for suspend
      
       - Various fixes for UML specific drivers: ubd, vector, xterm
      
      * tag 'for-linus-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml: (32 commits)
        um: Fix build w/o CONFIG_PM_SLEEP
        um: time-travel: Correct time event IRQ delivery
        um: irq/sigio: Support suspend/resume handling of workaround IRQs
        um: time-travel: Actually apply "free-until" optimisation
        um: chan_xterm: Fix fd leak
        um: tty: Fix handling of close in tty lines
        um: Monitor error events in IRQ controller
        um: allocate a guard page to helper threads
        um: support some of ARCH_HAS_SET_MEMORY
        um: time-travel: avoid multiple identical propagations
        um: Fetch registers only for signals which need them
        um: Support suspend to RAM
        um: Allow PM with suspend-to-idle
        um: time: Fix read_persistent_clock64() in time-travel
        um: Simplify os_idle_sleep() and sleep longer
        um: Simplify IRQ handling code
        um: Remove IRQ_NONE type
        um: irq: Reduce irq_reg allocation
        um: irq: Clean up and rename struct irq_fd
        um: Clean up alarm IRQ chip name
        ...
      345b17ac
    • Linus Torvalds's avatar
      Merge tag 'for-linus-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs · 787fec8a
      Linus Torvalds authored
      Pull jffs2, ubi and ubifs updates from Richard Weinberger:
       "JFFS2:
         - Fix for a remount regression
         - Fix for an abnormal GC exit
         - Fix for a possible NULL pointer issue while mounting
      
        UBI:
         - Add support ECC-ed NOR flash
         - Removal of dead code
      
        UBIFS:
         - Make node dumping debug code more reliable
         - Various cleanups: less ifdefs, less typos
         - Fix for an info leak"
      
      * tag 'for-linus-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs:
        ubifs: ubifs_dump_node: Dump all branches of the index node
        ubifs: ubifs_dump_sleb: Remove unused function
        ubifs: Pass node length in all node dumping callers
        Revert "ubifs: Fix out-of-bounds memory access caused by abnormal value of node_len"
        ubifs: Limit dumping length by size of memory which is allocated for the node
        ubifs: Remove the redundant return in dbg_check_nondata_nodes_order
        jffs2: Fix NULL pointer dereference in rp_size fs option parsing
        ubifs: Fixed print foramt mismatch in ubifs
        ubi: Do not zero out EC and VID on ECC-ed NOR flashes
        jffs2: remove trailing semicolon in macro definition
        ubifs: Fix error return code in ubifs_init_authentication()
        ubifs: wbuf: Don't leak kernel memory to flash
        ubi: Remove useless code in bytes_str_to_int
        ubifs: Fix the printing type of c->big_lpt
        jffs2: Allow setting rp_size to zero during remounting
        jffs2: Fix ignoring mounting options problem during remounting
        jffs2: Fix GC exit abnormally
        ubifs: Code cleanup by removing ifdef macro surrounding
        jffs2: Fix if/else empty body warnings
        ubifs: Delete duplicated words + other fixes
      787fec8a
    • Linus Torvalds's avatar
      Merge tag '5.11-rc-smb3' of git://git.samba.org/sfrench/cifs-2.6 · e13300bd
      Linus Torvalds authored
      Pull cifs updates from Steve French:
       "The largest part are for support of the newer mount API which has been
        needed for cifs/smb3 mounts for a long time due to the new API's
        better handling of remount, and better error reporting. There are
        three additional small cleanup patches for this being tested, that are
        not included yet.
      
        This series also includes addition of support for the SMB3 witness
        protocol which can provide important notifications from the server to
        client on server address or export or network changes. This can be
        useful for example in order to be notified before the failure - when a
        server's IP address changes (in the future it will allow us to support
        server notifications of when a share is moved).
      
        It also includes three patches for stable e.g. some that better handle
        some confusing error messages during session establishment"
      
      * tag '5.11-rc-smb3' of git://git.samba.org/sfrench/cifs-2.6: (55 commits)
        cifs: update internal module version number
        cifs: Fix support for remount when not changing rsize/wsize
        cifs: handle "guest" mount parameter
        cifs: correct four aliased mount parms to allow use of previous names
        cifs: Tracepoints and logs for tracing credit changes.
        cifs: fix use after free in cifs_smb3_do_mount()
        cifs: fix rsize/wsize to be negotiated values
        cifs: Fix some error pointers handling detected by static checker
        smb3: remind users that witness protocol is experimental
        cifs: update super_operations to show_devname
        cifs: fix uninitialized variable in smb3_fs_context_parse_param
        cifs: update mnt_cifs_flags during reconfigure
        cifs: move update of flags into a separate function
        cifs: remove ctx argument from cifs_setup_cifs_sb
        cifs: do not allow changing posix_paths during remount
        cifs: uncomplicate printing the iocharset parameter
        cifs: don't create a temp nls in cifs_setup_ipc
        cifs: simplify handling of cifs_sb/ctx->local_nls
        cifs: we do not allow changing username/password/unc/... during remount
        cifs: add initial reconfigure support
        ...
      e13300bd
  3. 17 Dec, 2020 34 commits
    • Linus Torvalds's avatar
      Merge tag 'net-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net · d64c6f96
      Linus Torvalds authored
      Pull networking fixes from Jakub Kicinski:
       "Current release - always broken:
      
         - net/smc: fix access to parent of an ib device
      
         - devlink: use _BITUL() macro instead of BIT() in the UAPI header
      
         - handful of mptcp fixes
      
        Previous release - regressions:
      
         - intel: AF_XDP: clear the status bits for the next_to_use descriptor
      
         - dpaa2-eth: fix the size of the mapped SGT buffer
      
        Previous release - always broken:
      
         - mptcp: fix security context on server socket
      
         - ethtool: fix string set id check
      
         - ethtool: fix error paths in ethnl_set_channels()
      
         - lan743x: fix rx_napi_poll/interrupt ping-pong
      
         - qca: ar9331: fix sleeping function called from invalid context bug"
      
      * tag 'net-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net: (32 commits)
        net/sched: sch_taprio: reset child qdiscs before freeing them
        nfp: move indirect block cleanup to flower app stop callback
        octeontx2-af: Fix undetected unmap PF error check
        net: nixge: fix spelling mistake in Kconfig: "Instuments" -> "Instruments"
        qlcnic: Fix error code in probe
        mptcp: fix pending data accounting
        mptcp: push pending frames when subflow has free space
        mptcp: properly annotate nested lock
        mptcp: fix security context on server socket
        net/mlx5: Fix compilation warning for 32-bit platform
        mptcp: clear use_ack and use_map when dropping other suboptions
        devlink: use _BITUL() macro instead of BIT() in the UAPI header
        net: korina: fix return value
        net/smc: fix access to parent of an ib device
        ethtool: fix error paths in ethnl_set_channels()
        nfc: s3fwrn5: Remove unused NCI prop commands
        nfc: s3fwrn5: Remove the delay for NFC sleep
        phy: fix kdoc warning
        tipc: do sanity check payload of a netlink message
        use __netdev_notify_peers in hyperv
        ...
      d64c6f96
    • Linus Torvalds's avatar
      Merge tag 'for-linus' of git://github.com/openrisc/linux · 0c6c8878
      Linus Torvalds authored
      Pull OpenRISC updates from Stafford Horne:
      
       - New drivers and OpenRISC support for the LiteX platform
      
       - A bug fix to support userspace gdb debugging
      
       - Fixes one compile issue with blk-iocost
      
      * tag 'for-linus' of git://github.com/openrisc/linux:
        openrisc: add local64.h to fix blk-iocost build
        openrisc: fix trap for debugger breakpoint signalling
        openrisc: add support for LiteX
        drivers/tty/serial: add LiteUART driver
        dt-bindings: serial: document LiteUART bindings
        drivers/soc/litex: add LiteX SoC Controller driver
        dt-bindings: soc: document LiteX SoC Controller bindings
        dt-bindings: vendor: add vendor prefix for LiteX
      0c6c8878
    • Linus Torvalds's avatar
      Merge tag 'powerpc-5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux · 8a5be36b
      Linus Torvalds authored
      Pull powerpc updates from Michael Ellerman:
      
       - Switch to the generic C VDSO, as well as some cleanups of our VDSO
         setup/handling code.
      
       - Support for KUAP (Kernel User Access Prevention) on systems using the
         hashed page table MMU, using memory protection keys.
      
       - Better handling of PowerVM SMT8 systems where all threads of a core
         do not share an L2, allowing the scheduler to make better scheduling
         decisions.
      
       - Further improvements to our machine check handling.
      
       - Show registers when unwinding interrupt frames during stack traces.
      
       - Improvements to our pseries (PowerVM) partition migration code.
      
       - Several series from Christophe refactoring and cleaning up various
         parts of the 32-bit code.
      
       - Other smaller features, fixes & cleanups.
      
      Thanks to: Alan Modra, Alexey Kardashevskiy, Andrew Donnellan, Aneesh
      Kumar K.V, Ard Biesheuvel, Athira Rajeev, Balamuruhan S, Bill Wendling,
      Cédric Le Goater, Christophe Leroy, Christophe Lombard, Colin Ian King,
      Daniel Axtens, David Hildenbrand, Frederic Barrat, Ganesh Goudar,
      Gautham R. Shenoy, Geert Uytterhoeven, Giuseppe Sacco, Greg Kurz,
      Harish, Jan Kratochvil, Jordan Niethe, Kaixu Xia, Laurent Dufour,
      Leonardo Bras, Madhavan Srinivasan, Mahesh Salgaonkar, Mathieu
      Desnoyers, Nathan Lynch, Nicholas Piggin, Oleg Nesterov, Oliver
      O'Halloran, Oscar Salvador, Po-Hsu Lin, Qian Cai, Qinglang Miao, Randy
      Dunlap, Ravi Bangoria, Sachin Sant, Sandipan Das, Sebastian Andrzej
      Siewior , Segher Boessenkool, Srikar Dronamraju, Tyrel Datwyler, Uwe
      Kleine-König, Vincent Stehlé, Youling Tang, and Zhang Xiaoxu.
      
      * tag 'powerpc-5.11-1' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux: (304 commits)
        powerpc/32s: Fix cleanup_cpu_mmu_context() compile bug
        powerpc: Add config fragment for disabling -Werror
        powerpc/configs: Add ppc64le_allnoconfig target
        powerpc/powernv: Rate limit opal-elog read failure message
        powerpc/pseries/memhotplug: Quieten some DLPAR operations
        powerpc/ps3: use dma_mapping_error()
        powerpc: force inlining of csum_partial() to avoid multiple csum_partial() with GCC10
        powerpc/perf: Fix Threshold Event Counter Multiplier width for P10
        powerpc/mm: Fix hugetlb_free_pmd_range() and hugetlb_free_pud_range()
        KVM: PPC: Book3S HV: Fix mask size for emulated msgsndp
        KVM: PPC: fix comparison to bool warning
        KVM: PPC: Book3S: Assign boolean values to a bool variable
        powerpc: Inline setup_kup()
        powerpc/64s: Mark the kuap/kuep functions non __init
        KVM: PPC: Book3S HV: XIVE: Add a comment regarding VP numbering
        powerpc/xive: Improve error reporting of OPAL calls
        powerpc/xive: Simplify xive_do_source_eoi()
        powerpc/xive: Remove P9 DD1 flag XIVE_IRQ_FLAG_EOI_FW
        powerpc/xive: Remove P9 DD1 flag XIVE_IRQ_FLAG_MASK_FW
        powerpc/xive: Remove P9 DD1 flag XIVE_IRQ_FLAG_SHIFT_BUG
        ...
      8a5be36b
    • Linus Torvalds's avatar
      Merge tag 'trace-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace · 09c0796a
      Linus Torvalds authored
      Pull tracing updates from Steven Rostedt:
       "The major update to this release is that there's a new arch config
        option called CONFIG_HAVE_DYNAMIC_FTRACE_WITH_ARGS.
      
        Currently, only x86_64 enables it. All the ftrace callbacks now take a
        struct ftrace_regs instead of a struct pt_regs. If the architecture
        has HAVE_DYNAMIC_FTRACE_WITH_ARGS enabled, then the ftrace_regs will
        have enough information to read the arguments of the function being
        traced, as well as access to the stack pointer.
      
        This way, if a user (like live kernel patching) only cares about the
        arguments, then it can avoid using the heavier weight "regs" callback,
        that puts in enough information in the struct ftrace_regs to simulate
        a breakpoint exception (needed for kprobes).
      
        A new config option that audits the timestamps of the ftrace ring
        buffer at most every event recorded.
      
        Ftrace recursion protection has been cleaned up to move the protection
        to the callback itself (this saves on an extra function call for those
        callbacks).
      
        Perf now handles its own RCU protection and does not depend on ftrace
        to do it for it (saving on that extra function call).
      
        New debug option to add "recursed_functions" file to tracefs that
        lists all the places that triggered the recursion protection of the
        function tracer. This will show where things need to be fixed as
        recursion slows down the function tracer.
      
        The eval enum mapping updates done at boot up are now offloaded to a
        work queue, as it caused a noticeable pause on slow embedded boards.
      
        Various clean ups and last minute fixes"
      
      * tag 'trace-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace: (33 commits)
        tracing: Offload eval map updates to a work queue
        Revert: "ring-buffer: Remove HAVE_64BIT_ALIGNED_ACCESS"
        ring-buffer: Add rb_check_bpage in __rb_allocate_pages
        ring-buffer: Fix two typos in comments
        tracing: Drop unneeded assignment in ring_buffer_resize()
        tracing: Disable ftrace selftests when any tracer is running
        seq_buf: Avoid type mismatch for seq_buf_init
        ring-buffer: Fix a typo in function description
        ring-buffer: Remove obsolete rb_event_is_commit()
        ring-buffer: Add test to validate the time stamp deltas
        ftrace/documentation: Fix RST C code blocks
        tracing: Clean up after filter logic rewriting
        tracing: Remove the useless value assignment in test_create_synth_event()
        livepatch: Use the default ftrace_ops instead of REGS when ARGS is available
        ftrace/x86: Allow for arguments to be passed in to ftrace_regs by default
        ftrace: Have the callbacks receive a struct ftrace_regs instead of pt_regs
        MAINTAINERS: assign ./fs/tracefs to TRACING
        tracing: Fix some typos in comments
        ftrace: Remove unused varible 'ret'
        ring-buffer: Add recording of ring buffer recursion into recursed_functions
        ...
      09c0796a
    • Linus Torvalds's avatar
      Merge tag 'modules-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux · 312dcaf9
      Linus Torvalds authored
      Pull modules updates from Jessica Yu:
       "Summary of modules changes for the 5.11 merge window:
      
         - Fix a race condition between systemd/udev and the module loader.
      
           The module loader was sending a uevent before the module was fully
           initialized (i.e., before its init function has been called). This
           means udev can start processing the module uevent before the module
           has finished initializing, and some udev rules expect that the
           module has initialized already upon receiving the uevent.
      
           This resulted in some systemd mount units failing if udev processes
           the event faster than the module can finish init. This is fixed by
           delaying the uevent until after the module has called its init
           routine.
      
         - Make the linker array sections for kernel params and module version
           attributes more robust by switching to use the alignment of the
           type in question.
      
           Namely, linker section arrays will be constructed using the
           alignment required by the struct (using __alignof__()) as opposed
           to a specific value such as sizeof(void *) or sizeof(long). This is
           less likely to cause breakages should the size of the type ever
           change (Johan Hovold)
      
         - Fix module state inconsistency by setting it back to GOING when a
           module fails to load and is on its way out (Miroslav Benes)
      
         - Some comment and code cleanups (Sergey Shtylyov)"
      
      * tag 'modules-for-v5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/jeyu/linux:
        module: delay kobject uevent until after module init call
        module: drop semicolon from version macro
        init: use type alignment for kernel parameters
        params: clean up module-param macros
        params: use type alignment for kernel parameters
        params: drop redundant "unused" attributes
        module: simplify version-attribute handling
        module: drop version-attribute alignment
        module: fix comment style
        module: add more 'kernel-doc' comments
        module: fix up 'kernel-doc' comments
        module: only handle errors with the *switch* statement in module_sig_check()
        module: avoid *goto*s in module_sig_check()
        module: merge repetitive strings in module_sig_check()
        module: set MODULE_STATE_GOING state when a module fails to load
      312dcaf9
    • Linus Torvalds's avatar
      Merge tag 'dmaengine-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine · 6daa9043
      Linus Torvalds authored
      Pull dmaengine updates from Vinod Koul:
       "The last dmaengine updates for this year :)
      
        This contains couple of new drivers, new device support and updates to
        bunch of drivers.
      
        New drivers/devices:
         - Qualcomm ADM driver
         - Qualcomm GPI driver
         - Allwinner A100 DMA support
         - Microchip Sama7g5 support
         - Mediatek MT8516 apdma
      
        Updates:
         - more updates to idxd driver and support for IAX config
         - runtime PM support for dw driver
         - TI drivers"
      
      * tag 'dmaengine-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine: (75 commits)
        soc: ti: k3-ringacc: Use correct error casting in k3_ringacc_dmarings_init
        dmaengine: ti: k3-udma-glue: Add support for K3 PKTDMA
        dmaengine: ti: k3-udma: Initial support for K3 PKTDMA
        dmaengine: ti: k3-udma: Add support for BCDMA channel TPL handling
        dmaengine: ti: k3-udma: Initial support for K3 BCDMA
        soc: ti: k3-ringacc: add AM64 DMA rings support.
        dmaengine: ti: Add support for k3 event routers
        dmaengine: ti: k3-psil: Add initial map for AM64
        dmaengine: ti: k3-psil: Extend psil_endpoint_config for K3 PKTDMA
        dt-bindings: dma: ti: Add document for K3 PKTDMA
        dt-bindings: dma: ti: Add document for K3 BCDMA
        dmaengine: dmatest: Use dmaengine_get_dma_device
        dmaengine: doc: client: Update for dmaengine_get_dma_device() usage
        dmaengine: Add support for per channel coherency handling
        dmaengine: of-dma: Add support for optional router configuration callback
        dmaengine: ti: k3-udma-glue: Configure the dma_dev for rings
        dmaengine: ti: k3-udma-glue: Get the ringacc from udma_dev
        dmaengine: ti: k3-udma-glue: Add function to get device pointer for DMA API
        dmaengine: ti: k3-udma: Add support for second resource range from sysfw
        dmaengine: ti: k3-udma: Wait for peer teardown completion if supported
        ...
      6daa9043
    • Linus Torvalds's avatar
      Merge tag 'mailbox-v5.11' of git://git.linaro.org/landing-teams/working/fujitsu/integration · 83005cd6
      Linus Torvalds authored
      Pull mailbox updates from Jassi Brar:
      
       - arm: added mhu-v2 controller driver
      
       - arm_mhu_db: fix kfree by using devm_ variant
      
       - stm32-ipcc: misc cleanup
      
      * tag 'mailbox-v5.11' of git://git.linaro.org/landing-teams/working/fujitsu/integration:
        mailbox: arm_mhuv2: Add driver
        dt-bindings: mailbox : arm,mhuv2: Add bindings
        mailbox: stm32-ipcc: cast void pointers to unsigned long
        mailbox: stm32-ipcc: remove duplicate error message
        mailbox: stm32-ipcc: add COMPILE_TEST dependency
        mailbox: arm_mhu_db: Fix mhu_db_shutdown by replacing kfree with devm_kfree
      83005cd6
    • Linus Torvalds's avatar
      Merge tag 'nfs-for-5.11-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs · 74f602dc
      Linus Torvalds authored
      Pull NFS client updates from Trond Myklebust:
       "Highlights include:
      
        Features:
      
         - NFSv3: Add emulation of lookupp() to improve open_by_filehandle()
           support
      
         - A series of patches to improve readdir performance, particularly
           with large directories
      
         - Basic support for using NFS/RDMA with the pNFS files and flexfiles
           drivers
      
         - Micro-optimisations for RDMA
      
         - RDMA tracing improvements
      
        Bugfixes:
      
         - Fix a long standing bug with xs_read_xdr_buf() when receiving
           partial pages (Dan Aloni)
      
         - Various fixes for getxattr and listxattr, when used over non-TCP
           transports
      
         - Fixes for containerised NFS from Sargun Dhillon
      
         - switch nfsiod to be an UNBOUND workqueue (Neil Brown)
      
         - READDIR should not ask for security label information if there is
           no LSM policy (Olga Kornievskaia)
      
         - Avoid using interval-based rebinding with TCP in lockd (Calum
           Mackay)
      
         - A series of RPC and NFS layer fixes to support the NFSv4.2
           READ_PLUS code
      
         - A couple of fixes for pnfs/flexfiles read failover
      
        Cleanups:
      
         - Various cleanups for the SUNRPC xdr code in conjunction with the
           READ_PLUS fixes"
      
      * tag 'nfs-for-5.11-1' of git://git.linux-nfs.org/projects/trondmy/linux-nfs: (90 commits)
        NFS/pNFS: Fix a typo in ff_layout_resend_pnfs_read()
        pNFS/flexfiles: Avoid spurious layout returns in ff_layout_choose_ds_for_read
        NFSv4/pnfs: Add tracing for the deviceid cache
        fs/lockd: convert comma to semicolon
        NFSv4.2: fix error return on memory allocation failure
        NFSv4.2/pnfs: Don't use READ_PLUS with pNFS yet
        NFSv4.2: Deal with potential READ_PLUS data extent buffer overflow
        NFSv4.2: Don't error when exiting early on a READ_PLUS buffer overflow
        NFSv4.2: Handle hole lengths that exceed the READ_PLUS read buffer
        NFSv4.2: decode_read_plus_hole() needs to check the extent offset
        NFSv4.2: decode_read_plus_data() must skip padding after data segment
        NFSv4.2: Ensure we always reset the result->count in decode_read_plus()
        SUNRPC: When expanding the buffer, we may need grow the sparse pages
        SUNRPC: Cleanup - constify a number of xdr_buf helpers
        SUNRPC: Clean up open coded setting of the xdr_stream 'nwords' field
        SUNRPC: _copy_to/from_pages() now check for zero length
        SUNRPC: Cleanup xdr_shrink_bufhead()
        SUNRPC: Fix xdr_expand_hole()
        SUNRPC: Fixes for xdr_align_data()
        SUNRPC: _shift_data_left/right_pages should check the shift length
        ...
      74f602dc
    • Linus Torvalds's avatar
      Merge tag 'ceph-for-5.11-rc1' of git://github.com/ceph/ceph-client · be695ee2
      Linus Torvalds authored
      Pull ceph updates from Ilya Dryomov:
       "The big ticket item here is support for msgr2 on-wire protocol, which
        adds the option of full in-transit encryption using AES-GCM algorithm
        (myself).
      
        On top of that we have a series to avoid intermittent errors during
        recovery with recover_session=clean and some MDS request encoding work
        from Jeff, a cap handling fix and assorted observability improvements
        from Luis and Xiubo and a good number of cleanups.
      
        Luis also ran into a corner case with quotas which sadly means that we
        are back to denying cross-quota-realm renames"
      
      * tag 'ceph-for-5.11-rc1' of git://github.com/ceph/ceph-client: (59 commits)
        libceph: drop ceph_auth_{create,update}_authorizer()
        libceph, ceph: make use of __ceph_auth_get_authorizer() in msgr1
        libceph, ceph: implement msgr2.1 protocol (crc and secure modes)
        libceph: introduce connection modes and ms_mode option
        libceph, rbd: ignore addr->type while comparing in some cases
        libceph, ceph: get and handle cluster maps with addrvecs
        libceph: factor out finish_auth()
        libceph: drop ac->ops->name field
        libceph: amend cephx init_protocol() and build_request()
        libceph, ceph: incorporate nautilus cephx changes
        libceph: safer en/decoding of cephx requests and replies
        libceph: more insight into ticket expiry and invalidation
        libceph: move msgr1 protocol specific fields to its own struct
        libceph: move msgr1 protocol implementation to its own file
        libceph: separate msgr1 protocol implementation
        libceph: export remaining protocol independent infrastructure
        libceph: export zero_page
        libceph: rename and export con->flags bits
        libceph: rename and export con->state states
        libceph: make con->state an int
        ...
      be695ee2
    • Linus Torvalds's avatar
      Merge tag 'ovl-update-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs · 92dbc9de
      Linus Torvalds authored
      Pull overlayfs updates from Miklos Szeredi:
      
       - Allow unprivileged mounting in a user namespace.
      
         For quite some time the security model of overlayfs has been that
         operations on underlying layers shall be performed with the
         privileges of the mounting task.
      
         This way an unprvileged user cannot gain privileges by the act of
         mounting an overlayfs instance. A full audit of all function calls
         made by the overlayfs code has been performed to see whether they
         conform to this model, and this branch contains some fixes in this
         regard.
      
       - Support running on copied filesystem images by optionally disabling
         UUID verification.
      
       - Bug fixes as well as documentation updates.
      
      * tag 'ovl-update-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs:
        ovl: unprivieged mounts
        ovl: do not get metacopy for userxattr
        ovl: do not fail because of O_NOATIME
        ovl: do not fail when setting origin xattr
        ovl: user xattr
        ovl: simplify file splice
        ovl: make ioctl() safe
        ovl: check privs before decoding file handle
        vfs: verify source area in vfs_dedupe_file_range_one()
        vfs: move cap_convert_nscap() call into vfs_setxattr()
        ovl: fix incorrect extent info in metacopy case
        ovl: expand warning in ovl_d_real()
        ovl: document lower modification caveats
        ovl: warn about orphan metacopy
        ovl: doc clarification
        ovl: introduce new "uuid=off" option for inodes index feature
        ovl: propagate ovl_fs to ovl_decode_real_fh and ovl_encode_real_fh
      92dbc9de
    • Linus Torvalds's avatar
      Merge tag 'fuse-update-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse · 65de0b89
      Linus Torvalds authored
      Pull fuse updates from Miklos Szeredi:
      
       - Improve performance of virtio-fs in mixed read/write workloads
      
       - Try to revalidate cache before returning EEXIST on exclusive create
      
       - Add a couple of miscellaneous bug fixes as well as some code cleanups
      
      * tag 'fuse-update-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse:
        fuse: fix bad inode
        fuse: support SB_NOSEC flag to improve write performance
        fuse: add a flag FUSE_OPEN_KILL_SUIDGID for open() request
        fuse: don't send ATTR_MODE to kill suid/sgid for handle_killpriv_v2
        fuse: setattr should set FATTR_KILL_SUIDGID
        fuse: set FUSE_WRITE_KILL_SUIDGID in cached write path
        fuse: rename FUSE_WRITE_KILL_PRIV to FUSE_WRITE_KILL_SUIDGID
        fuse: introduce the notion of FUSE_HANDLE_KILLPRIV_V2
        fuse: always revalidate if exclusive create
        virtiofs: clean up error handling in virtio_fs_get_tree()
        fuse: add fuse_sb_destroy() helper
        fuse: simplify get_fuse_conn*()
        fuse: get rid of fuse_mount refcount
        virtiofs: simplify sb setup
        virtiofs fix leak in setup
        fuse: launder page should wait for page writeback
      65de0b89
    • Linus Torvalds's avatar
      Merge tag 'f2fs-for-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs · ff49c86f
      Linus Torvalds authored
      Pull f2fs updates from Jaegeuk Kim:
       "In this round, we've made more work into per-file compression support.
      
        For example, F2FS_IOC_GET | SET_COMPRESS_OPTION provides a way to
        change the algorithm or cluster size per file. F2FS_IOC_COMPRESS |
        DECOMPRESS_FILE provides a way to compress and decompress the existing
        normal files manually.
      
        There is also a new mount option, compress_mode=fs|user, which can
        control who compresses the data.
      
        Chao also added a checksum feature with a mount option so that
        we are able to detect any corrupted cluster.
      
        In addition, Daniel contributed casefolding with encryption patch,
        which will be used for Android devices.
      
        Summary:
      
        Enhancements:
         - add ioctls and mount option to manage per-file compression feature
         - support casefolding with encryption
         - support checksum for compressed cluster
         - avoid IO starvation by replacing mutex with rwsem
         - add sysfs, max_io_bytes, to control max bio size
      
        Bug fixes:
         - fix use-after-free issue when compression and fsverity are enabled
         - fix consistency corruption during fault injection test
         - fix data offset for lseek
         - get rid of buffer_head which has 32bits limit in fiemap
         - fix some bugs in multi-partitions support
         - fix nat entry count calculation in shrinker
         - fix some stat information
      
        And, we've refactored some logics and fix minor bugs as well"
      
      * tag 'f2fs-for-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs: (36 commits)
        f2fs: compress: fix compression chksum
        f2fs: fix shift-out-of-bounds in sanity_check_raw_super()
        f2fs: fix race of pending_pages in decompression
        f2fs: fix to account inline xattr correctly during recovery
        f2fs: inline: fix wrong inline inode stat
        f2fs: inline: correct comment in f2fs_recover_inline_data
        f2fs: don't check PAGE_SIZE again in sanity_check_raw_super()
        f2fs: convert to F2FS_*_INO macro
        f2fs: introduce max_io_bytes, a sysfs entry, to limit bio size
        f2fs: don't allow any writes on readonly mount
        f2fs: avoid race condition for shrinker count
        f2fs: add F2FS_IOC_DECOMPRESS_FILE and F2FS_IOC_COMPRESS_FILE
        f2fs: add compress_mode mount option
        f2fs: Remove unnecessary unlikely()
        f2fs: init dirty_secmap incorrectly
        f2fs: remove buffer_head which has 32bits limit
        f2fs: fix wrong block count instead of bytes
        f2fs: use new conversion functions between blks and bytes
        f2fs: rename logical_to_blk and blk_to_logical
        f2fs: fix kbytes written stat for multi-device case
        ...
      ff49c86f
    • Linus Torvalds's avatar
      Merge tag 'for_v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · b97d4c42
      Linus Torvalds authored
      Pull ext2, reiserfs, quota and writeback updates from Jan Kara:
      
       - a couple of quota fixes (mostly for problems found by syzbot)
      
       - several ext2 cleanups
      
       - one fix for reiserfs crash on corrupted image
      
       - a fix for spurious warning in writeback code
      
      * tag 'for_v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        writeback: don't warn on an unregistered BDI in __mark_inode_dirty
        fs: quota: fix array-index-out-of-bounds bug by passing correct argument to vfs_cleanup_quota_inode()
        reiserfs: add check for an invalid ih_entry_count
        ext2: Fix fall-through warnings for Clang
        fs/ext2: Use ext2_put_page
        docs: filesystems: Reduce ext2.rst to one top-level heading
        quota: Sanity-check quota file headers on load
        quota: Don't overflow quota file offsets
        ext2: Remove unnecessary blank
        fs/quota: update quota state flags scheme with project quota flags
      b97d4c42
    • Davide Caratti's avatar
      net/sched: sch_taprio: reset child qdiscs before freeing them · 44d4775c
      Davide Caratti authored
      syzkaller shows that packets can still be dequeued while taprio_destroy()
      is running. Let sch_taprio use the reset() function to cancel the advance
      timer and drop all skbs from the child qdiscs.
      
      Fixes: 5a781ccb ("tc: Add support for configuring the taprio scheduler")
      Link: https://syzkaller.appspot.com/bug?id=f362872379bf8f0017fb667c1ab158f2d1e764ae
      Reported-by: syzbot+8971da381fb5a31f542d@syzkaller.appspotmail.com
      Signed-off-by: default avatarDavide Caratti <dcaratti@redhat.com>
      Acked-by: default avatarVinicius Costa Gomes <vinicius.gomes@intel.com>
      Link: https://lore.kernel.org/r/63b6d79b0e830ebb0283e020db4df3cdfdfb2b94.1608142843.git.dcaratti@redhat.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      44d4775c
    • Simon Horman's avatar
      nfp: move indirect block cleanup to flower app stop callback · 5b33afee
      Simon Horman authored
      The indirect block cleanup may cause control messages to be sent
      if offloaded flows are present. However, by the time the flower app
      cleanup callback is called txbufs are no longer available and attempts
      to send control messages result in a NULL-pointer dereference in
      nfp_ctrl_tx_one().
      
      This problem may be resolved by moving the indirect block cleanup
      to the stop callback, where txbufs are still available.
      
      As suggested by Jakub Kicinski and Louis Peens.
      
      Fixes: a1db2178 ("net: flow_offload: fix flow_indr_dev_unregister path")
      Signed-off-by: default avatarSimon Horman <simon.horman@netronome.com>
      Signed-off-by: default avatarLouis Peens <louis.peens@netronome.com>
      Link: https://lore.kernel.org/r/20201216145701.30005-1-simon.horman@netronome.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      5b33afee
    • Colin Ian King's avatar
      octeontx2-af: Fix undetected unmap PF error check · d8a4ea35
      Colin Ian King authored
      Currently the check for an unmap PF error is always going to be false
      because intr_val is a 32 bit int and is being bit-mask checked against
      1ULL << 32.  Fix this by making intr_val a u64 to match the type at it
      is copied from, namely npa_event_context->npa_af_rvu_ge.
      
      Addresses-Coverity: ("Operands don't affect result")
      Fixes: f1168d1e ("octeontx2-af: Add devlink health reporters for NPA")
      Signed-off-by: default avatarColin Ian King <colin.king@canonical.com>
      Acked-by: default avatarGeorge Cherian <george.cherian@marvell.com>
      Link: https://lore.kernel.org/r/20201216123604.15369-1-colin.king@canonical.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      d8a4ea35
    • Linus Torvalds's avatar
      Merge tag 'fsnotify_for_v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs · 14bd41e4
      Linus Torvalds authored
      Pull fsnotify updates from Jan Kara:
       "A few fsnotify fixes from Amir fixing fallout from big fsnotify
        overhaul a few months back and an improvement of defaults limiting
        maximum number of inotify watches from Waiman"
      
      * tag 'fsnotify_for_v5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs:
        fsnotify: fix events reported to watching parent and child
        inotify: convert to handle_inode_event() interface
        fsnotify: generalize handle_inode_event()
        inotify: Increase default inotify.max_user_watches limit to 1048576
      14bd41e4
    • Colin Ian King's avatar
    • Dan Carpenter's avatar
      qlcnic: Fix error code in probe · 0d528486
      Dan Carpenter authored
      Return -EINVAL if we can't find the correct device.  Currently it
      returns success.
      
      Fixes: 13159183 ("qlcnic: 83xx base driver")
      Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
      Link: https://lore.kernel.org/r/X9nHbMqEyI/xPfGd@mwandaSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      0d528486
    • Jakub Kicinski's avatar
      Merge branch 'mptcp-a-bunch-of-assorted-fixes' · 86eb09b6
      Jakub Kicinski authored
      Paolo Abeni says:
      
      ====================
      mptcp: a bunch of assorted fixes
      
      This series pulls a few fixes for the MPTCP datapath.
      Most issues addressed here has been recently introduced
      with the recent reworks, with the notable exception of
      the first patch, which addresses an issue present since
      the early days
      ====================
      
      Link: https://lore.kernel.org/r/cover.1608114076.git.pabeni@redhat.comSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      86eb09b6
    • Paolo Abeni's avatar
      mptcp: fix pending data accounting · 13e16037
      Paolo Abeni authored
      When sendmsg() needs to wait for memory, the pending data
      is not updated. That causes a drift in forward memory allocation,
      leading to stall and/or warnings at socket close time.
      
      This change addresses the above issue moving the pending data
      counter update inside the sendmsg() main loop.
      
      Fixes: 6e628cd3 ("mptcp: use mptcp release_cb for delayed tasks")
      Reviewed-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
      Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      13e16037
    • Paolo Abeni's avatar
      mptcp: push pending frames when subflow has free space · 219d0499
      Paolo Abeni authored
      When multiple subflows are active, we can receive a
      window update on subflow with no write space available.
      MPTCP will try to push frames on such subflow and will
      fail. Pending frames will be pushed only after receiving
      a window update on a subflow with some wspace available.
      
      Overall the above could lead to suboptimal aggregate
      bandwidth usage.
      
      Instead, we should try to push pending frames as soon as
      the subflow reaches both conditions mentioned above.
      
      We can finally enable self-tests with asymmetric links,
      as the above makes them finally pass.
      
      Fixes: 6f8a612a ("mptcp: keep track of advertised windows right edge")
      Reviewed-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
      Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      219d0499
    • Paolo Abeni's avatar
      mptcp: properly annotate nested lock · 3f8b2667
      Paolo Abeni authored
      MPTCP closes the subflows while holding the msk-level lock.
      While acquiring the subflow socket lock we need to use the
      correct nested annotation, or we can hit a lockdep splat
      at runtime.
      Reported-and-tested-by: default avatarGeliang Tang <geliangtang@gmail.com>
      Fixes: e16163b6 ("mptcp: refactor shutdown and close")
      Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
      Reviewed-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      3f8b2667
    • Paolo Abeni's avatar
      mptcp: fix security context on server socket · 0c148460
      Paolo Abeni authored
      Currently MPTCP is not propagating the security context
      from the ingress request socket to newly created msk
      at clone time.
      
      Address the issue invoking the missing security helper.
      
      Fixes: cf7da0d6 ("mptcp: Create SUBFLOW socket for incoming connections")
      Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
      Reviewed-by: default avatarMat Martineau <mathew.j.martineau@linux.intel.com>
      Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      0c148460
    • Parav Pandit's avatar
      net/mlx5: Fix compilation warning for 32-bit platform · 49e27134
      Parav Pandit authored
      MLX5_GENERAL_OBJECT_TYPES types bitfield is 64-bit field.
      
      Defining an enum for such bit fields on 32-bit platform results in below
      warning.
      
      ./include/vdso/bits.h:7:26: warning: left shift count >= width of type [-Wshift-count-overflow]
                               ^
      ./include/linux/mlx5/mlx5_ifc.h:10716:46: note: in expansion of macro ‘BIT’
       MLX5_HCA_CAP_GENERAL_OBJECT_TYPES_SAMPLER = BIT(0x20),
                                                   ^~~
      
      Use 32-bit friendly BIT_ULL macro.
      
      Fixes: 2a297089 ("net/mlx5: Add sample offload hardware bits and structures")
      Signed-off-by: default avatarParav Pandit <parav@nvidia.com>
      Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
      Signed-off-by: default avatarLeon Romanovsky <leonro@nvidia.com>
      Link: https://lore.kernel.org/r/20201213120641.216032-1-leon@kernel.orgSigned-off-by: default avatarJakub Kicinski <kuba@kernel.org>
      49e27134
    • Linus Torvalds's avatar
      drm/edid: fix objtool warning in drm_cvt_modes() · d652d5f1
      Linus Torvalds authored
      Commit 991fcb77 ("drm/edid: Fix uninitialized variable in
      drm_cvt_modes()") just replaced one warning with another.
      
      The original warning about a possibly uninitialized variable was due to
      the compiler not being smart enough to see that the case statement
      actually enumerated all possible cases.  And the initial fix was just to
      add a "default" case that had a single "unreachable()", just to tell the
      compiler that that situation cannot happen.
      
      However, that doesn't actually fix the fundamental reason for the
      problem: the compiler still doesn't see that the existing case
      statements enumerate all possibilities, so the compiler will still
      generate code to jump to that unreachable case statement.  It just won't
      complain about an uninitialized variable any more.
      
      So now the compiler generates code to our inline asm marker that we told
      it would not fall through, and end end result is basically random.  We
      have created a bridge to nowhere.
      
      And then, depending on the random details of just exactly what the
      compiler ends up doing, 'objtool' might end up complaining about the
      conditional branches (for conditions that cannot happen, and that thus
      will never be taken - but if the compiler was not smart enough to figure
      that out, we can't expect objtool to do so) going off in the weeds.
      
      So depending on how the compiler has laid out the result, you might see
      something like this:
      
          drivers/gpu/drm/drm_edid.o: warning: objtool: do_cvt_mode() falls through to next function drm_mode_detailed.isra.0()
      
      and now you have a truly inscrutable warning that makes no sense at all
      unless you start looking at whatever random code the compiler happened
      to generate for our bare "unreachable()" statement.
      
      IOW, don't use "unreachable()" unless you have an _active_ operation
      that generates code that actually makes it obvious that something is not
      reachable (ie an UD instruction or similar).
      
      Solve the "compiler isn't smart enough" problem by just marking one of
      the cases as "default", so that even when the compiler doesn't otherwise
      see that we've enumerated all cases, the compiler will feel happy and
      safe about there always being a valid case that initializes the 'width'
      variable.
      
      This also generates better code, since now the compiler doesn't generate
      comparisons for five different possibilities (the four real ones and the
      one that can't happen), but just for the three real ones and "the rest"
      (which is that last one).
      
      A smart enough compiler that sees that we cover all the cases won't care.
      
      Cc: Lyude Paul <lyude@redhat.com>
      Cc: Ilia Mirkin <imirkin@alum.mit.edu>
      Cc: Josh Poimboeuf <jpoimboe@redhat.com>
      Cc: Peter Zijlstra <peterz@infradead.org>
      Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
      d652d5f1
    • Steve French's avatar
      cifs: update internal module version number · afee4410
      Steve French authored
      To 2.30
      Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
      afee4410
    • Steve French's avatar
      cifs: Fix support for remount when not changing rsize/wsize · 2d060493
      Steve French authored
      When remounting with the new mount API, we need to set
      rsize and wsize to the previous values if they are not passed
      in on the remount. Otherwise they get set to zero which breaks
      xfstest 452 for example.
      Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
      Reviewed-by: default avatarRonnie Sahlberg <lsahlber@redhat.com>
      Reviewed-by: default avatarShyam Prasad N <sprasad@microsoft.com>
      2d060493
    • Michael Ellerman's avatar
      powerpc/32s: Fix cleanup_cpu_mmu_context() compile bug · c1bea0a8
      Michael Ellerman authored
      Currently pmac32_defconfig with SMP=y doesn't build:
      
        arch/powerpc/platforms/powermac/smp.c:
        error: implicit declaration of function 'cleanup_cpu_mmu_context'
      
      It would be nice for consistency if all platforms clear mm_cpumask and
      flush TLBs on unplug, but the TLB invalidation bug described in commit
      01b0f0ea ("powerpc/64s: Trim offlined CPUs from mm_cpumasks") only
      applies to 64s and for now we only have the TLB flush code for that
      platform.
      
      So just add an empty version for 32-bit Book3S.
      
      Fixes: 01b0f0ea ("powerpc/64s: Trim offlined CPUs from mm_cpumasks")
      Reported-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
      Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
      [mpe: Change log based on comments from Nick]
      Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
      c1bea0a8
    • Linus Torvalds's avatar
      Merge tag 'arm-soc-omap-genpd-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc · accefff5
      Linus Torvalds authored
      Pull ARM SoC OMAP GenPD updates from Arnd Bergmann:
       "These are additional updates for the power domain support on OMAP,
        moving to an implementation based on device tree information instead
        of SoC specific code. This is the latest step in the ongoing process
        for moving code out of arch/arm/mach-omap2.
      
        I kept this separate from the other driver changes since it touches
        code in multiple areas"
      
      * tag 'arm-soc-omap-genpd-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (51 commits)
        ARM: OMAP2+: Fix am4 only build after genpd changes
        ARM: dts: Configure power domain for omap5 dss
        ARM: dts: omap5: add remaining PRM instances
        soc: ti: omap-prm: omap5: add genpd support for remaining PRM instances
        ARM: OMAP2+: Drop legacy platform data for dra7 gpmc
        ARM: dts: Configure interconnect target module for dra7 iva
        ARM: dts: dra7: add remaining PRM instances
        soc: ti: omap-prm: dra7: add genpd support for remaining PRM instances
        clk: ti: dra7: Drop idlest polling from IVA clkctrl clocks
        ARM: OMAP2+: Drop legacy platform data for omap4 gpmc
        ARM: OMAP2+: Drop legacy platform data for omap4 iva
        ARM: dts: Configure power domain for omap4 dsp
        ARM: dts: Configure power domain for omap4 dss
        ARM: dts: omap4: add remaining PRM instances
        soc: ti: omap-prm: omap4: add genpd support for remaining PRM instances
        clk: ti: omap4: Drop idlest polling from IVA clkctrl clocks
        ARM: OMAP2+: Drop legacy remaining legacy platform data for am4
        ARM: dts: Use simple-pm-bus for genpd for am4 l3
        ARM: dts: Move am4 l3 noc to a separate node
        ARM: dts: Use simple-pm-bus for genpd for am4 l4_per
        ...
      accefff5
    • Linus Torvalds's avatar
      Merge tag 'arm-soc-drivers-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc · 48c1c40a
      Linus Torvalds authored
      Pull ARM SoC driver updates from Arnd Bergmann:
       "There are a couple of subsystems maintained by other people that merge
        their drivers through the SoC tree, those changes include:
      
         - The SCMI firmware framework gains support for sensor notifications
           and for controlling voltage domains.
      
         - A large update for the Tegra memory controller driver, integrating
           it better with the interconnect framework
      
         - The memory controller subsystem gains support for Mediatek MT8192
      
         - The reset controller framework gains support for sharing pulsed
           resets
      
        For Soc specific drivers in drivers/soc, the main changes are
      
         - The Allwinner/sunxi MBUS gets a rework for the way it handles
           dma_map_ops and offsets between physical and dma address spaces.
      
         - An errata fix plus some cleanups for Freescale Layerscape SoCs
      
         - A cleanup for renesas drivers regarding MMIO accesses.
      
         - New SoC specific drivers for Mediatek MT8192 and MT8183 power
           domains
      
         - New SoC specific drivers for Aspeed AST2600 LPC bus control and SoC
           identification.
      
         - Core Power Domain support for Qualcomm MSM8916, MSM8939, SDM660 and
           SDX55.
      
         - A rework of the TI AM33xx 'genpd' power domain support to use
           information from DT instead of platform data
      
         - Support for TI AM64x SoCs
      
         - Allow building some Amlogic drivers as modules instead of built-in
      
        Finally, there are numerous cleanups and smaller bug fixes for
        Mediatek, Tegra, Samsung, Qualcomm, TI OMAP, Amlogic, Rockchips,
        Renesas, and Xilinx SoCs"
      
      * tag 'arm-soc-drivers-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (222 commits)
        soc: mediatek: mmsys: Specify HAS_IOMEM dependency for MTK_MMSYS
        firmware: xilinx: Properly align function parameter
        firmware: xilinx: Add a blank line after function declaration
        firmware: xilinx: Remove additional newline
        firmware: xilinx: Fix kernel-doc warnings
        firmware: xlnx-zynqmp: fix compilation warning
        soc: xilinx: vcu: add missing register NUM_CORE
        soc: xilinx: vcu: use vcu-settings syscon registers
        dt-bindings: soc: xlnx: extract xlnx, vcu-settings to separate binding
        soc: xilinx: vcu: drop useless success message
        clk: samsung: mark PM functions as __maybe_unused
        soc: samsung: exynos-chipid: initialize later - with arch_initcall
        soc: samsung: exynos-chipid: order list of SoCs by name
        memory: jz4780_nemc: Fix potential NULL dereference in jz4780_nemc_probe()
        memory: ti-emif-sram: only build for ARMv7
        memory: tegra30: Support interconnect framework
        memory: tegra20: Support hardware versioning and clean up OPP table initialization
        dt-bindings: memory: tegra20-emc: Document opp-supported-hw property
        soc: rockchip: io-domain: Fix error return code in rockchip_iodomain_probe()
        reset-controller: ti: force the write operation when assert or deassert
        ...
      48c1c40a
    • Linus Torvalds's avatar
      Merge tag 'arm-soc-dt-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc · 9805529e
      Linus Torvalds authored
      Pull ARM device tree updates from Arnd Bergmann:
       "Across all platforms, there is a continued move towards DT schema for
        validating the dts files. As a result there are bug fixes for mistakes
        that are found using these schema, in addition to warnings from the
        dtc compiler.
      
        As usual, many changes are for adding support for additional on-chip
        and on-board components in the machines we already support.
      
        The newly supported SoCs for this release are:
      
         - MStar Infinity2M, a low-end IP camera chip based on a dual-core
           Cortex-A7, otherwise similar to the Infinity chip we already
           support. This is also known as the SigmaStar SSD202D, and we add
           support for the Honestar ssd201htv2 development kit.
      
         - Nuvoton NPCM730, a Cortex-A9 based Baseboard Management Controller
           (BMC), in the same family as the NPCM750. This gets used in the
           Ampere Altra based "Fii Kudo" server and the Quanta GSJ, both of
           which are added as well.
      
         - Broadcom BCM4908, a 64-bit home router chip based on Broadcom's own
           Brahma-B53 CPU. Support is also added for the Asus ROG Rapture
           GT-AC5300 high-end WiFi router based on this chip.
      
         - Mediatek MT8192 is a new SoC based on eight Cortex-A76/A55 cores,
           meant for faster Chromebooks and tablets. It gets added along with
           its reference design.
      
         - Mediatek MT6779 (Helio P90) is a high-end phone chip from last
           year's generation, also added along with its reference board. This
           one is still based on Cortex-A75/A55.
      
         - Mediatek MT8167 is a version of the already supported MT8516 chip,
           both based on Cortex-A35. It gets added along with the "Pumpkin"
           single board computer, but is likely to also make its way into
           low-end tablets in the future.
      
        For the already supported chips, there are a number of new boards.
        Interestingly there are more 32-bit machines added this time than
        64-bit. Here is a brief list of the new boards:
      
         - Three new Mikrotik router variants based on Marvell Prestera
           98DX3236, a close relative of the more common Armada XP
      
         - A reference board for the Marvell Armada 382
      
         - Three new servers using ASpeed baseboard management controllers,
           the actual machines being from Bytedance, Facebook and IBM, and one
           machine using the Nuvoton NPCM750 BMC.
      
         - The Galaxy Note 10.1 (P4) tablet, using an Exynos 4412.
      
         - The usual set of 32-bit i.MX industrial/embedded hardware:
             * Protonic WD3 (tractor e-cockpit)
             * Kamstrup OMNIA Flex Concentrator (smart grid platform)
             * Van der Laan LANMCU (food storage)
             * Altesco I6P (vehicle inspection stations)
             * PHYTEC phyBOARD-Segin/phyCORE-i.MX6UL baseboard
      
         - DH electronics STM32MP157C DHCOM, a PicoITX carrier board for the
           aleady supported DHCOM module
      
         - Three new Allwinner SoC based single-board computers:
             * NanoPi R1 (H3 based)
             * FriendlyArm ZeroPi (H3 based)
             * Elimo Initium SBC (S3 based)
      
         - Ouya Game Console based on Nvidia Tegra 3
      
         - Version 5 of the already supported Zynq Z-Turn MYIR Board
      
         - LX2162AQDS, a reference platform for NXP Layerscape LX2162A, which
           is a repackaged 16-core LX2160A
      
         - A series of Kontron i.MX8M Mini baseboard/SoM versions
      
         - Espressobin Ultra, a new variant of the popular Armada 3700 based
           board,
      
         - IEI Puzzle-M801, a rackmount network appliance based on Marvell
           Armada 8040
      
         - Microsoft Lumia 950 XL, a phone
      
         - HDK855 and HDK865 Hardware development kits for Qualcomm sm8250 and
           sm8150, respectively
      
         - Three new board variants of the "Trogdor" Chromebook (sc7180)
      
         - New board variants of the Renesas based "Kingfisher" and "HiHope"
           reference boards
      
         - Kobol Helios64, an open source NAS appliance based on Rockchips
           RK3399
      
         - Engicam PX30.Core, a SoM based on Rockchip PX30, along with a few
           carrier boards"
      
      * tag 'arm-soc-dt-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (679 commits)
        arm64: dts: sparx5: Add SGPIO devices
        arm64: dts: sparx5: Add reset support
        dt-bindings: gpio: Add a binding header for the MSC313 GPIO driver
        ARM: mstar: SMP support
        ARM: mstar: Wire up smpctrl for SSD201/SSD202D
        ARM: mstar: Add smp ctrl registers to infinity2m dtsi
        ARM: mstar: Add dts for Honestar ssd201htv2
        ARM: mstar: Add chip level dtsi for SSD202D
        ARM: mstar: Add common dtsi for SSD201/SSD202D
        ARM: mstar: Add infinity2m support
        dt-bindings: mstar: Add Honestar SSD201_HT_V2 to mstar boards
        dt-bindings: vendor-prefixes: Add honestar vendor prefix
        dt-bindings: mstar: Add binding details for mstar,smpctrl
        ARM: mstar: Fill in GPIO controller properties for infinity
        ARM: mstar: Add gpio controller to MStar base dtsi
        ARM: zynq: Fix incorrect reference to XM013 instead of XM011
        ARM: zynq: Convert at25 binding to new description on zc770-xm013
        ARM: zynq: Fix OCM mapping to be aligned with binding on zc702
        ARM: zynq: Fix leds subnode name for zc702/zybo-z7
        ARM: zynq: Rename bus to be align with simple-bus yaml
        ...
      9805529e
    • Linus Torvalds's avatar
      Merge tag 'arm-soc-defconfig-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc · b0a6cd29
      Linus Torvalds authored
      Pull ARM SoC defconfig updates from Arnd Bergmann:
       "These are the usual defconfig updates, adding support for additional
        modules and updating some files according to changes in Kconfig.
      
        I also include the removal of CONFIG_BACKLIGHT_GENERIC across multiple
        architectures, after the driver was removed"
      
      * tag 'arm-soc-defconfig-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (41 commits)
        powerpc/configs: drop unused BACKLIGHT_GENERIC option
        parisc: configs: drop unused BACKLIGHT_GENERIC option
        arm64: defconfig: drop unused BACKLIGHT_GENERIC option
        ARM: configs: drop unused BACKLIGHT_GENERIC option
        arm64: defconfig: Enable more Librem 5 hardware
        arm64: defconfig: Enable RTC_DRV_HYM8563
        arm64: defconfig: Enable USB_SERIAL_CP210X
        arm64: defconfig: Enable PHY_ROCKCHIP_INNO_DSIDPHY
        arm64: defconfig: Enable ROCKCHIP_LVDS
        arm64: defconfig: Enable ARM SCMI protocol and drivers
        ARM: multi_v7_defconfig: Enable ARM SCMI protocol and drivers
        ARM: multi_v7_defconfig: enable STM32 dfsdm audio support
        ARM: multi_v7_defconfig: enable STM32 spdifrx support
        ARM: multi_v7_defconfig: enable STUSB160X Type-C port controller support
        ARM: multi_v7_defconfig: add STM32 crypto support
        ARM: multi_v7_defconfig: enable counter subsystem and stm32 counter drivers
        ARM: multi_v7_defconfig: make Samsung Exynos EHCI driver a module
        arm64: defconfig: Enable Qualcomm PON driver
        ARM: omap2plus_defconfig: Enable TI eQEP counter driver
        ARM: multi_v7_defconfig: ti: Enable networking options for nfs boot
        ...
      b0a6cd29
    • Linus Torvalds's avatar
      Merge tag 'arm-soc-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc · b06db0b3
      Linus Torvalds authored
      Pull ARM SoC updates from Arnd Bergmann:
       "These are updates for SoC specific code, mostly in the 32-bit
        architecture:
      
         - A rework for handling MMIO accesses in Renesas SoCs in a more
           portable way
      
         - Updates to SoC version detection in NXP i.MX SoCs.
      
         - Smaller bug fixes for OMAP, Samsung, Marvell, Amlogic"
      
      * tag 'arm-soc-5.11' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc: (24 commits)
        arm64: Kconfig: meson: drop pinctrl
        ARM: mxs: Add serial number support for i.MX23, i.MX28 SoCs
        MAINTAINERS: switch mvebu tree to kernel.org
        MAINTAINERS: Add an entry for MikroTik CRS3xx 98DX3236 boards
        ARM: shmobile: Stop using __raw_*() I/O accessors
        ARM: shmobile: sh73a0: Remove obsolete static mapping
        ARM: shmobile: sh73a0: Use ioremap() to map SMP registers
        ARM: shmobile: sh73a0: Use ioremap() to map L2C registers
        ARM: shmobile: r8a7779: Remove obsolete static mappings
        ARM: shmobile: r8a7779: Use ioremap() to map SMP registers
        ARM: shmobile: r8a7779: Use ioremap() to map INTC2 registers
        ARM: shmobile: r8a7778: Introduce HPBREG_BASE
        ARM: OMAP1: clock: Use IS_ERR_OR_NULL() to clean code
        ARM: OMAP2+: Remove redundant null check before clk_prepare_enable/clk_disable_unprepare
        ARM: OMAP2+: Remove redundant assignment to variable ret
        ARM: OMAP2+: Fix kfree NULL pointer in omap2xxx_clkt_vps_init
        ARM: OMAP2+: Fix memleak in omap2xxx_clkt_vps_init
        ARM: exynos: extend cpuidle support to P4 Note boards
        ARM: imx: mach-imx6q: correctly identify i.MX6QP SoCs
        ARM: imx: imx7ulp: Add a comment explaining the B2 silicon version
        ...
      b06db0b3