5.14.6-rc1 review
Subsystems (7)
Greg Kroah-Hartman
maintainercover 5.14.6-rc1 review
This is the start of the stable review cycle for the 5.14.6 release. There are 432 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Sat, 18 Sep 2021 15:57:06 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v5.x/stable-review/patch-5.14.6-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-5.14.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 5.14.6-rc1
Qiang.Zhang <[email protected]>
tracing/osnoise: Fix missed cpus_read_unlock() in start_per_cpu_kthreads()
Alyssa Rosenzweig <[email protected]>
drm/panfrost: Clamp lock region to Bifrost minimum
Alyssa Rosenzweig <[email protected]>
drm/panfrost: Use u64 for size in lock_region
Alyssa Rosenzweig <[email protected]>
drm/panfrost: Simplify lock_region calculation
Thomas Hellström <[email protected]>
drm/ttm: Fix ttm_bo_move_memcpy() for subclassed struct ttm_resource
Kalyan Thota <[email protected]>
drm/msm/disp/dpu1: add safe lut config in dpu driver
Aaron Liu <[email protected]>
drm/amd/display: setup system context for APUs
Alex Sierra <[email protected]>
drm/amdkfd: drop process ref count when xnack disable
Jerry (Fangzhi) Zuo <[email protected]>
drm/amd/display: Update bounding box states (v2)
Aurabindo Pillai <[email protected]>
drm/amd/display: Update number of DCN3 clock states
xinhui pan <[email protected]>
drm/amdgpu: Fix a deadlock if previous GEM object allocation fails
Nicholas Kazlauskas <[email protected]>
drm/amdgpu: Enable S/G for Yellow Carp
Andrey Grodzovsky <[email protected]>
drm/amdgpu: Fix BUG_ON assert
Boris Brezillon <[email protected]>
drm/panfrost: Make sure MMU context lifetime is not bound to panfrost_priv
Rajkumar Subbiah <[email protected]>
drm/dp_mst: Fix return code on sideband message failure
David Heidelberg <[email protected]>
drm/msi/mdp4: populate priv->kms in mdp4_kms_init
Thomas Zimmermann <[email protected]>
drm/mgag200: Select clock in PLL update functions
Song Yoong Siang <[email protected]>
net: stmmac: Fix overall budget calculation for rxtx_napi
Jan Hoffmann <[email protected]>
net: dsa: lantiq_gswip: fix maximum frame length
Kees Cook <[email protected]>
lib/test_stackinit: Fix static initializer test
Patryk Duda <[email protected]>
platform/chrome: cros_ec_proto: Send command again when timeout occurs
sumiyawang <[email protected]>
libnvdimm/pmem: Fix crash triggered when I/O in-flight during unbind
Vasily Averin <[email protected]>
memcg: enable accounting for pids in nested pid namespaces
yanghui <[email protected]>
mm/mempolicy: fix a race between offset_il_node and mpol_rebind_task
Miaohe Lin <[email protected]>
mm/page_alloc.c: avoid accessing uninitialized pcp page migratetype
Rik van Riel <[email protected]>
mm,vmscan: fix divide by zero in get_scan_count
Liu Zixian <[email protected]>
mm/hugetlb: initialize hugetlb_usage in mm_init
Li Zhijian <[email protected]>
mm/hmm: bypass devmap pte when all pfn requested flags are fulfilled
David Hildenbrand <[email protected]>
mm/memory_hotplug: use "unsigned long" for PFN in zone_for_pfn_range()
Mike Kravetz <[email protected]>
hugetlb: fix hugetlb cgroup refcounting during vma split
Michael Wang <[email protected]>
mm: fix panic caused by __page_handle_poison()
Sven Schnelle <[email protected]>
s390/topology: fix topology information when calling cpu hotplug notifiers
Halil Pasic <[email protected]>
s390/pv: fix the forcing of the swiotlb
Pratik R. Sampat <[email protected]>
cpufreq: powernv: Fix init_chip_info initialization in numa=off
Evgeny Novikov <[email protected]>
mtd: rawnand: intel: Fix error handling in probe
Saurav Kashyap <[email protected]>
scsi: qla2xxx: Sync queue idx with queue_pair_map idx
Saurav Kashyap <[email protected]>
scsi: qla2xxx: Changes to support kdump kernel
Maciej W. Rozycki <[email protected]>
scsi: BusLogic: Fix missing pr_cont() use
chenying <[email protected]>
ovl: fix BUG_ON() in may_delete() when called from ovl_cleanup()
Petr Mladek <[email protected]>
printk/console: Check consistent sequence number when handling race in console_unlock()
Masahiro Yamada <[email protected]>
parisc: Fix compile failure when building 64-bit kernel natively
Mikulas Patocka <[email protected]>
parisc: fix crash with signals and alloca
Guojia Liao <[email protected]>
net: hns3: clean up a type mismatch warning
Yang Yingliang <[email protected]>
net: w5100: check return value after calling platform_get_resource()
Haimin Zhang <[email protected]>
fix array-index-out-of-bounds in taprio_change
王贇 <[email protected]>
net: fix NULL pointer reference in cipso_v4_doi_free
Miaoqing Pan <[email protected]>
ath9k: fix sleeping in atomic context
Zekun Shen <[email protected]>
ath9k: fix OOB read ar9300_eeprom_restore_internal
Loic Poulain <[email protected]>
wcn36xx: Fix missing frame timestamp for beacon/probe-resp
Chengfeng Ye <[email protected]>
selftests/bpf: Fix potential unreleased lock
Colin Ian King <[email protected]>
parport: remove non-zero check on count
Rui Miguel Silva <[email protected]>
usb: isp1760: otg control register access
Rui Miguel Silva <[email protected]>
usb: isp1760: use the right irq status bit
Rui Miguel Silva <[email protected]>
usb: isp1760: write to status and address register
Rui Miguel Silva <[email protected]>
usb: isp1760: fix qtd fill length
Rui Miguel Silva <[email protected]>
usb: isp1760: fix memory pool initialization
Yevgeny Kliteynik <[email protected]>
net/mlx5: DR, Enable QP retransmission
Wentao_Liang <[email protected]>
net/mlx5: DR, fix a potential use-after-free bug
Ilan Peer <[email protected]>
iwlwifi: mvm: Fix scan channel flags settings
Avraham Stern <[email protected]>
iwlwifi: mvm: don't schedule the roc_done_wk if it is already running
Johannes Berg <[email protected]>
iwlwifi: fw: correctly limit to monitor dump
Johannes Berg <[email protected]>
iwlwifi: mvm: fix access to BSS elements
Ilan Peer <[email protected]>
iwlwifi: mvm: Fix umac scan request probe parameters
Johannes Berg <[email protected]>
iwlwifi: mvm: avoid static queue number aliasing
Zhang Qilong <[email protected]>
iwlwifi: mvm: fix a memory leak in iwl_mvm_mac_ctxt_beacon_changed
Ilan Peer <[email protected]>
iwlwifi: mvm: Do not use full SSIDs in 6GHz scan
Johannes Berg <[email protected]>
iwlwifi: pcie: free RBs during configure
J. Bruce Fields <[email protected]>
nfsd: fix crash on LOCKT on reexported NFSv3
J. Bruce Fields <[email protected]>
nfs: don't atempt blocking locks on nfs reexports
Sean Keely <[email protected]>
drm/amdkfd: Account for SH/SE count when setting up cu masks.
Pierre-Louis Bossart <[email protected]>
ASoC: soc-pcm: protect BE dailink state changes in trigger
Xiaotan Luo <[email protected]>
ASoC: rockchip: i2s: Fixup config for DAIFMT_DSP_A/B
Sugar Zhang <[email protected]>
ASoC: rockchip: i2s: Fix regmap_ops hang
Chunfeng Yun <[email protected]>
usb: xhci-mtk: Do not use xhci's virt_dev in drop_endpoint
Chunfeng Yun <[email protected]>
usb: xhci-mtk: fix use-after-free of mtk->hcd
Shuah Khan <[email protected]>
usbip:vhci_hcd USB port can get stuck in the disabled state
Anirudh Rayabharam <[email protected]>
usbip: give back URBs for unsent unlink requests during cleanup
Nadezda Lutovinova <[email protected]>
usb: musb: musb_dsps: request_irq() after initializing musb
Nadezda Lutovinova <[email protected]>
usb: dwc3: imx8mp: request irq after initializing dwc3
Mathias Nyman <[email protected]>
Revert "USB: xhci: fix U1/U2 handling for hardware with XHCI_INTEL_HOST quirk set"
Ding Hui <[email protected]>
cifs: fix wrong release in sess_alloc_buffer() failed path
Juhee Kang <[email protected]>
samples: pktgen: fix to print when terminated normally
Subbaraya Sundeep <[email protected]>
octeontx2-pf: cleanup transmit link deriving logic
Nishad Kamdar <[email protected]>
mmc: core: Return correct emmc response in case of ioctl error
Li Zhijian <[email protected]>
selftests/bpf: Enlarge select() timeout for test_maps
Thomas Hebb <[email protected]>
mmc: rtsx_pci: Fix long reads when clock is prescaled
Ulf Hansson <[email protected]>
mmc: core: Avoid hogging the CPU while polling for busy after I/O writes
Ulf Hansson <[email protected]>
mmc: core: Avoid hogging the CPU while polling for busy for mmc ioctls
Ulf Hansson <[email protected]>
mmc: core: Avoid hogging the CPU while polling for busy in the I/O err path
Manish Narani <[email protected]>
mmc: sdhci-of-arasan: Check return value of non-void funtions
Manish Narani <[email protected]>
mmc: sdhci-of-arasan: Modified SD default speed to 19MHz for ZynqMP
Marc Zyngier <[email protected]>
of: Don't allow __of_attached_node_sysfs() without CONFIG_SYSFS
Gustaw Lewandowski <[email protected]>
ASoC: Intel: Skylake: Fix passing loadable flag for module
Cezary Rojewski <[email protected]>
ASoC: Intel: Skylake: Fix module configuration for KPB and MIXER
Pierre-Louis Bossart <[email protected]>
soundwire: intel: fix potential race condition during power down
Marcos Paulo de Souza <[email protected]>
btrfs: tree-log: check btrfs_lookup_data_extent return value
Filipe Manana <[email protected]>
btrfs: remove racy and unnecessary inode transaction update when using no-holes
Arnd Bergmann <[email protected]>
m68knommu: only set CONFIG_ISA_DMA_API for ColdFire sub-arch
Subbaraya Sundeep <[email protected]>
octeontx2-pf: Fix NIX1_RX interface backpressure
Chin-Yen Lee <[email protected]>
rtw88: wow: fix size access error of probe request
Ping-Ke Shih <[email protected]>
rtw88: wow: build wow function only if CONFIG_PM is on
Chin-Yen Lee <[email protected]>
rtw88: use read_poll_timeout instead of fixed sleep
Chris Chiu <[email protected]>
rtl8xxxu: Fix the handling of TX A-MPDU aggregation
Nathan Chancellor <[email protected]>
drm/exynos: Always initialize mapping in exynos_drm_register_dma()
J. Bruce Fields <[email protected]>
lockd: lockd server-side shouldn't set fl_ops
Li Jun <[email protected]>
usb: chipidea: host: fix port index underflow and UBSAN complains
Bob Peterson <[email protected]>
gfs2: Don't call dlm after protocol is unmounted
Kuninori Morimoto <[email protected]>
ASoC: rsnd: adg: clearly handle clock error / NULL case
Mark Brown <[email protected]>
kselftest/arm64: pac: Fix skipping of tests on systems without PAC
Mark Brown <[email protected]>
kselftest/arm64: mte: Fix misleading output when skipping tests
Eli Cohen <[email protected]>
net: Fix offloading indirect devices dependency on qdisc order creation
Bongsu Jeon <[email protected]>
selftests: nci: Fix the wrong condition
Bongsu Jeon <[email protected]>
selftests: nci: Fix the code for next nlattr offset
Kees Cook <[email protected]>
staging: rts5208: Fix get_ms_information() heap buffer size
Brandon Wyman <[email protected]>
hwmon: (pmbus/ibm-cffps) Fix write bits for LED control
Yonghong Song <[email protected]>
selftests/bpf: Fix flaky send_signal test
Yucong Sun <[email protected]>
selftests/bpf: Correctly display subtest skip status
Stefan Assmann <[email protected]>
iavf: use mutexes for locking of critical sections
J. Bruce Fields <[email protected]>
rpc: fix gss_svc_init cleanup on failure
Thomas Gleixner <[email protected]>
locking/rtmutex: Set proper wait context for lockdep
Luke Hsiao <[email protected]>
tcp: enable data-less, empty-cookie SYN with TFO_SERVER_COOKIE_NOT_REQD
Darrick J. Wong <[email protected]>
iomap: pass writeback errors to the mapping
Ulrich Hecht <[email protected]>
serial: sh-sci: fix break handling for sysrq
Rajendra Nayak <[email protected]>
opp: Don't print an error if required-opps is missing
Kiran K <[email protected]>
Bluetooth: Fix race condition in handling NOP command
Luiz Augusto von Dentz <[email protected]>
Bluetooth: Fix handling of LE Enhanced Connection Complete
Sagi Grimberg <[email protected]>
nvme: code command_id with a genctr for use-after-free validation
Sagi Grimberg <[email protected]>
nvme-tcp: don't check blk_mq_tag_to_rq when receiving pdu data
Raag Jadav <[email protected]>
arm64: dts: ls1046a: fix eeprom entries
Tim Harvey <[email protected]>
arm64: dts: imx8mm-venice-gw71xx: fix USB OTG VBUS
Tim Harvey <[email protected]>
arm64: dts: imx8mm-venice-gw700x: fix invalid pmic pin config
Tim Harvey <[email protected]>
arm64: dts: imx8mm-venice-gw700x: fix mp5416 pmic config
Thierry Reding <[email protected]>
arm64: tegra: Fix compatible string for Tegra132 CPUs
Andreas Obergschwandtner <[email protected]>
ARM: tegra: tamonten: Fix UART pad setting
Dmitry Osipenko <[email protected]>
ARM: tegra: acer-a500: Remove bogus USB VBUS regulators
Johan Almbladh <[email protected]>
mac80211: Fix monitor MTU limit so that A-MSDUs get through
Tuo Li <[email protected]>
drm/display: fix possible null-pointer dereference in dcn10_set_clock()
Tuo Li <[email protected]>
gpu: drm: amd: amdgpu: amdgpu_i2c: fix possible uninitialized-variable access in amdgpu_i2c_router_select_ddc_port()
Eran Ben Elisha <[email protected]>
net/mlx5: Fix variable type to match 64bit
Kuogee Hsieh <[email protected]>
drm/msm/dp: do not end dp link training until video is ready
Kuogee Hsieh <[email protected]>
drm/msm/dp: return correct edid checksum after corrupted edid checksum read
Kuogee Hsieh <[email protected]>
drm/msm/dp: reset aux controller after dp_aux_cmd_fifo_tx() failed.
Kuogee Hsieh <[email protected]>
drm/msm/dp: reduce link rate if failed at link training 1
Desmond Cheong Zhi Xi <[email protected]>
Bluetooth: avoid circular locks in sco_sock_connect
Desmond Cheong Zhi Xi <[email protected]>
Bluetooth: schedule SCO timeouts with delayed_work
Fabio Aiuto <[email protected]>
staging: rtl8723bs: fix right side of condition
Desmond Cheong Zhi Xi <[email protected]>
drm/vmwgfx: fix potential UAF in vmwgfx_surface.c
Jussi Maki <[email protected]>
selftests/bpf: Fix xdp_tx.c prog section name
Roy Chan <[email protected]>
drm/amd/display: fix incorrect CM/TF programming sequence in dwb
Roy Chan <[email protected]>
drm/amd/display: fix missing writeback disablement if plane is removed
Sanjay R Mehta <[email protected]>
thunderbolt: Fix port linking by checking all adapters
Linus Walleij <[email protected]>
ARM: dts: ixp4xx: Fix up bad interrupt flags
Quanyang Wang <[email protected]>
drm: xlnx: zynqmp: release reset to DP controller before accessing DP registers
Quanyang Wang <[email protected]>
drm: xlnx: zynqmp_dpsub: Call pm_runtime_get_sync before setting pixel clock
Konrad Dybcio <[email protected]>
drm/msm/dsi: Fix DSI and DSI PHY regulator config from SDM660
David Heidelberg <[email protected]>
drm/msm: mdp4: drop vblank get/put from prepare/complete_commit
Nathan Chancellor <[email protected]>
net: ethernet: stmmac: Do not use unreachable() in ipq806x_gmac_probe()
Rajendra Nayak <[email protected]>
nvmem: qfprom: Fix up qfprom_disable_fuse_blowing() ordering
Georgi Djakov <[email protected]>
arm64: dts: qcom: sm8250: Fix epss_l3 unit address
Vinod Koul <[email protected]>
arm64: dts: qcom: msm8996: don't use underscore in node name
Vinod Koul <[email protected]>
arm64: dts: qcom: msm8994: don't use underscore in node name
Vinod Koul <[email protected]>
arm64: dts: qcom: sdm630: don't use underscore in node name
Vinod Koul <[email protected]>
arm64: dts: qcom: ipq6018: drop '0x' from unit address
Vinod Koul <[email protected]>
arm64: dts: qcom: sdm660: use reg value for memory node
Vinod Koul <[email protected]>
arm64: dts: qcom: ipq8074: fix pci node reg property
Sebastian Reichel <[email protected]>
ARM: dts: imx53-ppd: Fix ACHC entry
Mikko Perttunen <[email protected]>
misc: sram: Only map reserved areas in Tegra SYSRAM
Tony Lindgren <[email protected]>
serial: 8250_omap: Handle optional overrun-throttle-ms property
Alex Elder <[email protected]>
net: ipa: fix IPA v4.9 interconnects
AngeloGioacchino Del Regno <[email protected]>
arm64: dts: qcom: sdm630: Fix TLMM node and pinctrl configuration
AngeloGioacchino Del Regno <[email protected]>
arm64: dts: qcom: sdm630: Rewrite memory map
Bob Peterson <[email protected]>
gfs2: Fix glock recursion in freeze_go_xmote_bh
Evgeny Novikov <[email protected]>
media: tegra-cec: Handle errors of clk_prepare_enable()
Krzysztof Hałasa <[email protected]>
media: TDA1997x: fix tda1997x_query_dv_timings() return value
Hans Verkuil <[email protected]>
media: v4l2-dv-timings.c: fix wrong condition in two for-loops
Laurent Pinchart <[email protected]>
media: imx: imx7-media-csi: Fix buffer return upon stream start failure
Umang Jain <[email protected]>
media: imx258: Limit the max analogue gain to 480
Laurent Pinchart <[email protected]>
media: imx258: Rectify mismatch of VTS value
Ioana Ciornei <[email protected]>
dpaa2-switch: do not enable the DPSW at probe time
Luiz Augusto von Dentz <[email protected]>
Bluetooth: Fix not generating RPA when required
Pierre-Louis Bossart <[email protected]>
ASoC: Intel: update sof_pcm512x quirks
Hans de Goede <[email protected]>
ASoC: Intel: bytcr_rt5640: Move "Platform Clock" routes to the maps for the matching in-/output
Vidya Sagar <[email protected]>
arm64: tegra: Fix Tegra194 PCIe EP compatible string
Nicolas Ferre <[email protected]>
ARM: dts: at91: use the right property for shutdown controller
Yufeng Mo <[email protected]>
bonding: 3ad: fix the concurrency between __bond_release_one() and bond_3ad_state_machine_handler()
Pablo Neira Ayuso <[email protected]>
netfilter: nft_compat: use nfnetlink_unicast()
Akhil P Oommen <[email protected]>
drm/msm/a6xx: Fix llcc configuration for a660 gpu
Marek Vasut <[email protected]>
ARM: dts: stm32: Update AV96 adv7513 node per dtbs_check
Marek Vasut <[email protected]>
ARM: dts: stm32: Set {bitclock,frame}-master phandles on ST DKx
Marek Vasut <[email protected]>
ARM: dts: stm32: Set {bitclock,frame}-master phandles on DHCOM SoM
Zhen Lei <[email protected]>
workqueue: Fix possible memory leaks in wq_numa_init()
Desmond Cheong Zhi Xi <[email protected]>
Bluetooth: skip invalid hci_sync_conn_complete_evt
Laurent Pinchart <[email protected]>
drm: rcar-du: Shutdown the display on system shutdown
Andy Shevchenko <[email protected]>
ata: sata_dwc_460ex: No need to call phy_exit() befre phy_init()
Martynas Pumputis <[email protected]>
libbpf: Fix race when pinning maps in parallel
Juhee Kang <[email protected]>
samples: bpf: Fix tracex7 error raised on the missing argument
Mikita Lipski <[email protected]>
drm/amd/display: Fix PSR command version
Christophe JAILLET <[email protected]>
staging: ks7010: Fix the initialization of the 'sleep_status' structure
Greg Kroah-Hartman <[email protected]>
vt: keyboard.c: make console an unsigned int
Greg Kroah-Hartman <[email protected]>
serial: 8250_pci: make setup_port() parameters explicitly unsigned
Jiri Slaby <[email protected]>
hvsi: don't panic on tty_register_driver failure
Jiri Slaby <[email protected]>
xtensa: ISS: don't panic in rs_init
Andy Shevchenko <[email protected]>
serial: max310x: Use clock-names property matching to recognize EXTCLK
Maciej W. Rozycki <[email protected]>
serial: 8250: Define RX trigger levels for OxSemi 950 devices
Niklas Schnelle <[email protected]>
s390: make PCI mio support a machine flag
Heiko Carstens <[email protected]>
s390/jump_label: print real address in a case of a jump label bug
Gustavo A. R. Silva <[email protected]>
flow_dissector: Fix out-of-bounds warnings
Gustavo A. R. Silva <[email protected]>
ipv4: ip_output.c: Fix out-of-bounds warning in ip_copy_addrs()
Alex Elder <[email protected]>
net: ipa: always validate filter and route tables
Alex Elder <[email protected]>
net: ipa: fix ipa_cmd_table_valid()
Zheyu Ma <[email protected]>
video: fbdev: riva: Error out if 'pixclock' equals zero
Zheyu Ma <[email protected]>
video: fbdev: kyro: Error out if 'pixclock' equals zero
Zheyu Ma <[email protected]>
video: fbdev: asiliantfb: Error out if 'pixclock' equals zero
Jernej Skrabec <[email protected]>
arm64: dts: allwinner: h6: tanix-tx6: Fix regulator node names
Geert Uytterhoeven <[email protected]>
drm/bridge: nwl-dsi: Avoid potential multiplication overflow on 32-bit
Johan Almbladh <[email protected]>
bpf/tests: Do not PASS tests without actually testing the result
Johan Almbladh <[email protected]>
bpf/tests: Fix copy-and-paste error in double word test
Anson Jacob <[email protected]>
drm/amd/amdgpu: Update debugfs link_settings output link_rate field in hex
Oak Zeng <[email protected]>
drm/amdgpu: Fix a printing message
Jake Wang <[email protected]>
drm/amd/display: Fixed hardware power down bypass during headless boot
Arnd Bergmann <[email protected]>
ethtool: improve compat ioctl handling
Niklas Söderlund <[email protected]>
nfp: fix return statement in nfp_net_parse_meta()
Yang Yingliang <[email protected]>
media: atomisp: pci: fix error return code in atomisp_pci_probe()
Dinghao Liu <[email protected]>
media: atomisp: Fix runtime PM imbalance in atomisp_pci_probe
Evgeny Novikov <[email protected]>
media: platform: stm32: unprepare clocks at handling errors in probe
Ezequiel Garcia <[email protected]>
media: hantro: vp8: Move noisy WARN_ON to vpu_debug
Oliver Logush <[email protected]>
drm/amd/display: Fix timer_per_pixel unit error
Shuah Khan <[email protected]>
selftests: firmware: Fix ignored return val of asprintf() warn
Eric Auger <[email protected]>
misc/pvpanic-pci: Allow automatic loading
Laurentiu Tudor <[email protected]>
bus: fsl-mc: fix mmio base address for child DPRCs
Laurentiu Tudor <[email protected]>
bus: fsl-mc: fix arg in call to dprc_scan_objects()
Zheyu Ma <[email protected]>
tty: serial: jsm: hold port lock when reporting modem line changes
Mauro Carvalho Chehab <[email protected]>
staging: hisilicon,hi6421-spmi-pmic.yaml: fix patternProperties
Geert Uytterhoeven <[email protected]>
staging: board: Fix uninitialized spinlock when attaching genpd
Jack Pham <[email protected]>
usb: gadget: composite: Allow bMaxPower=0 if self-powered
Evgeny Novikov <[email protected]>
USB: EHCI: ehci-mv: improve error handling in mv_ehci_enable()
Maciej Żenczykowski <[email protected]>
usb: gadget: u_ether: fix a potential null pointer dereference
Kelly Devilliv <[email protected]>
usb: host: fotg210: fix the actual_length of an iso packet
Kelly Devilliv <[email protected]>
usb: host: fotg210: fix the endpoint's transactional opportunities calculation
Sasha Neftin <[email protected]>
igc: Check if num of q_vectors is smaller than max before array access
Zhouyi Zhou <[email protected]>
rcu: Fix macro name CONFIG_TASKS_RCU_TRACE
Desmond Cheong Zhi Xi <[email protected]>
drm: protect drm_master pointers in drm_lease.c
Desmond Cheong Zhi Xi <[email protected]>
drm: serialize drm_file.master with a new spinlock
Desmond Cheong Zhi Xi <[email protected]>
drm: avoid blocking in drm_clients_info's rcu section
Tianjia Zhang <[email protected]>
Smack: Fix wrong semantics in smk_access_entry()
Alex Elder <[email protected]>
net: ipa: fix IPA v4.11 interconnect data
Bhupesh Sharma <[email protected]>
arm64: dts: qcom: Fix usb entries for SA8155p adp board
Yajun Deng <[email protected]>
netlink: Deal with ESRCH error in nlmsg_notify()
KuoHsiang Chou <[email protected]>
drm/ast: Disable fast reset after DRAM initial
Zheyu Ma <[email protected]>
video: fbdev: kyro: fix a DoS bug by restricting user input
David Heidelberg <[email protected]>
ARM: dts: qcom: apq8064: correct clock names
Stefan Assmann <[email protected]>
iavf: fix locking of critical sections
Stefan Assmann <[email protected]>
iavf: do not override the adapter state in the watchdog task
Jonathan Cameron <[email protected]>
iio: dac: ad5624r: Fix incorrect handling of an optional regulator.
Marek Vasut <[email protected]>
net: phy: Fix data type in DP83822 dp8382x_disable_wol()
Xin Long <[email protected]>
tipc: keep the skb in rcv queue until the whole data is read
Rafael J. Wysocki <[email protected]>
PCI: Use pci_update_current_state() in pci_enable_device_flags()
Sean Anderson <[email protected]>
crypto: mxs-dcp - Use sg_mapping_iter to copy data
Ani Sinha <[email protected]>
x86/hyperv: fix for unwanted manipulation of sched_clock when TSC marked unstable
Thomas Zimmermann <[email protected]>
drm/vkms: Let shadow-plane helpers prepare the plane's FB
Martynas Pumputis <[email protected]>
libbpf: Fix reuse of pinned map on older kernel
Tomi Valkeinen <[email protected]>
media: ti-vpe: cal: fix queuing of the initial buffer
Tomi Valkeinen <[email protected]>
media: ti-vpe: cal: fix error handling in cal_camerarx_create
Mauro Carvalho Chehab <[email protected]>
media: dib8000: rewrite the init prbs logic
Randy Dunlap <[email protected]>
ASoC: atmel: ATMEL drivers don't need HAS_DMA
Peter Ujfalusi <[email protected]>
ASoC: ti: davinci-mcasp: Fix DIT mode support
Linus Walleij <[email protected]>
drm/panel: Fix up DT bindings for Samsung lms397kf04
Christian König <[email protected]>
dma-buf: fix dma_resv_test_signaled test_all handling v2
Tim Gover <[email protected]>
drm: vc4: Fix pixel-wrap issue with DVP teardown
Luben Tuikov <[email protected]>
drm/amdgpu: Fix koops when accessing RAS EEPROM
Luben Tuikov <[email protected]>
drm/amdgpu: Fix amdgpu_ras_eeprom_init()
Daniel Vetter <[email protected]>
drm/omap: Follow implicit fencing in prepare_fb
Andrey Grodzovsky <[email protected]>
drm/ttm: Fix multihop assert on eviction.
Dom Cobley <[email protected]>
drm/vc4: hdmi: Set HD_CTL_WHOLSMP and HD_CTL_CHALIGN_SET
Zack Rusin <[email protected]>
drm/vmwgfx: Fix some static checker warnings
Zack Rusin <[email protected]>
drm/vmwgfx: Fix subresource updates with new contexts
Nadav Amit <[email protected]>
userfaultfd: prevent concurrent API initialization
Masahiro Yamada <[email protected]>
kbuild: Fix 'no symbols' warning when CONFIG_TRIM_UNUSD_KSYMS=y
Oleksij Rempel <[email protected]>
MIPS: Malta: fix alignment of the devicetree buffer
Jaegeuk Kim <[email protected]>
f2fs: should put a page beyond EOF when preparing a write
Jaegeuk Kim <[email protected]>
f2fs: deallocate compressed pages when error happens
Chao Yu <[email protected]>
f2fs: fix to unmap pages from userspace process in punch_hole()
Chao Yu <[email protected]>
f2fs: fix unexpected ENOENT comes from f2fs_map_blocks()
Chao Yu <[email protected]>
f2fs: fix to account missing .skipped_gc_rwsem
Yongqiang Niu <[email protected]>
soc: mediatek: cmdq: add address shift in jump
Alexey Kardashevskiy <[email protected]>
KVM: PPC: Fix clearing never mapped TCEs in realmode
Codrin Ciubotariu <[email protected]>
clk: at91: clk-generated: Limit the requested rate to our range
Sergio Paracuellos <[email protected]>
clk: ralink: avoid to set 'CLK_IS_CRITICAL' flag for gates
David Howells <[email protected]>
fscache: Fix cookie key hashing
Wenpeng Liang <[email protected]>
RDMA/hns: Fix QP's resp incomplete assignment
Wenpeng Liang <[email protected]>
RDMA/hns: Fix query destination qpn
Srikar Dronamraju <[email protected]>
powerpc/smp: Update cpu_core_map on all PowerPc systems
Srikar Dronamraju <[email protected]>
powerpc/smp: Fix a crash while booting kvm guest with nr_cpus=2
Hans de Goede <[email protected]>
platform/x86: dell-smbios-wmi: Add missing kfree in error-exit from run_smbios_call
Junxian Huang <[email protected]>
RDMA/hns: Bugfix for incorrect association between dip_idx and dgid
Junxian Huang <[email protected]>
RDMA/hns: Bugfix for the missing assignment for dip_idx
Junxian Huang <[email protected]>
RDMA/hns: Bugfix for data type of dip_idx
Yixing Liu <[email protected]>
RDMA/hns: Fix incorrect lsn field
Kajol Jain <[email protected]>
powerpc/perf: Fix the check for SIAR value
Nicholas Piggin <[email protected]>
KVM: PPC: Book3S HV Nested: Reflect guest PMU in-use to L0 when guest SPRs are live
Alim Akhtar <[email protected]>
scsi: ufs: ufs-exynos: Fix static checker warning
Fabiano Rosas <[email protected]>
KVM: PPC: Book3S HV: Fix copy_tofrom_guest routines
Ahmad Fatoum <[email protected]>
clk: imx8m: fix clock tree update of TF-A managed clocks
Lucas Stach <[email protected]>
clk: imx8mm: use correct mux type for clkout path
Lang Cheng <[email protected]>
RDMA/hns: Ownerbit mode add control field
Lukas Bulwahn <[email protected]>
HID: thrustmaster: clean up Makefile and adapt quirks
Jim Broadus <[email protected]>
HID: i2c-hid: Fix Elan touchpad regression
Basavaraj Natikar <[email protected]>
HID: amd_sfh: Fix period data field to enable sensor
YueHaibing <[email protected]>
RDMA/hns: Fix return in hns_roce_rereg_user_mr()
Lu Baolu <[email protected]>
iommu/vt-d: Update the virtual command related registers
Chao Yu <[email protected]>
f2fs: fix to keep compatibility of fault injection interface
Joel Stanley <[email protected]>
powerpc/config: Renable MTD_PHYSMAP_OF
Joel Stanley <[email protected]>
powerpc/config: Fix IPV6 warning in mpc855_ads
Dan Carpenter <[email protected]>
scsi: qedf: Fix error codes in qedf_alloc_global_queues()
Dan Carpenter <[email protected]>
scsi: qedi: Fix error codes in qedi_alloc_global_queues()
Dan Carpenter <[email protected]>
scsi: smartpqi: Fix an error code in pqi_get_raid_map()
Srinivas Pandruvada <[email protected]>
platform/x86: ISST: Fix optimization with use of numa
Jason Gunthorpe <[email protected]>
vfio/mbochs: Fix missing error unwind of mbochs_used_mbytes
Laurent Dufour <[email protected]>
powerpc/numa: Consider the max NUMA node for migratable LPAR
Zhen Lei <[email protected]>
pinctrl: single: Fix error return code in pcs_parse_bits_in_pinctrl_entry()
Wei Li <[email protected]>
scsi: fdomain: Fix error return code in fdomain_probe()
Adrian Hunter <[email protected]>
scsi: ufshcd: Fix device links when BOOT WLUN fails to probe
Colin Ian King <[email protected]>
scsi: ufs: Fix unsigned int compared with less than zero
Anna Schumaker <[email protected]>
sunrpc: Fix return value of get_srcport()
Trond Myklebust <[email protected]>
SUNRPC/xprtrdma: Fix reconnection locking
Trond Myklebust <[email protected]>
SUNRPC: Fix potential memory corruption
Trond Myklebust <[email protected]>
NFSv4/pnfs: The layout barrier indicate a minimal value for the seqid
Trond Myklebust <[email protected]>
NFSv4/pNFS: Always allow update of a zero valued layout barrier
Trond Myklebust <[email protected]>
NFSv4/pNFS: Fix a layoutget livelock loop
Chuck Lever <[email protected]>
xprtrdma: Put rpcrdma_reps before waking the tear-down completion
Anthony Iliopoulos <[email protected]>
dma-debug: fix debugfs initialization order
Randy Dunlap <[email protected]>
openrisc: don't printk() unconditionally
Yangtao Li <[email protected]>
f2fs: reduce the scope of setting fsck tag when de->name_len is zero
Nathan Chancellor <[email protected]>
cpuidle: pseries: Mark pseries_idle_proble() as __init
Leon Romanovsky <[email protected]>
RDMA/mlx5: Delete not-available udata check
Leon Romanovsky <[email protected]>
RDMA/efa: Remove double QP type assignment
Leon Romanovsky <[email protected]>
RDMA/hns: Don't overwrite supplied QP attributes
Michal Suchanek <[email protected]>
powerpc/stacktrace: Include linux/delay.h
Gautham R. Shenoy <[email protected]>
cpuidle: pseries: Fixup CEDE0 latency only for POWER10 onwards
Bart Van Assche <[email protected]>
scsi: ufs: Fix the SCSI abort handler
Bart Van Assche <[email protected]>
scsi: ufs: Use DECLARE_COMPLETION_ONSTACK() where appropriate
Bart Van Assche <[email protected]>
scsi: ufs: Fix memory corruption by ufshcd_read_desc_param()
Jason Gunthorpe <[email protected]>
vfio: Use config not menuconfig for VFIO_NOIOMMU
Chao Yu <[email protected]>
f2fs: fix wrong checkpoint_changed value in f2fs_remount()
Daeho Jeong <[email protected]>
f2fs: turn back remapped address in compressed page endio
Jaegeuk Kim <[email protected]>
f2fs: do not submit NEW_ADDR to read node block
Jaehyoung Choi <[email protected]>
pinctrl: samsung: Fix pinctrl bank pin count
Colin Ian King <[email protected]>
scsi: BusLogic: Use %X for u32 sized integer rather than %lX
Leon Romanovsky <[email protected]>
docs: Fix infiniband uverbs minor number
Leon Romanovsky <[email protected]>
RDMA/iwcm: Release resources if iw_cm module initialization fails
Mike Marciniszyn <[email protected]>
IB/hfi1: Adjust pkey entry in index 0
Peter Geis <[email protected]>
clk: rockchip: drop GRF dependency for rk3328/rk3036 pll types
Christoph Hellwig <[email protected]>
scsi: bsg: Remove support for SCSI_IOCTL_SEND_COMMAND
Marek Behún <[email protected]>
pinctrl: armada-37xx: Correct PWM pins definitions
Chao Yu <[email protected]>
f2fs: quota: fix potential deadlock
Lad Prabhakar <[email protected]>
clk: renesas: rzg2l: Fix off-by-one check in rzg2l_cpg_clk_src_twocell_get()
Dmitry Torokhov <[email protected]>
HID: input: do not report stylus battery state as "full"
Jack Wang <[email protected]>
RDMA/rtrs: Move sq_wr_avail to rtrs_con
Jack Wang <[email protected]>
RDMA/rtrs: Enable the same selective signal for heartbeat and IO
Jack Wang <[email protected]>
RDMA/rtrs: move wr_cnt from rtrs_srv_con to rtrs_con
Chao Yu <[email protected]>
f2fs: compress: fix to set zstd compress level correctly
Pali Rohár <[email protected]>
PCI: aardvark: Fix masking and unmasking legacy INTx interrupts
Pali Rohár <[email protected]>
PCI: aardvark: Increase polling delay to 1.5s while waiting for PIO response
Evan Wang <[email protected]>
PCI: aardvark: Fix checking for PIO status
Pali Rohár <[email protected]>
PCI: aardvark: Configure PCIe resources from 'ranges' DT property
Hyun Kwon <[email protected]>
PCI: xilinx-nwl: Enable the clock through CCF
Krzysztof Wilczyński <[email protected]>
PCI: Return ~0 data on pciconfig_read() CAP_SYS_ADMIN failure
Marek Behún <[email protected]>
PCI: Restrict ASMedia ASM1062 SATA Max Payload Size Supported
Stuart Hayes <[email protected]>
PCI/portdrv: Enable Bandwidth Notification only if port supports it
Chao Yu <[email protected]>
f2fs: fix to do sanity check for sb/cp fields correctly
Jaegeuk Kim <[email protected]>
f2fs: let's keep writing IOs on SBI_NEED_FSCK
Thomas Gleixner <[email protected]>
sched: Prevent balance_push() on remote runqueues
David Heidelberg <[email protected]>
ARM: 9105/1: atags_to_fdt: don't warn about stack size
Hans de Goede <[email protected]>
libata: add ATA_HORKAGE_NO_NCQ_TRIM for Samsung 860 and 870 SSDs
Jan Kiszka <[email protected]>
watchdog: iTCO_wdt: Fix detection of SMI-off case
Robin Gong <[email protected]>
dmaengine: imx-sdma: remove duplicated sdma_load_context
Robin Gong <[email protected]>
Revert "dmaengine: imx-sdma: refine to load context only once"
Julian Wiedmann <[email protected]>
s390/qdio: cancel the ESTABLISH ccw after timeout
Julian Wiedmann <[email protected]>
s390/qdio: fix roll-back after timeout on ESTABLISH ccw
Srinivas Kandagatla <[email protected]>
nvmem: core: fix error handling while validating keepout regions
Sean Young <[email protected]>
media: rc-loopback: return number of emitters rather than error
Mauro Carvalho Chehab <[email protected]>
media: uvc: don't do DMA on stack
Wang Hai <[email protected]>
VMCI: fix NULL pointer dereference when unmapping queue pair
Eddie James <[email protected]>
spi: fsi: Reduce max transfer size to 8 bytes
Brijesh Singh <[email protected]>
crypto: ccp - shutdown SEV firmware on kexec
Arne Welzel <[email protected]>
dm crypt: Avoid percpu_counter spinlock contention in crypt_page_alloc()
Kevin Hao <[email protected]>
cpufreq: schedutil: Use kobject release() method to free sugov_tunables
Krzysztof Kozlowski <[email protected]>
power: supply: max17042: handle fails of reading status register
Damien Le Moal <[email protected]>
block: bfq: fix bfq_set_next_ioprio_data()
zhenwei pi <[email protected]>
crypto: public_key: fix overflow during implicit conversion
Joseph Gates <[email protected]>
wcn36xx: Ensure finish scan is not requested before start scan
Nuno Sá <[email protected]>
iio: ltc2983: fix device probe
Alexandru Elisei <[email protected]>
arm64: Do not trap PMSNEVFR_EL1
Mark Rutland <[email protected]>
arm64: head: avoid over-mapping in map_memory
Will Deacon <[email protected]>
arm64: mm: Fix TLBI vs ASID rollover
Marc Zyngier <[email protected]>
arm64: Move .hyp.rodata outside of the _sdata.._edata range
Iwona Winiarska <[email protected]>
soc: aspeed: p2a-ctrl: Fix boundary check for mmap
Iwona Winiarska <[email protected]>
soc: aspeed: lpc-ctrl: Fix boundary check for mmap
Manivannan Sadhasivam <[email protected]>
soc: qcom: aoss: Fix the out of bound usage of cooling_devs
Enric Balletbo i Serra <[email protected]>
soc: mediatek: mmsys: Fix missing UFOE component in mt8173 table routing
Paul Cercueil <[email protected]>
pinctrl: ingenic: Fix bias config for X2000(E)
Paul Cercueil <[email protected]>
pinctrl: ingenic: Fix incorrect pull up/down info
Marc Zyngier <[email protected]>
pinctrl: stmfx: Fix hazardous u8[] to unsigned long cast
Dinh Nguyen <[email protected]>
clk: socfpga: agilex: add the bypass register for s2f_usr0 clock
Dinh Nguyen <[email protected]>
clk: socfpga: agilex: fix up s2f_user0_clk representation
Dinh Nguyen <[email protected]>
clk: socfpga: agilex: fix the parents of the psi_ref_clk
Rolf Eike Beer <[email protected]>
tools/thermal/tmon: Add cross compiling support
Steven Rostedt (VMware) <[email protected]>
selftests/ftrace: Fix requirement check of README file
jingle.wu <[email protected]>
Input: elan_i2c - reduce the resume time for controller in Whitebox
Colin Ian King <[email protected]>
ceph: fix dereference of null pointer cf
Harshvardhan Jha <[email protected]>
9p/xen: Fix end of loop tests for list_for_each_entry
Juergen Gross <[email protected]>
xen: fix setting of max_pfn in shared_info
Kajol Jain <[email protected]>
powerpc/perf/hv-gpci: Fix counter value parsing
Niklas Cassel <[email protected]>
blk-zoned: allow BLKREPORTZONE without CAP_SYS_ADMIN
Niklas Cassel <[email protected]>
blk-zoned: allow zone management send operations without CAP_SYS_ADMIN
Naohiro Aota <[email protected]>
btrfs: zoned: fix double counting of split ordered extent
Desmond Cheong Zhi Xi <[email protected]>
btrfs: reset replace target device to allocation state on close
Anand Jain <[email protected]>
btrfs: fix upper limit for max_inline for page size 64K
Naohiro Aota <[email protected]>
btrfs: zoned: suppress reclaim error message on EAGAIN
Naohiro Aota <[email protected]>
btrfs: zoned: fix block group alloc_offset calculation
Josef Bacik <[email protected]>
btrfs: do not do preemptive flushing if the majority is global rsv
Josef Bacik <[email protected]>
btrfs: reduce the preemptive flushing threshold to 90%
Josef Bacik <[email protected]>
btrfs: wait on async extents when flushing delalloc
Josef Bacik <[email protected]>
btrfs: wake up async_delalloc_pages waiters after submit
Josef Bacik <[email protected]>
btrfs: use delalloc_bytes to determine flush amount for shrink_delalloc
Jens Axboe <[email protected]>
io-wq: fix race between adding work and activating a free worker
Jens Axboe <[email protected]>
io-wq: fix wakeup race when adding new work
Pavel Begunkov <[email protected]>
io_uring: fix io_try_cancel_userdata race for iowq
Pavel Begunkov <[email protected]>
io_uring: add ->splice_fd_in checks
Pavel Begunkov <[email protected]>
io_uring: place fixed tables under memcg limits
Dmitry Osipenko <[email protected]>
rtc: tps65910: Correct driver module alias
Randy Dunlap <[email protected]>
Makefile: use -Wno-main in the full kernel tree
-------------
Diffstat:
Documentation/admin-guide/devices.txt | 6 +- .../bindings/display/panel/samsung,lms397kf04.yaml | 18 +- .../pinctrl/marvell,armada-37xx-pinctrl.txt | 8 +- Documentation/filesystems/f2fs.rst | 1 + Makefile | 11 +- arch/arm/boot/compressed/Makefile | 2 + arch/arm/boot/dts/at91-kizbox3_common.dtsi | 2 +- arch/arm/boot/dts/at91-sam9x60ek.dts | 2 +- arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 2 +- arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts | 2 +- arch/arm/boot/dts/at91-sama5d2_icp.dts | 2 +- arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts | 2 +- arch/arm/boot/dts/at91-sama5d2_xplained.dts | 2 +- arch/arm/boot/dts/imx53-ppd.dts | 23 +- arch/arm/boot/dts/intel-ixp42x-linksys-nslu2.dts | 24 +- .../arm/boot/dts/intel-ixp43x-gateworks-gw2358.dts | 48 ++-- arch/arm/boot/dts/qcom-apq8064.dtsi | 6 +- arch/arm/boot/dts/stm32mp15xx-dhcom-pdk2.dtsi | 8 +- arch/arm/boot/dts/stm32mp15xx-dhcor-avenger96.dtsi | 6 +- arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 8 +- arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 25 +- arch/arm/boot/dts/tegra20-tamonten.dtsi | 14 +- .../boot/dts/allwinner/sun50i-h6-tanix-tx6.dts | 4 +- arch/arm64/boot/dts/freescale/fsl-ls1046a-frwy.dts | 8 +- arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 7 +- .../boot/dts/freescale/imx8mm-venice-gw700x.dtsi | 64 ++--- .../boot/dts/freescale/imx8mm-venice-gw71xx.dtsi | 5 +- arch/arm64/boot/dts/nvidia/tegra132.dtsi | 4 +- arch/arm64/boot/dts/nvidia/tegra194.dtsi | 6 +- arch/arm64/boot/dts/qcom/ipq6018.dtsi | 2 +- arch/arm64/boot/dts/qcom/ipq8074-hk01.dts | 2 +- arch/arm64/boot/dts/qcom/ipq8074.dtsi | 16 +- arch/arm64/boot/dts/qcom/msm8994.dtsi | 6 +- arch/arm64/boot/dts/qcom/msm8996.dtsi | 4 +- arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 60 ++++- arch/arm64/boot/dts/qcom/sdm630.dtsi | 257 ++++++++++++-------- arch/arm64/boot/dts/qcom/sm8250.dtsi | 2 +- arch/arm64/include/asm/el2_setup.h | 13 +- arch/arm64/include/asm/kernel-pgtable.h | 4 +- arch/arm64/include/asm/mmu.h | 29 ++- arch/arm64/include/asm/tlbflush.h | 11 +- arch/arm64/kernel/head.S | 11 +- arch/arm64/kernel/vmlinux.lds.S | 4 +- arch/m68k/Kconfig.bus | 2 +- arch/mips/mti-malta/malta-dtshim.c | 2 +- arch/openrisc/kernel/entry.S | 2 + arch/parisc/Makefile | 6 +- arch/parisc/kernel/signal.c | 6 + arch/powerpc/configs/mpc885_ads_defconfig | 3 +- arch/powerpc/include/asm/pmc.h | 7 + arch/powerpc/kernel/smp.c | 13 +- arch/powerpc/kernel/stacktrace.c | 1 + arch/powerpc/kvm/book3s_64_mmu_radix.c | 6 +- arch/powerpc/kvm/book3s_64_vio_hv.c | 9 +- arch/powerpc/kvm/book3s_hv.c | 20 ++ arch/powerpc/mm/numa.c | 13 +- arch/powerpc/perf/core-book3s.c | 12 +- arch/powerpc/perf/hv-gpci.c | 2 +- arch/s390/include/asm/setup.h | 2 + arch/s390/include/asm/smp.h | 1 + arch/s390/kernel/early.c | 4 + arch/s390/kernel/jump_label.c | 2 +- arch/s390/kernel/smp.c | 9 +- arch/s390/kernel/topology.c | 13 +- arch/s390/mm/init.c | 2 +- arch/s390/pci/pci.c | 5 +- arch/x86/kernel/cpu/mshyperv.c | 9 +- arch/x86/xen/p2m.c | 4 +- arch/xtensa/platforms/iss/console.c | 17 +- block/bfq-iosched.c | 2 +- block/blk-zoned.c | 6 - block/bsg.c | 5 +- drivers/ata/libata-core.c | 4 + drivers/ata/sata_dwc_460ex.c | 12 +- drivers/base/core.c | 2 + drivers/bus/fsl-mc/fsl-mc-bus.c | 26 +- drivers/clk/at91/clk-generated.c | 6 + drivers/clk/imx/clk-composite-8m.c | 3 +- drivers/clk/imx/clk-imx8mm.c | 11 +- drivers/clk/imx/clk-imx8mn.c | 7 +- drivers/clk/imx/clk-imx8mq.c | 7 +- drivers/clk/imx/clk.h | 16 +- drivers/clk/ralink/clk-mt7621.c | 9 +- drivers/clk/renesas/renesas-rzg2l-cpg.c | 2 +- drivers/clk/rockchip/clk-pll.c | 2 +- drivers/clk/socfpga/clk-agilex.c | 19 +- drivers/cpufreq/powernv-cpufreq.c | 16 +- drivers/cpuidle/cpuidle-pseries.c | 18 +- drivers/crypto/ccp/sev-dev.c | 49 ++-- drivers/crypto/ccp/sp-pci.c | 12 + drivers/crypto/mxs-dcp.c | 36 +-- drivers/dma-buf/dma-resv.c | 33 +-- drivers/dma/imx-sdma.c | 13 +- drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 23 +- drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 16 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 2 +- drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 2 +- drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 2 +- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 84 +++++-- drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 1 + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 3 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 +- .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 16 +- drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 4 +- .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 38 ++- drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 14 +- .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 2 +- .../gpu/drm/amd/display/dc/dcn30/dcn30_dwb_cm.c | 90 +++++-- drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 37 +-- .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 42 +++- drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 5 +- drivers/gpu/drm/ast/ast_drv.h | 6 + drivers/gpu/drm/ast/ast_main.c | 5 + drivers/gpu/drm/ast/ast_post.c | 91 +++++-- drivers/gpu/drm/bridge/nwl-dsi.c | 2 +- drivers/gpu/drm/drm_auth.c | 42 +++- drivers/gpu/drm/drm_debugfs.c | 3 +- drivers/gpu/drm/drm_dp_mst_topology.c | 10 +- drivers/gpu/drm/drm_file.c | 1 + drivers/gpu/drm/drm_lease.c | 81 +++++-- drivers/gpu/drm/exynos/exynos_drm_dma.c | 2 + drivers/gpu/drm/mgag200/mgag200_drv.h | 16 ++ drivers/gpu/drm/mgag200/mgag200_mode.c | 20 +- drivers/gpu/drm/mgag200/mgag200_reg.h | 9 +- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 46 ++-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 5 + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 17 +- drivers/gpu/drm/msm/dp/dp_aux.c | 3 + drivers/gpu/drm/msm/dp/dp_ctrl.c | 134 +++++++---- drivers/gpu/drm/msm/dp/dp_panel.c | 9 +- drivers/gpu/drm/msm/dsi/dsi_cfg.c | 1 - drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 2 +- drivers/gpu/drm/omapdrm/omap_plane.c | 3 + drivers/gpu/drm/panfrost/panfrost_device.h | 8 +- drivers/gpu/drm/panfrost/panfrost_drv.c | 50 +--- drivers/gpu/drm/panfrost/panfrost_gem.c | 20 +- drivers/gpu/drm/panfrost/panfrost_job.c | 4 +- drivers/gpu/drm/panfrost/panfrost_mmu.c | 191 +++++++++------ drivers/gpu/drm/panfrost/panfrost_mmu.h | 5 +- drivers/gpu/drm/panfrost/panfrost_regs.h | 2 + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 8 + drivers/gpu/drm/ttm/ttm_bo.c | 63 ++--- drivers/gpu/drm/ttm/ttm_bo_util.c | 7 +- drivers/gpu/drm/vc4/vc4_hdmi.c | 19 +- drivers/gpu/drm/vkms/vkms_plane.c | 38 +-- drivers/gpu/drm/vmwgfx/ttm_memory.c | 2 + drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 20 +- drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 + drivers/gpu/drm/vmwgfx/vmwgfx_mob.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 6 +- drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 8 +- drivers/gpu/drm/vmwgfx/vmwgfx_so.c | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 9 +- drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 4 +- drivers/gpu/drm/xlnx/zynqmp_disp.c | 3 +- drivers/gpu/drm/xlnx/zynqmp_dp.c | 22 +- drivers/hid/Makefile | 1 - drivers/hid/amd-sfh-hid/amd_sfh_client.c | 2 +- drivers/hid/hid-input.c | 2 - drivers/hid/hid-quirks.c | 2 - drivers/hid/i2c-hid/i2c-hid-core.c | 5 +- drivers/hwmon/pmbus/ibm-cffps.c | 6 +- drivers/iio/dac/ad5624r_spi.c | 18 +- drivers/iio/temperature/ltc2983.c | 30 ++- drivers/infiniband/core/iwcm.c | 19 +- drivers/infiniband/hw/efa/efa_verbs.c | 1 - drivers/infiniband/hw/hfi1/init.c | 7 +- drivers/infiniband/hw/hns/hns_roce_device.h | 9 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 21 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 2 +- drivers/infiniband/hw/hns/hns_roce_main.c | 8 +- drivers/infiniband/hw/hns/hns_roce_mr.c | 4 +- drivers/infiniband/hw/hns/hns_roce_qp.c | 21 +- drivers/infiniband/hw/mlx5/qp.c | 3 - drivers/infiniband/ulp/rtrs/rtrs-clt.c | 11 +- drivers/infiniband/ulp/rtrs/rtrs-clt.h | 1 - drivers/infiniband/ulp/rtrs/rtrs-pri.h | 3 + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 19 +- drivers/infiniband/ulp/rtrs/rtrs-srv.h | 2 - drivers/infiniband/ulp/rtrs/rtrs.c | 8 +- drivers/input/mouse/elan_i2c.h | 3 +- drivers/input/mouse/elan_i2c_core.c | 1 + drivers/iommu/intel/pasid.h | 10 +- drivers/mailbox/mtk-cmdq-mailbox.c | 3 +- drivers/md/dm-crypt.c | 7 +- drivers/media/cec/platform/stm32/stm32-cec.c | 26 +- drivers/media/cec/platform/tegra/tegra_cec.c | 10 +- drivers/media/dvb-frontends/dib8000.c | 58 +++-- drivers/media/i2c/imx258.c | 4 +- drivers/media/i2c/tda1997x.c | 5 +- drivers/media/platform/ti-vpe/cal-camerarx.c | 4 +- drivers/media/platform/ti-vpe/cal-video.c | 2 +- drivers/media/rc/rc-loopback.c | 2 +- drivers/media/usb/uvc/uvc_v4l2.c | 34 ++- drivers/media/v4l2-core/v4l2-dv-timings.c | 4 +- drivers/misc/pvpanic/pvpanic-pci.c | 2 + drivers/misc/sram.c | 103 +++++--- drivers/misc/sram.h | 9 + drivers/misc/vmw_vmci/vmci_queue_pair.c | 6 +- drivers/mmc/core/block.c | 77 +++--- drivers/mmc/core/mmc_ops.c | 5 +- drivers/mmc/core/mmc_ops.h | 1 + drivers/mmc/host/rtsx_pci_sdmmc.c | 36 ++- drivers/mmc/host/sdhci-of-arasan.c | 36 ++- drivers/mtd/nand/raw/intel-nand-controller.c | 27 ++- drivers/net/bonding/bond_main.c | 3 +- drivers/net/dsa/lantiq_gswip.c | 3 +- .../net/ethernet/freescale/dpaa2/dpaa2-switch.c | 6 - .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 9 +- drivers/net/ethernet/intel/iavf/iavf.h | 9 +- drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 10 +- drivers/net/ethernet/intel/iavf/iavf_main.c | 122 ++++++---- drivers/net/ethernet/intel/igc/igc_main.c | 9 +- drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 1 + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 9 +- .../ethernet/marvell/octeontx2/nic/otx2_common.c | 38 ++- .../ethernet/marvell/octeontx2/nic/otx2_common.h | 1 + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 8 +- .../ethernet/mellanox/mlx5/core/steering/dr_rule.c | 2 +- .../ethernet/mellanox/mlx5/core/steering/dr_send.c | 1 + .../net/ethernet/netronome/nfp/nfp_net_common.c | 2 +- .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 18 +- drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 10 +- drivers/net/ethernet/wiznet/w5100.c | 2 + drivers/net/ipa/ipa_cmd.c | 38 ++- drivers/net/ipa/ipa_cmd.h | 15 +- drivers/net/ipa/ipa_data-v4.11.c | 13 +- drivers/net/ipa/ipa_data-v4.9.c | 9 +- drivers/net/ipa/ipa_table.c | 38 ++- drivers/net/ipa/ipa_table.h | 16 -- drivers/net/phy/dp83822.c | 8 +- drivers/net/wireless/ath/ath9k/ar9003_eeprom.c | 3 +- drivers/net/wireless/ath/ath9k/hw.c | 12 +- drivers/net/wireless/ath/wcn36xx/main.c | 5 +- drivers/net/wireless/ath/wcn36xx/txrx.c | 4 + drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 1 + drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 6 +- drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 2 +- drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 4 +- drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 8 +- drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 24 +- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 11 +- drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 30 ++- .../net/wireless/intel/iwlwifi/mvm/time-event.c | 31 ++- drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 5 +- drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 3 + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 2 + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 33 ++- drivers/net/wireless/realtek/rtw88/Makefile | 2 +- drivers/net/wireless/realtek/rtw88/fw.c | 8 +- drivers/net/wireless/realtek/rtw88/fw.h | 1 + drivers/net/wireless/realtek/rtw88/wow.c | 21 +- drivers/nvdimm/pmem.c | 4 +- drivers/nvme/host/core.c | 3 +- drivers/nvme/host/nvme.h | 47 +++- drivers/nvme/host/pci.c | 2 +- drivers/nvme/host/rdma.c | 4 +- drivers/nvme/host/tcp.c | 38 ++- drivers/nvme/target/loop.c | 4 +- drivers/nvmem/core.c | 7 +- drivers/nvmem/qfprom.c | 6 +- drivers/of/kobj.c | 2 +- drivers/opp/of.c | 12 +- drivers/parport/ieee1284_ops.c | 2 +- drivers/pci/controller/pci-aardvark.c | 268 ++++++++++++++++++++- drivers/pci/controller/pcie-xilinx-nwl.c | 12 + drivers/pci/pci.c | 6 +- drivers/pci/pcie/portdrv_core.c | 9 +- drivers/pci/quirks.c | 1 + drivers/pci/syscall.c | 4 +- drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 16 +- drivers/pinctrl/pinctrl-ingenic.c | 12 +- drivers/pinctrl/pinctrl-single.c | 1 + drivers/pinctrl/pinctrl-stmfx.c | 6 +- drivers/pinctrl/samsung/pinctrl-samsung.c | 2 +- drivers/platform/chrome/cros_ec_proto.c | 9 + drivers/platform/x86/dell/dell-smbios-wmi.c | 1 + .../x86/intel_speed_select_if/isst_if_common.c | 3 +- drivers/power/supply/max17042_battery.c | 6 +- drivers/rtc/rtc-tps65910.c | 2 +- drivers/s390/cio/qdio_main.c | 82 ++++--- drivers/scsi/BusLogic.c | 6 +- drivers/scsi/pcmcia/fdomain_cs.c | 4 +- drivers/scsi/qedf/qedf_main.c | 10 +- drivers/scsi/qedi/qedi_main.c | 14 +- drivers/scsi/qla2xxx/qla_nvme.c | 5 +- drivers/scsi/qla2xxx/qla_os.c | 6 + drivers/scsi/smartpqi/smartpqi_init.c | 1 + drivers/scsi/ufs/ufs-exynos.c | 4 +- drivers/scsi/ufs/ufs-exynos.h | 2 +- drivers/scsi/ufs/ufshcd.c | 96 ++++---- drivers/soc/aspeed/aspeed-lpc-ctrl.c | 2 +- drivers/soc/aspeed/aspeed-p2a-ctrl.c | 2 +- drivers/soc/mediatek/mtk-mmsys.h | 4 + drivers/soc/qcom/qcom_aoss.c | 8 +- drivers/soundwire/intel.c | 23 +- drivers/spi/spi-fsi.c | 125 ++-------- drivers/staging/board/board.c | 7 +- .../hikey9xx/hisilicon,hi6421-spmi-pmic.yaml | 6 +- drivers/staging/ks7010/ks7010_sdio.c | 2 +- drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 4 +- drivers/staging/media/hantro/hantro_g1_vp8_dec.c | 13 +- .../media/hantro/rockchip_vpu2_hw_vp8_dec.c | 13 +- drivers/staging/media/imx/imx7-media-csi.c | 15 +- drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 2 +- drivers/staging/rts5208/rtsx_scsi.c | 10 +- drivers/thunderbolt/switch.c | 2 +- drivers/tty/hvc/hvsi.c | 19 +- drivers/tty/serial/8250/8250_omap.c | 25 +- drivers/tty/serial/8250/8250_pci.c | 2 +- drivers/tty/serial/8250/8250_port.c | 3 +- drivers/tty/serial/jsm/jsm_neo.c | 2 + drivers/tty/serial/jsm/jsm_tty.c | 3 + drivers/tty/serial/max310x.c | 15 +- drivers/tty/serial/sh-sci.c | 7 +- drivers/tty/vt/keyboard.c | 30 +-- drivers/usb/chipidea/host.c | 14 +- drivers/usb/dwc3/dwc3-imx8mp.c | 14 +- drivers/usb/gadget/composite.c | 8 +- drivers/usb/gadget/function/u_ether.c | 5 +- drivers/usb/host/ehci-mv.c | 23 +- drivers/usb/host/fotg210-hcd.c | 41 ++-- drivers/usb/host/fotg210.h | 5 - drivers/usb/host/xhci-mtk-sch.c | 100 ++++---- drivers/usb/host/xhci-mtk.c | 2 +- drivers/usb/host/xhci-mtk.h | 11 +- drivers/usb/host/xhci.c | 24 +- drivers/usb/isp1760/isp1760-core.c | 50 ++-- drivers/usb/isp1760/isp1760-hcd.c | 33 +-- drivers/usb/isp1760/isp1760-regs.h | 16 ++ drivers/usb/isp1760/isp1760-udc.c | 12 +- drivers/usb/musb/musb_dsps.c | 13 +- drivers/usb/usbip/vhci_hcd.c | 32 ++- drivers/vfio/Kconfig | 2 +- drivers/video/fbdev/asiliantfb.c | 3 + drivers/video/fbdev/kyro/fbdev.c | 8 + drivers/video/fbdev/riva/fbdev.c | 3 + drivers/watchdog/iTCO_wdt.c | 2 +- fs/btrfs/block-group.c | 2 +- fs/btrfs/ctree.h | 9 +- fs/btrfs/disk-io.c | 48 ++-- fs/btrfs/free-space-cache.c | 7 +- fs/btrfs/inode.c | 26 +- fs/btrfs/ordered-data.c | 8 + fs/btrfs/space-info.c | 96 +++++++- fs/btrfs/tree-log.c | 4 +- fs/btrfs/volumes.c | 3 + fs/ceph/caps.c | 3 + fs/cifs/sess.c | 2 +- fs/f2fs/compress.c | 12 +- fs/f2fs/data.c | 22 +- fs/f2fs/dir.c | 14 +- fs/f2fs/f2fs.h | 4 +- fs/f2fs/file.c | 4 +- fs/f2fs/gc.c | 4 +- fs/f2fs/node.c | 3 +- fs/f2fs/segment.c | 2 +- fs/f2fs/super.c | 113 +++++---- fs/fscache/cookie.c | 14 +- fs/fscache/internal.h | 2 + fs/fscache/main.c | 39 +++ fs/gfs2/glops.c | 17 +- fs/gfs2/lock_dlm.c | 5 + fs/io-wq.c | 50 ++-- fs/io_uring.c | 59 +++-- fs/iomap/buffered-io.c | 2 +- fs/lockd/svclock.c | 30 +-- fs/nfs/export.c | 2 +- fs/nfs/pnfs.c | 16 +- fs/nfsd/nfs4state.c | 13 +- fs/overlayfs/dir.c | 6 +- fs/userfaultfd.c | 91 ++++--- include/crypto/public_key.h | 4 +- include/drm/drm_auth.h | 1 + include/drm/drm_file.h | 18 +- include/linux/ethtool.h | 4 - include/linux/exportfs.h | 2 + include/linux/hugetlb.h | 9 + include/linux/hugetlb_cgroup.h | 12 + include/linux/intel-iommu.h | 6 +- include/linux/memory_hotplug.h | 4 +- include/linux/rcupdate.h | 2 +- include/linux/rtmutex.h | 19 +- include/linux/sunrpc/xprt.h | 1 + include/linux/vt_kern.h | 30 +-- include/net/bluetooth/hci_core.h | 4 + include/net/flow_offload.h | 1 + include/trace/events/btrfs.h | 1 + include/uapi/linux/serial_reg.h | 1 + kernel/dma/debug.c | 7 +- kernel/fork.c | 1 + kernel/locking/rtmutex.c | 2 +- kernel/pid_namespace.c | 3 +- kernel/printk/printk.c | 7 +- kernel/rcu/tree_plugin.h | 8 +- kernel/sched/core.c | 6 +- kernel/sched/cpufreq_schedutil.c | 16 +- kernel/trace/trace_osnoise.c | 6 +- kernel/workqueue.c | 12 +- lib/test_bpf.c | 13 +- lib/test_stackinit.c | 20 +- mm/hmm.c | 5 +- mm/hugetlb.c | 4 +- mm/memory-failure.c | 4 +- mm/memory_hotplug.c | 4 +- mm/mempolicy.c | 17 +- mm/page_alloc.c | 4 +- mm/vmscan.c | 2 +- net/9p/trans_xen.c | 4 +- net/bluetooth/hci_event.c | 150 ++++++++---- net/bluetooth/hci_request.c | 81 +++---- net/bluetooth/sco.c | 74 +++--- net/core/flow_dissector.c | 12 +- net/core/flow_offload.c | 89 ++++++- net/ethtool/ioctl.c | 136 +++++++++-- net/ipv4/ip_output.c | 5 +- net/ipv4/tcp_fastopen.c | 3 +- net/mac80211/iface.c | 11 +- net/netfilter/nf_flow_table_offload.c | 1 + net/netfilter/nf_tables_offload.c | 1 + net/netfilter/nft_compat.c | 8 +- net/netlabel/netlabel_cipso_v4.c | 4 +- net/netlink/af_netlink.c | 4 +- net/sched/cls_api.c | 1 + net/sched/sch_taprio.c | 4 +- net/socket.c | 125 +--------- net/sunrpc/auth_gss/svcauth_gss.c | 2 +- net/sunrpc/xprt.c | 8 +- net/sunrpc/xprtrdma/transport.c | 11 +- net/sunrpc/xprtrdma/verbs.c | 10 +- net/sunrpc/xprtsock.c | 2 +- net/tipc/socket.c | 36 ++- samples/bpf/test_override_return.sh | 1 + samples/bpf/tracex7_user.c | 5 + .../pktgen/pktgen_sample03_burst_single_flow.sh | 6 +- samples/vfio-mdev/mbochs.c | 24 +- scripts/gen_ksymdeps.sh | 8 +- scripts/subarch.include | 2 +- security/smack/smack_access.c | 17 +- sound/soc/atmel/Kconfig | 1 - sound/soc/intel/boards/bytcr_rt5640.c | 9 +- sound/soc/intel/boards/sof_pcm512x.c | 13 +- sound/soc/intel/skylake/skl-messages.c | 11 +- sound/soc/intel/skylake/skl-pcm.c | 25 +- sound/soc/rockchip/rockchip_i2s.c | 35 ++- sound/soc/sh/rcar/adg.c | 12 +- sound/soc/soc-pcm.c | 103 ++++++-- sound/soc/ti/davinci-mcasp.c | 150 ++++++++++-- tools/lib/bpf/libbpf.c | 63 ++++- .../testing/selftests/arm64/mte/mte_common_util.c | 2 +- tools/testing/selftests/arm64/pauth/pac.c | 10 +- .../testing/selftests/bpf/prog_tests/send_signal.c | 16 ++ .../selftests/bpf/prog_tests/sockopt_inherit.c | 4 +- tools/testing/selftests/bpf/progs/xdp_tx.c | 2 +- tools/testing/selftests/bpf/test_maps.c | 2 +- tools/testing/selftests/bpf/test_progs.c | 25 +- tools/testing/selftests/bpf/test_xdp_veth.sh | 2 +- tools/testing/selftests/firmware/fw_namespace.c | 3 +- tools/testing/selftests/ftrace/test.d/functions | 2 +- tools/testing/selftests/nci/nci_dev.c | 6 +- tools/thermal/tmon/Makefile | 2 +- 468 files changed, 4873 insertions(+), 2875 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/432 Makefile: use -Wno-main in the full kernel tree
From: Randy Dunlap <[email protected]>
commit 49832c819ab85b33b7a2a1429c8d067e82be2977 upstream.
When using gcc (SUSE Linux) 7.5.0 (on openSUSE 15.3), I see a build warning:
kernel/trace/trace_osnoise.c: In function 'start_kthread':
kernel/trace/trace_osnoise.c:1461:8: warning: 'main' is usually a function [-Wmain]
void *main = osnoise_main;
^~~~Quieten that warning by using "-Wno-main". It's OK to use "main" as a declaration name in the kernel.
Build-tested on most ARCHes.
[ v2: only do it for gcc, since clang doesn't have that particular warning ]
--- Makefile | 2 ++ 1 file changed, 2 insertions(+)
Makefile +2 -0
@@ -803,6 +803,8 @@ else # Disabled for clang while comment to attribute conversion happens and # https://github.com/ClangBuiltLinux/linux/issues/636 is discussed. KBUILD_CFLAGS += $(call cc-option,-Wimplicit-fallthrough=5,) +# gcc inanely warns about local variables called 'main' +KBUILD_CFLAGS += -Wno-main endif # These warnings generated too much noise in a regular build.
Greg Kroah-Hartman
maintainerPATCH 2/432 rtc: tps65910: Correct driver module alias
In reply to Greg Kroah-HartmanFrom: Dmitry Osipenko <[email protected]>
commit 8d448fa0a8bb1c8d94eef7647edffe9ac81a281e upstream.
The TPS65910 RTC driver module doesn't auto-load because of the wrong module alias that doesn't match the device name, fix it.
--- drivers/rtc/rtc-tps65910.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/rtc/rtc-tps65910.c +1 -1
@@ -467,6 +467,6 @@ static struct platform_driver tps65910_r };module_platform_driver (tps65910_rtc_driver); -MODULE_ALIAS ("platform:rtc-tps65910" ); +MODULE_ALIAS ("platform:tps65910-rtc" );MODULE_AUTHOR ("Venu Byravarasu <[email protected]>" );MODULE_LICENSE ("GPL" );
Greg Kroah-Hartman
maintainerPATCH 3/432 io_uring: place fixed tables under memcg limits
In reply to Greg Kroah-HartmanFrom: Pavel Begunkov <[email protected]>
commit 0bea96f59ba40e63c0ae93ad6a02417b95f22f4d upstream.
Fixed tables may be large enough, place all of them together with allocated tags under memcg limits.
--- fs/io_uring.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/io_uring.c +2 -2
@@ -7126,14 +7126,14 @@ static void **io_alloc_page_table(size_tsize_t init_size = size;void **table; - table =kcalloc (nr_tables,sizeof (*table),GFP_KERNEL ); + table =kcalloc (nr_tables,sizeof (*table),GFP_KERNEL_ACCOUNT );if (!table)return NULL ;for (i =0 ; i < nr_tables; i++) {unsigned int this_size =min_t (size_t, size,PAGE_SIZE ); - table[i] =kzalloc (this_size,GFP_KERNEL ); + table[i] =kzalloc (this_size,GFP_KERNEL_ACCOUNT );if (!table[i]) {io_free_page_table (table, init_size);return NULL ;
Greg Kroah-Hartman
maintainerPATCH 4/432 io_uring: add ->splice_fd_in checks
In reply to Greg Kroah-HartmanFrom: Pavel Begunkov <[email protected]>
commit 26578cda3db983b17cabe4e577af26306beb9987 upstream.
->splice_fd_in is used only by splice/tee, but no other request checks it for validity. Add the check for most of request types excluding reads/writes/sends/recvs, we don't want overhead for them and can leave them be as is until the field is actually used.
--- fs/io_uring.c | 52 ++++++++++++++++++++++++++++++---------------------- 1 file changed, 30 insertions(+), 22 deletions(-)
fs/io_uring.c +30 -22
@@ -3484,7 +3484,7 @@ static int io_renameat_prep(struct io_kiif (unlikely (req->ctx->flags &IORING_SETUP_IOPOLL ))return -EINVAL ; -if (sqe->ioprio || sqe->buf_index) +if (sqe->ioprio || sqe->buf_index || sqe->splice_fd_in)return -EINVAL ;if (unlikely (req->flags &REQ_F_FIXED_FILE ))return -EBADF ;
@@ -3535,7 +3535,8 @@ static int io_unlinkat_prep(struct io_kiif (unlikely (req->ctx->flags &IORING_SETUP_IOPOLL ))return -EINVAL ; -if (sqe->ioprio || sqe->off || sqe->len || sqe->buf_index) +if (sqe->ioprio || sqe->off || sqe->len || sqe->buf_index || + sqe->splice_fd_in)return -EINVAL ;if (unlikely (req->flags &REQ_F_FIXED_FILE ))return -EBADF ;
@@ -3581,8 +3582,8 @@ static int io_shutdown_prep(struct io_ki#if defined(CONFIG_NET )if (unlikely (req->ctx->flags &IORING_SETUP_IOPOLL ))return -EINVAL ; -if (sqe->ioprio || sqe->off || sqe->addr || sqe->rw_flags || - sqe->buf_index) +if (unlikely (sqe->ioprio || sqe->off || sqe->addr || sqe->rw_flags || + sqe->buf_index || sqe->splice_fd_in))return -EINVAL ; req->shutdown.how =READ_ONCE (sqe->len);
@@ -3730,7 +3731,8 @@ static int io_fsync_prep(struct io_kiocbif (unlikely (ctx->flags &IORING_SETUP_IOPOLL ))return -EINVAL ; -if (unlikely (sqe->addr || sqe->ioprio || sqe->buf_index)) +if (unlikely (sqe->addr || sqe->ioprio || sqe->buf_index || + sqe->splice_fd_in))return -EINVAL ; req->sync.flags =READ_ONCE (sqe->fsync_flags);
@@ -3763,7 +3765,8 @@ static int io_fsync(struct io_kiocb *reqstatic int io_fallocate_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -if (sqe->ioprio || sqe->buf_index || sqe->rw_flags) +if (sqe->ioprio || sqe->buf_index || sqe->rw_flags || + sqe->splice_fd_in)return -EINVAL ;if (unlikely (req->ctx->flags &IORING_SETUP_IOPOLL ))return -EINVAL ;
@@ -3794,7 +3797,7 @@ static int __io_openat_prep(struct io_kiconst char __user *fname;int ret; -if (unlikely (sqe->ioprio || sqe->buf_index)) +if (unlikely (sqe->ioprio || sqe->buf_index || sqe->splice_fd_in))return -EINVAL ;if (unlikely (req->flags &REQ_F_FIXED_FILE ))return -EBADF ;
@@ -3918,7 +3921,8 @@ static int io_remove_buffers_prep(structstruct io_provide_buf *p = &req->pbuf;u64 tmp; -if (sqe->ioprio || sqe->rw_flags || sqe->addr || sqe->len || sqe->off) +if (sqe->ioprio || sqe->rw_flags || sqe->addr || sqe->len || sqe->off || + sqe->splice_fd_in)return -EINVAL ; tmp =READ_ONCE (sqe->fd);
@@ -3989,7 +3993,7 @@ static int io_provide_buffers_prep(strucstruct io_provide_buf *p = &req->pbuf;u64 tmp; -if (sqe->ioprio || sqe->rw_flags) +if (sqe->ioprio || sqe->rw_flags || sqe->splice_fd_in)return -EINVAL ; tmp =READ_ONCE (sqe->fd);
@@ -4076,7 +4080,7 @@ static int io_epoll_ctl_prep(struct io_k const struct io_uring_sqe *sqe) {#if defined(CONFIG_EPOLL ) -if (sqe->ioprio || sqe->buf_index) +if (sqe->ioprio || sqe->buf_index || sqe->splice_fd_in)return -EINVAL ;if (unlikely (req->ctx->flags &IORING_SETUP_IOPOLL ))return -EINVAL ;
@@ -4122,7 +4126,7 @@ static int io_epoll_ctl(struct io_kiocbstatic int io_madvise_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) {#if defined(CONFIG_ADVISE_SYSCALLS ) && defined(CONFIG_MMU ) -if (sqe->ioprio || sqe->buf_index || sqe->off) +if (sqe->ioprio || sqe->buf_index || sqe->off || sqe->splice_fd_in)return -EINVAL ;if (unlikely (req->ctx->flags &IORING_SETUP_IOPOLL ))return -EINVAL ;
@@ -4157,7 +4161,7 @@ static int io_madvise(struct io_kiocb *rstatic int io_fadvise_prep (struct io_kiocb *req,const struct io_uring_sqe *sqe) { -if (sqe->ioprio || sqe->buf_index || sqe->addr) +if (sqe->ioprio || sqe->buf_index || sqe->addr || sqe->splice_fd_in)return -EINVAL ;if (unlikely (req->ctx->flags &IORING_SETUP_IOPOLL ))return -EINVAL ;
@@ -4195,7 +4199,7 @@ static int io_statx_prep(struct io_kiocb {if (unlikely (req->ctx->flags &IORING_SETUP_IOPOLL ))return -EINVAL ; -if (sqe->ioprio || sqe->buf_index) +if (sqe->ioprio || sqe->buf_index || sqe->splice_fd_in)return -EINVAL ;if (req->flags &REQ_F_FIXED_FILE )return -EBADF ;
@@ -4231,7 +4235,7 @@ static int io_close_prep(struct io_kiocbif (unlikely (req->ctx->flags &IORING_SETUP_IOPOLL ))return -EINVAL ;if (sqe->ioprio || sqe->off || sqe->addr || sqe->len || - sqe->rw_flags || sqe->buf_index) + sqe->rw_flags || sqe->buf_index || sqe->splice_fd_in)return -EINVAL ;if (req->flags &REQ_F_FIXED_FILE )return -EBADF ;
@@ -4292,7 +4296,8 @@ static int io_sfr_prep(struct io_kiocb *if (unlikely (ctx->flags &IORING_SETUP_IOPOLL ))return -EINVAL ; -if (unlikely (sqe->addr || sqe->ioprio || sqe->buf_index)) +if (unlikely (sqe->addr || sqe->ioprio || sqe->buf_index || + sqe->splice_fd_in))return -EINVAL ; req->sync.off =READ_ONCE (sqe->off);
@@ -4719,7 +4724,7 @@ static int io_accept_prep(struct io_kiocif (unlikely (req->ctx->flags &IORING_SETUP_IOPOLL ))return -EINVAL ; -if (sqe->ioprio || sqe->len || sqe->buf_index) +if (sqe->ioprio || sqe->len || sqe->buf_index || sqe->splice_fd_in)return -EINVAL ; accept->addr =u64_to_user_ptr (READ_ONCE (sqe->addr));
@@ -4767,7 +4772,8 @@ static int io_connect_prep(struct io_kioif (unlikely (req->ctx->flags &IORING_SETUP_IOPOLL ))return -EINVAL ; -if (sqe->ioprio || sqe->len || sqe->buf_index || sqe->rw_flags) +if (sqe->ioprio || sqe->len || sqe->buf_index || sqe->rw_flags || + sqe->splice_fd_in)return -EINVAL ; conn->addr =u64_to_user_ptr (READ_ONCE (sqe->addr));
@@ -5375,7 +5381,7 @@ static int io_poll_update_prep(struct ioif (unlikely (req->ctx->flags &IORING_SETUP_IOPOLL ))return -EINVAL ; -if (sqe->ioprio || sqe->buf_index) +if (sqe->ioprio || sqe->buf_index || sqe->splice_fd_in)return -EINVAL ; flags =READ_ONCE (sqe->len); if (flags & ~(IORING_POLL_UPDATE_EVENTS | IORING_POLL_UPDATE_USER_DATA |
@@ -5610,7 +5616,7 @@ static int io_timeout_remove_prep(structreturn -EINVAL ;if (unlikely (req->flags & (REQ_F_FIXED_FILE |REQ_F_BUFFER_SELECT )))return -EINVAL ; -if (sqe->ioprio || sqe->buf_index || sqe->len) +if (sqe->ioprio || sqe->buf_index || sqe->len || sqe->splice_fd_in)return -EINVAL ; tr->addr =READ_ONCE (sqe->addr);
@@ -5669,7 +5675,8 @@ static int io_timeout_prep(struct io_kioif (unlikely (req->ctx->flags &IORING_SETUP_IOPOLL ))return -EINVAL ; -if (sqe->ioprio || sqe->buf_index || sqe->len !=1 ) +if (sqe->ioprio || sqe->buf_index || sqe->len !=1 || + sqe->splice_fd_in)return -EINVAL ;if (off && is_timeout_link)return -EINVAL ;
@@ -5820,7 +5827,8 @@ static int io_async_cancel_prep(struct ireturn -EINVAL ;if (unlikely (req->flags & (REQ_F_FIXED_FILE |REQ_F_BUFFER_SELECT )))return -EINVAL ; -if (sqe->ioprio || sqe->off || sqe->len || sqe->cancel_flags) +if (sqe->ioprio || sqe->off || sqe->len || sqe->cancel_flags || + sqe->splice_fd_in)return -EINVAL ; req->cancel.addr =READ_ONCE (sqe->addr);
@@ -5877,7 +5885,7 @@ static int io_rsrc_update_prep(struct io {if (unlikely (req->flags & (REQ_F_FIXED_FILE |REQ_F_BUFFER_SELECT )))return -EINVAL ; -if (sqe->ioprio || sqe->rw_flags) +if (sqe->ioprio || sqe->rw_flags || sqe->splice_fd_in)return -EINVAL ; req->rsrc_update.offset =READ_ONCE (sqe->off);
Greg Kroah-Hartman
maintainerPATCH 5/432 io_uring: fix io_try_cancel_userdata race for iowq
In reply to Greg Kroah-HartmanFrom: Pavel Begunkov <[email protected]>
commit dadebc350da2bef62593b1df007a6e0b90baf42a upstream.
WARNING: CPU: 1 PID: 5870 at fs/io_uring.c:5975 io_try_cancel_userdata+0x30f/0x540 fs/io_uring.c:5975 CPU: 0 PID: 5870 Comm: iou-wrk-5860 Not tainted 5.14.0-rc6-next-20210820-syzkaller #0 Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 01/01/2011 RIP: 0010:io_try_cancel_userdata+0x30f/0x540 fs/io_uring.c:5975 Call Trace: io_async_cancel fs/io_uring.c:6014 [inline] io_issue_sqe+0x22d5/0x65a0 fs/io_uring.c:6407 io_wq_submit_work+0x1dc/0x300 fs/io_uring.c:6511 io_worker_handle_work+0xa45/0x1840 fs/io-wq.c:533 io_wqe_worker+0x2cc/0xbb0 fs/io-wq.c:582 ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:295
io_try_cancel_userdata() can be called from io_async_cancel() executing in the io-wq context, so the warning fires, which is there to alert anyone accessing task->io_uring->io_wq in a racy way. However, io_wq_put_and_exit() always first waits for all threads to complete, so the only detail left is to zero tctx->io_wq after the context is removed.
note: one little assumption is that when IO_WQ_WORK_CANCEL, the executor won't touch ->io_wq, because io_wq_destroy() might cancel left pending requests in such a way.
--- fs/io_uring.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/io_uring.c +2 -1
@@ -6310,6 +6310,7 @@ static void io_wq_submit_work(struct io_if (timeout)io_queue_linked_timeout (timeout); +/* either cancelled or io-wq is dying, so don't touch tctx->iowq */ if (work->flags &IO_WQ_WORK_CANCEL ) ret = -ECANCELED ;
@@ -9137,8 +9138,8 @@ static void io_uring_clean_tctx(struct i* Must be after io_uring_del_task_file() (removes nodes under * uring_lock) to avoid race with io_uring_try_cancel_iowq(). */ - tctx->io_wq =NULL ;io_wq_put_and_exit (wq); + tctx->io_wq =NULL ; } }
Greg Kroah-Hartman
maintainerPATCH 6/432 io-wq: fix wakeup race when adding new work
In reply to Greg Kroah-HartmanFrom: Jens Axboe <[email protected]>
commit 87df7fb922d18e96992aa5e824aa34b2065fef59 upstream.
When new work is added, io_wqe_enqueue() checks if we need to wake or create a new worker. But that check is done outside the lock that otherwise synchronizes us with a worker going to sleep, so we can end up in the following situation:
CPU0 CPU1
lock
insert work
unlockatomic_read(nr_running) != 0
lock atomic_dec(nr_running)
no wakeup needed
Hold the wqe lock around the "need to wakeup" check. Then we can also get rid of the temporary work_flags variable, as we know the work will remain valid as long as we hold the lock.
--- fs/io-wq.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
fs/io-wq.c +4 -4
@@ -793,7 +793,7 @@ append:static void io_wqe_enqueue (struct io_wqe *wqe,struct io_wq_work *work) {struct io_wqe_acct *acct =io_work_get_acct (wqe, work); -int work_flags; +bool do_wake;unsigned long flags;/*
@@ -806,14 +806,14 @@ static void io_wqe_enqueue(struct io_wqereturn ; } - work_flags = work->flags;raw_spin_lock_irqsave (&wqe->lock, flags);io_wqe_insert_work (wqe, work); wqe->flags &= ~IO_WQE_FLAG_STALLED ; + do_wake = (work->flags &IO_WQ_WORK_CONCURRENT ) || + !atomic_read (&acct->nr_running);raw_spin_unlock_irqrestore (&wqe->lock, flags); -if ((work_flags &IO_WQ_WORK_CONCURRENT ) || - !atomic_read (&acct->nr_running)) +if (do_wake)io_wqe_wake_worker (wqe, acct); }
Greg Kroah-Hartman
maintainerPATCH 7/432 io-wq: fix race between adding work and activating a free worker
In reply to Greg Kroah-HartmanFrom: Jens Axboe <[email protected]>
commit 94ffb0a282872c2f4b14f757fa1aef2302aeaabb upstream.
The attempt to find and activate a free worker for new work is currently combined with creating a new one if we don't find one, but that opens io-wq up to a race where the worker that is found and activated can put itself to sleep without knowing that it has been selected to perform this new work.
Fix this by moving the activation into where we add the new work item, then we can retain it within the wqe->lock scope and elimiate the race with the worker itself checking inside the lock, but sleeping outside of it.
--- fs/io-wq.c | 50 ++++++++++++++++++++++++-------------------------- 1 file changed, 24 insertions(+), 26 deletions(-)
fs/io-wq.c +24 -26
@@ -236,9 +236,9 @@ static bool io_wqe_activate_free_worker(* We need a worker. If we find a free one, we're good. If not, and we're * below the max number of workers, create one. */ -static void io_wqe_wake_worker (struct io_wqe *wqe,struct io_wqe_acct *acct) +static void io_wqe_create_worker (struct io_wqe *wqe,struct io_wqe_acct *acct) { -bool ret; +bool do_create = false, first = false;/* * Most likely an attempt to queue unbounded work on an io_wq that
@@ -247,25 +247,18 @@ static void io_wqe_wake_worker(struct ioif (unlikely (!acct->max_workers))pr_warn_once ("io-wq is not configured for unbound workers" ); -rcu_read_lock (); - ret =io_wqe_activate_free_worker (wqe); -rcu_read_unlock (); - -if (!ret) { -bool do_create = false, first = false; - -raw_spin_lock_irq (&wqe->lock); -if (acct->nr_workers < acct->max_workers) { -atomic_inc (&acct->nr_running); -atomic_inc (&wqe->wq->worker_refs); -if (!acct->nr_workers) - first = true; - acct->nr_workers++; - do_create = true; - } -raw_spin_unlock_irq (&wqe->lock); -if (do_create) -create_io_worker (wqe->wq, wqe, acct->index, first); +raw_spin_lock_irq (&wqe->lock); +if (acct->nr_workers < acct->max_workers) { +if (!acct->nr_workers) + first = true; + acct->nr_workers++; + do_create = true; + } +raw_spin_unlock_irq (&wqe->lock); +if (do_create) { +atomic_inc (&acct->nr_running); +atomic_inc (&wqe->wq->worker_refs); +create_io_worker (wqe->wq, wqe, acct->index, first); } }
@@ -793,7 +786,8 @@ append:static void io_wqe_enqueue (struct io_wqe *wqe,struct io_wq_work *work) {struct io_wqe_acct *acct =io_work_get_acct (wqe, work); -bool do_wake; +unsigned work_flags = work->flags; +bool do_create;unsigned long flags;/*
@@ -809,12 +803,16 @@ static void io_wqe_enqueue(struct io_wqeraw_spin_lock_irqsave (&wqe->lock, flags);io_wqe_insert_work (wqe, work); wqe->flags &= ~IO_WQE_FLAG_STALLED ; - do_wake = (work->flags &IO_WQ_WORK_CONCURRENT ) || - !atomic_read (&acct->nr_running); + +rcu_read_lock (); + do_create = !io_wqe_activate_free_worker (wqe); +rcu_read_unlock (); +raw_spin_unlock_irqrestore (&wqe->lock, flags); -if (do_wake) -io_wqe_wake_worker (wqe, acct); +if (do_create && ((work_flags &IO_WQ_WORK_CONCURRENT ) || + !atomic_read (&acct->nr_running))) +io_wqe_create_worker (wqe, acct); }void io_wq_enqueue (struct io_wq *wq,struct io_wq_work *work)
Greg Kroah-Hartman
maintainerPATCH 8/432 btrfs: use delalloc_bytes to determine flush amount for shrink_delalloc
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
commit 03fe78cc2942c55cc13be5ca42578750f17204a1 upstream.
We have been hitting some early ENOSPC issues in production with more recent kernels, and I tracked it down to us simply not flushing delalloc as aggressively as we should be. With tracing I was seeing us failing all tickets with all of the block rsvs at or around 0, with very little pinned space, but still around 120MiB of outstanding bytes_may_used. Upon further investigation I saw that we were flushing around 14 pages per shrink call for delalloc, despite having around 2GiB of delalloc outstanding.
Consider the example of a 8 way machine, all CPUs trying to create a file in parallel, which at the time of this commit requires 5 items to do. Assuming a 16k leaf size, we have 10MiB of total metadata reclaim size waiting on reservations. Now assume we have 128MiB of delalloc outstanding. With our current math we would set items to 20, and then set to_reclaim to 20 * 256k, or 5MiB.
Assuming that we went through this loop all 3 times, for both FLUSH_DELALLOC and FLUSH_DELALLOC_WAIT, and then did the full loop twice, we'd only flush 60MiB of the 128MiB delalloc space. This could leave a fair bit of delalloc reservations still hanging around by the time we go to ENOSPC out all the remaining tickets.
Fix this two ways. First, change the calculations to be a fraction of the total delalloc bytes on the system. Prior to this change we were calculating based on dirty inodes so our math made more sense, now it's just completely unrelated to what we're actually doing.
Second add a FLUSH_DELALLOC_FULL state, that we hold off until we've gone through the flush states at least once. This will empty the system of all delalloc so we're sure to be truly out of space when we start failing tickets.
I'm tagging stable 5.10 and forward, because this is where we started using the page stuff heavily again. This affects earlier kernel versions as well, but would be a pain to backport to them as the flushing mechanisms aren't the same.
--- fs/btrfs/ctree.h | 9 +++++---- fs/btrfs/space-info.c | 40 ++++++++++++++++++++++++++++------------ include/trace/events/btrfs.h | 1 + 3 files changed, 34 insertions(+), 16 deletions(-)
fs/btrfs/ctree.h +5 -4
@@ -2781,10 +2781,11 @@ enum btrfs_flush_state {FLUSH_DELAYED_REFS =4 ,FLUSH_DELALLOC =5 ,FLUSH_DELALLOC_WAIT =6 , -ALLOC_CHUNK =7 , -ALLOC_CHUNK_FORCE =8 , -RUN_DELAYED_IPUTS =9 , - COMMIT_TRANS = 10, +FLUSH_DELALLOC_FULL =7 , +ALLOC_CHUNK =8 , +ALLOC_CHUNK_FORCE =9 , +RUN_DELAYED_IPUTS =10 , + COMMIT_TRANS = 11, }; int btrfs_subvolume_reserve_metadata(struct btrfs_root *root,
fs/btrfs/space-info.c +28 -12
@@ -493,6 +493,11 @@ static void shrink_delalloc(struct btrfslong time_left;int loops; + delalloc_bytes =percpu_counter_sum_positive (&fs_info->delalloc_bytes); + ordered_bytes =percpu_counter_sum_positive (&fs_info->ordered_bytes); +if (delalloc_bytes ==0 && ordered_bytes ==0 ) +return ; +/* Calc the number of the pages we need flush for space reservation */ if (to_reclaim ==U64_MAX ) { items =U64_MAX ;
@@ -500,22 +505,21 @@ static void shrink_delalloc(struct btrfs/* * to_reclaim is set to however much metadata we need to * reclaim, but reclaiming that much data doesn't really track -* exactly, so increase the amount to reclaim by 2x in order to -* make sure we're flushing enough delalloc to hopefully reclaim -* some metadata reservations. +* exactly. What we really want to do is reclaim full inode's +* worth of reservations, however that's not available to us +* here. We will take a fraction of the delalloc bytes for our +* flushing loops and hope for the best. Delalloc will expand +* the amount we write to cover an entire dirty extent, which +* will reclaim the metadata reservation for that range. If +* it's not enough subsequent flush stages will be more +* aggressive. */ + to_reclaim =max (to_reclaim, delalloc_bytes >>3 ); items =calc_reclaim_items_nr (fs_info, to_reclaim) *2 ; - to_reclaim = items *EXTENT_SIZE_PER_ITEM ; } trans = (struct btrfs_trans_handle *)current->journal_info; - delalloc_bytes =percpu_counter_sum_positive ( - &fs_info->delalloc_bytes); - ordered_bytes =percpu_counter_sum_positive (&fs_info->ordered_bytes); -if (delalloc_bytes ==0 && ordered_bytes ==0 ) -return ; -/* * If we are doing more ordered than delalloc we need to just wait on * ordered extents, otherwise we'll waste time trying to flush delalloc
@@ -595,8 +599,11 @@ static void flush_space(struct btrfs_fs_break ;case FLUSH_DELALLOC :case FLUSH_DELALLOC_WAIT : +case FLUSH_DELALLOC_FULL : +if (state ==FLUSH_DELALLOC_FULL ) + num_bytes =U64_MAX ;shrink_delalloc (fs_info, space_info, num_bytes, - state ==FLUSH_DELALLOC_WAIT , for_preempt); + state !=FLUSH_DELALLOC , for_preempt);break ;case FLUSH_DELAYED_REFS_NR :case FLUSH_DELAYED_REFS :
@@ -905,6 +912,14 @@ static void btrfs_async_reclaim_metadata }/* +* We do not want to empty the system of delalloc unless we're +* under heavy pressure, so allow one trip through the flushing +* logic before we start doing a FLUSH_DELALLOC_FULL. +*/ +if (flush_state ==FLUSH_DELALLOC_FULL && !commit_cycles) + flush_state++; + +/* * We don't want to force a chunk allocation until we've tried * pretty hard to reclaim space. Think of the case where we * freed up a bunch of space and so have a lot of pinned space
@@ -1067,7 +1082,7 @@ static void btrfs_preempt_reclaim_metada* so if we now have space to allocate do the force chunk allocation. */ static const enum btrfs_flush_state data_flush_states[] = { -FLUSH_DELALLOC_WAIT , +FLUSH_DELALLOC_FULL ,RUN_DELAYED_IPUTS ,COMMIT_TRANS ,ALLOC_CHUNK_FORCE ,
@@ -1156,6 +1171,7 @@ static const enum btrfs_flush_state evicFLUSH_DELAYED_REFS ,FLUSH_DELALLOC ,FLUSH_DELALLOC_WAIT , +FLUSH_DELALLOC_FULL ,ALLOC_CHUNK , COMMIT_TRANS, };
include/trace/events/btrfs.h +1 -0
@@ -94,6 +94,7 @@ struct btrfs_space_info; EM( FLUSH_DELAYED_ITEMS, "FLUSH_DELAYED_ITEMS") \ EM( FLUSH_DELALLOC, "FLUSH_DELALLOC") \ EM( FLUSH_DELALLOC_WAIT, "FLUSH_DELALLOC_WAIT") \ + EM( FLUSH_DELALLOC_FULL, "FLUSH_DELALLOC_FULL") \ EM( FLUSH_DELAYED_REFS_NR, "FLUSH_DELAYED_REFS_NR") \ EM( FLUSH_DELAYED_REFS, "FLUSH_ELAYED_REFS") \EM (ALLOC_CHUNK ,"ALLOC_CHUNK" ) \
Greg Kroah-Hartman
maintainerPATCH 9/432 btrfs: wake up async_delalloc_pages waiters after submit
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
commit ac98141d140444fe93e26471d3074c603b70e2ca upstream.
We use the async_delalloc_pages mechanism to make sure that we've completed our async work before trying to continue our delalloc flushing. The reason for this is we need to see any ordered extents that were created by our delalloc flushing. However we're waking up before we do the submit work, which is before we create the ordered extents. This is a pretty wide race window where we could potentially think there are no ordered extents and thus exit shrink_delalloc prematurely. Fix this by waking us up after we've done the work to create ordered extents.
--- fs/btrfs/inode.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
fs/btrfs/inode.c +5 -5
@@ -1290,11 +1290,6 @@ static noinline void async_cow_submit(st nr_pages = (async_chunk->end - async_chunk->start +PAGE_SIZE ) >>PAGE_SHIFT ; -/* atomic_sub_return implies a barrier */ -if (atomic_sub_return (nr_pages, &fs_info->async_delalloc_pages) < -5 *SZ_1M ) -cond_wake_up_nomb (&fs_info->async_submit_wait); -/* * ->inode could be NULL if async_chunk_start has failed to compress, * in which case we don't have anything to submit, yet we need to
@@ -1303,6 +1298,11 @@ static noinline void async_cow_submit(st*/ if (async_chunk->inode)submit_compressed_extents (async_chunk); + +/* atomic_sub_return implies a barrier */ +if (atomic_sub_return (nr_pages, &fs_info->async_delalloc_pages) < +5 *SZ_1M ) +cond_wake_up_nomb (&fs_info->async_submit_wait); } static noinline void async_cow_free(struct btrfs_work *work)
Greg Kroah-Hartman
maintainerPATCH 10/432 btrfs: wait on async extents when flushing delalloc
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
commit e16460707e94c3d4c1b5418cb68b28b8efa903b2 upstream.
I've been debugging an early ENOSPC problem in production and finally root caused it to this problem. When we switched to the per-inode in 38d715f494f2 ("btrfs: use btrfs_start_delalloc_roots in shrink_delalloc") I pulled out the async extent handling, because we were doing the correct thing by calling filemap_flush() if we had async extents set. This would properly wait on any async extents by locking the page in the second flush, thus making sure our ordered extents were properly set up.
However when I switched us back to page based flushing, I used sync_inode(), which allows us to pass in our own wbc. The problem here is that sync_inode() is smarter than the filemap_* helpers, it tries to avoid calling writepages at all. This means that our second call could skip calling do_writepages altogether, and thus not wait on the pagelock for the async helpers. This means we could come back before any ordered extents were created and then simply continue on in our flushing mechanisms and ENOSPC out when we have plenty of space to use.
Fix this by putting back the async pages logic in shrink_delalloc. This allows us to bulk write out everything that we need to, and then we can wait in one place for the async helpers to catch up, and then wait on any ordered extents that are created.
--- fs/btrfs/inode.c | 4 ---- fs/btrfs/space-info.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 4 deletions(-)
fs/btrfs/inode.c +0 -4
@@ -9809,10 +9809,6 @@ static int start_delalloc_inodes(struct &work->work); }else { ret =sync_inode (inode, wbc); -if (!ret && -test_bit (BTRFS_INODE_HAS_ASYNC_EXTENT , - &BTRFS_I (inode)->runtime_flags)) - ret =sync_inode (inode, wbc);btrfs_add_delayed_iput (inode);if (ret || wbc->nr_to_write <=0 ) goto out;
fs/btrfs/space-info.c +40 -0
@@ -532,9 +532,49 @@ static void shrink_delalloc(struct btrfswhile ((delalloc_bytes || ordered_bytes) && loops <3 ) {u64 temp =min (delalloc_bytes, to_reclaim) >>PAGE_SHIFT ;long nr_pages =min_t (u64, temp,LONG_MAX ); +int async_pages;btrfs_start_delalloc_roots (fs_info, nr_pages, true); +/* +* We need to make sure any outstanding async pages are now +* processed before we continue. This is because things like +* sync_inode() try to be smart and skip writing if the inode is +* marked clean. We don't use filemap_fwrite for flushing +* because we want to control how many pages we write out at a +* time, thus this is the only safe way to make sure we've +* waited for outstanding compressed workers to have started +* their jobs and thus have ordered extents set up properly. +* +* This exists because we do not want to wait for each +* individual inode to finish its async work, we simply want to +* start the IO on everybody, and then come back here and wait +* for all of the async work to catch up. Once we're done with +* that we know we'll have ordered extents for everything and we +* can decide if we wait for that or not. +* +* If we choose to replace this in the future, make absolutely +* sure that the proper waiting is being done in the async case, +* as there have been bugs in that area before. +*/ + async_pages =atomic_read (&fs_info->async_delalloc_pages); +if (!async_pages) + goto skip_async; + +/* +* We don't want to wait forever, if we wrote less pages in this +* loop than we have outstanding, only wait for that number of +* pages, otherwise we can wait for all async pages to finish +* before continuing. +*/ +if (async_pages > nr_pages) + async_pages -= nr_pages; +else + async_pages =0 ; +wait_event (fs_info->async_submit_wait, +atomic_read (&fs_info->async_delalloc_pages) <= + async_pages); +skip_async: loops++;if (wait_ordered && !trans) {btrfs_wait_ordered_roots (fs_info, items,0 , (u64)-1 );
Greg Kroah-Hartman
maintainerPATCH 11/432 btrfs: reduce the preemptive flushing threshold to 90%
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
commit 93c60b17f2b5fca2c5931d7944788d1ef5f25528 upstream.
The preemptive flushing code was added in order to avoid needing to synchronously wait for ENOSPC flushing to recover space. Once we're almost full however we can essentially flush constantly. We were using 98% as a threshold to determine if we were simply full, however in practice this is a really high bar to hit. For example reports of systems running into this problem had around 94% usage and thus continued to flush. Fix this by lowering the threshold to 90%, which is a more sane value, especially for smaller file systems.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=212185
--- fs/btrfs/space-info.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/space-info.c +1 -1
@@ -733,7 +733,7 @@ static bool need_preemptive_reclaim(stru {u64 global_rsv_size = fs_info->global_block_rsv.reserved;u64 ordered, delalloc; -u64 thresh =div_factor_fine (space_info->total_bytes,98 ); +u64 thresh =div_factor_fine (space_info->total_bytes,90 );u64 used;/* If we're just plain full then async reclaim just slows us down. */
Greg Kroah-Hartman
maintainerPATCH 12/432 btrfs: do not do preemptive flushing if the majority is global rsv
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
commit 114623979405abf0b143f9c6688b3ff00ee48338 upstream.
A common characteristic of the bug report where preemptive flushing was going full tilt was the fact that the vast majority of the free metadata space was used up by the global reserve. The hard 90% threshold would cover the majority of these cases, but to be even smarter we should take into account how much of the outstanding reservations are covered by the global block reserve. If the global block reserve accounts for the vast majority of outstanding reservations, skip preemptive flushing, as it will likely just cause churn and pain.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=212185
--- fs/btrfs/space-info.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
fs/btrfs/space-info.c +14 -0
@@ -741,6 +741,20 @@ static bool need_preemptive_reclaim(stru global_rsv_size) >= thresh)return false; + used = space_info->bytes_may_use + space_info->bytes_pinned; + +/* The total flushable belongs to the global rsv, don't flush. */ +if (global_rsv_size >= used) +return false; + +/* +* 128MiB is 1/4 of the maximum global rsv size. If we have less than +* that devoted to other reservations then there's no sense in flushing, +* we don't have a lot of things that need flushing. +*/ +if (used - global_rsv_size <=SZ_128M ) +return false; +/* * We have tickets queued, bail so we don't compete with the async * flushers.
Greg Kroah-Hartman
maintainerPATCH 13/432 btrfs: zoned: fix block group alloc_offset calculation
In reply to Greg Kroah-HartmanFrom: Naohiro Aota <[email protected]>
commit 0ae79c6fe70d5c5c645733b7ed39d5e6021d8c9a upstream.
alloc_offset is offset from the start of a block group and @offset is actually an address in logical space. Thus, we need to consider block_group->start when calculating them.
--- fs/btrfs/free-space-cache.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
fs/btrfs/free-space-cache.c +5 -2
@@ -2652,8 +2652,11 @@ int btrfs_remove_free_space(struct btrfs* btrfs_pin_extent_for_log_replay() when replaying the log. * Advance the pointer not to overwrite the tree-log nodes. */ -if (block_group->alloc_offset < offset + bytes) - block_group->alloc_offset = offset + bytes; +if (block_group->start + block_group->alloc_offset < + offset + bytes) { + block_group->alloc_offset = + offset + bytes - block_group->start; + }return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 14/432 btrfs: zoned: suppress reclaim error message on EAGAIN
In reply to Greg Kroah-HartmanFrom: Naohiro Aota <[email protected]>
commit ba86dd9fe60e5853fbff96f2658212908b83f271 upstream.
btrfs_relocate_chunk() can fail with -EAGAIN when e.g. send operations are running. The message can fail btrfs/187 and it's unnecessary because we anyway add it back to the reclaim list.
btrfs_reclaim_bgs_work()
`-> btrfs_relocate_chunk()
`-> btrfs_relocate_block_group()
`-> reloc_chunk_start()
`-> if (fs_info->send_in_progress)
`-> return -EAGAIN--- fs/btrfs/block-group.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/btrfs/block-group.c +1 -1
@@ -1561,7 +1561,7 @@ void btrfs_reclaim_bgs_work(struct work_ div64_u64(zone_unusable * 100, bg->length));trace_btrfs_reclaim_block_group (bg); ret =btrfs_relocate_chunk (fs_info, bg->start); -if (ret) +if (ret && ret != -EAGAIN )btrfs_err (fs_info,"error relocating chunk %llu" , bg->start);
Greg Kroah-Hartman
maintainerPATCH 15/432 btrfs: fix upper limit for max_inline for page size 64K
In reply to Greg Kroah-HartmanFrom: Anand Jain <[email protected]>
commit 6f93e834fa7c5faa0372e46828b4b2a966ac61d7 upstream.
The mount option max_inline ranges from 0 to the sectorsize (which is now equal to page size). But we parse the mount options too early and before the actual sectorsize is read from the superblock. So the upper limit of max_inline is unaware of the actual sectorsize and is limited by the temporary sectorsize 4096, even on a system where the default sectorsize is 64K.
Fix this by reading the superblock sectorsize before the mount option parse.
--- fs/btrfs/disk-io.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-)
fs/btrfs/disk-io.c +24 -24
@@ -3314,6 +3314,30 @@ int __cold open_ctree(struct super_block*/ fs_info->compress_type =BTRFS_COMPRESS_ZLIB ; +/* +* Flag our filesystem as having big metadata blocks if they are bigger +* than the page size. +*/ +if (btrfs_super_nodesize (disk_super) >PAGE_SIZE ) { +if (!(features &BTRFS_FEATURE_INCOMPAT_BIG_METADATA )) +btrfs_info (fs_info, +"flagging fs with big metadata feature" ); + features |=BTRFS_FEATURE_INCOMPAT_BIG_METADATA ; + } + +/* Set up fs_info before parsing mount options */ + nodesize =btrfs_super_nodesize (disk_super); + sectorsize =btrfs_super_sectorsize (disk_super); + stripesize = sectorsize; + fs_info->dirty_metadata_batch = nodesize * (1 +ilog2 (nr_cpu_ids)); + fs_info->delalloc_batch = sectorsize *512 * (1 +ilog2 (nr_cpu_ids)); + + fs_info->nodesize = nodesize; + fs_info->sectorsize = sectorsize; + fs_info->sectorsize_bits =ilog2 (sectorsize); + fs_info->csums_per_leaf =BTRFS_MAX_ITEM_SIZE (fs_info) / fs_info->csum_size; + fs_info->stripesize = stripesize; + ret =btrfs_parse_options (fs_info, options, sb->s_flags);if (ret) { err = ret;
@@ -3341,30 +3365,6 @@ int __cold open_ctree(struct super_blockbtrfs_info (fs_info,"has skinny extents" );/* -* flag our filesystem as having big metadata blocks if -* they are bigger than the page size -*/ -if (btrfs_super_nodesize (disk_super) >PAGE_SIZE ) { -if (!(features &BTRFS_FEATURE_INCOMPAT_BIG_METADATA )) -btrfs_info (fs_info, -"flagging fs with big metadata feature" ); - features |=BTRFS_FEATURE_INCOMPAT_BIG_METADATA ; - } - - nodesize =btrfs_super_nodesize (disk_super); - sectorsize =btrfs_super_sectorsize (disk_super); - stripesize = sectorsize; - fs_info->dirty_metadata_batch = nodesize * (1 +ilog2 (nr_cpu_ids)); - fs_info->delalloc_batch = sectorsize *512 * (1 +ilog2 (nr_cpu_ids)); - -/* Cache block sizes */ - fs_info->nodesize = nodesize; - fs_info->sectorsize = sectorsize; - fs_info->sectorsize_bits =ilog2 (sectorsize); - fs_info->csums_per_leaf =BTRFS_MAX_ITEM_SIZE (fs_info) / fs_info->csum_size; - fs_info->stripesize = stripesize; - -/* * mixed block groups end up with duplicate but slightly offset * extent buffers for the same range. It leads to corruptions */
Greg Kroah-Hartman
maintainerPATCH 16/432 btrfs: reset replace target device to allocation state on close
In reply to Greg Kroah-HartmanFrom: Desmond Cheong Zhi Xi <[email protected]>
commit 0d977e0eba234e01a60bdde27314dc21374201b3 upstream.
This crash was observed with a failed assertion on device close:
BTRFS: Transaction aborted (error -28)
WARNING: CPU: 1 PID: 3902 at fs/btrfs/extent-tree.c:2150 btrfs_run_delayed_refs+0x1d2/0x1e0 [btrfs] Modules linked in: btrfs blake2b_generic libcrc32c crc32c_intel xor zstd_decompress zstd_compress xxhash lzo_compress lzo_decompress raid6_pq loop CPU: 1 PID: 3902 Comm: kworker/u8:4 Not tainted 5.14.0-rc5-default+ #1532 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.0-59-gc9ba527-rebuilt.opensuse.org 04/01/2014 Workqueue: events_unbound btrfs_async_reclaim_metadata_space [btrfs] RIP: 0010:btrfs_run_delayed_refs+0x1d2/0x1e0 [btrfs] RSP: 0018:ffffb7a5452d7d80 EFLAGS: 00010282 RAX: 0000000000000000 RBX: 0000000000000003 RCX: 0000000000000000 RDX: 0000000000000001 RSI: ffffffffabee13c4 RDI: 00000000ffffffff RBP: ffff97834176a378 R08: 0000000000000001 R09: 0000000000000001 R10: 0000000000000000 R11: 0000000000000001 R12: ffff97835195d388 R13: 0000000005b08000 R14: ffff978385484000 R15: 000000000000016c FS: 0000000000000000(0000) GS:ffff9783bd800000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000056190d003fe8 CR3: 000000002a81e005 CR4: 0000000000170ea0 Call Trace: flush_space+0x197/0x2f0 [btrfs] btrfs_async_reclaim_metadata_space+0x139/0x300 [btrfs] process_one_work+0x262/0x5e0 worker_thread+0x4c/0x320 ? process_one_work+0x5e0/0x5e0 kthread+0x144/0x170 ? set_kthread_struct+0x40/0x40 ret_from_fork+0x1f/0x30 irq event stamp: 19334989 hardirqs last enabled at (19334997): [<ffffffffab0e0c87>] console_unlock+0x2b7/0x400 hardirqs last disabled at (19335006): [<ffffffffab0e0d0d>] console_unlock+0x33d/0x400 softirqs last enabled at (19334900): [<ffffffffaba0030d>] __do_softirq+0x30d/0x574 softirqs last disabled at (19334893): [<ffffffffab0721ec>] irq_exit_rcu+0x12c/0x140 ---[ end trace 45939e308e0dd3c7 ]--- BTRFS: error (device vdd) in btrfs_run_delayed_refs:2150: errno=-28 No space left BTRFS info (device vdd): forced readonly BTRFS warning (device vdd): failed setting block group ro: -30 BTRFS info (device vdd): suspending dev_replace for unmount assertion failed: !test_bit(BTRFS_DEV_STATE_REPLACE_TGT, &device->dev_state), in fs/btrfs/volumes.c:1150 ------------[ cut here ]------------ kernel BUG at fs/btrfs/ctree.h:3431! invalid opcode: 0000 [#1] PREEMPT SMP CPU: 1 PID: 3982 Comm: umount Tainted: G W 5.14.0-rc5-default+ #1532 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.12.0-59-gc9ba527-rebuilt.opensuse.org 04/01/2014 RIP: 0010:assertfail.constprop.0+0x18/0x1a [btrfs] RSP: 0018:ffffb7a5454c7db8 EFLAGS: 00010246 RAX: 0000000000000068 RBX: ffff978364b91c00 RCX: 0000000000000000 RDX: 0000000000000000 RSI: ffffffffabee13c4 RDI: 00000000ffffffff RBP: ffff9783523a4c00 R08: 0000000000000001 R09: 0000000000000001 R10: 0000000000000000 R11: 0000000000000001 R12: ffff9783523a4d18 R13: 0000000000000000 R14: 0000000000000004 R15: 0000000000000003 FS: 00007f61c8f42800(0000) GS:ffff9783bd800000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 000056190cffa810 CR3: 0000000030b96002 CR4: 0000000000170ea0 Call Trace: btrfs_close_one_device.cold+0x11/0x55 [btrfs] close_fs_devices+0x44/0xb0 [btrfs] btrfs_close_devices+0x48/0x160 [btrfs] generic_shutdown_super+0x69/0x100 kill_anon_super+0x14/0x30 btrfs_kill_super+0x12/0x20 [btrfs] deactivate_locked_super+0x2c/0xa0 cleanup_mnt+0x144/0x1b0 task_work_run+0x59/0xa0 exit_to_user_mode_loop+0xe7/0xf0 exit_to_user_mode_prepare+0xaf/0xf0 syscall_exit_to_user_mode+0x19/0x50 do_syscall_64+0x4a/0x90 entry_SYSCALL_64_after_hwframe+0x44/0xae
This happens when close_ctree is called while a dev_replace hasn't completed. In close_ctree, we suspend the dev_replace, but keep the replace target around so that we can resume the dev_replace procedure when we mount the root again. This is the call trace:
close_ctree():
btrfs_dev_replace_suspend_for_unmount();
btrfs_close_devices():
btrfs_close_fs_devices():
btrfs_close_one_device():
ASSERT(!test_bit(BTRFS_DEV_STATE_REPLACE_TGT,
&device->dev_state));However, since the replace target sticks around, there is a device with BTRFS_DEV_STATE_REPLACE_TGT set on close, and we fail the assertion in btrfs_close_one_device.
To fix this, if we come across the replace target device when closing, we should properly reset it back to allocation state. This fix also ensures that if a non-target device has a corrupted state and has the BTRFS_DEV_STATE_REPLACE_TGT bit set, the assertion will still catch the error.
--- fs/btrfs/volumes.c | 3 +++ 1 file changed, 3 insertions(+)
fs/btrfs/volumes.c +3 -0
@@ -1130,6 +1130,9 @@ static void btrfs_close_one_device(struc fs_devices->rw_devices--; } +if (device->devid ==BTRFS_DEV_REPLACE_DEVID ) +clear_bit (BTRFS_DEV_STATE_REPLACE_TGT , &device->dev_state); +if (test_bit (BTRFS_DEV_STATE_MISSING , &device->dev_state)) fs_devices->missing_devices--;
Greg Kroah-Hartman
maintainerPATCH 17/432 btrfs: zoned: fix double counting of split ordered extent
In reply to Greg Kroah-HartmanFrom: Naohiro Aota <[email protected]>
commit f79645df806565a03abb2847a1d20e6930b25e7e upstream.
btrfs_add_ordered_extent_*() add num_bytes to fs_info->ordered_bytes. Then, splitting an ordered extent will call btrfs_add_ordered_extent_*() again for split extents, leading to double counting of the region of a split extent. These leaked bytes are finally reported at unmount time as follow:
BTRFS info (device dm-1): at unmount dio bytes count 364544
Fix the double counting by subtracting split extent's size from fs_info->ordered_bytes.
--- fs/btrfs/ordered-data.c | 8 ++++++++ 1 file changed, 8 insertions(+)
fs/btrfs/ordered-data.c +8 -0
@@ -1052,6 +1052,7 @@ static int clone_ordered_extent(struct b u64 len) {struct inode *inode = ordered->inode; +struct btrfs_fs_info *fs_info =BTRFS_I (inode)->root->fs_info;u64 file_offset = ordered->file_offset + pos;u64 disk_bytenr = ordered->disk_bytenr + pos;u64 num_bytes = len;
@@ -1069,6 +1070,13 @@ static int clone_ordered_extent(struct belse type =__ffs (flags_masked); +/* +* The splitting extent is already counted and will be added again +* in btrfs_add_ordered_extent_*(). Subtract num_bytes to avoid +* double counting. +*/ +percpu_counter_add_batch (&fs_info->ordered_bytes, -num_bytes, + fs_info->delalloc_batch);if (test_bit (BTRFS_ORDERED_COMPRESSED , &ordered->flags)) {WARN_ON_ONCE (1 ); ret = btrfs_add_ordered_extent_compress(BTRFS_I(inode),
Greg Kroah-Hartman
maintainerPATCH 18/432 blk-zoned: allow zone management send operations without CAP_SYS_ADMIN
In reply to Greg Kroah-HartmanFrom: Niklas Cassel <[email protected]>
commit ead3b768bb51259e3a5f2287ff5fc9041eb6f450 upstream.
Zone management send operations (BLKRESETZONE, BLKOPENZONE, BLKCLOSEZONE and BLKFINISHZONE) should be allowed under the same permissions as write(). (write() does not require CAP_SYS_ADMIN).
Additionally, other ioctls like BLKSECDISCARD and BLKZEROOUT only check if the fd was successfully opened with FMODE_WRITE.
(They do not require CAP_SYS_ADMIN).
Currently, zone management send operations require both CAP_SYS_ADMIN and that the fd was successfully opened with FMODE_WRITE.
Remove the CAP_SYS_ADMIN requirement, so that zone management send operations match the access control requirement of write(), BLKSECDISCARD and BLKZEROOUT.
--- block/blk-zoned.c | 3 --- 1 file changed, 3 deletions(-)
block/blk-zoned.c +0 -3
@@ -421,9 +421,6 @@ int blkdev_zone_mgmt_ioctl(struct block_if (!blk_queue_is_zoned (q))return -ENOTTY ; -if (!capable (CAP_SYS_ADMIN )) -return -EACCES ; -if (!(mode &FMODE_WRITE ))return -EBADF ;
Greg Kroah-Hartman
maintainerPATCH 19/432 blk-zoned: allow BLKREPORTZONE without CAP_SYS_ADMIN
In reply to Greg Kroah-HartmanFrom: Niklas Cassel <[email protected]>
commit 4d643b66089591b4769bcdb6fd1bfeff2fe301b8 upstream.
A user space process should not need the CAP_SYS_ADMIN capability set in order to perform a BLKREPORTZONE ioctl.
Getting the zone report is required in order to get the write pointer. Neither read() nor write() requires CAP_SYS_ADMIN, so it is reasonable that a user space process that can read/write from/to the device, also can get the write pointer. (Since e.g. writes have to be at the write pointer.)
--- block/blk-zoned.c | 3 --- 1 file changed, 3 deletions(-)
block/blk-zoned.c +0 -3
@@ -360,9 +360,6 @@ int blkdev_report_zones_ioctl(struct bloif (!blk_queue_is_zoned (q))return -ENOTTY ; -if (!capable (CAP_SYS_ADMIN )) -return -EACCES ; -if (copy_from_user (&rep, argp,sizeof (struct blk_zone_report )))return -EFAULT ;
Greg Kroah-Hartman
maintainerPATCH 20/432 powerpc/perf/hv-gpci: Fix counter value parsing
In reply to Greg Kroah-HartmanFrom: Kajol Jain <[email protected]>
commit f9addd85fbfacf0d155e83dbee8696d6df5ed0c7 upstream.
H_GetPerformanceCounterInfo (0xF080) hcall returns the counter data in the result buffer. Result buffer has specific format defined in the PAPR specification. One of the fields is counter offset and width of the counter data returned.
Counter data are returned in a unsigned char array in big endian byte order. To get the final counter data, the values must be left shifted byte at a time. But commit 220a0c609ad17 ("powerpc/perf: Add support for the hv gpci (get performance counter info) interface") made the shifting bitwise and also assumed little endian order. Because of that, hcall counters values are reported incorrectly.
In particular this can lead to counters go backwards which messes up the counter prev vs now calculation and leads to huge counter value reporting:
#: perf stat -e hv_gpci/system_tlbie_count_and_time_tlbie_instructions_issued/
-C 0 -I 1000
time counts unit events
1.000078854 18,446,744,073,709,535,232 hv_gpci/system_tlbie_count_and_time_tlbie_instructions_issued/
2.000213293 0 hv_gpci/system_tlbie_count_and_time_tlbie_instructions_issued/
3.000320107 0 hv_gpci/system_tlbie_count_and_time_tlbie_instructions_issued/
4.000428392 0 hv_gpci/system_tlbie_count_and_time_tlbie_instructions_issued/
5.000537864 0 hv_gpci/system_tlbie_count_and_time_tlbie_instructions_issued/
6.000649087 0 hv_gpci/system_tlbie_count_and_time_tlbie_instructions_issued/
7.000760312 0 hv_gpci/system_tlbie_count_and_time_tlbie_instructions_issued/
8.000865218 16,448 hv_gpci/system_tlbie_count_and_time_tlbie_instructions_issued/
9.000978985 18,446,744,073,709,535,232 hv_gpci/system_tlbie_count_and_time_tlbie_instructions_issued/
10.001088891 16,384 hv_gpci/system_tlbie_count_and_time_tlbie_instructions_issued/
11.001201435 0 hv_gpci/system_tlbie_count_and_time_tlbie_instructions_issued/
12.001307937 18,446,744,073,709,535,232 hv_gpci/system_tlbie_count_and_time_tlbie_instructions_issued/
Fix the shifting logic to correct match the format, ie. read bytes in big endian order.
--- arch/powerpc/perf/hv-gpci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/perf/hv-gpci.c +1 -1
@@ -175,7 +175,7 @@ static unsigned long single_gpci_request*/ count =0 ;for (i = offset; i < offset + length; i++) - count |= arg->bytes[i] << (i - offset); + count |= (u64)(arg->bytes[i]) << ((length -1 - (i - offset)) *8 ); *value = count; out:
Greg Kroah-Hartman
maintainerPATCH 21/432 xen: fix setting of max_pfn in shared_info
In reply to Greg Kroah-HartmanFrom: Juergen Gross <[email protected]>
commit 4b511d5bfa74b1926daefd1694205c7f1bcf677f upstream.
Xen PV guests are specifying the highest used PFN via the max_pfn field in shared_info. This value is used by the Xen tools when saving or migrating the guest.
Unfortunately this field is misnamed, as in reality it is specifying the number of pages (including any memory holes) of the guest, so it is the highest used PFN + 1. Renaming isn't possible, as this is a public Xen hypervisor interface which needs to be kept stable.
The kernel will set the value correctly initially at boot time, but when adding more pages (e.g. due to memory hotplug or ballooning) a real PFN number is stored in max_pfn. This is done when expanding the p2m array, and the PFN stored there is even possibly wrong, as it should be the last possible PFN of the just added P2M frame, and not one which led to the P2M expansion.
Fix that by setting shared_info->max_pfn to the last possible PFN + 1.
--- arch/x86/xen/p2m.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/xen/p2m.c +2 -2
@@ -618,8 +618,8 @@ int xen_alloc_p2m_entry(unsigned long pf }/* Expanded the p2m? */ -if (pfn > xen_p2m_last_pfn) { - xen_p2m_last_pfn = pfn; +if (pfn >= xen_p2m_last_pfn) { + xen_p2m_last_pfn =ALIGN (pfn +1 ,P2M_PER_PAGE ); HYPERVISOR_shared_info->arch.max_pfn = xen_p2m_last_pfn; }
Greg Kroah-Hartman
maintainerPATCH 22/432 9p/xen: Fix end of loop tests for list_for_each_entry
In reply to Greg Kroah-HartmanFrom: Harshvardhan Jha <[email protected]>
commit 732b33d0dbf17e9483f0b50385bf606f724f50a2 upstream.
This patch addresses the following problems:
- priv can never be NULL, so this part of the check is useless
- if the loop ran through the whole list, priv->client is invalid and
it is more appropriate and sufficient to check for the end of list_for_each_entry loop condition.
--- net/9p/trans_xen.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/9p/trans_xen.c +2 -2
@@ -138,7 +138,7 @@ static bool p9_xen_write_todo(struct xenstatic int p9_xen_request (struct p9_client *client,struct p9_req_t *p9_req) { -struct xen_9pfs_front_priv *priv =NULL ; +struct xen_9pfs_front_priv *priv;RING_IDX cons, prod, masked_cons, masked_prod;unsigned long flags;u32 size = p9_req->tc.size;
@@ -151,7 +151,7 @@ static int p9_xen_request(struct p9_cliebreak ; }read_unlock (&xen_9pfs_lock); -if (!priv || priv->client != client) +if (list_entry_is_head (priv, &xen_9pfs_devs, list))return -EINVAL ; num = p9_req->tc.tag % priv->num_rings;
Greg Kroah-Hartman
maintainerPATCH 23/432 ceph: fix dereference of null pointer cf
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
commit 05a444d3f90a3c3e6362e88a1bf13e1a60f8cace upstream.
Currently in the case where kmem_cache_alloc fails the null pointer cf is dereferenced when assigning cf->is_capsnap = false. Fix this by adding a null pointer check and return path.
Cc: [email protected]
Addresses-Coverity: ("Dereference null return")
--- fs/ceph/caps.c | 3 +++ 1 file changed, 3 insertions(+)
fs/ceph/caps.c +3 -0
@@ -1746,6 +1746,9 @@ struct ceph_cap_flush *ceph_alloc_cap_flstruct ceph_cap_flush *cf; cf =kmem_cache_alloc (ceph_cap_flush_cachep,GFP_KERNEL ); +if (!cf) +return NULL ; + cf->is_capsnap = false;return cf; }
Greg Kroah-Hartman
maintainerPATCH 24/432 Input: elan_i2c - reduce the resume time for controller in Whitebox
In reply to Greg Kroah-HartmanFrom: jingle.wu <[email protected]>
commit d198b8273e3006818ea287a93eb4d8fd2543e512 upstream.
Similar to controllers found Voxel, Delbin, Magpie and Bobba, the one found in Whitebox does not need to be reset after issuing power-on command, and skipping reset saves resume time.
--- drivers/input/mouse/elan_i2c.h | 3 ++- drivers/input/mouse/elan_i2c_core.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-)
drivers/input/mouse/elan_i2c.h +2 -1
@@ -55,8 +55,9 @@#define ETP_FW_PAGE_SIZE_512 512#define ETP_FW_SIGNATURE_SIZE 6 -#define ETP_PRODUCT_ID_DELBIN 0x00C2 +#define ETP_PRODUCT_ID_WHITEBOX 0x00B8#define ETP_PRODUCT_ID_VOXEL 0x00BF +#define ETP_PRODUCT_ID_DELBIN 0x00C2#define ETP_PRODUCT_ID_MAGPIE 0x0120#define ETP_PRODUCT_ID_BOBBA 0x0121
drivers/input/mouse/elan_i2c_core.c +1 -0
@@ -105,6 +105,7 @@ static u32 elan_i2c_lookup_quirks(u16 icu32 quirks; } elan_i2c_quirks[] = { { 0x0D, ETP_PRODUCT_ID_DELBIN, ETP_QUIRK_QUICK_WAKEUP }, + { 0x0D, ETP_PRODUCT_ID_WHITEBOX, ETP_QUIRK_QUICK_WAKEUP }, { 0x10, ETP_PRODUCT_ID_VOXEL, ETP_QUIRK_QUICK_WAKEUP }, { 0x14, ETP_PRODUCT_ID_MAGPIE, ETP_QUIRK_QUICK_WAKEUP }, { 0x14, ETP_PRODUCT_ID_BOBBA, ETP_QUIRK_QUICK_WAKEUP },
Greg Kroah-Hartman
maintainerPATCH 25/432 selftests/ftrace: Fix requirement check of README file
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (VMware) <[email protected]>
commit 210f9df02611cbe641ced3239122b270fd907d86 upstream.
The selftest for ftrace checks some features by checking if the README has text that states the feature is supported by that kernel. Unfortunately, this check gives false positives because it many not be checked if there's spaces in the string to check. This is due to the compare between the required variable with the ":README" string stripped, because neither has quotes around them.
--- tools/testing/selftests/ftrace/test.d/functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/testing/selftests/ftrace/test.d/functions +1 -1
@@ -115,7 +115,7 @@ check_requires() { # Check required file echo "Required tracer $t is not configured." exit_unsupported fi - elif [ $r != $i ]; then + elif [ "$r" != "$i" ]; then if ! grep -Fq "$r" README ; then echo "Required feature pattern \"$r\" is not in README." exit_unsupported
Greg Kroah-Hartman
maintainerPATCH 26/432 tools/thermal/tmon: Add cross compiling support
In reply to Greg Kroah-HartmanFrom: Rolf Eike Beer <[email protected]>
commit b5f7912bb604b47a0fe024560488a7556dce8ee7 upstream.
Default to prefixed pkg-config when crosscompiling, this matches what other parts of the tools/ directory already do.
[dlezcano] : Reworked description
--- tools/thermal/tmon/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
tools/thermal/tmon/Makefile +1 -1
@@ -10,7 +10,7 @@ override CFLAGS+= $(call cc-option,-O3,- # Add "-fstack-protector" only if toolchain supports it. override CFLAGS+= $(call cc-option,-fstack-protector-strong) CC?= $(CROSS_COMPILE)gcc -PKG_CONFIG?= pkg-config +PKG_CONFIG?= $(CROSS_COMPILE)pkg-config override CFLAGS+=-D VERSION=\"$(VERSION)\" LDFLAGS+=
Greg Kroah-Hartman
maintainerPATCH 27/432 clk: socfpga: agilex: fix the parents of the psi_ref_clk
In reply to Greg Kroah-HartmanFrom: Dinh Nguyen <[email protected]>
commit 9d563236cca43fc4fe190b3be173444bd48e2a3b upstream.
The psi_ref_clk comes from the C2 node of the main_pll and periph_pll, not the C3.
--- drivers/clk/socfpga/clk-agilex.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/clk/socfpga/clk-agilex.c +4 -4
@@ -107,10 +107,10 @@ static const struct clk_parent_data gpio };static const struct clk_parent_data psi_ref_free_mux[] = { - { .fw_name ="main_pll_c3" , - .name ="main_pll_c3" , }, - { .fw_name ="peri_pll_c3" , - .name ="peri_pll_c3" , }, + { .fw_name ="main_pll_c2" , + .name ="main_pll_c2" , }, + { .fw_name ="peri_pll_c2" , + .name ="peri_pll_c2" , }, { .fw_name ="osc1" , .name ="osc1" , }, { .fw_name ="cb-intosc-hs-div2-clk" ,
Greg Kroah-Hartman
maintainerPATCH 28/432 clk: socfpga: agilex: fix up s2f_user0_clk representation
In reply to Greg Kroah-HartmanFrom: Dinh Nguyen <[email protected]>
commit f817c132db679d492d96c60993fa2f2c67ab18d0 upstream.
Correct the s2f_user0_mux clock representation.
--- drivers/clk/socfpga/clk-agilex.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/clk/socfpga/clk-agilex.c +9 -0
@@ -195,6 +195,13 @@ static const struct clk_parent_data sdmm .name = "boot_clk", }, }; +static const struct clk_parent_data s2f_user0_mux[] = { + { .fw_name ="s2f_user0_free_clk" , + .name ="s2f_user0_free_clk" , }, + { .fw_name ="boot_clk" , + .name ="boot_clk" , }, +}; +static const struct clk_parent_data s2f_user1_mux[] = { { .fw_name ="s2f_user1_free_clk" , .name = "s2f_user1_free_clk", },
@@ -319,6 +326,8 @@ static const struct stratix10_gate_clock 4, 0x98, 0, 16, 0x88, 3, 0}, {AGILEX_SDMMC_CLK ,"sdmmc_clk" ,NULL , sdmmc_mux,ARRAY_SIZE (sdmmc_mux),0 ,0x7C , 5, 0, 0, 0, 0x88, 4, 4}, + { AGILEX_S2F_USER0_CLK, "s2f_user0_clk", NULL, s2f_user0_mux, ARRAY_SIZE(s2f_user0_mux), 0, 0x24, + 6, 0, 0, 0, 0x30, 2, 0}, { AGILEX_S2F_USER1_CLK, "s2f_user1_clk", NULL, s2f_user1_mux, ARRAY_SIZE(s2f_user1_mux), 0, 0x7C, 6, 0, 0, 0, 0x88, 5, 0}, { AGILEX_PSI_REF_CLK, "psi_ref_clk", NULL, psi_mux, ARRAY_SIZE(psi_mux), 0, 0x7C,
Greg Kroah-Hartman
maintainerPATCH 29/432 clk: socfpga: agilex: add the bypass register for s2f_usr0 clock
In reply to Greg Kroah-HartmanFrom: Dinh Nguyen <[email protected]>
commit d17929eb1066d1c1653aae9bb4396a9f1d6602ac upstream.
Add the bypass register for the s2f_user0_clk.
--- drivers/clk/socfpga/clk-agilex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/socfpga/clk-agilex.c +1 -1
@@ -280,7 +280,7 @@ static const struct stratix10_perip_cnt_ {AGILEX_SDMMC_FREE_CLK ,"sdmmc_free_clk" ,NULL , sdmmc_free_mux, ARRAY_SIZE(sdmmc_free_mux), 0, 0xE4, 0, 0, 0}, { AGILEX_S2F_USER0_FREE_CLK, "s2f_user0_free_clk", NULL, s2f_usr0_free_mux, - ARRAY_SIZE(s2f_usr0_free_mux), 0, 0xE8, 0, 0, 0}, + ARRAY_SIZE(s2f_usr0_free_mux), 0, 0xE8, 0, 0x30, 2}, { AGILEX_S2F_USER1_FREE_CLK, "s2f_user1_free_clk", NULL, s2f_usr1_free_mux, ARRAY_SIZE(s2f_usr1_free_mux), 0, 0xEC, 0, 0x88, 5}, { AGILEX_PSI_REF_FREE_CLK, "psi_ref_free_clk", NULL, psi_ref_free_mux,
Greg Kroah-Hartman
maintainerPATCH 30/432 pinctrl: stmfx: Fix hazardous u8[] to unsigned long cast
In reply to Greg Kroah-HartmanFrom: Marc Zyngier <[email protected]>
commit 1b73e588f47397dee6e4bdfd953e0306c60b5fe5 upstream.
Casting a small array of u8 to an unsigned long is *never* OK:
- it does funny thing when the array size is less than that of a long, as it accesses random places in the stack
- it makes everything even more fun with a BE kernel
Fix this by building the unsigned long used as a bitmap byte by byte, in a way that works across endianess and has no undefined behaviours.
An extra BUILD_BUG_ON() catches the unlikely case where the array would be larger than a single unsigned long.
--- drivers/pinctrl/pinctrl-stmfx.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/pinctrl/pinctrl-stmfx.c +4 -2
@@ -566,7 +566,7 @@ static irqreturn_t stmfx_pinctrl_irq_thru8 pending[NR_GPIO_REGS ];u8 src[NR_GPIO_REGS ] = {0 ,0 ,0 };unsigned long n, status; -int ret; +int i, ret; ret =regmap_bulk_read (pctl->stmfx->map,STMFX_REG_IRQ_GPI_PENDING , &pending,NR_GPIO_REGS );
@@ -576,7 +576,9 @@ static irqreturn_t stmfx_pinctrl_irq_thrregmap_bulk_write (pctl->stmfx->map,STMFX_REG_IRQ_GPI_SRC , src,NR_GPIO_REGS ); - status = *(unsigned long *)pending; +BUILD_BUG_ON (NR_GPIO_REGS >sizeof (status)); +for (i =0 , status =0 ; i <NR_GPIO_REGS ; i++) + status |= (unsigned long )pending[i] << (i *8 );for_each_set_bit (n, &status, gc->ngpio) {handle_nested_irq (irq_find_mapping (gc->irq.domain, n));stmfx_pinctrl_irq_toggle_trigger (pctl, n);
Greg Kroah-Hartman
maintainerPATCH 31/432 pinctrl: ingenic: Fix incorrect pull up/down info
In reply to Greg Kroah-HartmanFrom: Paul Cercueil <[email protected]>
commit d5e931403942b3af39212960c2592b5ba741b2bf upstream.
Fix the pull up/down info for both the JZ4760 and JZ4770 SoCs, as the previous values sometimes contradicted what's written in the programming manual.
--- drivers/pinctrl/pinctrl-ingenic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/pinctrl/pinctrl-ingenic.c +3 -3
@@ -710,7 +710,7 @@ static const struct ingenic_chip_info jz };static const u32 jz4760_pull_ups[6 ] = { -0xffffffff ,0xfffcf3ff ,0xffffffff ,0xffffcfff ,0xfffffb7c ,0xfffff00f , +0xffffffff ,0xfffcf3ff ,0xffffffff ,0xffffcfff ,0xfffffb7c ,0x0000000f , };static const u32 jz4760_pull_downs[6 ] = {
@@ -936,11 +936,11 @@ static const struct ingenic_chip_info jz };static const u32 jz4770_pull_ups[6 ] = { -0x3fffffff ,0xfff0030c ,0xffffffff ,0xffff4fff ,0xfffffb7c ,0xffa7f00f , +0x3fffffff ,0xfff0f3fc ,0xffffffff ,0xffff4fff ,0xfffffb7c ,0x0024f00f , };static const u32 jz4770_pull_downs[6 ] = { -0x00000000 ,0x000f0c03 ,0x00000000 ,0x0000b000 ,0x00000483 ,0x00580ff0 , +0x00000000 ,0x000f0c03 ,0x00000000 ,0x0000b000 ,0x00000483 ,0x005b0ff0 , };static int jz4770_uart0_data_pins[] = {0xa0 ,0xa3 , };
Greg Kroah-Hartman
maintainerPATCH 32/432 pinctrl: ingenic: Fix bias config for X2000(E)
In reply to Greg Kroah-HartmanFrom: Paul Cercueil <[email protected]>
commit 7261851e938f4b0fe8c0f5a8e627ae90e1ba9875 upstream.
The ingenic_set_bias() function's "bias" argument is not a "enum pin_config_param", so its value should not be compared against values of that enum.
This should fix the bias config not working on the X2000(E) SoCs.
--- drivers/pinctrl/pinctrl-ingenic.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/pinctrl/pinctrl-ingenic.c +3 -3
@@ -3441,17 +3441,17 @@ static void ingenic_set_bias(struct inge {if (jzpc->info->version >=ID_X2000 ) {switch (bias) { -case PIN_CONFIG_BIAS_PULL_UP : +case GPIO_PULL_UP :ingenic_config_pin (jzpc, pin,X2000_GPIO_PEPD , false);ingenic_config_pin (jzpc, pin,X2000_GPIO_PEPU , true);break ; -case PIN_CONFIG_BIAS_PULL_DOWN : +case GPIO_PULL_DOWN :ingenic_config_pin (jzpc, pin,X2000_GPIO_PEPU , false);ingenic_config_pin (jzpc, pin,X2000_GPIO_PEPD , true);break ; -case PIN_CONFIG_BIAS_DISABLE : +case GPIO_PULL_DIS :default :ingenic_config_pin (jzpc, pin,X2000_GPIO_PEPU , false);ingenic_config_pin (jzpc, pin,X2000_GPIO_PEPD , false);
Greg Kroah-Hartman
maintainerPATCH 33/432 soc: mediatek: mmsys: Fix missing UFOE component in mt8173 table routing
In reply to Greg Kroah-HartmanFrom: Enric Balletbo i Serra <[email protected]>
commit 25423731956b3d72bc35d336227c88ada49148e8 upstream.
The UFOE (data compression engine) component needs to be enabled to have the imgtec gpu driver working. If we don't enable it we see a black screen. Looks like when we switched to use and array for setting the routing registers in commit 440147639ac7 ("soc: mediatek: mmsys: Use an array for setting the routing registers") we missed to add this component in the new routing table, it was present before that commit, so fix it by adding this component in the mt8173 routing table.
--- drivers/soc/mediatek/mtk-mmsys.h | 4 ++++ 1 file changed, 4 insertions(+)
drivers/soc/mediatek/mtk-mmsys.h +4 -0
@@ -262,6 +262,10 @@ static const struct mtk_mmsys_routes mms DDP_COMPONENT_RDMA2, DDP_COMPONENT_DSI3,DISP_REG_CONFIG_DSIO_SEL_IN ,DSI3_SEL_IN_MASK ,DSI3_SEL_IN_RDMA2 + }, { +DDP_COMPONENT_UFOE ,DDP_COMPONENT_DSI0 , +DISP_REG_CONFIG_DISP_UFOE_MOUT_EN ,UFOE_MOUT_EN_DSI0 , +UFOE_MOUT_EN_DSI0 } };
Greg Kroah-Hartman
maintainerPATCH 34/432 soc: qcom: aoss: Fix the out of bound usage of cooling_devs
In reply to Greg Kroah-HartmanFrom: Manivannan Sadhasivam <[email protected]>
commit a89f355e469dcda129c2522be4fdba00c1c74c83 upstream.
In "qmp_cooling_devices_register", the count value is initially QMP_NUM_COOLING_RESOURCES, which is 2. Based on the initial count value, the memory for cooling_devs is allocated. Then while calling the "qmp_cooling_device_add" function, count value is post-incremented for each child node.
This makes the out of bound access to the cooling_dev array. Fix it by passing the QMP_NUM_COOLING_RESOURCES definition to devm_kzalloc() and initializing the count to 0.
While at it, let's also free the memory allocated to cooling_dev if no cooling device is found in DT and during unroll phase.
--- drivers/soc/qcom/qcom_aoss.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/soc/qcom/qcom_aoss.c +6 -2
@@ -476,12 +476,12 @@ static int qmp_cooling_device_add(structstatic int qmp_cooling_devices_register (struct qmp *qmp) {struct device_node *np, *child; -int count =QMP_NUM_COOLING_RESOURCES ; +int count =0 ;int ret; np = qmp->dev->of_node; - qmp->cooling_devs =devm_kcalloc (qmp->dev, count, + qmp->cooling_devs =devm_kcalloc (qmp->dev,QMP_NUM_COOLING_RESOURCES ,sizeof (*qmp->cooling_devs),GFP_KERNEL );
@@ -497,12 +497,16 @@ static int qmp_cooling_devices_register( goto unroll; } +if (!count) +devm_kfree (qmp->dev, qmp->cooling_devs); +return 0 ; unroll:while (--count >=0 )thermal_cooling_device_unregister (qmp->cooling_devs[count].cdev); +devm_kfree (qmp->dev, qmp->cooling_devs);return ret; }
Greg Kroah-Hartman
maintainerPATCH 35/432 soc: aspeed: lpc-ctrl: Fix boundary check for mmap
In reply to Greg Kroah-HartmanFrom: Iwona Winiarska <[email protected]>
commit b49a0e69a7b1a68c8d3f64097d06dabb770fec96 upstream.
The check mixes pages (vm_pgoff) with bytes (vm_start, vm_end) on one side of the comparison, and uses resource address (rather than just the resource size) on the other side of the comparison.
This can allow malicious userspace to easily bypass the boundary check and map pages that are located outside memory-region reserved by the driver.
--- drivers/soc/aspeed/aspeed-lpc-ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/aspeed/aspeed-lpc-ctrl.c +1 -1
@@ -51,7 +51,7 @@ static int aspeed_lpc_ctrl_mmap(struct funsigned long vsize = vma->vm_end - vma->vm_start;pgprot_t prot = vma->vm_page_prot; -if (vma->vm_pgoff + vsize > lpc_ctrl->mem_base + lpc_ctrl->mem_size) +if (vma->vm_pgoff +vma_pages (vma) > lpc_ctrl->mem_size >>PAGE_SHIFT )return -EINVAL ;/* ast2400/2500 AHB accesses are not cache coherent */
Greg Kroah-Hartman
maintainerPATCH 36/432 soc: aspeed: p2a-ctrl: Fix boundary check for mmap
In reply to Greg Kroah-HartmanFrom: Iwona Winiarska <[email protected]>
commit 8b07e990fb254fcbaa919616ac77f981cb48c73d upstream.
The check mixes pages (vm_pgoff) with bytes (vm_start, vm_end) on one side of the comparison, and uses resource address (rather than just the resource size) on the other side of the comparison.
This can allow malicious userspace to easily bypass the boundary check and map pages that are located outside memory-region reserved by the driver.
--- drivers/soc/aspeed/aspeed-p2a-ctrl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/soc/aspeed/aspeed-p2a-ctrl.c +1 -1
@@ -110,7 +110,7 @@ static int aspeed_p2a_mmap(struct file * vsize = vma->vm_end - vma->vm_start; prot = vma->vm_page_prot; -if (vma->vm_pgoff + vsize > ctrl->mem_base + ctrl->mem_size) +if (vma->vm_pgoff +vma_pages (vma) > ctrl->mem_size >>PAGE_SHIFT )return -EINVAL ;/* ast2400/2500 AHB accesses are not cache coherent */
Greg Kroah-Hartman
maintainerPATCH 37/432 arm64: Move .hyp.rodata outside of the _sdata.._edata range
In reply to Greg Kroah-HartmanFrom: Marc Zyngier <[email protected]>
commit eb48d154cd0dade56a0e244f0cfa198ea2925ed3 upstream.
The HYP rodata section is currently lumped together with the BSS, which isn't exactly what is expected (it gets registered with kmemleak, for example).
Move it away so that it is actually marked RO. As an added benefit, it isn't registered with kmemleak anymore.
--- arch/arm64/kernel/vmlinux.lds.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm64/kernel/vmlinux.lds.S +2 -2
@@ -181,6 +181,8 @@ SECTIONS /* everything from this point to __init_begin will be marked RO NX */ RO_DATA(PAGE_SIZE) + HYPERVISOR_DATA_SECTIONS + idmap_pg_dir = .; . += IDMAP_DIR_SIZE; idmap_pg_end = .;
@@ -260,8 +262,6 @@ SECTIONS _sdata = .; RW_DATA(L1_CACHE_BYTES, PAGE_SIZE, THREAD_ALIGN) - HYPERVISOR_DATA_SECTIONS - /* * Data written with the MMU off but read with the MMU on requires * cache lines to be invalidated, discarding up to a Cache Writeback
Greg Kroah-Hartman
maintainerPATCH 38/432 arm64: mm: Fix TLBI vs ASID rollover
In reply to Greg Kroah-HartmanFrom: Will Deacon <[email protected]>
commit 5e10f9887ed85d4f59266d5c60dd09be96b5dbd4 upstream.
When switching to an 'mm_struct' for the first time following an ASID rollover, a new ASID may be allocated and assigned to 'mm->context.id'. This reassignment can happen concurrently with other operations on the mm, such as unmapping pages and subsequently issuing TLB invalidation.
Consequently, we need to ensure that (a) accesses to 'mm->context.id' are atomic and (b) all page-table updates made prior to a TLBI using the old ASID are guaranteed to be visible to CPUs running with the new ASID.
This was found by inspection after reviewing the VMID changes from Shameer but it looks like a real (yet hard to hit) bug.
--- arch/arm64/include/asm/mmu.h | 29 +++++++++++++++++++++++++---- arch/arm64/include/asm/tlbflush.h | 11 ++++++----- 2 files changed, 31 insertions(+), 9 deletions(-)
arch/arm64/include/asm/mmu.h +25 -4
@@ -27,11 +27,32 @@ typedef struct { } mm_context_t;/* -* This macro is only used by the TLBI and low-level switch_mm() code, -* neither of which can race with an ASID change. We therefore don't -* need to reload the counter using atomic64_read(). +* We use atomic64_read() here because the ASID for an 'mm_struct' can +* be reallocated when scheduling one of its threads following a +* rollover event (see new_context() and flush_context()). In this case, +* a concurrent TLBI (e.g. via try_to_unmap_one() and ptep_clear_flush()) +* may use a stale ASID. This is fine in principle as the new ASID is +* guaranteed to be clean in the TLB, but the TLBI routines have to take +* care to handle the following race: +* +* CPU 0 CPU 1 CPU 2 +* +* // ptep_clear_flush(mm) +* xchg_relaxed(pte, 0) +* DSB ISHST +* old = ASID(mm) +* | <rollover> +* | new = new_context(mm) +* \-----------------> atomic_set(mm->context.id, new) +* cpu_switch_mm(mm) +* // Hardware walk of pte using new ASID +* TLBI(old) +* +* In this scenario, the barrier on CPU 0 and the dependency on CPU 1 +* ensure that the page-table walker on CPU 1 *must* see the invalid PTE +* written by CPU 0. */ -#define ASID (mm) ((mm)->context.id.counter & 0xffff) +#define ASID (mm) (atomic64_read(&(mm)->context.id) & 0xffff)static inline bool arm64_kernel_unmapped_at_el0 (void ) {
arch/arm64/include/asm/tlbflush.h +6 -5
@@ -245,9 +245,10 @@ static inline void flush_tlb_all(void)static inline void flush_tlb_mm (struct mm_struct *mm) { -unsigned long asid =__TLBI_VADDR (0 ,ASID (mm)); +unsigned long asid;dsb (ishst); + asid =__TLBI_VADDR (0 ,ASID (mm));__tlbi (aside1is, asid);__tlbi_user (aside1is, asid);dsb (ish);
@@ -256,9 +257,10 @@ static inline void flush_tlb_mm(struct mstatic inline void flush_tlb_page_nosync (struct vm_area_struct *vma,unsigned long uaddr) { -unsigned long addr =__TLBI_VADDR (uaddr,ASID (vma->vm_mm)); +unsigned long addr;dsb (ishst); + addr =__TLBI_VADDR (uaddr,ASID (vma->vm_mm));__tlbi (vale1is, addr);__tlbi_user (vale1is, addr); }
@@ -283,9 +285,7 @@ static inline void __flush_tlb_range(str {int num =0 ;int scale =0 ; -unsigned long asid =ASID (vma->vm_mm); -unsigned long addr; -unsigned long pages; +unsigned long asid, addr, pages; start =round_down (start, stride); end =round_up (end, stride);
@@ -305,6 +305,7 @@ static inline void __flush_tlb_range(str }dsb (ishst); + asid =ASID (vma->vm_mm);/* * When the CPU does not support TLB range operations, flush the TLB
Greg Kroah-Hartman
maintainerPATCH 39/432 arm64: head: avoid over-mapping in map_memory
In reply to Greg Kroah-HartmanFrom: Mark Rutland <[email protected]>
commit 90268574a3e8a6b883bd802d702a2738577e1006 upstream.
The compute_indices and populate_entries macros operate on inclusive bounds, and thus the map_memory macro which uses them also operates on inclusive bounds.
We pass _end and _idmap_text_end to map_memory, but these are exclusive bounds, and if one of these is sufficiently aligned (as a result of kernel configuration, physical placement, and KASLR), then:
* In compute_indices, the computed iend will be in the page/block *after* the final byte of the intended mapping.
* In populate_entries, an unnecessary entry will be created at the end of each level of table. At the leaf level, this entry will map up to SWAPPER_BLOCK_SIZE bytes of physical addresses that we did not intend to map.
As we may map up to SWAPPER_BLOCK_SIZE bytes more than intended, we may violate the boot protocol and map physical address past the 2MiB-aligned end address we are permitted to map. As we map these with Normal memory attributes, this may result in further problems depending on what these physical addresses correspond to.
The final entry at each level may require an additional table at that level. As EARLY_ENTRIES() calculates an inclusive bound, we allocate enough memory for this.
Avoid the extraneous mapping by having map_memory convert the exclusive end address to an inclusive end address by subtracting one, and do likewise in EARLY_ENTRIES() when calculating the number of required tables. For clarity, comments are updated to more clearly document which boundaries the macros operate on. For consistency with the other macros, the comments in map_memory are also updated to describe vstart and vend as virtual addresses.
--- arch/arm64/include/asm/kernel-pgtable.h | 4 ++-- arch/arm64/kernel/head.S | 11 ++++++----- 2 files changed, 8 insertions(+), 7 deletions(-)
arch/arm64/include/asm/kernel-pgtable.h +2 -2
@@ -65,8 +65,8 @@#define EARLY_KASLR (0)#endif -#define EARLY_ENTRIES (vstart, vend, shift) (((vend) >> (shift)) \ - - ((vstart) >> (shift)) + 1 + EARLY_KASLR) +#define EARLY_ENTRIES (vstart, vend, shift) \ + ((((vend) - 1) >> (shift)) - ((vstart) >> (shift)) + 1 + EARLY_KASLR)#define EARLY_PGDS (vstart, vend) (EARLY_ENTRIES(vstart, vend, PGDIR_SHIFT))
arch/arm64/kernel/head.S +6 -5
@@ -177,7 +177,7 @@ SYM_CODE_END(preserve_boot_args) * to be composed of multiple pages. (This effectively scales the end index). * * vstart: virtual address of start of range - * vend: virtual address of end of range + * vend: virtual address of end of range - we map [vstart, vend] * shift: shift used to transform virtual address into index * ptrs: number of entries in page table * istart: index in table corresponding to vstart
@@ -214,17 +214,18 @@ SYM_CODE_END(preserve_boot_args) * * tbl: location of page table * rtbl: address to be used for first level page table entry (typically tbl + PAGE_SIZE) - * vstart: start address to map - * vend: end address to map - we map [vstart, vend] + * vstart: virtual address of start of range + * vend: virtual address of end of range - we map [vstart, vend - 1] * flags: flags to use to map last level entries * phys: physical address corresponding to vstart - physical memory is contiguous * pgds: the number of pgd entries * * Temporaries: istart, iend, tmp, count, sv - these need to be different registers - * Preserves: vstart, vend, flags - * Corrupts: tbl, rtbl, istart, iend, tmp, count, sv + * Preserves: vstart, flags + * Corrupts: tbl, rtbl, vend, istart, iend, tmp, count, sv */ .macro map_memory, tbl, rtbl, vstart, vend, flags, phys, pgds, istart, iend, tmp, count, sv + sub \vend, \vend, #1 add \rtbl, \tbl, #PAGE_SIZE mov \sv, \rtbl mov \count, #0
Greg Kroah-Hartman
maintainerPATCH 40/432 arm64: Do not trap PMSNEVFR_EL1
In reply to Greg Kroah-HartmanFrom: Alexandru Elisei <[email protected]>
commit 50cb99fa89aa2bec2cab2f9917010bbd7769bfa3 upstream.
Commit 31c00d2aeaa2 ("arm64: Disable fine grained traps on boot") zeroed the fine grained trap registers to prevent unwanted register traps from occuring. However, for the PMSNEVFR_EL1 register, the corresponding HDFG{R,W}TR_EL2.nPMSNEVFR_EL1 fields must be 1 to disable trapping. Set both fields to 1 if FEAT_SPEv1p2 is detected to disable read and write traps.
--- arch/arm64/include/asm/el2_setup.h | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-)
arch/arm64/include/asm/el2_setup.h +11 -2
@@ -149,8 +149,17 @@ ubfx x1, x1, #ID_AA64MMFR0_FGT_SHIFT, #4 cbz x1, .Lskip_fgt_\@ - msr_s SYS_HDFGRTR_EL2, xzr - msr_s SYS_HDFGWTR_EL2, xzr + mov x0, xzr + mrs x1, id_aa64dfr0_el1 + ubfx x1, x1, #ID_AA64DFR0_PMSVER_SHIFT, #4 + cmp x1, #3 + b.lt .Lset_fgt_\@ +/* Disable PMSNEVFR_EL1 read and write traps */ + orr x0, x0, #(1 << 62) + +.Lset_fgt_\@: + msr_s SYS_HDFGRTR_EL2, x0 + msr_s SYS_HDFGWTR_EL2, x0 msr_s SYS_HFGRTR_EL2, xzr msr_s SYS_HFGWTR_EL2, xzr msr_s SYS_HFGITR_EL2, xzr
Greg Kroah-Hartman
maintainerPATCH 41/432 iio: ltc2983: fix device probe
In reply to Greg Kroah-HartmanFrom: Nuno Sá <[email protected]>
commit b76d26d69ecc97ebb24aaf40427a13c808a4f488 upstream.
There is no reason to assume that the IRQ rising edge (indicating that the device start up phase is done) will happen after we request the IRQ. If the device is already up by the time we request it, the call to 'wait_for_completion_timeout()' will timeout and we will fail the device probe even though there's nothing wrong.
Fix it by just polling the status register until we get the indication that the device is up and running. As a side effect of this fix, requesting the IRQ is also moved to after the setup function.
--- drivers/iio/temperature/ltc2983.c | 30 ++++++++++++++---------------- 1 file changed, 14 insertions(+), 16 deletions(-)
drivers/iio/temperature/ltc2983.c +14 -16
@@ -89,6 +89,8 @@#define LTC2983_STATUS_START_MASK BIT(7)#define LTC2983_STATUS_START (x) FIELD_PREP(LTC2983_STATUS_START_MASK, x) +#define LTC2983_STATUS_UP_MASK GENMASK(7, 6) +#define LTC2983_STATUS_UP (reg) FIELD_GET(LTC2983_STATUS_UP_MASK, reg)#define LTC2983_STATUS_CHAN_SEL_MASK GENMASK(4, 0)#define LTC2983_STATUS_CHAN_SEL (x) \
@@ -1362,17 +1364,16 @@ put_child:static int ltc2983_setup (struct ltc2983_data *st,bool assign_iio) { -u32 iio_chan_t =0 , iio_chan_v =0 , chan, iio_idx =0 ; +u32 iio_chan_t =0 , iio_chan_v =0 , chan, iio_idx =0 , status;int ret; -unsigned long time; - -/* make sure the device is up */ - time =wait_for_completion_timeout (&st->completion, -msecs_to_jiffies (250 )); -if (!time) { +/* make sure the device is up: start bit (7) is 0 and done bit (6) is 1 */ + ret =regmap_read_poll_timeout (st->regmap,LTC2983_STATUS_REG , status, +LTC2983_STATUS_UP (status) ==1 ,25000 , +25000 *10 ); +if (ret) {dev_err (&st->spi->dev,"Device startup timed out\n" ); -return -ETIMEDOUT ; +return ret; } st->iio_chan = devm_kzalloc(&st->spi->dev,
@@ -1492,10 +1493,11 @@ static int ltc2983_probe(struct spi_devi ret =ltc2983_parse_dt (st);if (ret)return ret; -/* -* let's request the irq now so it is used to sync the device -* startup in ltc2983_setup() -*/ + + ret =ltc2983_setup (st, true); +if (ret) +return ret; + ret =devm_request_irq (&spi->dev, spi->irq, ltc2983_irq_handler,IRQF_TRIGGER_RISING , name, st);if (ret) {
@@ -1503,10 +1505,6 @@ static int ltc2983_probe(struct spi_devireturn ret; } - ret =ltc2983_setup (st, true); -if (ret) -return ret; - indio_dev->name = name; indio_dev->num_channels = st->iio_channels; indio_dev->channels = st->iio_chan;
Greg Kroah-Hartman
maintainerPATCH 42/432 wcn36xx: Ensure finish scan is not requested before start scan
In reply to Greg Kroah-HartmanFrom: Joseph Gates <[email protected]>
commit d195d7aac09bddabc2c8326fb02fcec2b0a2de02 upstream.
If the operating channel is the first in the scan list, it was seen that a finish scan request would be sent before a start scan request was sent, causing the firmware to fail all future scans. Track the current channel being scanned to avoid requesting the scan finish before it starts.
--- drivers/net/wireless/ath/wcn36xx/main.c | 5 ++++- drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-)
drivers/net/wireless/ath/wcn36xx/main.c +4 -1
@@ -408,13 +408,14 @@ static int wcn36xx_config(struct ieee802wcn36xx_dbg (WCN36XX_DBG_MAC ,"wcn36xx_config channel switch=%d\n" , ch); -if (wcn->sw_scan_opchannel == ch) { +if (wcn->sw_scan_opchannel == ch && wcn->sw_scan_channel) {/* If channel is the initial operating channel, we may * want to receive/transmit regular data packets, then * simply stop the scan session and exit PS mode. */ wcn36xx_smd_finish_scan (wcn,HAL_SYS_MODE_SCAN , wcn->sw_scan_vif); + wcn->sw_scan_channel =0 ; }else if (wcn->sw_scan) {/* A scan is ongoing, do not change the operating * channel, but start a scan session on the channel.
@@ -422,6 +423,7 @@ static int wcn36xx_config(struct ieee802wcn36xx_smd_init_scan (wcn,HAL_SYS_MODE_SCAN , wcn->sw_scan_vif);wcn36xx_smd_start_scan (wcn, ch); + wcn->sw_scan_channel = ch; }else {wcn36xx_change_opchannel (wcn, ch); }
@@ -702,6 +704,7 @@ static void wcn36xx_sw_scan_start(struct wcn->sw_scan = true; wcn->sw_scan_vif = vif; + wcn->sw_scan_channel =0 ;if (vif_priv->sta_assoc) wcn->sw_scan_opchannel =WCN36XX_HW_CHANNEL (wcn);else
drivers/net/wireless/ath/wcn36xx/wcn36xx.h +1 -0
@@ -246,6 +246,7 @@ struct wcn36xx {struct cfg80211_scan_request *scan_req;bool sw_scan;u8 sw_scan_opchannel; +u8 sw_scan_channel;struct ieee80211_vif *sw_scan_vif;struct mutex scan_lock;bool scan_aborted;
Greg Kroah-Hartman
maintainerPATCH 43/432 crypto: public_key: fix overflow during implicit conversion
In reply to Greg Kroah-HartmanFrom: zhenwei pi <[email protected]>
commit f985911b7bc75d5c98ed24d8aaa8b94c590f7c6a upstream.
Hit kernel warning like this, it can be reproduced by verifying 256 bytes datafile by keyctl command, run script:
RAWDATA=rawdata
SIGDATA=sigdata
modprobe pkcs8_key_parser
rm -rf *.der *.pem *.pfx
rm -rf $RAWDATA
dd if=/dev/random of=$RAWDATA bs=256 count=1
openssl req -nodes -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem \
-subj "/C=CN/ST=GD/L=SZ/O=vihoo/OU=dev/CN=xx.com/[email protected]"
KEY_ID=`openssl pkcs8 -in key.pem -topk8 -nocrypt -outform DER | keyctl \
padd asymmetric 123 @s`
keyctl pkey_sign $KEY_ID 0 $RAWDATA enc=pkcs1 hash=sha1 > $SIGDATA keyctl pkey_verify $KEY_ID 0 $RAWDATA $SIGDATA enc=pkcs1 hash=sha1
Then the kernel reports:
WARNING: CPU: 5 PID: 344556 at crypto/rsa-pkcs1pad.c:540 pkcs1pad_verify+0x160/0x190 ... Call Trace: public_key_verify_signature+0x282/0x380 ? software_key_query+0x12d/0x180 ? keyctl_pkey_params_get+0xd6/0x130 asymmetric_key_verify_signature+0x66/0x80 keyctl_pkey_verify+0xa5/0x100 do_syscall_64+0x35/0xb0 entry_SYSCALL_64_after_hwframe+0x44/0xae
The reason of this issue, in function 'asymmetric_key_verify_signature':
'.digest_size(u8) = params->in_len(u32)' leads overflow of an u8 value, so use u32 instead of u8 for digest_size field. And reorder struct public_key_signature, it saves 8 bytes on a 64-bit machine.
--- include/crypto/public_key.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/crypto/public_key.h +2 -2
@@ -38,9 +38,9 @@ extern void public_key_free(struct publistruct public_key_signature {struct asymmetric_key_id *auth_ids[2 ];u8 *s;/* Signature */ -u32 s_size;/* Number of bytes in signature */ u8 *digest; -u8 digest_size;/* Number of bytes in digest */ +u32 s_size;/* Number of bytes in signature */ +u32 digest_size;/* Number of bytes in digest */ const char *pkey_algo;const char *hash_algo;const char *encoding;
Greg Kroah-Hartman
maintainerPATCH 44/432 block: bfq: fix bfq_set_next_ioprio_data()
In reply to Greg Kroah-HartmanFrom: Damien Le Moal <[email protected]>
commit a680dd72ec336b81511e3bff48efac6dbfa563e7 upstream.
For a request that has a priority level equal to or larger than IOPRIO_BE_NR, bfq_set_next_ioprio_data() prints a critical warning but defaults to setting the request new_ioprio field to IOPRIO_BE_NR. This is not consistent with the warning and the allowed values for priority levels. Fix this by setting the request new_ioprio field to IOPRIO_BE_NR - 1, the lowest priority level allowed.
--- block/bfq-iosched.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
block/bfq-iosched.c +1 -1
@@ -5296,7 +5296,7 @@ bfq_set_next_ioprio_data(struct bfq_queuif (bfqq->new_ioprio >=IOPRIO_BE_NR ) {pr_crit ("bfq_set_next_ioprio_data: new_ioprio %d\n" , bfqq->new_ioprio); - bfqq->new_ioprio =IOPRIO_BE_NR ; + bfqq->new_ioprio =IOPRIO_BE_NR -1 ; } bfqq->entity.new_weight =bfq_ioprio_to_weight (bfqq->new_ioprio);
Greg Kroah-Hartman
maintainerPATCH 45/432 power: supply: max17042: handle fails of reading status register
In reply to Greg Kroah-HartmanFrom: Krzysztof Kozlowski <[email protected]>
commit 54784ffa5b267f57161eb8fbb811499f22a0a0bf upstream.
Reading status register can fail in the interrupt handler. In such case, the regmap_read() will not store anything useful under passed 'val' variable and random stack value will be used to determine type of interrupt.
Handle the regmap_read() failure to avoid handling interrupt type and triggering changed power supply event based on random stack value.
--- drivers/power/supply/max17042_battery.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/power/supply/max17042_battery.c +5 -1
@@ -869,8 +869,12 @@ static irqreturn_t max17042_thread_handl {struct max17042_chip *chip = dev;u32 val; +int ret; + + ret =regmap_read (chip->regmap,MAX17042_STATUS , &val); +if (ret) +return IRQ_HANDLED ; -regmap_read (chip->regmap,MAX17042_STATUS , &val);if ((val &STATUS_INTR_SOCMIN_BIT ) || (val &STATUS_INTR_SOCMAX_BIT )) {dev_info (&chip->client->dev,"SOC threshold INTR\n" );
Greg Kroah-Hartman
maintainerPATCH 46/432 cpufreq: schedutil: Use kobject release() method to free sugov_tunables
In reply to Greg Kroah-HartmanFrom: Kevin Hao <[email protected]>
commit e5c6b312ce3cc97e90ea159446e6bfa06645364d upstream.
The struct sugov_tunables is protected by the kobject, so we can't free
it directly. Otherwise we would get a call trace like this:
ODEBUG: free active (active state 0) object type: timer_list hint: delayed_work_timer_fn+0x0/0x30
WARNING: CPU: 3 PID: 720 at lib/debugobjects.c:505 debug_print_object+0xb8/0x100 Modules linked in: CPU: 3 PID: 720 Comm: a.sh Tainted: G W 5.14.0-rc1-next-20210715-yocto-standard+ #507 Hardware name: Marvell OcteonTX CN96XX board (DT) pstate: 40400009 (nZcv daif +PAN -UAO -TCO BTYPE=--) pc : debug_print_object+0xb8/0x100 lr : debug_print_object+0xb8/0x100 sp : ffff80001ecaf910 x29: ffff80001ecaf910 x28: ffff00011b10b8d0 x27: ffff800011043d80 x26: ffff00011a8f0000 x25: ffff800013cb3ff0 x24: 0000000000000000 x23: ffff80001142aa68 x22: ffff800011043d80 x21: ffff00010de46f20 x20: ffff800013c0c520 x19: ffff800011d8f5b0 x18: 0000000000000010 x17: 6e6968207473696c x16: 5f72656d6974203a x15: 6570797420746365 x14: 6a626f2029302065 x13: 303378302f307830 x12: 2b6e665f72656d69 x11: ffff8000124b1560 x10: ffff800012331520 x9 : ffff8000100ca6b0 x8 : 000000000017ffe8 x7 : c0000000fffeffff x6 : 0000000000000001 x5 : ffff800011d8c000 x4 : ffff800011d8c740 x3 : 0000000000000000 x2 : ffff0001108301c0 x1 : ab3c90eedf9c0f00 x0 : 0000000000000000 Call trace: debug_print_object+0xb8/0x100 __debug_check_no_obj_freed+0x1c0/0x230 debug_check_no_obj_freed+0x20/0x88 slab_free_freelist_hook+0x154/0x1c8 kfree+0x114/0x5d0 sugov_exit+0xbc/0xc0 cpufreq_exit_governor+0x44/0x90 cpufreq_set_policy+0x268/0x4a8 store_scaling_governor+0xe0/0x128 store+0xc0/0xf0 sysfs_kf_write+0x54/0x80 kernfs_fop_write_iter+0x128/0x1c0 new_sync_write+0xf0/0x190 vfs_write+0x2d4/0x478 ksys_write+0x74/0x100 __arm64_sys_write+0x24/0x30 invoke_syscall.constprop.0+0x54/0xe0 do_el0_svc+0x64/0x158 el0_svc+0x2c/0xb0 el0t_64_sync_handler+0xb0/0xb8 el0t_64_sync+0x198/0x19c irq event stamp: 5518 hardirqs last enabled at (5517): [<ffff8000100cbd7c>] console_unlock+0x554/0x6c8 hardirqs last disabled at (5518): [<ffff800010fc0638>] el1_dbg+0x28/0xa0 softirqs last enabled at (5504): [<ffff8000100106e0>] __do_softirq+0x4d0/0x6c0 softirqs last disabled at (5483): [<ffff800010049548>] irq_exit+0x1b0/0x1b8
So split the original sugov_tunables_free() into two functions, sugov_clear_global_tunables() is just used to clear the global_tunables and the new sugov_tunables_free() is used as kobj_type::release to release the sugov_tunables safely.
--- kernel/sched/cpufreq_schedutil.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
kernel/sched/cpufreq_schedutil.c +11 -5
@@ -537,9 +537,17 @@ static struct attribute *sugov_attrs[] = };ATTRIBUTE_GROUPS (sugov); +static void sugov_tunables_free (struct kobject *kobj) +{ + struct gov_attr_set *attr_set = container_of(kobj, struct gov_attr_set, kobj); + +kfree (to_sugov_tunables (attr_set)); +} +static struct kobj_type sugov_tunables_ktype = { .default_groups = sugov_groups, .sysfs_ops = &governor_sysfs_ops, + .release = &sugov_tunables_free, };/********************** cpufreq governor interface *********************/
@@ -639,12 +647,10 @@ static struct sugov_tunables *sugov_tunareturn tunables; } -static void sugov_tunables_free (struct sugov_tunables *tunables) +static void sugov_clear_global_tunables (void ) {if (!have_governor_per_policy ()) global_tunables =NULL ; - -kfree (tunables); }static int sugov_init (struct cpufreq_policy *policy)
@@ -707,7 +713,7 @@ out: fail:kobject_put (&tunables->attr_set.kobj); policy->governor_data =NULL ; -sugov_tunables_free (tunables); +sugov_clear_global_tunables (); stop_kthread:sugov_kthread_stop (sg_policy);
@@ -734,7 +740,7 @@ static void sugov_exit(struct cpufreq_po count =gov_attr_set_put (&tunables->attr_set, &sg_policy->tunables_hook); policy->governor_data =NULL ;if (!count) -sugov_tunables_free (tunables); +sugov_clear_global_tunables ();mutex_unlock (&global_tunables_lock);
Re: [PATCH 5.14 046/432] cpufreq: schedutil: Use kobject release() method to free sugov_tunables
Quoted 114 lines · Greg Kroah-Hartman
From: Kevin Hao <[email protected]>
commit
e5c6b312ce3cc97e90ea159446e6bfa06645364dupstream.The struct
sugov_tunablesis protected by the kobject, so we can't free it directly. Otherwise we would get a call trace like this:ODEBUG: free active (active state 0) object type: timer_list hint: delayed_work_timer_fn+0x0/0x30 WARNING: CPU: 3 PID: 720 at lib/debugobjects.c:505 debug_print_object+0xb8/0x100 Modules linked in: CPU: 3 PID: 720 Comm: a.sh Tainted: G W 5.14.0-rc1-next-20210715-yocto-standard+ #507 Hardware name: Marvell OcteonTX CN96XX board (DT) pstate: 40400009 (nZcv daif +PAN -UAO -TCO BTYPE=--) pc : debug_print_object+0xb8/0x100 lr : debug_print_object+0xb8/0x100 sp : ffff80001ecaf910 x29: ffff80001ecaf910 x28: ffff00011b10b8d0 x27: ffff800011043d80 x26: ffff00011a8f0000 x25: ffff800013cb3ff0 x24: 0000000000000000 x23: ffff80001142aa68 x22: ffff800011043d80 x21: ffff00010de46f20 x20: ffff800013c0c520 x19: ffff800011d8f5b0 x18: 0000000000000010 x17: 6e6968207473696c x16: 5f72656d6974203a x15: 6570797420746365 x14: 6a626f2029302065 x13: 303378302f307830 x12: 2b6e665f72656d69 x11: ffff8000124b1560 x10: ffff800012331520 x9 : ffff8000100ca6b0 x8 : 000000000017ffe8 x7 : c0000000fffeffff x6 : 0000000000000001 x5 : ffff800011d8c000 x4 : ffff800011d8c740 x3 : 0000000000000000 x2 : ffff0001108301c0 x1 : ab3c90eedf9c0f00 x0 : 0000000000000000 Call trace: debug_print_object+0xb8/0x100 __debug_check_no_obj_freed+0x1c0/0x230 debug_check_no_obj_freed+0x20/0x88 slab_free_freelist_hook+0x154/0x1c8 kfree+0x114/0x5d0 sugov_exit+0xbc/0xc0 cpufreq_exit_governor+0x44/0x90 cpufreq_set_policy+0x268/0x4a8 store_scaling_governor+0xe0/0x128 store+0xc0/0xf0 sysfs_kf_write+0x54/0x80 kernfs_fop_write_iter+0x128/0x1c0 new_sync_write+0xf0/0x190 vfs_write+0x2d4/0x478 ksys_write+0x74/0x100 __arm64_sys_write+0x24/0x30 invoke_syscall.constprop.0+0x54/0xe0 do_el0_svc+0x64/0x158 el0_svc+0x2c/0xb0 el0t_64_sync_handler+0xb0/0xb8 el0t_64_sync+0x198/0x19c irq event stamp: 5518 hardirqs last enabled at (5517): [<ffff8000100cbd7c>] console_unlock+0x554/0x6c8 hardirqs last disabled at (5518): [<ffff800010fc0638>] el1_dbg+0x28/0xa0 softirqs last enabled at (5504): [<ffff8000100106e0>] __do_softirq+0x4d0/0x6c0 softirqs last disabled at (5483): [<ffff800010049548>] irq_exit+0x1b0/0x1b8So split the original
sugov_tunables_free()into two functions,sugov_clear_global_tunables()is just used to clear theglobal_tunablesand the newsugov_tunables_free()is used askobj_type::releaseto release thesugov_tunablessafely.Fixes 9bdcb44e391d ("cpufreq: schedutil: New governor based on scheduler utilization data")Cc 4.7+ <[email protected]> # 4.7+Signed-off-by Kevin Hao <[email protected]>Acked-by Viresh Kumar <[email protected]>Signed-off-by Rafael J. Wysocki <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- kernel/sched/cpufreq_schedutil.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)kernel/sched/cpufreq_schedutil.c +10
-4@@ -537,9 +537,17 @@ static struct attribute *sugov_attrs[] = };ATTRIBUTE_GROUPS (sugov); +static void sugov_tunables_free (struct kobject *kobj) +{ + struct gov_attr_set *attr_set = container_of(kobj, struct gov_attr_set, kobj); + +kfree (to_sugov_tunables (attr_set)); +} +static struct kobj_type sugov_tunables_ktype = { .default_groups = sugov_groups, .sysfs_ops = &governor_sysfs_ops, + .release = &sugov_tunables_free, };/********************** cpufreq governor interface *********************/ @@ -639,12 +647,10 @@ static struct sugov_tunables *sugov_tunareturn tunables; } -static void sugov_tunables_free (struct sugov_tunables *tunables) +static void sugov_clear_global_tunables (void ) {if (!have_governor_per_policy ()) global_tunables =NULL ; - -kfree (tunables); }static int sugov_init (struct cpufreq_policy *policy)@@ -707,7 +713,7 @@ out: fail:kobject_put (&tunables->attr_set.kobj); policy->governor_data =NULL ; -sugov_tunables_free (tunables); +sugov_clear_global_tunables (); stop_kthread:sugov_kthread_stop (sg_policy);
kernel/sched/cpufreq_schedutil.c static void sugov_exit(struct cpufreq_po · line 746
Quoted 8 lines
kernel/sched/cpufreq_schedutil.c +1
-1@@ -734,7 +740,7 @@ static void sugov_exit(struct cpufreq_po count =gov_attr_set_put (&tunables->attr_set, &sg_policy->tunables_hook); policy->governor_data =NULL ;if (!count) -sugov_tunables_free (tunables); +sugov_clear_global_tunables ();mutex_unlock (&global_tunables_lock);
Please defer adding this one.
Greg Kroah-Hartman
maintainerPATCH 47/432 dm crypt: Avoid percpu_counter spinlock contention in crypt_page_alloc()
In reply to Greg Kroah-HartmanFrom: Arne Welzel <[email protected]>
commit 528b16bfc3ae5f11638e71b3b63a81f9999df727 upstream.
On systems with many cores using dm-crypt, heavy spinlock contention in percpu_counter_compare() can be observed when the page allocation limit for a given device is reached or close to be reached. This is due to percpu_counter_compare() taking a spinlock to compute an exact result on potentially many CPUs at the same time.
Switch to non-exact comparison of allocated and allowed pages by using the value returned by percpu_counter_read_positive() to avoid taking the percpu_counter spinlock.
This may over/under estimate the actual number of allocated pages by at most (batch-1) * num_online_cpus().
Currently, batch is bounded by 32. The system on which this issue was first observed has 256 CPUs and 512GB of RAM. With a 4k page size, this change may over/under estimate by 31MB. With ~10G (2%) allowed dm-crypt allocations, this seems an acceptable error. Certainly preferred over running into the spinlock contention.
This behavior was reproduced on an EC2 c5.24xlarge instance with 96 CPUs and 192GB RAM as follows, but can be provoked on systems with less CPUs as well.
* Disable swap
* Tune vm settings to promote regular writeback
$ echo 50 > /proc/sys/vm/dirty_expire_centisecs
$ echo 25 > /proc/sys/vm/dirty_writeback_centisecs
$ echo $((128 * 1024 * 1024)) > /proc/sys/vm/dirty_background_bytes * Create 8 dmcrypt devices based on files on a tmpfs
* Create and mount an ext4 filesystem on each crypt devices
* Run stress-ng --hdd 8 within one of above filesystems
Total %system usage collected from sysstat goes to ~35%. Write throughput on the underlying loop device is ~2GB/s. perf profiling an individual kworker kcryptd thread shows the following profile, indicating spinlock contention in percpu_counter_compare():
99.98% 0.00% kworker/u193:46 [kernel.kallsyms] [k] ret_from_fork
|
--ret_from_fork
kthread
worker_thread
|
--99.92%--process_one_work
|
|--80.52%--kcryptd_crypt
| |
| |--62.58%--mempool_alloc
| | |
| | --62.24%--crypt_page_alloc
| | |
| | --61.51%--__percpu_counter_compare
| | |
| | --61.34%--__percpu_counter_sum
| | |
| | |--58.68%--_raw_spin_lock_irqsave
| | | |
| | | --58.30%--native_queued_spin_lock_slowpath
| | |
| | --0.69%--cpumask_next
| | |
| | --0.51%--_find_next_bit
| |
| |--10.61%--crypt_convert
| | |
| | |--6.05%--xts_crypt
...After applying this patch and running the same test, %system usage is lowered to ~7% and write throughput on the loop device increases to ~2.7GB/s. perf report shows mempool_alloc() as ~8% rather than ~62% in the profile and not hitting the percpu_counter() spinlock anymore.
|--8.15%--mempool_alloc
| |
| |--3.93%--crypt_page_alloc
| | |
| | --3.75%--__alloc_pages
| | |
| | --3.62%--get_page_from_freelist
| | |
| | --3.22%--rmqueue_bulk
| | |
| | --2.59%--_raw_spin_lock
| | |
| | --2.57%--native_queued_spin_lock_slowpath
| |
| --3.05%--_raw_spin_lock_irqsave
| |
| --2.49%--native_queued_spin_lock_slowpath--- drivers/md/dm-crypt.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/md/dm-crypt.c +6 -1
@@ -2661,7 +2661,12 @@ static void *crypt_page_alloc(gfp_t gfp_struct crypt_config *cc = pool_data;struct page *page; -if (unlikely (percpu_counter_compare (&cc->n_allocated_pages, dm_crypt_pages_per_client) >=0 ) && +/* +* Note, percpu_counter_read_positive() may over (and under) estimate +* the current usage by at most (batch - 1) * num_online_cpus() pages, +* but avoids potential spinlock contention of an exact result. +*/ +if (unlikely (percpu_counter_read_positive (&cc->n_allocated_pages) >= dm_crypt_pages_per_client) &&likely (gfp_mask & __GFP_NORETRY))return NULL ;
Greg Kroah-Hartman
maintainerPATCH 48/432 crypto: ccp - shutdown SEV firmware on kexec
In reply to Greg Kroah-HartmanFrom: Brijesh Singh <[email protected]>
commit 5441a07a127f106c9936e4f9fa1a8a93e3f31828 upstream.
The commit 97f9ac3db6612 ("crypto: ccp - Add support for SEV-ES to the PSP driver") added support to allocate Trusted Memory Region (TMR) used during the SEV-ES firmware initialization. The TMR gets locked during the firmware initialization and unlocked during the shutdown. While the TMR is locked, access to it is disallowed.
Currently, the CCP driver does not shutdown the firmware during the kexec reboot, leaving the TMR memory locked.
Register a callback to shutdown the SEV firmware on the kexec boot.
--- drivers/crypto/ccp/sev-dev.c | 49 ++++++++++++++++++++----------------------- drivers/crypto/ccp/sp-pci.c | 12 ++++++++++ 2 files changed, 35 insertions(+), 26 deletions(-)
drivers/crypto/ccp/sev-dev.c +23 -26
@@ -300,6 +300,9 @@ static int __sev_platform_shutdown_lockestruct sev_device *sev = psp_master->sev_data;int ret; +if (sev->state ==SEV_STATE_UNINIT ) +return 0 ; + ret =__sev_do_cmd_locked (SEV_CMD_SHUTDOWN ,NULL , error);if (ret)return ret;
@@ -1019,6 +1022,20 @@ e_err:return ret; } +static void sev_firmware_shutdown (struct sev_device *sev) +{ +sev_platform_shutdown (NULL ); + +if (sev_es_tmr) { +/* The TMR area was encrypted, flush it from the cache */ +wbinvd_on_all_cpus (); + +free_pages ((unsigned long )sev_es_tmr, +get_order (SEV_ES_TMR_SIZE )); + sev_es_tmr =NULL ; + } +} +void sev_dev_destroy (struct psp_device *psp) {struct sev_device *sev = psp->sev_data;
@@ -1026,6 +1043,8 @@ void sev_dev_destroy(struct psp_device *if (!sev)return ; +sev_firmware_shutdown (sev); +if (sev->misc)kref_put (&misc_dev->refcount, sev_exit);
@@ -1056,21 +1075,6 @@ void sev_pci_init(void)if (sev_get_api_version ()) goto err; -/* -* If platform is not in UNINIT state then firmware upgrade and/or -* platform INIT command will fail. These command require UNINIT state. -* -* In a normal boot we should never run into case where the firmware -* is not in UNINIT state on boot. But in case of kexec boot, a reboot -* may not go through a typical shutdown sequence and may leave the -* firmware in INIT or WORKING state. -*/ - -if (sev->state !=SEV_STATE_UNINIT ) { -sev_platform_shutdown (NULL ); - sev->state =SEV_STATE_UNINIT ; - } -if (sev_version_greater_or_equal (0 ,15 ) &&sev_update_firmware (sev->dev) ==0 )sev_get_api_version ();
@@ -1115,17 +1119,10 @@ err:void sev_pci_exit (void ) { -if (!psp_master->sev_data) -return ; - -sev_platform_shutdown (NULL ); +struct sev_device *sev = psp_master->sev_data; -if (sev_es_tmr) { -/* The TMR area was encrypted, flush it from the cache */ -wbinvd_on_all_cpus (); +if (!sev) +return ; -free_pages ((unsigned long )sev_es_tmr, -get_order (SEV_ES_TMR_SIZE )); - sev_es_tmr =NULL ; - } +sev_firmware_shutdown (sev); }
drivers/crypto/ccp/sp-pci.c +12 -0
@@ -241,6 +241,17 @@ e_err:return ret; } +static void sp_pci_shutdown (struct pci_dev *pdev) +{ +struct device *dev = &pdev->dev; +struct sp_device *sp =dev_get_drvdata (dev); + +if (!sp) +return ; + +sp_destroy (sp); +} +static void sp_pci_remove (struct pci_dev *pdev) {struct device *dev = &pdev->dev;
@@ -371,6 +382,7 @@ static struct pci_driver sp_pci_driver = .id_table = sp_pci_table, .probe = sp_pci_probe, .remove = sp_pci_remove, + .shutdown = sp_pci_shutdown, .driver.pm = &sp_pci_pm_ops, };
Greg Kroah-Hartman
maintainerPATCH 49/432 spi: fsi: Reduce max transfer size to 8 bytes
In reply to Greg Kroah-HartmanFrom: Eddie James <[email protected]>
commit 34d34a56a5ea1e54a5af4f34c6ac9df724129351 upstream.
Security changes have forced the SPI controllers to be limited to 8 byte reads. Refactor the sequencing to just handle 8 bytes at a time.
--- drivers/spi/spi-fsi.c | 125 ++++++++------------------------------------------ 1 file changed, 22 insertions(+), 103 deletions(-)
drivers/spi/spi-fsi.c +22 -103
@@ -25,16 +25,11 @@#define SPI_FSI_BASE 0x70000#define SPI_FSI_INIT_TIMEOUT_MS 1000 -#define SPI_FSI_MAX_XFR_SIZE 2048 -#define SPI_FSI_MAX_XFR_SIZE_RESTRICTED 8 +#define SPI_FSI_MAX_RX_SIZE 8 +#define SPI_FSI_MAX_TX_SIZE 40#define SPI_FSI_ERROR 0x0#define SPI_FSI_COUNTER_CFG 0x1 -#define SPI_FSI_COUNTER_CFG_LOOPS (x) (((u64)(x) & 0xffULL) << 32) -#define SPI_FSI_COUNTER_CFG_N2_RX BIT_ULL(8) -#define SPI_FSI_COUNTER_CFG_N2_TX BIT_ULL(9) -#define SPI_FSI_COUNTER_CFG_N2_IMPLICIT BIT_ULL(10) -#define SPI_FSI_COUNTER_CFG_N2_RELOAD BIT_ULL(11)#define SPI_FSI_CFG1 0x2#define SPI_FSI_CLOCK_CFG 0x3#define SPI_FSI_CLOCK_CFG_MM_ENABLE BIT_ULL(32)
@@ -76,8 +71,6 @@ struct fsi_spi {struct device *dev;/* SPI controller device */ struct fsi_device *fsi;/* FSI2SPI CFAM engine device */ u32 base; -size_t max_xfr_size; -bool restricted; };struct fsi_spi_sequence {
@@ -241,7 +234,7 @@ static int fsi_spi_reset(struct fsi_spireturn fsi_spi_write_reg (ctx,SPI_FSI_STATUS ,0ULL ); } -static int fsi_spi_sequence_add (struct fsi_spi_sequence *seq,u8 val) +static void fsi_spi_sequence_add (struct fsi_spi_sequence *seq,u8 val) {/* * Add the next byte of instruction to the 8-byte sequence register.
@@ -251,8 +244,6 @@ static int fsi_spi_sequence_add(struct f*/ seq->data |= (u64 )val << seq->bit; seq->bit -=8 ; - -return ((64 - seq->bit) /8 ) -2 ; }static void fsi_spi_sequence_init (struct fsi_spi_sequence *seq)
@@ -261,71 +252,11 @@ static void fsi_spi_sequence_init(struct seq->data =0ULL ; } -static int fsi_spi_sequence_transfer (struct fsi_spi *ctx, -struct fsi_spi_sequence *seq, -struct spi_transfer *transfer) -{ -int loops; -int idx; -int rc; -u8 val =0 ; -u8 len =min (transfer->len,8U ); -u8 rem = transfer->len % len; - - loops = transfer->len / len; - -if (transfer->tx_buf) { - val =SPI_FSI_SEQUENCE_SHIFT_OUT (len); - idx =fsi_spi_sequence_add (seq, val); - -if (rem) - rem =SPI_FSI_SEQUENCE_SHIFT_OUT (rem); - }else if (transfer->rx_buf) { - val =SPI_FSI_SEQUENCE_SHIFT_IN (len); - idx =fsi_spi_sequence_add (seq, val); - -if (rem) - rem =SPI_FSI_SEQUENCE_SHIFT_IN (rem); - }else { -return -EINVAL ; - } - -if (ctx->restricted && loops >1 ) { -dev_warn (ctx->dev, -"Transfer too large; no branches permitted.\n" ); -return -EINVAL ; - } - -if (loops >1 ) { -u64 cfg =SPI_FSI_COUNTER_CFG_LOOPS (loops -1 ); - -fsi_spi_sequence_add (seq,SPI_FSI_SEQUENCE_BRANCH (idx)); - -if (transfer->rx_buf) - cfg |=SPI_FSI_COUNTER_CFG_N2_RX | -SPI_FSI_COUNTER_CFG_N2_TX | -SPI_FSI_COUNTER_CFG_N2_IMPLICIT | -SPI_FSI_COUNTER_CFG_N2_RELOAD ; - - rc =fsi_spi_write_reg (ctx,SPI_FSI_COUNTER_CFG , cfg); -if (rc) -return rc; - }else { -fsi_spi_write_reg (ctx,SPI_FSI_COUNTER_CFG ,0ULL ); - } - -if (rem) -fsi_spi_sequence_add (seq, rem); - -return 0 ; -} -static int fsi_spi_transfer_data (struct fsi_spi *ctx,struct spi_transfer *transfer) {int rc =0 ;u64 status =0ULL ; -u64 cfg =0ULL ;if (transfer->tx_buf) {int nb;
@@ -363,16 +294,6 @@ static int fsi_spi_transfer_data(structu64 in =0ULL ;u8 *rx = transfer->rx_buf; - rc =fsi_spi_read_reg (ctx,SPI_FSI_COUNTER_CFG , &cfg); -if (rc) -return rc; - -if (cfg &SPI_FSI_COUNTER_CFG_N2_IMPLICIT ) { - rc =fsi_spi_write_reg (ctx,SPI_FSI_DATA_TX ,0 ); -if (rc) -return rc; - } - while (transfer->len > recv) { do { rc = fsi_spi_read_reg(ctx, SPI_FSI_STATUS,
@@ -439,6 +360,10 @@ static int fsi_spi_transfer_init(struct } }while (seq_state && (seq_state !=SPI_FSI_STATUS_SEQ_STATE_IDLE )); + rc =fsi_spi_write_reg (ctx,SPI_FSI_COUNTER_CFG ,0ULL ); +if (rc) +return rc; + rc =fsi_spi_read_reg (ctx,SPI_FSI_CLOCK_CFG , &clock_cfg);if (rc)return rc;
@@ -459,6 +384,7 @@ static int fsi_spi_transfer_one_message( {int rc;u8 seq_slave =SPI_FSI_SEQUENCE_SEL_SLAVE (mesg->spi->chip_select +1 ); +unsigned int len;struct spi_transfer *transfer;struct fsi_spi *ctx =spi_controller_get_devdata (ctlr);
@@ -471,8 +397,7 @@ static int fsi_spi_transfer_one_message(struct spi_transfer *next =NULL ;/* Sequencer must do shift out (tx) first. */ -if (!transfer->tx_buf || - transfer->len > (ctx->max_xfr_size +8 )) { +if (!transfer->tx_buf || transfer->len >SPI_FSI_MAX_TX_SIZE ) { rc = -EINVAL ; goto error; }
@@ -486,9 +411,13 @@ static int fsi_spi_transfer_one_message(fsi_spi_sequence_init (&seq);fsi_spi_sequence_add (&seq, seq_slave); - rc =fsi_spi_sequence_transfer (ctx, &seq, transfer); -if (rc) - goto error; + len = transfer->len; +while (len >8 ) { +fsi_spi_sequence_add (&seq, +SPI_FSI_SEQUENCE_SHIFT_OUT (8 )); + len -=8 ; + } +fsi_spi_sequence_add (&seq,SPI_FSI_SEQUENCE_SHIFT_OUT (len));if (!list_is_last (&transfer->transfer_list, &mesg->transfers)) {
@@ -496,7 +425,9 @@ static int fsi_spi_transfer_one_message(/* Sequencer can only do shift in (rx) after tx. */ if (next->rx_buf) { -if (next->len > ctx->max_xfr_size) { +u8 shift; + +if (next->len >SPI_FSI_MAX_RX_SIZE ) { rc = -EINVAL ; goto error; }
@@ -504,10 +435,8 @@ static int fsi_spi_transfer_one_message(dev_dbg (ctx->dev,"Sequence rx of %d bytes.\n" , next->len); - rc =fsi_spi_sequence_transfer (ctx, &seq, - next); -if (rc) - goto error; + shift =SPI_FSI_SEQUENCE_SHIFT_IN (next->len); +fsi_spi_sequence_add (&seq, shift); }else { next =NULL ; }
@@ -541,9 +470,7 @@ error:static size_t fsi_spi_max_transfer_size (struct spi_device *spi) { -struct fsi_spi *ctx =spi_controller_get_devdata (spi->controller); - -return ctx->max_xfr_size; +return SPI_FSI_MAX_RX_SIZE ; }static int fsi_spi_probe (struct device *dev)
@@ -582,14 +509,6 @@ static int fsi_spi_probe(struct device * ctx->fsi = fsi; ctx->base = base +SPI_FSI_BASE ; -if (of_device_is_compatible (np,"ibm,fsi2spi-restricted" )) { - ctx->restricted = true; - ctx->max_xfr_size =SPI_FSI_MAX_XFR_SIZE_RESTRICTED ; - }else { - ctx->restricted = false; - ctx->max_xfr_size =SPI_FSI_MAX_XFR_SIZE ; - } - rc =devm_spi_register_controller (dev, ctlr);if (rc)spi_controller_put (ctlr);
Greg Kroah-Hartman
maintainerPATCH 50/432 VMCI: fix NULL pointer dereference when unmapping queue pair
In reply to Greg Kroah-HartmanFrom: Wang Hai <[email protected]>
commit a30dc6cf0dc51419021550152e435736aaef8799 upstream.
I got a NULL pointer dereference report when doing fuzz test:
Call Trace: qp_release_pages+0xae/0x130 qp_host_unregister_user_memory.isra.25+0x2d/0x80 vmci_qp_broker_unmap+0x191/0x320 ? vmci_host_do_alloc_queuepair.isra.9+0x1c0/0x1c0 vmci_host_unlocked_ioctl+0x59f/0xd50 ? do_vfs_ioctl+0x14b/0xa10 ? tomoyo_file_ioctl+0x28/0x30 ? vmci_host_do_alloc_queuepair.isra.9+0x1c0/0x1c0 __x64_sys_ioctl+0xea/0x120 do_syscall_64+0x34/0xb0 entry_SYSCALL_64_after_hwframe+0x44/0xae
When a queue pair is created by the following call, it will not register the user memory if the page_store is NULL, and the entry->state will be set to VMCIQPB_CREATED_NO_MEM.
vmci_host_unlocked_ioctl
vmci_host_do_alloc_queuepair
vmci_qp_broker_alloc
qp_broker_alloc
qp_broker_create // set entry->state = VMCIQPB_CREATED_NO_MEM;When unmapping this queue pair, qp_host_unregister_user_memory() will be called to unregister the non-existent user memory, which will result in a null pointer reference. It will also change VMCIQPB_CREATED_NO_MEM to VMCIQPB_CREATED_MEM, which should not be present in this operation.
Only when the qp broker has mem, it can unregister the user memory when unmapping the qp broker.
Only when the qp broker has no mem, it can register the user memory when mapping the qp broker.
--- drivers/misc/vmw_vmci/vmci_queue_pair.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/misc/vmw_vmci/vmci_queue_pair.c +4 -2
@@ -2243,7 +2243,8 @@ int vmci_qp_broker_map(struct vmci_handle handle, result =VMCI_SUCCESS ; -if (context_id !=VMCI_HOST_CONTEXT_ID ) { +if (context_id !=VMCI_HOST_CONTEXT_ID && + !QPBROKERSTATE_HAS_MEM (entry)) {struct vmci_qp_page_store page_store; page_store.pages = guest_mem;
@@ -2350,7 +2351,8 @@ int vmci_qp_broker_unmap(struct vmci_handle handle, goto out; } -if (context_id !=VMCI_HOST_CONTEXT_ID ) { +if (context_id !=VMCI_HOST_CONTEXT_ID && +QPBROKERSTATE_HAS_MEM (entry)) {qp_acquire_queue_mutex (entry->produce_q); result =qp_save_headers (entry);if (result <VMCI_SUCCESS )
Signature · 1 line
2.33.0
Greg Kroah-Hartman
maintainerPATCH 51/432 media: uvc: dont do DMA on stack
In reply to Greg Kroah-HartmanFrom: Mauro Carvalho Chehab <[email protected]>
commit 1a10d7fdb6d0e235e9d230916244cc2769d3f170 upstream.
As warned by smatch:
drivers/media/usb/uvc/uvc_v4l2.c:911 uvc_ioctl_g_input() error: doing dma on the stack (&i) drivers/media/usb/uvc/uvc_v4l2.c:943 uvc_ioctl_s_input() error: doing dma on the stack (&i)
those two functions call uvc_query_ctrl passing a pointer to a data at the DMA stack. those are used to send URBs via usb_control_msg(). Using DMA stack is not supported and should not work anymore on modern Linux versions.
So, use a kmalloc'ed buffer.
--- drivers/media/usb/uvc/uvc_v4l2.c | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-)
drivers/media/usb/uvc/uvc_v4l2.c +23 -11
@@ -899,8 +899,8 @@ static int uvc_ioctl_g_input(struct file {struct uvc_fh *handle = fh;struct uvc_video_chain *chain = handle->chain; +u8 *buf;int ret; -u8 i;if (chain->selector ==NULL || (chain->dev->quirks &UVC_QUIRK_IGNORE_SELECTOR_UNIT )) {
@@ -908,22 +908,27 @@ static int uvc_ioctl_g_input(struct filereturn 0 ; } + buf =kmalloc (1 ,GFP_KERNEL ); +if (!buf) +return -ENOMEM ; + ret =uvc_query_ctrl (chain->dev,UVC_GET_CUR , chain->selector->id, chain->dev->intfnum,UVC_SU_INPUT_SELECT_CONTROL , - &i,1 ); -if (ret <0 ) -return ret; + buf,1 ); +if (!ret) + *input = *buf -1 ; - *input = i -1 ; -return 0 ; +kfree (buf); + +return ret; }static int uvc_ioctl_s_input (struct file *file,void *fh,unsigned int input) {struct uvc_fh *handle = fh;struct uvc_video_chain *chain = handle->chain; +u8 *buf;int ret; -u32 i; ret =uvc_acquire_privileges (handle);if (ret <0 )
@@ -939,10 +944,17 @@ static int uvc_ioctl_s_input(struct fileif (input >= chain->selector->bNrInPins)return -EINVAL ; - i = input +1 ; -return uvc_query_ctrl (chain->dev,UVC_SET_CUR , chain->selector->id, - chain->dev->intfnum,UVC_SU_INPUT_SELECT_CONTROL , - &i,1 ); + buf =kmalloc (1 ,GFP_KERNEL ); +if (!buf) +return -ENOMEM ; + + *buf = input +1 ; + ret =uvc_query_ctrl (chain->dev,UVC_SET_CUR , chain->selector->id, + chain->dev->intfnum,UVC_SU_INPUT_SELECT_CONTROL , + buf,1 ); +kfree (buf); + +return ret; } static int uvc_ioctl_queryctrl(struct file *file, void *fh,
Greg Kroah-Hartman
maintainerPATCH 52/432 media: rc-loopback: return number of emitters rather than error
In reply to Greg Kroah-HartmanFrom: Sean Young <[email protected]>
commit 6b7f554be8c92319d7e6df92fd247ebb9beb4a45 upstream.
The LIRC_SET_TRANSMITTER_MASK ioctl should return the number of emitters if an invalid list was set.
--- drivers/media/rc/rc-loopback.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/media/rc/rc-loopback.c +1 -1
@@ -42,7 +42,7 @@ static int loop_set_tx_mask(struct rc_deif ((mask & (RXMASK_REGULAR |RXMASK_LEARNING )) != mask) {dprintk ("invalid tx mask: %u\n" , mask); -return -EINVAL ; +return 2 ; }dprintk ("setting tx mask: %u\n" , mask);
Greg Kroah-Hartman
maintainerPATCH 53/432 nvmem: core: fix error handling while validating keepout regions
In reply to Greg Kroah-HartmanFrom: Srinivas Kandagatla <[email protected]>
commit de0534df93474f268486c486ea7e01b44a478026 upstream.
Current error path on failure of validating keepout regions is calling put_device, eventhough the device is not even registered at that point.
Fix this by adding proper error handling of freeing ida and nvmem.
--- drivers/nvmem/core.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
drivers/nvmem/core.c +5 -2
@@ -824,8 +824,11 @@ struct nvmem_device *nvmem_register(consif (nvmem->nkeepout) { rval =nvmem_validate_keepouts (nvmem); -if (rval) - goto err_put_device; +if (rval) { +ida_free (&nvmem_ida, nvmem->id); +kfree (nvmem); +return ERR_PTR (rval); + } }dev_dbg (&nvmem->dev,"Registering nvmem device %s\n" , config->name);
Greg Kroah-Hartman
maintainerPATCH 54/432 s390/qdio: fix roll-back after timeout on ESTABLISH ccw
In reply to Greg Kroah-HartmanFrom: Julian Wiedmann <[email protected]>
commit 2c197870e4701610ec3b1143808d4e31152caf30 upstream.
When qdio_establish() times out while waiting for the ESTABLISH ccw to complete, it calls qdio_shutdown() to roll back all of its previous actions. But at this point the qdio_irq's state is still QDIO_IRQ_STATE_INACTIVE, so qdio_shutdown() will exit immediately without doing any actual work.
Which means that eg. the qdio_irq's thinint-indicator stays registered, and cdev->handler isn't restored to its old value. And since commit 954d6235be41 ("s390/qdio: make thinint registration symmetric") the qdio_irq also stays on the tiq_list, so on the next qdio_establish() we might get a helpful BUG from the list-debugging code:
...
[ 4633.512591] list_add double add: new=00000000005a4110, prev=00000001b357db78, next=00000000005a4110. [ 4633.512621] ------------[ cut here ]------------ [ 4633.512623] kernel BUG at lib/list_debug.c:29! ... [ 4633.512796] [<00000001b2c6ee9a>] __list_add_valid+0x82/0xa0 [ 4633.512798] ([<00000001b2c6ee96>] __list_add_valid+0x7e/0xa0) [ 4633.512800] [<00000001b2fcecce>] qdio_establish_thinint+0x116/0x190 [ 4633.512805] [<00000001b2fcbe58>] qdio_establish+0x128/0x498
...
Fix this by extracting a goto-chain from the existing error exits in qdio_establish(), and check the return value of the wait_event_...() to detect the timeout condition.
--- drivers/s390/cio/qdio_main.c | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-)
drivers/s390/cio/qdio_main.c +19 -12
@@ -1083,6 +1083,7 @@ int qdio_establish(struct ccw_device *cd {struct qdio_irq *irq_ptr = cdev->private->qdio_data;struct subchannel_id schid; +long timeout;int rc;ccw_device_get_schid (cdev, &schid);
@@ -1111,11 +1112,8 @@ int qdio_establish(struct ccw_device *cdqdio_setup_irq (irq_ptr, init_data); rc =qdio_establish_thinint (irq_ptr); -if (rc) { -qdio_shutdown_irq (irq_ptr); -mutex_unlock (&irq_ptr->setup_mutex); -return rc; - } +if (rc) + goto err_thinint;/* establish q */ irq_ptr->ccw.cmd_code = irq_ptr->equeue.cmd;
@@ -1131,15 +1129,16 @@ int qdio_establish(struct ccw_device *cdif (rc) {DBF_ERROR ("%4x est IO ERR" , irq_ptr->schid.sch_no);DBF_ERROR ("rc:%4x" , rc); -qdio_shutdown_thinint (irq_ptr); -qdio_shutdown_irq (irq_ptr); -mutex_unlock (&irq_ptr->setup_mutex); -return rc; + goto err_ccw_start; } -wait_event_interruptible_timeout (cdev->private->wait_q, - irq_ptr->state ==QDIO_IRQ_STATE_ESTABLISHED || - irq_ptr->state ==QDIO_IRQ_STATE_ERR ,HZ ); + timeout =wait_event_interruptible_timeout (cdev->private->wait_q, + irq_ptr->state ==QDIO_IRQ_STATE_ESTABLISHED || + irq_ptr->state ==QDIO_IRQ_STATE_ERR ,HZ ); +if (timeout <=0 ) { + rc = (timeout == -ERESTARTSYS ) ? -EINTR : -ETIME ; + goto err_ccw_timeout; + }if (irq_ptr->state !=QDIO_IRQ_STATE_ESTABLISHED ) {mutex_unlock (&irq_ptr->setup_mutex);
@@ -1156,6 +1155,14 @@ int qdio_establish(struct ccw_device *cdqdio_print_subchannel_info (irq_ptr);qdio_setup_debug_entries (irq_ptr);return 0 ; + +err_ccw_timeout: +err_ccw_start: +qdio_shutdown_thinint (irq_ptr); +err_thinint: +qdio_shutdown_irq (irq_ptr); +mutex_unlock (&irq_ptr->setup_mutex); +return rc; }EXPORT_SYMBOL_GPL (qdio_establish);
Greg Kroah-Hartman
maintainerPATCH 55/432 s390/qdio: cancel the ESTABLISH ccw after timeout
In reply to Greg Kroah-HartmanFrom: Julian Wiedmann <[email protected]>
commit 1c1dc8bda3a05c60877a6649775894db5343bdea upstream.
When the ESTABLISH ccw does not complete within the specified timeout, try our best to cancel the ccw program that is still active on the device. Otherwise the IO subsystem might be accessing it even after the driver eg. called qdio_free().
--- drivers/s390/cio/qdio_main.c | 51 +++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 21 deletions(-)
drivers/s390/cio/qdio_main.c +30 -21
@@ -890,6 +890,33 @@ static void qdio_shutdown_queues(struct } } +static int qdio_cancel_ccw (struct qdio_irq *irq,int how) +{ +struct ccw_device *cdev = irq->cdev; +int rc; + +spin_lock_irq (get_ccwdev_lock (cdev)); +qdio_set_state (irq,QDIO_IRQ_STATE_CLEANUP ); +if (how &QDIO_FLAG_CLEANUP_USING_CLEAR ) + rc =ccw_device_clear (cdev,QDIO_DOING_CLEANUP ); +else +/* default behaviour is halt */ + rc =ccw_device_halt (cdev,QDIO_DOING_CLEANUP ); +spin_unlock_irq (get_ccwdev_lock (cdev)); +if (rc) { +DBF_ERROR ("%4x SHUTD ERR" , irq->schid.sch_no); +DBF_ERROR ("rc:%4d" , rc); +return rc; + } + +wait_event_interruptible_timeout (cdev->private->wait_q, + irq->state ==QDIO_IRQ_STATE_INACTIVE || + irq->state ==QDIO_IRQ_STATE_ERR , +10 *HZ ); + +return 0 ; +} +/** * qdio_shutdown - shut down a qdio subchannel * @cdev: associated ccw device
@@ -927,27 +954,7 @@ int qdio_shutdown(struct ccw_device *cdeqdio_shutdown_queues (irq_ptr);qdio_shutdown_debug_entries (irq_ptr); -/* cleanup subchannel */ -spin_lock_irq (get_ccwdev_lock (cdev)); -qdio_set_state (irq_ptr,QDIO_IRQ_STATE_CLEANUP ); -if (how &QDIO_FLAG_CLEANUP_USING_CLEAR ) - rc =ccw_device_clear (cdev,QDIO_DOING_CLEANUP ); -else -/* default behaviour is halt */ - rc =ccw_device_halt (cdev,QDIO_DOING_CLEANUP ); -spin_unlock_irq (get_ccwdev_lock (cdev)); -if (rc) { -DBF_ERROR ("%4x SHUTD ERR" , irq_ptr->schid.sch_no); -DBF_ERROR ("rc:%4d" , rc); - goto no_cleanup; - } - -wait_event_interruptible_timeout (cdev->private->wait_q, - irq_ptr->state ==QDIO_IRQ_STATE_INACTIVE || - irq_ptr->state ==QDIO_IRQ_STATE_ERR , -10 *HZ ); - -no_cleanup: + rc =qdio_cancel_ccw (irq_ptr, how);qdio_shutdown_thinint (irq_ptr);qdio_shutdown_irq (irq_ptr);
@@ -1157,10 +1164,12 @@ int qdio_establish(struct ccw_device *cdreturn 0 ; err_ccw_timeout: +qdio_cancel_ccw (irq_ptr,QDIO_FLAG_CLEANUP_USING_CLEAR ); err_ccw_start:qdio_shutdown_thinint (irq_ptr); err_thinint:qdio_shutdown_irq (irq_ptr); +qdio_set_state (irq_ptr,QDIO_IRQ_STATE_INACTIVE );mutex_unlock (&irq_ptr->setup_mutex);return rc; }
Greg Kroah-Hartman
maintainerPATCH 56/432 Revert "dmaengine: imx-sdma: refine to load context only once"
In reply to Greg Kroah-HartmanFrom: Robin Gong <[email protected]>
commit 8592f02464d52776c5cfae4627c6413b0ae7602d upstream.
This reverts commit ad0d92d7ba6aecbe2705907c38ff8d8be4da1e9c, because in spi-imx case, burst length may be changed dynamically.
--- drivers/dma/imx-sdma.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/dma/imx-sdma.c +0 -8
@@ -433,7 +433,6 @@ struct sdma_channel {unsigned long watermark_level;u32 shp_addr, per_addr;enum dma_status status; -bool context_loaded;struct imx_dma_data data;struct work_struct terminate_worker; };
@@ -1008,9 +1007,6 @@ static int sdma_load_context(struct sdmaint ret;unsigned long flags; -if (sdmac->context_loaded) -return 0 ; -if (sdmac->direction ==DMA_DEV_TO_MEM ) load_address = sdmac->pc_from_device;else if (sdmac->direction ==DMA_DEV_TO_DEV )
@@ -1053,8 +1049,6 @@ static int sdma_load_context(struct sdmaspin_unlock_irqrestore (&sdma->channel_0_lock, flags); - sdmac->context_loaded = true; -return ret; }
@@ -1093,7 +1087,6 @@ static void sdma_channel_terminate_work(vchan_get_all_descriptors (&sdmac->vc, &head);spin_unlock_irqrestore (&sdmac->vc.lock, flags);vchan_dma_desc_free_list (&sdmac->vc, &head); - sdmac->context_loaded = false; }static int sdma_terminate_all (struct dma_chan *chan)
@@ -1361,7 +1354,6 @@ static void sdma_free_chan_resources(str sdmac->event_id0 =0 ; sdmac->event_id1 =0 ; - sdmac->context_loaded = false;sdma_set_channel_priority (sdmac,0 );
Greg Kroah-Hartman
maintainerPATCH 57/432 dmaengine: imx-sdma: remove duplicated sdma_load_context
In reply to Greg Kroah-HartmanFrom: Robin Gong <[email protected]>
commit e555a03b112838883fdd8185d613c35d043732f2 upstream.
Since sdma_transfer_init() will do sdma_load_context before any sdma transfer, no need once more in sdma_config_channel().
--- drivers/dma/imx-sdma.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/dma/imx-sdma.c +1 -4
@@ -1161,7 +1161,6 @@ static void sdma_set_watermarklevel_for_static int sdma_config_channel (struct dma_chan *chan) {struct sdma_channel *sdmac =to_sdma_chan (chan); -int ret;sdma_disable_channel (chan);
@@ -1201,9 +1200,7 @@ static int sdma_config_channel(struct dm sdmac->watermark_level =0 ;/* FIXME: M3_BASE_ADDRESS */ } - ret =sdma_load_context (sdmac); - -return ret; +return 0 ; } static int sdma_set_channel_priority(struct sdma_channel *sdmac,
Greg Kroah-Hartman
maintainerPATCH 58/432 watchdog: iTCO_wdt: Fix detection of SMI-off case
In reply to Greg Kroah-HartmanFrom: Jan Kiszka <[email protected]>
commit aec42642d91fc86ddc03e97f0139c6c34ee6b6b1 upstream.
Obviously, the test needs to run against the register content, not its address.
--- drivers/watchdog/iTCO_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/iTCO_wdt.c +1 -1
@@ -362,7 +362,7 @@ static int iTCO_wdt_set_timeout(struct w* Otherwise, the BIOS generally reboots when the SMI triggers. */ if (p->smi_res && - (SMI_EN (p) & (TCO_EN |GBL_SMI_EN )) != (TCO_EN |GBL_SMI_EN )) + (inl (SMI_EN (p)) & (TCO_EN |GBL_SMI_EN )) != (TCO_EN |GBL_SMI_EN )) tmrval /=2 ;/* from the specs: */
Greg Kroah-Hartman
maintainerPATCH 59/432 libata: add ATA_HORKAGE_NO_NCQ_TRIM for Samsung 860 and 870 SSDs
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
commit 8a6430ab9c9c87cb64c512e505e8690bbaee190b upstream.
Commit ca6bfcb2f6d9 ("libata: Enable queued TRIM for Samsung SSD 860") limited the existing ATA_HORKAGE_NO_NCQ_TRIM quirk from "Samsung SSD 8*", covering all Samsung 800 series SSDs, to only apply to "Samsung SSD 840*" and "Samsung SSD 850*" series based on information from Samsung.
But there is a large number of users which is still reporting issues with the Samsung 860 and 870 SSDs combined with Intel, ASmedia or Marvell SATA controllers and all reporters also report these problems going away when disabling queued trims.
Note that with AMD SATA controllers users are reporting even worse issues and only completely disabling NCQ helps there, this will be addressed in a separate patch.
--- drivers/ata/libata-core.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/ata/libata-core.c +4 -0
@@ -3950,6 +3950,10 @@ static const struct ata_blacklist_entry ATA_HORKAGE_ZERO_AFTER_TRIM, }, {"Samsung SSD 850*" ,NULL ,ATA_HORKAGE_NO_NCQ_TRIM | ATA_HORKAGE_ZERO_AFTER_TRIM, }, + { "Samsung SSD 860*", NULL, ATA_HORKAGE_NO_NCQ_TRIM | + ATA_HORKAGE_ZERO_AFTER_TRIM, }, + { "Samsung SSD 870*", NULL, ATA_HORKAGE_NO_NCQ_TRIM | + ATA_HORKAGE_ZERO_AFTER_TRIM, }, { "FCCT*M500*", NULL, ATA_HORKAGE_NO_NCQ_TRIM | ATA_HORKAGE_ZERO_AFTER_TRIM, },
Greg Kroah-Hartman
maintainerPATCH 60/432 ARM: 9105/1: atags_to_fdt: dont warn about stack size
In reply to Greg Kroah-HartmanFrom: David Heidelberg <[email protected]>
commit b30d0289de72c62516df03fdad8d53f552c69839 upstream.
The merge_fdt_bootargs() function by definition consumes more than 1024 bytes of stack because it has a 1024 byte command line on the stack, meaning that we always get a warning when building this file:
arch/arm/boot/compressed/atags_to_fdt.c: In function 'merge_fdt_bootargs':arch/arm/boot/compressed/atags_to_fdt.c:98:1: warning: the frame size of 1032 bytes is larger than 1024 bytes [-Wframe-larger-than=]
However, as this is the decompressor and we know that it has a very shallow call chain, and we do not actually risk overflowing the kernel stack at runtime here.
This just shuts up the warning by disabling the warning flag for this file.
Tested on Nexus 7 2012 builds.
--- arch/arm/boot/compressed/Makefile | 2 ++ 1 file changed, 2 insertions(+)
arch/arm/boot/compressed/Makefile +2 -0
@@ -85,6 +85,8 @@ compress-$(CONFIG_KERNEL_LZ4) = lz4 libfdt_objs := fdt_rw.o fdt_ro.o fdt_wip.o fdt.o ifeq ($(CONFIG_ARM_ATAG_DTB_COMPAT),y) +CFLAGS_REMOVE_atags_to_fdt.o += -Wframe-larger-than=${CONFIG_FRAME_WARN} +CFLAGS_atags_to_fdt.o += -Wframe-larger-than=1280 OBJS += $(libfdt_objs) atags_to_fdt.o endif ifeq ($(CONFIG_USE_OF),y)
Greg Kroah-Hartman
maintainerPATCH 61/432 sched: Prevent balance_push() on remote runqueues
In reply to Greg Kroah-HartmanFrom: Thomas Gleixner <[email protected]>
commit 868ad33bfa3bf39960982682ad3a0f8ebda1656e upstream.
sched_setscheduler() and rt_mutex_setprio() invoke the run-queue balance callback after changing priorities or the scheduling class of a task. The run-queue for which the callback is invoked can be local or remote.
That's not a problem for the regular rq::push_work which is serialized with a busy flag in the run-queue struct, but for the balance_push() work which is only valid to be invoked on the outgoing CPU that's wrong. It not only triggers the debug warning, but also leaves the per CPU variable push_work unprotected, which can result in double enqueues on the stop machine list.
Remove the warning and validate that the function is invoked on the outgoing CPU.
--- kernel/sched/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
kernel/sched/core.c +3 -3
@@ -8536,7 +8536,6 @@ static void balance_push(struct rq *rq)struct task_struct *push_task = rq->curr;lockdep_assert_rq_held (rq); -SCHED_WARN_ON (rq->cpu !=smp_processor_id ());/* * Ensure the thing is persistent until balance_push_set(.on = false);
@@ -8544,9 +8543,10 @@ static void balance_push(struct rq *rq) rq->balance_callback = &balance_push_callback;/* -* Only active while going offline. +* Only active while going offline and when invoked on the outgoing +* CPU. */ -if (!cpu_dying (rq->cpu)) +if (!cpu_dying (rq->cpu) || rq !=this_rq ())return ;/*
Greg Kroah-Hartman
maintainerPATCH 62/432 f2fs: lets keep writing IOs on SBI_NEED_FSCK
In reply to Greg Kroah-HartmanFrom: Jaegeuk Kim <[email protected]>
commit 1ffc8f5f7751f91fe6af527d426a723231b741a6 upstream.
SBI_NEED_FSCK is an indicator that fsck.f2fs needs to be triggered, so it is not fully critical to stop any IO writes. So, let's allow to write data instead of reporting EIO forever given SBI_NEED_FSCK, but do keep OPU.
--- fs/f2fs/data.c | 2 ++ fs/f2fs/segment.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)
fs/f2fs/data.c +2 -0
@@ -2498,6 +2498,8 @@ bool f2fs_should_update_outplace(structreturn true;if (f2fs_is_atomic_file (inode))return true; +if (is_sbi_flag_set (sbi,SBI_NEED_FSCK )) +return true;/* swap file is migrating in aligned write mode */ if (is_inode_flag_set (inode,FI_ALIGNED_WRITE ))
fs/f2fs/segment.c +1 -1
@@ -3563,7 +3563,7 @@ int f2fs_inplace_write_data(struct f2fs_ goto drop_bio; } -if (is_sbi_flag_set (sbi,SBI_NEED_FSCK ) ||f2fs_cp_error (sbi)) { +if (f2fs_cp_error (sbi)) { err = -EIO ; goto drop_bio; }
Greg Kroah-Hartman
maintainerPATCH 63/432 f2fs: fix to do sanity check for sb/cp fields correctly
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
commit 65ddf6564843890a58ee3b18bb46ce67d96333fb upstream.
This patch fixes below problems of sb/cp sanity check:
- in sanity_check_raw_superi(), it missed to consider log header blocks while cp_payload check.
- in f2fs_sanity_check_ckpt(), it missed to check nat_bits_blocks.
--- fs/f2fs/super.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-)
fs/f2fs/super.c +18 -4
@@ -3217,11 +3217,13 @@ static int sanity_check_raw_super(structreturn -EFSCORRUPTED ; } -if (le32_to_cpu (raw_super->cp_payload) > - (blocks_per_seg -F2FS_CP_PACKS )) { -f2fs_info (sbi,"Insane cp_payload (%u > %u)" , +if (le32_to_cpu (raw_super->cp_payload) >= + (blocks_per_seg -F2FS_CP_PACKS - +NR_CURSEG_PERSIST_TYPE )) { +f2fs_info (sbi,"Insane cp_payload (%u >= %u)" ,le32_to_cpu (raw_super->cp_payload), - blocks_per_seg -F2FS_CP_PACKS ); + blocks_per_seg -F2FS_CP_PACKS - +NR_CURSEG_PERSIST_TYPE );return -EFSCORRUPTED ; }
@@ -3257,6 +3259,7 @@ int f2fs_sanity_check_ckpt(struct f2fs_sunsigned int cp_pack_start_sum, cp_payload;block_t user_block_count, valid_user_blocks;block_t avail_node_count, valid_node_count; +unsigned int nat_blocks, nat_bits_bytes, nat_bits_blocks;int i, j; total =le32_to_cpu (raw_super->segment_count);
@@ -3387,6 +3390,17 @@ skip_cross:return 1 ; } + nat_blocks = nat_segs << log_blocks_per_seg; + nat_bits_bytes = nat_blocks /BITS_PER_BYTE ; + nat_bits_blocks =F2FS_BLK_ALIGN ((nat_bits_bytes <<1 ) +8 ); +if (__is_set_ckpt_flags (ckpt,CP_NAT_BITS_FLAG ) && + (cp_payload +F2FS_CP_PACKS + +NR_CURSEG_PERSIST_TYPE + nat_bits_blocks >= blocks_per_seg)) { +f2fs_warn (sbi,"Insane cp_payload: %u, nat_bits_blocks: %u)" , + cp_payload, nat_bits_blocks); +return -EFSCORRUPTED ; + } +if (unlikely (f2fs_cp_error (sbi))) {f2fs_err (sbi,"A bug case: need to run fsck" );return 1 ;
Greg Kroah-Hartman
maintainerPATCH 64/432 PCI/portdrv: Enable Bandwidth Notification only if port supports it
In reply to Greg Kroah-HartmanFrom: Stuart Hayes <[email protected]>
commit 00823dcbdd415c868390feaca16f0265101efab4 upstream.
Previously we assumed that all Root Ports and Switch Downstream Ports supported Link Bandwidth Notification. Per spec, this is only required for Ports supporting Links wider than x1 and/or multiple Link speeds (PCIe r5.0, sec 7.5.3.6).
Because we assumed all Ports supported it, we tried to set up a Bandwidth Notification IRQ, which failed for devices that don't support IRQs at all, which meant pcieport didn't attach to the Port at all.
Check the Link Bandwidth Notification Capability bit and enable the service only when the Port supports it.
--- drivers/pci/pcie/portdrv_core.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/pci/pcie/portdrv_core.c +7 -2
@@ -257,8 +257,13 @@ static int get_port_device_capability(st services |=PCIE_PORT_SERVICE_DPC ;if (pci_pcie_type (dev) ==PCI_EXP_TYPE_DOWNSTREAM || -pci_pcie_type (dev) ==PCI_EXP_TYPE_ROOT_PORT ) - services |=PCIE_PORT_SERVICE_BWNOTIF ; +pci_pcie_type (dev) ==PCI_EXP_TYPE_ROOT_PORT ) { +u32 linkcap; + +pcie_capability_read_dword (dev,PCI_EXP_LNKCAP , &linkcap); +if (linkcap &PCI_EXP_LNKCAP_LBNC ) + services |=PCIE_PORT_SERVICE_BWNOTIF ; + }return services; }
Greg Kroah-Hartman
maintainerPATCH 65/432 PCI: Restrict ASMedia ASM1062 SATA Max Payload Size Supported
In reply to Greg Kroah-HartmanFrom: Marek Behún <[email protected]>
commit b12d93e9958e028856cbcb061b6e64728ca07755 upstream.
The ASMedia ASM1062 SATA controller advertises Max_Payload_Size_Supported of 512, but in fact it cannot handle incoming TLPs with payload size of 512.
We discovered this issue on PCIe controllers capable of MPS = 512 (Aardvark and DesignWare), where the issue presents itself as an External Abort. Bjorn Helgaas says:
Probably ASM1062 reports a Malformed TLP error when it receives a data payload of 512 bytes, and Aardvark, DesignWare, etc convert this to an arm64 External Abort. [1]
To avoid this problem, limit the ASM1062 Max Payload Size Supported to 256 bytes, so we set the Max Payload Size of devices that may send TLPs to the ASM1062 to 256 or less.
[1] https://lore.kernel.org/linux-pci/20210601170907.GA1949035@bjorn-Precision-5520/
--- drivers/pci/quirks.c | 1 + 1 file changed, 1 insertion(+)
drivers/pci/quirks.c +1 -0
@@ -3241,6 +3241,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_SO PCI_DEVICE_ID_SOLARFLARE_SFC4000A_1, fixup_mpss_256);DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_SOLARFLARE ,PCI_DEVICE_ID_SOLARFLARE_SFC4000B , fixup_mpss_256); +DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_ASMEDIA ,0x0612 , fixup_mpss_256);/* * Intel 5000 and 5100 Memory controllers have an erratum with read completion
Greg Kroah-Hartman
maintainerPATCH 66/432 PCI: Return ~0 data on pciconfig_read() CAP_SYS_ADMIN failure
In reply to Greg Kroah-HartmanFrom: Krzysztof Wilczyński <[email protected]>
commit a8bd29bd49c4156ea0ec5a97812333e2aeef44e7 upstream.
The pciconfig_read() syscall reads PCI configuration space using hardware-dependent config accessors.
If the read fails on PCI, most accessors don't return an error; they pretend the read was successful and got ~0 data from the device, so the syscall returns success with ~0 data in the buffer.
When the accessor does return an error, pciconfig_read() normally fills the user's buffer with ~0 and returns an error in errno. But after e4585da22ad0 ("pci syscall.c: Switch to refcounting API"), we don't fill the buffer with ~0 for the EPERM "user lacks CAP_SYS_ADMIN" error.
Userspace may rely on the ~0 data to detect errors, but after e4585da22ad0, that would not detect CAP_SYS_ADMIN errors.
Restore the original behaviour of filling the buffer with ~0 when the CAP_SYS_ADMIN check fails.
[bhelgaas: commit log, fold in Nathan's fix
https://lore.kernel.org/r/[email protected]]
--- drivers/pci/syscall.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/pci/syscall.c +3 -1
@@ -22,8 +22,10 @@ SYSCALL_DEFINE5(pciconfig_read, unsignedlong err;int cfg_ret; + err = -EPERM ; + dev =NULL ;if (!capable (CAP_SYS_ADMIN )) -return -EPERM ; + goto error; err = -ENODEV ; dev =pci_get_domain_bus_and_slot (0 , bus, dfn);
Greg Kroah-Hartman
maintainerPATCH 67/432 PCI: xilinx-nwl: Enable the clock through CCF
In reply to Greg Kroah-HartmanFrom: Hyun Kwon <[email protected]>
commit de0a01f5296651d3a539f2d23d0db8f359483696 upstream.
Enable PCIe reference clock. There is no remove function that's why this should be enough for simple operation.
Normally this clock is enabled by default by firmware but there are usecases where this clock should be enabled by driver itself. It is also good that PCIe clock is recorded in a clock framework.
--- drivers/pci/controller/pcie-xilinx-nwl.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
drivers/pci/controller/pcie-xilinx-nwl.c +12 -0
@@ -6,6 +6,7 @@* (C) Copyright 2014 - 2015, Xilinx, Inc. */ +#include <linux/clk.h> #include <linux/delay.h> #include <linux/interrupt.h> #include <linux/irq.h>
@@ -169,6 +170,7 @@ struct nwl_pcie {u8 last_busno;struct nwl_msi msi;struct irq_domain *legacy_irq_domain; +struct clk *clk;raw_spinlock_t leg_mask_lock; };
@@ -823,6 +825,16 @@ static int nwl_pcie_probe(struct platforreturn err; } + pcie->clk =devm_clk_get (dev,NULL ); +if (IS_ERR (pcie->clk)) +return PTR_ERR (pcie->clk); + + err =clk_prepare_enable (pcie->clk); +if (err) { +dev_err (dev,"can't enable PCIe ref clock\n" ); +return err; + } + err =nwl_pcie_bridge_init (pcie);if (err) {dev_err (dev,"HW Initialization failed\n" );
Greg Kroah-Hartman
maintainerPATCH 68/432 PCI: aardvark: Configure PCIe resources from ranges DT property
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
commit 64f160e19e9264a7f6d89c516baae1473b6f8359 upstream.
In commit 6df6ba974a55 ("PCI: aardvark: Remove PCIe outbound window configuration") was removed aardvark PCIe outbound window configuration and commit description said that was recommended solution by HW designers.
But that commit completely removed support for configuring PCIe IO resources without removing PCIe IO 'ranges' from DTS files. After that commit PCIe IO space started to be treated as PCIe MEM space and accessing it just caused kernel crash.
Moreover implementation of PCIe outbound windows prior that commit was incorrect. It completely ignored offset between CPU address and PCIe bus address and expected that in DTS is CPU address always same as PCIe bus address without doing any checks. Also it completely ignored size of every PCIe resource specified in 'ranges' DTS property and expected that every PCIe resource has size 128 MB (also for PCIe IO range). Again without any check. Apparently none of PCIe resource has in DTS specified size of 128 MB. So it was completely broken and thanks to how aardvark mask works, configuration was completely ignored.
This patch reverts back support for PCIe outbound window configuration but implementation is a new without issues mentioned above. PCIe outbound window is required when DTS specify in 'ranges' property non-zero offset between CPU and PCIe address space. To address recommendation by HW designers as specified in commit description of 6df6ba974a55, set default outbound parameters as PCIe MEM access without translation and therefore for this PCIe 'ranges' it is not needed to configure PCIe outbound window. For PCIe IO space is needed to configure aardvark PCIe outbound window.
This patch fixes kernel crash when trying to access PCIe IO space.
--- drivers/pci/controller/pci-aardvark.c | 195 +++++++++++++++++++++++++++++++++- 1 file changed, 194 insertions(+), 1 deletion(-)
drivers/pci/controller/pci-aardvark.c +194 -1
@@ -118,6 +118,46 @@#define PCIE_MSI_MASK_REG (CONTROL_BASE_ADDR + 0x5C)#define PCIE_MSI_PAYLOAD_REG (CONTROL_BASE_ADDR + 0x9C) +/* PCIe window configuration */ +#define OB_WIN_BASE_ADDR 0x4c00 +#define OB_WIN_BLOCK_SIZE 0x20 +#define OB_WIN_COUNT 8 +#define OB_WIN_REG_ADDR (win, offset) (OB_WIN_BASE_ADDR + \ + OB_WIN_BLOCK_SIZE * (win) + \ + (offset)) +#define OB_WIN_MATCH_LS (win) OB_WIN_REG_ADDR(win, 0x00) +#define OB_WIN_ENABLE BIT(0) +#define OB_WIN_MATCH_MS (win) OB_WIN_REG_ADDR(win, 0x04) +#define OB_WIN_REMAP_LS (win) OB_WIN_REG_ADDR(win, 0x08) +#define OB_WIN_REMAP_MS (win) OB_WIN_REG_ADDR(win, 0x0c) +#define OB_WIN_MASK_LS (win) OB_WIN_REG_ADDR(win, 0x10) +#define OB_WIN_MASK_MS (win) OB_WIN_REG_ADDR(win, 0x14) +#define OB_WIN_ACTIONS (win) OB_WIN_REG_ADDR(win, 0x18) +#define OB_WIN_DEFAULT_ACTIONS (OB_WIN_ACTIONS(OB_WIN_COUNT-1) + 0x4) +#define OB_WIN_FUNC_NUM_MASK GENMASK(31, 24) +#define OB_WIN_FUNC_NUM_SHIFT 24 +#define OB_WIN_FUNC_NUM_ENABLE BIT(23) +#define OB_WIN_BUS_NUM_BITS_MASK GENMASK(22, 20) +#define OB_WIN_BUS_NUM_BITS_SHIFT 20 +#define OB_WIN_MSG_CODE_ENABLE BIT(22) +#define OB_WIN_MSG_CODE_MASK GENMASK(21, 14) +#define OB_WIN_MSG_CODE_SHIFT 14 +#define OB_WIN_MSG_PAYLOAD_LEN BIT(12) +#define OB_WIN_ATTR_ENABLE BIT(11) +#define OB_WIN_ATTR_TC_MASK GENMASK(10, 8) +#define OB_WIN_ATTR_TC_SHIFT 8 +#define OB_WIN_ATTR_RELAXED BIT(7) +#define OB_WIN_ATTR_NOSNOOP BIT(6) +#define OB_WIN_ATTR_POISON BIT(5) +#define OB_WIN_ATTR_IDO BIT(4) +#define OB_WIN_TYPE_MASK GENMASK(3, 0) +#define OB_WIN_TYPE_SHIFT 0 +#define OB_WIN_TYPE_MEM 0x0 +#define OB_WIN_TYPE_IO 0x4 +#define OB_WIN_TYPE_CONFIG_TYPE0 0x8 +#define OB_WIN_TYPE_CONFIG_TYPE1 0x9 +#define OB_WIN_TYPE_MSG 0xc +/* LMI registers base address and register offsets */ #define LMI_BASE_ADDR 0x6000#define CFG_REG (LMI_BASE_ADDR + 0x0)
@@ -180,6 +220,13 @@struct advk_pcie {struct platform_device *pdev;void __iomem *base; +struct { +phys_addr_t match; +phys_addr_t remap; +phys_addr_t mask; +u32 actions; + } wins[OB_WIN_COUNT ]; +u8 wins_count;struct irq_domain *irq_domain;struct irq_chip irq_chip;struct irq_domain *msi_domain;
@@ -366,9 +413,39 @@ err:dev_err (dev,"link never came up\n" ); } +/* +* Set PCIe address window register which could be used for memory +* mapping. +*/ +static void advk_pcie_set_ob_win (struct advk_pcie *pcie,u8 win_num, +phys_addr_t match,phys_addr_t remap, +phys_addr_t mask,u32 actions) +{ +advk_writel (pcie,OB_WIN_ENABLE | +lower_32_bits (match),OB_WIN_MATCH_LS (win_num)); +advk_writel (pcie,upper_32_bits (match),OB_WIN_MATCH_MS (win_num)); +advk_writel (pcie,lower_32_bits (remap),OB_WIN_REMAP_LS (win_num)); +advk_writel (pcie,upper_32_bits (remap),OB_WIN_REMAP_MS (win_num)); +advk_writel (pcie,lower_32_bits (mask),OB_WIN_MASK_LS (win_num)); +advk_writel (pcie,upper_32_bits (mask),OB_WIN_MASK_MS (win_num)); +advk_writel (pcie, actions,OB_WIN_ACTIONS (win_num)); +} + +static void advk_pcie_disable_ob_win (struct advk_pcie *pcie,u8 win_num) +{ +advk_writel (pcie,0 ,OB_WIN_MATCH_LS (win_num)); +advk_writel (pcie,0 ,OB_WIN_MATCH_MS (win_num)); +advk_writel (pcie,0 ,OB_WIN_REMAP_LS (win_num)); +advk_writel (pcie,0 ,OB_WIN_REMAP_MS (win_num)); +advk_writel (pcie,0 ,OB_WIN_MASK_LS (win_num)); +advk_writel (pcie,0 ,OB_WIN_MASK_MS (win_num)); +advk_writel (pcie,0 ,OB_WIN_ACTIONS (win_num)); +} +static void advk_pcie_setup_hw (struct advk_pcie *pcie) {u32 reg; +int i;/* Enable TX */ reg =advk_readl (pcie,PCIE_CORE_REF_CLK_REG );
@@ -447,15 +524,51 @@ static void advk_pcie_setup_hw(struct ad reg =PCIE_IRQ_ALL_MASK & (~PCIE_IRQ_ENABLE_INTS_MASK );advk_writel (pcie, reg,HOST_CTRL_INT_MASK_REG ); +/* +* Enable AXI address window location generation: +* When it is enabled, the default outbound window +* configurations (Default User Field: 0xD0074CFC) +* are used to transparent address translation for +* the outbound transactions. Thus, PCIe address +* windows are not required for transparent memory +* access when default outbound window configuration +* is set for memory access. +*/ reg =advk_readl (pcie,PCIE_CORE_CTRL2_REG ); reg |=PCIE_CORE_CTRL2_OB_WIN_ENABLE ;advk_writel (pcie, reg,PCIE_CORE_CTRL2_REG ); -/* Bypass the address window mapping for PIO */ +/* +* Set memory access in Default User Field so it +* is not required to configure PCIe address for +* transparent memory access. +*/ +advk_writel (pcie,OB_WIN_TYPE_MEM ,OB_WIN_DEFAULT_ACTIONS ); + +/* +* Bypass the address window mapping for PIO: +* Since PIO access already contains all required +* info over AXI interface by PIO registers, the +* address window is not required. +*/ reg =advk_readl (pcie,PIO_CTRL ); reg |=PIO_CTRL_ADDR_WIN_DISABLE ;advk_writel (pcie, reg,PIO_CTRL ); +/* +* Configure PCIe address windows for non-memory or +* non-transparent access as by default PCIe uses +* transparent memory access. +*/ +for (i =0 ; i < pcie->wins_count; i++) +advk_pcie_set_ob_win (pcie, i, + pcie->wins[i].match, pcie->wins[i].remap, + pcie->wins[i].mask, pcie->wins[i].actions); + +/* Disable remaining PCIe outbound windows */ +for (i = pcie->wins_count; i <OB_WIN_COUNT ; i++) +advk_pcie_disable_ob_win (pcie, i); +advk_pcie_train_link (pcie);/*
@@ -1162,6 +1275,7 @@ static int advk_pcie_probe(struct platfostruct device *dev = &pdev->dev;struct advk_pcie *pcie;struct pci_host_bridge *bridge; +struct resource_entry *entry;int ret, irq; bridge =devm_pci_alloc_host_bridge (dev,sizeof (struct advk_pcie ));
@@ -1172,6 +1286,80 @@ static int advk_pcie_probe(struct platfo pcie->pdev = pdev;platform_set_drvdata (pdev, pcie); +resource_list_for_each_entry (entry, &bridge->windows) { +resource_size_t start = entry->res->start; +resource_size_t size =resource_size (entry->res); +unsigned long type =resource_type (entry->res); +u64 win_size; + +/* +* Aardvark hardware allows to configure also PCIe window +* for config type 0 and type 1 mapping, but driver uses +* only PIO for issuing configuration transfers which does +* not use PCIe window configuration. +*/ +if (type !=IORESOURCE_MEM && type !=IORESOURCE_MEM_64 && + type !=IORESOURCE_IO ) +continue ; + +/* +* Skip transparent memory resources. Default outbound access +* configuration is set to transparent memory access so it +* does not need window configuration. +*/ +if ((type ==IORESOURCE_MEM || type ==IORESOURCE_MEM_64 ) && + entry->offset ==0 ) +continue ; + +/* +* The n-th PCIe window is configured by tuple (match, remap, mask) +* and an access to address A uses this window if A matches the +* match with given mask. +* So every PCIe window size must be a power of two and every start +* address must be aligned to window size. Minimal size is 64 KiB +* because lower 16 bits of mask must be zero. Remapped address +* may have set only bits from the mask. +*/ +while (pcie->wins_count <OB_WIN_COUNT && size >0 ) { +/* Calculate the largest aligned window size */ + win_size = (1ULL << (fls64 (size)-1 )) | + (start ? (1ULL <<__ffs64 (start)) :0 ); + win_size =1ULL <<__ffs64 (win_size); +if (win_size <0x10000 ) +break ; + +dev_dbg (dev, +"Configuring PCIe window %d: [0x%llx-0x%llx] as %lu\n" , + pcie->wins_count, (unsigned long long )start, + (unsigned long long )start + win_size, type); + +if (type ==IORESOURCE_IO ) { + pcie->wins[pcie->wins_count].actions =OB_WIN_TYPE_IO ; + pcie->wins[pcie->wins_count].match =pci_pio_to_address (start); + }else { + pcie->wins[pcie->wins_count].actions =OB_WIN_TYPE_MEM ; + pcie->wins[pcie->wins_count].match = start; + } + pcie->wins[pcie->wins_count].remap = start - entry->offset; + pcie->wins[pcie->wins_count].mask = ~(win_size -1 ); + +if (pcie->wins[pcie->wins_count].remap & (win_size -1 )) +break ; + + start += win_size; + size -= win_size; + pcie->wins_count++; + } + +if (size >0 ) { +dev_err (&pcie->pdev->dev, +"Invalid PCIe region [0x%llx-0x%llx]\n" , + (unsigned long long )entry->res->start, + (unsigned long long )entry->res->end +1 ); +return -EINVAL ; + } + } + pcie->base =devm_platform_ioremap_resource (pdev,0 );if (IS_ERR (pcie->base))return PTR_ERR (pcie->base);
@@ -1252,6 +1440,7 @@ static int advk_pcie_remove(struct platf {struct advk_pcie *pcie =platform_get_drvdata (pdev);struct pci_host_bridge *bridge =pci_host_bridge_from_priv (pcie); +int i;pci_lock_rescan_remove ();pci_stop_root_bus (bridge->bus);
@@ -1261,6 +1450,10 @@ static int advk_pcie_remove(struct platfadvk_pcie_remove_msi_irq_domain (pcie);advk_pcie_remove_irq_domain (pcie); +/* Disable outbound address windows mapping */ +for (i =0 ; i <OB_WIN_COUNT ; i++) +advk_pcie_disable_ob_win (pcie, i); +return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 69/432 PCI: aardvark: Fix checking for PIO status
In reply to Greg Kroah-HartmanFrom: Evan Wang <[email protected]>
commit fcb461e2bc8b83b7eaca20cb2221e8b940f2189c upstream.
There is an issue that when PCIe switch is connected to an Armada 3700 board, there will be lots of warnings about PIO errors when reading the config space. According to Aardvark PIO read and write sequence in HW specification, the current way to check PIO status has the following issues:
1) For PIO read operation, it reports the error message, which should be avoided according to HW specification.
2) For PIO read and write operations, it only checks PIO operation complete status, which is not enough, and error status should also be checked.
This patch aligns the code with Aardvark PIO read and write sequence in HW specification on PIO status check and fix the warnings when reading config space.
[pali: Fix CRS handling when CRSSVE is not enabled]
--- drivers/pci/controller/pci-aardvark.c | 62 +++++++++++++++++++++++++++++----- 1 file changed, 54 insertions(+), 8 deletions(-)
drivers/pci/controller/pci-aardvark.c +54 -8
@@ -58,6 +58,7 @@#define PIO_COMPLETION_STATUS_CRS 2#define PIO_COMPLETION_STATUS_CA 4#define PIO_NON_POSTED_REQ BIT(10) +#define PIO_ERR_STATUS BIT(11)#define PIO_ADDR_LS (PIO_BASE_ADDR + 0x8)#define PIO_ADDR_MS (PIO_BASE_ADDR + 0xc)#define PIO_WR_DATA (PIO_BASE_ADDR + 0x10)
@@ -585,7 +586,7 @@ static void advk_pcie_setup_hw(struct adadvk_writel (pcie, reg,PCIE_CORE_CMD_STATUS_REG ); } -static void advk_pcie_check_pio_status (struct advk_pcie *pcie) +static int advk_pcie_check_pio_status (struct advk_pcie *pcie,u32 *val) {struct device *dev = &pcie->pdev->dev;u32 reg;
@@ -596,14 +597,49 @@ static void advk_pcie_check_pio_status(s status = (reg &PIO_COMPLETION_STATUS_MASK ) >>PIO_COMPLETION_STATUS_SHIFT ; -if (!status) -return ; - +/* +* According to HW spec, the PIO status check sequence as below: +* 1) even if COMPLETION_STATUS(bit9:7) indicates successful, +* it still needs to check Error Status(bit11), only when this bit +* indicates no error happen, the operation is successful. +* 2) value Unsupported Request(1) of COMPLETION_STATUS(bit9:7) only +* means a PIO write error, and for PIO read it is successful with +* a read value of 0xFFFFFFFF. +* 3) value Completion Retry Status(CRS) of COMPLETION_STATUS(bit9:7) +* only means a PIO write error, and for PIO read it is successful +* with a read value of 0xFFFF0001. +* 4) value Completer Abort (CA) of COMPLETION_STATUS(bit9:7) means +* error for both PIO read and PIO write operation. +* 5) other errors are indicated as 'unknown'. +*/ switch (status) { +case PIO_COMPLETION_STATUS_OK : +if (reg &PIO_ERR_STATUS ) { + strcomp_status ="COMP_ERR" ; +break ; + } +/* Get the read result */ +if (val) + *val =advk_readl (pcie,PIO_RD_DATA ); +/* No error */ + strcomp_status =NULL ; +break ;case PIO_COMPLETION_STATUS_UR : strcomp_status ="UR" ;break ;case PIO_COMPLETION_STATUS_CRS : +/* PCIe r4.0, sec 2.3.2, says: +* If CRS Software Visibility is not enabled, the Root Complex +* must re-issue the Configuration Request as a new Request. +* A Root Complex implementation may choose to limit the number +* of Configuration Request/CRS Completion Status loops before +* determining that something is wrong with the target of the +* Request and taking appropriate action, e.g., complete the +* Request to the host as a failed transaction. +* +* To simplify implementation do not re-issue the Configuration +* Request and complete the Request as a failed transaction. +*/ strcomp_status ="CRS" ;break ;case PIO_COMPLETION_STATUS_CA :
@@ -614,6 +650,9 @@ static void advk_pcie_check_pio_status(sbreak ; } +if (!strcomp_status) +return 0 ; +if (reg &PIO_NON_POSTED_REQ ) str_posted ="Non-posted" ;else
@@ -621,6 +660,8 @@ static void advk_pcie_check_pio_status(sdev_err (dev,"%s PIO Response Status: %s, %#x @ %#x\n" , str_posted, strcomp_status, reg,advk_readl (pcie,PIO_ADDR_LS )); + +return -EFAULT ; }static int advk_pcie_wait_pio (struct advk_pcie *pcie)
@@ -858,10 +899,13 @@ static int advk_pcie_rd_conf(struct pci_return PCIBIOS_SET_FAILED ; } -advk_pcie_check_pio_status (pcie); +/* Check PIO status and get the read result */ + ret =advk_pcie_check_pio_status (pcie, val); +if (ret <0 ) { + *val =0xffffffff ; +return PCIBIOS_SET_FAILED ; + } -/* Get the read result */ - *val =advk_readl (pcie,PIO_RD_DATA );if (size ==1 ) *val = (*val >> (8 * (where &3 ))) &0xff ;else if (size ==2 )
@@ -925,7 +969,9 @@ static int advk_pcie_wr_conf(struct pci_if (ret <0 )return PCIBIOS_SET_FAILED ; -advk_pcie_check_pio_status (pcie); + ret =advk_pcie_check_pio_status (pcie,NULL ); +if (ret <0 ) +return PCIBIOS_SET_FAILED ;return PCIBIOS_SUCCESSFUL ; }
Greg Kroah-Hartman
maintainerPATCH 70/432 PCI: aardvark: Increase polling delay to 1.5s while waiting for PIO response
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
commit 02bcec3ea5591720114f586960490b04b093a09e upstream.
Measurements in different conditions showed that aardvark hardware PIO response can take up to 1.44s. Increase wait timeout from 1ms to 1.5s to ensure that we do not miss responses from hardware. After 1.44s hardware returns errors (e.g. Completer abort).
The previous two patches fixed checking for PIO status, so now we can use it to also catch errors which are reported by hardware after 1.44s.
After applying this patch, kernel can detect and print PIO errors to dmesg:
[ 6.879999] advk-pcie d0070000.pcie: Non-posted PIO Response Status: CA, 0xe00 @ 0x100004
[ 6.896436] advk-pcie d0070000.pcie: Posted PIO Response Status: COMP_ERR, 0x804 @ 0x100004
[ 6.913049] advk-pcie d0070000.pcie: Posted PIO Response Status: COMP_ERR, 0x804 @ 0x100010
[ 6.929663] advk-pcie d0070000.pcie: Non-posted PIO Response Status: CA, 0xe00 @ 0x100010
[ 6.953558] advk-pcie d0070000.pcie: Posted PIO Response Status: COMP_ERR, 0x804 @ 0x100014
[ 6.970170] advk-pcie d0070000.pcie: Non-posted PIO Response Status: CA, 0xe00 @ 0x100014
[ 6.994328] advk-pcie d0070000.pcie: Posted PIO Response Status: COMP_ERR, 0x804 @ 0x100004Without this patch kernel prints only a generic error to dmesg:
[ 5.246847] advk-pcie d0070000.pcie: config read/write timed out
--- drivers/pci/controller/pci-aardvark.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/controller/pci-aardvark.c +1 -1
@@ -207,7 +207,7 @@#define PCIE_CONFIG_WR_TYPE0 0xa#define PCIE_CONFIG_WR_TYPE1 0xb -#define PIO_RETRY_CNT 500 +#define PIO_RETRY_CNT 750000/* 1.5 s */ #define PIO_RETRY_DELAY 2/* 2 us*/ #define LINK_WAIT_MAX_RETRIES 10
Greg Kroah-Hartman
maintainerPATCH 71/432 PCI: aardvark: Fix masking and unmasking legacy INTx interrupts
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
commit d212dcee27c1f89517181047e5485fcbba4a25c2 upstream.
irq_mask and irq_unmask callbacks need to be properly guarded by raw spin locks as masking/unmasking procedure needs atomic read-modify-write operation on hardware register.
--- drivers/pci/controller/pci-aardvark.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/pci/controller/pci-aardvark.c +9 -0
@@ -230,6 +230,7 @@ struct advk_pcie {u8 wins_count;struct irq_domain *irq_domain;struct irq_chip irq_chip; +raw_spinlock_t irq_lock;struct irq_domain *msi_domain;struct irq_domain *msi_inner_domain;struct irq_chip msi_bottom_irq_chip;
@@ -1045,22 +1046,28 @@ static void advk_pcie_irq_mask(struct ir {struct advk_pcie *pcie = d->domain->host_data;irq_hw_number_t hwirq =irqd_to_hwirq (d); +unsigned long flags;u32 mask; +raw_spin_lock_irqsave (&pcie->irq_lock, flags); mask =advk_readl (pcie,PCIE_ISR1_MASK_REG ); mask |=PCIE_ISR1_INTX_ASSERT (hwirq);advk_writel (pcie, mask,PCIE_ISR1_MASK_REG ); +raw_spin_unlock_irqrestore (&pcie->irq_lock, flags); }static void advk_pcie_irq_unmask (struct irq_data *d) {struct advk_pcie *pcie = d->domain->host_data;irq_hw_number_t hwirq =irqd_to_hwirq (d); +unsigned long flags;u32 mask; +raw_spin_lock_irqsave (&pcie->irq_lock, flags); mask =advk_readl (pcie,PCIE_ISR1_MASK_REG ); mask &= ~PCIE_ISR1_INTX_ASSERT (hwirq);advk_writel (pcie, mask,PCIE_ISR1_MASK_REG ); +raw_spin_unlock_irqrestore (&pcie->irq_lock, flags); } static int advk_pcie_irq_map(struct irq_domain *h,
@@ -1144,6 +1151,8 @@ static int advk_pcie_init_irq_domain(strstruct irq_chip *irq_chip;int ret =0 ; +raw_spin_lock_init (&pcie->irq_lock); + pcie_intc_node =of_get_next_child (node,NULL );if (!pcie_intc_node) {dev_err (dev,"No PCIe Intc node found\n" );
Greg Kroah-Hartman
maintainerPATCH 72/432 f2fs: compress: fix to set zstd compress level correctly
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit 01f6afd0f3ccaa2d5f7fb87e7bd910dc17eef06b ]
As 5kft reported in [1]:
set_compress_context() should set compress level into .i_compress_flag for zstd as well as lz4hc, otherwise, zstd compressor will still use default zstd compress level during compression, fix it.
[1] https://lore.kernel.org/linux-f2fs-devel/[email protected]/T/#u
--- fs/f2fs/f2fs.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/f2fs/f2fs.h +2 -1
@@ -4137,7 +4137,8 @@ static inline void set_compress_context(struct inode *inode) 1 << COMPRESS_CHKSUM : 0;F2FS_I (inode)->i_cluster_size =1 <<F2FS_I (inode)->i_log_cluster_size; -if (F2FS_I (inode)->i_compress_algorithm ==COMPRESS_LZ4 && +if ((F2FS_I (inode)->i_compress_algorithm ==COMPRESS_LZ4 || +F2FS_I (inode)->i_compress_algorithm ==COMPRESS_ZSTD ) &&F2FS_OPTION (sbi).compress_level)F2FS_I (inode)->i_compress_flag |= F2FS_OPTION(sbi).compress_level <<
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 73/432 RDMA/rtrs: move wr_cnt from rtrs_srv_con to rtrs_con
In reply to Greg Kroah-HartmanFrom: Jack Wang <[email protected]>
[ Upstream commit a10431eff136ef15e1f9955efe369744b1294db1 ]
We need to track also the wr used for heatbeat. This is a preparation for that, will be used in later patch.
The io_cnt in rtrs_clt is removed, use wr_cnt instead.
--- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 7 ++++--- drivers/infiniband/ulp/rtrs/rtrs-clt.h | 1 - drivers/infiniband/ulp/rtrs/rtrs-pri.h | 1 + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 6 +++--- drivers/infiniband/ulp/rtrs/rtrs-srv.h | 1 - 5 files changed, 8 insertions(+), 8 deletions(-)
drivers/infiniband/ulp/rtrs/rtrs-clt.c +4 -3
@@ -478,7 +478,7 @@ static int rtrs_post_send_rdma(struct rtrs_clt_con *con,* From time to time we have to post signalled sends, * or send queue will fill up and only QP reset can help. */ - flags =atomic_inc_return (&con->io_cnt) % sess->queue_depth ? + flags =atomic_inc_return (&con->c.wr_cnt) % sess->queue_depth ?0 :IB_SEND_SIGNALED ; ib_dma_sync_single_for_device(sess->s.dev->ib_dev, req->iu->dma_addr,
@@ -1043,7 +1043,7 @@ static int rtrs_post_rdma_write_sg(struct rtrs_clt_con *con,* From time to time we have to post signalled sends, * or send queue will fill up and only QP reset can help. */ - flags =atomic_inc_return (&con->io_cnt) % sess->queue_depth ? + flags =atomic_inc_return (&con->c.wr_cnt) % sess->queue_depth ?0 :IB_SEND_SIGNALED ; ib_dma_sync_single_for_device(sess->s.dev->ib_dev, req->iu->dma_addr,
@@ -1601,7 +1601,8 @@ static int create_con(struct rtrs_clt_sess *sess, unsigned int cid) con->cpu = (cid ? cid -1 :0 ) % nr_cpu_ids; con->c.cid = cid; con->c.sess = &sess->s; -atomic_set (&con->io_cnt,0 ); +/* Align with srv, init as 1 */ +atomic_set (&con->c.wr_cnt,1 );mutex_init (&con->con_mutex); sess->s.con[cid] = &con->c;
drivers/infiniband/ulp/rtrs/rtrs-clt.h +0 -1
@@ -74,7 +74,6 @@ struct rtrs_clt_con {u32 queue_num;unsigned int cpu;struct mutex con_mutex; -atomic_t io_cnt;int cm_err; };
drivers/infiniband/ulp/rtrs/rtrs-pri.h +1 -0
@@ -96,6 +96,7 @@ struct rtrs_con {struct rdma_cm_id *cm_id;unsigned int cid;int nr_cqe; +atomic_t wr_cnt; };struct rtrs_sess {
drivers/infiniband/ulp/rtrs/rtrs-srv.c +3 -3
@@ -269,7 +269,7 @@ static int rdma_write_sg(struct rtrs_srv_op *id)* From time to time we have to post signaled sends, * or send queue will fill up and only QP reset can help. */ - flags = (atomic_inc_return (&id->con->wr_cnt) % srv->queue_depth) ? + flags = (atomic_inc_return (&id->con->c.wr_cnt) % srv->queue_depth) ?0 :IB_SEND_SIGNALED ;if (need_inval) {
@@ -396,7 +396,7 @@ static int send_io_resp_imm(struct rtrs_srv_con *con, struct rtrs_srv_op *id,* From time to time we have to post signalled sends, * or send queue will fill up and only QP reset can help. */ - flags = (atomic_inc_return (&con->wr_cnt) % srv->queue_depth) ? + flags = (atomic_inc_return (&con->c.wr_cnt) % srv->queue_depth) ?0 :IB_SEND_SIGNALED ; imm =rtrs_to_io_rsp_imm (id->msg_id, errno, need_inval); imm_wr.wr.next =NULL ;
@@ -1648,7 +1648,7 @@ static int create_con(struct rtrs_srv_sess *sess, con->c.cm_id = cm_id; con->c.sess = &sess->s; con->c.cid = cid; -atomic_set (&con->wr_cnt,1 ); +atomic_set (&con->c.wr_cnt,1 ); wr_limit = sess->s.dev->ib_dev->attrs.max_qp_wr;if (con->c.cid ==0 ) {
drivers/infiniband/ulp/rtrs/rtrs-srv.h +0 -1
@@ -42,7 +42,6 @@ struct rtrs_srv_stats {struct rtrs_srv_con {struct rtrs_con c; -atomic_t wr_cnt;atomic_t sq_wr_avail;struct list_head rsp_wr_wait_list;spinlock_t rsp_wr_wait_lock;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 74/432 RDMA/rtrs: Enable the same selective signal for heartbeat and IO
In reply to Greg Kroah-HartmanFrom: Jack Wang <[email protected]>
[ Upstream commit e2d98504c697f9c8e45b815062f8893b10808d8e ]
On idle session, because we do not do signal for heartbeat, it will overflow the send queue after sometime.
To avoid that, we need to enable the signal for heartbeat. To do that, add a new member signal_interval in rtrs_path, which will set min of queue_depth and SERVICE_CON_QUEUE_DEPTH, and track it for both heartbeat and IO, so the sq queue full accounting is correct.
--- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 7 +++++-- drivers/infiniband/ulp/rtrs/rtrs-pri.h | 1 + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 11 ++++++----- drivers/infiniband/ulp/rtrs/rtrs.c | 7 ++++++- 4 files changed, 18 insertions(+), 8 deletions(-)
drivers/infiniband/ulp/rtrs/rtrs-clt.c +5 -2
@@ -478,7 +478,7 @@ static int rtrs_post_send_rdma(struct rtrs_clt_con *con,* From time to time we have to post signalled sends, * or send queue will fill up and only QP reset can help. */ - flags =atomic_inc_return (&con->c.wr_cnt) % sess->queue_depth ? + flags =atomic_inc_return (&con->c.wr_cnt) % sess->s.signal_interval ?0 :IB_SEND_SIGNALED ; ib_dma_sync_single_for_device(sess->s.dev->ib_dev, req->iu->dma_addr,
@@ -680,6 +680,7 @@ static void rtrs_clt_rdma_done(struct ib_cq *cq, struct ib_wc *wc)case IB_WC_RDMA_WRITE :/* * post_send() RDMA write completions of IO reqs (read/write) +* and hb. */ break ;
@@ -1043,7 +1044,7 @@ static int rtrs_post_rdma_write_sg(struct rtrs_clt_con *con,* From time to time we have to post signalled sends, * or send queue will fill up and only QP reset can help. */ - flags =atomic_inc_return (&con->c.wr_cnt) % sess->queue_depth ? + flags =atomic_inc_return (&con->c.wr_cnt) % sess->s.signal_interval ?0 :IB_SEND_SIGNALED ; ib_dma_sync_single_for_device(sess->s.dev->ib_dev, req->iu->dma_addr,
@@ -1849,6 +1850,8 @@ static int rtrs_rdma_conn_established(struct rtrs_clt_con *con,return -ENOMEM ; } sess->queue_depth = queue_depth; + sess->s.signal_interval =min_not_zero (queue_depth, + (unsigned short )SERVICE_CON_QUEUE_DEPTH ); sess->max_hdr_size =le32_to_cpu (msg->max_hdr_size); sess->max_io_size =le32_to_cpu (msg->max_io_size); sess->flags =le32_to_cpu (msg->flags);
drivers/infiniband/ulp/rtrs/rtrs-pri.h +1 -0
@@ -109,6 +109,7 @@ struct rtrs_sess {unsigned int con_num;unsigned int irq_con_num;unsigned int recon_cnt; +unsigned int signal_interval;struct rtrs_ib_dev *dev;int dev_ref;struct ib_cqe *hb_cqe;
drivers/infiniband/ulp/rtrs/rtrs-srv.c +6 -5
@@ -201,7 +201,6 @@ static int rdma_write_sg(struct rtrs_srv_op *id)struct rtrs_srv_sess *sess =to_srv_sess (s);dma_addr_t dma_addr = sess->dma_addr[id->msg_id];struct rtrs_srv_mr *srv_mr; -struct rtrs_srv *srv = sess->srv;struct ib_send_wr inv_wr;struct ib_rdma_wr imm_wr;struct ib_rdma_wr *wr =NULL ;
@@ -269,7 +268,7 @@ static int rdma_write_sg(struct rtrs_srv_op *id)* From time to time we have to post signaled sends, * or send queue will fill up and only QP reset can help. */ - flags = (atomic_inc_return (&id->con->c.wr_cnt) % srv->queue_depth) ? + flags = (atomic_inc_return (&id->con->c.wr_cnt) % s->signal_interval) ?0 :IB_SEND_SIGNALED ;if (need_inval) {
@@ -347,7 +346,6 @@ static int send_io_resp_imm(struct rtrs_srv_con *con, struct rtrs_srv_op *id,struct ib_send_wr inv_wr, *wr =NULL ;struct ib_rdma_wr imm_wr;struct ib_reg_wr rwr; -struct rtrs_srv *srv = sess->srv;struct rtrs_srv_mr *srv_mr;bool need_inval = false;enum ib_send_flags flags;
@@ -396,7 +394,7 @@ static int send_io_resp_imm(struct rtrs_srv_con *con, struct rtrs_srv_op *id,* From time to time we have to post signalled sends, * or send queue will fill up and only QP reset can help. */ - flags = (atomic_inc_return (&con->c.wr_cnt) % srv->queue_depth) ? + flags = (atomic_inc_return (&con->c.wr_cnt) % s->signal_interval) ?0 :IB_SEND_SIGNALED ; imm =rtrs_to_io_rsp_imm (id->msg_id, errno, need_inval); imm_wr.wr.next =NULL ;
@@ -1268,8 +1266,9 @@ static void rtrs_srv_rdma_done(struct ib_cq *cq, struct ib_wc *wc)case IB_WC_SEND :/* * post_send() RDMA write completions of IO reqs (read/write) +* and hb. */ -atomic_add (srv->queue_depth, &con->sq_wr_avail); +atomic_add (s->signal_interval, &con->sq_wr_avail);if (unlikely (!list_empty_careful (&con->rsp_wr_wait_list)))rtrs_rdma_process_wr_wait_list (con);
@@ -1659,6 +1658,8 @@ static int create_con(struct rtrs_srv_sess *sess, max_send_wr =min_t (int, wr_limit,SERVICE_CON_QUEUE_DEPTH *2 +2 ); max_recv_wr = max_send_wr; + s->signal_interval =min_not_zero (srv->queue_depth, + (size_t )SERVICE_CON_QUEUE_DEPTH ); }else {/* when always_invlaidate enalbed, we need linv+rinv+mr+imm */ if (always_invalidate)
drivers/infiniband/ulp/rtrs/rtrs.c +6 -1
@@ -187,10 +187,15 @@ int rtrs_post_rdma_write_imm_empty(struct rtrs_con *con, struct ib_cqe *cqe, struct ib_send_wr *head) {struct ib_rdma_wr wr; +struct rtrs_sess *sess = con->sess; +enum ib_send_flags sflags; + + sflags = (atomic_inc_return (&con->wr_cnt) % sess->signal_interval) ? +0 :IB_SEND_SIGNALED ; wr = (struct ib_rdma_wr ) { .wr.wr_cqe = cqe, - .wr.send_flags = flags, + .wr.send_flags = sflags, .wr.opcode =IB_WR_RDMA_WRITE_WITH_IMM , .wr.ex.imm_data =cpu_to_be32 (imm_data), };
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 75/432 RDMA/rtrs: Move sq_wr_avail to rtrs_con
In reply to Greg Kroah-HartmanFrom: Jack Wang <[email protected]>
[ Upstream commit cfcdbd9dd7632a9bb1e308a029f5fa65008333af ]
In order to account HB for sq_wr_avail properly, move sq_wr_avail from rtrs_srv_con to rtrs_con.
Although rtrs-clt do not care sq_wr_avail, but still init it to max_send_wr.
--- drivers/infiniband/ulp/rtrs/rtrs-clt.c | 1 + drivers/infiniband/ulp/rtrs/rtrs-pri.h | 1 + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 8 ++++---- drivers/infiniband/ulp/rtrs/rtrs-srv.h | 1 - drivers/infiniband/ulp/rtrs/rtrs.c | 1 + 5 files changed, 7 insertions(+), 5 deletions(-)
drivers/infiniband/ulp/rtrs/rtrs-clt.c +1 -0
@@ -1680,6 +1680,7 @@ static int create_con_cq_qp(struct rtrs_clt_con *con) sess->queue_depth * 3 + 1); max_send_sge =2 ; } +atomic_set (&con->c.sq_wr_avail, max_send_wr); cq_num = max_send_wr + max_recv_wr;/* alloc iu to recv new rkey reply when server reports flags set */ if (sess->flags &RTRS_MSG_NEW_RKEY_F || con->c.cid ==0 ) {
drivers/infiniband/ulp/rtrs/rtrs-pri.h +1 -0
@@ -97,6 +97,7 @@ struct rtrs_con {unsigned int cid;int nr_cqe;atomic_t wr_cnt; +atomic_t sq_wr_avail; };struct rtrs_sess {
drivers/infiniband/ulp/rtrs/rtrs-srv.c +4 -4
@@ -507,11 +507,11 @@ bool rtrs_srv_resp_rdma(struct rtrs_srv_op *id, int status)ib_update_fast_reg_key (mr->mr,ib_inc_rkey (mr->mr->rkey)); }if (unlikely (atomic_sub_return (1 , - &con->sq_wr_avail) <0 )) { + &con->c.sq_wr_avail) <0 )) {rtrs_err (s,"IB send queue full: sess=%s cid=%d\n" ,kobject_name (&sess->kobj), con->c.cid); -atomic_add (1 , &con->sq_wr_avail); +atomic_add (1 , &con->c.sq_wr_avail);spin_lock (&con->rsp_wr_wait_lock);list_add_tail (&id->wait_list, &con->rsp_wr_wait_list);spin_unlock (&con->rsp_wr_wait_lock);
@@ -1268,7 +1268,7 @@ static void rtrs_srv_rdma_done(struct ib_cq *cq, struct ib_wc *wc)* post_send() RDMA write completions of IO reqs (read/write) * and hb. */ -atomic_add (s->signal_interval, &con->sq_wr_avail); +atomic_add (s->signal_interval, &con->c.sq_wr_avail);if (unlikely (!list_empty_careful (&con->rsp_wr_wait_list)))rtrs_rdma_process_wr_wait_list (con);
@@ -1680,7 +1680,7 @@ static int create_con(struct rtrs_srv_sess *sess,*/ } cq_num = max_send_wr + max_recv_wr; -atomic_set (&con->sq_wr_avail, max_send_wr); +atomic_set (&con->c.sq_wr_avail, max_send_wr); cq_vector =rtrs_srv_get_next_cq_vector (sess);/* TODO: SOFTIRQ can be faster, but be careful with softirq context */
drivers/infiniband/ulp/rtrs/rtrs-srv.h +0 -1
@@ -42,7 +42,6 @@ struct rtrs_srv_stats {struct rtrs_srv_con {struct rtrs_con c; -atomic_t sq_wr_avail;struct list_head rsp_wr_wait_list;spinlock_t rsp_wr_wait_lock; };
drivers/infiniband/ulp/rtrs/rtrs.c +1 -0
@@ -190,6 +190,7 @@ int rtrs_post_rdma_write_imm_empty(struct rtrs_con *con, struct ib_cqe *cqe,struct rtrs_sess *sess = con->sess;enum ib_send_flags sflags; +atomic_dec_if_positive (&con->sq_wr_avail); sflags = (atomic_inc_return (&con->wr_cnt) % sess->signal_interval) ?0 :IB_SEND_SIGNALED ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 76/432 HID: input: do not report stylus battery state as "full"
In reply to Greg Kroah-HartmanFrom: Dmitry Torokhov <[email protected]>
[ Upstream commit f4abaa9eebde334045ed6ac4e564d050f1df3013 ]
The power supply states of discharging, charging, full, etc, represent state of charging, not the capacity level of the battery (for which we have a separate property). Current HID usage tables to not allow for expressing charging state of the batteries found in generic styli, so we should simply assume that the battery is discharging even if current capacity is at 100% when battery strength reporting is done via HID interface. In fact, we were doing just that before commit 581c4484769e.
This change helps UIs to not mis-represent fully charged batteries in styli as being charging/topping-off.
--- drivers/hid/hid-input.c | 2 -- 1 file changed, 2 deletions(-)
drivers/hid/hid-input.c +0 -2
@@ -419,8 +419,6 @@ static int hidinput_get_battery_property(struct power_supply *psy,if (dev->battery_status ==HID_BATTERY_UNKNOWN ) val->intval =POWER_SUPPLY_STATUS_UNKNOWN ; -else if (dev->battery_capacity ==100 ) - val->intval =POWER_SUPPLY_STATUS_FULL ;else val->intval =POWER_SUPPLY_STATUS_DISCHARGING ;break ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 77/432 clk: renesas: rzg2l: Fix off-by-one check in rzg2l_cpg_clk_src_twocell_get()
In reply to Greg Kroah-HartmanFrom: Lad Prabhakar <[email protected]>
[ Upstream commit 1606e81543f80fc3b1912957cf6d8fa62e40b8e5 ]
Fix clock index out of range check for module clocks in rzg2l_cpg_clk_src_twocell_get().
--- drivers/clk/renesas/renesas-rzg2l-cpg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/renesas/renesas-rzg2l-cpg.c +1 -1
@@ -229,7 +229,7 @@ static struct clkcase CPG_MOD : type ="module" ; -if (clkidx > priv->num_mod_clks) { +if (clkidx >= priv->num_mod_clks) {dev_err (dev,"Invalid %s clock index %u\n" , type, clkidx);return ERR_PTR (-EINVAL );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 78/432 f2fs: quota: fix potential deadlock
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit 9de71ede81e6d1a111fdd868b2d78d459fa77f80 ]
xfstest generic/587 reports a deadlock issue as below:
======================================================
WARNING: possible circular locking dependency detected
5.14.0-rc1 #69 Not tainted
------------------------------------------------------
repquota/8606 is trying to acquire lock:ffff888022ac9320 (&sb->s_type->i_mutex_key#18){+.+.}-{3:3}, at: f2fs_quota_sync+0x207/0x300 [f2fs]
but task is already holding lock:ffff8880084bcde8 (&sbi->quota_sem){.+.+}-{3:3}, at: f2fs_quota_sync+0x59/0x300 [f2fs]
which lock already depends on the new lock.
the existing dependency chain (in reverse order) is:
-> #2 (&sbi->quota_sem){.+.+}-{3:3}:
__lock_acquire+0x648/0x10b0
lock_acquire+0x128/0x470
down_read+0x3b/0x2a0
f2fs_quota_sync+0x59/0x300 [f2fs]
f2fs_quota_on+0x48/0x100 [f2fs]
do_quotactl+0x5e3/0xb30
__x64_sys_quotactl+0x23a/0x4e0
do_syscall_64+0x3b/0x90
entry_SYSCALL_64_after_hwframe+0x44/0xae-> #1 (&sbi->cp_rwsem){++++}-{3:3}:
__lock_acquire+0x648/0x10b0
lock_acquire+0x128/0x470
down_read+0x3b/0x2a0
f2fs_unlink+0x353/0x670 [f2fs]
vfs_unlink+0x1c7/0x380
do_unlinkat+0x413/0x4b0
__x64_sys_unlinkat+0x50/0xb0
do_syscall_64+0x3b/0x90
entry_SYSCALL_64_after_hwframe+0x44/0xae-> #0 (&sb->s_type->i_mutex_key#18){+.+.}-{3:3}:
check_prev_add+0xdc/0xb30
validate_chain+0xa67/0xb20
__lock_acquire+0x648/0x10b0
lock_acquire+0x128/0x470
down_write+0x39/0xc0
f2fs_quota_sync+0x207/0x300 [f2fs]
do_quotactl+0xaff/0xb30
__x64_sys_quotactl+0x23a/0x4e0
do_syscall_64+0x3b/0x90
entry_SYSCALL_64_after_hwframe+0x44/0xaeother info that might help us debug this:
Chain exists of: &sb->s_type->i_mutex_key#18 --> &sbi->cp_rwsem --> &sbi->quota_sem Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock(&sbi->quota_sem);
lock(&sbi->cp_rwsem);
lock(&sbi->quota_sem); lock(&sb->s_type->i_mutex_key#18);
*** DEADLOCK ***
3 locks held by repquota/8606:
#0: ffff88801efac0e0 (&type->s_umount_key#53){++++}-{3:3}, at: user_get_super+0xd9/0x190 #1: ffff8880084bc380 (&sbi->cp_rwsem){++++}-{3:3}, at: f2fs_quota_sync+0x3e/0x300 [f2fs] #2: ffff8880084bcde8 (&sbi->quota_sem){.+.+}-{3:3}, at: f2fs_quota_sync+0x59/0x300 [f2fs]
stack backtrace: CPU: 6 PID: 8606 Comm: repquota Not tainted 5.14.0-rc1 #69 Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS VirtualBox 12/01/2006 Call Trace: dump_stack_lvl+0xce/0x134 dump_stack+0x17/0x20 print_circular_bug.isra.0.cold+0x239/0x253 check_noncircular+0x1be/0x1f0 check_prev_add+0xdc/0xb30 validate_chain+0xa67/0xb20 __lock_acquire+0x648/0x10b0 lock_acquire+0x128/0x470 down_write+0x39/0xc0 f2fs_quota_sync+0x207/0x300 [f2fs] do_quotactl+0xaff/0xb30 __x64_sys_quotactl+0x23a/0x4e0 do_syscall_64+0x3b/0x90 entry_SYSCALL_64_after_hwframe+0x44/0xae RIP: 0033:0x7f883b0b4efe
The root cause is ABBA deadlock of inode lock and cp_rwsem, reorder locks in f2fs_quota_sync() as below to fix this issue:
- lock inode
- lock cp_rwsem
- lock quota_sem
--- fs/f2fs/super.c | 84 ++++++++++++++++++++++++++++--------------------- 1 file changed, 48 insertions(+), 36 deletions(-)
fs/f2fs/super.c +48 -36
@@ -2527,6 +2527,33 @@ static int f2fs_enable_quotas(struct super_block *sb)return 0 ; } +static int f2fs_quota_sync_file (struct f2fs_sb_info *sbi,int type) +{ +struct quota_info *dqopt =sb_dqopt (sbi->sb); +struct address_space *mapping = dqopt->files[type]->i_mapping; +int ret =0 ; + + ret =dquot_writeback_dquots (sbi->sb, type); +if (ret) + goto out; + + ret =filemap_fdatawrite (mapping); +if (ret) + goto out; + +/* if we are using journalled quota */ +if (is_journalled_quota (sbi)) + goto out; + + ret =filemap_fdatawait (mapping); + +truncate_inode_pages (&dqopt->files[type]->i_data,0 ); +out: +if (ret) +set_sbi_flag (sbi,SBI_QUOTA_NEED_REPAIR ); +return ret; +} +int f2fs_quota_sync (struct super_block *sb,int type) {struct f2fs_sb_info *sbi =F2FS_SB (sb);
@@ -2534,57 +2561,42 @@ int f2fs_quota_sync(struct super_block *sb, int type)int cnt;int ret; -/* -* do_quotactl -* f2fs_quota_sync -* down_read(quota_sem) -* dquot_writeback_dquots() -* f2fs_dquot_commit -* block_operation -* down_read(quota_sem) -*/ -f2fs_lock_op (sbi); - -down_read (&sbi->quota_sem); - ret =dquot_writeback_dquots (sb, type); -if (ret) - goto out; -/* * Now when everything is written we can discard the pagecache so * that userspace sees the changes. */ for (cnt =0 ; cnt <MAXQUOTAS ; cnt++) { -struct address_space *mapping;if (type !=-1 && cnt != type)continue ; -if (!sb_has_quota_active (sb, cnt)) -continue ; - mapping = dqopt->files[cnt]->i_mapping; +if (!sb_has_quota_active (sb, type)) +return 0 ; - ret =filemap_fdatawrite (mapping); -if (ret) - goto out; +inode_lock (dqopt->files[cnt]); -/* if we are using journalled quota */ -if (is_journalled_quota (sbi)) -continue ; +/* +* do_quotactl +* f2fs_quota_sync +* down_read(quota_sem) +* dquot_writeback_dquots() +* f2fs_dquot_commit +* block_operation +* down_read(quota_sem) +*/ +f2fs_lock_op (sbi); +down_read (&sbi->quota_sem); - ret =filemap_fdatawait (mapping); -if (ret) -set_sbi_flag (F2FS_SB (sb),SBI_QUOTA_NEED_REPAIR ); + ret =f2fs_quota_sync_file (sbi, cnt); + +up_read (&sbi->quota_sem); +f2fs_unlock_op (sbi); -inode_lock (dqopt->files[cnt]); -truncate_inode_pages (&dqopt->files[cnt]->i_data,0 );inode_unlock (dqopt->files[cnt]); + +if (ret) +break ; } -out: -if (ret) -set_sbi_flag (F2FS_SB (sb),SBI_QUOTA_NEED_REPAIR ); -up_read (&sbi->quota_sem); -f2fs_unlock_op (sbi);return ret; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 79/432 pinctrl: armada-37xx: Correct PWM pins definitions
In reply to Greg Kroah-HartmanFrom: Marek Behún <[email protected]>
[ Upstream commit baf8d6899b1e8906dc076ef26cc633e96a8bb0c3 ]
The PWM pins on North Bridge on Armada 37xx can be configured into PWM or GPIO functions. When in PWM function, each pin can also be configured to drive low on 0 and tri-state on 1 (LED mode).
The current definitions handle this by declaring two pin groups for each pin:
- group "pwmN" with functions "pwm" and "gpio"
- group "ledN_od" ("od" for open drain) with functions "led" and "gpio"
This is semantically incorrect. The correct definition for each pin should be one group with three functions: "pwm", "led" and "gpio".
Change the "pwmN" groups to support "led" function.
Remove "ledN_od" groups. This cannot break backwards compatibility with older device trees: no device tree uses it since there is no PWM driver for this SOC yet. Also "ledN_od" groups are not even documented.
--- .../pinctrl/marvell,armada-37xx-pinctrl.txt | 8 ++++---- drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-)
Documentation/devicetree/bindings/pinctrl/marvell,armada-37xx-pinctrl.txt +4 -4
@@ -43,19 +43,19 @@ group emmc_nb group pwm0 - pin 11 (GPIO1-11) - - functions pwm, gpio + - functions pwm, led, gpio group pwm1 - pin 12 - - functions pwm, gpio + - functions pwm, led, gpio group pwm2 - pin 13 - - functions pwm, gpio + - functions pwm, led, gpio group pwm3 - pin 14 - - functions pwm, gpio + - functions pwm, led, gpio group pmic1 - pin 7
drivers/pinctrl/mvebu/pinctrl-armada-37xx.c +8 -8
@@ -167,10 +167,14 @@ static struct armada_37xx_pin_group armada_37xx_nb_groups[] = {PIN_GRP_GPIO ("jtag" ,20 ,5 ,BIT (0 ),"jtag" ),PIN_GRP_GPIO ("sdio0" ,8 ,3 ,BIT (1 ),"sdio" ),PIN_GRP_GPIO ("emmc_nb" ,27 ,9 ,BIT (2 ),"emmc" ), -PIN_GRP_GPIO ("pwm0" ,11 ,1 ,BIT (3 ),"pwm" ), -PIN_GRP_GPIO ("pwm1" ,12 ,1 ,BIT (4 ),"pwm" ), -PIN_GRP_GPIO ("pwm2" ,13 ,1 ,BIT (5 ),"pwm" ), -PIN_GRP_GPIO ("pwm3" ,14 ,1 ,BIT (6 ),"pwm" ), +PIN_GRP_GPIO_3 ("pwm0" ,11 ,1 ,BIT (3 ) |BIT (20 ),0 ,BIT (20 ),BIT (3 ), +"pwm" ,"led" ), +PIN_GRP_GPIO_3 ("pwm1" ,12 ,1 ,BIT (4 ) |BIT (21 ),0 ,BIT (21 ),BIT (4 ), +"pwm" ,"led" ), +PIN_GRP_GPIO_3 ("pwm2" ,13 ,1 ,BIT (5 ) |BIT (22 ),0 ,BIT (22 ),BIT (5 ), +"pwm" ,"led" ), +PIN_GRP_GPIO_3 ("pwm3" ,14 ,1 ,BIT (6 ) |BIT (23 ),0 ,BIT (23 ),BIT (6 ), +"pwm" ,"led" ),PIN_GRP_GPIO ("pmic1" ,7 ,1 ,BIT (7 ),"pmic" ),PIN_GRP_GPIO ("pmic0" ,6 ,1 ,BIT (8 ),"pmic" ), PIN_GRP_GPIO("i2c2", 2, 2, BIT(9), "i2c"),
@@ -184,10 +188,6 @@ static struct armada_37xx_pin_group armada_37xx_nb_groups[] = {PIN_GRP_EXTRA ("uart2" ,9 ,2 ,BIT (1 ) |BIT (13 ) |BIT (14 ) |BIT (19 ),BIT (1 ) |BIT (13 ) |BIT (14 ),BIT (1 ) |BIT (19 ), 18, 2, "gpio", "uart"), -PIN_GRP_GPIO_2 ("led0_od" ,11 ,1 ,BIT (20 ),BIT (20 ),0 ,"led" ), -PIN_GRP_GPIO_2 ("led1_od" ,12 ,1 ,BIT (21 ),BIT (21 ),0 ,"led" ), -PIN_GRP_GPIO_2 ("led2_od" ,13 ,1 ,BIT (22 ),BIT (22 ),0 ,"led" ), - PIN_GRP_GPIO_2("led3_od", 14, 1, BIT(23), BIT(23), 0, "led"), };static struct armada_37xx_pin_group armada_37xx_sb_groups[] = {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 80/432 scsi: bsg: Remove support for SCSI_IOCTL_SEND_COMMAND
In reply to Greg Kroah-HartmanFrom: Christoph Hellwig <[email protected]>
[ Upstream commit beec64d0c9749afedf51c3c10cf52de1d9a89cc0 ]
SCSI_IOCTL_SEND_COMMAND has been deprecated longer than bsg exists and has been warning for just as long. More importantly it harcodes SCSI CDBs and thus will do the wrong thing on non-SCSI bsg nodes.
--- block/bsg.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
block/bsg.c +4 -1
@@ -373,10 +373,13 @@ static long bsg_ioctl(struct file *file, unsigned int cmd, unsigned long arg)case SG_GET_RESERVED_SIZE :case SG_SET_RESERVED_SIZE :case SG_EMULATED_HOST : -case SCSI_IOCTL_SEND_COMMAND :return scsi_cmd_ioctl (bd->queue,NULL , file->f_mode, cmd, uarg);case SG_IO :return bsg_sg_io (bd->queue, file->f_mode, uarg); +case SCSI_IOCTL_SEND_COMMAND : +pr_warn_ratelimited ("%s: calling unsupported SCSI_IOCTL_SEND_COMMAND\n" , + current->comm); +return -EINVAL ;default :return -ENOTTY ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 81/432 clk: rockchip: drop GRF dependency for rk3328/rk3036 pll types
In reply to Greg Kroah-HartmanFrom: Peter Geis <[email protected]>
[ Upstream commit 6fffe52fb336ec2063270a7305652a93ea677ca1 ]
The rk3036/rk3328 pll types were converted to checking the lock status via the internal register in january 2020, so don't need the grf reference since then.
But it was forgotten to remove grf check when deciding between the pll rate ops (read-only vs. read-write), so a clock driver without the needed grf reference might've been put into the read-only mode just because the grf reference was missing.
This affected the rk356x that needs to reclock certain plls at boot.
Fix this by removing the check for the grf for selecting the utilized operations.
--- drivers/clk/rockchip/clk-pll.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/clk/rockchip/clk-pll.c +1 -1
@@ -940,7 +940,7 @@ struct clk *rockchip_clk_register_pll(struct rockchip_clk_provider *ctx,switch (pll_type) {case pll_rk3036:case pll_rk3328: -if (!pll->rate_table ||IS_ERR (ctx->grf)) +if (!pll->rate_table) init.ops = &rockchip_rk3036_pll_clk_norate_ops;else init.ops = &rockchip_rk3036_pll_clk_ops;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 82/432 IB/hfi1: Adjust pkey entry in index 0
In reply to Greg Kroah-HartmanFrom: Mike Marciniszyn <[email protected]>
[ Upstream commit 62004871e1fa7f9a60797595c03477af5b5ec36f ]
It is possible for the primary IPoIB network device associated with any RDMA device to fail to join certain multicast groups preventing IPv6 neighbor discovery and possibly other network ULPs from working correctly. The IPv4 broadcast group is not affected as the IPoIB network device handles joining that multicast group directly.
This is because the primary IPoIB network device uses the pkey at ndex 0 in the associated RDMA device's pkey table. Anytime the pkey value of index 0 changes, the primary IPoIB network device automatically modifies it's broadcast address (i.e. /sys/class/net/[ib0]/broadcast), since the broadcast address includes the pkey value, and then bounces carrier. This includes initial pkey assignment, such as when the pkey at index 0 transitions from the opa default of invalid (0x0000) to some value such as the OPA default pkey for Virtual Fabric 0: 0x8001 or when the fabric manager is restarted with a configuration change causing the pkey at index 0 to change. Many network ULPs are not sensitive to the carrier bounce and are not expecting the broadcast address to change including the linux IPv6 stack. This problem does not affect IPoIB child network devices as their pkey value is constant for all time.
To mitigate this issue, change the default pkey in at index 0 to 0x8001 to cover the predominant case and avoid issues as ipoib comes up and the FM sweeps.
At some point, ipoib multicast support should automatically fix non-broadcast addresses as it does with the primary broadcast address.
--- drivers/infiniband/hw/hfi1/init.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
drivers/infiniband/hw/hfi1/init.c +1 -6
@@ -650,12 +650,7 @@ void hfi1_init_pportdata(struct pci_dev *pdev, struct hfi1_pportdata *ppd, ppd->pkeys[default_pkey_idx] =DEFAULT_P_KEY ; ppd->part_enforce |=HFI1_PART_ENFORCE_IN ; - -if (loopback) { -dd_dev_err (dd,"Faking data partition 0x8001 in idx %u\n" , - !default_pkey_idx); - ppd->pkeys[!default_pkey_idx] =0x8001 ; - } + ppd->pkeys[0 ] =0x8001 ;INIT_WORK (&ppd->link_vc_work, handle_verify_cap);INIT_WORK (&ppd->link_up_work, handle_link_up);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 83/432 RDMA/iwcm: Release resources if iw_cm module initialization fails
In reply to Greg Kroah-HartmanFrom: Leon Romanovsky <[email protected]>
[ Upstream commit e677b72a0647249370f2635862bf0241c86f66ad ]
The failure during iw_cm module initialization partially left the system with unreleased memory and other resources. Rewrite the module init/exit routines in such way that netlink commands will be opened only after successful initialization.
--- drivers/infiniband/core/iwcm.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-)
drivers/infiniband/core/iwcm.c +12 -7
@@ -1186,29 +1186,34 @@ static int __init iw_cm_init(void) ret =iwpm_init (RDMA_NL_IWCM );if (ret) -pr_err ("iw_cm: couldn't init iwpm\n" ); -else -rdma_nl_register (RDMA_NL_IWCM , iwcm_nl_cb_table); +return ret; + iwcm_wq =alloc_ordered_workqueue ("iw_cm_wq" ,0 );if (!iwcm_wq) -return -ENOMEM ; + goto err_alloc; iwcm_ctl_table_hdr =register_net_sysctl (&init_net,"net/iw_cm" , iwcm_ctl_table);if (!iwcm_ctl_table_hdr) {pr_err ("iw_cm: couldn't register sysctl paths\n" ); -destroy_workqueue (iwcm_wq); -return -ENOMEM ; + goto err_sysctl; } +rdma_nl_register (RDMA_NL_IWCM , iwcm_nl_cb_table);return 0 ; + +err_sysctl: +destroy_workqueue (iwcm_wq); +err_alloc: +iwpm_exit (RDMA_NL_IWCM ); +return -ENOMEM ; } static void __exit iw_cm_cleanup(void) { +rdma_nl_unregister (RDMA_NL_IWCM );unregister_net_sysctl_table (iwcm_ctl_table_hdr);destroy_workqueue (iwcm_wq); -rdma_nl_unregister (RDMA_NL_IWCM );iwpm_exit (RDMA_NL_IWCM ); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 84/432 docs: Fix infiniband uverbs minor number
In reply to Greg Kroah-HartmanFrom: Leon Romanovsky <[email protected]>
[ Upstream commit 8d7e415d55610d503fdb8815344846b72d194a40 ]
Starting from the beginning of infiniband subsystem, the uverbs char devices start from 192 as a minor number, see
commit bc38a6abdd5a ("[PATCH] IB uverbs: core implementation").
This patch updates the admin guide documentation to reflect it.
--- Documentation/admin-guide/devices.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
Documentation/admin-guide/devices.txt +3 -3
@@ -2993,10 +2993,10 @@ 65 = /dev/infiniband/issm1 Second InfiniBand IsSM device ... 127 = /dev/infiniband/issm63 63rd InfiniBand IsSM device - 128 = /dev/infiniband/uverbs0 First InfiniBand verbs device - 129 = /dev/infiniband/uverbs1 Second InfiniBand verbs device + 192 = /dev/infiniband/uverbs0 First InfiniBand verbs device + 193 = /dev/infiniband/uverbs1 Second InfiniBand verbs device ... - 159 = /dev/infiniband/uverbs31 31st InfiniBand verbs device + 223 = /dev/infiniband/uverbs31 31st InfiniBand verbs device 232 char Biometric Devices 0 = /dev/biometric/sensor0/fingerprint first fingerprint sensor on first device
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 85/432 scsi: BusLogic: Use %X for u32 sized integer rather than %lX
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit 2127cd21fb78c6e22d92944253afd967b0ff774d ]
An earlier fix changed the print format specifier for adapter->bios_addr to use %lX. However, the integer is a u32 so the fix was wrong. Fix this by using the correct %X format specifier.
Addresses-Coverity: ("Invalid type in argument")
--- drivers/scsi/BusLogic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/BusLogic.c +1 -1
@@ -1711,7 +1711,7 @@ static bool __init blogic_reportconfig(struct blogic_adapter *adapter)if (adapter->adapter_bus_type !=BLOGIC_PCI_BUS ) {blogic_info (" DMA Channel: None, " , adapter);if (adapter->bios_addr >0 ) -blogic_info ("BIOS Address: 0x%lX, " , adapter, +blogic_info ("BIOS Address: 0x%X, " , adapter, adapter->bios_addr);else blogic_info ("BIOS Address: None, " , adapter);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 86/432 pinctrl: samsung: Fix pinctrl bank pin count
In reply to Greg Kroah-HartmanFrom: Jaehyoung Choi <[email protected]>
[ Upstream commit 70115558ab02fe8d28a6634350b3491a542aaa02 ]
Commit 1abd18d1a51a ("pinctrl: samsung: Register pinctrl before GPIO") changes the order of GPIO and pinctrl registration: now pinctrl is registered before GPIO. That means gpio_chip->ngpio is not set when samsung_pinctrl_register() called, and one cannot rely on that value anymore. Use pin_bank->nr_pins' instead of pin_bank->gpio_chip.ngpio' to fix mentioned inconsistency.
--- drivers/pinctrl/samsung/pinctrl-samsung.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pinctrl/samsung/pinctrl-samsung.c +1 -1
@@ -918,7 +918,7 @@ static int samsung_pinctrl_register(struct platform_device *pdev, pin_bank->grange.pin_base = drvdata->pin_base + pin_bank->pin_base; pin_bank->grange.base = pin_bank->grange.pin_base; - pin_bank->grange.npins = pin_bank->gpio_chip.ngpio; + pin_bank->grange.npins = pin_bank->nr_pins; pin_bank->grange.gc = &pin_bank->gpio_chip;pinctrl_add_gpio_range (drvdata->pctl_dev, &pin_bank->grange); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 87/432 f2fs: do not submit NEW_ADDR to read node block
In reply to Greg Kroah-HartmanFrom: Jaegeuk Kim <[email protected]>
[ Upstream commit b7ec2061737f12c33e45beeb967d17f31abc1ada ]
After the below patch, give cp is errored, we drop dirty node pages. This can give NEW_ADDR to read node pages. Don't do WARN_ON() which gives generic/475 failure.
--- fs/f2fs/node.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/f2fs/node.c +2 -1
@@ -1321,7 +1321,8 @@ static int read_node_page(struct page *page, int op_flags)if (err)return err; -if (unlikely (ni.blk_addr ==NULL_ADDR ) || +/* NEW_ADDR can be seen, after cp_error drops some dirty node pages */ +if (unlikely (ni.blk_addr ==NULL_ADDR || ni.blk_addr ==NEW_ADDR ) ||is_sbi_flag_set (sbi,SBI_IS_SHUTDOWN )) {ClearPageUptodate (page);return -ENOENT ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 88/432 f2fs: turn back remapped address in compressed page endio
In reply to Greg Kroah-HartmanFrom: Daeho Jeong <[email protected]>
[ Upstream commit 4931e0c93e124357308893a3e5e224cbeeabc721 ]
Turned back the remmaped sector address to the address in the partition, when ending io, for compress cache to work properly.
compressed blocks")
--- fs/f2fs/data.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
fs/f2fs/data.c +3 -1
@@ -116,6 +116,7 @@ struct bio_post_read_ctx {struct f2fs_sb_info *sbi;struct work_struct work;unsigned int enabled_steps; +block_t fs_blkaddr; };static void f2fs_finish_read_bio (struct bio *bio)
@@ -228,7 +229,7 @@ static void f2fs_handle_step_decompress(struct bio_post_read_ctx *ctx)struct bio_vec *bv;struct bvec_iter_all iter_all;bool all_compressed = true; -block_t blkaddr =SECTOR_TO_BLOCK (ctx->bio->bi_iter.bi_sector); +block_t blkaddr = ctx->fs_blkaddr;bio_for_each_segment_all (bv, ctx->bio, iter_all) {struct page *page = bv->bv_page;
@@ -1003,6 +1004,7 @@ static struct bio *f2fs_grab_read_bio(struct inode *inode, block_t blkaddr, ctx->bio = bio; ctx->sbi = sbi; ctx->enabled_steps = post_read_steps; + ctx->fs_blkaddr = blkaddr; bio->bi_private = ctx; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 89/432 f2fs: fix wrong checkpoint_changed value in f2fs_remount()
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit 277afbde6ca2b38729683fc17c031b4bc942068d ]
In f2fs_remount(), return value of test_opt() is an unsigned int type variable, however when we compare it to a bool type variable, it cause wrong result, fix it.
--- fs/f2fs/super.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
fs/f2fs/super.c +2 -5
@@ -2071,11 +2071,10 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data)bool need_restart_ckpt = false, need_stop_ckpt = false;bool need_restart_flush = false, need_stop_flush = false;bool no_extent_cache = !test_opt (sbi,EXTENT_CACHE ); -bool disable_checkpoint =test_opt (sbi,DISABLE_CHECKPOINT ); +bool enable_checkpoint = !test_opt (sbi,DISABLE_CHECKPOINT );bool no_io_align = !F2FS_IO_ALIGNED (sbi);bool no_atgc = !test_opt (sbi,ATGC );bool no_compress_cache = !test_opt (sbi,COMPRESS_CACHE ); -bool checkpoint_changed;#ifdef CONFIG_QUOTA int i, j;#endif
@@ -2120,8 +2119,6 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data) err =parse_options (sb, data, true);if (err) goto restore_opts; - checkpoint_changed = - disable_checkpoint !=test_opt (sbi,DISABLE_CHECKPOINT );/* * Previous and new state of filesystem is RO,
@@ -2243,7 +2240,7 @@ static int f2fs_remount(struct super_block *sb, int *flags, char *data) need_stop_flush = true; } -if (checkpoint_changed) { +if (enable_checkpoint == !!test_opt (sbi,DISABLE_CHECKPOINT )) {if (test_opt (sbi,DISABLE_CHECKPOINT )) { err =f2fs_disable_checkpoint (sbi);if (err)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 90/432 vfio: Use config not menuconfig for VFIO_NOIOMMU
In reply to Greg Kroah-HartmanFrom: Jason Gunthorpe <[email protected]>
[ Upstream commit 26c22cfde5dd6e63f25c48458b0185dcb0fbb2fd ]
VFIO_NOIOMMU is supposed to be an element in the VFIO menu, not start a new menu. Correct this copy-paste mistake.
--- drivers/vfio/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/vfio/Kconfig +1 -1
@@ -29,7 +29,7 @@ menuconfig VFIO If you don't know what to do here, say N. -menuconfig VFIO_NOIOMMU +config VFIO_NOIOMMU bool "VFIO No-IOMMU support" depends on VFIO help
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 91/432 scsi: ufs: Fix memory corruption by ufshcd_read_desc_param()
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit d3d9c4570285090b533b00946b72647361f0345b ]
If param_offset > buff_len then the memcpy() statement in ufshcd_read_desc_param() corrupts memory since it copies 256 + buff_len - param_offset bytes into a buffer with size buff_len. Since param_offset < 256 this results in writing past the bound of the output buffer.
--- drivers/scsi/ufs/ufshcd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
drivers/scsi/ufs/ufshcd.c +5 -3
@@ -3419,9 +3419,11 @@ int ufshcd_read_desc_param(struct ufs_hba *hba,if (is_kmalloc) {/* Make sure we don't copy more data than available */ -if (param_offset + param_size > buff_len) - param_size = buff_len - param_offset; -memcpy (param_read_buf, &desc_buf[param_offset], param_size); +if (param_offset >= buff_len) + ret = -EINVAL ; +else +memcpy (param_read_buf, &desc_buf[param_offset], +min_t (u32, param_size, buff_len - param_offset)); } out:if (is_kmalloc)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 92/432 scsi: ufs: Use DECLARE_COMPLETION_ONSTACK() where appropriate
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit 8a686f26eaa4b8a5c494b6b69e8a97815e3ffb82 ]
Quoted 1 line
From
Documentation/scheduler/completion.rst: "When a completion is declared
as a local variable within a function, then the initialization should always use DECLARE_COMPLETION_ONSTACK() explicitly, not just to make lockdep happy, but also to make it clear that limited scope had been considered and is intentional."
--- drivers/scsi/ufs/ufshcd.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/scsi/ufs/ufshcd.c +3 -6
@@ -2949,11 +2949,11 @@ static int ufshcd_exec_dev_cmd(struct ufs_hba *hba, enum dev_cmd_type cmd_type, int timeout) {struct request_queue *q = hba->cmd_queue; +DECLARE_COMPLETION_ONSTACK (wait);struct request *req;struct ufshcd_lrb *lrbp;int err;int tag; -struct completion wait;down_read (&hba->clk_scaling_lock);
@@ -2978,7 +2978,6 @@ static int ufshcd_exec_dev_cmd(struct ufs_hba *hba, goto out; } -init_completion (&wait); lrbp = &hba->lrb[tag];WARN_ON (lrbp->cmd); err =ufshcd_compose_dev_cmd (hba, lrbp, cmd_type, tag);
@@ -3985,14 +3984,13 @@ EXPORT_SYMBOL_GPL(ufshcd_dme_get_attr);*/ static int ufshcd_uic_pwr_ctrl (struct ufs_hba *hba,struct uic_command *cmd) { -struct completion uic_async_done; +DECLARE_COMPLETION_ONSTACK (uic_async_done);unsigned long flags;u8 status;int ret;bool reenable_intr = false;mutex_lock (&hba->uic_cmd_mutex); -init_completion (&uic_async_done);ufshcd_add_delay_before_dme_cmd (hba);spin_lock_irqsave (hba->host->host_lock, flags);
@@ -6665,11 +6663,11 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba, enum query_opcode desc_op) {struct request_queue *q = hba->cmd_queue; +DECLARE_COMPLETION_ONSTACK (wait);struct request *req;struct ufshcd_lrb *lrbp;int err =0 ;int tag; -struct completion wait;u8 upiu_flags;down_read (&hba->clk_scaling_lock);
@@ -6687,7 +6685,6 @@ static int ufshcd_issue_devman_upiu_cmd(struct ufs_hba *hba, goto out; } -init_completion (&wait); lrbp = &hba->lrb[tag];WARN_ON (lrbp->cmd); lrbp->cmd =NULL ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 93/432 scsi: ufs: Fix the SCSI abort handler
In reply to Greg Kroah-HartmanFrom: Bart Van Assche <[email protected]>
[ Upstream commit 64180742605f772d511903c9e50262afb13726c6 ]
Make the following changes in ufshcd_abort():
- Return FAILED instead of SUCCESS if the abort handler notices that a SCSI command has already been completed. Returning SUCCESS in this case triggers a use-after-free and may trigger a kernel crash.
- Fix the code for aborting SCSI commands submitted to a WLUN.
The current approach for aborting SCSI commands that have been submitted to a WLUN and that timed out is as follows:
- Report to the SCSI core that the command has completed successfully. Let the block layer free any data buffers associated with the command.
- Mark the command as outstanding in 'outstanding_reqs'.
- If the block layer tries to reuse the tag associated with the aborted command, busy-wait until the tag is freed.
This approach can result in:
- Memory corruption if the controller accesses the data buffer after the block layer has freed the associated data buffers.
- A race condition if ufshcd_queuecommand() or ufshcd_exec_dev_cmd() checks the bit that corresponds to an aborted command in 'outstanding_reqs' after it has been cleared and before it is reset.
- High energy consumption if ufshcd_queuecommand() repeatedly returns SCSI_MLQUEUE_HOST_BUSY.
Fix this by reporting to the SCSI error handler that aborting a SCSI command failed if the SCSI command was submitted to a WLUN.
--- drivers/scsi/ufs/ufshcd.c | 54 ++++++++++++++------------------------- 1 file changed, 19 insertions(+), 35 deletions(-)
drivers/scsi/ufs/ufshcd.c +19 -35
@@ -2766,15 +2766,6 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)WARN_ON (ufshcd_is_clkgating_allowed (hba) && (hba->clk_gating.state !=CLKS_ON )); -if (unlikely (test_bit (tag, &hba->outstanding_reqs))) { -if (hba->pm_op_in_progress) -set_host_byte (cmd,DID_BAD_TARGET ); -else - err =SCSI_MLQUEUE_HOST_BUSY ; -ufshcd_release (hba); - goto out; - } - lrbp = &hba->lrb[tag];WARN_ON (lrbp->cmd); lrbp->cmd = cmd;
@@ -2973,11 +2964,6 @@ static int ufshcd_exec_dev_cmd(struct ufs_hba *hba, req->timeout =msecs_to_jiffies (2 * timeout);blk_mq_start_request (req); -if (unlikely (test_bit (tag, &hba->outstanding_reqs))) { - err = -EBUSY ; - goto out; - } - lrbp = &hba->lrb[tag];WARN_ON (lrbp->cmd); err =ufshcd_compose_dev_cmd (hba, lrbp, cmd_type, tag);
@@ -6984,7 +6970,7 @@ static int ufshcd_abort(struct scsi_cmnd *cmd)struct ufs_hba *hba;unsigned long flags;unsigned int tag; -int err =0 ; +int err =FAILED ;struct ufshcd_lrb *lrbp;u32 reg;
@@ -7001,12 +6987,12 @@ static int ufshcd_abort(struct scsi_cmnd *cmd)ufshcd_hold (hba, false); reg =ufshcd_readl (hba,REG_UTP_TRANSFER_REQ_DOOR_BELL ); -/* If command is already aborted/completed, return SUCCESS */ +/* If command is already aborted/completed, return FAILED. */ if (!(test_bit (tag, &hba->outstanding_reqs))) {dev_err (hba->dev,"%s: cmd at tag %d already completed, outstanding=0x%lx, doorbell=0x%x\n" , __func__, tag, hba->outstanding_reqs, reg); - goto out; + goto release; }/* Print Transfer Request of aborted task */
@@ -7035,7 +7021,8 @@ static int ufshcd_abort(struct scsi_cmnd *cmd)dev_err (hba->dev,"%s: cmd was completed, but without a notifying intr, tag = %d" , __func__, tag); - goto cleanup; +__ufshcd_transfer_req_compl (hba,1UL << tag); + goto release; }/*
@@ -7048,36 +7035,33 @@ static int ufshcd_abort(struct scsi_cmnd *cmd)*/ if (lrbp->lun ==UFS_UPIU_UFS_DEVICE_WLUN ) {ufshcd_update_evt_hist (hba,UFS_EVT_ABORT , lrbp->lun); -__ufshcd_transfer_req_compl (hba, (1UL << tag)); -set_bit (tag, &hba->outstanding_reqs); +spin_lock_irqsave (host->host_lock, flags); hba->force_reset = true;ufshcd_schedule_eh_work (hba);spin_unlock_irqrestore (host->host_lock, flags); - goto out; + goto release; }/* Skip task abort in case previous aborts failed and report failure */ -if (lrbp->req_abort_skip) - err = -EIO ; -else - err =ufshcd_try_to_abort_task (hba, tag); +if (lrbp->req_abort_skip) { +dev_err (hba->dev,"%s: skipping abort\n" , __func__); +ufshcd_set_req_abort_skip (hba, hba->outstanding_reqs); + goto release; + } -if (!err) { -cleanup: -__ufshcd_transfer_req_compl (hba, (1UL << tag)); -out: - err =SUCCESS ; - }else { + err =ufshcd_try_to_abort_task (hba, tag); +if (err) {dev_err (hba->dev,"%s: failed with err %d\n" , __func__, err);ufshcd_set_req_abort_skip (hba, hba->outstanding_reqs); err =FAILED ; + goto release; } -/* -* This ufshcd_release() corresponds to the original scsi cmd that got -* aborted here (as we won't get any IRQ for it). -*/ + err =SUCCESS ; + +release: +/* Matches the ufshcd_hold() call at the start of this function. */ ufshcd_release (hba);return err; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 94/432 cpuidle: pseries: Fixup CEDE0 latency only for POWER10 onwards
In reply to Greg Kroah-HartmanFrom: Gautham R. Shenoy <[email protected]>
[ Upstream commit 50741b70b0cbbafbd9199f5180e66c0c53783a4a ]
Commit d947fb4c965c ("cpuidle: pseries: Fixup exit latency for CEDE(0)") sets the exit latency of CEDE(0) based on the latency values of the Extended CEDE states advertised by the platform
On POWER9 LPARs, the firmwares advertise a very low value of 2us for CEDE1 exit latency on a Dedicated LPAR. The latency advertized by the PHYP hypervisor corresponds to the latency required to wakeup from the underlying hardware idle state. However the wakeup latency from the LPAR perspective should include
1. The time taken to transition the CPU from the Hypervisor into the LPAR post wakeup from platform idle state
2. Time taken to send the IPI from the source CPU (waker) to the idle target CPU (wakee).
1. can be measured via timer idle test, where we queue a timer, say for 1ms, and enter the CEDE state. When the timer fires, in the timer handler we compute how much extra timer over the expected 1ms have we consumed. On a a POWER9 LPAR the numbers are
CEDE latency measured using a timer (numbers in ns)
N Min Median Avg 90%ile 99%ile Max Stddev 400 2601 5677 5668.74 5917 6413 9299 455.01
1. and 2. combined can be determined by an IPI latency test where we send an IPI to an idle CPU and in the handler compute the time difference between when the IPI was sent and when the handler ran. We see the following numbers on POWER9 LPAR.
CEDE latency measured using an IPI (numbers in ns)
N Min Median Avg 90%ile 99%ile Max Stddev 400 711 7564 7369.43 8559 9514 9698 1200.01
Suppose, we consider the 99th percentile latency value measured using the IPI to be the wakeup latency, the value would be 9.5us This is in the ballpark of the default value of 10us.
Hence, use the exit latency of CEDE(0) based on the latency values advertized by platform only from POWER10 onwards. The values advertized on POWER10 platforms is more realistic and informed by the latency measurements. For earlier platforms stick to the default value of 10us. The fix was suggested by Michael Ellerman.
--- drivers/cpuidle/cpuidle-pseries.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
drivers/cpuidle/cpuidle-pseries.c +15 -1
@@ -419,7 +419,21 @@ static int pseries_idle_probe(void) cpuidle_state_table = shared_states; max_idle_state =ARRAY_SIZE (shared_states); }else { -fixup_cede0_latency (); +/* +* Use firmware provided latency values +* starting with POWER10 platforms. In the +* case that we are running on a POWER10 +* platform but in an earlier compat mode, we +* can still use the firmware provided values. +* +* However, on platforms prior to POWER10, we +* cannot rely on the accuracy of the firmware +* provided latency values. On such platforms, +* go with the conservative default estimate +* of 10us. +*/ +if (cpu_has_feature (CPU_FTR_ARCH_31 ) ||pvr_version_is (PVR_POWER10 )) +fixup_cede0_latency (); cpuidle_state_table = dedicated_states; max_idle_state =NR_DEDICATED_STATES ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 95/432 powerpc/stacktrace: Include linux/delay.h
In reply to Greg Kroah-HartmanFrom: Michal Suchanek <[email protected]>
[ Upstream commit a6cae77f1bc89368a4e2822afcddc45c3062d499 ]
commit 7c6986ade69e ("powerpc/stacktrace: Fix spurious "stale" traces in raise_backtrace_ipi()") introduces udelay() call without including the linux/delay.h header.
This may happen to work on master but the header that declares the functionshould be included nonetheless.
--- arch/powerpc/kernel/stacktrace.c | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/kernel/stacktrace.c +1 -0
@@ -8,6 +8,7 @@* Copyright 2018 Nick Piggin, Michael Ellerman, IBM Corp. */ +#include <linux/delay.h> #include <linux/export.h> #include <linux/kallsyms.h> #include <linux/module.h>
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 96/432 RDMA/hns: Dont overwrite supplied QP attributes
In reply to Greg Kroah-HartmanFrom: Leon Romanovsky <[email protected]>
[ Upstream commit e66e49592b690d6abd537cc207b07a3db2f413d0 ]
QP attributes that were supplied by IB/core already have all parameters set when they are passed to the driver. The drivers are not supposed to change anything in struct ib_qp_init_attr.
--- drivers/infiniband/hw/hns/hns_roce_qp.c | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-)
drivers/infiniband/hw/hns/hns_roce_qp.c +1 -7
@@ -1171,14 +1171,8 @@ struct ib_qp *hns_roce_create_qp(struct ib_pd *pd,if (!hr_qp)return ERR_PTR (-ENOMEM ); -if (init_attr->qp_type ==IB_QPT_XRC_INI ) - init_attr->recv_cq =NULL ; - -if (init_attr->qp_type ==IB_QPT_XRC_TGT ) { +if (init_attr->qp_type ==IB_QPT_XRC_TGT ) hr_qp->xrcdn =to_hr_xrcd (init_attr->xrcd)->xrcdn; - init_attr->recv_cq =NULL ; - init_attr->send_cq =NULL ; - }if (init_attr->qp_type ==IB_QPT_GSI ) { hr_qp->port = init_attr->port_num -1 ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 97/432 RDMA/efa: Remove double QP type assignment
In reply to Greg Kroah-HartmanFrom: Leon Romanovsky <[email protected]>
[ Upstream commit f9193d266347fe9bed5c173e7a1bf96268142a79 ]
The QP type is set by the IB/core and shouldn't be set in the driver.
--- drivers/infiniband/hw/efa/efa_verbs.c | 1 - 1 file changed, 1 deletion(-)
drivers/infiniband/hw/efa/efa_verbs.c +0 -1
@@ -717,7 +717,6 @@ struct ib_qp *efa_create_qp(struct ib_pd *ibpd, qp->qp_handle = create_qp_resp.qp_handle; qp->ibqp.qp_num = create_qp_resp.qp_num; - qp->ibqp.qp_type = init_attr->qp_type; qp->max_send_wr = init_attr->cap.max_send_wr; qp->max_recv_wr = init_attr->cap.max_recv_wr; qp->max_send_sge = init_attr->cap.max_send_sge;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 98/432 RDMA/mlx5: Delete not-available udata check
In reply to Greg Kroah-HartmanFrom: Leon Romanovsky <[email protected]>
[ Upstream commit 5f6bb7e32283b8e3339b7adc00638234ac199cc4 ]
XRC_TGT QPs are created through kernel verbs and don't have udata at all.
--- drivers/infiniband/hw/mlx5/qp.c | 3 --- 1 file changed, 3 deletions(-)
drivers/infiniband/hw/mlx5/qp.c +0 -3
@@ -1906,7 +1906,6 @@ static int get_atomic_mode(struct mlx5_ib_dev *dev,static int create_xrc_tgt_qp (struct mlx5_ib_dev *dev,struct mlx5_ib_qp *qp,struct mlx5_create_qp_params *params) { -struct mlx5_ib_create_qp *ucmd = params->ucmd;struct ib_qp_init_attr *attr = params->attr;u32 uidx = params->uidx;struct mlx5_ib_resources *devr = &dev->devr;
@@ -1926,8 +1925,6 @@ static int create_xrc_tgt_qp(struct mlx5_ib_dev *dev, struct mlx5_ib_qp *qp,if (!in)return -ENOMEM ; -if (MLX5_CAP_GEN (mdev, ece_support) && ucmd) -MLX5_SET (create_qp_in, in, ece, ucmd->ece_options); qpc =MLX5_ADDR_OF (create_qp_in, in, qpc);MLX5_SET (qpc, qpc, st,MLX5_QP_ST_XRC );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 99/432 cpuidle: pseries: Mark pseries_idle_proble() as __init
In reply to Greg Kroah-HartmanFrom: Nathan Chancellor <[email protected]>
[ Upstream commit d04691d373e75c83424b85c0e68e4a3f9370c10d ]
After commit 7cbd631d4dec ("cpuidle: pseries: Fixup CEDE0 latency only for POWER10 onwards"), pseries_idle_probe() is no longer inlined when compiling with clang, which causes a modpost warning:
WARNING: modpost: vmlinux.o(.text+0xc86a54): Section mismatch in reference from the function pseries_idle_probe() to the function .init.text:fixup_cede0_latency()
The function pseries_idle_probe() references
the function __init fixup_cede0_latency().
This is often because pseries_idle_probe lacks a __init annotation or the annotation of fixup_cede0_latency is wrong.
pseries_idle_probe() is a non-init function, which calls fixup_cede0_latency(), which is an init function, explaining the mismatch. pseries_idle_probe() is only called from pseries_processor_idle_init(), which is an init function, so mark pseries_idle_probe() as __init so there is no more warning.
--- drivers/cpuidle/cpuidle-pseries.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpuidle/cpuidle-pseries.c +1 -1
@@ -402,7 +402,7 @@ static void __init fixup_cede0_latency(void)* pseries_idle_probe() * Choose state table for shared versus dedicated partition */ -static int pseries_idle_probe (void ) +static int __init pseries_idle_probe (void ) {if (cpuidle_disable !=IDLE_NO_OVERRIDE )
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 100/432 f2fs: reduce the scope of setting fsck tag when de->name_len is zero
In reply to Greg Kroah-HartmanFrom: Yangtao Li <[email protected]>
[ Upstream commit d4bf15a7ce172d186d400d606adf4f34a59130d6 ]
I recently found a case where de->name_len is 0 in f2fs_fill_dentries() easily reproduced, and finally set the fsck flag.
Thread A Thread B
- f2fs_readdir
- f2fs_read_inline_dir
- ctx->pos = d.max
- f2fs_add_dentry
- f2fs_add_inline_entry
- do_convert_inline_dir
- f2fs_add_regular_entry
- f2fs_readdir
- f2fs_fill_dentries
- set_sbi_flag(sbi, SBI_NEED_FSCK)
Process A opens the folder, and has been reading without closing it. During this period, Process B created a file under the folder (occupying multiple f2fs_dir_entry, exceeding the d.max of the inline dir). After creation, process A uses the d.max of inline dir to read it again, and it will read that de->name_len is 0.
And Chao pointed out that w/o inline conversion, the race condition still can happen as below:
dir_entry1: Adir_entry2: Bdir_entry3: C
free slot: _ctx->pos: ^
Thread A is traversing directory,
ctx-pos moves to below position after readdir() by thread A:AAAABBBB___
^
Then thread B delete dir_entry2, and create dir_entry3.
Thread A calls readdir() to lookup dirents starting from middle of new dirent slots as below:AAAACCCCCC_
^
In these scenarios, the file system is not damaged, and it's hard to avoid it. But we can bypass tagging FSCK flag if:
a) bit_pos (:= ctx->pos % d->max) is non-zero and
b) before bit_pos moves to first valid dir_entry.
--- fs/f2fs/dir.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
fs/f2fs/dir.c +9 -5
@@ -1000,6 +1000,7 @@ int f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d,struct f2fs_sb_info *sbi =F2FS_I_SB (d->inode);struct blk_plug plug;bool readdir_ra = sbi->readdir_ra ==1 ; +bool found_valid_dirent = false;int err =0 ; bit_pos = ((unsigned long )ctx->pos % d->max);
@@ -1014,13 +1015,15 @@ int f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d, de = &d->dentry[bit_pos];if (de->name_len ==0 ) { +if (found_valid_dirent || !bit_pos) { +printk_ratelimited ( +"%sF2FS-fs (%s): invalid namelen(0), ino:%u, run fsck to fix." , +KERN_WARNING , sbi->sb->s_id, +le32_to_cpu (de->ino)); +set_sbi_flag (sbi,SBI_NEED_FSCK ); + } bit_pos++; ctx->pos = start_pos + bit_pos; -printk_ratelimited ( -"%sF2FS-fs (%s): invalid namelen(0), ino:%u, run fsck to fix." , -KERN_WARNING , sbi->sb->s_id, -le32_to_cpu (de->ino)); -set_sbi_flag (sbi,SBI_NEED_FSCK );continue ; }
@@ -1063,6 +1066,7 @@ int f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d,f2fs_ra_node_page (sbi,le32_to_cpu (de->ino)); ctx->pos = start_pos + bit_pos; + found_valid_dirent = true; } out:if (readdir_ra)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 101/432 openrisc: dont printk() unconditionally
In reply to Greg Kroah-HartmanFrom: Randy Dunlap <[email protected]>
[ Upstream commit 946e1052cdcc7e585ee5d1e72528ca49fb295243 ]
Don't call printk() when CONFIG_PRINTK is not set. Fixes the following build errors:
or1k-linux-ld: arch/openrisc/kernel/entry.o: in function `_external_irq_handler':
(.text+0x804): undefined reference to `printk'
(.text+0x804): relocation truncated to fit: R_OR1K_INSN_REL_26 against undefined symbol `printk'
--- arch/openrisc/kernel/entry.S | 2 ++ 1 file changed, 2 insertions(+)
arch/openrisc/kernel/entry.S +2 -0
@@ -547,6 +547,7 @@ EXCEPTION_ENTRY(_external_irq_handler) l.bnf 1f // ext irq enabled, all ok. l.nop +#ifdef CONFIG_PRINTK l.addi r1,r1,-0x8 l.movhi r3,hi(42f) l.ori r3,r3,lo(42f)
@@ -560,6 +561,7 @@ EXCEPTION_ENTRY(_external_irq_handler) .string "\n\rESR interrupt bug: in _external_irq_handler (ESR %x)\n\r" .align 4 .previous +#endif l.ori r4,r4,SPR_SR_IEE // fix the bug // l.sw PT_SR(r1),r4
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 102/432 dma-debug: fix debugfs initialization order
In reply to Greg Kroah-HartmanFrom: Anthony Iliopoulos <[email protected]>
[ Upstream commit 173735c346c412d9f084825ecb04f24ada0e2986 ]
Due to link order, dma_debug_init is called before debugfs has a chance to initialize (via debugfs_init which also happens in the core initcall stage), so the directories for dma-debug are never created.
Decouple dma_debug_fs_init from dma_debug_init and defer its init until core_initcall_sync (after debugfs has been initialized) while letting dma-debug initialization occur as soon as possible to catch any early mappings, as suggested in [1].
[1] https://lore.kernel.org/linux-iommu/YIgGa6yF%[email protected]/
--- kernel/dma/debug.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
kernel/dma/debug.c +4 -3
@@ -792,7 +792,7 @@ static int dump_show(struct seq_file *seq, void *v) }DEFINE_SHOW_ATTRIBUTE (dump); -static void dma_debug_fs_init (void ) +static int __init dma_debug_fs_init (void ) {struct dentry *dentry =debugfs_create_dir ("dma-api" ,NULL );
@@ -805,7 +805,10 @@ static void dma_debug_fs_init(void)debugfs_create_u32 ("nr_total_entries" ,0444 , dentry, &nr_total_entries);debugfs_create_file ("driver_filter" ,0644 , dentry,NULL , &filter_fops);debugfs_create_file ("dump" ,0444 , dentry,NULL , &dump_fops); + +return 0 ; } +core_initcall_sync (dma_debug_fs_init);static int device_dma_allocations (struct device *dev,struct dma_debug_entry **out_entry) {
@@ -890,8 +893,6 @@ static int dma_debug_init(void)spin_lock_init (&dma_entry_hash[i].lock); } -dma_debug_fs_init (); - nr_pages =DIV_ROUND_UP (nr_prealloc_entries,DMA_DEBUG_DYNAMIC_ENTRIES );for (i =0 ; i < nr_pages; ++i)dma_debug_create_entries (GFP_KERNEL );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 103/432 xprtrdma: Put rpcrdma_reps before waking the tear-down completion
In reply to Greg Kroah-HartmanFrom: Chuck Lever <[email protected]>
[ Upstream commit 97480cae13ca3a9c1de3eb6fd66cf9650a60db42 ]
Ensure the tear-down completion is awoken only /after/ we've stopped fiddling with rpcrdma_rep objects in rpcrdma_post_recvs().
--- net/sunrpc/xprtrdma/verbs.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
net/sunrpc/xprtrdma/verbs.c +5 -5
@@ -1416,11 +1416,6 @@ void rpcrdma_post_recvs(struct rpcrdma_xprt *r_xprt, int needed, bool temp) rc =ib_post_recv (ep->re_id->qp, wr, (const struct ib_recv_wr **)&bad_wr); -if (atomic_dec_return (&ep->re_receiving) >0 ) -complete (&ep->re_done); - -out: -trace_xprtrdma_post_recvs (r_xprt, count, rc);if (rc) {for (wr = bad_wr; wr;) {struct rpcrdma_rep *rep;
@@ -1431,6 +1426,11 @@ void rpcrdma_post_recvs(struct rpcrdma_xprt *r_xprt, int needed, bool temp) --count; } } +if (atomic_dec_return (&ep->re_receiving) >0 ) +complete (&ep->re_done); + +out: +trace_xprtrdma_post_recvs (r_xprt, count, rc); ep->re_receive_count += count;return ; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 104/432 NFSv4/pNFS: Fix a layoutget livelock loop
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit e20772cbdf463c12088837e5a08bde1b876bfd25 ]
If NFS_LAYOUT_RETURN_REQUESTED is set, but there is no value set for the layout plh_return_seq, we can end up in a livelock loop in which every layout segment retrieved by a new call to layoutget is immediately invalidated by pnfs_layout_need_return().
To get around this, we should just set plh_return_seq to the current value of the layout stateid's seqid.
--- fs/nfs/pnfs.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
fs/nfs/pnfs.c +8 -4
@@ -347,11 +347,15 @@ pnfs_set_plh_return_info(struct pnfs_layout_hdr *lo, enum pnfs_iomode iomode, iomode =IOMODE_ANY ; lo->plh_return_iomode = iomode;set_bit (NFS_LAYOUT_RETURN_REQUESTED , &lo->plh_flags); -if (seq !=0 ) { -WARN_ON_ONCE (lo->plh_return_seq !=0 && lo->plh_return_seq != seq); +/* +* We must set lo->plh_return_seq to avoid livelocks with +* pnfs_layout_need_return() +*/ +if (seq ==0 ) + seq =be32_to_cpu (lo->plh_stateid.seqid); +if (!lo->plh_return_seq ||pnfs_seqid_is_newer (seq, lo->plh_return_seq)) lo->plh_return_seq = seq; -pnfs_barrier_update (lo, seq); - } +pnfs_barrier_update (lo, seq); } static void
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 105/432 NFSv4/pNFS: Always allow update of a zero valued layout barrier
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit 45baadaad7bf9183651fb74f4ed1200da48505a5 ]
A zero value for the layout barrier indicates that it has been cleared (since seqid '0' is an illegal value), so we should always allow it to be updated.
--- fs/nfs/pnfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/pnfs.c +1 -1
@@ -335,7 +335,7 @@ static bool pnfs_seqid_is_newer(u32 s1, u32 s2)static void pnfs_barrier_update (struct pnfs_layout_hdr *lo,u32 newseq) { -if (pnfs_seqid_is_newer (newseq, lo->plh_barrier)) +if (pnfs_seqid_is_newer (newseq, lo->plh_barrier) || !lo->plh_barrier) lo->plh_barrier = newseq; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 106/432 NFSv4/pnfs: The layout barrier indicate a minimal value for the seqid
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit d6236a98b3bab07c0a1455fd1ab46f79c3978cdc ]
The intention of the layout barrier is to ensure that we do not update the layout to match an older value than the current expectation. Fix the test in pnfs_layout_stateid_blocked() to reflect that it is legal for the seqid of the stateid to match that of the barrier.
--- fs/nfs/pnfs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nfs/pnfs.c +1 -1
@@ -1004,7 +1004,7 @@ pnfs_layout_stateid_blocked(const struct pnfs_layout_hdr *lo, {u32 seqid =be32_to_cpu (stateid->seqid); -return !pnfs_seqid_is_newer (seqid, lo->plh_barrier) && lo->plh_barrier; +return lo->plh_barrier &&pnfs_seqid_is_newer (lo->plh_barrier, seqid); }/* lget is set to 1 if called from inside send_layoutget call chain */
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 107/432 SUNRPC: Fix potential memory corruption
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit c2dc3e5fad13aca5d7bdf4bcb52b1a1d707c8555 ]
We really should not call rpc_wake_up_queued_task_set_status() with xprt->snd_task as an argument unless we are certain that is actually an rpc_task.
--- include/linux/sunrpc/xprt.h | 1 + net/sunrpc/xprt.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-)
include/linux/sunrpc/xprt.h +1 -0
@@ -432,6 +432,7 @@ void xprt_release_write(struct rpc_xprt *, struct rpc_task *);#define XPRT_CONGESTED (9)#define XPRT_CWND_WAIT (10)#define XPRT_WRITE_SPACE (11) +#define XPRT_SND_IS_COOKIE (12)static inline void xprt_set_connected (struct rpc_xprt *xprt) {
net/sunrpc/xprt.c +4 -2
@@ -775,9 +775,9 @@ void xprt_force_disconnect(struct rpc_xprt *xprt)/* Try to schedule an autoclose RPC call */ if (test_and_set_bit (XPRT_LOCKED , &xprt->state) ==0 )queue_work (xprtiod_workqueue, &xprt->task_cleanup); -else if (xprt->snd_task) +else if (xprt->snd_task && !test_bit (XPRT_SND_IS_COOKIE , &xprt->state))rpc_wake_up_queued_task_set_status (&xprt->pending, - xprt->snd_task, -ENOTCONN ); + xprt->snd_task, -ENOTCONN );spin_unlock (&xprt->transport_lock); }EXPORT_SYMBOL_GPL (xprt_force_disconnect);
@@ -866,6 +866,7 @@ bool xprt_lock_connect(struct rpc_xprt *xprt, goto out;if (xprt->snd_task != task) goto out; +set_bit (XPRT_SND_IS_COOKIE , &xprt->state); xprt->snd_task = cookie; ret = true; out:
@@ -881,6 +882,7 @@ void xprt_unlock_connect(struct rpc_xprt *xprt, void *cookie)if (!test_bit (XPRT_LOCKED , &xprt->state)) goto out; xprt->snd_task =NULL ; +clear_bit (XPRT_SND_IS_COOKIE , &xprt->state); xprt->ops->release_xprt (xprt,NULL );xprt_schedule_autodisconnect (xprt); out:
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 108/432 SUNRPC/xprtrdma: Fix reconnection locking
In reply to Greg Kroah-HartmanFrom: Trond Myklebust <[email protected]>
[ Upstream commit f99fa50880f5300fbbb3c0754ddc7f8738d24fe7 ]
The xprtrdma client code currently relies on the task that initiated the connect to hold the XPRT_LOCK for the duration of the connection attempt. If the task is woken early, due to some other event, then that lock could get released early.
Avoid races by using the same mechanism that the socket code uses of transferring lock ownership to the RDMA connect worker itself. That frees us to call rpcrdma_xprt_disconnect() directly since we're now guaranteed exclusion w.r.t. other callers.
--- net/sunrpc/xprt.c | 2 ++ net/sunrpc/xprtrdma/transport.c | 11 +++++------ 2 files changed, 7 insertions(+), 6 deletions(-)
net/sunrpc/xprt.c +2 -0
@@ -873,6 +873,7 @@ bool xprt_lock_connect(struct rpc_xprt *xprt,spin_unlock (&xprt->transport_lock);return ret; } +EXPORT_SYMBOL_GPL (xprt_lock_connect);void xprt_unlock_connect (struct rpc_xprt *xprt,void *cookie) {
@@ -889,6 +890,7 @@ void xprt_unlock_connect(struct rpc_xprt *xprt, void *cookie)spin_unlock (&xprt->transport_lock);wake_up_bit (&xprt->state,XPRT_LOCKED ); } +EXPORT_SYMBOL_GPL (xprt_unlock_connect);/** * xprt_connect - schedule a transport connect operation
net/sunrpc/xprtrdma/transport.c +5 -6
@@ -250,12 +250,9 @@ xprt_rdma_connect_worker(struct work_struct *work) xprt->stat.connect_start;xprt_set_connected (xprt); rc = -EAGAIN ; - }else { -/* Force a call to xprt_rdma_close to clean up */ -spin_lock (&xprt->transport_lock); -set_bit (XPRT_CLOSE_WAIT , &xprt->state); -spin_unlock (&xprt->transport_lock); - } + }else +rpcrdma_xprt_disconnect (r_xprt); +xprt_unlock_connect (xprt, r_xprt);xprt_wake_pending_tasks (xprt, rc); }
@@ -489,6 +486,8 @@ xprt_rdma_connect(struct rpc_xprt *xprt, struct rpc_task *task)struct rpcrdma_ep *ep = r_xprt->rx_ep;unsigned long delay; +WARN_ON_ONCE (!xprt_lock_connect (xprt, task, r_xprt)); + delay =0 ;if (ep && ep->re_connect_status !=0 ) { delay =xprt_reconnect_delay (xprt);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 109/432 sunrpc: Fix return value of get_srcport()
In reply to Greg Kroah-HartmanFrom: Anna Schumaker <[email protected]>
[ Upstream commit 5d46dd04cb68771f77ba66dbf6fd323a4a2ce00d ]
Since bc1c56e9bbe9 transport->srcport may by unset, causing get_srcport() to return 0 when called. Fix this by querying the port from the underlying socket instead of the transport.
--- net/sunrpc/xprtsock.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/sunrpc/xprtsock.c +1 -1
@@ -1656,7 +1656,7 @@ static int xs_get_srcport(struct sock_xprt *transport)unsigned short get_srcport (struct rpc_xprt *xprt) { struct sock_xprt *sock = container_of(xprt, struct sock_xprt, xprt); -return sock->srcport; +return xs_sock_getport (sock->sock); }EXPORT_SYMBOL (get_srcport);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 110/432 scsi: ufs: Fix unsigned int compared with less than zero
In reply to Greg Kroah-HartmanFrom: Colin Ian King <[email protected]>
[ Upstream commit a5402cdcc2a925835db89ea336909b2b724189df ]
Variable 'tag' is currently an unsigned int and is being compared to less than zero, this check is always false. Fix this by making 'tag' an int.
Addresses-Coverity: ("Macro compares unsigned to 0")
--- drivers/scsi/ufs/ufshcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/ufs/ufshcd.c +1 -1
@@ -6969,7 +6969,7 @@ static int ufshcd_abort(struct scsi_cmnd *cmd)struct Scsi_Host *host;struct ufs_hba *hba;unsigned long flags; -unsigned int tag; +int tag;int err =FAILED ;struct ufshcd_lrb *lrbp;u32 reg;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 111/432 scsi: ufshcd: Fix device links when BOOT WLUN fails to probe
In reply to Greg Kroah-HartmanFrom: Adrian Hunter <[email protected]>
[ Upstream commit bf25967ac54129ffb676ee0dbe3b8b34af6c6232 ]
Managed device links are deleted by device_del(). However it is possible to add a device link to a consumer before device_add(), and then discovering an error prevents the device from being used. In that case normally references to the device would be dropped and the device would be deleted. However the device link holds a reference to the device, so the device link and device remain indefinitely (unless the supplier is deleted).
For UFSHCD, if a LUN fails to probe (e.g. absent BOOT WLUN), the device will not have been registered but can still have a device link holding a reference to the device. The unwanted device link will prevent runtime suspend indefinitely.
Amend device link removal to accept removal of a link with an unregistered consumer device (suggested by Rafael), and fix UFSHCD by explicitly deleting the device link when SCSI destroys the SCSI device.
--- drivers/base/core.c | 2 ++ drivers/scsi/ufs/ufshcd.c | 23 +++++++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-)
drivers/base/core.c +2 -0
@@ -886,6 +886,8 @@ static void device_link_put_kref(struct device_link *link) {if (link->flags &DL_FLAG_STATELESS )kref_put (&link->kref, __device_link_del); +else if (!device_is_registered (link->consumer)) +__device_link_del (&link->kref);else WARN (1 ,"Unable to drop a managed device link reference\n" ); }
drivers/scsi/ufs/ufshcd.c +21 -2
@@ -5006,15 +5006,34 @@ static int ufshcd_slave_configure(struct scsi_device *sdev)static void ufshcd_slave_destroy (struct scsi_device *sdev) {struct ufs_hba *hba; +unsigned long flags; hba =shost_priv (sdev->host);/* Drop the reference as it won't be needed anymore */ if (ufshcd_scsi_to_upiu_lun (sdev->lun) ==UFS_UPIU_UFS_DEVICE_WLUN ) { -unsigned long flags; -spin_lock_irqsave (hba->host->host_lock, flags); hba->sdev_ufs_device =NULL ;spin_unlock_irqrestore (hba->host->host_lock, flags); + }else if (hba->sdev_ufs_device) { +struct device *supplier =NULL ; + +/* Ensure UFS Device WLUN exists and does not disappear */ +spin_lock_irqsave (hba->host->host_lock, flags); +if (hba->sdev_ufs_device) { + supplier = &hba->sdev_ufs_device->sdev_gendev; +get_device (supplier); + } +spin_unlock_irqrestore (hba->host->host_lock, flags); + +if (supplier) { +/* +* If a LUN fails to probe (e.g. absent BOOT WLUN), the +* device will not have been registered but can still +* have a device link holding a reference to the device. +*/ +device_link_remove (&sdev->sdev_gendev, supplier); +put_device (supplier); + } } }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 112/432 scsi: fdomain: Fix error return code in fdomain_probe()
In reply to Greg Kroah-HartmanFrom: Wei Li <[email protected]>
[ Upstream commit 632c4ae6da1d629eddf9da1e692d7617c568c256 ]
If request_region() fails the return value is not set. Return -EBUSY on error.
--- drivers/scsi/pcmcia/fdomain_cs.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/scsi/pcmcia/fdomain_cs.c +3 -1
@@ -45,8 +45,10 @@ static int fdomain_probe(struct pcmcia_device *link) goto fail_disable;if (!request_region (link->resource[0 ]->start,FDOMAIN_REGION_SIZE , -"fdomain_cs" )) +"fdomain_cs" )) { + ret = -EBUSY ; goto fail_disable; + } sh =fdomain_create (link->resource[0 ]->start, link->irq,7 , &link->dev);if (!sh) {
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 113/432 pinctrl: single: Fix error return code in pcs_parse_bits_in_pinctrl_entry()
In reply to Greg Kroah-HartmanFrom: Zhen Lei <[email protected]>
[ Upstream commit d789a490d32fdf0465275e3607f8a3bc87d3f3ba ]
Fix to return -ENOTSUPP instead of 0 when PCS_HAS_PINCONF is true, which is the same as that returned in pcs_parse_pinconf().
--- drivers/pinctrl/pinctrl-single.c | 1 + 1 file changed, 1 insertion(+)
drivers/pinctrl/pinctrl-single.c +1 -0
@@ -1224,6 +1224,7 @@ static int pcs_parse_bits_in_pinctrl_entry(struct pcs_device *pcs,if (PCS_HAS_PINCONF ) {dev_err (pcs->dev,"pinconf not supported\n" ); + res = -ENOTSUPP ; goto free_pingroups; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 114/432 powerpc/numa: Consider the max NUMA node for migratable LPAR
In reply to Greg Kroah-HartmanFrom: Laurent Dufour <[email protected]>
[ Upstream commit 9c7248bb8de31f51c693bfa6a6ea53b1c07e0fa8 ]
When a LPAR is migratable, we should consider the maximum possible NUMA node instead of the number of NUMA nodes from the actual system.
The DT property 'ibm,current-associativity-domains' defines the maximum number of nodes the LPAR can see when running on that box. But if the LPAR is being migrated on another box, it may see up to the nodes defined by 'ibm,max-associativity-domains'. So if a LPAR is migratable, that value should be used.
Unfortunately, there is no easy way to know if an LPAR is migratable or not. The hypervisor exports the property 'ibm,migratable-partition' in the case it set to migrate partition, but that would not mean that the current partition is migratable.
Without this patch, when a LPAR is started on a 2 node box and then migrated to a 3 node box, the hypervisor may spread the LPAR's CPUs on the 3rd node. In that case if a CPU from that 3rd node is added to the LPAR, it will be wrongly assigned to the node because the kernel has been set to use up to 2 nodes (the configuration of the departure node). With this patch applies, the CPU is correctly added to the 3rd node.
--- arch/powerpc/mm/numa.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
arch/powerpc/mm/numa.c +10 -3
@@ -893,7 +893,7 @@ static void __init setup_node_data(int nid, u64 start_pfn, u64 end_pfn)static void __init find_possible_nodes (void ) {struct device_node *rtas; -const __be32 *domains; +const __be32 *domains =NULL ;int prop_length, max_nodes;u32 i;
@@ -909,9 +909,14 @@ static void __init find_possible_nodes(void)* it doesn't exist, then fallback on ibm,max-associativity-domains. * Current denotes what the platform can support compared to max * which denotes what the Hypervisor can support. +* +* If the LPAR is migratable, new nodes might be activated after a LPM, +* so we should consider the max number in that case. */ - domains =of_get_property (rtas,"ibm,current-associativity-domains" , - &prop_length); +if (!of_get_property (of_root,"ibm,migratable-partition" ,NULL )) + domains =of_get_property (rtas, +"ibm,current-associativity-domains" , + &prop_length);if (!domains) { domains =of_get_property (rtas,"ibm,max-associativity-domains" , &prop_length);
@@ -920,6 +925,8 @@ static void __init find_possible_nodes(void) } max_nodes =of_read_number (&domains[min_common_depth],1 ); +pr_info ("Partition configured for %d NUMA nodes.\n" , max_nodes); +for (i =0 ; i < max_nodes; i++) {if (!node_possible (i))node_set (i, node_possible_map);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 115/432 vfio/mbochs: Fix missing error unwind of mbochs_used_mbytes
In reply to Greg Kroah-HartmanFrom: Jason Gunthorpe <[email protected]>
[ Upstream commit de5494af4815a4c9328536c72741229b7de88e7f ]
Convert mbochs to use an atomic scheme for this like mtty was changed into. The atomic fixes various race conditions with probing. Add the missing error unwind. Also add the missing kfree of mdev_state->pages.
--- samples/vfio-mdev/mbochs.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-)
samples/vfio-mdev/mbochs.c +15 -9
@@ -129,7 +129,7 @@ static dev_t mbochs_devt;static struct class *mbochs_class;static struct cdev mbochs_cdev;static struct device mbochs_dev; -static int mbochs_used_mbytes; +static atomic_t mbochs_avail_mbytes;static const struct vfio_device_ops mbochs_dev_ops;struct vfio_region_info_ext {
@@ -507,18 +507,22 @@ static int mbochs_reset(struct mdev_state *mdev_state)static int mbochs_probe (struct mdev_device *mdev) { +int avail_mbytes =atomic_read (&mbochs_avail_mbytes);const struct mbochs_type *type = &mbochs_types[mdev_get_type_group_id (mdev)];struct device *dev =mdev_dev (mdev);struct mdev_state *mdev_state;int ret = -ENOMEM ; -if (type->mbytes + mbochs_used_mbytes > max_mbytes) -return -ENOMEM ; +do { +if (avail_mbytes < type->mbytes) +return -ENOSPC ; + }while (!atomic_try_cmpxchg (&mbochs_avail_mbytes, &avail_mbytes, + avail_mbytes - type->mbytes)); mdev_state =kzalloc (sizeof (struct mdev_state ),GFP_KERNEL );if (mdev_state ==NULL ) -return -ENOMEM ; + goto err_avail;vfio_init_group_dev (&mdev_state->vdev, &mdev->dev, &mbochs_dev_ops); mdev_state->vconfig =kzalloc (MBOCHS_CONFIG_SPACE_SIZE ,GFP_KERNEL );
@@ -549,17 +553,17 @@ static int mbochs_probe(struct mdev_device *mdev)mbochs_create_config_space (mdev_state);mbochs_reset (mdev_state); - mbochs_used_mbytes += type->mbytes; - ret =vfio_register_group_dev (&mdev_state->vdev);if (ret) goto err_mem;dev_set_drvdata (&mdev->dev, mdev_state);return 0 ; - err_mem: +kfree (mdev_state->pages);kfree (mdev_state->vconfig);kfree (mdev_state); +err_avail: +atomic_add (type->mbytes, &mbochs_avail_mbytes);return ret; }
@@ -567,8 +571,8 @@ static void mbochs_remove(struct mdev_device *mdev) {struct mdev_state *mdev_state =dev_get_drvdata (&mdev->dev); - mbochs_used_mbytes -= mdev_state->type->mbytes;vfio_unregister_group_dev (&mdev_state->vdev); +atomic_add (mdev_state->type->mbytes, &mbochs_avail_mbytes);kfree (mdev_state->pages);kfree (mdev_state->vconfig);kfree (mdev_state);
@@ -1355,7 +1359,7 @@ static ssize_t available_instances_show(struct mdev_type *mtype, {const struct mbochs_type *type = &mbochs_types[mtype_get_type_group_id (mtype)]; -int count = (max_mbytes - mbochs_used_mbytes) / type->mbytes; +int count =atomic_read (&mbochs_avail_mbytes) / type->mbytes;return sprintf (buf,"%d\n" , count); }
@@ -1437,6 +1441,8 @@ static int __init mbochs_dev_init(void) {int ret =0 ; +atomic_set (&mbochs_avail_mbytes, max_mbytes); + ret =alloc_chrdev_region (&mbochs_devt,0 ,MINORMASK +1 ,MBOCHS_NAME );if (ret <0 ) {pr_err ("Error: failed to register mbochs_dev, err: %d\n" , ret);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 116/432 platform/x86: ISST: Fix optimization with use of numa
In reply to Greg Kroah-HartmanFrom: Srinivas Pandruvada <[email protected]>
[ Upstream commit d36d4a1d75d2a8bd14ec00d5cb0ce166f6886146 ]
When numa is used to map CPU to PCI device, the optimized path to read from cached data is not working and still calls _isst_if_get_pci_dev().
The reason is that when caching the mapping, numa information is not available as it is read later. So move the assignment of isst_cpu_info[cpu].numa_node before calling _isst_if_get_pci_dev().
--- drivers/platform/x86/intel_speed_select_if/isst_if_common.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/platform/x86/intel_speed_select_if/isst_if_common.c +2 -1
@@ -379,6 +379,8 @@ static int isst_if_cpu_online(unsigned int cpu)u64 data;int ret; + isst_cpu_info[cpu].numa_node =cpu_to_node (cpu); + ret =rdmsrl_safe (MSR_CPU_BUS_NUMBER , &data);if (ret) {/* This is not a fatal error on MSR mailbox only I/F */
@@ -397,7 +399,6 @@ static int isst_if_cpu_online(unsigned int cpu)return ret; } isst_cpu_info[cpu].punit_cpu_id = data; - isst_cpu_info[cpu].numa_node =cpu_to_node (cpu);isst_restore_msr_local (cpu);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 117/432 scsi: smartpqi: Fix an error code in pqi_get_raid_map()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit d1f6581a6796c4e9fd8a4a24e8b77463d18f0df1 ]
Return -EINVAL on failure instead of success.
--- drivers/scsi/smartpqi/smartpqi_init.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/smartpqi/smartpqi_init.c +1 -0
@@ -1322,6 +1322,7 @@ static int pqi_get_raid_map(struct pqi_ctrl_info *ctrl_info,"requested %u bytes, received %u bytes\n" , raid_map_size, get_unaligned_le32(&raid_map->structure_size)); + rc = -EINVAL ; goto error; } }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 118/432 scsi: qedi: Fix error codes in qedi_alloc_global_queues()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit 4dbe57d46d54a847875fa33e7d05877bb341585e ]
This function had some left over code that returned 1 on error instead negative error codes. Convert everything to use negative error codes. The caller treats all non-zero returns the same so this does not affect run time.
A couple places set "rc" instead of "status" so those error paths ended up returning success by mistake. Get rid of the "rc" variable and use "status" everywhere.
Remove the bogus "status = 0" initialization, as a future proofing measure so the compiler will warn about uninitialized error codes.
--- drivers/scsi/qedi/qedi_main.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/scsi/qedi/qedi_main.c +7 -7
@@ -1621,7 +1621,7 @@ static int qedi_alloc_global_queues(struct qedi_ctx *qedi) {u32 *list;int i; -int status =0 , rc; +int status;u32 *pbl;dma_addr_t page;int num_pages;
@@ -1632,14 +1632,14 @@ static int qedi_alloc_global_queues(struct qedi_ctx *qedi)*/ if (!qedi->num_queues) {QEDI_ERR (&qedi->dbg_ctx,"No MSI-X vectors available!\n" ); -return 1 ; +return -ENOMEM ; }/* Make sure we allocated the PBL that will contain the physical * addresses of our queues */ if (!qedi->p_cpuq) { - status =1 ; + status = -EINVAL ; goto mem_alloc_failure; }
@@ -1654,13 +1654,13 @@ static int qedi_alloc_global_queues(struct qedi_ctx *qedi) "qedi->global_queues=%p.\n", qedi->global_queues);/* Allocate DMA coherent buffers for BDQ */ - rc =qedi_alloc_bdq (qedi); -if (rc) + status =qedi_alloc_bdq (qedi); +if (status) goto mem_alloc_failure;/* Allocate DMA coherent buffers for NVM_ISCSI_CFG */ - rc =qedi_alloc_nvm_iscsi_cfg (qedi); -if (rc) + status =qedi_alloc_nvm_iscsi_cfg (qedi); +if (status) goto mem_alloc_failure;/* Allocate a CQ and an associated PBL for each MSI-X
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 119/432 scsi: qedf: Fix error codes in qedf_alloc_global_queues()
In reply to Greg Kroah-HartmanFrom: Dan Carpenter <[email protected]>
[ Upstream commit ccc89737aa6b9f248cf1623014038beb6c2b7f56 ]
This driver has some left over "return 1" on failure style code mixed with "return negative error codes" style code. The caller doesn't care so we should just convert everything to return negative error codes.
Then there was a problem that there were two variables used to store error codes which just resulted in confusion. If qedf_alloc_bdq() returned a negative error code, we accidentally returned success instead of propagating the error code. So get rid of the "rc" variable and use "status" every where.
Also remove the "status = 0" initialization so that these sorts of bugs will be detected by the compiler in the future.
--- drivers/scsi/qedf/qedf_main.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/scsi/qedf/qedf_main.c +5 -5
@@ -3004,7 +3004,7 @@ static int qedf_alloc_global_queues(struct qedf_ctx *qedf) {u32 *list;int i; -int status =0 , rc; +int status;u32 *pbl;dma_addr_t page;int num_pages;
@@ -3016,7 +3016,7 @@ static int qedf_alloc_global_queues(struct qedf_ctx *qedf)*/ if (!qedf->num_queues) {QEDF_ERR (&(qedf->dbg_ctx),"No MSI-X vectors available!\n" ); -return 1 ; +return -ENOMEM ; }/*
@@ -3024,7 +3024,7 @@ static int qedf_alloc_global_queues(struct qedf_ctx *qedf)* addresses of our queues */ if (!qedf->p_cpuq) { - status =1 ; + status = -EINVAL ;QEDF_ERR (&qedf->dbg_ctx,"p_cpuq is NULL.\n" ); goto mem_alloc_failure; }
@@ -3040,8 +3040,8 @@ static int qedf_alloc_global_queues(struct qedf_ctx *qedf) "qedf->global_queues=%p.\n", qedf->global_queues);/* Allocate DMA coherent buffers for BDQ */ - rc =qedf_alloc_bdq (qedf); -if (rc) { + status =qedf_alloc_bdq (qedf); +if (status) {QEDF_ERR (&qedf->dbg_ctx,"Unable to allocate bdq.\n" ); goto mem_alloc_failure; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 120/432 powerpc/config: Fix IPV6 warning in mpc855_ads
In reply to Greg Kroah-HartmanFrom: Joel Stanley <[email protected]>
[ Upstream commit c5ac55b6cbc604ad4144c380feae20f69453df91 ]
When building this config there's a warning:
79:warning: override: reassigning to symbol IPV6
Commit 9a1762a4a4ff ("powerpc/8xx: Update mpc885_ads_defconfig to improve CI") added CONFIG_IPV6=y, but left '# CONFIG_IPV6 is not set' in.
IPV6 is default y, so remove both to clean up the build.
--- arch/powerpc/configs/mpc885_ads_defconfig | 2 -- 1 file changed, 2 deletions(-)
arch/powerpc/configs/mpc885_ads_defconfig +0 -2
@@ -21,7 +21,6 @@ CONFIG_INET=y CONFIG_IP_MULTICAST=y CONFIG_IP_PNP=y CONFIG_SYN_COOKIES=y -# CONFIG_IPV6 is not set # CONFIG_FW_LOADER is not set CONFIG_MTD=y CONFIG_MTD_BLOCK=y
@@ -76,7 +75,6 @@ CONFIG_PERF_EVENTS=y CONFIG_MATH_EMULATION=y CONFIG_VIRT_CPU_ACCOUNTING_NATIVE=y CONFIG_STRICT_KERNEL_RWX=y -CONFIG_IPV6=y CONFIG_BPF_JIT=y CONFIG_DEBUG_VM_PGTABLE=y CONFIG_BDI_SWITCH=y
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 121/432 powerpc/config: Renable MTD_PHYSMAP_OF
In reply to Greg Kroah-HartmanFrom: Joel Stanley <[email protected]>
[ Upstream commit d0e28a6145c3455b69991245e7f6147eb914b34a ]
CONFIG_MTD_PHYSMAP_OF is not longer enabled as it depends on MTD_PHYSMAP which is not enabled.
This is a regression from commit 642b1e8dbed7 ("mtd: maps: Merge physmap_of.c into physmap-core.c"), which added the extra dependency. Add CONFIG_MTD_PHYSMAP=y so this stays in the config, as Christophe said it is useful for build coverage.
--- arch/powerpc/configs/mpc885_ads_defconfig | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/configs/mpc885_ads_defconfig +1 -0
@@ -33,6 +33,7 @@ CONFIG_MTD_CFI_GEOMETRY=y # CONFIG_MTD_CFI_I2 is not set CONFIG_MTD_CFI_I4=y CONFIG_MTD_CFI_AMDSTD=y +CONFIG_MTD_PHYSMAP=y CONFIG_MTD_PHYSMAP_OF=y # CONFIG_BLK_DEV is not set CONFIG_NETDEVICES=y
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 122/432 f2fs: fix to keep compatibility of fault injection interface
In reply to Greg Kroah-HartmanFrom: Chao Yu <[email protected]>
[ Upstream commit b96d9b3b09f0427b289332c6f6bfbf747a19b654 ]
The value of FAULT_* macros and its description in f2fs.rst became inconsistent, fix this to keep compatibility of fault injection interface.
--- Documentation/filesystems/f2fs.rst | 1 + fs/f2fs/f2fs.h | 1 + 2 files changed, 2 insertions(+)
Documentation/filesystems/f2fs.rst +1 -0
@@ -185,6 +185,7 @@ fault_type=%d Support configuring fault injection type, should be FAULT_KVMALLOC 0x000000002 FAULT_PAGE_ALLOC 0x000000004 FAULT_PAGE_GET 0x000000008 + FAULT_ALLOC_BIO 0x000000010 (obsolete) FAULT_ALLOC_NID 0x000000020 FAULT_ORPHAN 0x000000040 FAULT_BLOCK 0x000000080
fs/f2fs/f2fs.h +1 -0
@@ -43,6 +43,7 @@ enum {FAULT_KVMALLOC ,FAULT_PAGE_ALLOC ,FAULT_PAGE_GET , +FAULT_ALLOC_BIO ,/* it's obsolete due to bio_alloc() will never fail */ FAULT_ALLOC_NID ,FAULT_ORPHAN , FAULT_BLOCK,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 123/432 iommu/vt-d: Update the virtual command related registers
In reply to Greg Kroah-HartmanFrom: Lu Baolu <[email protected]>
[ Upstream commit 4d99efb229e63928c6b03a756a2e38cd4777fbe8 ]
The VT-d spec Revision 3.3 updated the virtual command registers, virtual command opcode B register, virtual command response register and virtual command capability register (Section 10.4.43, 10.4.44, 10.4.45, 10.4.46). This updates the virtual command interface implementation in the Intel IOMMU driver accordingly.
--- drivers/iommu/intel/pasid.h | 10 +++++----- include/linux/intel-iommu.h | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/iommu/intel/pasid.h +5 -5
@@ -28,12 +28,12 @@#define VCMD_CMD_ALLOC 0x1#define VCMD_CMD_FREE 0x2#define VCMD_VRSP_IP 0x1 -#define VCMD_VRSP_SC (e) (((e) >> 1) & 0x3) +#define VCMD_VRSP_SC (e) (((e) & 0xff) >> 1)#define VCMD_VRSP_SC_SUCCESS 0 -#define VCMD_VRSP_SC_NO_PASID_AVAIL 2 -#define VCMD_VRSP_SC_INVALID_PASID 2 -#define VCMD_VRSP_RESULT_PASID (e) (((e) >> 8) & 0xfffff) -#define VCMD_CMD_OPERAND (e) ((e) << 8) +#define VCMD_VRSP_SC_NO_PASID_AVAIL 16 +#define VCMD_VRSP_SC_INVALID_PASID 16 +#define VCMD_VRSP_RESULT_PASID (e) (((e) >> 16) & 0xfffff) +#define VCMD_CMD_OPERAND (e) ((e) << 16)/* * Domain ID reserved for pasid entries programmed for first-level * only and pass-through transfer modes.
include/linux/intel-iommu.h +3 -3
@@ -124,9 +124,9 @@#define DMAR_MTRR_PHYSMASK8_REG 0x208#define DMAR_MTRR_PHYSBASE9_REG 0x210#define DMAR_MTRR_PHYSMASK9_REG 0x218 -#define DMAR_VCCAP_REG 0xe00/* Virtual command capability register */ -#define DMAR_VCMD_REG 0xe10/* Virtual command register */ -#define DMAR_VCRSP_REG 0xe20/* Virtual command response register */ +#define DMAR_VCCAP_REG 0xe30/* Virtual command capability register */ +#define DMAR_VCMD_REG 0xe00/* Virtual command register */ +#define DMAR_VCRSP_REG 0xe10/* Virtual command response register */ #define DMAR_IQER_REG_IQEI (reg) FIELD_GET(GENMASK_ULL(3, 0), reg)#define DMAR_IQER_REG_ITESID (reg) FIELD_GET(GENMASK_ULL(47, 32), reg)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 124/432 RDMA/hns: Fix return in hns_roce_rereg_user_mr()
In reply to Greg Kroah-HartmanFrom: YueHaibing <[email protected]>
[ Upstream commit c4c7d7a43246a42b0355692c3ed53dff7cbb29bb ]
If re-registering an MR in hns_roce_rereg_user_mr(), we should return NULL instead of passing 0 to ERR_PTR for clarity.
--- drivers/infiniband/hw/hns/hns_roce_mr.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/infiniband/hw/hns/hns_roce_mr.c +3 -1
@@ -352,7 +352,9 @@ struct ib_mr *hns_roce_rereg_user_mr(struct ib_mr *ibmr, int flags, u64 start, free_cmd_mbox:hns_roce_free_cmd_mailbox (hr_dev, mailbox); -return ERR_PTR (ret); +if (ret) +return ERR_PTR (ret); +return NULL ; }int hns_roce_dereg_mr (struct ib_mr *ibmr,struct ib_udata *udata)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 125/432 HID: amd_sfh: Fix period data field to enable sensor
In reply to Greg Kroah-HartmanFrom: Basavaraj Natikar <[email protected]>
[ Upstream commit 3978f54817559b28535c58a00d3d31bbd5d0b65a ]
Existing amd-sfh driver is programming the MP2 firmware period field in units of jiffies, but the MP2 firmware expects in milliseconds unit.
Changing it to milliseconds.
--- drivers/hid/amd-sfh-hid/amd_sfh_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/hid/amd-sfh-hid/amd_sfh_client.c +1 -1
@@ -184,7 +184,7 @@ int amd_sfh_hid_client_init(struct amd_mp2_dev *privdata) rc = -ENOMEM ; goto cleanup; } - info.period =msecs_to_jiffies (AMD_SFH_IDLE_LOOP ); + info.period =AMD_SFH_IDLE_LOOP ; info.sensor_idx = cl_idx; info.dma_address = cl_data->sensor_dma_addr[i];
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 126/432 HID: i2c-hid: Fix Elan touchpad regression
In reply to Greg Kroah-HartmanFrom: Jim Broadus <[email protected]>
[ Upstream commit 786537063bbfb3a7ebc6fc21b2baf37fb91df401 ]
A quirk was recently added for Elan devices that has same device match as an entry earlier in the list. The i2c_hid_lookup_quirk function will always return the last match in the list, so the new entry shadows the old entry. The quirk in the previous entry, I2C_HID_QUIRK_BOGUS_IRQ, silenced a flood of messages which have reappeared in the 5.13 kernel.
This change moves the two quirk flags into the same entry.
--- drivers/hid/i2c-hid/i2c-hid-core.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/hid/i2c-hid/i2c-hid-core.c +2 -3
@@ -171,8 +171,6 @@ static const struct i2c_hid_quirks { I2C_HID_QUIRK_NO_IRQ_AFTER_RESET }, {I2C_VENDOR_ID_RAYDIUM ,I2C_PRODUCT_ID_RAYDIUM_3118 , I2C_HID_QUIRK_NO_IRQ_AFTER_RESET }, - { USB_VENDOR_ID_ELAN, HID_ANY_ID, - I2C_HID_QUIRK_BOGUS_IRQ }, { USB_VENDOR_ID_ALPS_JP, HID_ANY_ID, I2C_HID_QUIRK_RESET_ON_RESUME }, { I2C_VENDOR_ID_SYNAPTICS, I2C_PRODUCT_ID_SYNAPTICS_SYNA2393,
@@ -183,7 +181,8 @@ static const struct i2c_hid_quirks {* Sending the wakeup after reset actually break ELAN touchscreen controller */ {USB_VENDOR_ID_ELAN ,HID_ANY_ID , - I2C_HID_QUIRK_NO_WAKEUP_AFTER_RESET }, +I2C_HID_QUIRK_NO_WAKEUP_AFTER_RESET | + I2C_HID_QUIRK_BOGUS_IRQ }, { 0, 0 } };
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 127/432 HID: thrustmaster: clean up Makefile and adapt quirks
In reply to Greg Kroah-HartmanFrom: Lukas Bulwahn <[email protected]>
[ Upstream commit 462ba66198a4a8ea996028915af10a698086e302 ]
Commit c49c33637802 ("HID: support for initialization of some Thrustmaster wheels") messed up the Makefile and quirks during the refactoring of this commit.
Luckily, ./scripts/checkkconfigsymbols.py warns on non-existing configs:
HID_TMINIT
Referencing files: drivers/hid/Makefile, drivers/hid/hid-quirks.c
Following the discussion (see Link), CONFIG_HID_THRUSTMASTER is the intended config for CONFIG_HID_TMINIT and the file hid-tminit.c was actually added as hid-thrustmaster.c.
So, clean up Makefile and adapt quirks to that refactoring.
--- drivers/hid/Makefile | 1 - drivers/hid/hid-quirks.c | 2 -- 2 files changed, 3 deletions(-)
drivers/hid/Makefile +0 -1
@@ -115,7 +115,6 @@ obj-$(CONFIG_HID_STEELSERIES) += hid-steelseries.o obj-$(CONFIG_HID_SUNPLUS) += hid-sunplus.o obj-$(CONFIG_HID_GREENASIA) += hid-gaff.o obj-$(CONFIG_HID_THRUSTMASTER) += hid-tmff.o hid-thrustmaster.o -obj-$(CONFIG_HID_TMINIT) += hid-tminit.o obj-$(CONFIG_HID_TIVO) += hid-tivo.o obj-$(CONFIG_HID_TOPSEED) += hid-topseed.o obj-$(CONFIG_HID_TWINHAN) += hid-twinhan.o
drivers/hid/hid-quirks.c +0 -2
@@ -662,8 +662,6 @@ static const struct hid_device_id hid_have_special_driver[] = { { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb653) }, { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb654) }, { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb65a) }, -#endif -#if IS_ENABLED(CONFIG_HID_TMINIT) { HID_USB_DEVICE(USB_VENDOR_ID_THRUSTMASTER, 0xb65d) }, #endif #if IS_ENABLED(CONFIG_HID_TIVO)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 128/432 RDMA/hns: Ownerbit mode add control field
In reply to Greg Kroah-HartmanFrom: Lang Cheng <[email protected]>
[ Upstream commit f8c549afd1e76ad78b1d044a307783c9b94ae3ab ]
The ownerbit mode is for external card mode. Make it controlled by the firmware.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +3 -0
@@ -4114,6 +4114,9 @@ static void modify_qp_reset_to_init(struct ib_qp *ibqp,if (hr_qp->en_flags &HNS_ROCE_QP_CAP_RQ_RECORD_DB )hr_reg_enable (context,QPC_RQ_RECORD_EN ); +if (hr_qp->en_flags &HNS_ROCE_QP_CAP_OWNER_DB ) +hr_reg_enable (context,QPC_OWNER_MODE ); +hr_reg_write (context,QPC_RQ_DB_RECORD_ADDR_L ,lower_32_bits (hr_qp->rdb.dma) >>1 ); hr_reg_write(context, QPC_RQ_DB_RECORD_ADDR_H,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 129/432 clk: imx8mm: use correct mux type for clkout path
In reply to Greg Kroah-HartmanFrom: Lucas Stach <[email protected]>
[ Upstream commit 1822b4dedc4d8cab96fd1d87bf8ff98194e29d9b ]
The mux in the clkout path needs the current selected parent to be enabled for the switch to work. Use the correct mux type to have the clk framework take care of this requirement.
--- drivers/clk/imx/clk-imx8mm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/imx/clk-imx8mm.c +2 -2
@@ -407,10 +407,10 @@ static int imx8mm_clocks_probe(struct platform_device *pdev) hws[IMX8MM_SYS_PLL2_500M ] =imx_clk_hw_fixed_factor ("sys_pll2_500m" ,"sys_pll2_500m_cg" ,1 ,2 ); hws[IMX8MM_SYS_PLL2_1000M ] =imx_clk_hw_fixed_factor ("sys_pll2_1000m" ,"sys_pll2_out" ,1 ,1 ); - hws[IMX8MM_CLK_CLKOUT1_SEL ] =imx_clk_hw_mux ("clkout1_sel" , base +0x128 ,4 ,4 , clkout_sels,ARRAY_SIZE (clkout_sels)); + hws[IMX8MM_CLK_CLKOUT1_SEL ] =imx_clk_hw_mux2 ("clkout1_sel" , base +0x128 ,4 ,4 , clkout_sels,ARRAY_SIZE (clkout_sels)); hws[IMX8MM_CLK_CLKOUT1_DIV ] =imx_clk_hw_divider ("clkout1_div" ,"clkout1_sel" , base +0x128 ,0 ,4 ); hws[IMX8MM_CLK_CLKOUT1 ] =imx_clk_hw_gate ("clkout1" ,"clkout1_div" , base +0x128 ,8 ); - hws[IMX8MM_CLK_CLKOUT2_SEL ] =imx_clk_hw_mux ("clkout2_sel" , base +0x128 ,20 ,4 , clkout_sels,ARRAY_SIZE (clkout_sels)); + hws[IMX8MM_CLK_CLKOUT2_SEL ] =imx_clk_hw_mux2 ("clkout2_sel" , base +0x128 ,20 ,4 , clkout_sels,ARRAY_SIZE (clkout_sels)); hws[IMX8MM_CLK_CLKOUT2_DIV ] =imx_clk_hw_divider ("clkout2_div" ,"clkout2_sel" , base +0x128 ,16 ,4 ); hws[IMX8MM_CLK_CLKOUT2 ] =imx_clk_hw_gate ("clkout2" ,"clkout2_div" , base +0x128 ,24 );
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 130/432 clk: imx8m: fix clock tree update of TF-A managed clocks
In reply to Greg Kroah-HartmanFrom: Ahmad Fatoum <[email protected]>
[ Upstream commit d36207b848a6490e14664e2197a1c8ab51d8148e ]
On the i.MX8M*, the TF-A exposes a SiP (Silicon Provider) service for DDR frequency scaling. The imx8m-ddrc-devfreq driver calls the SiP and then does clk_set_parent on the DDR muxes to synchronize the clock tree.
Since 936c383673b9 ("clk: imx: fix composite peripheral flags"), these TF-A managed muxes have SET_PARENT_GATE set, which results in imx8m-ddrc-devfreq's clk_set_parent after SiP failing with -EBUSY:
echo 25000000 > userspace/set_freq imx8m-ddrc-devfreq 3d400000.memory-controller: failed to set
dram_apb parent: -16
Fix this by adding a new i.MX composite flag for firmware managed clocks, which clears SET_PARENT_GATE.
This is safe to do, because updating the Linux clock tree to reflect reality will always be glitch-free.
--- drivers/clk/imx/clk-composite-8m.c | 3 ++- drivers/clk/imx/clk-imx8mm.c | 7 ++++--- drivers/clk/imx/clk-imx8mn.c | 7 ++++--- drivers/clk/imx/clk-imx8mq.c | 7 ++++--- drivers/clk/imx/clk.h | 16 ++++++++++++++-- 5 files changed, 28 insertions(+), 12 deletions(-)
drivers/clk/imx/clk-composite-8m.c +2 -1
@@ -216,7 +216,8 @@ struct clk_hw *imx8m_clk_hw_composite_flags(const char *name, div->width =PCG_PREDIV_WIDTH ; divider_ops = &imx8m_clk_composite_divider_ops; mux_ops = &clk_mux_ops; - flags |=CLK_SET_PARENT_GATE ; +if (!(composite_flags &IMX_COMPOSITE_FW_MANAGED )) + flags |=CLK_SET_PARENT_GATE ; } div->lock = &imx_ccm_lock;
drivers/clk/imx/clk-imx8mm.c +4 -3
@@ -470,10 +470,11 @@ static int imx8mm_clocks_probe(struct platform_device *pdev)/* * DRAM clocks are manipulated from TF-A outside clock framework. -* Mark with GET_RATE_NOCACHE to always read div value from hardware +* The fw_managed helper sets GET_RATE_NOCACHE and clears SET_PARENT_GATE +* as div value should always be read from hardware */ - hws[IMX8MM_CLK_DRAM_ALT ] =__imx8m_clk_hw_composite ("dram_alt" , imx8mm_dram_alt_sels, base +0xa000 ,CLK_GET_RATE_NOCACHE ); - hws[IMX8MM_CLK_DRAM_APB ] =__imx8m_clk_hw_composite ("dram_apb" , imx8mm_dram_apb_sels, base +0xa080 ,CLK_IS_CRITICAL |CLK_GET_RATE_NOCACHE ); + hws[IMX8MM_CLK_DRAM_ALT ] =imx8m_clk_hw_fw_managed_composite ("dram_alt" , imx8mm_dram_alt_sels, base +0xa000 ); + hws[IMX8MM_CLK_DRAM_APB ] =imx8m_clk_hw_fw_managed_composite_critical ("dram_apb" , imx8mm_dram_apb_sels, base +0xa080 );/* IP */ hws[IMX8MM_CLK_VPU_G1 ] =imx8m_clk_hw_composite ("vpu_g1" , imx8mm_vpu_g1_sels, base +0xa100 );
drivers/clk/imx/clk-imx8mn.c +4 -3
@@ -453,10 +453,11 @@ static int imx8mn_clocks_probe(struct platform_device *pdev)/* * DRAM clocks are manipulated from TF-A outside clock framework. -* Mark with GET_RATE_NOCACHE to always read div value from hardware +* The fw_managed helper sets GET_RATE_NOCACHE and clears SET_PARENT_GATE +* as div value should always be read from hardware */ - hws[IMX8MN_CLK_DRAM_ALT ] =__imx8m_clk_hw_composite ("dram_alt" , imx8mn_dram_alt_sels, base +0xa000 ,CLK_GET_RATE_NOCACHE ); - hws[IMX8MN_CLK_DRAM_APB ] =__imx8m_clk_hw_composite ("dram_apb" , imx8mn_dram_apb_sels, base +0xa080 ,CLK_IS_CRITICAL |CLK_GET_RATE_NOCACHE ); + hws[IMX8MN_CLK_DRAM_ALT ] =imx8m_clk_hw_fw_managed_composite ("dram_alt" , imx8mn_dram_alt_sels, base +0xa000 ); + hws[IMX8MN_CLK_DRAM_APB ] =imx8m_clk_hw_fw_managed_composite_critical ("dram_apb" , imx8mn_dram_apb_sels, base +0xa080 ); hws[IMX8MN_CLK_DISP_PIXEL ] =imx8m_clk_hw_composite ("disp_pixel" , imx8mn_disp_pixel_sels, base +0xa500 ); hws[IMX8MN_CLK_SAI2 ] =imx8m_clk_hw_composite ("sai2" , imx8mn_sai2_sels, base +0xa600 );
drivers/clk/imx/clk-imx8mq.c +4 -3
@@ -449,11 +449,12 @@ static int imx8mq_clocks_probe(struct platform_device *pdev)/* * DRAM clocks are manipulated from TF-A outside clock framework. -* Mark with GET_RATE_NOCACHE to always read div value from hardware +* The fw_managed helper sets GET_RATE_NOCACHE and clears SET_PARENT_GATE +* as div value should always be read from hardware */ hws[IMX8MQ_CLK_DRAM_CORE ] =imx_clk_hw_mux2_flags ("dram_core_clk" , base +0x9800 ,24 ,1 , imx8mq_dram_core_sels,ARRAY_SIZE (imx8mq_dram_core_sels),CLK_IS_CRITICAL ); - hws[IMX8MQ_CLK_DRAM_ALT ] =__imx8m_clk_hw_composite ("dram_alt" , imx8mq_dram_alt_sels, base +0xa000 ,CLK_GET_RATE_NOCACHE ); - hws[IMX8MQ_CLK_DRAM_APB ] =__imx8m_clk_hw_composite ("dram_apb" , imx8mq_dram_apb_sels, base +0xa080 ,CLK_IS_CRITICAL |CLK_GET_RATE_NOCACHE ); + hws[IMX8MQ_CLK_DRAM_ALT ] =imx8m_clk_hw_fw_managed_composite ("dram_alt" , imx8mq_dram_alt_sels, base +0xa000 ); + hws[IMX8MQ_CLK_DRAM_APB ] =imx8m_clk_hw_fw_managed_composite_critical ("dram_apb" , imx8mq_dram_apb_sels, base +0xa080 );/* IP */ hws[IMX8MQ_CLK_VPU_G1 ] =imx8m_clk_hw_composite ("vpu_g1" , imx8mq_vpu_g1_sels, base +0xa100 );
drivers/clk/imx/clk.h +14 -2
@@ -530,8 +530,9 @@ struct clk_hw *imx_clk_hw_cpu(const char *name, const char *parent_name, struct clk *div, struct clk *mux, struct clk *pll, struct clk *step); -#define IMX_COMPOSITE_CORE BIT(0) -#define IMX_COMPOSITE_BUS BIT(1) +#define IMX_COMPOSITE_CORE BIT(0) +#define IMX_COMPOSITE_BUS BIT(1) +#define IMX_COMPOSITE_FW_MANAGED BIT(2) struct clk_hw *imx8m_clk_hw_composite_flags(const char *name, const char * const *parent_names,
@@ -567,6 +568,17 @@ struct clk_hw *imx8m_clk_hw_composite_flags(const char *name, ARRAY_SIZE(parent_names), reg, 0, \ flags | CLK_SET_RATE_NO_REPARENT | CLK_OPS_PARENT_ENABLE) +#define __imx8m_clk_hw_fw_managed_composite (name, parent_names, reg, flags) \ + imx8m_clk_hw_composite_flags(name, parent_names, \ + ARRAY_SIZE(parent_names), reg, IMX_COMPOSITE_FW_MANAGED, \ + flags | CLK_GET_RATE_NOCACHE | CLK_SET_RATE_NO_REPARENT | CLK_OPS_PARENT_ENABLE) + +#define imx8m_clk_hw_fw_managed_composite (name, parent_names, reg) \ + __imx8m_clk_hw_fw_managed_composite(name, parent_names, reg, 0) + +#define imx8m_clk_hw_fw_managed_composite_critical (name, parent_names, reg) \ + __imx8m_clk_hw_fw_managed_composite(name, parent_names, reg, CLK_IS_CRITICAL) +#define __imx8m_clk_composite (name, parent_names, reg, flags) \ to_clk(__imx8m_clk_hw_composite(name, parent_names, reg, flags))
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 131/432 KVM: PPC: Book3S HV: Fix copy_tofrom_guest routines
In reply to Greg Kroah-HartmanFrom: Fabiano Rosas <[email protected]>
[ Upstream commit 5d7d6dac8fe99ed59eee2300e4a03370f94d5222 ]
The __kvmhv_copy_tofrom_guest_radix function was introduced along with nested HV guest support. It uses the platform's Radix MMU quadrants to provide a nested hypervisor with fast access to its nested guests memory (H_COPY_TOFROM_GUEST hypercall). It has also since been added as a fast path for the kvmppc_ld/st routines which are used during instruction emulation.
The commit def0bfdbd603 ("powerpc: use probe_user_read() and probe_user_write()") changed the low level copy function from raw_copy_from_user to probe_user_read, which adds a check to access_ok. In powerpc that is:
static inline bool __access_ok(unsigned long addr, unsigned long size)
{
return addr < TASK_SIZE_MAX && size <= TASK_SIZE_MAX - addr;}
and TASK_SIZE_MAX is 0x0010000000000000UL for 64-bit, which means that setting the two MSBs of the effective address (which correspond to the quadrant) now cause access_ok to reject the access.
This was not caught earlier because the most common code path via kvmppc_ld/st contains a fallback (kvm_read_guest) that is likely to succeed for L1 guests. For nested guests there is no fallback.
Another issue is that probe_user_read (now __copy_from_user_nofault) does not return the number of bytes not copied in case of failure, so the destination memory is not being cleared anymore in kvmhv_copy_from_guest_radix:
ret = kvmhv_copy_tofrom_guest_radix(vcpu, eaddr, to, NULL, n);
if (ret > 0) <-- always false!
memset(to + (n - ret), 0, ret);
This patch fixes both issues by skipping access_ok and open-coding the low level __copy_to/from_user_inatomic.
--- arch/powerpc/kvm/book3s_64_mmu_radix.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
arch/powerpc/kvm/book3s_64_mmu_radix.c +4 -2
@@ -65,10 +65,12 @@ unsigned long __kvmhv_copy_tofrom_guest_radix(int lpid, int pid, }isync (); +pagefault_disable ();if (is_load) - ret =copy_from_user_nofault (to, (const void __user *)from, n); + ret =__copy_from_user_inatomic (to, (const void __user *)from, n);else - ret =copy_to_user_nofault ((void __user *)to, from, n); + ret =__copy_to_user_inatomic ((void __user *)to, from, n); +pagefault_enable ();/* switch the pid first to avoid running host with unallocated pid */ if (quadrant ==1 && pid != old_pid)
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 132/432 scsi: ufs: ufs-exynos: Fix static checker warning
In reply to Greg Kroah-HartmanFrom: Alim Akhtar <[email protected]>
[ Upstream commit 313bf281f2091552f509fd05a74172c70ce7572f ]
clk_get_rate() returns unsigned long and currently this driver stores the return value in u32 type, resulting the below warning:
Fixed smatch warnings:
drivers/scsi/ufs/ufs-exynos.c:286 exynos_ufs_get_clk_info()
warn: wrong type for 'ufs->mclk_rate' (should be 'ulong')
drivers/scsi/ufs/ufs-exynos.c:287 exynos_ufs_get_clk_info()
warn: wrong type for 'pclk_rate' (should be 'ulong')--- drivers/scsi/ufs/ufs-exynos.c | 4 ++-- drivers/scsi/ufs/ufs-exynos.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/scsi/ufs/ufs-exynos.c +2 -2
@@ -260,7 +260,7 @@ static int exynos_ufs_get_clk_info(struct exynos_ufs *ufs)struct ufs_hba *hba = ufs->hba;struct list_head *head = &hba->clk_list_head;struct ufs_clk_info *clki; -u32 pclk_rate; +unsigned long pclk_rate;u32 f_min, f_max;u8 div =0 ;int ret =0 ;
@@ -299,7 +299,7 @@ static int exynos_ufs_get_clk_info(struct exynos_ufs *ufs) }if (unlikely (pclk_rate < f_min || pclk_rate > f_max)) { -dev_err (hba->dev,"not available pclk range %d\n" , pclk_rate); +dev_err (hba->dev,"not available pclk range %lu\n" , pclk_rate); ret = -EINVAL ; goto out; }
drivers/scsi/ufs/ufs-exynos.h +1 -1
@@ -184,7 +184,7 @@ struct exynos_ufs {u32 pclk_div;u32 pclk_avail_min;u32 pclk_avail_max; -u32 mclk_rate; +unsigned long mclk_rate;int avail_ln_rx;int avail_ln_tx;int rx_sel_idx;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 133/432 KVM: PPC: Book3S HV Nested: Reflect guest PMU in-use to L0 when guest SPRs are live
In reply to Greg Kroah-HartmanFrom: Nicholas Piggin <[email protected]>
[ Upstream commit 1782663897945a5cf28e564ba5eed730098e9aa4 ]
After the L1 saves its PMU SPRs but before loading the L2's PMU SPRs, switch the pmcregs_in_use field in the L1 lppaca to the value advertised by the L2 in its VPA. On the way out of the L2, set it back after saving the L2 PMU registers (if they were in-use).
This transfers the PMU liveness indication between the L1 and L2 at the points where the registers are not live.
This fixes the nested HV bug for which a workaround was added to the L0 HV by commit 63279eeb7f93a ("KVM: PPC: Book3S HV: Always save guest pmu for guest capable of nesting"), which explains the problem in detail. That workaround is no longer required for guests that include this bug fix.
--- arch/powerpc/include/asm/pmc.h | 7 +++++++ arch/powerpc/kvm/book3s_hv.c | 20 ++++++++++++++++++++ 2 files changed, 27 insertions(+)
arch/powerpc/include/asm/pmc.h +7 -0
@@ -34,6 +34,13 @@ static inline void ppc_set_pmu_inuse(int inuse)#endif } +#ifdef CONFIG_KVM_BOOK3S_HV_POSSIBLE +static inline int ppc_get_pmu_inuse (void ) +{ +return get_paca ()->pmcregs_in_use; +} +#endif +extern void power4_enable_pmcs (void );#else /* CONFIG_PPC64 */
arch/powerpc/kvm/book3s_hv.c +20 -0
@@ -59,6 +59,7 @@#include <asm/kvm_book3s.h> #include <asm/mmu_context.h> #include <asm/lppaca.h> +#include <asm/pmc.h> #include <asm/processor.h> #include <asm/cputhreads.h> #include <asm/page.h>
@@ -3852,6 +3853,18 @@ static int kvmhv_p9_guest_entry(struct kvm_vcpu *vcpu, u64 time_limit, cpu_has_feature(CPU_FTR_P9_TM_HV_ASSIST))kvmppc_restore_tm_hv (vcpu, vcpu->arch.shregs.msr, true); +#ifdef CONFIG_PPC_PSERIES +if (kvmhv_on_pseries ()) { +barrier (); +if (vcpu->arch.vpa.pinned_addr) { +struct lppaca *lp = vcpu->arch.vpa.pinned_addr; +get_lppaca ()->pmcregs_in_use = lp->pmcregs_in_use; + }else { +get_lppaca ()->pmcregs_in_use =1 ; + } +barrier (); + } +#endif kvmhv_load_guest_pmu (vcpu);msr_check_and_set (MSR_FP |MSR_VEC |MSR_VSX );
@@ -3986,6 +3999,13 @@ static int kvmhv_p9_guest_entry(struct kvm_vcpu *vcpu, u64 time_limit, save_pmu |=nesting_enabled (vcpu->kvm);kvmhv_save_guest_pmu (vcpu, save_pmu); +#ifdef CONFIG_PPC_PSERIES +if (kvmhv_on_pseries ()) { +barrier (); +get_lppaca ()->pmcregs_in_use =ppc_get_pmu_inuse (); +barrier (); + } +#endif vc->entry_exit_map =0x101 ; vc->in_guest =0 ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 134/432 powerpc/perf: Fix the check for SIAR value
In reply to Greg Kroah-HartmanFrom: Kajol Jain <[email protected]>
[ Upstream commit 3c69a5f22223fa3e312689ec218b5059784d49d7 ]
Incase of random sampling, there can be scenarios where Sample Instruction Address Register(SIAR) may not latch to the sampled instruction and could result in the value of 0. In these scenarios it is preferred to return regs->nip. These corner cases are seen in the previous generation (p9) also.
Patch adds the check for SIAR value along with regs_use_siar and siar_valid checks so that the function will return regs->nip incase SIAR is zero.
Patch drops the code under PPMU_P10_DD1 flag check which handles SIAR 0 case only for Power10 DD1.
--- arch/powerpc/perf/core-book3s.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
arch/powerpc/perf/core-book3s.c +2 -10
@@ -2251,18 +2251,10 @@ unsigned long perf_misc_flags(struct pt_regs *regs)*/ unsigned long perf_instruction_pointer (struct pt_regs *regs) { -bool use_siar =regs_use_siar (regs);unsigned long siar =mfspr (SPRN_SIAR ); -if (ppmu && (ppmu->flags &PPMU_P10_DD1 )) { -if (siar) -return siar; -else -return regs->nip; - }else if (use_siar &&siar_valid (regs)) -return mfspr (SPRN_SIAR ) +perf_ip_adjust (regs); -else if (use_siar) -return 0 ;// no valid instruction pointer +if (regs_use_siar (regs) &&siar_valid (regs) && siar) +return siar +perf_ip_adjust (regs);else return regs->nip; }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 135/432 RDMA/hns: Fix incorrect lsn field
In reply to Greg Kroah-HartmanFrom: Yixing Liu <[email protected]>
[ Upstream commit 9bed8a70716ba65d300b9cc30eb7e0276353f7bf ]
In RNR NAK screnario, according to the specification, when no credit is available, only the first fragment of the send request can be sent. The LSN(Limit Sequence Number) field should be 0 or the entire packet will be resent.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 3 --- 1 file changed, 3 deletions(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +0 -3
@@ -4489,9 +4489,6 @@ static int modify_qp_rtr_to_rts(struct ib_qp *ibqp,hr_reg_clear (qpc_mask,QPC_CHECK_FLG ); -hr_reg_write (context,QPC_LSN ,0x100 ); -hr_reg_clear (qpc_mask,QPC_LSN ); -hr_reg_clear (qpc_mask,QPC_V2_IRRL_HEAD );return 0 ;
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 136/432 RDMA/hns: Bugfix for data type of dip_idx
In reply to Greg Kroah-HartmanFrom: Junxian Huang <[email protected]>
[ Upstream commit 4303e61264c45cb535255c5b76400f5c4ab1305d ]
dip_idx is associated with qp_num whose data type is u32. However, dip_idx is incorrectly defined as u8 data in the hns_roce_dip struct, which leads to data truncation during value assignment.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.h +1 -1
@@ -1447,7 +1447,7 @@ struct hns_roce_v2_priv {struct hns_roce_dip {u8 dgid[GID_LEN_V2 ]; -u8 dip_idx; +u32 dip_idx;struct list_head node;/* all dips are on a list */ };
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 137/432 RDMA/hns: Bugfix for the missing assignment for dip_idx
In reply to Greg Kroah-HartmanFrom: Junxian Huang <[email protected]>
[ Upstream commit 074f315fc54a9ce45559a44ca36d9fa1ee1ea2cd ]
When the dgid-dip_idx mapping relationship exists, dip should be assigned.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +3 -1
@@ -4514,8 +4514,10 @@ static int get_dip_ctx_idx(struct ib_qp *ibqp, const struct ib_qp_attr *attr,spin_lock_irqsave (&hr_dev->dip_list_lock, flags);list_for_each_entry (hr_dip, &hr_dev->dip_list, node) { -if (!memcmp (grh->dgid.raw, hr_dip->dgid,16 )) +if (!memcmp (grh->dgid.raw, hr_dip->dgid,16 )) { + *dip_idx = hr_dip->dip_idx; goto out; + } }/* If no dgid is found, a new dip and a mapping between dgid and
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 138/432 RDMA/hns: Bugfix for incorrect association between dip_idx and dgid
In reply to Greg Kroah-HartmanFrom: Junxian Huang <[email protected]>
[ Upstream commit eb653eda1e91dd3e7d1d2448d528d033dbfbe78f ]
dip_idx and dgid should be a one-to-one mapping relationship, but when qp_num loops back to the start number, it may happen that two different dgid are assiociated to the same dip_idx incorrectly.
One solution is to store the qp_num that is not assigned to dip_idx in an array. When a dip_idx needs to be allocated to a new dgid, an spare qp_num is extracted and assigned to dip_idx.
--- drivers/infiniband/hw/hns/hns_roce_device.h | 9 ++++++++- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 9 ++++++++- drivers/infiniband/hw/hns/hns_roce_main.c | 8 ++++++-- drivers/infiniband/hw/hns/hns_roce_qp.c | 10 +++++++++- 4 files changed, 31 insertions(+), 5 deletions(-)
drivers/infiniband/hw/hns/hns_roce_device.h +8 -1
@@ -496,6 +496,12 @@ struct hns_roce_bank {u32 next;/* Next ID to allocate. */ }; +struct hns_roce_idx_table { +u32 *spare_idx; +u32 head; +u32 tail; +}; +struct hns_roce_qp_table {struct hns_roce_hem_table qp_table;struct hns_roce_hem_table irrl_table;
@@ -504,6 +510,7 @@ struct hns_roce_qp_table {struct mutex scc_mutex;struct hns_roce_bank bank[HNS_ROCE_QP_BANK_NUM ];struct mutex bank_mutex; +struct hns_roce_idx_table idx_table; };struct hns_roce_cq_table {
@@ -1146,7 +1153,7 @@ int hns_roce_mtr_map(struct hns_roce_dev *hr_dev, struct hns_roce_mtr *mtr,void hns_roce_init_pd_table (struct hns_roce_dev *hr_dev);void hns_roce_init_mr_table (struct hns_roce_dev *hr_dev);void hns_roce_init_cq_table (struct hns_roce_dev *hr_dev); -void hns_roce_init_qp_table (struct hns_roce_dev *hr_dev); +int hns_roce_init_qp_table (struct hns_roce_dev *hr_dev);int hns_roce_init_srq_table (struct hns_roce_dev *hr_dev);void hns_roce_init_xrcd_table (struct hns_roce_dev *hr_dev);
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +8 -1
@@ -4507,12 +4507,18 @@ static int get_dip_ctx_idx(struct ib_qp *ibqp, const struct ib_qp_attr *attr, {const struct ib_global_route *grh =rdma_ah_read_grh (&attr->ah_attr);struct hns_roce_dev *hr_dev =to_hr_dev (ibqp->device); +u32 *spare_idx = hr_dev->qp_table.idx_table.spare_idx; +u32 *head = &hr_dev->qp_table.idx_table.head; +u32 *tail = &hr_dev->qp_table.idx_table.tail;struct hns_roce_dip *hr_dip;unsigned long flags;int ret =0 ;spin_lock_irqsave (&hr_dev->dip_list_lock, flags); + spare_idx[*tail] = ibqp->qp_num; + *tail = (*tail == hr_dev->caps.num_qps -1 ) ?0 : (*tail +1 ); +list_for_each_entry (hr_dip, &hr_dev->dip_list, node) {if (!memcmp (grh->dgid.raw, hr_dip->dgid,16 )) { *dip_idx = hr_dip->dip_idx;
@@ -4530,7 +4536,8 @@ static int get_dip_ctx_idx(struct ib_qp *ibqp, const struct ib_qp_attr *attr, }memcpy (hr_dip->dgid, grh->dgid.raw,sizeof (grh->dgid.raw)); - hr_dip->dip_idx = *dip_idx = ibqp->qp_num; + hr_dip->dip_idx = *dip_idx = spare_idx[*head]; + *head = (*head == hr_dev->caps.num_qps -1 ) ?0 : (*head +1 );list_add_tail (&hr_dip->node, &hr_dev->dip_list); out:
drivers/infiniband/hw/hns/hns_roce_main.c +6 -2
@@ -748,6 +748,12 @@ static int hns_roce_setup_hca(struct hns_roce_dev *hr_dev) goto err_uar_table_free; } + ret =hns_roce_init_qp_table (hr_dev); +if (ret) { +dev_err (dev,"Failed to init qp_table.\n" ); + goto err_uar_table_free; + } +hns_roce_init_pd_table (hr_dev);if (hr_dev->caps.flags &HNS_ROCE_CAP_FLAG_XRC )
@@ -757,8 +763,6 @@ static int hns_roce_setup_hca(struct hns_roce_dev *hr_dev)hns_roce_init_cq_table (hr_dev); -hns_roce_init_qp_table (hr_dev); -if (hr_dev->caps.flags &HNS_ROCE_CAP_FLAG_SRQ ) { ret =hns_roce_init_srq_table (hr_dev);if (ret) {
drivers/infiniband/hw/hns/hns_roce_qp.c +9 -1
@@ -1423,12 +1423,17 @@ bool hns_roce_wq_overflow(struct hns_roce_wq *hr_wq, u32 nreq,return cur + nreq >= hr_wq->wqe_cnt; } -void hns_roce_init_qp_table (struct hns_roce_dev *hr_dev) +int hns_roce_init_qp_table (struct hns_roce_dev *hr_dev) {struct hns_roce_qp_table *qp_table = &hr_dev->qp_table;unsigned int reserved_from_bot;unsigned int i; + qp_table->idx_table.spare_idx =kcalloc (hr_dev->caps.num_qps, +sizeof (u32),GFP_KERNEL ); +if (!qp_table->idx_table.spare_idx) +return -ENOMEM ; +mutex_init (&qp_table->scc_mutex);mutex_init (&qp_table->bank_mutex);xa_init (&hr_dev->qp_table_xa);
@@ -1446,6 +1451,8 @@ void hns_roce_init_qp_table(struct hns_roce_dev *hr_dev)HNS_ROCE_QP_BANK_NUM -1 ; hr_dev->qp_table.bank[i].next = hr_dev->qp_table.bank[i].min; } + +return 0 ; }void hns_roce_cleanup_qp_table (struct hns_roce_dev *hr_dev)
@@ -1454,4 +1461,5 @@ void hns_roce_cleanup_qp_table(struct hns_roce_dev *hr_dev)for (i =0 ; i <HNS_ROCE_QP_BANK_NUM ; i++)ida_destroy (&hr_dev->qp_table.bank[i].ida); +kfree (hr_dev->qp_table.idx_table.spare_idx); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 139/432 platform/x86: dell-smbios-wmi: Add missing kfree in error-exit from run_smbios_call
In reply to Greg Kroah-HartmanFrom: Hans de Goede <[email protected]>
[ Upstream commit 0487d4fc42d7f31a56cfd9e2237f9ebd889e6112 ]
As pointed out be Kees Cook if we return -EIO because the obj->type != ACPI_TYPE_BUFFER, then we must kfree the output buffer before the return.
--- drivers/platform/x86/dell/dell-smbios-wmi.c | 1 + 1 file changed, 1 insertion(+)
drivers/platform/x86/dell/dell-smbios-wmi.c +1 -0
@@ -69,6 +69,7 @@ static int run_smbios_call(struct wmi_device *wdev)if (obj->type ==ACPI_TYPE_INTEGER )dev_dbg (&wdev->dev,"SMBIOS call failed: %llu\n" , obj->integer.value); +kfree (output.pointer);return -EIO ; }memcpy (&priv->buf->std, obj->buffer.pointer, obj->buffer.length);
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 140/432 powerpc/smp: Fix a crash while booting kvm guest with nr_cpus=2
In reply to Greg Kroah-HartmanFrom: Srikar Dronamraju <[email protected]>
[ Upstream commit 8efd249babea2fec268cff90b9f5ca723dbb7499 ]
Aneesh reported a crash with a fairly recent upstream kernel when booting kernel whose commandline was appended with nr_cpus=2
1:mon> e
cpu 0x1: Vector: 300 (Data Access) at [c000000008a67bd0]
pc: c00000000002557c: cpu_to_chip_id+0x3c/0x100
lr: c000000000058380: start_secondary+0x460/0xb00
sp: c000000008a67e70 msr: 8000000000001033
dar: 10
dsisr: 80000
current = 0xc00000000891bb00
paca = 0xc0000018ff981f80 irqmask: 0x03 irq_happened: 0x01
pid = 0, comm = swapper/1
Linux version 5.13.0-rc3-15704-ga050a6d2b7e8 (kvaneesh@ltc-boston8) (gcc (Ubuntu 9.3.0-17ubuntu1~20.04) 9.3.0, GNU ld (GNU Binutils for Ubuntu) 2.34) #433 SMP Tue May 25 02:38:49 CDT 2021 1:mon> t
[link register ] c000000000058380 start_secondary+0x460/0xb00
[c000000008a67e70] c000000008a67eb0 (unreliable)
[c000000008a67eb0] c0000000000589d4 start_secondary+0xab4/0xb00
[c000000008a67f90] c00000000000c654 start_secondary_prolog+0x10/0x14
Current code assumes that num_possible_cpus() is always greater than threads_per_core. However this may not be true when using nr_cpus=2 or similar options. Handle the case where num_possible_cpus() is not an exact multiple of threads_per_core.
--- arch/powerpc/kernel/smp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/powerpc/kernel/smp.c +1 -1
@@ -1085,7 +1085,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus) }if (cpu_to_chip_id (boot_cpuid) !=-1 ) { -int idx =num_possible_cpus () / threads_per_core; +int idx =DIV_ROUND_UP (num_possible_cpus (), threads_per_core);/* * All threads of a core will all belong to the same core,
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 141/432 powerpc/smp: Update cpu_core_map on all PowerPc systems
In reply to Greg Kroah-HartmanFrom: Srikar Dronamraju <[email protected]>
[ Upstream commit b8b928030332a0ca16d42433eb2c3085600d8704 ]
lscpu() uses core_siblings to list the number of sockets in the system. core_siblings is set using topology_core_cpumask.
While optimizing the powerpc bootup path, Commit 4ca234a9cbd7 ("powerpc/smp: Stop updating cpu_core_mask"). it was found that updating cpu_core_mask() ended up taking a lot of time. It was thought that on Powerpc, cpu_core_mask() would always be same as cpu_cpu_mask() i.e number of sockets will always be equal to number of nodes. As an optimization, cpu_core_mask() was made a snapshot of cpu_cpu_mask().
However that was found to be false with PowerPc KVM guests, where each node could have more than one socket. So with Commit c47f892d7aa6 ("powerpc/smp: Reintroduce cpu_core_mask"), cpu_core_mask was updated based on chip_id but in an optimized way using some mask manipulations and chip_id caching.
However on non-PowerNV and non-pseries KVM guests (i.e not implementing cpu_to_chip_id(), continued to use a copy of cpu_cpu_mask().
There are two issues that were noticed on such systems
1. lscpu would report one extra socket.
On a IBM,9009-42A (aka zz system) which has only 2 chips/ sockets/ nodes, lscpu would report
Architecture: ppc64le Byte Order: Little Endian CPU(s): 160 On-line CPU(s) list: 0-159 Thread(s) per core: 8 Core(s) per socket: 6 Socket(s): 3 <-------------- NUMA node(s): 2 Model: 2.2 (pvr 004e 0202) Model name: POWER9 (architected), altivec supported Hypervisor vendor: pHyp Virtualization type: para L1d cache: 32K L1i cache: 32K L2 cache: 512K L3 cache: 10240K NUMA node0 CPU(s): 0-79 NUMA node1 CPU(s): 80-159
2. Currently cpu_cpu_mask is updated when a core is added/removed. However its not updated when smt mode switching or on CPUs are explicitly offlined. However all other percpu masks are updated to ensure only active/online CPUs are in the masks. This results in build_sched_domain traces since there will be CPUs in cpu_cpu_mask() but those CPUs are not present in SMT / CACHE / MC / NUMA domains. A loop of threads running smt mode switching and core add/remove will soon show this trace.
Hence cpu_cpu_mask has to be update at smt mode switch.
This will have impact on cpu_core_mask(). cpu_core_mask() is a snapshot of cpu_cpu_mask. Different CPUs within the same socket will end up having different cpu_core_masks since they are snapshots at different points of time. This means when lscpu will start reporting many more sockets than the actual number of sockets/ nodes / chips.
Different ways to handle this problem:
A. Update the snapshot aka cpu_core_mask for all CPUs whenever
cpu_cpu_mask is updated. This would a non-optimal solution.
B. Instead of a cpumask_var_t, make cpu_core_map a cpumask pointer
pointing to cpu_cpu_mask. However percpu cpumask pointer is frowned upon and we need a clean way to handle PowerPc KVM guest which is not a snapshot.
C. Update cpu_core_masks all PowerPc systems like in PowerPc KVM guests using mask manipulations. This approach is relatively simple and unifies with the existing code.
D. On top of 3, we could also resurrect get_physical_package_id which
could return a nid for the said CPU. However this is not needed at this time.
Option C is the preferred approach for now.
While this is somewhat a revert of Commit 4ca234a9cbd7 ("powerpc/smp:
Stop updating cpu_core_mask").
1. Plain revert has some conflicts
2. For chip_id == -1, the cpu_core_mask is made identical to cpu_cpu_mask, unlike previously where cpu_core_mask was set to a core if chip_id doesn't exist.
This goes by the principle that if chip_id is not exposed, then sockets / chip / node share the same set of CPUs.
With the fix, lscpu o/p would be
Architecture: ppc64le Byte Order: Little Endian CPU(s): 160 On-line CPU(s) list: 0-159 Thread(s) per core: 8 Core(s) per socket: 6 Socket(s): 2 <-------------- NUMA node(s): 2 Model: 2.2 (pvr 004e 0202) Model name: POWER9 (architected), altivec supported Hypervisor vendor: pHyp Virtualization type: para L1d cache: 32K L1i cache: 32K L2 cache: 512K L3 cache: 10240K NUMA node0 CPU(s): 0-79 NUMA node1 CPU(s): 80-159
--- arch/powerpc/kernel/smp.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
arch/powerpc/kernel/smp.c +5 -6
@@ -1503,6 +1503,7 @@ static void add_cpu_to_masks(int cpu)* add it to it's own thread sibling mask. */ cpumask_set_cpu (cpu,cpu_sibling_mask (cpu)); +cpumask_set_cpu (cpu,cpu_core_mask (cpu));for (i = first_thread; i < first_thread + threads_per_core; i++)if (cpu_online (i))
@@ -1520,11 +1521,6 @@ static void add_cpu_to_masks(int cpu)if (chip_id_lookup_table && ret) chip_id =cpu_to_chip_id (cpu); -if (chip_id ==-1 ) { -cpumask_copy (per_cpu (cpu_core_map, cpu),cpu_cpu_mask (cpu)); - goto out; - } -if (shared_caches) submask_fn = cpu_l2_cache_mask;
@@ -1534,6 +1530,10 @@ static void add_cpu_to_masks(int cpu)/* Skip all CPUs already part of current CPU core mask */ cpumask_andnot (mask, cpu_online_mask,cpu_core_mask (cpu)); +/* If chip_id is -1; limit the cpu_core_mask to within DIE*/ +if (chip_id ==-1 ) +cpumask_and (mask, mask,cpu_cpu_mask (cpu)); +for_each_cpu (i, mask) {if (chip_id ==cpu_to_chip_id (i)) {or_cpumasks_related (cpu, i, submask_fn, cpu_core_mask);
@@ -1543,7 +1543,6 @@ static void add_cpu_to_masks(int cpu) } } -out:free_cpumask_var (mask); }
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 142/432 RDMA/hns: Fix query destination qpn
In reply to Greg Kroah-HartmanFrom: Wenpeng Liang <[email protected]>
[ Upstream commit e788a3cd5787aca74e0ee00202d4dca64b43f043 ]
The bit width of dqpn is 24 bits, using u8 will cause truncation error.
--- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +1 -1
@@ -5136,7 +5136,7 @@ static int hns_roce_v2_query_qp(struct ib_qp *ibqp, struct ib_qp_attr *qp_attr, qp_attr->rq_psn =hr_reg_read (&context,QPC_RX_REQ_EPSN ); qp_attr->sq_psn = (u32 )hr_reg_read (&context,QPC_SQ_CUR_PSN ); - qp_attr->dest_qp_num = (u8 )hr_reg_read (&context,QPC_DQPN ); + qp_attr->dest_qp_num =hr_reg_read (&context,QPC_DQPN ); qp_attr->qp_access_flags = ((hr_reg_read (&context,QPC_RRE )) <<V2_QP_RRE_S ) | ((hr_reg_read(&context, QPC_RWE)) << V2_QP_RWE_S) |
Signature · 1 line
2.30.2
Greg Kroah-Hartman
maintainerPATCH 143/432 RDMA/hns: Fix QPs resp incomplete assignment
In reply to Greg Kroah-HartmanFrom: Wenpeng Liang <[email protected]>
[ Upstream commit d2e0ccffcdd7209fc9881c8970d2a7e28dcb43b9 ]
The resp passed to the user space represents the enable flag of qp, incomplete assignment will cause some features of the user space to be disabled.
--- drivers/infiniband/hw/hns/hns_roce_qp.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/infiniband/hw/hns/hns_roce_qp.c +1 -2
@@ -848,7 +848,6 @@ static int alloc_qp_db(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp, goto err_out; } hr_qp->en_flags |=HNS_ROCE_QP_CAP_SQ_RECORD_DB ; - resp->cap_flags |=HNS_ROCE_QP_CAP_SQ_RECORD_DB ; }if (user_qp_has_rdb (hr_dev, init_attr, udata, resp)) {
@@ -861,7 +860,6 @@ static int alloc_qp_db(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp, goto err_sdb; } hr_qp->en_flags |=HNS_ROCE_QP_CAP_RQ_RECORD_DB ; - resp->cap_flags |=HNS_ROCE_QP_CAP_RQ_RECORD_DB ; } }else {if (hr_dev->pci_dev->revision >=PCI_REVISION_ID_HIP09 )
@@ -1073,6 +1071,7 @@ static int hns_roce_create_qp_common(struct hns_roce_dev *hr_dev, }if (udata) { + resp.cap_flags = hr_qp->en_flags; ret =ib_copy_to_udata (udata, &resp,min (udata->outlen,sizeof (resp)));if (ret) {
Signature · 1 line
2.30.2