1. 14 3月, 2021 6 次提交
    • L
      Merge tag 'char-misc-5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc · 88fe4924
      Linus Torvalds 提交于
      Pull char/misc driver fixes from Greg KH:
       "Here are some small misc/char driver fixes to resolve some reported
        problems:
      
         - habanalabs driver fixes
      
         - Acrn build fixes (reported many times)
      
         - pvpanic module table export fix
      
        All of these have been in linux-next for a while with no reported
        issues"
      
      * tag 'char-misc-5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc:
        misc/pvpanic: Export module FDT device table
        misc: fastrpc: restrict user apps from sending kernel RPC messages
        virt: acrn: Correct type casting of argument of copy_from_user()
        virt: acrn: Use EPOLLIN instead of POLLIN
        virt: acrn: Use vfs_poll() instead of f_op->poll()
        virt: acrn: Make remove_cpu sysfs invisible with !CONFIG_HOTPLUG_CPU
        cpu/hotplug: Fix build error of using {add,remove}_cpu() with !CONFIG_SMP
        habanalabs: fix debugfs address translation
        habanalabs: Disable file operations after device is removed
        habanalabs: Call put_pid() when releasing control device
        drivers: habanalabs: remove unused dentry pointer for debugfs files
        habanalabs: mark hl_eq_inc_ptr() as static
      88fe4924
    • L
      Merge tag 'staging-5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging · be61af33
      Linus Torvalds 提交于
      Pull staging driver fixes from Greg KH:
       "Here are some small staging driver fixes for reported problems. They
        include:
      
         - wfx header file cleanup patch reverted as it could cause problems
      
         - comedi driver endian fixes
      
         - buffer overflow problems for staging wifi drivers
      
         - build dependency issue for rtl8192e driver
      
        All have been in linux-next for a while with no reported problems"
      
      * tag 'staging-5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (23 commits)
        Revert "staging: wfx: remove unused included header files"
        staging: rtl8188eu: prevent ->ssid overflow in rtw_wx_set_scan()
        staging: rtl8188eu: fix potential memory corruption in rtw_check_beacon_data()
        staging: rtl8192u: fix ->ssid overflow in r8192_wx_set_scan()
        staging: comedi: pcl726: Use 16-bit 0 for interrupt data
        staging: comedi: ni_65xx: Use 16-bit 0 for interrupt data
        staging: comedi: ni_6527: Use 16-bit 0 for interrupt data
        staging: comedi: comedi_parport: Use 16-bit 0 for interrupt data
        staging: comedi: amplc_pc236_common: Use 16-bit 0 for interrupt data
        staging: comedi: pcl818: Fix endian problem for AI command data
        staging: comedi: pcl711: Fix endian problem for AI command data
        staging: comedi: me4000: Fix endian problem for AI command data
        staging: comedi: dmm32at: Fix endian problem for AI command data
        staging: comedi: das800: Fix endian problem for AI command data
        staging: comedi: das6402: Fix endian problem for AI command data
        staging: comedi: adv_pci1710: Fix endian problem for AI command data
        staging: comedi: addi_apci_1500: Fix endian problem for command sample
        staging: comedi: addi_apci_1032: Fix endian problem for COS sample
        staging: ks7010: prevent buffer overflow in ks_wlan_set_scan()
        staging: rtl8712: Fix possible buffer overflow in r8712_sitesurvey_cmd
        ...
      be61af33
    • L
      Merge tag 'tty-5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty · cc14086f
      Linus Torvalds 提交于
      Pull tty/serial fixes from Greg KH:
       "Here are some small tty and serial driver fixes to resolve some
        reported problems:
      
         - led tty trigger fixes based on review and were acked by the led
           maintainer
      
         - revert a max310x serial driver patch as it was causing problems
      
         - revert a pty change as it was also causing problems
      
        All of these have been in linux-next for a while with no reported
        problems"
      
      * tag 'tty-5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
        Revert "drivers:tty:pty: Fix a race causing data loss on close"
        Revert "serial: max310x: rework RX interrupt handling"
        leds: trigger/tty: Use led_set_brightness_sync() from workqueue
        leds: trigger: Fix error path to not unlock the unlocked mutex
      cc14086f
    • L
      Merge tag 'usb-5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb · 5c7bdbf8
      Linus Torvalds 提交于
      Pull USB fixes from Greg KH:
       "Here are a small number of USB fixes for 5.12-rc3 to resolve a bunch
        of reported issues:
      
         - usbip fixups for issues found by syzbot
      
         - xhci driver fixes and quirk additions
      
         - gadget driver fixes
      
         - dwc3 QCOM driver fix
      
         - usb-serial new ids and fixes
      
         - usblp fix for a long-time issue
      
         - cdc-acm quirk addition
      
         - other tiny fixes for reported problems
      
        All of these have been in linux-next for a while with no reported
        issues"
      
      * tag 'usb-5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (25 commits)
        xhci: Fix repeated xhci wake after suspend due to uncleared internal wake state
        usb: xhci: Fix ASMedia ASM1042A and ASM3242 DMA addressing
        xhci: Improve detection of device initiated wake signal.
        usb: xhci: do not perform Soft Retry for some xHCI hosts
        usbip: fix vudc usbip_sockfd_store races leading to gpf
        usbip: fix vhci_hcd attach_store() races leading to gpf
        usbip: fix stub_dev usbip_sockfd_store() races leading to gpf
        usbip: fix vudc to check for stream socket
        usbip: fix vhci_hcd to check for stream socket
        usbip: fix stub_dev to check for stream socket
        usb: dwc3: qcom: Add missing DWC3 OF node refcount decrement
        USB: usblp: fix a hang in poll() if disconnected
        USB: gadget: udc: s3c2410_udc: fix return value check in s3c2410_udc_probe()
        usb: renesas_usbhs: Clear PIPECFG for re-enabling pipe with other EPNUM
        usb: dwc3: qcom: Honor wakeup enabled/disabled state
        usb: gadget: f_uac1: stop playback on function disable
        usb: gadget: f_uac2: always increase endpoint max_packet_size by one audio slot
        USB: gadget: u_ether: Fix a configfs return code
        usb: dwc3: qcom: add ACPI device id for sc8180x
        Goodix Fingerprint device is not a modem
        ...
      5c7bdbf8
    • L
      Merge tag 'erofs-for-5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs · 42062343
      Linus Torvalds 提交于
      Pull erofs fix from Gao Xiang:
       "Fix an urgent regression introduced by commit baa2c7c9 ("block:
        set .bi_max_vecs as actual allocated vector number"), which could
        cause unexpected hung since linux 5.12-rc1.
      
        Resolve it by avoiding using bio->bi_max_vecs completely"
      
      * tag 'erofs-for-5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs:
        erofs: fix bio->bi_max_vecs behavior change
      42062343
    • L
      Merge tag 'kbuild-fixes-v5.12-2' of... · e83bad7f
      Linus Torvalds 提交于
      Merge tag 'kbuild-fixes-v5.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild
      
      Pull Kbuild fixes from Masahiro Yamada:
      
       - avoid 'make image_name' invoking syncconfig
      
       - fix a couple of bugs in scripts/dummy-tools
      
       - fix LLD_VENDOR and locale issues in scripts/ld-version.sh
      
       - rebuild GCC plugins when the compiler is upgraded
      
       - allow LTO to be enabled with KASAN_HW_TAGS
      
       - allow LTO to be enabled without LLVM=1
      
      * tag 'kbuild-fixes-v5.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
        kbuild: fix ld-version.sh to not be affected by locale
        kbuild: remove meaningless parameter to $(call if_changed_rule,dtc)
        kbuild: remove LLVM=1 test from HAS_LTO_CLANG
        kbuild: remove unneeded -O option to dtc
        kbuild: dummy-tools: adjust to scripts/cc-version.sh
        kbuild: Allow LTO to be selected with KASAN_HW_TAGS
        kbuild: dummy-tools: support MPROFILE_KERNEL checks for ppc
        kbuild: rebuild GCC plugins when the compiler is upgraded
        kbuild: Fix ld-version.sh script if LLD was built with LLD_VENDOR
        kbuild: dummy-tools: fix inverted tests for gcc
        kbuild: add image_name to no-sync-config-targets
      e83bad7f
  2. 13 3月, 2021 22 次提交
    • M
      kbuild: fix ld-version.sh to not be affected by locale · bcbcf50f
      Masahiro Yamada 提交于
      ld-version.sh checks the output from $(LD) --version, but it has a
      problem on some locales.
      
      For example, in Italian:
      
        $ LC_MESSAGES=it_IT.UTF-8 ld --version | head -n 1
        ld di GNU (GNU Binutils for Debian) 2.35.2
      
      This makes ld-version.sh fail because it expects "GNU ld" for the
      BFD linker case.
      
      Add LC_ALL=C to override the user's locale.
      
      BTW, setting LC_MESSAGES=C (or LANG=C) is not enough because it is
      ineffective if LC_ALL is set on the user's environment.
      
      Link: https://bugzilla.kernel.org/show_bug.cgi?id=212105
      Reported-by: Marco Scardovi
      Reported-by: NAndy Shevchenko <andriy.shevchenko@linux.intel.com>
      Signed-off-by: NMasahiro Yamada <masahiroy@kernel.org>
      Recensito-da: Nick Desaulniers <ndesaulniers@google.com>
      Reviewed-by: NNathan Chancellor <nathan@kernel.org>
      bcbcf50f
    • L
      Merge tag 'nfs-for-5.12-2' of git://git.linux-nfs.org/projects/anna/linux-nfs · f296bfd5
      Linus Torvalds 提交于
      Pull NFS client bugfixes from Anna Schumaker:
       "These are mostly fixes for issues discovered at the recent NFS
        bakeathon:
      
         - Fix PNFS_FLEXFILE_LAYOUT kconfig so it is possible to build
           into the kernel
      
         - Correct size calculationn for create reply length
      
         - Set memalloc_nofs_save() for sync tasks to prevent deadlocks
      
         - Don't revalidate directory permissions on lookup failure
      
         - Don't clear inode cache when lookup fails
      
         - Change functions to use nfs_set_cache_invalid() for proper
           delegation handling
      
         - Fix return value of _nfs4_get_security_label()
      
         - Return an error when attempting to remove system.nfs4_acl"
      
      * tag 'nfs-for-5.12-2' of git://git.linux-nfs.org/projects/anna/linux-nfs:
        nfs: we don't support removing system.nfs4_acl
        NFSv4.2: fix return value of _nfs4_get_security_label()
        NFS: Fix open coded versions of nfs_set_cache_invalid() in NFSv4
        NFS: Fix open coded versions of nfs_set_cache_invalid()
        NFS: Clean up function nfs_mark_dir_for_revalidate()
        NFS: Don't gratuitously clear the inode cache when lookup failed
        NFS: Don't revalidate the directory permissions on a lookup failure
        SUNRPC: Set memalloc_nofs_save() for sync tasks
        NFS: Correct size calculation for create reply length
        nfs: fix PNFS_FLEXFILE_LAYOUT Kconfig default
      f296bfd5
    • L
      Merge branch 'for-v5.12-rc3' of... · b6b8aa27
      Linus Torvalds 提交于
      Merge branch 'for-v5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
      
      Pull userns fix from Eric Biederman:
       "Removing the ambiguity broke userspace so this reverts the change"
      
      * 'for-v5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
        Revert 95ebabde ("capabilities: Don't allow writing ambiguous v3 file capabilities")
      b6b8aa27
    • L
      Merge tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi · 9afc1163
      Linus Torvalds 提交于
      Pull SCSI fixes from James Bottomley:
       "Ten updates: one non code maintainer update for vmw_pvscsi, five code
        updates for ibmvfc and four for UFS.
      
        All are either trivial patches or bug fixes"
      
      * tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
        scsi: vmw_pvscsi: MAINTAINERS: Update maintainer
        scsi: ufs: Convert sysfs sprintf/snprintf family to sysfs_emit
        scsi: ufs: Remove redundant checks of !hba in suspend/resume callbacks
        scsi: ufs: ufs-qcom: Disable interrupt in reset path
        scsi: ufs: Minor adjustments to error handling
        scsi: ibmvfc: Reinitialize sub-CRQs and perform channel enquiry after LPM
        scsi: ibmvfc: Store return code of H_FREE_SUB_CRQ during cleanup
        scsi: ibmvfc: Treat H_CLOSED as success during sub-CRQ registration
        scsi: ibmvfc: Fix invalid sub-CRQ handles after hard reset
        scsi: ibmvfc: Simplify handling of sub-CRQ initialization
      9afc1163
    • E
      Revert 95ebabde ("capabilities: Don't allow writing ambiguous v3 file capabilities") · 3b0c2d3e
      Eric W. Biederman 提交于
      It turns out that there are in fact userspace implementations that
      care and this recent change caused a regression.
      
      https://github.com/containers/buildah/issues/3071
      
      As the motivation for the original change was future development,
      and the impact is existing real world code just revert this change
      and allow the ambiguity in v3 file caps.
      
      Cc: stable@vger.kernel.org
      Fixes: 95ebabde ("capabilities: Don't allow writing ambiguous v3 file capabilities")
      Signed-off-by: NEric W. Biederman <ebiederm@xmission.com>
      3b0c2d3e
    • L
      Merge tag 'block-5.12-2021-03-12-v2' of git://git.kernel.dk/linux-block · ce307084
      Linus Torvalds 提交于
      Pull block fixes from Jens Axboe:
       "Mostly just random fixes all over the map.
      
        The only odd-one-out change is finally getting the rename of
        BIO_MAX_PAGES to BIO_MAX_VECS done. This should've been done with the
        multipage bvec change, but it's been left.
      
        Do it now to avoid hassles around changes piling up for the next merge
        window.
      
        Summary:
      
         - NVMe pull request:
            - one more quirk (Dmitry Monakhov)
            - fix max_zone_append_sectors initialization (Chaitanya Kulkarni)
            - nvme-fc reset/create race fix (James Smart)
            - fix status code on aborts/resets (Hannes Reinecke)
            - fix the CSS check for ZNS namespaces (Chaitanya Kulkarni)
            - fix a use after free in a debug printk in nvme-rdma (Lv Yunlong)
      
         - Follow-up NVMe error fix for NULL 'id' (Christoph)
      
         - Fixup for the bd_size_lock being IRQ safe, now that the offending
           driver has been dropped (Damien).
      
         - rsxx probe failure error return (Jia-Ju)
      
         - umem probe failure error return (Wei)
      
         - s390/dasd unbind fixes (Stefan)
      
         - blk-cgroup stats summing fix (Xunlei)
      
         - zone reset handling fix (Damien)
      
         - Rename BIO_MAX_PAGES to BIO_MAX_VECS (Christoph)
      
         - Suppress uevent trigger for hidden devices (Daniel)
      
         - Fix handling of discard on busy device (Jan)
      
         - Fix stale cache issue with zone reset (Shin'ichiro)"
      
      * tag 'block-5.12-2021-03-12-v2' of git://git.kernel.dk/linux-block:
        nvme: fix the nsid value to print in nvme_validate_or_alloc_ns
        block: Discard page cache of zone reset target range
        block: Suppress uevent for hidden device when removed
        block: rename BIO_MAX_PAGES to BIO_MAX_VECS
        nvme-pci: add the DISABLE_WRITE_ZEROES quirk for a Samsung PM1725a
        nvme-rdma: Fix a use after free in nvmet_rdma_write_data_done
        nvme-core: check ctrl css before setting up zns
        nvme-fc: fix racing controller reset and create association
        nvme-fc: return NVME_SC_HOST_ABORTED_CMD when a command has been aborted
        nvme-fc: set NVME_REQ_CANCELLED in nvme_fc_terminate_exchange()
        nvme: add NVME_REQ_CANCELLED flag in nvme_cancel_request()
        nvme: simplify error logic in nvme_validate_ns()
        nvme: set max_zone_append_sectors nvme_revalidate_zones
        block: rsxx: fix error return code of rsxx_pci_probe()
        block: Fix REQ_OP_ZONE_RESET_ALL handling
        umem: fix error return code in mm_pci_probe()
        blk-cgroup: Fix the recursive blkg rwstat
        s390/dasd: fix hanging IO request during DASD driver unbind
        s390/dasd: fix hanging DASD driver unbind
        block: Try to handle busy underlying device on discard
      ce307084
    • L
      Merge tag 'io_uring-5.12-2021-03-12' of git://git.kernel.dk/linux-block · 9278be92
      Linus Torvalds 提交于
      Pull io_uring fixes from Jens Axboe:
       "Not quite as small this week as I had hoped, but at least this should
        be the end of it. All the little known issues have been ironed out -
        most of it little stuff, but cancelations being the bigger part. Only
        minor tweaks and/or regular fixes expected beyond this point.
      
         - Fix the creds tracking for async (io-wq and SQPOLL)
      
         - Various SQPOLL fixes related to parking, sharing, forking, IOPOLL,
           completions, and life times. Much simpler now.
      
         - Make IO threads unfreezable by default, on account of a bug report
           that had them spinning on resume. Honestly not quite sure why
           thawing leaves us with a perpetual signal pending (causing the
           spin), but for now make them unfreezable like there were in 5.11
           and prior.
      
         - Move personality_idr to xarray, solving a use-after-free related to
           removing an entry from the iterator callback. Buffer idr needs the
           same treatment.
      
         - Re-org around and task vs context tracking, enabling the fixing of
           cancelations, and then cancelation fixes on top.
      
         - Various little bits of cleanups and hardening, and removal of now
           dead parts"
      
      * tag 'io_uring-5.12-2021-03-12' of git://git.kernel.dk/linux-block: (34 commits)
        io_uring: fix OP_ASYNC_CANCEL across tasks
        io_uring: cancel sqpoll via task_work
        io_uring: prevent racy sqd->thread checks
        io_uring: remove useless ->startup completion
        io_uring: cancel deferred requests in try_cancel
        io_uring: perform IOPOLL reaping if canceler is thread itself
        io_uring: force creation of separate context for ATTACH_WQ and non-threads
        io_uring: remove indirect ctx into sqo injection
        io_uring: fix invalid ctx->sq_thread_idle
        kernel: make IO threads unfreezable by default
        io_uring: always wait for sqd exited when stopping SQPOLL thread
        io_uring: remove unneeded variable 'ret'
        io_uring: move all io_kiocb init early in io_init_req()
        io-wq: fix ref leak for req in case of exit cancelations
        io_uring: fix complete_post races for linked req
        io_uring: add io_disarm_next() helper
        io_uring: fix io_sq_offload_create error handling
        io-wq: remove unused 'user' member of io_wq
        io_uring: Convert personality_idr to XArray
        io_uring: clean R_DISABLED startup mess
        ...
      9278be92
    • L
      Merge tag 'devprop-5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 26141008
      Linus Torvalds 提交于
      Pull device properties framework fixes from Rafael Wysocki:
       "Prevent software nodes from being registered before their parents and
        fix a recent mistake causing already registered software nodes to be
        registered again in some cases (Heikki Krogerus)"
      
      * tag 'devprop-5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        software node: Fix device_add_software_node()
        software node: Fix node registration
      26141008
    • L
      Merge tag 'pm-5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm · 3077f027
      Linus Torvalds 提交于
      Pull power management fixes from Rafael Wysocki:
       "These fix an operating performance point (OPP) reference counting
        issue and three issues in ARM cpufreq drivers.
      
        Specifics:
      
         - Add a flag to mark OPPs that are not referenced by he OPP core any
           more to prevent OPPs from being freed prematurely by mistake (Beata
           Michalska).
      
         - Add ARM Vexpress platforms to the cpufreq-dt-platdev blacklist
           since the actual scaling of them is handled elsewhere (Sudeep
           Holla).
      
         - Fix a function return value check and a possible use-after-free in
           the qcom-hw cpufreq driver (Shawn Guo, Wei Yongjun)"
      
      * tag 'pm-5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
        opp: Don't drop extra references to OPPs accidentally
        cpufreq: blacklist Arm Vexpress platforms in cpufreq-dt-platdev
        cpufreq: qcom-hw: Fix return value check in qcom_cpufreq_hw_cpu_init()
        cpufreq: qcom-hw: fix dereferencing freed memory 'data'
      3077f027
    • C
      nvme: fix the nsid value to print in nvme_validate_or_alloc_ns · f4f9fc29
      Christoph Hellwig 提交于
      ns can be NULL at this point, and my move of the check from
      the original patch by Chaitanya broke this.
      
      Fixes: 0ec84df4 ("nvme-core: check ctrl css before setting up zns")
      Signed-off-by: NChristoph Hellwig <hch@lst.de>
      Signed-off-by: NJens Axboe <axboe@kernel.dk>
      f4f9fc29
    • L
      Merge tag 'sound-5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound · 34417833
      Linus Torvalds 提交于
      Pull sound fixes from Takashi Iwai:
       "No surprise here, only a collection of device-specific fixes for
        USB-audio and HD-audio at this time"
      
      * tag 'sound-5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
        ALSA: hda/hdmi: Cancel pending works before suspend
        ALSA: hda: Avoid spurious unsol event handling during S3/S4
        ALSA: hda: Flush pending unsolicited events before suspend
        ALSA: usb-audio: fix use after free in usb_audio_disconnect
        ALSA: usb-audio: fix NULL ptr dereference in usb_audio_probe
        ALSA: hda/ca0132: Add Sound BlasterX AE-5 Plus support
        ALSA: hda: Drop the BATCH workaround for AMD controllers
        ALSA: hda/conexant: Add quirk for mute LED control on HP ZBook G5
        ALSA: usb-audio: Apply the control quirk to Plantronics headsets
        ALSA: usb-audio: Fix "cannot get freq eq" errors on Dell AE515 sound bar
        ALSA: hda: ignore invalid NHLT table
        ALSA: usb-audio: Disable USB autosuspend properly in setup_disable_autosuspend()
        ALSA: usb: Add Plantronics C320-M USB ctrl msg delay quirk
      34417833
    • L
      Merge tag 'mmc-v5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc · 568099a7
      Linus Torvalds 提交于
      Pull MMC fixes from Ulf Hansson:
       "MMC core:
      
         - Fix partition switch time for eMMC
      
        MMC host:
      
         - mmci: Enforce R1B response to fix busy detection for
           the stm32 variants
      
         - cqhci: Fix crash when removing mmc module/card"
      
      * tag 'mmc-v5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc:
        mmc: cqhci: Fix random crash when remove mmc module/card
        mmc: core: Fix partition switch time for eMMC
        mmc: mmci: Add MMC_CAP_NEED_RSP_BUSY for the stm32 variants
      568099a7
    • L
      Merge tag 'regulator-fix-v5.12-rc2' of... · 270c0551
      Linus Torvalds 提交于
      Merge tag 'regulator-fix-v5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
      
      Pull regulator fixes from Mark Brown:
       "A small collection fo driver specific fixes that have arrived since
        the merge window"
      
      * tag 'regulator-fix-v5.12-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
        regulator: mt6315: Fix off-by-one for .n_voltages
        regulator: rt4831: Fix return value check in rt4831_regulator_probe()
        regulator: pca9450: Clear PRESET_EN bit to fix BUCK1/2/3 voltage setting
        regulator: qcom-rpmh: Use correct buck for S1C regulator
        regulator: qcom-rpmh: Correct the pmic5_hfsmps515 buck
        regulator: pca9450: Fix return value when failing to get sd-vsel GPIO
        regulator: mt6315: Return REGULATOR_MODE_INVALID for invalid mode
      270c0551
    • L
      Merge tag 'configfs-for-5.12' of git://git.infradead.org/users/hch/configfs · 8d9d53de
      Linus Torvalds 提交于
      Pull configfs fix from Christoph Hellwig:
      
       - fix a use-after-free in __configfs_open_file (Daiyue Zhang)
      
      * tag 'configfs-for-5.12' of git://git.infradead.org/users/hch/configfs:
        configfs: fix a use-after-free in __configfs_open_file
      8d9d53de
    • L
      Merge tag 'gfs2-v5.12-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2 · b77b5fdd
      Linus Torvalds 提交于
      Pull gfs2 fixes from Andreas Gruenbacher:
       "Various gfs2 fixes"
      
      * tag 'gfs2-v5.12-rc2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2:
        gfs2: bypass log flush if the journal is not live
        gfs2: bypass signal_our_withdraw if no journal
        gfs2: fix use-after-free in trans_drain
        gfs2: make function gfs2_make_fs_ro() to void type
      b77b5fdd
    • L
      Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux · 17f8fc19
      Linus Torvalds 提交于
      Pull arm64 fixes from Will Deacon:
       "We've got a smattering of changes all over the place which we've
        acrued since -rc1. To my knowledge, there aren't any pending issues at
        the moment, but there's still plenty of time for something else to
        crop up...
      
        Summary:
      
         - Fix booting a 52-bit-VA-aware kernel on Qualcomm Amberwing
      
         - Fix pfn_valid() not to reject all ZONE_DEVICE memory
      
         - Fix memory tagging setup for hotplugged memory regions
      
         - Fix KASAN tagging in page_alloc() when DEBUG_VIRTUAL is enabled
      
         - Fix accidental truncation of CPU PMU event counters
      
         - Fix error code initialisation when failing probe of DMC620 PMU
      
         - Fix return value initialisation for sve-ptrace selftest
      
         - Drop broken support for CMDLINE_EXTEND"
      
      * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
        perf/arm_dmc620_pmu: Fix error return code in dmc620_pmu_device_probe()
        arm64: mm: remove unused __cpu_uses_extended_idmap[_level()]
        arm64: mm: use a 48-bit ID map when possible on 52-bit VA builds
        arm64: perf: Fix 64-bit event counter read truncation
        arm64/mm: Fix __enable_mmu() for new TGRAN range values
        kselftest: arm64: Fix exit code of sve-ptrace
        arm64: mte: Map hotplugged memory as Normal Tagged
        arm64: kasan: fix page_alloc tagging with DEBUG_VIRTUAL
        arm64/mm: Reorganize pfn_valid()
        arm64/mm: Fix pfn_valid() for ZONE_DEVICE based memory
        arm64/mm: Drop THP conditionality from FORCE_MAX_ZONEORDER
        arm64/mm: Drop redundant ARCH_WANT_HUGE_PMD_SHARE
        arm64: Drop support for CMDLINE_EXTEND
        arm64: cpufeatures: Fix handling of CONFIG_CMDLINE for idreg overrides
      17f8fc19
    • L
      Merge tag 'for-linus-5.12b-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip · 6bf8819f
      Linus Torvalds 提交于
      Pull xen fixes from Juergen Gross:
       "Two fix series and a single cleanup:
      
         - a small cleanup patch to remove unneeded symbol exports
      
         - a series to cleanup Xen grant handling (avoiding allocations in
           some cases, and using common defines for "invalid" values)
      
         - a series to address a race issue in Xen event channel handling"
      
      * tag 'for-linus-5.12b-rc3-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip:
        Xen/gntdev: don't needlessly use kvcalloc()
        Xen/gnttab: introduce common INVALID_GRANT_{HANDLE,REF}
        Xen/gntdev: don't needlessly allocate k{,un}map_ops[]
        Xen: drop exports of {set,clear}_foreign_p2m_mapping()
        xen/events: avoid handling the same event on two cpus at the same time
        xen/events: don't unmask an event channel when an eoi is pending
        xen/events: reset affinity of 2-level event when tearing it down
      6bf8819f
    • R
      Merge branch 'pm-opp' · 71803232
      Rafael J. Wysocki 提交于
      * pm-opp:
        opp: Don't drop extra references to OPPs accidentally
      71803232
    • R
      Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm · bee7359f
      Rafael J. Wysocki 提交于
      Pull an operating performance points (OPP) framework fix for 5.12
      from Viresh Kumar:
      
      "Fix OPP refcount issue noticed by Beata."
      
      * 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm:
        opp: Don't drop extra references to OPPs accidentally
      bee7359f
    • P
      io_uring: fix OP_ASYNC_CANCEL across tasks · 58f99373
      Pavel Begunkov 提交于
      IORING_OP_ASYNC_CANCEL tries io-wq cancellation only for current task.
      If it fails go over tctx_list and try it out for every single tctx.
      Signed-off-by: NPavel Begunkov <asml.silence@gmail.com>
      Signed-off-by: NJens Axboe <axboe@kernel.dk>
      58f99373
    • P
      io_uring: cancel sqpoll via task_work · 521d6a73
      Pavel Begunkov 提交于
      1) The first problem is io_uring_cancel_sqpoll() ->
      io_uring_cancel_task_requests() basically doing park(); park(); and so
      hanging.
      
      2) Another one is more subtle, when the master task is doing cancellations,
      but SQPOLL task submits in-between the end of the cancellation but
      before finish() requests taking a ref to the ctx, and so eternally
      locking it up.
      
      3) Yet another is a dying SQPOLL task doing io_uring_cancel_sqpoll() and
      same io_uring_cancel_sqpoll() from the owner task, they race for
      tctx->wait events. And there probably more of them.
      
      Instead do SQPOLL cancellations from within SQPOLL task context via
      task_work, see io_sqpoll_cancel_sync(). With that we don't need temporal
      park()/unpark() during cancellation, which is ugly, subtle and anyway
      doesn't allow to do io_run_task_work() properly.
      
      io_uring_cancel_sqpoll() is called only from SQPOLL task context and
      under sqd locking, so all parking is removed from there. And so,
      io_sq_thread_[un]park() and io_sq_thread_stop() are not used now by
      SQPOLL task, and that spare us from some headache.
      
      Also remove ctx->sqd_list early to avoid 2). And kill tctx->sqpoll,
      which is not used anymore.
      Signed-off-by: NPavel Begunkov <asml.silence@gmail.com>
      Signed-off-by: NJens Axboe <axboe@kernel.dk>
      521d6a73
    • P
      io_uring: prevent racy sqd->thread checks · 26984fbf
      Pavel Begunkov 提交于
      SQPOLL thread to which we're trying to attach may be going away, it's
      not nice but a more serious problem is if io_sq_offload_create() sees
      sqd->thread==NULL, and tries to init it with a new thread. There are
      tons of ways it can be exploited or fail.
      Signed-off-by: NPavel Begunkov <asml.silence@gmail.com>
      Signed-off-by: NJens Axboe <axboe@kernel.dk>
      26984fbf
  3. 12 3月, 2021 12 次提交
    • B
      gfs2: bypass log flush if the journal is not live · 0efc4976
      Bob Peterson 提交于
      Patch fe3e3976 ("gfs2: Rework the log space allocation logic")
      changed gfs2_log_flush to reserve a set of journal blocks in case no
      transaction is active.  However, gfs2_log_flush also gets called in
      cases where we don't have an active journal, for example, for spectator
      mounts.  In that case, trying to reserve blocks would sleep forever, but
      we want gfs2_log_flush to be a no-op instead.
      
      Fixes: fe3e3976 ("gfs2: Rework the log space allocation logic")
      Signed-off-by: NBob Peterson <rpeterso@redhat.com>
      Signed-off-by: NAndreas Gruenbacher <agruenba@redhat.com>
      0efc4976
    • P
      io_uring: remove useless ->startup completion · 0df8ea60
      Pavel Begunkov 提交于
      We always do complete(&sqd->startup) almost right after sqd->thread
      creation, either in the success path or in io_sq_thread_finish(). It's
      specifically created not started for us to be able to set some stuff
      like sqd->thread and io_uring_alloc_task_context() before following
      right after wake_up_new_task().
      Signed-off-by: NPavel Begunkov <asml.silence@gmail.com>
      Signed-off-by: NJens Axboe <axboe@kernel.dk>
      0df8ea60
    • P
      io_uring: cancel deferred requests in try_cancel · e1915f76
      Pavel Begunkov 提交于
      As io_uring_cancel_files() and others let SQO to run between
      io_uring_try_cancel_requests(), SQO may generate new deferred requests,
      so it's safer to try to cancel them in it.
      Signed-off-by: NPavel Begunkov <asml.silence@gmail.com>
      Signed-off-by: NJens Axboe <axboe@kernel.dk>
      e1915f76
    • J
      Merge tag 'nvme-5.12-2021-03-12' of git://git.infradead.org/nvme into block-5.12 · d4b64fd7
      Jens Axboe 提交于
      Pull NVMe fixes from Christoph:
      
      "nvme fixes for 5.12:
      
       - one more quirk (Dmitry Monakhov)
       - fix max_zone_append_sectors initialization (Chaitanya Kulkarni)
       - nvme-fc reset/create race fix (James Smart)
       - fix status code on aborts/resets (Hannes Reinecke)
       - fix the CSS check for ZNS namespaces (Chaitanya Kulkarni)
       - fix a use after free in a debug printk in nvme-rdma (Lv Yunlong)"
      
      * tag 'nvme-5.12-2021-03-12' of git://git.infradead.org/nvme:
        nvme-pci: add the DISABLE_WRITE_ZEROES quirk for a Samsung PM1725a
        nvme-rdma: Fix a use after free in nvmet_rdma_write_data_done
        nvme-core: check ctrl css before setting up zns
        nvme-fc: fix racing controller reset and create association
        nvme-fc: return NVME_SC_HOST_ABORTED_CMD when a command has been aborted
        nvme-fc: set NVME_REQ_CANCELLED in nvme_fc_terminate_exchange()
        nvme: add NVME_REQ_CANCELLED flag in nvme_cancel_request()
        nvme: simplify error logic in nvme_validate_ns()
        nvme: set max_zone_append_sectors nvme_revalidate_zones
      d4b64fd7
    • B
      gfs2: bypass signal_our_withdraw if no journal · d5bf630f
      Bob Peterson 提交于
      Before this patch, function signal_our_withdraw referenced the journal
      inode immediately. But corrupt file systems may have some invalid
      journals, in which case our attempt to read it in will withdraw and the
      resulting signal_our_withdraw would dereference the NULL value.
      
      This patch adds a check to signal_our_withdraw so that if the journal
      has not yet been initialized, it simply returns and does the old-style
      withdraw.
      
      Thanks, Andy Price, for his analysis.
      
      Reported-by: syzbot+50a8a9cf8127f2c6f5df@syzkaller.appspotmail.com
      Fixes: 601ef0d5 ("gfs2: Force withdraw to replay journals and wait for it to finish")
      Signed-off-by: NBob Peterson <rpeterso@redhat.com>
      Signed-off-by: NAndreas Gruenbacher <agruenba@redhat.com>
      d5bf630f
    • W
      perf/arm_dmc620_pmu: Fix error return code in dmc620_pmu_device_probe() · c8e38668
      Wei Yongjun 提交于
      Fix to return negative error code -ENOMEM from the error handling
      case instead of 0, as done elsewhere in this function.
      
      Fixes: 53c218da ("driver/perf: Add PMU driver for the ARM DMC-620 memory controller")
      Reported-by: NHulk Robot <hulkci@huawei.com>
      Signed-off-by: NWei Yongjun <weiyongjun1@huawei.com>
      Link: https://lore.kernel.org/r/20210312080421.277562-1-weiyongjun1@huawei.comSigned-off-by: NWill Deacon <will@kernel.org>
      c8e38668
    • B
      opp: Don't drop extra references to OPPs accidentally · 606a5d42
      Beata Michalska 提交于
      We are required to call dev_pm_opp_put() from outside of the
      opp_table->lock as debugfs removal needs to happen lock-less to avoid
      circular dependency issues.
      
      commit cf1fac94 ("opp: Reduce the size of critical section in
      _opp_kref_release()") tried to fix that introducing a new routine
      _opp_get_next() which keeps returning OPPs that can be freed by the
      callers and this routine shall be called without holding the
      opp_table->lock.
      
      Though the commit overlooked the fact that the OPPs can be referenced by
      other users as well and this routine will end up dropping references
      which were taken by other users and hence freeing the OPPs prematurely.
      
      In effect, other users of the OPPs will end up having invalid pointers
      at hand. We didn't see any crash reports earlier as the exact situation
      never happened, though it is certainly possible.
      
      We need a way to mark which OPPs are no longer referenced by the OPP
      core, so we don't drop extra references to them accidentally.
      
      This commit adds another OPP flag, "removed", which is used to track
      this. And now we should never end up dropping extra references to the
      OPPs.
      
      Cc: v5.11+ <stable@vger.kernel.org> # v5.11+
      Fixes: cf1fac94 ("opp: Reduce the size of critical section in _opp_kref_release()")
      Signed-off-by: NBeata Michalska <beata.michalska@arm.com>
      [ Viresh: Almost rewrote entire patch, added new "removed" field,
      	  rewrote commit log and added the correct Fixes tag. ]
      Co-developed-by: NViresh Kumar <viresh.kumar@linaro.org>
      Signed-off-by: NViresh Kumar <viresh.kumar@linaro.org>
      606a5d42
    • L
      Merge tag 'drm-fixes-2021-03-12-1' of git://anongit.freedesktop.org/drm/drm · f78d76e7
      Linus Torvalds 提交于
      Pull drm fixes from Dave Airlie:
       "Regular fixes for rc3. The i915 pull was based on the rc1 tag so I
        just cherry-picked the single fix from there to avoid it. The misc and
        amd trees seem to be on okay bases.
      
        It's a bunch of fixes across the tree, amdgpu has most of them a few
        ttm fixes around qxl, and nouveau.
      
        core:
         - Clear holes when converting compat ioctl's between 32-bits and
           64-bits.
      
        docs:
         - Use gitlab for drm bugzilla now.
      
        ttm:
         - Fix ttm page pool accounting.
      
        fbdev:
         - Fix oops in drm_fbdev_cleanup()
      
        shmem:
         - Assorted fixes for shmem helpers.
      
        qxl:
         - unpin qxl bos created as pinned when freeing them, and make ttm
           only warn once on this behavior.
         - Zero head.surface_id correctly in qxl.
      
        atyfb:
         - Use LCD management for atyfb on PPC_MAC.
      
        meson:
         - Shutdown kms poll helper in meson correctly.
      
        nouveau:
         - fix regression in bo syncing
      
        i915:
         - Wedge the GPU if command parser setup fails
      
        amdgpu:
         - Fix aux backlight control
         - Add a backlight override parameter
         - Various display fixes
         - PCIe DPM fix for vega
         - Polaris watermark fixes
         - Additional S0ix fix
      
        radeon:
         - Fix GEM regression
         - Fix AGP dependency handling"
      
      * tag 'drm-fixes-2021-03-12-1' of git://anongit.freedesktop.org/drm/drm: (33 commits)
        drm/nouveau: fix dma syncing for loops (v2)
        drm/i915: Wedge the GPU if command parser setup fails
        drm/compat: Clear bounce structures
        drm/shmem-helpers: vunmap: Don't put pages for dma-buf
        drm: meson_drv add shutdown function
        drm/shmem-helper: Don't remove the offset in vm_area_struct pgoff
        drm/shmem-helper: Check for purged buffers in fault handler
        qxl: Fix uninitialised struct field head.surface_id
        drm/ttm: Fix TTM page pool accounting
        drm/ttm: soften TTM warnings
        drm: Use USB controller's DMA mask when importing dmabufs
        MAINTAINERS: update drm bug reporting URL
        fbdev: atyfb: use LCD management functions for PPC_PMAC also
        fbdev: atyfb: always declare aty_{ld,st}_lcd()
        drm/qxl: fix lockdep issue in qxl_alloc_release_reserved
        drm/qxl: unpin release objects
        drm/fb-helper: only unmap if buffer not null
        drm/amdgpu: fix S0ix handling when the CONFIG_AMD_PMC=m
        drm/radeon: fix AGP dependency
        drm/radeon: also init GEM funcs in radeon_gem_prime_import_sg_table
        ...
      f78d76e7
    • D
      drm/nouveau: fix dma syncing for loops (v2) · 4042160c
      Dave Airlie 提交于
      The index variable should only be increased in one place.
      
      Noticed this while trying to track down another oops.
      
      v2: use while loop.
      
      Fixes: f295c8cf ("drm/nouveau: fix dma syncing warning with debugging on.")
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      Reviewed-by: NMichael J. Ruhl <michael.j.ruhl@intel.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20210311043527.5376-1-airlied@gmail.com
      4042160c
    • T
      drm/i915: Wedge the GPU if command parser setup fails · a829f033
      Tvrtko Ursulin 提交于
      Commit 311a50e7 ("drm/i915: Add support for mandatory cmdparsing")
      introduced mandatory command parsing but setup failures were not
      translated into wedging the GPU which was probably the intent.
      
      Possible errors come in two categories. Either the sanity check on
      internal tables has failed, which should be caught in CI unless an
      affected platform would be missed in testing; or memory allocation failure
      happened during driver load, which should be extremely unlikely but for
      correctness should still be handled.
      
      v2:
       * Tidy coding style. (Chris)
      
      [airlied: cherry-picked to avoid rc1 base]
      Signed-off-by: NTvrtko Ursulin <tvrtko.ursulin@intel.com>
      Fixes: 311a50e7 ("drm/i915: Add support for mandatory cmdparsing")
      Cc: Jon Bloomfield <jon.bloomfield@intel.com>
      Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
      Cc: Chris Wilson <chris.p.wilson@intel.com>
      Reviewed-by: NChris Wilson <chris.p.wilson@intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20210302114213.1102223-1-tvrtko.ursulin@linux.intel.com
      (cherry picked from commit 5a1a659762d35a6dc51047c9127c011303c77b7f)
      Signed-off-by: NRodrigo Vivi <rodrigo.vivi@intel.com>
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      a829f033
    • D
      Merge tag 'amd-drm-fixes-5.12-2021-03-10' of... · fb198483
      Dave Airlie 提交于
      Merge tag 'amd-drm-fixes-5.12-2021-03-10' of https://gitlab.freedesktop.org/agd5f/linux into drm-fixes
      
      amd-drm-fixes-5.12-2021-03-10:
      
      amdgpu:
      - Fix aux backlight control
      - Add a backlight override parameter
      - Various display fixes
      - PCIe DPM fix for vega
      - Polaris watermark fixes
      - Additional S0ix fix
      
      radeon:
      - Fix GEM regression
      - Fix AGP dependency handling
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      From: Alex Deucher <alexander.deucher@amd.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/20210310221141.3974-1-alexander.deucher@amd.com
      fb198483
    • D
      Merge tag 'drm-misc-fixes-2021-03-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes · e0da9686
      Dave Airlie 提交于
      drm-misc-fixes for rc3, rebased on rc2:
      - Fix oops in drm_fbdev_cleanup()
      - unpin qxl bos created as pinned when freeing them,
        and make ttm only warn once on this behavior.
      - Use LCD management for atyfb on PPC_MAC.
      - Use gitlab for drm bugzilla now.
      - Fix ttm page pool accounting.
      - Zero head.surface_id correctly in qxl.
      - Assorted fixes for shmem helpers.
      - Shutdown kms poll helper in meson correctly.
      - Clear holes when converting compat ioctl's between 32-bits and 64-bits.
      Signed-off-by: NDave Airlie <airlied@redhat.com>
      
      From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
      Link: https://patchwork.freedesktop.org/patch/msgid/4606f08e-d0e8-c543-5e96-cee2fd728a41@linux.intel.com
      e0da9686