History

Merge remote-tracking branch 'torvalds/master' into perf/urgent

To check if more kernel API sync is needed and also to see if the perf build tests continue to pass.

Arnaldo Carvalho de Melo committed 4 years ago

Commit 93340302 parents fc45e65 90c9e95335 files · +4741 −2199Browse files

Unified · Split

335 files
  1. .mailmap +3 −0
  2. Documentation/arm64/silicon-errata.rst +2 −0
  3. Documentation/dev-tools/kselftest.rst +8 −0
  4. Documentation/devicetree/bindings/net/qcom,ipa.yaml +6 −0
  5. Documentation/devicetree/bindings/spi/spi-peripheral-props.yaml +3 −2
  6. Documentation/filesystems/netfs_library.rst +16 −0
  7. Documentation/gpu/todo.rst +0 −24
  8. Documentation/userspace-api/ioctl/ioctl-number.rst +3 −0
  9. MAINTAINERS +16 −3
  10. arch/arm/crypto/blake2s-shash.c +2 −2
  11. arch/arm64/Kconfig +16 −0
  12. arch/arm64/kernel/cpu_errata.c +8 −0
  13. arch/arm64/kvm/arm.c +33 −18
  14. arch/arm64/kvm/handle_exit.c +8 −0
  15. arch/arm64/kvm/hyp/include/hyp/switch.h +21 −2
  16. arch/arm64/tools/cpucaps +3 −2
  17. arch/mips/cavium-octeon/octeon-memcpy.S +1 −1
  18. arch/mips/kvm/mips.c +46 −4
  19. arch/mips/kvm/vz.c +9 −3
  20. arch/riscv/kvm/vcpu.c +31 −17
  21. arch/riscv/kvm/vcpu_sbi_base.c +2 −1
  22. arch/x86/crypto/blake2s-shash.c +2 −2
  23. arch/x86/include/asm/kvm-x86-ops.h +1 −1
  24. arch/x86/include/asm/kvm_host.h +2 −1
  25. arch/x86/include/asm/xen/hypervisor.h +0 −14
  26. arch/x86/kvm/cpuid.c +7 −6
  27. arch/x86/kvm/lapic.c +2 −8
  28. arch/x86/kvm/svm/svm.c +18 −3
  29. arch/x86/kvm/vmx/vmx.c +18 −3
  30. arch/x86/kvm/x86.c +6 −4
  31. arch/x86/kvm/x86.h +0 −45
  32. arch/x86/xen/enlighten_hvm.c +4 −9
  33. arch/x86/xen/enlighten_pv.c +0 −4
  34. arch/x86/xen/smp_pv.c +6 −20
  35. block/bio-integrity.c +1 −1
  36. block/fops.c +19 −14
  37. crypto/blake2s_generic.c +2 −2
  38. drivers/acpi/Kconfig +1 −0
  39. drivers/ata/libata-core.c +10 −0
  40. drivers/char/random.c +22 −17
  41. drivers/dma-buf/dma-heap.c +2 −0
  42. drivers/gpu/drm/amd/amdgpu/amdgpu.h +8 −2
  43. drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c +32 −5
  44. drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +9 −2
  45. drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +1 −1
  46. drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +3 −0
  47. drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c +8 −8
  48. drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c +10 −10
  49. drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c +20 −0
  50. drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +0 −5
  51. drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c +0 −15
  52. drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.h +0 −3
  53. drivers/gpu/drm/amd/display/dc/dcn20/dcn20_stream_encoder.c +0 −2
  54. drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_stream_encoder.c +0 −2
  55. drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h +0 −4
  56. drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +3 −3
  57. drivers/gpu/drm/i915/display/intel_overlay.c +3 −0
  58. drivers/gpu/drm/i915/display/intel_tc.c +2 −1
  59. drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c +7 −2
  60. drivers/gpu/drm/i915/gt/uc/intel_guc.h +5 −0
  61. drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +97 −17
  62. drivers/gpu/drm/i915/i915_gpu_error.c +1 −1
  63. drivers/gpu/drm/i915/i915_reg.h +2 −1
  64. drivers/gpu/drm/kmb/kmb_plane.c +0 −6
  65. drivers/gpu/drm/mxsfb/mxsfb_kms.c +5 −1
  66. drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c +1 −1
  67. drivers/infiniband/core/cm.c +1 −1
  68. drivers/infiniband/core/cma.c +12 −10
  69. drivers/infiniband/core/ucma.c +23 −11
  70. drivers/infiniband/hw/hfi1/ipoib.h +1 −1
  71. drivers/infiniband/hw/hfi1/ipoib_main.c +15 −12
  72. drivers/infiniband/hw/hfi1/ipoib_tx.c +26 −12
  73. drivers/infiniband/hw/mlx4/main.c +1 −1
  74. drivers/infiniband/sw/rdmavt/qp.c +2 −0
  75. drivers/infiniband/sw/siw/siw.h +1 −6
  76. drivers/infiniband/sw/siw/siw_qp_rx.c +11 −9
  77. drivers/infiniband/sw/siw/siw_verbs.c +2 −1
  78. drivers/input/touchscreen/wm97xx-core.c +3 −9
  79. drivers/iommu/amd/init.c +2 −0
  80. drivers/iommu/intel/irq_remapping.c +10 −3
  81. drivers/iommu/ioasid.c +1 −0
  82. drivers/iommu/iommu.c +19 −14
  83. drivers/iommu/omap-iommu.c +1 −1
  84. drivers/md/md.c +4 −4
  85. drivers/net/dsa/Kconfig +1 −0
  86. drivers/net/ethernet/amd/xgbe/xgbe-drv.c +13 −1
  87. drivers/net/ethernet/google/gve/gve_adminq.c +1 −1
  88. drivers/net/ethernet/intel/e1000e/e1000.h +3 −1
  89. drivers/net/ethernet/intel/e1000e/ich8lan.c +20 −0
  90. drivers/net/ethernet/intel/e1000e/netdev.c +21 −18
  91. drivers/net/ethernet/intel/i40e/i40e.h +1 −0
  92. drivers/net/ethernet/intel/i40e/i40e_main.c +29 −2
  93. drivers/net/ethernet/mellanox/mlx5/core/en.h +3 −3
  94. drivers/net/ethernet/mellanox/mlx5/core/en/qos.c +2 −1
  95. drivers/net/ethernet/mellanox/mlx5/core/en/rep/bond.c +14 −18
  96. drivers/net/ethernet/mellanox/mlx5/core/en/rep/bridge.c +4 −2
  97. drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h +5 −0
  98. drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c +3 −1
  99. drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c +11 −2
  100. drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h +6 −3
  101. drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +19 −11
  102. drivers/net/ethernet/mellanox/mlx5/core/en_tc.c +14 −1
  103. drivers/net/ethernet/mellanox/mlx5/core/en_tx.c +1 −1
  104. drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.c +4 −0
  105. drivers/net/ethernet/mellanox/mlx5/core/esw/diag/bridge_tracepoint.h +1 −1
  106. drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c +1 −1
  107. drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c +5 −4
  108. drivers/net/ethernet/mellanox/mlx5/core/port.c +5 −4
  109. drivers/net/ethernet/microchip/sparx5/sparx5_packet.c +1 −1
  110. drivers/net/ethernet/smsc/smc911x.c +4 −4
  111. drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c +7 −2
  112. drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h +1 −0
  113. drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c +17 −2
  114. drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c +12 −7
  115. drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +4 −2
  116. drivers/net/ieee802154/at86rf230.c +11 −2
  117. drivers/net/ieee802154/ca8210.c +1 −0
  118. drivers/net/ieee802154/mac802154_hwsim.c +1 −0
  119. drivers/net/ieee802154/mcr20a.c +2 −2
  120. drivers/net/ipa/ipa_power.c +52 −0
  121. drivers/net/ipa/ipa_power.h +7 −0
  122. drivers/net/ipa/ipa_uc.c +5 −0
  123. drivers/net/macsec.c +21 −12
  124. drivers/net/phy/at803x.c +13 −13
  125. drivers/net/usb/ipheth.c +3 −3
  126. drivers/nvme/host/core.c +8 −1
  127. drivers/nvme/host/fabrics.h +1 −0
  128. drivers/nvme/host/rdma.c +1 −0
  129. drivers/nvme/host/tcp.c +1 −0
  130. drivers/pci/controller/cadence/pci-j721e.c +42 −43
  131. drivers/pci/controller/dwc/pcie-kirin.c +18 −13
  132. drivers/pinctrl/Makefile +1 −1
  133. drivers/pinctrl/bcm/Kconfig +1 −0
  134. drivers/pinctrl/bcm/pinctrl-bcm2835.c +15 −8
  135. drivers/pinctrl/intel/pinctrl-cherryview.c +3 −2
  136. drivers/pinctrl/intel/pinctrl-intel.c +36 −28
  137. drivers/pinctrl/pinctrl-microchip-sgpio.c +2 −1
  138. drivers/pinctrl/pinctrl-thunderbay.c +35 −55
  139. drivers/pinctrl/pinctrl-zynqmp.c +4 −6
  140. drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c +4 −4
  141. drivers/platform/surface/Kconfig +1 −0
  142. drivers/platform/x86/amd-pmc.c +9 −6
  143. drivers/platform/x86/asus-tf103c-dock.c +2 −2
  144. drivers/platform/x86/intel/crystal_cove_charger.c +13 −13
  145. drivers/platform/x86/intel/speed_select_if/isst_if_common.c +63 −34
  146. drivers/platform/x86/thinkpad_acpi.c +22 −3
  147. drivers/platform/x86/touchscreen_dmi.c +24 −0
  148. drivers/platform/x86/x86-android-tablets.c +95 −10
  149. drivers/regulator/max20086-regulator.c +2 −1
  150. drivers/scsi/bnx2fc/bnx2fc_fcoe.c +13 −8
  151. drivers/scsi/hisi_sas/hisi_sas_main.c +6 −8
  152. drivers/scsi/pm8001/pm8001_hwi.c +0 −18
  153. drivers/scsi/pm8001/pm8001_sas.c +5 −0
  154. drivers/scsi/pm8001/pm80xx_hwi.c +3 −28
  155. drivers/scsi/scsi_scan.c +50 −5
  156. drivers/spi/spi-bcm-qspi.c +1 −1
  157. drivers/spi/spi-meson-spicc.c +5 −0
  158. drivers/spi/spi-mt65xx.c +1 −1
  159. drivers/spi/spi-stm32-qspi.c +17 −30
  160. drivers/spi/spi-stm32.c +4 −3
  161. drivers/spi/spi-uniphier.c +14 −4
  162. drivers/video/console/Kconfig +20 −0
  163. drivers/video/fbdev/core/bitblit.c +16 −0
  164. drivers/video/fbdev/core/fbcon.c +536 −21
  165. drivers/video/fbdev/core/fbcon.h +72 −0
  166. drivers/video/fbdev/core/fbcon_ccw.c +24 −4
  167. drivers/video/fbdev/core/fbcon_cw.c +24 −4
  168. drivers/video/fbdev/core/fbcon_rotate.h +9 −0
  169. drivers/video/fbdev/core/fbcon_ud.c +29 −8
  170. drivers/video/fbdev/core/tileblit.c +16 −0
  171. drivers/video/fbdev/skeletonfb.c +6 −6
  172. fs/9p/fid.c +4 −5
  173. fs/Makefile +1 −1
  174. fs/btrfs/block-group.c +37 −2
  175. fs/btrfs/ctree.h +6 −0
  176. fs/btrfs/ioctl.c +2 −5
  177. fs/btrfs/qgroup.c +19 −2
  178. fs/btrfs/transaction.c +24 −0
  179. fs/btrfs/transaction.h +2 −0
  180. fs/btrfs/tree-checker.c +15 −0
  181. fs/btrfs/tree-log.c +23 −0
  182. fs/cachefiles/io.c +59 −0
  183. fs/cifs/connect.c +16 −7
  184. fs/cifs/file.c +82 −139
  185. fs/cifs/fscache.c +108 −18
  186. fs/cifs/fscache.h +49 −30
  187. fs/cifs/inode.c +4 −4
  188. fs/cifs/sess.c +5 −1
  189. fs/erofs/data.c +4 −4
  190. fs/erofs/zdata.c +56 −57
  191. fs/erofs/zmap.c +7 −0
  192. fs/ext4/ext4.h +7 −7
  193. fs/ext4/hash.c +1 −1
  194. fs/ext4/namei.c +6 −6
  195. fs/ext4/super.c +5 −5
  196. fs/ext4/sysfs.c +4 −4
  197. fs/f2fs/dir.c +5 −5
  198. fs/f2fs/f2fs.h +1 −1
  199. fs/f2fs/hash.c +1 −1
  200. fs/f2fs/namei.c +2 −2
  201. fs/f2fs/recovery.c +2 −2
  202. fs/f2fs/super.c +5 −5
  203. fs/f2fs/sysfs.c +5 −5
  204. fs/iomap/buffered-io.c +48 −4
  205. fs/libfs.c +5 −5
  206. fs/lockd/svcsubs.c +10 −8
  207. fs/nfsd/nfs4state.c +3 −1
  208. fs/notify/fanotify/fanotify_user.c +3 −3
  209. fs/overlayfs/copy_up.c +13 −3
  210. fs/quota/dquot.c +8 −3
  211. fs/super.c +12 −7
  212. fs/sync.c +12 −6
  213. fs/unicode/Kconfig +5 −13
  214. fs/unicode/Makefile +4 −2
  215. fs/xfs/xfs_aops.c +15 −1
  216. fs/xfs/xfs_bmap_util.c +3 −6
  217. fs/xfs/xfs_file.c +26 −60
  218. fs/xfs/xfs_inode.h +0 −9
  219. fs/xfs/xfs_ioctl.c +1 −1
  220. fs/xfs/xfs_pnfs.c +39 −3
  221. fs/xfs/xfs_super.c +5 −1
  222. include/crypto/internal/blake2s.h +25 −15
  223. include/linux/ceph/libceph.h +1 −0
  224. include/linux/ceph/messenger.h +5 −0
  225. include/linux/fb.h +1 −1
  226. include/linux/fs.h +1 −1
  227. include/linux/if_vlan.h +4 −2
  228. include/linux/iomap.h +2 −0
  229. include/linux/kvm_host.h +109 −3
  230. include/linux/libata.h +1 −0
  231. include/linux/netfs.h +7 −0
  232. include/linux/page_table_check.h +19 −0
  233. include/linux/pgtable.h +1 −0
  234. include/linux/sched.h +0 −1
  235. include/net/ax25.h +12 −0
  236. include/net/neighbour.h +13 −5
  237. include/sound/pcm.h +15 −0
  238. include/uapi/linux/kvm.h +3 −3
  239. include/uapi/linux/smc_diag.h +5 −6
  240. include/uapi/sound/asound.h +3 −1
  241. include/uapi/xen/gntdev.h +7 −1
  242. include/xen/xenbus_dev.h +0 −2
  243. ipc/sem.c +2 −2
  244. kernel/async.c +0 −3
  245. kernel/audit.c +43 −19
  246. kernel/bpf/bpf_lsm.c +1 −1
  247. kernel/bpf/ringbuf.c +1 −1
  248. kernel/bpf/trampoline.c +3 −2
  249. kernel/cgroup/cgroup-v1.c +14 −0
  250. kernel/cgroup/cpuset.c +51 −14
  251. kernel/module.c +5 −20
  252. kernel/printk/sysctl.c +1 −1
  253. kernel/stackleak.c +2 −3
  254. lib/crypto/blake2s.c +2 −2
  255. mm/debug_vm_pgtable.c +2 −0
  256. mm/gup.c +30 −5
  257. mm/khugepaged.c +21 −16
  258. mm/kmemleak.c +7 −6
  259. mm/page_isolation.c +1 −1
  260. mm/page_table_check.c +27 −28
  261. net/ax25/af_ax25.c +16 −7
  262. net/ax25/ax25_dev.c +23 −5
  263. net/ax25/ax25_route.c +11 −2
  264. net/bridge/netfilter/nft_reject_bridge.c +4 −4
  265. net/ceph/ceph_common.c +7 −0
  266. net/ceph/messenger.c +4 −0
  267. net/ceph/messenger_v1.c +48 −6
  268. net/ceph/messenger_v2.c +186 −64
  269. net/core/neighbour.c +12 −6
  270. net/core/rtnetlink.c +4 −2
  271. net/ieee802154/nl802154.c +4 −4
  272. net/ipv4/netfilter/Kconfig +0 −4
  273. net/ipv4/tcp.c +5 −2
  274. net/ipv4/tcp_input.c +2 −0
  275. net/ipv6/netfilter/Kconfig +0 −4
  276. net/ipv6/netfilter/Makefile +0 −3
  277. net/ipv6/netfilter/nf_flow_table_ipv6.c +0 −0
  278. net/netfilter/nf_tables_api.c +0 −1
  279. net/netfilter/nft_byteorder.c +12 −0
  280. net/netfilter/nft_ct.c +4 −1
  281. net/packet/af_packet.c +6 −2
  282. net/sched/cls_api.c +7 −4
  283. net/smc/af_smc.c +118 −15
  284. net/smc/smc.h +19 −1
  285. net/smc/smc_diag.c +0 −2
  286. security/selinux/ss/conditional.c +2 −1
  287. sound/core/pcm_native.c +13 −0
  288. sound/hda/intel-sdw-acpi.c +3 −4
  289. sound/pci/hda/hda_auto_parser.c +1 −1
  290. sound/pci/hda/hda_codec.c +4 −0
  291. sound/pci/hda/hda_generic.c +15 −2
  292. sound/pci/hda/hda_generic.h +3 −0
  293. sound/pci/hda/patch_realtek.c +55 −12
  294. sound/soc/amd/acp/acp-mach-common.c +2 −2
  295. sound/soc/codecs/cpcap.c +2 −0
  296. sound/soc/codecs/hdmi-codec.c +1 −1
  297. sound/soc/codecs/lpass-rx-macro.c +4 −4
  298. sound/soc/codecs/max9759.c +2 −1
  299. sound/soc/codecs/rt5682-i2c.c +4 −11
  300. sound/soc/codecs/rt5682.c +8 −16
  301. sound/soc/codecs/rt5682.h +0 −2
  302. sound/soc/codecs/wcd938x.c +17 −14
  303. sound/soc/fsl/pcm030-audio-fabric.c +8 −3
  304. sound/soc/generic/simple-card.c +25 −1
  305. sound/soc/mediatek/Kconfig +1 −1
  306. sound/soc/qcom/qdsp6/q6apm-dai.c +5 −2
  307. sound/soc/soc-acpi.c +2 −5
  308. sound/soc/soc-ops.c +26 −3
  309. sound/soc/soc-pcm.c +12 −6
  310. sound/soc/xilinx/xlnx_formatter_pcm.c +24 −3
  311. sound/usb/mixer.c +4 −0
  312. sound/usb/quirks-table.h +1 −1
  313. tools/bpf/resolve_btfids/Makefile +5 −1
  314. tools/include/uapi/linux/lirc.h +0 −229
  315. tools/scripts/Makefile.include +1 −1
  316. tools/testing/kunit/kunit_kernel.py +1 −0
  317. tools/testing/selftests/bpf/test_lirc_mode2_user.c +0 −1
  318. tools/testing/selftests/cpufreq/main.sh +1 −1
  319. tools/testing/selftests/exec/Makefile +1 −1
  320. tools/testing/selftests/futex/Makefile +2 −2
  321. tools/testing/selftests/kselftest_harness.h +3 −1
  322. tools/testing/selftests/mincore/mincore_selftest.c +14 −6
  323. tools/testing/selftests/netfilter/nft_concat_range.sh +71 −1
  324. tools/testing/selftests/netfilter/nft_nat.sh +152 −0
  325. tools/testing/selftests/netfilter/nft_zones_many.sh +6 −6
  326. tools/testing/selftests/openat2/Makefile +1 −1
  327. tools/testing/selftests/openat2/helpers.h +7 −5
  328. tools/testing/selftests/openat2/openat2_test.c +11 −1
  329. tools/testing/selftests/rtc/settings +1 −1
  330. tools/testing/selftests/vDSO/vdso_test_abi.c +62 −73
  331. tools/testing/selftests/vm/userfaultfd.c +7 −2
  332. tools/testing/selftests/zram/zram.sh +1 −14
  333. tools/testing/selftests/zram/zram01.sh +9 −24
  334. tools/testing/selftests/zram/zram02.sh +0 −1
  335. tools/testing/selftests/zram/zram_lib.sh +88 −46
.mailmap+3−0
@@ -80,6 +80,9 @@ Chris Chiu <chris.chiu@canonical.com> <chiu@endlessos.org> · 79 unmodified lines
8080 Christian Borntraeger <borntraeger@linux.ibm.com> <borntraeger@de.ibm.com>
8181 Christian Borntraeger <borntraeger@linux.ibm.com> <cborntra@de.ibm.com>
8282 Christian Borntraeger <borntraeger@linux.ibm.com> <borntrae@de.ibm.com>
83+Christian Brauner <brauner@kernel.org> <christian@brauner.io>
84+Christian Brauner <brauner@kernel.org> <christian.brauner@canonical.com>
85+Christian Brauner <brauner@kernel.org> <christian.brauner@ubuntu.com>
8386 Christophe Ricard <christophe.ricard@gmail.com>
8487 Christoph Hellwig <hch@lst.de>
8588 Colin Ian King <colin.king@intel.com> <colin.king@canonical.com>
Documentation/arm64/silicon-errata.rst+2−0
@@ -100,6 +100,8 @@ stable kernels. · 99 unmodified lines
100100 +----------------+-----------------+-----------------+-----------------------------+
101101 | ARM | Cortex-A510 | #2051678 | ARM64_ERRATUM_2051678 |
102102 +----------------+-----------------+-----------------+-----------------------------+
103+| ARM | Cortex-A510 | #2077057 | ARM64_ERRATUM_2077057 |
104++----------------+-----------------+-----------------+-----------------------------+
103105 | ARM | Cortex-A710 | #2119858 | ARM64_ERRATUM_2119858 |
104106 +----------------+-----------------+-----------------+-----------------------------+
105107 | ARM | Cortex-A710 | #2054223 | ARM64_ERRATUM_2054223 |
Documentation/dev-tools/kselftest.rst+8−0
@@ -7,6 +7,14 @@ directory. These are intended to be small tests to exercise individual code · 6 unmodified lines
77 paths in the kernel. Tests are intended to be run after building, installing
88 and booting a kernel.
99
10+Kselftest from mainline can be run on older stable kernels. Running tests
11+from mainline offers the best coverage. Several test rings run mainline
12+kselftest suite on stable releases. The reason is that when a new test
13+gets added to test existing code to regression test a bug, we should be
14+able to run that test on an older kernel. Hence, it is important to keep
15+code that can still test an older kernel and make sure it skips the test
16+gracefully on newer releases.
17+
1018 You can find additional information on Kselftest framework, how to
1119 write new tests using the framework on Kselftest wiki:
1220
Documentation/devicetree/bindings/net/qcom,ipa.yaml+6−0
@@ -107,6 +107,10 @@ properties: · 106 unmodified lines
107107 - const: imem
108108 - const: config
109109
110+ qcom,qmp:
111+ $ref: /schemas/types.yaml#/definitions/phandle
112+ description: phandle to the AOSS side-channel message RAM
113+
110114 qcom,smem-states:
111115 $ref: /schemas/types.yaml#/definitions/phandle-array
112116 description: State bits used in by the AP to signal the modem.
@@ -222,6 +226,8 @@ examples: · 109 unmodified lines
222226 "imem",
223227 "config";
224228
229+ qcom,qmp = <&aoss_qmp>;
230+
225231 qcom,smem-states = <&ipa_smp2p_out 0>,
226232 <&ipa_smp2p_out 1>;
227233 qcom,smem-state-names = "ipa-clock-enabled-valid",
Documentation/devicetree/bindings/spi/spi-peripheral-props.yaml+3−2
@@ -23,8 +23,9 @@ properties: · 22 unmodified lines
2323 minItems: 1
2424 maxItems: 256
2525 items:
26− minimum: 0
27− maximum: 256
26+ items:
27+ - minimum: 0
28+ maximum: 256
2829 description:
2930 Chip select used by the device.
3031
Documentation/filesystems/netfs_library.rst+16−0
@@ -462,6 +462,10 @@ operation table looks like the following:: · 461 unmodified lines
462462 struct iov_iter *iter,
463463 netfs_io_terminated_t term_func,
464464 void *term_func_priv);
465+
466+ int (*query_occupancy)(struct netfs_cache_resources *cres,
467+ loff_t start, size_t len, size_t granularity,
468+ loff_t *_data_start, size_t *_data_len);
465469 };
466470
467471 With a termination handler function pointer::
@@ -536,6 +540,18 @@ The methods defined in the table are: · 68 unmodified lines
536540 indicating whether the termination is definitely happening in the caller's
537541 context.
538542
543+ * ``query_occupancy()``
544+
545+ [Required] Called to find out where the next piece of data is within a
546+ particular region of the cache. The start and length of the region to be
547+ queried are passed in, along with the granularity to which the answer needs
548+ to be aligned. The function passes back the start and length of the data,
549+ if any, available within that region. Note that there may be a hole at the
550+ front.
551+
552+ It returns 0 if some data was found, -ENODATA if there was no usable data
553+ within the region or -ENOBUFS if there is no caching on this file.
554+
539555 Note that these methods are passed a pointer to the cache resource structure,
540556 not the read request structure as they could be used in other situations where
541557 there isn't a read request structure as well, such as writing dirty data to the
Documentation/gpu/todo.rst+0−24
@@ -300,30 +300,6 @@ Contact: Daniel Vetter, Noralf Tronnes · 299 unmodified lines
300300
301301 Level: Advanced
302302
303−Garbage collect fbdev scrolling acceleration
304−--------------------------------------------
305−
306−Scroll acceleration has been disabled in fbcon. Now it works as the old
307−SCROLL_REDRAW mode. A ton of code was removed in fbcon.c and the hook bmove was
308−removed from fbcon_ops.
309−Remaining tasks:
310−
311−- a bunch of the hooks in fbcon_ops could be removed or simplified by calling
312− directly instead of the function table (with a switch on p->rotate)
313−
314−- fb_copyarea is unused after this, and can be deleted from all drivers
315−
316−- after that, fb_copyarea can be deleted from fb_ops in include/linux/fb.h as
317− well as cfb_copyarea
318−
319−Note that not all acceleration code can be deleted, since clearing and cursor
320−support is still accelerated, which might be good candidates for further
321−deletion projects.
322−
323−Contact: Daniel Vetter
324−
325−Level: Intermediate
326−
327303 idr_init_base()
328304 ---------------
329305
Documentation/userspace-api/ioctl/ioctl-number.rst+3−0
@@ -115,6 +115,7 @@ Code Seq# Include File Comments · 114 unmodified lines
115115 'B' 00-1F linux/cciss_ioctl.h conflict!
116116 'B' 00-0F include/linux/pmu.h conflict!
117117 'B' C0-FF advanced bbus <mailto:maassen@uni-freiburg.de>
118+'B' 00-0F xen/xenbus_dev.h conflict!
118119 'C' all linux/soundcard.h conflict!
119120 'C' 01-2F linux/capi.h conflict!
120121 'C' F0-FF drivers/net/wan/cosa.h conflict!
@@ -134,6 +135,7 @@ Code Seq# Include File Comments · 13 unmodified lines
134135 'F' 80-8F linux/arcfb.h conflict!
135136 'F' DD video/sstfb.h conflict!
136137 'G' 00-3F drivers/misc/sgi-gru/grulib.h conflict!
138+'G' 00-0F xen/gntalloc.h, xen/gntdev.h conflict!
137139 'H' 00-7F linux/hiddev.h conflict!
138140 'H' 00-0F linux/hidraw.h conflict!
139141 'H' 01 linux/mei.h conflict!
@@ -176,6 +178,7 @@ Code Seq# Include File Comments · 36 unmodified lines
176178 'P' 60-6F sound/sscape_ioctl.h conflict!
177179 'P' 00-0F drivers/usb/class/usblp.c conflict!
178180 'P' 01-09 drivers/misc/pci_endpoint_test.c conflict!
181+'P' 00-0F xen/privcmd.h conflict!
179182 'Q' all linux/soundcard.h
180183 'R' 00-1F linux/random.h conflict!
181184 'R' 01 linux/rfkill.h conflict!
MAINTAINERS+16−3
@@ -4157,9 +4157,8 @@ N: csky · 4156 unmodified lines
41574157 K: csky
41584158
41594159 CA8210 IEEE-802.15.4 RADIO DRIVER
4160−M: Harry Morris <h.morris@cascoda.com>
41614160 L: linux-wpan@vger.kernel.org
4162−S: Maintained
4161+S: Orphan
41634162 W: https://github.com/Cascoda/ca8210-linux.git
41644163 F: Documentation/devicetree/bindings/net/ieee802154/ca8210.txt
41654164 F: drivers/net/ieee802154/ca8210.c
@@ -10880,6 +10879,12 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux-block.git · 6714 unmodified lines
1088010879 F: drivers/ata/pata_arasan_cf.c
1088110880 F: include/linux/pata_arasan_cf_data.h
1088210881
10882+LIBATA PATA DRIVERS
10883+R: Sergey Shtylyov <s.shtylyov@omp.ru>
10884+L: linux-ide@vger.kernel.org
10885+F: drivers/ata/ata_*.c
10886+F: drivers/ata/pata_*.c
10887+
1088310888 LIBATA PATA FARADAY FTIDE010 AND GEMINI SATA BRIDGE DRIVERS
1088410889 M: Linus Walleij <linus.walleij@linaro.org>
1088510890 L: linux-ide@vger.kernel.org
@@ -12400,7 +12405,7 @@ F: include/uapi/linux/membarrier.h · 1514 unmodified lines
1240012405 F: kernel/sched/membarrier.c
1240112406
1240212407 MEMBLOCK
12403−M: Mike Rapoport <rppt@linux.ibm.com>
12408+M: Mike Rapoport <rppt@kernel.org>
1240412409 L: linux-mm@kvack.org
1240512410 S: Maintained
1240612411 F: Documentation/core-api/boot-time-mm.rst
@@ -16469,6 +16474,14 @@ F: Documentation/devicetree/bindings/i2c/renesas,rmobile-iic.yaml · 4062 unmodified lines
1646916474 F: drivers/i2c/busses/i2c-rcar.c
1647016475 F: drivers/i2c/busses/i2c-sh_mobile.c
1647116476
16477+RENESAS R-CAR SATA DRIVER
16478+R: Sergey Shtylyov <s.shtylyov@omp.ru>
16479+S: Supported
16480+L: linux-ide@vger.kernel.org
16481+L: linux-renesas-soc@vger.kernel.org
16482+F: Documentation/devicetree/bindings/ata/renesas,rcar-sata.yaml
16483+F: drivers/ata/sata_rcar.c
16484+
1647216485 RENESAS R-CAR THERMAL DRIVERS
1647316486 M: Niklas Söderlund <niklas.soderlund@ragnatech.se>
1647416487 L: linux-renesas-soc@vger.kernel.org
arch/arm/crypto/blake2s-shash.c+2−2
@@ -13,12 +13,12 @@ · 12 unmodified lines
1313 static int crypto_blake2s_update_arm(struct shash_desc *desc,
1414 const u8 *in, unsigned int inlen)
1515 {
16− return crypto_blake2s_update(desc, in, inlen, blake2s_compress);
16+ return crypto_blake2s_update(desc, in, inlen, false);
1717 }
1818
1919 static int crypto_blake2s_final_arm(struct shash_desc *desc, u8 *out)
2020 {
21− return crypto_blake2s_final(desc, out, blake2s_compress);
21+ return crypto_blake2s_final(desc, out, false);
2222 }
2323
2424 #define BLAKE2S_ALG(name, driver_name, digest_size) \
arch/arm64/Kconfig+16−0
@@ -680,6 +680,22 @@ config ARM64_ERRATUM_2051678 · 679 unmodified lines
680680
681681 If unsure, say Y.
682682
683+config ARM64_ERRATUM_2077057
684+ bool "Cortex-A510: 2077057: workaround software-step corrupting SPSR_EL2"
685+ help
686+ This option adds the workaround for ARM Cortex-A510 erratum 2077057.
687+ Affected Cortex-A510 may corrupt SPSR_EL2 when the a step exception is
688+ expected, but a Pointer Authentication trap is taken instead. The
689+ erratum causes SPSR_EL1 to be copied to SPSR_EL2, which could allow
690+ EL1 to cause a return to EL2 with a guest controlled ELR_EL2.
691+
692+ This can only happen when EL2 is stepping EL1.
693+
694+ When these conditions occur, the SPSR_EL2 value is unchanged from the
695+ previous guest entry, and can be restored from the in-memory copy.
696+
697+ If unsure, say Y.
698+
683699 config ARM64_ERRATUM_2119858
684700 bool "Cortex-A710/X2: 2119858: workaround TRBE overwriting trace data in FILL mode"
685701 default y
arch/arm64/kernel/cpu_errata.c+8−0
@@ -600,6 +600,14 @@ const struct arm64_cpu_capabilities arm64_errata[] = { · 599 unmodified lines
600600 CAP_MIDR_RANGE_LIST(trbe_write_out_of_range_cpus),
601601 },
602602 #endif
603+#ifdef CONFIG_ARM64_ERRATUM_2077057
604+ {
605+ .desc = "ARM erratum 2077057",
606+ .capability = ARM64_WORKAROUND_2077057,
607+ .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM,
608+ ERRATA_MIDR_REV_RANGE(MIDR_CORTEX_A510, 0, 0, 2),
609+ },
610+#endif
603611 #ifdef CONFIG_ARM64_ERRATUM_2064142
604612 {
605613 .desc = "ARM erratum 2064142",
arch/arm64/kvm/arm.c+33−18
@@ -797,6 +797,24 @@ static bool kvm_vcpu_exit_request(struct kvm_vcpu *vcpu, int *ret) · 796 unmodified lines
797797 xfer_to_guest_mode_work_pending();
798798 }
799799
800+/*
801+ * Actually run the vCPU, entering an RCU extended quiescent state (EQS) while
802+ * the vCPU is running.
803+ *
804+ * This must be noinstr as instrumentation may make use of RCU, and this is not
805+ * safe during the EQS.
806+ */
807+static int noinstr kvm_arm_vcpu_enter_exit(struct kvm_vcpu *vcpu)
808+{
809+ int ret;
810+
811+ guest_state_enter_irqoff();
812+ ret = kvm_call_hyp_ret(__kvm_vcpu_run, vcpu);
813+ guest_state_exit_irqoff();
814+
815+ return ret;
816+}
817+
800818 /**
801819 * kvm_arch_vcpu_ioctl_run - the main VCPU run function to execute guest code
802820 * @vcpu: The VCPU pointer
@@ -881,9 +899,9 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) · 78 unmodified lines
881899 * Enter the guest
882900 */
883901 trace_kvm_entry(*vcpu_pc(vcpu));
884− guest_enter_irqoff();
902+ guest_timing_enter_irqoff();
885903
886− ret = kvm_call_hyp_ret(__kvm_vcpu_run, vcpu);
904+ ret = kvm_arm_vcpu_enter_exit(vcpu);
887905
888906 vcpu->mode = OUTSIDE_GUEST_MODE;
889907 vcpu->stat.exits++;
@@ -918,26 +936,23 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) · 28 unmodified lines
918936 kvm_arch_vcpu_ctxsync_fp(vcpu);
919937
920938 /*
921− * We may have taken a host interrupt in HYP mode (ie
922− * while executing the guest). This interrupt is still
923− * pending, as we haven't serviced it yet!
939+ * We must ensure that any pending interrupts are taken before
940+ * we exit guest timing so that timer ticks are accounted as
941+ * guest time. Transiently unmask interrupts so that any
942+ * pending interrupts are taken.
924943 *
925− * We're now back in SVC mode, with interrupts
926− * disabled. Enabling the interrupts now will have
927− * the effect of taking the interrupt again, in SVC
928− * mode this time.
944+ * Per ARM DDI 0487G.b section D1.13.4, an ISB (or other
945+ * context synchronization event) is necessary to ensure that
946+ * pending interrupts are taken.
929947 */
930948 local_irq_enable();
949+ isb();
950+ local_irq_disable();
951+
952+ guest_timing_exit_irqoff();
953+
954+ local_irq_enable();
931955
932− /*
933− * We do local_irq_enable() before calling guest_exit() so
934− * that if a timer interrupt hits while running the guest we
935− * account that tick as being spent in the guest. We enable
936− * preemption after calling guest_exit() so that if we get
937− * preempted we make sure ticks after that is not counted as
938− * guest time.
939− */
940− guest_exit();
941956 trace_kvm_exit(ret, kvm_vcpu_trap_get_class(vcpu), *vcpu_pc(vcpu));
942957
943958 /* Exit types that need handling before we can be preempted */
arch/arm64/kvm/handle_exit.c+8−0
@@ -228,6 +228,14 @@ int handle_exit(struct kvm_vcpu *vcpu, int exception_index) · 227 unmodified lines
228228 {
229229 struct kvm_run *run = vcpu->run;
230230
231+ if (ARM_SERROR_PENDING(exception_index)) {
232+ /*
233+ * The SError is handled by handle_exit_early(). If the guest
234+ * survives it will re-execute the original instruction.
235+ */
236+ return 1;
237+ }
238+
231239 exception_index = ARM_EXCEPTION_CODE(exception_index);
232240
233241 switch (exception_index) {
arch/arm64/kvm/hyp/include/hyp/switch.h+21−2
@@ -402,6 +402,24 @@ static inline bool kvm_hyp_handle_exit(struct kvm_vcpu *vcpu, u64 *exit_code) · 401 unmodified lines
402402 return false;
403403 }
404404
405+static inline void synchronize_vcpu_pstate(struct kvm_vcpu *vcpu, u64 *exit_code)
406+{
407+ /*
408+ * Check for the conditions of Cortex-A510's #2077057. When these occur
409+ * SPSR_EL2 can't be trusted, but isn't needed either as it is
410+ * unchanged from the value in vcpu_gp_regs(vcpu)->pstate.
411+ * Are we single-stepping the guest, and took a PAC exception from the
412+ * active-not-pending state?
413+ */
414+ if (cpus_have_final_cap(ARM64_WORKAROUND_2077057) &&
415+ vcpu->guest_debug & KVM_GUESTDBG_SINGLESTEP &&
416+ *vcpu_cpsr(vcpu) & DBG_SPSR_SS &&
417+ ESR_ELx_EC(read_sysreg_el2(SYS_ESR)) == ESR_ELx_EC_PAC)
418+ write_sysreg_el2(*vcpu_cpsr(vcpu), SYS_SPSR);
419+
420+ vcpu->arch.ctxt.regs.pstate = read_sysreg_el2(SYS_SPSR);
421+}
422+
405423 /*
406424 * Return true when we were able to fixup the guest exit and should return to
407425 * the guest, false when we should restore the host state and return to the
@@ -413,7 +431,7 @@ static inline bool fixup_guest_exit(struct kvm_vcpu *vcpu, u64 *exit_code) · 5 unmodified lines
413431 * Save PSTATE early so that we can evaluate the vcpu mode
414432 * early on.
415433 */
416− vcpu->arch.ctxt.regs.pstate = read_sysreg_el2(SYS_SPSR);
434+ synchronize_vcpu_pstate(vcpu, exit_code);
417435
418436 /*
419437 * Check whether we want to repaint the state one way or
@@ -424,7 +442,8 @@ static inline bool fixup_guest_exit(struct kvm_vcpu *vcpu, u64 *exit_code) · 4 unmodified lines
424442 if (ARM_EXCEPTION_CODE(*exit_code) != ARM_EXCEPTION_IRQ)
425443 vcpu->arch.fault.esr_el2 = read_sysreg_el2(SYS_ESR);
426444
427− if (ARM_SERROR_PENDING(*exit_code)) {
445+ if (ARM_SERROR_PENDING(*exit_code) &&
446+ ARM_EXCEPTION_CODE(*exit_code) != ARM_EXCEPTION_IRQ) {
428447 u8 esr_ec = kvm_vcpu_trap_get_class(vcpu);
429448
430449 /*
arch/arm64/tools/cpucaps+3−2
@@ -55,9 +55,10 @@ WORKAROUND_1418040 · 54 unmodified lines
5555 WORKAROUND_1463225
5656 WORKAROUND_1508412
5757 WORKAROUND_1542419
58−WORKAROUND_2064142
59−WORKAROUND_2038923
6058 WORKAROUND_1902691
59+WORKAROUND_2038923
60+WORKAROUND_2064142
61+WORKAROUND_2077057
6162 WORKAROUND_TRBE_OVERWRITE_FILL_MODE
6263 WORKAROUND_TSB_FLUSH_FAILURE
6364 WORKAROUND_TRBE_WRITE_OUT_OF_RANGE
arch/mips/cavium-octeon/octeon-memcpy.S+1−1
@@ -74,7 +74,7 @@ · 73 unmodified lines
7474 #define EXC(inst_reg,addr,handler) \
7575 9: inst_reg, addr; \
7676 .section __ex_table,"a"; \
77− PTR 9b, handler; \
77+ PTR_WD 9b, handler; \
7878 .previous
7979
8080 /*
arch/mips/kvm/mips.c+46−4
@@ -414,6 +414,24 @@ int kvm_arch_vcpu_ioctl_set_guest_debug(struct kvm_vcpu *vcpu, · 413 unmodified lines
414414 return -ENOIOCTLCMD;
415415 }
416416
417+/*
418+ * Actually run the vCPU, entering an RCU extended quiescent state (EQS) while
419+ * the vCPU is running.
420+ *
421+ * This must be noinstr as instrumentation may make use of RCU, and this is not
422+ * safe during the EQS.
423+ */
424+static int noinstr kvm_mips_vcpu_enter_exit(struct kvm_vcpu *vcpu)
425+{
426+ int ret;
427+
428+ guest_state_enter_irqoff();
429+ ret = kvm_mips_callbacks->vcpu_run(vcpu);
430+ guest_state_exit_irqoff();
431+
432+ return ret;
433+}
434+
417435 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)
418436 {
419437 int r = -EINTR;
@@ -434,7 +452,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) · 14 unmodified lines
434452 lose_fpu(1);
435453
436454 local_irq_disable();
437− guest_enter_irqoff();
455+ guest_timing_enter_irqoff();
438456 trace_kvm_enter(vcpu);
439457
440458 /*
@@ -445,10 +463,23 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) · 4 unmodified lines
445463 */
446464 smp_store_mb(vcpu->mode, IN_GUEST_MODE);
447465
448− r = kvm_mips_callbacks->vcpu_run(vcpu);
466+ r = kvm_mips_vcpu_enter_exit(vcpu);
467+
468+ /*
469+ * We must ensure that any pending interrupts are taken before
470+ * we exit guest timing so that timer ticks are accounted as
471+ * guest time. Transiently unmask interrupts so that any
472+ * pending interrupts are taken.
473+ *
474+ * TODO: is there a barrier which ensures that pending interrupts are
475+ * recognised? Currently this just hopes that the CPU takes any pending
476+ * interrupts between the enable and disable.
477+ */
478+ local_irq_enable();
479+ local_irq_disable();
449480
450481 trace_kvm_out(vcpu);
451− guest_exit_irqoff();
482+ guest_timing_exit_irqoff();
452483 local_irq_enable();
453484
454485 out:
@@ -1168,7 +1199,7 @@ static void kvm_mips_set_c0_status(void) · 713 unmodified lines
11681199 /*
11691200 * Return value is in the form (errcode<<2 | RESUME_FLAG_HOST | RESUME_FLAG_NV)
11701201 */
1171−int kvm_mips_handle_exit(struct kvm_vcpu *vcpu)
1202+static int __kvm_mips_handle_exit(struct kvm_vcpu *vcpu)
11721203 {
11731204 struct kvm_run *run = vcpu->run;
11741205 u32 cause = vcpu->arch.host_cp0_cause;
@@ -1357,6 +1388,17 @@ int kvm_mips_handle_exit(struct kvm_vcpu *vcpu) · 182 unmodified lines
13571388 return ret;
13581389 }
13591390
1391+int noinstr kvm_mips_handle_exit(struct kvm_vcpu *vcpu)
1392+{
1393+ int ret;
1394+
1395+ guest_state_exit_irqoff();
1396+ ret = __kvm_mips_handle_exit(vcpu);
1397+ guest_state_enter_irqoff();
1398+
1399+ return ret;
1400+}
1401+
13601402 /* Enable FPU for guest and restore context */
13611403 void kvm_own_fpu(struct kvm_vcpu *vcpu)
13621404 {
arch/mips/kvm/vz.c+9−3
@@ -458,8 +458,8 @@ void kvm_vz_acquire_htimer(struct kvm_vcpu *vcpu) · 457 unmodified lines
458458 /**
459459 * _kvm_vz_save_htimer() - Switch to software emulation of guest timer.
460460 * @vcpu: Virtual CPU.
461− * @compare: Pointer to write compare value to.
462− * @cause: Pointer to write cause value to.
461+ * @out_compare: Pointer to write compare value to.
462+ * @out_cause: Pointer to write cause value to.
463463 *
464464 * Save VZ guest timer state and switch to software emulation of guest CP0
465465 * timer. The hard timer must already be in use, so preemption should be
@@ -1541,11 +1541,14 @@ static int kvm_trap_vz_handle_guest_exit(struct kvm_vcpu *vcpu) · 1075 unmodified lines
15411541 }
15421542
15431543 /**
1544− * kvm_trap_vz_handle_cop_unusuable() - Guest used unusable coprocessor.
1544+ * kvm_trap_vz_handle_cop_unusable() - Guest used unusable coprocessor.
15451545 * @vcpu: Virtual CPU context.
15461546 *
15471547 * Handle when the guest attempts to use a coprocessor which hasn't been allowed
15481548 * by the root context.
1549+ *
1550+ * Return: value indicating whether to resume the host or the guest
1551+ * (RESUME_HOST or RESUME_GUEST)
15491552 */
15501553 static int kvm_trap_vz_handle_cop_unusable(struct kvm_vcpu *vcpu)
15511554 {
@@ -1592,6 +1595,9 @@ static int kvm_trap_vz_handle_cop_unusable(struct kvm_vcpu *vcpu) · 40 unmodified lines
15921595 *
15931596 * Handle when the guest attempts to use MSA when it is disabled in the root
15941597 * context.
1598+ *
1599+ * Return: value indicating whether to resume the host or the guest
1600+ * (RESUME_HOST or RESUME_GUEST)
15951601 */
15961602 static int kvm_trap_vz_handle_msa_disabled(struct kvm_vcpu *vcpu)
15971603 {
arch/riscv/kvm/vcpu.c+31−17
@@ -90,6 +90,7 @@ int kvm_arch_vcpu_precreate(struct kvm *kvm, unsigned int id) · 89 unmodified lines
9090 int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu)
9191 {
9292 struct kvm_cpu_context *cntx;
93+ struct kvm_vcpu_csr *reset_csr = &vcpu->arch.guest_reset_csr;
9394
9495 /* Mark this VCPU never ran */
9596 vcpu->arch.ran_atleast_once = false;
@@ -106,6 +107,9 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) · 10 unmodified lines
106107 cntx->hstatus |= HSTATUS_SPVP;
107108 cntx->hstatus |= HSTATUS_SPV;
108109
110+ /* By default, make CY, TM, and IR counters accessible in VU mode */
111+ reset_csr->scounteren = 0x7;
112+
109113 /* Setup VCPU timer */
110114 kvm_riscv_vcpu_timer_init(vcpu);
111115
@@ -699,6 +703,20 @@ static void kvm_riscv_update_hvip(struct kvm_vcpu *vcpu) · 587 unmodified lines
699703 csr_write(CSR_HVIP, csr->hvip);
700704 }
701705
706+/*
707+ * Actually run the vCPU, entering an RCU extended quiescent state (EQS) while
708+ * the vCPU is running.
709+ *
710+ * This must be noinstr as instrumentation may make use of RCU, and this is not
711+ * safe during the EQS.
712+ */
713+static void noinstr kvm_riscv_vcpu_enter_exit(struct kvm_vcpu *vcpu)
714+{
715+ guest_state_enter_irqoff();
716+ __kvm_riscv_switch_to(&vcpu->arch);
717+ guest_state_exit_irqoff();
718+}
719+
702720 int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)
703721 {
704722 int ret;
@@ -790,9 +808,9 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) · 85 unmodified lines
790808 continue;
791809 }
792810
793− guest_enter_irqoff();
811+ guest_timing_enter_irqoff();
794812
795− __kvm_riscv_switch_to(&vcpu->arch);
813+ kvm_riscv_vcpu_enter_exit(vcpu);
796814
797815 vcpu->mode = OUTSIDE_GUEST_MODE;
798816 vcpu->stat.exits++;
@@ -812,25 +830,21 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu) · 13 unmodified lines
812830 kvm_riscv_vcpu_sync_interrupts(vcpu);
813831
814832 /*
815− * We may have taken a host interrupt in VS/VU-mode (i.e.
816− * while executing the guest). This interrupt is still
817− * pending, as we haven't serviced it yet!
833+ * We must ensure that any pending interrupts are taken before
834+ * we exit guest timing so that timer ticks are accounted as
835+ * guest time. Transiently unmask interrupts so that any
836+ * pending interrupts are taken.
818837 *
819− * We're now back in HS-mode with interrupts disabled
820− * so enabling the interrupts now will have the effect
821− * of taking the interrupt again, in HS-mode this time.
838+ * There's no barrier which ensures that pending interrupts are
839+ * recognised, so we just hope that the CPU takes any pending
840+ * interrupts between the enable and disable.
822841 */
823842 local_irq_enable();
843+ local_irq_disable();
824844
825− /*
826− * We do local_irq_enable() before calling guest_exit() so
827− * that if a timer interrupt hits while running the guest
828− * we account that tick as being spent in the guest. We
829− * enable preemption after calling guest_exit() so that if
830− * we get preempted we make sure ticks after that is not
831− * counted as guest time.
832− */
833− guest_exit();
845+ guest_timing_exit_irqoff();
846+
847+ local_irq_enable();
834848
835849 preempt_enable();
836850
arch/riscv/kvm/vcpu_sbi_base.c+2−1
@@ -9,6 +9,7 @@ · 8 unmodified lines
99 #include <linux/errno.h>
1010 #include <linux/err.h>
1111 #include <linux/kvm_host.h>
12+#include <linux/version.h>
1213 #include <asm/csr.h>
1314 #include <asm/sbi.h>
1415 #include <asm/kvm_vcpu_timer.h>
@@ -32,7 +33,7 @@ static int kvm_sbi_ext_base_handler(struct kvm_vcpu *vcpu, struct kvm_run *run, · 17 unmodified lines
3233 *out_val = KVM_SBI_IMPID;
3334 break;
3435 case SBI_EXT_BASE_GET_IMP_VERSION:
35− *out_val = 0;
36+ *out_val = LINUX_VERSION_CODE;
3637 break;
3738 case SBI_EXT_BASE_PROBE_EXT:
3839 if ((cp->a0 >= SBI_EXT_EXPERIMENTAL_START &&
arch/x86/crypto/blake2s-shash.c+2−2
@@ -18,12 +18,12 @@ · 17 unmodified lines
1818 static int crypto_blake2s_update_x86(struct shash_desc *desc,
1919 const u8 *in, unsigned int inlen)
2020 {
21− return crypto_blake2s_update(desc, in, inlen, blake2s_compress);
21+ return crypto_blake2s_update(desc, in, inlen, false);
2222 }
2323
2424 static int crypto_blake2s_final_x86(struct shash_desc *desc, u8 *out)
2525 {
26− return crypto_blake2s_final(desc, out, blake2s_compress);
26+ return crypto_blake2s_final(desc, out, false);
2727 }
2828
2929 #define BLAKE2S_ALG(name, driver_name, digest_size) \
arch/x86/include/asm/kvm-x86-ops.h+1−1
@@ -82,7 +82,7 @@ KVM_X86_OP_NULL(guest_apic_has_interrupt) · 81 unmodified lines
8282 KVM_X86_OP(load_eoi_exitmap)
8383 KVM_X86_OP(set_virtual_apic_mode)
8484 KVM_X86_OP_NULL(set_apic_access_page_addr)
85−KVM_X86_OP(deliver_posted_interrupt)
85+KVM_X86_OP(deliver_interrupt)
8686 KVM_X86_OP_NULL(sync_pir_to_irr)
8787 KVM_X86_OP(set_tss_addr)
8888 KVM_X86_OP(set_identity_map_addr)
arch/x86/include/asm/kvm_host.h+2−1
@@ -1410,7 +1410,8 @@ struct kvm_x86_ops { · 1409 unmodified lines
14101410 void (*load_eoi_exitmap)(struct kvm_vcpu *vcpu, u64 *eoi_exit_bitmap);
14111411 void (*set_virtual_apic_mode)(struct kvm_vcpu *vcpu);
14121412 void (*set_apic_access_page_addr)(struct kvm_vcpu *vcpu);
1413− int (*deliver_posted_interrupt)(struct kvm_vcpu *vcpu, int vector);
1413+ void (*deliver_interrupt)(struct kvm_lapic *apic, int delivery_mode,
1414+ int trig_mode, int vector);
14141415 int (*sync_pir_to_irr)(struct kvm_vcpu *vcpu);
14151416 int (*set_tss_addr)(struct kvm *kvm, unsigned int addr);
14161417 int (*set_identity_map_addr)(struct kvm *kvm, u64 ident_addr);
arch/x86/include/asm/xen/hypervisor.h+0−14
@@ -43,20 +43,6 @@ static inline uint32_t xen_cpuid_base(void) · 42 unmodified lines
4343 return hypervisor_cpuid_base("XenVMMXenVMM", 2);
4444 }
4545
46−#ifdef CONFIG_XEN
47−extern bool __init xen_hvm_need_lapic(void);
48−
49−static inline bool __init xen_x2apic_para_available(void)
50−{
51− return xen_hvm_need_lapic();
52−}
53−#else
54−static inline bool __init xen_x2apic_para_available(void)
55−{
56− return (xen_cpuid_base() != 0);
57−}
58−#endif
59−
6046 struct pci_dev;
6147
6248 #ifdef CONFIG_XEN_PV_DOM0
arch/x86/kvm/cpuid.c+7−6
@@ -554,12 +554,13 @@ void kvm_set_cpu_caps(void) · 553 unmodified lines
554554 );
555555
556556 kvm_cpu_cap_mask(CPUID_7_0_EBX,
557− F(FSGSBASE) | F(SGX) | F(BMI1) | F(HLE) | F(AVX2) | F(SMEP) |
558− F(BMI2) | F(ERMS) | F(INVPCID) | F(RTM) | 0 /*MPX*/ | F(RDSEED) |
559− F(ADX) | F(SMAP) | F(AVX512IFMA) | F(AVX512F) | F(AVX512PF) |
560− F(AVX512ER) | F(AVX512CD) | F(CLFLUSHOPT) | F(CLWB) | F(AVX512DQ) |
561− F(SHA_NI) | F(AVX512BW) | F(AVX512VL) | 0 /*INTEL_PT*/
562− );
557+ F(FSGSBASE) | F(SGX) | F(BMI1) | F(HLE) | F(AVX2) |
558+ F(FDP_EXCPTN_ONLY) | F(SMEP) | F(BMI2) | F(ERMS) | F(INVPCID) |
559+ F(RTM) | F(ZERO_FCS_FDS) | 0 /*MPX*/ | F(AVX512F) |
560+ F(AVX512DQ) | F(RDSEED) | F(ADX) | F(SMAP) | F(AVX512IFMA) |
561+ F(CLFLUSHOPT) | F(CLWB) | 0 /*INTEL_PT*/ | F(AVX512PF) |
562+ F(AVX512ER) | F(AVX512CD) | F(SHA_NI) | F(AVX512BW) |
563+ F(AVX512VL));
563564
564565 kvm_cpu_cap_mask(CPUID_7_ECX,
565566 F(AVX512VBMI) | F(LA57) | F(PKU) | 0 /*OSPKE*/ | F(RDPID) |
arch/x86/kvm/lapic.c+2−8
@@ -1096,14 +1096,8 @@ static int __apic_accept_irq(struct kvm_lapic *apic, int delivery_mode, · 1095 unmodified lines
10961096 apic->regs + APIC_TMR);
10971097 }
10981098
1099− if (static_call(kvm_x86_deliver_posted_interrupt)(vcpu, vector)) {
1100− kvm_lapic_set_irr(vector, apic);
1101− kvm_make_request(KVM_REQ_EVENT, vcpu);
1102− kvm_vcpu_kick(vcpu);
1103− } else {
1104− trace_kvm_apicv_accept_irq(vcpu->vcpu_id, delivery_mode,
1105− trig_mode, vector);
1106− }
1099+ static_call(kvm_x86_deliver_interrupt)(apic, delivery_mode,
1100+ trig_mode, vector);
11071101 break;
11081102
11091103 case APIC_DM_REMRD:
arch/x86/kvm/svm/svm.c+18−3
@@ -3291,6 +3291,21 @@ static void svm_set_irq(struct kvm_vcpu *vcpu) · 3290 unmodified lines
32913291 SVM_EVTINJ_VALID | SVM_EVTINJ_TYPE_INTR;
32923292 }
32933293
3294+static void svm_deliver_interrupt(struct kvm_lapic *apic, int delivery_mode,
3295+ int trig_mode, int vector)
3296+{
3297+ struct kvm_vcpu *vcpu = apic->vcpu;
3298+
3299+ if (svm_deliver_avic_intr(vcpu, vector)) {
3300+ kvm_lapic_set_irr(vector, apic);
3301+ kvm_make_request(KVM_REQ_EVENT, vcpu);
3302+ kvm_vcpu_kick(vcpu);
3303+ } else {
3304+ trace_kvm_apicv_accept_irq(vcpu->vcpu_id, delivery_mode,
3305+ trig_mode, vector);
3306+ }
3307+}
3308+
32943309 static void svm_update_cr8_intercept(struct kvm_vcpu *vcpu, int tpr, int irr)
32953310 {
32963311 struct vcpu_svm *svm = to_svm(vcpu);
@@ -3615,7 +3630,7 @@ static noinstr void svm_vcpu_enter_exit(struct kvm_vcpu *vcpu) · 318 unmodified lines
36153630 struct vcpu_svm *svm = to_svm(vcpu);
36163631 unsigned long vmcb_pa = svm->current_vmcb->pa;
36173632
3618− kvm_guest_enter_irqoff();
3633+ guest_state_enter_irqoff();
36193634
36203635 if (sev_es_guest(vcpu->kvm)) {
36213636 __svm_sev_es_vcpu_run(vmcb_pa);
@@ -3635,7 +3650,7 @@ static noinstr void svm_vcpu_enter_exit(struct kvm_vcpu *vcpu) · 13 unmodified lines
36353650 vmload(__sme_page_pa(sd->save_area));
36363651 }
36373652
3638− kvm_guest_exit_irqoff();
3653+ guest_state_exit_irqoff();
36393654 }
36403655
36413656 static __no_kcsan fastpath_t svm_vcpu_run(struct kvm_vcpu *vcpu)
@@ -4545,7 +4560,7 @@ static struct kvm_x86_ops svm_x86_ops __initdata = { · 903 unmodified lines
45454560 .pmu_ops = &amd_pmu_ops,
45464561 .nested_ops = &svm_nested_ops,
45474562
4548− .deliver_posted_interrupt = svm_deliver_avic_intr,
4563+ .deliver_interrupt = svm_deliver_interrupt,
45494564 .dy_apicv_has_pending_interrupt = svm_dy_apicv_has_pending_interrupt,
45504565 .update_pi_irte = svm_update_pi_irte,
45514566 .setup_mce = svm_setup_mce,
arch/x86/kvm/vmx/vmx.c+18−3
@@ -4041,6 +4041,21 @@ static int vmx_deliver_posted_interrupt(struct kvm_vcpu *vcpu, int vector) · 4040 unmodified lines
40414041 return 0;
40424042 }
40434043
4044+static void vmx_deliver_interrupt(struct kvm_lapic *apic, int delivery_mode,
4045+ int trig_mode, int vector)
4046+{
4047+ struct kvm_vcpu *vcpu = apic->vcpu;
4048+
4049+ if (vmx_deliver_posted_interrupt(vcpu, vector)) {
4050+ kvm_lapic_set_irr(vector, apic);
4051+ kvm_make_request(KVM_REQ_EVENT, vcpu);
4052+ kvm_vcpu_kick(vcpu);
4053+ } else {
4054+ trace_kvm_apicv_accept_irq(vcpu->vcpu_id, delivery_mode,
4055+ trig_mode, vector);
4056+ }
4057+}
4058+
40444059 /*
40454060 * Set up the vmcs's constant host-state fields, i.e., host-state fields that
40464061 * will not change in the lifetime of the guest.
@@ -6754,7 +6769,7 @@ static fastpath_t vmx_exit_handlers_fastpath(struct kvm_vcpu *vcpu) · 2707 unmodified lines
67546769 static noinstr void vmx_vcpu_enter_exit(struct kvm_vcpu *vcpu,
67556770 struct vcpu_vmx *vmx)
67566771 {
6757− kvm_guest_enter_irqoff();
6772+ guest_state_enter_irqoff();
67586773
67596774 /* L1D Flush includes CPU buffer clear to mitigate MDS */
67606775 if (static_branch_unlikely(&vmx_l1d_should_flush))
@@ -6770,7 +6785,7 @@ static noinstr void vmx_vcpu_enter_exit(struct kvm_vcpu *vcpu, · 9 unmodified lines
67706785
67716786 vcpu->arch.cr2 = native_read_cr2();
67726787
6773− kvm_guest_exit_irqoff();
6788+ guest_state_exit_irqoff();
67746789 }
67756790
67766791 static fastpath_t vmx_vcpu_run(struct kvm_vcpu *vcpu)
@@ -7768,7 +7783,7 @@ static struct kvm_x86_ops vmx_x86_ops __initdata = { · 991 unmodified lines
77687783 .hwapic_isr_update = vmx_hwapic_isr_update,
77697784 .guest_apic_has_interrupt = vmx_guest_apic_has_interrupt,
77707785 .sync_pir_to_irr = vmx_sync_pir_to_irr,
7771− .deliver_posted_interrupt = vmx_deliver_posted_interrupt,
7786+ .deliver_interrupt = vmx_deliver_interrupt,
77727787 .dy_apicv_has_pending_interrupt = pi_has_pending_interrupt,
77737788
77747789 .set_tss_addr = vmx_set_tss_addr,
arch/x86/kvm/x86.c+6−4
@@ -90,6 +90,8 @@ · 89 unmodified lines
9090 u64 __read_mostly kvm_mce_cap_supported = MCG_CTL_P | MCG_SER_P;
9191 EXPORT_SYMBOL_GPL(kvm_mce_cap_supported);
9292
93+#define ERR_PTR_USR(e) ((void __user *)ERR_PTR(e))
94+
9395 #define emul_to_vcpu(ctxt) \
9496 ((struct kvm_vcpu *)(ctxt)->vcpu)
9597
@@ -4340,7 +4342,7 @@ static inline void __user *kvm_get_attr_addr(struct kvm_device_attr *attr) · 4244 unmodified lines
43404342 void __user *uaddr = (void __user*)(unsigned long)attr->addr;
43414343
43424344 if ((u64)(unsigned long)uaddr != attr->addr)
4343− return ERR_PTR(-EFAULT);
4345+ return ERR_PTR_USR(-EFAULT);
43444346 return uaddr;
43454347 }
43464348
@@ -10041,6 +10043,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) · 5694 unmodified lines
1004110043 set_debugreg(0, 7);
1004210044 }
1004310045
10046+ guest_timing_enter_irqoff();
10047+
1004410048 for (;;) {
1004510049 /*
1004610050 * Assert that vCPU vs. VM APICv state is consistent. An APICv
@@ -10125,7 +10129,7 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) · 78 unmodified lines
1012510129 * of accounting via context tracking, but the loss of accuracy is
1012610130 * acceptable for all known use cases.
1012710131 */
10128− vtime_account_guest_exit();
10132+ guest_timing_exit_irqoff();
1012910133
1013010134 if (lapic_in_kernel(vcpu)) {
1013110135 s64 delta = vcpu->arch.apic->lapic_timer.advance_expire_delta;
@@ -11639,8 +11643,6 @@ void kvm_arch_sync_events(struct kvm *kvm) · 1507 unmodified lines
1163911643 kvm_free_pit(kvm);
1164011644 }
1164111645
11642−#define ERR_PTR_USR(e) ((void __user *)ERR_PTR(e))
11643−
1164411646 /**
1164511647 * __x86_set_memory_region: Setup KVM internal memory slot
1164611648 *
arch/x86/kvm/x86.h+0−45
@@ -10,51 +10,6 @@ · 9 unmodified lines
1010
1111 void kvm_spurious_fault(void);
1212
13−static __always_inline void kvm_guest_enter_irqoff(void)
14−{
15− /*
16− * VMENTER enables interrupts (host state), but the kernel state is
17− * interrupts disabled when this is invoked. Also tell RCU about
18− * it. This is the same logic as for exit_to_user_mode().
19− *
20− * This ensures that e.g. latency analysis on the host observes
21− * guest mode as interrupt enabled.
22− *
23− * guest_enter_irqoff() informs context tracking about the
24− * transition to guest mode and if enabled adjusts RCU state
25− * accordingly.
26− */
27− instrumentation_begin();
28− trace_hardirqs_on_prepare();
29− lockdep_hardirqs_on_prepare(CALLER_ADDR0);
30− instrumentation_end();
31−
32− guest_enter_irqoff();
33− lockdep_hardirqs_on(CALLER_ADDR0);
34−}
35−
36−static __always_inline void kvm_guest_exit_irqoff(void)
37−{
38− /*
39− * VMEXIT disables interrupts (host state), but tracing and lockdep
40− * have them in state 'on' as recorded before entering guest mode.
41− * Same as enter_from_user_mode().
42− *
43− * context_tracking_guest_exit() restores host context and reinstates
44− * RCU if enabled and required.
45− *
46− * This needs to be done immediately after VM-Exit, before any code
47− * that might contain tracepoints or call out to the greater world,
48− * e.g. before x86_spec_ctrl_restore_host().
49− */
50− lockdep_hardirqs_off(CALLER_ADDR0);
51− context_tracking_guest_exit();
52−
53− instrumentation_begin();
54− trace_hardirqs_off_finish();
55− instrumentation_end();
56−}
57−
5813 #define KVM_NESTED_VMENTER_CONSISTENCY_CHECK(consistency_check) \
5914 ({ \
6015 bool failed = (consistency_check); \
arch/x86/xen/enlighten_hvm.c+4−9
@@ -9,6 +9,7 @@ · 8 unmodified lines
99 #include <xen/events.h>
1010 #include <xen/interface/memory.h>
1111
12+#include <asm/apic.h>
1213 #include <asm/cpu.h>
1314 #include <asm/smp.h>
1415 #include <asm/io_apic.h>
@@ -242,15 +243,9 @@ static __init int xen_parse_no_vector_callback(char *arg) · 227 unmodified lines
242243 }
243244 early_param("xen_no_vector_callback", xen_parse_no_vector_callback);
244245
245−bool __init xen_hvm_need_lapic(void)
246+static __init bool xen_x2apic_available(void)
246247 {
247− if (xen_pv_domain())
248− return false;
249− if (!xen_hvm_domain())
250− return false;
251− if (xen_feature(XENFEAT_hvm_pirqs) && xen_have_vector_callback)
252− return false;
253− return true;
248+ return x2apic_supported();
254249 }
255250
256251 static __init void xen_hvm_guest_late_init(void)
@@ -312,7 +307,7 @@ struct hypervisor_x86 x86_hyper_xen_hvm __initdata = { · 55 unmodified lines
312307 .detect = xen_platform_hvm,
313308 .type = X86_HYPER_XEN_HVM,
314309 .init.init_platform = xen_hvm_guest_init,
315− .init.x2apic_available = xen_x2apic_para_available,
310+ .init.x2apic_available = xen_x2apic_available,
316311 .init.init_mem_mapping = xen_hvm_init_mem_mapping,
317312 .init.guest_late_init = xen_hvm_guest_late_init,
318313 .runtime.pin_vcpu = xen_pin_vcpu,
arch/x86/xen/enlighten_pv.c+0−4
@@ -1341,10 +1341,6 @@ asmlinkage __visible void __init xen_start_kernel(void) · 1340 unmodified lines
13411341
13421342 xen_acpi_sleep_register();
13431343
1344− /* Avoid searching for BIOS MP tables */
1345− x86_init.mpparse.find_smp_config = x86_init_noop;
1346− x86_init.mpparse.get_smp_config = x86_init_uint_noop;
1347−
13481344 xen_boot_params_init_edd();
13491345
13501346 #ifdef CONFIG_ACPI
arch/x86/xen/smp_pv.c+6−20
@@ -148,28 +148,12 @@ int xen_smp_intr_init_pv(unsigned int cpu) · 147 unmodified lines
148148 return rc;
149149 }
150150
151−static void __init xen_fill_possible_map(void)
152−{
153− int i, rc;
154−
155− if (xen_initial_domain())
156− return;
157−
158− for (i = 0; i < nr_cpu_ids; i++) {
159− rc = HYPERVISOR_vcpu_op(VCPUOP_is_up, i, NULL);
160− if (rc >= 0) {
161− num_processors++;
162− set_cpu_possible(i, true);
163− }
164− }
165−}
166−
167−static void __init xen_filter_cpu_maps(void)
151+static void __init _get_smp_config(unsigned int early)
168152 {
169153 int i, rc;
170154 unsigned int subtract = 0;
171155
172− if (!xen_initial_domain())
156+ if (early)
173157 return;
174158
175159 num_processors = 0;
@@ -210,7 +194,6 @@ static void __init xen_pv_smp_prepare_boot_cpu(void) · 34 unmodified lines
210194 * sure the old memory can be recycled. */
211195 make_lowmem_page_readwrite(xen_initial_gdt);
212196
213− xen_filter_cpu_maps();
214197 xen_setup_vcpu_info_placement();
215198
216199 /*
@@ -476,5 +459,8 @@ static const struct smp_ops xen_smp_ops __initconst = { · 259 unmodified lines
476459 void __init xen_smp_init(void)
477460 {
478461 smp_ops = xen_smp_ops;
479− xen_fill_possible_map();
462+
463+ /* Avoid searching for BIOS MP tables */
464+ x86_init.mpparse.find_smp_config = x86_init_noop;
465+ x86_init.mpparse.get_smp_config = _get_smp_config;
480466 }
block/bio-integrity.c+1−1
@@ -373,7 +373,7 @@ void bio_integrity_advance(struct bio *bio, unsigned int bytes_done) · 372 unmodified lines
373373 struct blk_integrity *bi = blk_get_integrity(bio->bi_bdev->bd_disk);
374374 unsigned bytes = bio_integrity_bytes(bi, bytes_done >> 9);
375375
376− bip->bip_iter.bi_sector += bytes_done >> 9;
376+ bip->bip_iter.bi_sector += bio_integrity_intervals(bi, bytes_done >> 9);
377377 bvec_iter_advance(bip->bip_vec, &bip->bip_iter, bytes);
378378 }
379379
block/fops.c+19−14
@@ -566,34 +566,37 @@ static ssize_t blkdev_read_iter(struct kiocb *iocb, struct iov_iter *to) · 565 unmodified lines
566566 {
567567 struct block_device *bdev = iocb->ki_filp->private_data;
568568 loff_t size = bdev_nr_bytes(bdev);
569− size_t count = iov_iter_count(to);
570569 loff_t pos = iocb->ki_pos;
571570 size_t shorted = 0;
572571 ssize_t ret = 0;
572+ size_t count;
573573
574− if (unlikely(pos + count > size)) {
574+ if (unlikely(pos + iov_iter_count(to) > size)) {
575575 if (pos >= size)
576576 return 0;
577577 size -= pos;
578− if (count > size) {
579− shorted = count - size;
580− iov_iter_truncate(to, size);
581− }
578+ shorted = iov_iter_count(to) - size;
579+ iov_iter_truncate(to, size);
582580 }
583581
582+ count = iov_iter_count(to);
583+ if (!count)
584+ goto reexpand; /* skip atime */
585+
584586 if (iocb->ki_flags & IOCB_DIRECT) {
585587 struct address_space *mapping = iocb->ki_filp->f_mapping;
586588
587589 if (iocb->ki_flags & IOCB_NOWAIT) {
588− if (filemap_range_needs_writeback(mapping, iocb->ki_pos,
589− iocb->ki_pos + count - 1))
590− return -EAGAIN;
590+ if (filemap_range_needs_writeback(mapping, pos,
591+ pos + count - 1)) {
592+ ret = -EAGAIN;
593+ goto reexpand;
594+ }
591595 } else {
592− ret = filemap_write_and_wait_range(mapping,
593− iocb->ki_pos,
594− iocb->ki_pos + count - 1);
596+ ret = filemap_write_and_wait_range(mapping, pos,
597+ pos + count - 1);
595598 if (ret < 0)
596− return ret;
599+ goto reexpand;
597600 }
598601
599602 file_accessed(iocb->ki_filp);
@@ -603,12 +606,14 @@ static ssize_t blkdev_read_iter(struct kiocb *iocb, struct iov_iter *to) · 3 unmodified lines
603606 iocb->ki_pos += ret;
604607 count -= ret;
605608 }
609+ iov_iter_revert(to, count - iov_iter_count(to));
606610 if (ret < 0 || !count)
607− return ret;
611+ goto reexpand;
608612 }
609613
610614 ret = filemap_read(iocb, to, ret);
611615
616+reexpand:
612617 if (unlikely(shorted))
613618 iov_iter_reexpand(to, iov_iter_count(to) + shorted);
614619 return ret;
crypto/blake2s_generic.c+2−2
@@ -15,12 +15,12 @@ · 14 unmodified lines
1515 static int crypto_blake2s_update_generic(struct shash_desc *desc,
1616 const u8 *in, unsigned int inlen)
1717 {
18− return crypto_blake2s_update(desc, in, inlen, blake2s_compress_generic);
18+ return crypto_blake2s_update(desc, in, inlen, true);
1919 }
2020
2121 static int crypto_blake2s_final_generic(struct shash_desc *desc, u8 *out)
2222 {
23− return crypto_blake2s_final(desc, out, blake2s_compress_generic);
23+ return crypto_blake2s_final(desc, out, true);
2424 }
2525
2626 #define BLAKE2S_ALG(name, driver_name, digest_size) \
drivers/acpi/Kconfig+1−0
@@ -11,6 +11,7 @@ menuconfig ACPI · 10 unmodified lines
1111 depends on ARCH_SUPPORTS_ACPI
1212 select PNP
1313 select NLS
14+ select CRC32
1415 default y if X86
1516 help
1617 Advanced Configuration and Power Interface (ACPI) support for
drivers/ata/libata-core.c+10−0
@@ -2007,6 +2007,9 @@ static bool ata_log_supported(struct ata_device *dev, u8 log) · 2006 unmodified lines
20072007 {
20082008 struct ata_port *ap = dev->link->ap;
20092009
2010+ if (dev->horkage & ATA_HORKAGE_NO_LOG_DIR)
2011+ return false;
2012+
20102013 if (ata_read_log_page(dev, ATA_LOG_DIRECTORY, 0, ap->sector_buf, 1))
20112014 return false;
20122015 return get_unaligned_le16(&ap->sector_buf[log * 2]) ? true : false;
@@ -4073,6 +4076,13 @@ static const struct ata_blacklist_entry ata_device_blacklist [] = { · 2060 unmodified lines
40734076 { "WDC WD3000JD-*", NULL, ATA_HORKAGE_WD_BROKEN_LPM },
40744077 { "WDC WD3200JD-*", NULL, ATA_HORKAGE_WD_BROKEN_LPM },
40754078
4079+ /*
4080+ * This sata dom device goes on a walkabout when the ATA_LOG_DIRECTORY
4081+ * log page is accessed. Ensure we never ask for this log page with
4082+ * these devices.
4083+ */
4084+ { "SATADOM-ML 3ME", NULL, ATA_HORKAGE_NO_LOG_DIR },
4085+
40764086 /* End Marker */
40774087 { }
40784088 };
drivers/char/random.c+22−17
@@ -762,7 +762,7 @@ static bool crng_init_try_arch(struct crng_state *crng) · 761 unmodified lines
762762 return arch_init;
763763 }
764764
765−static bool __init crng_init_try_arch_early(struct crng_state *crng)
765+static bool __init crng_init_try_arch_early(void)
766766 {
767767 int i;
768768 bool arch_init = true;
@@ -774,7 +774,7 @@ static bool __init crng_init_try_arch_early(struct crng_state *crng) · 5 unmodified lines
774774 rv = random_get_entropy();
775775 arch_init = false;
776776 }
777− crng->state[i] ^= rv;
777+ primary_crng.state[i] ^= rv;
778778 }
779779
780780 return arch_init;
@@ -788,22 +788,20 @@ static void crng_initialize_secondary(struct crng_state *crng) · 7 unmodified lines
788788 crng->init_time = jiffies - CRNG_RESEED_INTERVAL - 1;
789789 }
790790
791−static void __init crng_initialize_primary(struct crng_state *crng)
791+static void __init crng_initialize_primary(void)
792792 {
793− _extract_entropy(&crng->state[4], sizeof(u32) * 12);
794− if (crng_init_try_arch_early(crng) && trust_cpu && crng_init < 2) {
793+ _extract_entropy(&primary_crng.state[4], sizeof(u32) * 12);
794+ if (crng_init_try_arch_early() && trust_cpu && crng_init < 2) {
795795 invalidate_batched_entropy();
796796 numa_crng_init();
797797 crng_init = 2;
798798 pr_notice("crng init done (trusting CPU's manufacturer)\n");
799799 }
800− crng->init_time = jiffies - CRNG_RESEED_INTERVAL - 1;
800+ primary_crng.init_time = jiffies - CRNG_RESEED_INTERVAL - 1;
801801 }
802802
803−static void crng_finalize_init(struct crng_state *crng)
803+static void crng_finalize_init(void)
804804 {
805− if (crng != &primary_crng || crng_init >= 2)
806− return;
807805 if (!system_wq) {
808806 /* We can't call numa_crng_init until we have workqueues,
809807 * so mark this for processing later. */
@@ -814,6 +812,7 @@ static void crng_finalize_init(struct crng_state *crng) · 4 unmodified lines
814812 invalidate_batched_entropy();
815813 numa_crng_init();
816814 crng_init = 2;
815+ crng_need_final_init = false;
817816 process_random_ready_list();
818817 wake_up_interruptible(&crng_init_wait);
819818 kill_fasync(&fasync, SIGIO, POLL_IN);
@@ -980,7 +979,8 @@ static void crng_reseed(struct crng_state *crng, bool use_input_pool) · 160 unmodified lines
980979 memzero_explicit(&buf, sizeof(buf));
981980 WRITE_ONCE(crng->init_time, jiffies);
982981 spin_unlock_irqrestore(&crng->lock, flags);
983− crng_finalize_init(crng);
982+ if (crng == &primary_crng && crng_init < 2)
983+ crng_finalize_init();
984984 }
985985
986986 static void _extract_crng(struct crng_state *crng, u8 out[CHACHA_BLOCK_SIZE])
@@ -1697,8 +1697,8 @@ int __init rand_initialize(void) · 710 unmodified lines
16971697 {
16981698 init_std_data();
16991699 if (crng_need_final_init)
1700− crng_finalize_init(&primary_crng);
1701− crng_initialize_primary(&primary_crng);
1700+ crng_finalize_init();
1701+ crng_initialize_primary();
17021702 crng_global_init_time = jiffies;
17031703 if (ratelimit_disable) {
17041704 urandom_warning.interval = 0;
@@ -1856,7 +1856,10 @@ static long random_ioctl(struct file *f, unsigned int cmd, unsigned long arg) · 151 unmodified lines
18561856 */
18571857 if (!capable(CAP_SYS_ADMIN))
18581858 return -EPERM;
1859− input_pool.entropy_count = 0;
1859+ if (xchg(&input_pool.entropy_count, 0) && random_write_wakeup_bits) {
1860+ wake_up_interruptible(&random_write_wait);
1861+ kill_fasync(&fasync, SIGIO, POLL_OUT);
1862+ }
18601863 return 0;
18611864 case RNDRESEEDCRNG:
18621865 if (!capable(CAP_SYS_ADMIN))
@@ -2205,13 +2208,15 @@ void add_hwgenerator_randomness(const char *buffer, size_t count, · 342 unmodified lines
22052208 return;
22062209 }
22072210
2208− /* Suspend writing if we're above the trickle threshold.
2211+ /* Throttle writing if we're above the trickle threshold.
22092212 * We'll be woken up again once below random_write_wakeup_thresh,
2210− * or when the calling thread is about to terminate.
2213+ * when the calling thread is about to terminate, or once
2214+ * CRNG_RESEED_INTERVAL has lapsed.
22112215 */
2212− wait_event_interruptible(random_write_wait,
2216+ wait_event_interruptible_timeout(random_write_wait,
22132217 !system_wq || kthread_should_stop() ||
2214− POOL_ENTROPY_BITS() <= random_write_wakeup_bits);
2218+ POOL_ENTROPY_BITS() <= random_write_wakeup_bits,
2219+ CRNG_RESEED_INTERVAL);
22152220 mix_pool_bytes(buffer, count);
22162221 credit_entropy_bits(entropy);
22172222 }
drivers/dma-buf/dma-heap.c+2−0
@@ -14,6 +14,7 @@ · 13 unmodified lines
1414 #include <linux/xarray.h>
1515 #include <linux/list.h>
1616 #include <linux/slab.h>
17+#include <linux/nospec.h>
1718 #include <linux/uaccess.h>
1819 #include <linux/syscalls.h>
1920 #include <linux/dma-heap.h>
@@ -135,6 +136,7 @@ static long dma_heap_ioctl(struct file *file, unsigned int ucmd, · 115 unmodified lines
135136 if (nr >= ARRAY_SIZE(dma_heap_ioctl_cmds))
136137 return -EINVAL;
137138
139+ nr = array_index_nospec(nr, ARRAY_SIZE(dma_heap_ioctl_cmds));
138140 /* Get the kernel ioctl cmd that matches */
139141 kcmd = dma_heap_ioctl_cmds[nr];
140142
drivers/gpu/drm/amd/amdgpu/amdgpu.h+8−2
@@ -1408,12 +1408,10 @@ int amdgpu_acpi_smart_shift_update(struct drm_device *dev, enum amdgpu_ss ss_sta · 1407 unmodified lines
14081408 int amdgpu_acpi_pcie_notify_device_ready(struct amdgpu_device *adev);
14091409
14101410 void amdgpu_acpi_get_backlight_caps(struct amdgpu_dm_backlight_caps *caps);
1411−bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev);
14121411 void amdgpu_acpi_detect(void);
14131412 #else
14141413 static inline int amdgpu_acpi_init(struct amdgpu_device *adev) { return 0; }
14151414 static inline void amdgpu_acpi_fini(struct amdgpu_device *adev) { }
1416−static inline bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev) { return false; }
14171415 static inline void amdgpu_acpi_detect(void) { }
14181416 static inline bool amdgpu_acpi_is_power_shift_control_supported(void) { return false; }
14191417 static inline int amdgpu_acpi_power_shift_control(struct amdgpu_device *adev,
@@ -1422,6 +1420,14 @@ static inline int amdgpu_acpi_smart_shift_update(struct drm_device *dev, · 2 unmodified lines
14221420 enum amdgpu_ss ss_state) { return 0; }
14231421 #endif
14241422
1423+#if defined(CONFIG_ACPI) && defined(CONFIG_SUSPEND)
1424+bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev);
1425+bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev);
1426+#else
1427+static inline bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev) { return false; }
1428+static inline bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev) { return false; }
1429+#endif
1430+
14251431 int amdgpu_cs_find_mapping(struct amdgpu_cs_parser *parser,
14261432 uint64_t addr, struct amdgpu_bo **bo,
14271433 struct amdgpu_bo_va_mapping **mapping);
drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c+32−5
@@ -1031,6 +1031,20 @@ void amdgpu_acpi_detect(void) · 1030 unmodified lines
10311031 }
10321032 }
10331033
1034+#if IS_ENABLED(CONFIG_SUSPEND)
1035+/**
1036+ * amdgpu_acpi_is_s3_active
1037+ *
1038+ * @adev: amdgpu_device_pointer
1039+ *
1040+ * returns true if supported, false if not.
1041+ */
1042+bool amdgpu_acpi_is_s3_active(struct amdgpu_device *adev)
1043+{
1044+ return !(adev->flags & AMD_IS_APU) ||
1045+ (pm_suspend_target_state == PM_SUSPEND_MEM);
1046+}
1047+
10341048 /**
10351049 * amdgpu_acpi_is_s0ix_active
10361050 *
@@ -1040,11 +1054,24 @@ void amdgpu_acpi_detect(void) · 3 unmodified lines
10401054 */
10411055 bool amdgpu_acpi_is_s0ix_active(struct amdgpu_device *adev)
10421056 {
1043−#if IS_ENABLED(CONFIG_AMD_PMC) && IS_ENABLED(CONFIG_SUSPEND)
1044− if (acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0) {
1045− if (adev->flags & AMD_IS_APU)
1046− return pm_suspend_target_state == PM_SUSPEND_TO_IDLE;
1057+ if (!(adev->flags & AMD_IS_APU) ||
1058+ (pm_suspend_target_state != PM_SUSPEND_TO_IDLE))
1059+ return false;
1060+
1061+ if (!(acpi_gbl_FADT.flags & ACPI_FADT_LOW_POWER_S0)) {
1062+ dev_warn_once(adev->dev,
1063+ "Power consumption will be higher as BIOS has not been configured for suspend-to-idle.\n"
1064+ "To use suspend-to-idle change the sleep mode in BIOS setup.\n");
1065+ return false;
10471066 }
1048−#endif
1067+
1068+#if !IS_ENABLED(CONFIG_AMD_PMC)
1069+ dev_warn_once(adev->dev,
1070+ "Power consumption will be higher as the kernel has not been compiled with CONFIG_AMD_PMC.\n");
10491071 return false;
1072+#else
1073+ return true;
1074+#endif /* CONFIG_AMD_PMC */
10501075 }
1076+
1077+#endif /* CONFIG_SUSPEND */
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c+9−2
@@ -2246,13 +2246,20 @@ static void amdgpu_drv_delayed_reset_work_handler(struct work_struct *work) · 2245 unmodified lines
22462246 static int amdgpu_pmops_prepare(struct device *dev)
22472247 {
22482248 struct drm_device *drm_dev = dev_get_drvdata(dev);
2249+ struct amdgpu_device *adev = drm_to_adev(drm_dev);
22492250
22502251 /* Return a positive number here so
22512252 * DPM_FLAG_SMART_SUSPEND works properly
22522253 */
22532254 if (amdgpu_device_supports_boco(drm_dev))
2254− return pm_runtime_suspended(dev) &&
2255− pm_suspend_via_firmware();
2255+ return pm_runtime_suspended(dev);
2256+
2257+ /* if we will not support s3 or s2i for the device
2258+ * then skip suspend
2259+ */
2260+ if (!amdgpu_acpi_is_s0ix_active(adev) &&
2261+ !amdgpu_acpi_is_s3_active(adev))
2262+ return 1;
22562263
22572264 return 0;
22582265 }
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c+1−1
@@ -1904,7 +1904,7 @@ int amdgpu_copy_buffer(struct amdgpu_ring *ring, uint64_t src_offset, · 1903 unmodified lines
19041904 unsigned i;
19051905 int r;
19061906
1907− if (direct_submit && !ring->sched.ready) {
1907+ if (!direct_submit && !ring->sched.ready) {
19081908 DRM_ERROR("Trying to move memory with ring turned off.\n");
19091909 return -EINVAL;
19101910 }
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c+3−0
@@ -1140,6 +1140,9 @@ static void gmc_v10_0_get_clockgating_state(void *handle, u32 *flags) · 1139 unmodified lines
11401140 {
11411141 struct amdgpu_device *adev = (struct amdgpu_device *)handle;
11421142
1143+ if (adev->ip_versions[GC_HWIP][0] == IP_VERSION(10, 1, 3))
1144+ return;
1145+
11431146 adev->mmhub.funcs->get_clockgating(adev, flags);
11441147
11451148 if (adev->ip_versions[ATHUB_HWIP][0] >= IP_VERSION(2, 1, 0))
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c+8−8
@@ -570,32 +570,32 @@ static struct wm_table lpddr5_wm_table = { · 569 unmodified lines
570570 .wm_inst = WM_A,
571571 .wm_type = WM_TYPE_PSTATE_CHG,
572572 .pstate_latency_us = 11.65333,
573− .sr_exit_time_us = 7.95,
574− .sr_enter_plus_exit_time_us = 9,
573+ .sr_exit_time_us = 13.5,
574+ .sr_enter_plus_exit_time_us = 16.5,
575575 .valid = true,
576576 },
577577 {
578578 .wm_inst = WM_B,
579579 .wm_type = WM_TYPE_PSTATE_CHG,
580580 .pstate_latency_us = 11.65333,
581− .sr_exit_time_us = 9.82,
582− .sr_enter_plus_exit_time_us = 11.196,
581+ .sr_exit_time_us = 13.5,
582+ .sr_enter_plus_exit_time_us = 16.5,
583583 .valid = true,
584584 },
585585 {
586586 .wm_inst = WM_C,
587587 .wm_type = WM_TYPE_PSTATE_CHG,
588588 .pstate_latency_us = 11.65333,
589− .sr_exit_time_us = 9.89,
590− .sr_enter_plus_exit_time_us = 11.24,
589+ .sr_exit_time_us = 13.5,
590+ .sr_enter_plus_exit_time_us = 16.5,
591591 .valid = true,
592592 },
593593 {
594594 .wm_inst = WM_D,
595595 .wm_type = WM_TYPE_PSTATE_CHG,
596596 .pstate_latency_us = 11.65333,
597− .sr_exit_time_us = 9.748,
598− .sr_enter_plus_exit_time_us = 11.102,
597+ .sr_exit_time_us = 13.5,
598+ .sr_enter_plus_exit_time_us = 16.5,
599599 .valid = true,
600600 },
601601 }
drivers/gpu/drm/amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c+10−10
@@ -329,38 +329,38 @@ static struct clk_bw_params dcn31_bw_params = { · 328 unmodified lines
329329
330330 };
331331
332−static struct wm_table ddr4_wm_table = {
332+static struct wm_table ddr5_wm_table = {
333333 .entries = {
334334 {
335335 .wm_inst = WM_A,
336336 .wm_type = WM_TYPE_PSTATE_CHG,
337337 .pstate_latency_us = 11.72,
338− .sr_exit_time_us = 6.09,
339− .sr_enter_plus_exit_time_us = 7.14,
338+ .sr_exit_time_us = 9,
339+ .sr_enter_plus_exit_time_us = 11,
340340 .valid = true,
341341 },
342342 {
343343 .wm_inst = WM_B,
344344 .wm_type = WM_TYPE_PSTATE_CHG,
345345 .pstate_latency_us = 11.72,
346− .sr_exit_time_us = 10.12,
347− .sr_enter_plus_exit_time_us = 11.48,
346+ .sr_exit_time_us = 9,
347+ .sr_enter_plus_exit_time_us = 11,
348348 .valid = true,
349349 },
350350 {
351351 .wm_inst = WM_C,
352352 .wm_type = WM_TYPE_PSTATE_CHG,
353353 .pstate_latency_us = 11.72,
354− .sr_exit_time_us = 10.12,
355− .sr_enter_plus_exit_time_us = 11.48,
354+ .sr_exit_time_us = 9,
355+ .sr_enter_plus_exit_time_us = 11,
356356 .valid = true,
357357 },
358358 {
359359 .wm_inst = WM_D,
360360 .wm_type = WM_TYPE_PSTATE_CHG,
361361 .pstate_latency_us = 11.72,
362− .sr_exit_time_us = 10.12,
363− .sr_enter_plus_exit_time_us = 11.48,
362+ .sr_exit_time_us = 9,
363+ .sr_enter_plus_exit_time_us = 11,
364364 .valid = true,
365365 },
366366 }
@@ -687,7 +687,7 @@ void dcn31_clk_mgr_construct( · 320 unmodified lines
687687 if (ctx->dc_bios->integrated_info->memory_type == LpDdr5MemType) {
688688 dcn31_bw_params.wm_table = lpddr5_wm_table;
689689 } else {
690− dcn31_bw_params.wm_table = ddr4_wm_table;
690+ dcn31_bw_params.wm_table = ddr5_wm_table;
691691 }
692692 /* Saved clocks configured at boot for debug purposes */
693693 dcn31_dump_clk_registers(&clk_mgr->base.base.boot_snapshot, &clk_mgr->base.base, &log_info);
drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c+20−0
@@ -5597,6 +5597,26 @@ static bool retrieve_link_cap(struct dc_link *link) · 5596 unmodified lines
55975597 dp_hw_fw_revision.ieee_fw_rev,
55985598 sizeof(dp_hw_fw_revision.ieee_fw_rev));
55995599
5600+ /* Quirk for Apple MBP 2018 15" Retina panels: wrong DP_MAX_LINK_RATE */
5601+ {
5602+ uint8_t str_mbp_2018[] = { 101, 68, 21, 103, 98, 97 };
5603+ uint8_t fwrev_mbp_2018[] = { 7, 4 };
5604+ uint8_t fwrev_mbp_2018_vega[] = { 8, 4 };
5605+
5606+ /* We also check for the firmware revision as 16,1 models have an
5607+ * identical device id and are incorrectly quirked otherwise.
5608+ */
5609+ if ((link->dpcd_caps.sink_dev_id == 0x0010fa) &&
5610+ !memcmp(link->dpcd_caps.sink_dev_id_str, str_mbp_2018,
5611+ sizeof(str_mbp_2018)) &&
5612+ (!memcmp(link->dpcd_caps.sink_fw_revision, fwrev_mbp_2018,
5613+ sizeof(fwrev_mbp_2018)) ||
5614+ !memcmp(link->dpcd_caps.sink_fw_revision, fwrev_mbp_2018_vega,
5615+ sizeof(fwrev_mbp_2018_vega)))) {
5616+ link->reported_link_cap.link_rate = LINK_RATE_RBR2;
5617+ }
5618+ }
5619+
56005620 memset(&link->dpcd_caps.dsc_caps, '\0',
56015621 sizeof(link->dpcd_caps.dsc_caps));
56025622 memset(&link->dpcd_caps.fec_cap, '\0', sizeof(link->dpcd_caps.fec_cap));
drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c+0−5
@@ -1608,11 +1608,6 @@ static enum dc_status apply_single_controller_ctx_to_hw( · 1607 unmodified lines
16081608 pipe_ctx->stream_res.stream_enc,
16091609 pipe_ctx->stream_res.tg->inst);
16101610
1611− if (dc_is_embedded_signal(pipe_ctx->stream->signal) &&
1612− pipe_ctx->stream_res.stream_enc->funcs->reset_fifo)
1613− pipe_ctx->stream_res.stream_enc->funcs->reset_fifo(
1614− pipe_ctx->stream_res.stream_enc);
1615−
16161611 if (dc_is_dp_signal(pipe_ctx->stream->signal))
16171612 dp_source_sequence_trace(link, DPCD_SOURCE_SEQ_AFTER_CONNECT_DIG_FE_OTG);
16181613
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.c+0−15
@@ -902,19 +902,6 @@ void enc1_stream_encoder_stop_dp_info_packets( · 901 unmodified lines
902902
903903 }
904904
905−void enc1_stream_encoder_reset_fifo(
906− struct stream_encoder *enc)
907−{
908− struct dcn10_stream_encoder *enc1 = DCN10STRENC_FROM_STRENC(enc);
909−
910− /* set DIG_START to 0x1 to reset FIFO */
911− REG_UPDATE(DIG_FE_CNTL, DIG_START, 1);
912− udelay(100);
913−
914− /* write 0 to take the FIFO out of reset */
915− REG_UPDATE(DIG_FE_CNTL, DIG_START, 0);
916−}
917−
918905 void enc1_stream_encoder_dp_blank(
919906 struct dc_link *link,
920907 struct stream_encoder *enc)
@@ -1600,8 +1587,6 @@ static const struct stream_encoder_funcs dcn10_str_enc_funcs = { · 679 unmodified lines
16001587 enc1_stream_encoder_send_immediate_sdp_message,
16011588 .stop_dp_info_packets =
16021589 enc1_stream_encoder_stop_dp_info_packets,
1603− .reset_fifo =
1604− enc1_stream_encoder_reset_fifo,
16051590 .dp_blank =
16061591 enc1_stream_encoder_dp_blank,
16071592 .dp_unblank =
drivers/gpu/drm/amd/display/dc/dcn10/dcn10_stream_encoder.h+0−3
@@ -626,9 +626,6 @@ void enc1_stream_encoder_send_immediate_sdp_message( · 625 unmodified lines
626626 void enc1_stream_encoder_stop_dp_info_packets(
627627 struct stream_encoder *enc);
628628
629−void enc1_stream_encoder_reset_fifo(
630− struct stream_encoder *enc);
631−
632629 void enc1_stream_encoder_dp_blank(
633630 struct dc_link *link,
634631 struct stream_encoder *enc);
drivers/gpu/drm/amd/display/dc/dcn20/dcn20_stream_encoder.c+0−2
@@ -593,8 +593,6 @@ static const struct stream_encoder_funcs dcn20_str_enc_funcs = { · 592 unmodified lines
593593 enc1_stream_encoder_send_immediate_sdp_message,
594594 .stop_dp_info_packets =
595595 enc1_stream_encoder_stop_dp_info_packets,
596− .reset_fifo =
597− enc1_stream_encoder_reset_fifo,
598596 .dp_blank =
599597 enc1_stream_encoder_dp_blank,
600598 .dp_unblank =
drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dio_stream_encoder.c+0−2
@@ -789,8 +789,6 @@ static const struct stream_encoder_funcs dcn30_str_enc_funcs = { · 788 unmodified lines
789789 enc3_stream_encoder_update_dp_info_packets,
790790 .stop_dp_info_packets =
791791 enc1_stream_encoder_stop_dp_info_packets,
792− .reset_fifo =
793− enc1_stream_encoder_reset_fifo,
794792 .dp_blank =
795793 enc1_stream_encoder_dp_blank,
796794 .dp_unblank =
drivers/gpu/drm/amd/display/dc/inc/hw/stream_encoder.h+0−4
@@ -164,10 +164,6 @@ struct stream_encoder_funcs { · 163 unmodified lines
164164 void (*stop_dp_info_packets)(
165165 struct stream_encoder *enc);
166166
167− void (*reset_fifo)(
168− struct stream_encoder *enc
169− );
170−
171167 void (*dp_blank)(
172168 struct dc_link *link,
173169 struct stream_encoder *enc);
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c+3−3
@@ -3696,14 +3696,14 @@ static ssize_t sienna_cichlid_get_gpu_metrics(struct smu_context *smu, · 3695 unmodified lines
36963696
36973697 static int sienna_cichlid_enable_mgpu_fan_boost(struct smu_context *smu)
36983698 {
3699− struct smu_table_context *table_context = &smu->smu_table;
3700− PPTable_t *smc_pptable = table_context->driver_pptable;
3699+ uint16_t *mgpu_fan_boost_limit_rpm;
37013700
3701+ GET_PPTABLE_MEMBER(MGpuFanBoostLimitRpm, &mgpu_fan_boost_limit_rpm);
37023702 /*
37033703 * Skip the MGpuFanBoost setting for those ASICs
37043704 * which do not support it
37053705 */
3706− if (!smc_pptable->MGpuFanBoostLimitRpm)
3706+ if (*mgpu_fan_boost_limit_rpm == 0)
37073707 return 0;
37083708
37093709 return smu_cmn_send_smc_msg_with_param(smu,
drivers/gpu/drm/i915/display/intel_overlay.c+3−0
@@ -959,6 +959,9 @@ static int check_overlay_dst(struct intel_overlay *overlay, · 958 unmodified lines
959959 const struct intel_crtc_state *pipe_config =
960960 overlay->crtc->config;
961961
962+ if (rec->dst_height == 0 || rec->dst_width == 0)
963+ return -EINVAL;
964+
962965 if (rec->dst_x < pipe_config->pipe_src_w &&
963966 rec->dst_x + rec->dst_width <= pipe_config->pipe_src_w &&
964967 rec->dst_y < pipe_config->pipe_src_h &&
drivers/gpu/drm/i915/display/intel_tc.c+2−1
@@ -345,10 +345,11 @@ static bool icl_tc_phy_status_complete(struct intel_digital_port *dig_port) · 344 unmodified lines
345345 static bool adl_tc_phy_status_complete(struct intel_digital_port *dig_port)
346346 {
347347 struct drm_i915_private *i915 = to_i915(dig_port->base.base.dev);
348+ enum tc_port tc_port = intel_port_to_tc(i915, dig_port->base.port);
348349 struct intel_uncore *uncore = &i915->uncore;
349350 u32 val;
350351
351− val = intel_uncore_read(uncore, TCSS_DDI_STATUS(dig_port->tc_phy_fia_idx));
352+ val = intel_uncore_read(uncore, TCSS_DDI_STATUS(tc_port));
352353 if (val == 0xffffffff) {
353354 drm_dbg_kms(&i915->drm,
354355 "Port %s: PHY in TCCOLD, assuming not complete\n",
drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c+7−2
@@ -2505,9 +2505,14 @@ static int eb_pin_timeline(struct i915_execbuffer *eb, struct intel_context *ce, · 2504 unmodified lines
25052505 timeout) < 0) {
25062506 i915_request_put(rq);
25072507
2508− tl = intel_context_timeline_lock(ce);
2508+ /*
2509+ * Error path, cannot use intel_context_timeline_lock as
2510+ * that is user interruptable and this clean up step
2511+ * must be done.
2512+ */
2513+ mutex_lock(&ce->timeline->mutex);
25092514 intel_context_exit(ce);
2510− intel_context_timeline_unlock(tl);
2515+ mutex_unlock(&ce->timeline->mutex);
25112516
25122517 if (nonblock)
25132518 return -EWOULDBLOCK;
drivers/gpu/drm/i915/gt/uc/intel_guc.h+5−0
@@ -206,6 +206,11 @@ struct intel_guc { · 205 unmodified lines
206206 * context usage for overflows.
207207 */
208208 struct delayed_work work;
209+
210+ /**
211+ * @shift: Right shift value for the gpm timestamp
212+ */
213+ u32 shift;
209214 } timestamp;
210215
211216 #ifdef CONFIG_DRM_I915_SELFTEST
drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c+97−17
@@ -1113,6 +1113,19 @@ __extend_last_switch(struct intel_guc *guc, u64 *prev_start, u32 new_start) · 1112 unmodified lines
11131113 if (new_start == lower_32_bits(*prev_start))
11141114 return;
11151115
1116+ /*
1117+ * When gt is unparked, we update the gt timestamp and start the ping
1118+ * worker that updates the gt_stamp every POLL_TIME_CLKS. As long as gt
1119+ * is unparked, all switched in contexts will have a start time that is
1120+ * within +/- POLL_TIME_CLKS of the most recent gt_stamp.
1121+ *
1122+ * If neither gt_stamp nor new_start has rolled over, then the
1123+ * gt_stamp_hi does not need to be adjusted, however if one of them has
1124+ * rolled over, we need to adjust gt_stamp_hi accordingly.
1125+ *
1126+ * The below conditions address the cases of new_start rollover and
1127+ * gt_stamp_last rollover respectively.
1128+ */
11161129 if (new_start < gt_stamp_last &&
11171130 (new_start - gt_stamp_last) <= POLL_TIME_CLKS)
11181131 gt_stamp_hi++;
@@ -1124,17 +1137,45 @@ __extend_last_switch(struct intel_guc *guc, u64 *prev_start, u32 new_start) · 5 unmodified lines
11241137 *prev_start = ((u64)gt_stamp_hi << 32) | new_start;
11251138 }
11261139
1127−static void guc_update_engine_gt_clks(struct intel_engine_cs *engine)
1140+/*
1141+ * GuC updates shared memory and KMD reads it. Since this is not synchronized,
1142+ * we run into a race where the value read is inconsistent. Sometimes the
1143+ * inconsistency is in reading the upper MSB bytes of the last_in value when
1144+ * this race occurs. 2 types of cases are seen - upper 8 bits are zero and upper
1145+ * 24 bits are zero. Since these are non-zero values, it is non-trivial to
1146+ * determine validity of these values. Instead we read the values multiple times
1147+ * until they are consistent. In test runs, 3 attempts results in consistent
1148+ * values. The upper bound is set to 6 attempts and may need to be tuned as per
1149+ * any new occurences.
1150+ */
1151+static void __get_engine_usage_record(struct intel_engine_cs *engine,
1152+ u32 *last_in, u32 *id, u32 *total)
11281153 {
11291154 struct guc_engine_usage_record *rec = intel_guc_engine_usage(engine);
1155+ int i = 0;
1156+
1157+ do {
1158+ *last_in = READ_ONCE(rec->last_switch_in_stamp);
1159+ *id = READ_ONCE(rec->current_context_index);
1160+ *total = READ_ONCE(rec->total_runtime);
1161+
1162+ if (READ_ONCE(rec->last_switch_in_stamp) == *last_in &&
1163+ READ_ONCE(rec->current_context_index) == *id &&
1164+ READ_ONCE(rec->total_runtime) == *total)
1165+ break;
1166+ } while (++i < 6);
1167+}
1168+
1169+static void guc_update_engine_gt_clks(struct intel_engine_cs *engine)
1170+{
11301171 struct intel_engine_guc_stats *stats = &engine->stats.guc;
11311172 struct intel_guc *guc = &engine->gt->uc.guc;
1132− u32 last_switch = rec->last_switch_in_stamp;
1133− u32 ctx_id = rec->current_context_index;
1134− u32 total = rec->total_runtime;
1173+ u32 last_switch, ctx_id, total;
11351174
11361175 lockdep_assert_held(&guc->timestamp.lock);
11371176
1177+ __get_engine_usage_record(engine, &last_switch, &ctx_id, &total);
1178+
11381179 stats->running = ctx_id != ~0U && last_switch;
11391180 if (stats->running)
11401181 __extend_last_switch(guc, &stats->start_gt_clk, last_switch);
@@ -1149,23 +1190,51 @@ static void guc_update_engine_gt_clks(struct intel_engine_cs *engine) · 8 unmodified lines
11491190 }
11501191 }
11511192
1152−static void guc_update_pm_timestamp(struct intel_guc *guc,
1153− struct intel_engine_cs *engine,
1154− ktime_t *now)
1193+static u32 gpm_timestamp_shift(struct intel_gt *gt)
1194+{
1195+ intel_wakeref_t wakeref;
1196+ u32 reg, shift;
1197+
1198+ with_intel_runtime_pm(gt->uncore->rpm, wakeref)
1199+ reg = intel_uncore_read(gt->uncore, RPM_CONFIG0);
1200+
1201+ shift = (reg & GEN10_RPM_CONFIG0_CTC_SHIFT_PARAMETER_MASK) >>
1202+ GEN10_RPM_CONFIG0_CTC_SHIFT_PARAMETER_SHIFT;
1203+
1204+ return 3 - shift;
1205+}
1206+
1207+static u64 gpm_timestamp(struct intel_gt *gt)
1208+{
1209+ u32 lo, hi, old_hi, loop = 0;
1210+
1211+ hi = intel_uncore_read(gt->uncore, MISC_STATUS1);
1212+ do {
1213+ lo = intel_uncore_read(gt->uncore, MISC_STATUS0);
1214+ old_hi = hi;
1215+ hi = intel_uncore_read(gt->uncore, MISC_STATUS1);
1216+ } while (old_hi != hi && loop++ < 2);
1217+
1218+ return ((u64)hi << 32) | lo;
1219+}
1220+
1221+static void guc_update_pm_timestamp(struct intel_guc *guc, ktime_t *now)
11551222 {
1156− u32 gt_stamp_now, gt_stamp_hi;
1223+ struct intel_gt *gt = guc_to_gt(guc);
1224+ u32 gt_stamp_lo, gt_stamp_hi;
1225+ u64 gpm_ts;
11571226
11581227 lockdep_assert_held(&guc->timestamp.lock);
11591228
11601229 gt_stamp_hi = upper_32_bits(guc->timestamp.gt_stamp);
1161− gt_stamp_now = intel_uncore_read(engine->uncore,
1162− RING_TIMESTAMP(engine->mmio_base));
1230+ gpm_ts = gpm_timestamp(gt) >> guc->timestamp.shift;
1231+ gt_stamp_lo = lower_32_bits(gpm_ts);
11631232 *now = ktime_get();
11641233
1165− if (gt_stamp_now < lower_32_bits(guc->timestamp.gt_stamp))
1234+ if (gt_stamp_lo < lower_32_bits(guc->timestamp.gt_stamp))
11661235 gt_stamp_hi++;
11671236
1168− guc->timestamp.gt_stamp = ((u64)gt_stamp_hi << 32) | gt_stamp_now;
1237+ guc->timestamp.gt_stamp = ((u64)gt_stamp_hi << 32) | gt_stamp_lo;
11691238 }
11701239
11711240 /*
@@ -1208,8 +1277,12 @@ static ktime_t guc_engine_busyness(struct intel_engine_cs *engine, ktime_t *now) · 36 unmodified lines
12081277 if (!in_reset && intel_gt_pm_get_if_awake(gt)) {
12091278 stats_saved = *stats;
12101279 gt_stamp_saved = guc->timestamp.gt_stamp;
1280+ /*
1281+ * Update gt_clks, then gt timestamp to simplify the 'gt_stamp -
1282+ * start_gt_clk' calculation below for active engines.
1283+ */
12111284 guc_update_engine_gt_clks(engine);
1212− guc_update_pm_timestamp(guc, engine, now);
1285+ guc_update_pm_timestamp(guc, now);
12131286 intel_gt_pm_put_async(gt);
12141287 if (i915_reset_count(gpu_error) != reset_count) {
12151288 *stats = stats_saved;
@@ -1241,8 +1314,8 @@ static void __reset_guc_busyness_stats(struct intel_guc *guc) · 25 unmodified lines
12411314
12421315 spin_lock_irqsave(&guc->timestamp.lock, flags);
12431316
1317+ guc_update_pm_timestamp(guc, &unused);
12441318 for_each_engine(engine, gt, id) {
1245− guc_update_pm_timestamp(guc, engine, &unused);
12461319 guc_update_engine_gt_clks(engine);
12471320 engine->stats.guc.prev_total = 0;
12481321 }
@@ -1259,10 +1332,11 @@ static void __update_guc_busyness_stats(struct intel_guc *guc) · 10 unmodified lines
12591332 ktime_t unused;
12601333
12611334 spin_lock_irqsave(&guc->timestamp.lock, flags);
1262− for_each_engine(engine, gt, id) {
1263− guc_update_pm_timestamp(guc, engine, &unused);
1335+
1336+ guc_update_pm_timestamp(guc, &unused);
1337+ for_each_engine(engine, gt, id)
12641338 guc_update_engine_gt_clks(engine);
1265− }
1339+
12661340 spin_unlock_irqrestore(&guc->timestamp.lock, flags);
12671341 }
12681342
@@ -1335,10 +1409,15 @@ void intel_guc_busyness_park(struct intel_gt *gt) · 66 unmodified lines
13351409 void intel_guc_busyness_unpark(struct intel_gt *gt)
13361410 {
13371411 struct intel_guc *guc = &gt->uc.guc;
1412+ unsigned long flags;
1413+ ktime_t unused;
13381414
13391415 if (!guc_submission_initialized(guc))
13401416 return;
13411417
1418+ spin_lock_irqsave(&guc->timestamp.lock, flags);
1419+ guc_update_pm_timestamp(guc, &unused);
1420+ spin_unlock_irqrestore(&guc->timestamp.lock, flags);
13421421 mod_delayed_work(system_highpri_wq, &guc->timestamp.work,
13431422 guc->timestamp.ping_delay);
13441423 }
@@ -1783,6 +1862,7 @@ int intel_guc_submission_init(struct intel_guc *guc) · 438 unmodified lines
17831862 spin_lock_init(&guc->timestamp.lock);
17841863 INIT_DELAYED_WORK(&guc->timestamp.work, guc_timestamp_ping);
17851864 guc->timestamp.ping_delay = (POLL_TIME_CLKS / gt->clock_frequency + 1) * HZ;
1865+ guc->timestamp.shift = gpm_timestamp_shift(gt);
17861866
17871867 return 0;
17881868 }
drivers/gpu/drm/i915/i915_gpu_error.c+1−1
@@ -1522,7 +1522,7 @@ capture_engine(struct intel_engine_cs *engine, · 1521 unmodified lines
15221522 struct i915_request *rq = NULL;
15231523 unsigned long flags;
15241524
1525− ee = intel_engine_coredump_alloc(engine, GFP_KERNEL);
1525+ ee = intel_engine_coredump_alloc(engine, ALLOW_FAIL);
15261526 if (!ee)
15271527 return NULL;
15281528
drivers/gpu/drm/i915/i915_reg.h+2−1
@@ -2684,7 +2684,8 @@ static inline bool i915_mmio_reg_valid(i915_reg_t reg) · 2683 unmodified lines
26842684 #define RING_WAIT (1 << 11) /* gen3+, PRBx_CTL */
26852685 #define RING_WAIT_SEMAPHORE (1 << 10) /* gen6+ */
26862686
2687−#define GUCPMTIMESTAMP _MMIO(0xC3E8)
2687+#define MISC_STATUS0 _MMIO(0xA500)
2688+#define MISC_STATUS1 _MMIO(0xA504)
26882689
26892690 /* There are 16 64-bit CS General Purpose Registers per-engine on Gen8+ */
26902691 #define GEN8_RING_CS_GPR(base, n) _MMIO((base) + 0x600 + (n) * 8)
drivers/gpu/drm/kmb/kmb_plane.c+0−6
@@ -158,12 +158,6 @@ static void kmb_plane_atomic_disable(struct drm_plane *plane, · 157 unmodified lines
158158 case LAYER_1:
159159 kmb->plane_status[plane_id].ctrl = LCD_CTRL_VL2_ENABLE;
160160 break;
161− case LAYER_2:
162− kmb->plane_status[plane_id].ctrl = LCD_CTRL_GL1_ENABLE;
163− break;
164− case LAYER_3:
165− kmb->plane_status[plane_id].ctrl = LCD_CTRL_GL2_ENABLE;
166− break;
167161 }
168162
169163 kmb->plane_status[plane_id].disable = true;
drivers/gpu/drm/mxsfb/mxsfb_kms.c+5−1
@@ -361,7 +361,11 @@ static void mxsfb_crtc_atomic_enable(struct drm_crtc *crtc, · 360 unmodified lines
361361 bridge_state =
362362 drm_atomic_get_new_bridge_state(state,
363363 mxsfb->bridge);
364− bus_format = bridge_state->input_bus_cfg.format;
364+ if (!bridge_state)
365+ bus_format = MEDIA_BUS_FMT_FIXED;
366+ else
367+ bus_format = bridge_state->input_bus_cfg.format;
368+
365369 if (bus_format == MEDIA_BUS_FMT_FIXED) {
366370 dev_warn_once(drm->dev,
367371 "Bridge does not provide bus format, assuming MEDIA_BUS_FMT_RGB888_1X24.\n"
drivers/gpu/drm/nouveau/nvkm/subdev/bios/base.c+1−1
@@ -38,7 +38,7 @@ nvbios_addr(struct nvkm_bios *bios, u32 *addr, u8 size) · 37 unmodified lines
3838 *addr += bios->imaged_addr;
3939 }
4040
41− if (unlikely(*addr + size >= bios->size)) {
41+ if (unlikely(*addr + size > bios->size)) {
4242 nvkm_error(&bios->subdev, "OOB %d %08x %08x\n", size, p, *addr);
4343 return false;
4444 }
drivers/infiniband/core/cm.c+1−1
@@ -3322,7 +3322,7 @@ static int cm_lap_handler(struct cm_work *work) · 3321 unmodified lines
33223322 ret = cm_init_av_by_path(param->alternate_path, NULL, &alt_av);
33233323 if (ret) {
33243324 rdma_destroy_ah_attr(&ah_attr);
3325− return -EINVAL;
3325+ goto deref;
33263326 }
33273327
33283328 spin_lock_irq(&cm_id_priv->lock);
drivers/infiniband/core/cma.c+12−10
@@ -67,8 +67,8 @@ static const char * const cma_events[] = { · 66 unmodified lines
6767 [RDMA_CM_EVENT_TIMEWAIT_EXIT] = "timewait exit",
6868 };
6969
70−static void cma_set_mgid(struct rdma_id_private *id_priv, struct sockaddr *addr,
71− union ib_gid *mgid);
70+static void cma_iboe_set_mgid(struct sockaddr *addr, union ib_gid *mgid,
71+ enum ib_gid_type gid_type);
7272
7373 const char *__attribute_const__ rdma_event_msg(enum rdma_cm_event_type event)
7474 {
@@ -1846,17 +1846,19 @@ static void destroy_mc(struct rdma_id_private *id_priv, · 1771 unmodified lines
18461846 if (dev_addr->bound_dev_if)
18471847 ndev = dev_get_by_index(dev_addr->net,
18481848 dev_addr->bound_dev_if);
1849− if (ndev) {
1849+ if (ndev && !send_only) {
1850+ enum ib_gid_type gid_type;
18501851 union ib_gid mgid;
18511852
1852− cma_set_mgid(id_priv, (struct sockaddr *)&mc->addr,
1853− &mgid);
1854−
1855− if (!send_only)
1856− cma_igmp_send(ndev, &mgid, false);
1857−
1858− dev_put(ndev);
1853+ gid_type = id_priv->cma_dev->default_gid_type
1854+ [id_priv->id.port_num -
1855+ rdma_start_port(
1856+ id_priv->cma_dev->device)];
1857+ cma_iboe_set_mgid((struct sockaddr *)&mc->addr, &mgid,
1858+ gid_type);
1859+ cma_igmp_send(ndev, &mgid, false);
18591860 }
1861+ dev_put(ndev);
18601862
18611863 cancel_work_sync(&mc->iboe_join.work);
18621864 }
drivers/infiniband/core/ucma.c+23−11
@@ -95,6 +95,7 @@ struct ucma_context { · 94 unmodified lines
9595 u64 uid;
9696
9797 struct list_head list;
98+ struct list_head mc_list;
9899 struct work_struct close_work;
99100 };
100101
@@ -105,6 +106,7 @@ struct ucma_multicast { · 4 unmodified lines
105106
106107 u64 uid;
107108 u8 join_state;
109+ struct list_head list;
108110 struct sockaddr_storage addr;
109111 };
110112
@@ -198,6 +200,7 @@ static struct ucma_context *ucma_alloc_ctx(struct ucma_file *file) · 87 unmodified lines
198200
199201 INIT_WORK(&ctx->close_work, ucma_close_id);
200202 init_completion(&ctx->comp);
203+ INIT_LIST_HEAD(&ctx->mc_list);
201204 /* So list_del() will work if we don't do ucma_finish_ctx() */
202205 INIT_LIST_HEAD(&ctx->list);
203206 ctx->file = file;
@@ -484,19 +487,19 @@ err1: · 280 unmodified lines
484487
485488 static void ucma_cleanup_multicast(struct ucma_context *ctx)
486489 {
487− struct ucma_multicast *mc;
488− unsigned long index;
490+ struct ucma_multicast *mc, *tmp;
489491
490− xa_for_each(&multicast_table, index, mc) {
491− if (mc->ctx != ctx)
492− continue;
492+ xa_lock(&multicast_table);
493+ list_for_each_entry_safe(mc, tmp, &ctx->mc_list, list) {
494+ list_del(&mc->list);
493495 /*
494496 * At this point mc->ctx->ref is 0 so the mc cannot leave the
495497 * lock on the reader and this is enough serialization
496498 */
497− xa_erase(&multicast_table, index);
499+ __xa_erase(&multicast_table, mc->id);
498500 kfree(mc);
499501 }
502+ xa_unlock(&multicast_table);
500503 }
501504
502505 static void ucma_cleanup_mc_events(struct ucma_multicast *mc)
@@ -1469,12 +1472,16 @@ static ssize_t ucma_process_join(struct ucma_file *file, · 966 unmodified lines
14691472 mc->uid = cmd->uid;
14701473 memcpy(&mc->addr, addr, cmd->addr_size);
14711474
1472− if (xa_alloc(&multicast_table, &mc->id, NULL, xa_limit_32b,
1475+ xa_lock(&multicast_table);
1476+ if (__xa_alloc(&multicast_table, &mc->id, NULL, xa_limit_32b,
14731477 GFP_KERNEL)) {
14741478 ret = -ENOMEM;
14751479 goto err_free_mc;
14761480 }
14771481
1482+ list_add_tail(&mc->list, &ctx->mc_list);
1483+ xa_unlock(&multicast_table);
1484+
14781485 mutex_lock(&ctx->mutex);
14791486 ret = rdma_join_multicast(ctx->cm_id, (struct sockaddr *)&mc->addr,
14801487 join_state, mc);
@@ -1500,8 +1507,11 @@ err_leave_multicast: · 19 unmodified lines
15001507 mutex_unlock(&ctx->mutex);
15011508 ucma_cleanup_mc_events(mc);
15021509 err_xa_erase:
1503− xa_erase(&multicast_table, mc->id);
1510+ xa_lock(&multicast_table);
1511+ list_del(&mc->list);
1512+ __xa_erase(&multicast_table, mc->id);
15041513 err_free_mc:
1514+ xa_unlock(&multicast_table);
15051515 kfree(mc);
15061516 err_put_ctx:
15071517 ucma_put_ctx(ctx);
@@ -1569,15 +1579,17 @@ static ssize_t ucma_leave_multicast(struct ucma_file *file, · 61 unmodified lines
15691579 mc = ERR_PTR(-EINVAL);
15701580 else if (!refcount_inc_not_zero(&mc->ctx->ref))
15711581 mc = ERR_PTR(-ENXIO);
1572− else
1573− __xa_erase(&multicast_table, mc->id);
1574− xa_unlock(&multicast_table);
15751582
15761583 if (IS_ERR(mc)) {
1584+ xa_unlock(&multicast_table);
15771585 ret = PTR_ERR(mc);
15781586 goto out;
15791587 }
15801588
1589+ list_del(&mc->list);
1590+ __xa_erase(&multicast_table, mc->id);
1591+ xa_unlock(&multicast_table);
1592+
15811593 mutex_lock(&mc->ctx->mutex);
15821594 rdma_leave_multicast(mc->ctx->cm_id, (struct sockaddr *) &mc->addr);
15831595 mutex_unlock(&mc->ctx->mutex);
drivers/infiniband/hw/hfi1/ipoib.h+1−1
@@ -55,7 +55,7 @@ union hfi1_ipoib_flow { · 54 unmodified lines
5555 */
5656 struct ipoib_txreq {
5757 struct sdma_txreq txreq;
58− struct hfi1_sdma_header sdma_hdr;
58+ struct hfi1_sdma_header *sdma_hdr;
5959 int sdma_status;
6060 int complete;
6161 struct hfi1_ipoib_dev_priv *priv;
drivers/infiniband/hw/hfi1/ipoib_main.c+15−12
@@ -22,26 +22,35 @@ static int hfi1_ipoib_dev_init(struct net_device *dev) · 21 unmodified lines
2222 int ret;
2323
2424 dev->tstats = netdev_alloc_pcpu_stats(struct pcpu_sw_netstats);
25+ if (!dev->tstats)
26+ return -ENOMEM;
2527
2628 ret = priv->netdev_ops->ndo_init(dev);
2729 if (ret)
28− return ret;
30+ goto out_ret;
2931
3032 ret = hfi1_netdev_add_data(priv->dd,
3133 qpn_from_mac(priv->netdev->dev_addr),
3234 dev);
3335 if (ret < 0) {
3436 priv->netdev_ops->ndo_uninit(dev);
35− return ret;
37+ goto out_ret;
3638 }
3739
3840 return 0;
41+out_ret:
42+ free_percpu(dev->tstats);
43+ dev->tstats = NULL;
44+ return ret;
3945 }
4046
4147 static void hfi1_ipoib_dev_uninit(struct net_device *dev)
4248 {
4349 struct hfi1_ipoib_dev_priv *priv = hfi1_ipoib_priv(dev);
4450
51+ free_percpu(dev->tstats);
52+ dev->tstats = NULL;
53+
4554 hfi1_netdev_remove_data(priv->dd, qpn_from_mac(priv->netdev->dev_addr));
4655
4756 priv->netdev_ops->ndo_uninit(dev);
@@ -166,12 +175,7 @@ static void hfi1_ipoib_netdev_dtor(struct net_device *dev) · 118 unmodified lines
166175 hfi1_ipoib_rxq_deinit(priv->netdev);
167176
168177 free_percpu(dev->tstats);
169−}
170−
171−static void hfi1_ipoib_free_rdma_netdev(struct net_device *dev)
172−{
173− hfi1_ipoib_netdev_dtor(dev);
174− free_netdev(dev);
178+ dev->tstats = NULL;
175179 }
176180
177181 static void hfi1_ipoib_set_id(struct net_device *dev, int id)
@@ -211,24 +215,23 @@ static int hfi1_ipoib_setup_rn(struct ib_device *device, · 33 unmodified lines
211215 priv->port_num = port_num;
212216 priv->netdev_ops = netdev->netdev_ops;
213217
214− netdev->netdev_ops = &hfi1_ipoib_netdev_ops;
215−
216218 ib_query_pkey(device, port_num, priv->pkey_index, &priv->pkey);
217219
218220 rc = hfi1_ipoib_txreq_init(priv);
219221 if (rc) {
220222 dd_dev_err(dd, "IPoIB netdev TX init - failed(%d)\n", rc);
221− hfi1_ipoib_free_rdma_netdev(netdev);
222223 return rc;
223224 }
224225
225226 rc = hfi1_ipoib_rxq_init(netdev);
226227 if (rc) {
227228 dd_dev_err(dd, "IPoIB netdev RX init - failed(%d)\n", rc);
228− hfi1_ipoib_free_rdma_netdev(netdev);
229+ hfi1_ipoib_txreq_deinit(priv);
229230 return rc;
230231 }
231232
233+ netdev->netdev_ops = &hfi1_ipoib_netdev_ops;
234+
232235 netdev->priv_destructor = hfi1_ipoib_netdev_dtor;
233236 netdev->needs_free_netdev = true;
234237
drivers/infiniband/hw/hfi1/ipoib_tx.c+26−12
@@ -122,7 +122,7 @@ static void hfi1_ipoib_free_tx(struct ipoib_txreq *tx, int budget) · 121 unmodified lines
122122 dd_dev_warn(priv->dd,
123123 "%s: Status = 0x%x pbc 0x%llx txq = %d sde = %d\n",
124124 __func__, tx->sdma_status,
125− le64_to_cpu(tx->sdma_hdr.pbc), tx->txq->q_idx,
125+ le64_to_cpu(tx->sdma_hdr->pbc), tx->txq->q_idx,
126126 tx->txq->sde->this_idx);
127127 }
128128
@@ -231,7 +231,7 @@ static int hfi1_ipoib_build_tx_desc(struct ipoib_txreq *tx, · 102 unmodified lines
231231 {
232232 struct hfi1_devdata *dd = txp->dd;
233233 struct sdma_txreq *txreq = &tx->txreq;
234− struct hfi1_sdma_header *sdma_hdr = &tx->sdma_hdr;
234+ struct hfi1_sdma_header *sdma_hdr = tx->sdma_hdr;
235235 u16 pkt_bytes =
236236 sizeof(sdma_hdr->pbc) + (txp->hdr_dwords << 2) + tx->skb->len;
237237 int ret;
@@ -256,7 +256,7 @@ static void hfi1_ipoib_build_ib_tx_headers(struct ipoib_txreq *tx, · 18 unmodified lines
256256 struct ipoib_txparms *txp)
257257 {
258258 struct hfi1_ipoib_dev_priv *priv = tx->txq->priv;
259− struct hfi1_sdma_header *sdma_hdr = &tx->sdma_hdr;
259+ struct hfi1_sdma_header *sdma_hdr = tx->sdma_hdr;
260260 struct sk_buff *skb = tx->skb;
261261 struct hfi1_pportdata *ppd = ppd_from_ibp(txp->ibp);
262262 struct rdma_ah_attr *ah_attr = txp->ah_attr;
@@ -483,7 +483,7 @@ static int hfi1_ipoib_send_dma_single(struct net_device *dev, · 220 unmodified lines
483483 if (likely(!ret)) {
484484 tx_ok:
485485 trace_sdma_output_ibhdr(txq->priv->dd,
486− &tx->sdma_hdr.hdr,
486+ &tx->sdma_hdr->hdr,
487487 ib_is_sc5(txp->flow.sc5));
488488 hfi1_ipoib_check_queue_depth(txq);
489489 return NETDEV_TX_OK;
@@ -547,7 +547,7 @@ static int hfi1_ipoib_send_dma_list(struct net_device *dev, · 57 unmodified lines
547547 hfi1_ipoib_check_queue_depth(txq);
548548
549549 trace_sdma_output_ibhdr(txq->priv->dd,
550− &tx->sdma_hdr.hdr,
550+ &tx->sdma_hdr->hdr,
551551 ib_is_sc5(txp->flow.sc5));
552552
553553 if (!netdev_xmit_more())
@@ -683,7 +683,8 @@ int hfi1_ipoib_txreq_init(struct hfi1_ipoib_dev_priv *priv) · 129 unmodified lines
683683 {
684684 struct net_device *dev = priv->netdev;
685685 u32 tx_ring_size, tx_item_size;
686− int i;
686+ struct hfi1_ipoib_circ_buf *tx_ring;
687+ int i, j;
687688
688689 /*
689690 * Ring holds 1 less than tx_ring_size
@@ -701,7 +702,9 @@ int hfi1_ipoib_txreq_init(struct hfi1_ipoib_dev_priv *priv) · 11 unmodified lines
701702
702703 for (i = 0; i < dev->num_tx_queues; i++) {
703704 struct hfi1_ipoib_txq *txq = &priv->txqs[i];
705+ struct ipoib_txreq *tx;
704706
707+ tx_ring = &txq->tx_ring;
705708 iowait_init(&txq->wait,
706709 0,
707710 hfi1_ipoib_flush_txq,
@@ -725,14 +728,19 @@ int hfi1_ipoib_txreq_init(struct hfi1_ipoib_dev_priv *priv) · 17 unmodified lines
725728 priv->dd->node);
726729
727730 txq->tx_ring.items =
728− kcalloc_node(tx_ring_size, tx_item_size,
729− GFP_KERNEL, priv->dd->node);
731+ kvzalloc_node(array_size(tx_ring_size, tx_item_size),
732+ GFP_KERNEL, priv->dd->node);
730733 if (!txq->tx_ring.items)
731734 goto free_txqs;
732735
733736 txq->tx_ring.max_items = tx_ring_size;
734− txq->tx_ring.shift = ilog2(tx_ring_size);
737+ txq->tx_ring.shift = ilog2(tx_item_size);
735738 txq->tx_ring.avail = hfi1_ipoib_ring_hwat(txq);
739+ tx_ring = &txq->tx_ring;
740+ for (j = 0; j < tx_ring_size; j++)
741+ hfi1_txreq_from_idx(tx_ring, j)->sdma_hdr =
742+ kzalloc_node(sizeof(*tx->sdma_hdr),
743+ GFP_KERNEL, priv->dd->node);
736744
737745 netif_tx_napi_add(dev, &txq->napi,
738746 hfi1_ipoib_poll_tx_ring,
@@ -746,7 +754,10 @@ free_txqs: · 7 unmodified lines
746754 struct hfi1_ipoib_txq *txq = &priv->txqs[i];
747755
748756 netif_napi_del(&txq->napi);
749− kfree(txq->tx_ring.items);
757+ tx_ring = &txq->tx_ring;
758+ for (j = 0; j < tx_ring_size; j++)
759+ kfree(hfi1_txreq_from_idx(tx_ring, j)->sdma_hdr);
760+ kvfree(tx_ring->items);
750761 }
751762
752763 kfree(priv->txqs);
@@ -780,17 +791,20 @@ static void hfi1_ipoib_drain_tx_list(struct hfi1_ipoib_txq *txq) · 27 unmodified lines
780791
781792 void hfi1_ipoib_txreq_deinit(struct hfi1_ipoib_dev_priv *priv)
782793 {
783− int i;
794+ int i, j;
784795
785796 for (i = 0; i < priv->netdev->num_tx_queues; i++) {
786797 struct hfi1_ipoib_txq *txq = &priv->txqs[i];
798+ struct hfi1_ipoib_circ_buf *tx_ring = &txq->tx_ring;
787799
788800 iowait_cancel_work(&txq->wait);
789801 iowait_sdma_drain(&txq->wait);
790802 hfi1_ipoib_drain_tx_list(txq);
791803 netif_napi_del(&txq->napi);
792804 hfi1_ipoib_drain_tx_ring(txq);
793− kfree(txq->tx_ring.items);
805+ for (j = 0; j < tx_ring->max_items; j++)
806+ kfree(hfi1_txreq_from_idx(tx_ring, j)->sdma_hdr);
807+ kvfree(tx_ring->items);
794808 }
795809
796810 kfree(priv->txqs);
drivers/infiniband/hw/mlx4/main.c+1−1
@@ -3237,7 +3237,7 @@ static void mlx4_ib_event(struct mlx4_dev *dev, void *ibdev_ptr, · 3236 unmodified lines
32373237 case MLX4_DEV_EVENT_PORT_MGMT_CHANGE:
32383238 ew = kmalloc(sizeof *ew, GFP_ATOMIC);
32393239 if (!ew)
3240− break;
3240+ return;
32413241
32423242 INIT_WORK(&ew->work, handle_port_mgmt_change_event);
32433243 memcpy(&ew->ib_eqe, eqe, sizeof *eqe);
drivers/infiniband/sw/rdmavt/qp.c+2−0
@@ -3073,6 +3073,8 @@ do_write: · 3072 unmodified lines
30733073 case IB_WR_ATOMIC_FETCH_AND_ADD:
30743074 if (unlikely(!(qp->qp_access_flags & IB_ACCESS_REMOTE_ATOMIC)))
30753075 goto inv_err;
3076+ if (unlikely(wqe->atomic_wr.remote_addr & (sizeof(u64) - 1)))
3077+ goto inv_err;
30763078 if (unlikely(!rvt_rkey_ok(qp, &qp->r_sge.sge, sizeof(u64),
30773079 wqe->atomic_wr.remote_addr,
30783080 wqe->atomic_wr.rkey,
drivers/infiniband/sw/siw/siw.h+1−6
@@ -644,14 +644,9 @@ static inline struct siw_sqe *orq_get_current(struct siw_qp *qp) · 643 unmodified lines
644644 return &qp->orq[qp->orq_get % qp->attrs.orq_size];
645645 }
646646
647−static inline struct siw_sqe *orq_get_tail(struct siw_qp *qp)
648−{
649− return &qp->orq[qp->orq_put % qp->attrs.orq_size];
650−}
651−
652647 static inline struct siw_sqe *orq_get_free(struct siw_qp *qp)
653648 {
654− struct siw_sqe *orq_e = orq_get_tail(qp);
649+ struct siw_sqe *orq_e = &qp->orq[qp->orq_put % qp->attrs.orq_size];
655650
656651 if (READ_ONCE(orq_e->flags) == 0)
657652 return orq_e;
drivers/infiniband/sw/siw/siw_qp_rx.c+11−9
@@ -1153,11 +1153,12 @@ static int siw_check_tx_fence(struct siw_qp *qp) · 1152 unmodified lines
11531153
11541154 spin_lock_irqsave(&qp->orq_lock, flags);
11551155
1156− rreq = orq_get_current(qp);
1157−
11581156 /* free current orq entry */
1157+ rreq = orq_get_current(qp);
11591158 WRITE_ONCE(rreq->flags, 0);
11601159
1160+ qp->orq_get++;
1161+
11611162 if (qp->tx_ctx.orq_fence) {
11621163 if (unlikely(tx_waiting->wr_status != SIW_WR_QUEUED)) {
11631164 pr_warn("siw: [QP %u]: fence resume: bad status %d\n",
@@ -1165,10 +1166,12 @@ static int siw_check_tx_fence(struct siw_qp *qp) · 1 unmodified line
11651166 rv = -EPROTO;
11661167 goto out;
11671168 }
1168− /* resume SQ processing */
1169+ /* resume SQ processing, if possible */
11691170 if (tx_waiting->sqe.opcode == SIW_OP_READ ||
11701171 tx_waiting->sqe.opcode == SIW_OP_READ_LOCAL_INV) {
1171− rreq = orq_get_tail(qp);
1172+
1173+ /* SQ processing was stopped because of a full ORQ */
1174+ rreq = orq_get_free(qp);
11721175 if (unlikely(!rreq)) {
11731176 pr_warn("siw: [QP %u]: no ORQE\n", qp_id(qp));
11741177 rv = -EPROTO;
@@ -1181,15 +1184,14 @@ static int siw_check_tx_fence(struct siw_qp *qp) · 6 unmodified lines
11811184 resume_tx = 1;
11821185
11831186 } else if (siw_orq_empty(qp)) {
1187+ /*
1188+ * SQ processing was stopped by fenced work request.
1189+ * Resume since all previous Read's are now completed.
1190+ */
11841191 qp->tx_ctx.orq_fence = 0;
11851192 resume_tx = 1;
1186− } else {
1187− pr_warn("siw: [QP %u]: fence resume: orq idx: %d:%d\n",
1188− qp_id(qp), qp->orq_get, qp->orq_put);
1189− rv = -EPROTO;
11901193 }
11911194 }
1192− qp->orq_get++;
11931195 out:
11941196 spin_unlock_irqrestore(&qp->orq_lock, flags);
11951197
drivers/infiniband/sw/siw/siw_verbs.c+2−1
@@ -313,7 +313,8 @@ int siw_create_qp(struct ib_qp *ibqp, struct ib_qp_init_attr *attrs, · 312 unmodified lines
313313
314314 if (atomic_inc_return(&sdev->num_qp) > SIW_MAX_QP) {
315315 siw_dbg(base_dev, "too many QP's\n");
316− return -ENOMEM;
316+ rv = -ENOMEM;
317+ goto err_atomic;
317318 }
318319 if (attrs->qp_type != IB_QPT_RC) {
319320 siw_dbg(base_dev, "only RC QP's supported\n");
drivers/input/touchscreen/wm97xx-core.c+3−9
@@ -615,10 +615,9 @@ static int wm97xx_register_touch(struct wm97xx *wm) · 614 unmodified lines
615615 * extensions)
616616 */
617617 wm->touch_dev = platform_device_alloc("wm97xx-touch", -1);
618− if (!wm->touch_dev) {
619− ret = -ENOMEM;
620− goto touch_err;
621− }
618+ if (!wm->touch_dev)
619+ return -ENOMEM;
620+
622621 platform_set_drvdata(wm->touch_dev, wm);
623622 wm->touch_dev->dev.parent = wm->dev;
624623 wm->touch_dev->dev.platform_data = pdata;
@@ -629,9 +628,6 @@ static int wm97xx_register_touch(struct wm97xx *wm) · 4 unmodified lines
629628 return 0;
630629 touch_reg_err:
631630 platform_device_put(wm->touch_dev);
632−touch_err:
633− input_unregister_device(wm->input_dev);
634− wm->input_dev = NULL;
635631
636632 return ret;
637633 }
@@ -639,8 +635,6 @@ touch_err: · 1 unmodified line
639635 static void wm97xx_unregister_touch(struct wm97xx *wm)
640636 {
641637 platform_device_unregister(wm->touch_dev);
642− input_unregister_device(wm->input_dev);
643− wm->input_dev = NULL;
644638 }
645639
646640 static int _wm97xx_probe(struct wm97xx *wm)
drivers/iommu/amd/init.c+2−0
@@ -21,6 +21,7 @@ · 20 unmodified lines
2121 #include <linux/export.h>
2222 #include <linux/kmemleak.h>
2323 #include <linux/cc_platform.h>
24+#include <linux/iopoll.h>
2425 #include <asm/pci-direct.h>
2526 #include <asm/iommu.h>
2627 #include <asm/apic.h>
@@ -834,6 +835,7 @@ static int iommu_ga_log_enable(struct amd_iommu *iommu) · 807 unmodified lines
834835 status = readl(iommu->mmio_base + MMIO_STATUS_OFFSET);
835836 if (status & (MMIO_STATUS_GALOG_RUN_MASK))
836837 break;
838+ udelay(10);
837839 }
838840
839841 if (WARN_ON(i >= LOOP_TIMEOUT))
drivers/iommu/intel/irq_remapping.c+10−3
@@ -569,9 +569,8 @@ static int intel_setup_irq_remapping(struct intel_iommu *iommu) · 568 unmodified lines
569569 fn, &intel_ir_domain_ops,
570570 iommu);
571571 if (!iommu->ir_domain) {
572− irq_domain_free_fwnode(fn);
573572 pr_err("IR%d: failed to allocate irqdomain\n", iommu->seq_id);
574− goto out_free_bitmap;
573+ goto out_free_fwnode;
575574 }
576575 iommu->ir_msi_domain =
577576 arch_create_remap_msi_irq_domain(iommu->ir_domain,
@@ -595,7 +594,7 @@ static int intel_setup_irq_remapping(struct intel_iommu *iommu) · 17 unmodified lines
595594
596595 if (dmar_enable_qi(iommu)) {
597596 pr_err("Failed to enable queued invalidation\n");
598− goto out_free_bitmap;
597+ goto out_free_ir_domain;
599598 }
600599 }
601600
@@ -619,6 +618,14 @@ static int intel_setup_irq_remapping(struct intel_iommu *iommu) · 17 unmodified lines
619618
620619 return 0;
621620
621+out_free_ir_domain:
622+ if (iommu->ir_msi_domain)
623+ irq_domain_remove(iommu->ir_msi_domain);
624+ iommu->ir_msi_domain = NULL;
625+ irq_domain_remove(iommu->ir_domain);
626+ iommu->ir_domain = NULL;
627+out_free_fwnode:
628+ irq_domain_free_fwnode(fn);
622629 out_free_bitmap:
623630 bitmap_free(bitmap);
624631 out_free_pages:
drivers/iommu/ioasid.c+1−0
@@ -349,6 +349,7 @@ EXPORT_SYMBOL_GPL(ioasid_alloc); · 348 unmodified lines
349349
350350 /**
351351 * ioasid_get - obtain a reference to the IOASID
352+ * @ioasid: the ID to get
352353 */
353354 void ioasid_get(ioasid_t ioasid)
354355 {
drivers/iommu/iommu.c+19−14
@@ -207,9 +207,14 @@ static struct dev_iommu *dev_iommu_get(struct device *dev) · 206 unmodified lines
207207
208208 static void dev_iommu_free(struct device *dev)
209209 {
210− iommu_fwspec_free(dev);
211− kfree(dev->iommu);
210+ struct dev_iommu *param = dev->iommu;
211+
212212 dev->iommu = NULL;
213+ if (param->fwspec) {
214+ fwnode_handle_put(param->fwspec->iommu_fwnode);
215+ kfree(param->fwspec);
216+ }
217+ kfree(param);
213218 }
214219
215220 static int __iommu_probe_device(struct device *dev, struct list_head *group_list)
@@ -980,17 +985,6 @@ static int iommu_group_device_count(struct iommu_group *group) · 764 unmodified lines
980985 return ret;
981986 }
982987
983−/**
984− * iommu_group_for_each_dev - iterate over each device in the group
985− * @group: the group
986− * @data: caller opaque data to be passed to callback function
987− * @fn: caller supplied callback function
988− *
989− * This function is called by group users to iterate over group devices.
990− * Callers should hold a reference count to the group during callback.
991− * The group->mutex is held across callbacks, which will block calls to
992− * iommu_group_add/remove_device.
993− */
994988 static int __iommu_group_for_each_dev(struct iommu_group *group, void *data,
995989 int (*fn)(struct device *, void *))
996990 {
@@ -1005,7 +999,17 @@ static int __iommu_group_for_each_dev(struct iommu_group *group, void *data, · 8 unmodified lines
1005999 return ret;
10061000 }
10071001
1008−
1002+/**
1003+ * iommu_group_for_each_dev - iterate over each device in the group
1004+ * @group: the group
1005+ * @data: caller opaque data to be passed to callback function
1006+ * @fn: caller supplied callback function
1007+ *
1008+ * This function is called by group users to iterate over group devices.
1009+ * Callers should hold a reference count to the group during callback.
1010+ * The group->mutex is held across callbacks, which will block calls to
1011+ * iommu_group_add/remove_device.
1012+ */
10091013 int iommu_group_for_each_dev(struct iommu_group *group, void *data,
10101014 int (*fn)(struct device *, void *))
10111015 {
@@ -3032,6 +3036,7 @@ EXPORT_SYMBOL_GPL(iommu_aux_get_pasid); · 2020 unmodified lines
30323036 * iommu_sva_bind_device() - Bind a process address space to a device
30333037 * @dev: the device
30343038 * @mm: the mm to bind, caller must hold a reference to it
3039+ * @drvdata: opaque data pointer to pass to bind callback
30353040 *
30363041 * Create a bond between device and address space, allowing the device to access
30373042 * the mm using the returned PASID. If a bond already exists between @device and
drivers/iommu/omap-iommu.c+1−1
@@ -1085,7 +1085,7 @@ static __maybe_unused int omap_iommu_runtime_resume(struct device *dev) · 1084 unmodified lines
10851085 }
10861086
10871087 /**
1088− * omap_iommu_suspend_prepare - prepare() dev_pm_ops implementation
1088+ * omap_iommu_prepare - prepare() dev_pm_ops implementation
10891089 * @dev: iommu device
10901090 *
10911091 * This function performs the necessary checks to determine if the IOMMU
drivers/md/md.c+4−4
@@ -5869,10 +5869,6 @@ int md_run(struct mddev *mddev) · 5868 unmodified lines
58695869 nowait = nowait && blk_queue_nowait(bdev_get_queue(rdev->bdev));
58705870 }
58715871
5872− /* Set the NOWAIT flags if all underlying devices support it */
5873− if (nowait)
5874− blk_queue_flag_set(QUEUE_FLAG_NOWAIT, mddev->queue);
5875−
58765872 if (!bioset_initialized(&mddev->bio_set)) {
58775873 err = bioset_init(&mddev->bio_set, BIO_POOL_SIZE, 0, BIOSET_NEED_BVECS);
58785874 if (err)
@@ -6010,6 +6006,10 @@ int md_run(struct mddev *mddev) · 131 unmodified lines
60106006 else
60116007 blk_queue_flag_clear(QUEUE_FLAG_NONROT, mddev->queue);
60126008 blk_queue_flag_set(QUEUE_FLAG_IO_STAT, mddev->queue);
6009+
6010+ /* Set the NOWAIT flags if all underlying devices support it */
6011+ if (nowait)
6012+ blk_queue_flag_set(QUEUE_FLAG_NOWAIT, mddev->queue);
60136013 }
60146014 if (pers->sync_request) {
60156015 if (mddev->kobj.sd &&
drivers/net/dsa/Kconfig+1−0
@@ -36,6 +36,7 @@ config NET_DSA_LANTIQ_GSWIP · 35 unmodified lines
3636 config NET_DSA_MT7530
3737 tristate "MediaTek MT753x and MT7621 Ethernet switch support"
3838 select NET_DSA_TAG_MTK
39+ select MEDIATEK_GE_PHY
3940 help
4041 This enables support for the MediaTek MT7530, MT7531, and MT7621
4142 Ethernet switch chips.
drivers/net/ethernet/amd/xgbe/xgbe-drv.c+13−1
@@ -721,7 +721,9 @@ static void xgbe_stop_timers(struct xgbe_prv_data *pdata) · 720 unmodified lines
721721 if (!channel->tx_ring)
722722 break;
723723
724+ /* Deactivate the Tx timer */
724725 del_timer_sync(&channel->tx_timer);
726+ channel->tx_timer_active = 0;
725727 }
726728 }
727729
@@ -2550,6 +2552,14 @@ read_again: · 1822 unmodified lines
25502552 buf2_len = xgbe_rx_buf2_len(rdata, packet, len);
25512553 len += buf2_len;
25522554
2555+ if (buf2_len > rdata->rx.buf.dma_len) {
2556+ /* Hardware inconsistency within the descriptors
2557+ * that has resulted in a length underflow.
2558+ */
2559+ error = 1;
2560+ goto skip_data;
2561+ }
2562+
25532563 if (!skb) {
25542564 skb = xgbe_create_skb(pdata, napi, rdata,
25552565 buf1_len);
@@ -2579,8 +2589,10 @@ skip_data: · 23 unmodified lines
25792589 if (!last || context_next)
25802590 goto read_again;
25812591
2582− if (!skb)
2592+ if (!skb || error) {
2593+ dev_kfree_skb(skb);
25832594 goto next_packet;
2595+ }
25842596
25852597 /* Be sure we don't exceed the configured MTU */
25862598 max_len = netdev->mtu + ETH_HLEN;
drivers/net/ethernet/google/gve/gve_adminq.c+1−1
@@ -301,7 +301,7 @@ static int gve_adminq_parse_err(struct gve_priv *priv, u32 status) · 300 unmodified lines
301301 */
302302 static int gve_adminq_kick_and_wait(struct gve_priv *priv)
303303 {
304− u32 tail, head;
304+ int tail, head;
305305 int i;
306306
307307 tail = ioread32be(&priv->reg_bar0->adminq_event_counter);
drivers/net/ethernet/intel/e1000e/e1000.h+3−1
@@ -115,7 +115,8 @@ enum e1000_boards { · 114 unmodified lines
115115 board_pch_lpt,
116116 board_pch_spt,
117117 board_pch_cnp,
118− board_pch_tgp
118+ board_pch_tgp,
119+ board_pch_adp
119120 };
120121
121122 struct e1000_ps_page {
@@ -502,6 +503,7 @@ extern const struct e1000_info e1000_pch_lpt_info; · 380 unmodified lines
502503 extern const struct e1000_info e1000_pch_spt_info;
503504 extern const struct e1000_info e1000_pch_cnp_info;
504505 extern const struct e1000_info e1000_pch_tgp_info;
506+extern const struct e1000_info e1000_pch_adp_info;
505507 extern const struct e1000_info e1000_es2_info;
506508
507509 void e1000e_ptp_init(struct e1000_adapter *adapter);
drivers/net/ethernet/intel/e1000e/ich8lan.c+20−0
@@ -6021,3 +6021,23 @@ const struct e1000_info e1000_pch_tgp_info = { · 6020 unmodified lines
60216021 .phy_ops = &ich8_phy_ops,
60226022 .nvm_ops = &spt_nvm_ops,
60236023 };
6024+
6025+const struct e1000_info e1000_pch_adp_info = {
6026+ .mac = e1000_pch_adp,
6027+ .flags = FLAG_IS_ICH
6028+ | FLAG_HAS_WOL
6029+ | FLAG_HAS_HW_TIMESTAMP
6030+ | FLAG_HAS_CTRLEXT_ON_LOAD
6031+ | FLAG_HAS_AMT
6032+ | FLAG_HAS_FLASH
6033+ | FLAG_HAS_JUMBO_FRAMES
6034+ | FLAG_APME_IN_WUC,
6035+ .flags2 = FLAG2_HAS_PHY_STATS
6036+ | FLAG2_HAS_EEE,
6037+ .pba = 26,
6038+ .max_hw_frame_size = 9022,
6039+ .get_variants = e1000_get_variants_ich8lan,
6040+ .mac_ops = &ich8_mac_ops,
6041+ .phy_ops = &ich8_phy_ops,
6042+ .nvm_ops = &spt_nvm_ops,
6043+};
drivers/net/ethernet/intel/e1000e/netdev.c+21−18
@@ -52,6 +52,7 @@ static const struct e1000_info *e1000_info_tbl[] = { · 51 unmodified lines
5252 [board_pch_spt] = &e1000_pch_spt_info,
5353 [board_pch_cnp] = &e1000_pch_cnp_info,
5454 [board_pch_tgp] = &e1000_pch_tgp_info,
55+ [board_pch_adp] = &e1000_pch_adp_info,
5556 };
5657
5758 struct e1000_reg_info {
@@ -6341,7 +6342,8 @@ static void e1000e_s0ix_entry_flow(struct e1000_adapter *adapter) · 6283 unmodified lines
63416342 u32 mac_data;
63426343 u16 phy_data;
63436344
6344− if (er32(FWSM) & E1000_ICH_FWSM_FW_VALID) {
6345+ if (er32(FWSM) & E1000_ICH_FWSM_FW_VALID &&
6346+ hw->mac.type >= e1000_pch_adp) {
63456347 /* Request ME configure the device for S0ix */
63466348 mac_data = er32(H2ME);
63476349 mac_data |= E1000_H2ME_START_DPG;
@@ -6490,7 +6492,8 @@ static void e1000e_s0ix_exit_flow(struct e1000_adapter *adapter) · 142 unmodified lines
64906492 u16 phy_data;
64916493 u32 i = 0;
64926494
6493− if (er32(FWSM) & E1000_ICH_FWSM_FW_VALID) {
6495+ if (er32(FWSM) & E1000_ICH_FWSM_FW_VALID &&
6496+ hw->mac.type >= e1000_pch_adp) {
64946497 /* Request ME unconfigure the device from S0ix */
64956498 mac_data = er32(H2ME);
64966499 mac_data &= ~E1000_H2ME_START_DPG;
@@ -7898,22 +7901,22 @@ static const struct pci_device_id e1000_pci_tbl[] = { · 1401 unmodified lines
78987901 { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_V14), board_pch_tgp },
78997902 { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_LM15), board_pch_tgp },
79007903 { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_TGP_I219_V15), board_pch_tgp },
7901− { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_LM23), board_pch_tgp },
7902− { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_V23), board_pch_tgp },
7903− { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM16), board_pch_tgp },
7904− { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V16), board_pch_tgp },
7905− { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM17), board_pch_tgp },
7906− { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V17), board_pch_tgp },
7907− { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_LM22), board_pch_tgp },
7908− { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_V22), board_pch_tgp },
7909− { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM18), board_pch_tgp },
7910− { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V18), board_pch_tgp },
7911− { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM19), board_pch_tgp },
7912− { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V19), board_pch_tgp },
7913− { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_LM20), board_pch_tgp },
7914− { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_V20), board_pch_tgp },
7915− { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_LM21), board_pch_tgp },
7916− { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_V21), board_pch_tgp },
7904+ { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_LM23), board_pch_adp },
7905+ { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_V23), board_pch_adp },
7906+ { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM16), board_pch_adp },
7907+ { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V16), board_pch_adp },
7908+ { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM17), board_pch_adp },
7909+ { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V17), board_pch_adp },
7910+ { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_LM22), board_pch_adp },
7911+ { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_V22), board_pch_adp },
7912+ { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM18), board_pch_adp },
7913+ { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V18), board_pch_adp },
7914+ { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM19), board_pch_adp },
7915+ { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V19), board_pch_adp },
7916+ { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_LM20), board_pch_adp },
7917+ { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_V20), board_pch_adp },
7918+ { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_LM21), board_pch_adp },
7919+ { PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_V21), board_pch_adp },
79177920
79187921 { 0, 0, 0, 0, 0, 0, 0 } /* terminate list */
79197922 };
drivers/net/ethernet/intel/i40e/i40e.h+1−0
@@ -144,6 +144,7 @@ enum i40e_state_t { · 143 unmodified lines
144144 __I40E_VIRTCHNL_OP_PENDING,
145145 __I40E_RECOVERY_MODE,
146146 __I40E_VF_RESETS_DISABLED, /* disable resets during i40e_remove */
147+ __I40E_IN_REMOVE,
147148 __I40E_VFS_RELEASING,
148149 /* This must be last as it determines the size of the BITMAP */
149150 __I40E_STATE_SIZE__,
drivers/net/ethernet/intel/i40e/i40e_main.c+29−2
@@ -5372,7 +5372,15 @@ static int i40e_vsi_configure_bw_alloc(struct i40e_vsi *vsi, u8 enabled_tc, · 5371 unmodified lines
53725372 /* There is no need to reset BW when mqprio mode is on. */
53735373 if (pf->flags & I40E_FLAG_TC_MQPRIO)
53745374 return 0;
5375− if (!vsi->mqprio_qopt.qopt.hw && !(pf->flags & I40E_FLAG_DCB_ENABLED)) {
5375+
5376+ if (!vsi->mqprio_qopt.qopt.hw) {
5377+ if (pf->flags & I40E_FLAG_DCB_ENABLED)
5378+ goto skip_reset;
5379+
5380+ if (IS_ENABLED(CONFIG_I40E_DCB) &&
5381+ i40e_dcb_hw_get_num_tc(&pf->hw) == 1)
5382+ goto skip_reset;
5383+
53765384 ret = i40e_set_bw_limit(vsi, vsi->seid, 0);
53775385 if (ret)
53785386 dev_info(&pf->pdev->dev,
@@ -5380,6 +5388,8 @@ static int i40e_vsi_configure_bw_alloc(struct i40e_vsi *vsi, u8 enabled_tc, · 1 unmodified line
53805388 vsi->seid);
53815389 return ret;
53825390 }
5391+
5392+skip_reset:
53835393 memset(&bw_data, 0, sizeof(bw_data));
53845394 bw_data.tc_valid_bits = enabled_tc;
53855395 for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++)
@@ -10853,6 +10863,9 @@ static void i40e_reset_and_rebuild(struct i40e_pf *pf, bool reinit, · 5467 unmodified lines
1085310863 bool lock_acquired)
1085410864 {
1085510865 int ret;
10866+
10867+ if (test_bit(__I40E_IN_REMOVE, pf->state))
10868+ return;
1085610869 /* Now we wait for GRST to settle out.
1085710870 * We don't have to delete the VEBs or VSIs from the hw switch
1085810871 * because the reset will make them disappear.
@@ -12212,6 +12225,8 @@ int i40e_reconfig_rss_queues(struct i40e_pf *pf, int queue_count) · 1353 unmodified lines
1221212225
1221312226 vsi->req_queue_pairs = queue_count;
1221412227 i40e_prep_for_reset(pf);
12228+ if (test_bit(__I40E_IN_REMOVE, pf->state))
12229+ return pf->alloc_rss_size;
1221512230
1221612231 pf->alloc_rss_size = new_rss_size;
1221712232
@@ -13038,6 +13053,10 @@ static int i40e_xdp_setup(struct i40e_vsi *vsi, struct bpf_prog *prog, · 820 unmodified lines
1303813053 if (need_reset)
1303913054 i40e_prep_for_reset(pf);
1304013055
13056+ /* VSI shall be deleted in a moment, just return EINVAL */
13057+ if (test_bit(__I40E_IN_REMOVE, pf->state))
13058+ return -EINVAL;
13059+
1304113060 old_prog = xchg(&vsi->xdp_prog, prog);
1304213061
1304313062 if (need_reset) {
@@ -15928,8 +15947,13 @@ static void i40e_remove(struct pci_dev *pdev) · 2884 unmodified lines
1592815947 i40e_write_rx_ctl(hw, I40E_PFQF_HENA(0), 0);
1592915948 i40e_write_rx_ctl(hw, I40E_PFQF_HENA(1), 0);
1593015949
15931− while (test_bit(__I40E_RESET_RECOVERY_PENDING, pf->state))
15950+ /* Grab __I40E_RESET_RECOVERY_PENDING and set __I40E_IN_REMOVE
15951+ * flags, once they are set, i40e_rebuild should not be called as
15952+ * i40e_prep_for_reset always returns early.
15953+ */
15954+ while (test_and_set_bit(__I40E_RESET_RECOVERY_PENDING, pf->state))
1593215955 usleep_range(1000, 2000);
15956+ set_bit(__I40E_IN_REMOVE, pf->state);
1593315957
1593415958 if (pf->flags & I40E_FLAG_SRIOV_ENABLED) {
1593515959 set_bit(__I40E_VF_RESETS_DISABLED, pf->state);
@@ -16128,6 +16152,9 @@ static void i40e_pci_error_reset_done(struct pci_dev *pdev) · 192 unmodified lines
1612816152 {
1612916153 struct i40e_pf *pf = pci_get_drvdata(pdev);
1613016154
16155+ if (test_bit(__I40E_IN_REMOVE, pf->state))
16156+ return;
16157+
1613116158 i40e_reset_and_rebuild(pf, false, false);
1613216159 }
1613316160
drivers/net/ethernet/mellanox/mlx5/core/en.h+3−3
@@ -224,7 +224,7 @@ static inline int mlx5e_get_max_num_channels(struct mlx5_core_dev *mdev) · 223 unmodified lines
224224 struct mlx5e_tx_wqe {
225225 struct mlx5_wqe_ctrl_seg ctrl;
226226 struct mlx5_wqe_eth_seg eth;
227− struct mlx5_wqe_data_seg data[0];
227+ struct mlx5_wqe_data_seg data[];
228228 };
229229
230230 struct mlx5e_rx_wqe_ll {
@@ -241,8 +241,8 @@ struct mlx5e_umr_wqe { · 10 unmodified lines
241241 struct mlx5_wqe_umr_ctrl_seg uctrl;
242242 struct mlx5_mkey_seg mkc;
243243 union {
244− struct mlx5_mtt inline_mtts[0];
245− struct mlx5_klm inline_klms[0];
244+ DECLARE_FLEX_ARRAY(struct mlx5_mtt, inline_mtts);
245+ DECLARE_FLEX_ARRAY(struct mlx5_klm, inline_klms);
246246 };
247247 };
248248
drivers/net/ethernet/mellanox/mlx5/core/en/qos.c+2−1
@@ -570,7 +570,8 @@ static int mlx5e_htb_convert_rate(struct mlx5e_priv *priv, u64 rate, · 569 unmodified lines
570570
571571 static void mlx5e_htb_convert_ceil(struct mlx5e_priv *priv, u64 ceil, u32 *max_average_bw)
572572 {
573− *max_average_bw = div_u64(ceil, BYTES_IN_MBIT);
573+ /* Hardware treats 0 as "unlimited", set at least 1. */
574+ *max_average_bw = max_t(u32, div_u64(ceil, BYTES_IN_MBIT), 1);
574575
575576 qos_dbg(priv->mdev, "Convert: ceil %llu -> max_average_bw %u\n",
576577 ceil, *max_average_bw);
drivers/net/ethernet/mellanox/mlx5/core/en/rep/bond.c+14−18
@@ -183,18 +183,7 @@ void mlx5e_rep_bond_unslave(struct mlx5_eswitch *esw, · 182 unmodified lines
183183
184184 static bool mlx5e_rep_is_lag_netdev(struct net_device *netdev)
185185 {
186− struct mlx5e_rep_priv *rpriv;
187− struct mlx5e_priv *priv;
188−
189− /* A given netdev is not a representor or not a slave of LAG configuration */
190− if (!mlx5e_eswitch_rep(netdev) || !netif_is_lag_port(netdev))
191− return false;
192−
193− priv = netdev_priv(netdev);
194− rpriv = priv->ppriv;
195−
196− /* Egress acl forward to vport is supported only non-uplink representor */
197− return rpriv->rep->vport != MLX5_VPORT_UPLINK;
186+ return netif_is_lag_port(netdev) && mlx5e_eswitch_vf_rep(netdev);
198187 }
199188
200189 static void mlx5e_rep_changelowerstate_event(struct net_device *netdev, void *ptr)
@@ -210,9 +199,6 @@ static void mlx5e_rep_changelowerstate_event(struct net_device *netdev, void *pt · 9 unmodified lines
210199 u16 fwd_vport_num;
211200 int err;
212201
213− if (!mlx5e_rep_is_lag_netdev(netdev))
214− return;
215−
216202 info = ptr;
217203 lag_info = info->lower_state_info;
218204 /* This is not an event of a representor becoming active slave */
@@ -266,9 +252,6 @@ static void mlx5e_rep_changeupper_event(struct net_device *netdev, void *ptr) · 47 unmodified lines
266252 struct net_device *lag_dev;
267253 struct mlx5e_priv *priv;
268254
269− if (!mlx5e_rep_is_lag_netdev(netdev))
270− return;
271−
272255 priv = netdev_priv(netdev);
273256 rpriv = priv->ppriv;
274257 lag_dev = info->upper_dev;
@@ -293,6 +276,19 @@ static int mlx5e_rep_esw_bond_netevent(struct notifier_block *nb, · 18 unmodified lines
293276 unsigned long event, void *ptr)
294277 {
295278 struct net_device *netdev = netdev_notifier_info_to_dev(ptr);
279+ struct mlx5e_rep_priv *rpriv;
280+ struct mlx5e_rep_bond *bond;
281+ struct mlx5e_priv *priv;
282+
283+ if (!mlx5e_rep_is_lag_netdev(netdev))
284+ return NOTIFY_DONE;
285+
286+ bond = container_of(nb, struct mlx5e_rep_bond, nb);
287+ priv = netdev_priv(netdev);
288+ rpriv = mlx5_eswitch_get_uplink_priv(priv->mdev->priv.eswitch, REP_ETH);
289+ /* Verify VF representor is on the same device of the bond handling the netevent. */
290+ if (rpriv->uplink_priv.bond != bond)
291+ return NOTIFY_DONE;
296292
297293 switch (event) {
298294 case NETDEV_CHANGELOWERSTATE:
drivers/net/ethernet/mellanox/mlx5/core/en/rep/bridge.c+4−2
@@ -491,7 +491,7 @@ void mlx5e_rep_bridge_init(struct mlx5e_priv *priv) · 490 unmodified lines
491491 }
492492
493493 br_offloads->netdev_nb.notifier_call = mlx5_esw_bridge_switchdev_port_event;
494− err = register_netdevice_notifier(&br_offloads->netdev_nb);
494+ err = register_netdevice_notifier_net(&init_net, &br_offloads->netdev_nb);
495495 if (err) {
496496 esw_warn(mdev, "Failed to register bridge offloads netdevice notifier (err=%d)\n",
497497 err);
@@ -509,7 +509,9 @@ err_register_swdev_blk: · 11 unmodified lines
509509 err_register_swdev:
510510 destroy_workqueue(br_offloads->wq);
511511 err_alloc_wq:
512+ rtnl_lock();
512513 mlx5_esw_bridge_cleanup(esw);
514+ rtnl_unlock();
513515 }
514516
515517 void mlx5e_rep_bridge_cleanup(struct mlx5e_priv *priv)
@@ -524,7 +526,7 @@ void mlx5e_rep_bridge_cleanup(struct mlx5e_priv *priv) · 8 unmodified lines
524526 return;
525527
526528 cancel_delayed_work_sync(&br_offloads->update_work);
527− unregister_netdevice_notifier(&br_offloads->netdev_nb);
529+ unregister_netdevice_notifier_net(&init_net, &br_offloads->netdev_nb);
528530 unregister_switchdev_blocking_notifier(&br_offloads->nb_blk);
529531 unregister_switchdev_notifier(&br_offloads->nb);
530532 destroy_workqueue(br_offloads->wq);
drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h+5−0
@@ -167,6 +167,11 @@ static inline u16 mlx5e_txqsq_get_next_pi(struct mlx5e_txqsq *sq, u16 size) · 166 unmodified lines
167167 return pi;
168168 }
169169
170+static inline u16 mlx5e_shampo_get_cqe_header_index(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe)
171+{
172+ return be16_to_cpu(cqe->shampo.header_entry_index) & (rq->mpwqe.shampo->hd_per_wq - 1);
173+}
174+
170175 struct mlx5e_shampo_umr {
171176 u16 len;
172177 };
drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c+3−1
@@ -341,8 +341,10 @@ mlx5e_xmit_xdp_frame(struct mlx5e_xdpsq *sq, struct mlx5e_xmit_data *xdptxd, · 340 unmodified lines
341341
342342 /* copy the inline part if required */
343343 if (sq->min_inline_mode != MLX5_INLINE_MODE_NONE) {
344− memcpy(eseg->inline_hdr.start, xdptxd->data, MLX5E_XDP_MIN_INLINE);
344+ memcpy(eseg->inline_hdr.start, xdptxd->data, sizeof(eseg->inline_hdr.start));
345345 eseg->inline_hdr.sz = cpu_to_be16(MLX5E_XDP_MIN_INLINE);
346+ memcpy(dseg, xdptxd->data + sizeof(eseg->inline_hdr.start),
347+ MLX5E_XDP_MIN_INLINE - sizeof(eseg->inline_hdr.start));
346348 dma_len -= MLX5E_XDP_MIN_INLINE;
347349 dma_addr += MLX5E_XDP_MIN_INLINE;
348350 dseg++;
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.c+11−2
@@ -157,11 +157,20 @@ static void mlx5e_ipsec_set_swp(struct sk_buff *skb, · 156 unmodified lines
157157 /* Tunnel mode */
158158 if (mode == XFRM_MODE_TUNNEL) {
159159 eseg->swp_inner_l3_offset = skb_inner_network_offset(skb) / 2;
160− eseg->swp_inner_l4_offset = skb_inner_transport_offset(skb) / 2;
161160 if (xo->proto == IPPROTO_IPV6)
162161 eseg->swp_flags |= MLX5_ETH_WQE_SWP_INNER_L3_IPV6;
163− if (inner_ip_hdr(skb)->protocol == IPPROTO_UDP)
162+
163+ switch (xo->inner_ipproto) {
164+ case IPPROTO_UDP:
164165 eseg->swp_flags |= MLX5_ETH_WQE_SWP_INNER_L4_UDP;
166+ fallthrough;
167+ case IPPROTO_TCP:
168+ /* IP | ESP | IP | [TCP | UDP] */
169+ eseg->swp_inner_l4_offset = skb_inner_transport_offset(skb) / 2;
170+ break;
171+ default:
172+ break;
173+ }
165174 return;
166175 }
167176
drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec_rxtx.h+6−3
@@ -131,14 +131,17 @@ static inline bool · 130 unmodified lines
131131 mlx5e_ipsec_txwqe_build_eseg_csum(struct mlx5e_txqsq *sq, struct sk_buff *skb,
132132 struct mlx5_wqe_eth_seg *eseg)
133133 {
134− struct xfrm_offload *xo = xfrm_offload(skb);
134+ u8 inner_ipproto;
135135
136136 if (!mlx5e_ipsec_eseg_meta(eseg))
137137 return false;
138138
139139 eseg->cs_flags = MLX5_ETH_WQE_L3_CSUM;
140− if (xo->inner_ipproto) {
141− eseg->cs_flags |= MLX5_ETH_WQE_L4_INNER_CSUM | MLX5_ETH_WQE_L3_INNER_CSUM;
140+ inner_ipproto = xfrm_offload(skb)->inner_ipproto;
141+ if (inner_ipproto) {
142+ eseg->cs_flags |= MLX5_ETH_WQE_L3_INNER_CSUM;
143+ if (inner_ipproto == IPPROTO_TCP || inner_ipproto == IPPROTO_UDP)
144+ eseg->cs_flags |= MLX5_ETH_WQE_L4_INNER_CSUM;
142145 } else if (likely(skb->ip_summed == CHECKSUM_PARTIAL)) {
143146 eseg->cs_flags |= MLX5_ETH_WQE_L4_CSUM;
144147 sq->stats->csum_partial_inner++;
drivers/net/ethernet/mellanox/mlx5/core/en_rx.c+19−11
@@ -1117,7 +1117,7 @@ static void mlx5e_shampo_update_ipv6_udp_hdr(struct mlx5e_rq *rq, struct ipv6hdr · 1116 unmodified lines
11171117 static void mlx5e_shampo_update_fin_psh_flags(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe,
11181118 struct tcphdr *skb_tcp_hd)
11191119 {
1120− u16 header_index = be16_to_cpu(cqe->shampo.header_entry_index);
1120+ u16 header_index = mlx5e_shampo_get_cqe_header_index(rq, cqe);
11211121 struct tcphdr *last_tcp_hd;
11221122 void *last_hd_addr;
11231123
@@ -1871,7 +1871,7 @@ mlx5e_skb_from_cqe_mpwrq_linear(struct mlx5e_rq *rq, struct mlx5e_mpw_info *wi, · 747 unmodified lines
18711871 return skb;
18721872 }
18731873
1874−static void
1874+static struct sk_buff *
18751875 mlx5e_skb_from_cqe_shampo(struct mlx5e_rq *rq, struct mlx5e_mpw_info *wi,
18761876 struct mlx5_cqe64 *cqe, u16 header_index)
18771877 {
@@ -1895,7 +1895,7 @@ mlx5e_skb_from_cqe_shampo(struct mlx5e_rq *rq, struct mlx5e_mpw_info *wi, · 17 unmodified lines
18951895 skb = mlx5e_build_linear_skb(rq, hdr, frag_size, rx_headroom, head_size);
18961896
18971897 if (unlikely(!skb))
1898− return;
1898+ return NULL;
18991899
19001900 /* queue up for recycling/reuse */
19011901 page_ref_inc(head->page);
@@ -1907,7 +1907,7 @@ mlx5e_skb_from_cqe_shampo(struct mlx5e_rq *rq, struct mlx5e_mpw_info *wi, · 5 unmodified lines
19071907 ALIGN(head_size, sizeof(long)));
19081908 if (unlikely(!skb)) {
19091909 rq->stats->buff_alloc_err++;
1910− return;
1910+ return NULL;
19111911 }
19121912
19131913 prefetchw(skb->data);
@@ -1918,9 +1918,7 @@ mlx5e_skb_from_cqe_shampo(struct mlx5e_rq *rq, struct mlx5e_mpw_info *wi, · 4 unmodified lines
19181918 skb->tail += head_size;
19191919 skb->len += head_size;
19201920 }
1921− rq->hw_gro_data->skb = skb;
1922− NAPI_GRO_CB(skb)->count = 1;
1923− skb_shinfo(skb)->gso_size = mpwrq_get_cqe_byte_cnt(cqe) - head_size;
1921+ return skb;
19241922 }
19251923
19261924 static void
@@ -1973,13 +1971,14 @@ mlx5e_free_rx_shampo_hd_entry(struct mlx5e_rq *rq, u16 header_index) · 46 unmodified lines
19731971 static void mlx5e_handle_rx_cqe_mpwrq_shampo(struct mlx5e_rq *rq, struct mlx5_cqe64 *cqe)
19741972 {
19751973 u16 data_bcnt = mpwrq_get_cqe_byte_cnt(cqe) - cqe->shampo.header_size;
1976− u16 header_index = be16_to_cpu(cqe->shampo.header_entry_index);
1974+ u16 header_index = mlx5e_shampo_get_cqe_header_index(rq, cqe);
19771975 u32 wqe_offset = be32_to_cpu(cqe->shampo.data_offset);
19781976 u16 cstrides = mpwrq_get_cqe_consumed_strides(cqe);
19791977 u32 data_offset = wqe_offset & (PAGE_SIZE - 1);
19801978 u32 cqe_bcnt = mpwrq_get_cqe_byte_cnt(cqe);
19811979 u16 wqe_id = be16_to_cpu(cqe->wqe_id);
19821980 u32 page_idx = wqe_offset >> PAGE_SHIFT;
1981+ u16 head_size = cqe->shampo.header_size;
19831982 struct sk_buff **skb = &rq->hw_gro_data->skb;
19841983 bool flush = cqe->shampo.flush;
19851984 bool match = cqe->shampo.match;
@@ -2011,9 +2010,16 @@ static void mlx5e_handle_rx_cqe_mpwrq_shampo(struct mlx5e_rq *rq, struct mlx5_cq · 25 unmodified lines
20112010 }
20122011
20132012 if (!*skb) {
2014− mlx5e_skb_from_cqe_shampo(rq, wi, cqe, header_index);
2013+ if (likely(head_size))
2014+ *skb = mlx5e_skb_from_cqe_shampo(rq, wi, cqe, header_index);
2015+ else
2016+ *skb = mlx5e_skb_from_cqe_mpwrq_nonlinear(rq, wi, cqe_bcnt, data_offset,
2017+ page_idx);
20152018 if (unlikely(!*skb))
20162019 goto free_hd_entry;
2020+
2021+ NAPI_GRO_CB(*skb)->count = 1;
2022+ skb_shinfo(*skb)->gso_size = cqe_bcnt - head_size;
20172023 } else {
20182024 NAPI_GRO_CB(*skb)->count++;
20192025 if (NAPI_GRO_CB(*skb)->count == 2 &&
@@ -2027,8 +2033,10 @@ static void mlx5e_handle_rx_cqe_mpwrq_shampo(struct mlx5e_rq *rq, struct mlx5_cq · 7 unmodified lines
20272033 }
20282034 }
20292035
2030− di = &wi->umr.dma_info[page_idx];
2031− mlx5e_fill_skb_data(*skb, rq, di, data_bcnt, data_offset);
2036+ if (likely(head_size)) {
2037+ di = &wi->umr.dma_info[page_idx];
2038+ mlx5e_fill_skb_data(*skb, rq, di, data_bcnt, data_offset);
2039+ }
20322040
20332041 mlx5e_shampo_complete_rx_cqe(rq, cqe, cqe_bcnt, *skb);
20342042 if (flush)
drivers/net/ethernet/mellanox/mlx5/core/en_tc.c+14−1
@@ -1414,7 +1414,8 @@ mlx5e_tc_add_fdb_flow(struct mlx5e_priv *priv, · 1413 unmodified lines
14141414 if (err)
14151415 goto err_out;
14161416
1417− if (!attr->chain && esw_attr->int_port) {
1417+ if (!attr->chain && esw_attr->int_port &&
1418+ attr->action & MLX5_FLOW_CONTEXT_ACTION_FWD_DEST) {
14181419 /* If decap route device is internal port, change the
14191420 * source vport value in reg_c0 back to uplink just in
14201421 * case the rule performs goto chain > 0. If we have a miss
@@ -3191,6 +3192,18 @@ actions_match_supported(struct mlx5e_priv *priv, · 1770 unmodified lines
31913192 return false;
31923193 }
31933194
3195+ if (!(~actions &
3196+ (MLX5_FLOW_CONTEXT_ACTION_FWD_DEST | MLX5_FLOW_CONTEXT_ACTION_DROP))) {
3197+ NL_SET_ERR_MSG_MOD(extack, "Rule cannot support forward+drop action");
3198+ return false;
3199+ }
3200+
3201+ if (actions & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR &&
3202+ actions & MLX5_FLOW_CONTEXT_ACTION_DROP) {
3203+ NL_SET_ERR_MSG_MOD(extack, "Drop with modify header action is not supported");
3204+ return false;
3205+ }
3206+
31943207 if (actions & MLX5_FLOW_CONTEXT_ACTION_MOD_HDR &&
31953208 !modify_header_match_supported(priv, &parse_attr->spec, flow_action,
31963209 actions, ct_flow, ct_clear, extack))
drivers/net/ethernet/mellanox/mlx5/core/en_tx.c+1−1
@@ -208,7 +208,7 @@ static inline void mlx5e_insert_vlan(void *start, struct sk_buff *skb, u16 ihs) · 207 unmodified lines
208208 int cpy1_sz = 2 * ETH_ALEN;
209209 int cpy2_sz = ihs - cpy1_sz;
210210
211− memcpy(vhdr, skb->data, cpy1_sz);
211+ memcpy(&vhdr->addrs, skb->data, cpy1_sz);
212212 vhdr->h_vlan_proto = skb->vlan_proto;
213213 vhdr->h_vlan_TCI = cpu_to_be16(skb_vlan_tag_get(skb));
214214 memcpy(&vhdr->h_vlan_encapsulated_proto, skb->data + cpy1_sz, cpy2_sz);
drivers/net/ethernet/mellanox/mlx5/core/esw/bridge.c+4−0
@@ -1574,6 +1574,8 @@ struct mlx5_esw_bridge_offloads *mlx5_esw_bridge_init(struct mlx5_eswitch *esw) · 1573 unmodified lines
15741574 {
15751575 struct mlx5_esw_bridge_offloads *br_offloads;
15761576
1577+ ASSERT_RTNL();
1578+
15771579 br_offloads = kvzalloc(sizeof(*br_offloads), GFP_KERNEL);
15781580 if (!br_offloads)
15791581 return ERR_PTR(-ENOMEM);
@@ -1590,6 +1592,8 @@ void mlx5_esw_bridge_cleanup(struct mlx5_eswitch *esw) · 10 unmodified lines
15901592 {
15911593 struct mlx5_esw_bridge_offloads *br_offloads = esw->br_offloads;
15921594
1595+ ASSERT_RTNL();
1596+
15931597 if (!br_offloads)
15941598 return;
15951599
drivers/net/ethernet/mellanox/mlx5/core/esw/diag/bridge_tracepoint.h+1−1
@@ -21,7 +21,7 @@ DECLARE_EVENT_CLASS(mlx5_esw_bridge_fdb_template, · 20 unmodified lines
2121 __field(unsigned int, used)
2222 ),
2323 TP_fast_assign(
24− strncpy(__entry->dev_name,
24+ strscpy(__entry->dev_name,
2525 netdev_name(fdb->dev),
2626 IFNAMSIZ);
2727 memcpy(__entry->addr, fdb->key.addr, ETH_ALEN);
drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c+1−1
@@ -132,7 +132,7 @@ static void mlx5_stop_sync_reset_poll(struct mlx5_core_dev *dev) · 131 unmodified lines
132132 {
133133 struct mlx5_fw_reset *fw_reset = dev->priv.fw_reset;
134134
135− del_timer(&fw_reset->timer);
135+ del_timer_sync(&fw_reset->timer);
136136 }
137137
138138 static void mlx5_sync_reset_clear_reset_requested(struct mlx5_core_dev *dev, bool poll_health)
drivers/net/ethernet/mellanox/mlx5/core/lib/fs_chains.c+5−4
@@ -121,12 +121,13 @@ u32 mlx5_chains_get_nf_ft_chain(struct mlx5_fs_chains *chains) · 120 unmodified lines
121121
122122 u32 mlx5_chains_get_prio_range(struct mlx5_fs_chains *chains)
123123 {
124− if (!mlx5_chains_prios_supported(chains))
125− return 1;
126−
127124 if (mlx5_chains_ignore_flow_level_supported(chains))
128125 return UINT_MAX;
129126
127+ if (!chains->dev->priv.eswitch ||
128+ chains->dev->priv.eswitch->mode != MLX5_ESWITCH_OFFLOADS)
129+ return 1;
130+
130131 /* We should get here only for eswitch case */
131132 return FDB_TC_MAX_PRIO;
132133 }
@@ -211,7 +212,7 @@ static int · 78 unmodified lines
211212 create_chain_restore(struct fs_chain *chain)
212213 {
213214 struct mlx5_eswitch *esw = chain->chains->dev->priv.eswitch;
214− char modact[MLX5_UN_SZ_BYTES(set_add_copy_action_in_auto)];
215+ u8 modact[MLX5_UN_SZ_BYTES(set_add_copy_action_in_auto)] = {};
215216 struct mlx5_fs_chains *chains = chain->chains;
216217 enum mlx5e_tc_attr_to_reg chain_to_reg;
217218 struct mlx5_modify_hdr *mod_hdr;
drivers/net/ethernet/mellanox/mlx5/core/port.c+5−4
@@ -406,23 +406,24 @@ int mlx5_query_module_eeprom(struct mlx5_core_dev *dev, · 405 unmodified lines
406406
407407 switch (module_id) {
408408 case MLX5_MODULE_ID_SFP:
409− mlx5_sfp_eeprom_params_set(&query.i2c_address, &query.page, &query.offset);
409+ mlx5_sfp_eeprom_params_set(&query.i2c_address, &query.page, &offset);
410410 break;
411411 case MLX5_MODULE_ID_QSFP:
412412 case MLX5_MODULE_ID_QSFP_PLUS:
413413 case MLX5_MODULE_ID_QSFP28:
414− mlx5_qsfp_eeprom_params_set(&query.i2c_address, &query.page, &query.offset);
414+ mlx5_qsfp_eeprom_params_set(&query.i2c_address, &query.page, &offset);
415415 break;
416416 default:
417417 mlx5_core_err(dev, "Module ID not recognized: 0x%x\n", module_id);
418418 return -EINVAL;
419419 }
420420
421− if (query.offset + size > MLX5_EEPROM_PAGE_LENGTH)
421+ if (offset + size > MLX5_EEPROM_PAGE_LENGTH)
422422 /* Cross pages read, read until offset 256 in low page */
423− size -= offset + size - MLX5_EEPROM_PAGE_LENGTH;
423+ size = MLX5_EEPROM_PAGE_LENGTH - offset;
424424
425425 query.size = size;
426+ query.offset = offset;
426427
427428 return mlx5_query_mcia(dev, &query, data);
428429 }
drivers/net/ethernet/microchip/sparx5/sparx5_packet.c+1−1
@@ -145,9 +145,9 @@ static void sparx5_xtr_grp(struct sparx5 *sparx5, u8 grp, bool byte_swap) · 144 unmodified lines
145145 skb_put(skb, byte_cnt - ETH_FCS_LEN);
146146 eth_skb_pad(skb);
147147 skb->protocol = eth_type_trans(skb, netdev);
148− netif_rx(skb);
149148 netdev->stats.rx_bytes += skb->len;
150149 netdev->stats.rx_packets++;
150+ netif_rx(skb);
151151 }
152152
153153 static int sparx5_inject(struct sparx5 *sparx5,
drivers/net/ethernet/smsc/smc911x.c+4−4
@@ -1648,7 +1648,7 @@ static int smc911x_ethtool_geteeprom(struct net_device *dev, · 1647 unmodified lines
16481648 return ret;
16491649 if ((ret=smc911x_ethtool_read_eeprom_byte(dev, &eebuf[i]))!=0)
16501650 return ret;
1651− }
1651+ }
16521652 memcpy(data, eebuf+eeprom->offset, eeprom->len);
16531653 return 0;
16541654 }
@@ -1667,11 +1667,11 @@ static int smc911x_ethtool_seteeprom(struct net_device *dev, · 12 unmodified lines
16671667 return ret;
16681668 /* write byte */
16691669 if ((ret=smc911x_ethtool_write_eeprom_byte(dev, *data))!=0)
1670− return ret;
1670+ return ret;
16711671 if ((ret=smc911x_ethtool_write_eeprom_cmd(dev, E2P_CMD_EPC_CMD_WRITE_, i ))!=0)
16721672 return ret;
1673− }
1674− return 0;
1673+ }
1674+ return 0;
16751675 }
16761676
16771677 static int smc911x_ethtool_geteeprom_len(struct net_device *dev)
drivers/net/ethernet/stmicro/stmmac/dwmac-visconti.c+7−2
@@ -49,13 +49,15 @@ struct visconti_eth { · 48 unmodified lines
4949 void __iomem *reg;
5050 u32 phy_intf_sel;
5151 struct clk *phy_ref_clk;
52+ struct device *dev;
5253 spinlock_t lock; /* lock to protect register update */
5354 };
5455
5556 static void visconti_eth_fix_mac_speed(void *priv, unsigned int speed)
5657 {
5758 struct visconti_eth *dwmac = priv;
58− unsigned int val, clk_sel_val;
59+ struct net_device *netdev = dev_get_drvdata(dwmac->dev);
60+ unsigned int val, clk_sel_val = 0;
5961 unsigned long flags;
6062
6163 spin_lock_irqsave(&dwmac->lock, flags);
@@ -85,7 +87,9 @@ static void visconti_eth_fix_mac_speed(void *priv, unsigned int speed) · 23 unmodified lines
8587 break;
8688 default:
8789 /* No bit control */
88− break;
90+ netdev_err(netdev, "Unsupported speed request (%d)", speed);
91+ spin_unlock_irqrestore(&dwmac->lock, flags);
92+ return;
8993 }
9094
9195 writel(val, dwmac->reg + MAC_CTRL_REG);
@@ -229,6 +233,7 @@ static int visconti_eth_dwmac_probe(struct platform_device *pdev) · 137 unmodified lines
229233
230234 spin_lock_init(&dwmac->lock);
231235 dwmac->reg = stmmac_res.addr;
236+ dwmac->dev = &pdev->dev;
232237 plat_dat->bsp_priv = dwmac;
233238 plat_dat->fix_mac_speed = visconti_eth_fix_mac_speed;
234239
drivers/net/ethernet/stmicro/stmmac/dwmac_dma.h+1−0
@@ -150,6 +150,7 @@ · 149 unmodified lines
150150
151151 #define NUM_DWMAC100_DMA_REGS 9
152152 #define NUM_DWMAC1000_DMA_REGS 23
153+#define NUM_DWMAC4_DMA_REGS 27
153154
154155 void dwmac_enable_dma_transmission(void __iomem *ioaddr);
155156 void dwmac_enable_dma_irq(void __iomem *ioaddr, u32 chan, bool rx, bool tx);
drivers/net/ethernet/stmicro/stmmac/stmmac_ethtool.c+17−2
@@ -21,10 +21,18 @@ · 20 unmodified lines
2121 #include "dwxgmac2.h"
2222
2323 #define REG_SPACE_SIZE 0x1060
24+#define GMAC4_REG_SPACE_SIZE 0x116C
2425 #define MAC100_ETHTOOL_NAME "st_mac100"
2526 #define GMAC_ETHTOOL_NAME "st_gmac"
2627 #define XGMAC_ETHTOOL_NAME "st_xgmac"
2728
29+/* Same as DMA_CHAN_BASE_ADDR defined in dwmac4_dma.h
30+ *
31+ * It is here because dwmac_dma.h and dwmac4_dam.h can not be included at the
32+ * same time due to the conflicting macro names.
33+ */
34+#define GMAC4_DMA_CHAN_BASE_ADDR 0x00001100
35+
2836 #define ETHTOOL_DMA_OFFSET 55
2937
3038 struct stmmac_stats {
@@ -434,6 +442,8 @@ static int stmmac_ethtool_get_regs_len(struct net_device *dev) · 403 unmodified lines
434442
435443 if (priv->plat->has_xgmac)
436444 return XGMAC_REGSIZE * 4;
445+ else if (priv->plat->has_gmac4)
446+ return GMAC4_REG_SPACE_SIZE;
437447 return REG_SPACE_SIZE;
438448 }
439449
@@ -446,8 +456,13 @@ static void stmmac_ethtool_gregs(struct net_device *dev, · 6 unmodified lines
446456 stmmac_dump_mac_regs(priv, priv->hw, reg_space);
447457 stmmac_dump_dma_regs(priv, priv->ioaddr, reg_space);
448458
449− if (!priv->plat->has_xgmac) {
450− /* Copy DMA registers to where ethtool expects them */
459+ /* Copy DMA registers to where ethtool expects them */
460+ if (priv->plat->has_gmac4) {
461+ /* GMAC4 dumps its DMA registers at its DMA_CHAN_BASE_ADDR */
462+ memcpy(&reg_space[ETHTOOL_DMA_OFFSET],
463+ &reg_space[GMAC4_DMA_CHAN_BASE_ADDR / 4],
464+ NUM_DWMAC4_DMA_REGS * 4);
465+ } else if (!priv->plat->has_xgmac) {
451466 memcpy(&reg_space[ETHTOOL_DMA_OFFSET],
452467 &reg_space[DMA_BUS_MODE / 4],
453468 NUM_DWMAC1000_DMA_REGS * 4);
drivers/net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c+12−7
@@ -145,15 +145,20 @@ static int adjust_systime(void __iomem *ioaddr, u32 sec, u32 nsec, · 144 unmodified lines
145145
146146 static void get_systime(void __iomem *ioaddr, u64 *systime)
147147 {
148− u64 ns;
149−
150− /* Get the TSSS value */
151− ns = readl(ioaddr + PTP_STNSR);
152− /* Get the TSS and convert sec time value to nanosecond */
153− ns += readl(ioaddr + PTP_STSR) * 1000000000ULL;
148+ u64 ns, sec0, sec1;
149+
150+ /* Get the TSS value */
151+ sec1 = readl_relaxed(ioaddr + PTP_STSR);
152+ do {
153+ sec0 = sec1;
154+ /* Get the TSSS value */
155+ ns = readl_relaxed(ioaddr + PTP_STNSR);
156+ /* Get the TSS value */
157+ sec1 = readl_relaxed(ioaddr + PTP_STSR);
158+ } while (sec0 != sec1);
154159
155160 if (systime)
156− *systime = ns;
161+ *systime = ns + (sec1 * 1000000000ULL);
157162 }
158163
159164 static void get_ptptime(void __iomem *ptpaddr, u64 *ptp_time)
drivers/net/ethernet/stmicro/stmmac/stmmac_main.c+4−2
@@ -7252,6 +7252,10 @@ int stmmac_dvr_remove(struct device *dev) · 7251 unmodified lines
72527252
72537253 netdev_info(priv->dev, "%s: removing driver", __func__);
72547254
7255+ pm_runtime_get_sync(dev);
7256+ pm_runtime_disable(dev);
7257+ pm_runtime_put_noidle(dev);
7258+
72557259 stmmac_stop_all_dma(priv);
72567260 stmmac_mac_set(priv, priv->ioaddr, false);
72577261 netif_carrier_off(ndev);
@@ -7270,8 +7274,6 @@ int stmmac_dvr_remove(struct device *dev) · 12 unmodified lines
72707274 if (priv->plat->stmmac_rst)
72717275 reset_control_assert(priv->plat->stmmac_rst);
72727276 reset_control_assert(priv->plat->stmmac_ahb_rst);
7273− pm_runtime_put(dev);
7274− pm_runtime_disable(dev);
72757277 if (priv->hw->pcs != STMMAC_PCS_TBI &&
72767278 priv->hw->pcs != STMMAC_PCS_RTBI)
72777279 stmmac_mdio_unregister(ndev);
drivers/net/ieee802154/at86rf230.c+11−2
@@ -100,6 +100,7 @@ struct at86rf230_local { · 99 unmodified lines
100100 unsigned long cal_timeout;
101101 bool is_tx;
102102 bool is_tx_from_off;
103+ bool was_tx;
103104 u8 tx_retry;
104105 struct sk_buff *tx_skb;
105106 struct at86rf230_state_change tx;
@@ -343,7 +344,11 @@ at86rf230_async_error_recover_complete(void *context) · 237 unmodified lines
343344 if (ctx->free)
344345 kfree(ctx);
345346
346− ieee802154_wake_queue(lp->hw);
347+ if (lp->was_tx) {
348+ lp->was_tx = 0;
349+ dev_kfree_skb_any(lp->tx_skb);
350+ ieee802154_wake_queue(lp->hw);
351+ }
347352 }
348353
349354 static void
@@ -352,7 +357,11 @@ at86rf230_async_error_recover(void *context) · 2 unmodified lines
352357 struct at86rf230_state_change *ctx = context;
353358 struct at86rf230_local *lp = ctx->lp;
354359
355− lp->is_tx = 0;
360+ if (lp->is_tx) {
361+ lp->was_tx = 1;
362+ lp->is_tx = 0;
363+ }
364+
356365 at86rf230_async_state_change(lp, ctx, STATE_RX_AACK_ON,
357366 at86rf230_async_error_recover_complete);
358367 }
drivers/net/ieee802154/ca8210.c+1−0
@@ -1771,6 +1771,7 @@ static int ca8210_async_xmit_complete( · 1770 unmodified lines
17711771 status
17721772 );
17731773 if (status != MAC_TRANSACTION_OVERFLOW) {
1774+ dev_kfree_skb_any(priv->tx_skb);
17741775 ieee802154_wake_queue(priv->hw);
17751776 return 0;
17761777 }
drivers/net/ieee802154/mac802154_hwsim.c+1−0
@@ -786,6 +786,7 @@ static int hwsim_add_one(struct genl_info *info, struct device *dev, · 785 unmodified lines
786786 goto err_pib;
787787 }
788788
789+ pib->channel = 13;
789790 rcu_assign_pointer(phy->pib, pib);
790791 phy->idx = idx;
791792 INIT_LIST_HEAD(&phy->edges);
drivers/net/ieee802154/mcr20a.c+2−2
@@ -976,8 +976,8 @@ static void mcr20a_hw_setup(struct mcr20a_local *lp) · 975 unmodified lines
976976 dev_dbg(printdev(lp), "%s\n", __func__);
977977
978978 phy->symbol_duration = 16;
979− phy->lifs_period = 40;
980− phy->sifs_period = 12;
979+ phy->lifs_period = 40 * phy->symbol_duration;
980+ phy->sifs_period = 12 * phy->symbol_duration;
981981
982982 hw->flags = IEEE802154_HW_TX_OMIT_CKSUM |
983983 IEEE802154_HW_AFILT |
drivers/net/ipa/ipa_power.c+52−0
@@ -11,6 +11,8 @@ · 10 unmodified lines
1111 #include <linux/pm_runtime.h>
1212 #include <linux/bitops.h>
1313
14+#include "linux/soc/qcom/qcom_aoss.h"
15+
1416 #include "ipa.h"
1517 #include "ipa_power.h"
1618 #include "ipa_endpoint.h"
@@ -64,6 +66,7 @@ enum ipa_power_flag { · 47 unmodified lines
6466 * struct ipa_power - IPA power management information
6567 * @dev: IPA device pointer
6668 * @core: IPA core clock
69+ * @qmp: QMP handle for AOSS communication
6770 * @spinlock: Protects modem TX queue enable/disable
6871 * @flags: Boolean state flags
6972 * @interconnect_count: Number of elements in interconnect[]
@@ -72,6 +75,7 @@ enum ipa_power_flag { · 2 unmodified lines
7275 struct ipa_power {
7376 struct device *dev;
7477 struct clk *core;
78+ struct qmp *qmp;
7579 spinlock_t spinlock; /* used with STOPPED/STARTED power flags */
7680 DECLARE_BITMAP(flags, IPA_POWER_FLAG_COUNT);
7781 u32 interconnect_count;
@@ -382,6 +386,47 @@ void ipa_power_modem_queue_active(struct ipa *ipa) · 304 unmodified lines
382386 clear_bit(IPA_POWER_FLAG_STARTED, ipa->power->flags);
383387 }
384388
389+static int ipa_power_retention_init(struct ipa_power *power)
390+{
391+ struct qmp *qmp = qmp_get(power->dev);
392+
393+ if (IS_ERR(qmp)) {
394+ if (PTR_ERR(qmp) == -EPROBE_DEFER)
395+ return -EPROBE_DEFER;
396+
397+ /* We assume any other error means it's not defined/needed */
398+ qmp = NULL;
399+ }
400+ power->qmp = qmp;
401+
402+ return 0;
403+}
404+
405+static void ipa_power_retention_exit(struct ipa_power *power)
406+{
407+ qmp_put(power->qmp);
408+ power->qmp = NULL;
409+}
410+
411+/* Control register retention on power collapse */
412+void ipa_power_retention(struct ipa *ipa, bool enable)
413+{
414+ static const char fmt[] = "{ class: bcm, res: ipa_pc, val: %c }";
415+ struct ipa_power *power = ipa->power;
416+ char buf[36]; /* Exactly enough for fmt[]; size a multiple of 4 */
417+ int ret;
418+
419+ if (!power->qmp)
420+ return; /* Not needed on this platform */
421+
422+ (void)snprintf(buf, sizeof(buf), fmt, enable ? '1' : '0');
423+
424+ ret = qmp_send(power->qmp, buf, sizeof(buf));
425+ if (ret)
426+ dev_err(power->dev, "error %d sending QMP %sable request\n",
427+ ret, enable ? "en" : "dis");
428+}
429+
385430 int ipa_power_setup(struct ipa *ipa)
386431 {
387432 int ret;
@@ -438,12 +483,18 @@ ipa_power_init(struct device *dev, const struct ipa_power_data *data) · 50 unmodified lines
438483 if (ret)
439484 goto err_kfree;
440485
486+ ret = ipa_power_retention_init(power);
487+ if (ret)
488+ goto err_interconnect_exit;
489+
441490 pm_runtime_set_autosuspend_delay(dev, IPA_AUTOSUSPEND_DELAY);
442491 pm_runtime_use_autosuspend(dev);
443492 pm_runtime_enable(dev);
444493
445494 return power;
446495
496+err_interconnect_exit:
497+ ipa_interconnect_exit(power);
447498 err_kfree:
448499 kfree(power);
449500 err_clk_put:
@@ -460,6 +511,7 @@ void ipa_power_exit(struct ipa_power *power) · 10 unmodified lines
460511
461512 pm_runtime_disable(dev);
462513 pm_runtime_dont_use_autosuspend(dev);
514+ ipa_power_retention_exit(power);
463515 ipa_interconnect_exit(power);
464516 kfree(power);
465517 clk_put(clk);
drivers/net/ipa/ipa_power.h+7−0
@@ -40,6 +40,13 @@ void ipa_power_modem_queue_wake(struct ipa *ipa); · 39 unmodified lines
4040 */
4141 void ipa_power_modem_queue_active(struct ipa *ipa);
4242
43+/**
44+ * ipa_power_retention() - Control register retention on power collapse
45+ * @ipa: IPA pointer
46+ * @enable: Whether retention should be enabled or disabled
47+ */
48+void ipa_power_retention(struct ipa *ipa, bool enable);
49+
4350 /**
4451 * ipa_power_setup() - Set up IPA power management
4552 * @ipa: IPA pointer
drivers/net/ipa/ipa_uc.c+5−0
@@ -11,6 +11,7 @@ · 10 unmodified lines
1111
1212 #include "ipa.h"
1313 #include "ipa_uc.h"
14+#include "ipa_power.h"
1415
1516 /**
1617 * DOC: The IPA embedded microcontroller
@@ -154,6 +155,7 @@ static void ipa_uc_response_hdlr(struct ipa *ipa, enum ipa_irq_id irq_id) · 137 unmodified lines
154155 case IPA_UC_RESPONSE_INIT_COMPLETED:
155156 if (ipa->uc_powered) {
156157 ipa->uc_loaded = true;
158+ ipa_power_retention(ipa, true);
157159 pm_runtime_mark_last_busy(dev);
158160 (void)pm_runtime_put_autosuspend(dev);
159161 ipa->uc_powered = false;
@@ -184,6 +186,9 @@ void ipa_uc_deconfig(struct ipa *ipa) · 24 unmodified lines
184186
185187 ipa_interrupt_remove(ipa->interrupt, IPA_IRQ_UC_1);
186188 ipa_interrupt_remove(ipa->interrupt, IPA_IRQ_UC_0);
189+ if (ipa->uc_loaded)
190+ ipa_power_retention(ipa, false);
191+
187192 if (!ipa->uc_powered)
188193 return;
189194
drivers/net/macsec.c+21−12
@@ -3870,6 +3870,18 @@ static void macsec_common_dellink(struct net_device *dev, struct list_head *head · 3869 unmodified lines
38703870 struct macsec_dev *macsec = macsec_priv(dev);
38713871 struct net_device *real_dev = macsec->real_dev;
38723872
3873+ /* If h/w offloading is available, propagate to the device */
3874+ if (macsec_is_offloaded(macsec)) {
3875+ const struct macsec_ops *ops;
3876+ struct macsec_context ctx;
3877+
3878+ ops = macsec_get_ops(netdev_priv(dev), &ctx);
3879+ if (ops) {
3880+ ctx.secy = &macsec->secy;
3881+ macsec_offload(ops->mdo_del_secy, &ctx);
3882+ }
3883+ }
3884+
38733885 unregister_netdevice_queue(dev, head);
38743886 list_del_rcu(&macsec->secys);
38753887 macsec_del_dev(macsec);
@@ -3884,18 +3896,6 @@ static void macsec_dellink(struct net_device *dev, struct list_head *head) · 8 unmodified lines
38843896 struct net_device *real_dev = macsec->real_dev;
38853897 struct macsec_rxh_data *rxd = macsec_data_rtnl(real_dev);
38863898
3887− /* If h/w offloading is available, propagate to the device */
3888− if (macsec_is_offloaded(macsec)) {
3889− const struct macsec_ops *ops;
3890− struct macsec_context ctx;
3891−
3892− ops = macsec_get_ops(netdev_priv(dev), &ctx);
3893− if (ops) {
3894− ctx.secy = &macsec->secy;
3895− macsec_offload(ops->mdo_del_secy, &ctx);
3896− }
3897− }
3898−
38993899 macsec_common_dellink(dev, head);
39003900
39013901 if (list_empty(&rxd->secys)) {
@@ -4018,6 +4018,15 @@ static int macsec_newlink(struct net *net, struct net_device *dev, · 116 unmodified lines
40184018 !macsec_check_offload(macsec->offload, macsec))
40194019 return -EOPNOTSUPP;
40204020
4021+ /* send_sci must be set to true when transmit sci explicitly is set */
4022+ if ((data && data[IFLA_MACSEC_SCI]) &&
4023+ (data && data[IFLA_MACSEC_INC_SCI])) {
4024+ u8 send_sci = !!nla_get_u8(data[IFLA_MACSEC_INC_SCI]);
4025+
4026+ if (!send_sci)
4027+ return -EINVAL;
4028+ }
4029+
40214030 if (data && data[IFLA_MACSEC_ICV_LEN])
40224031 icv_len = nla_get_u8(data[IFLA_MACSEC_ICV_LEN]);
40234032 mtu = real_dev->mtu - icv_len - macsec_extra_len(true);
drivers/net/phy/at803x.c+13−13
@@ -1688,19 +1688,19 @@ static int qca808x_read_status(struct phy_device *phydev) · 1687 unmodified lines
16881688 if (ret < 0)
16891689 return ret;
16901690
1691− if (phydev->link && phydev->speed == SPEED_2500)
1692− phydev->interface = PHY_INTERFACE_MODE_2500BASEX;
1693− else
1694− phydev->interface = PHY_INTERFACE_MODE_SMII;
1695−
1696− /* generate seed as a lower random value to make PHY linked as SLAVE easily,
1697− * except for master/slave configuration fault detected.
1698− * the reason for not putting this code into the function link_change_notify is
1699− * the corner case where the link partner is also the qca8081 PHY and the seed
1700− * value is configured as the same value, the link can't be up and no link change
1701− * occurs.
1702− */
1703− if (!phydev->link) {
1691+ if (phydev->link) {
1692+ if (phydev->speed == SPEED_2500)
1693+ phydev->interface = PHY_INTERFACE_MODE_2500BASEX;
1694+ else
1695+ phydev->interface = PHY_INTERFACE_MODE_SGMII;
1696+ } else {
1697+ /* generate seed as a lower random value to make PHY linked as SLAVE easily,
1698+ * except for master/slave configuration fault detected.
1699+ * the reason for not putting this code into the function link_change_notify is
1700+ * the corner case where the link partner is also the qca8081 PHY and the seed
1701+ * value is configured as the same value, the link can't be up and no link change
1702+ * occurs.
1703+ */
17041704 if (phydev->master_slave_state == MASTER_SLAVE_STATE_ERR) {
17051705 qca808x_phy_ms_seed_enable(phydev, false);
17061706 } else {
drivers/net/usb/ipheth.c+3−3
@@ -121,7 +121,7 @@ static int ipheth_alloc_urbs(struct ipheth_device *iphone) · 120 unmodified lines
121121 if (tx_buf == NULL)
122122 goto free_rx_urb;
123123
124− rx_buf = usb_alloc_coherent(iphone->udev, IPHETH_BUF_SIZE,
124+ rx_buf = usb_alloc_coherent(iphone->udev, IPHETH_BUF_SIZE + IPHETH_IP_ALIGN,
125125 GFP_KERNEL, &rx_urb->transfer_dma);
126126 if (rx_buf == NULL)
127127 goto free_tx_buf;
@@ -146,7 +146,7 @@ error_nomem: · 18 unmodified lines
146146
147147 static void ipheth_free_urbs(struct ipheth_device *iphone)
148148 {
149− usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, iphone->rx_buf,
149+ usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE + IPHETH_IP_ALIGN, iphone->rx_buf,
150150 iphone->rx_urb->transfer_dma);
151151 usb_free_coherent(iphone->udev, IPHETH_BUF_SIZE, iphone->tx_buf,
152152 iphone->tx_urb->transfer_dma);
@@ -317,7 +317,7 @@ static int ipheth_rx_submit(struct ipheth_device *dev, gfp_t mem_flags) · 164 unmodified lines
317317
318318 usb_fill_bulk_urb(dev->rx_urb, udev,
319319 usb_rcvbulkpipe(udev, dev->bulk_in),
320− dev->rx_buf, IPHETH_BUF_SIZE,
320+ dev->rx_buf, IPHETH_BUF_SIZE + IPHETH_IP_ALIGN,
321321 ipheth_rcvbulk_callback,
322322 dev);
323323 dev->rx_urb->transfer_flags |= URB_NO_TRANSFER_DMA_MAP;
drivers/nvme/host/core.c+8−1
@@ -4253,7 +4253,14 @@ static void nvme_async_event_work(struct work_struct *work) · 4252 unmodified lines
42534253 container_of(work, struct nvme_ctrl, async_event_work);
42544254
42554255 nvme_aen_uevent(ctrl);
4256− ctrl->ops->submit_async_event(ctrl);
4256+
4257+ /*
4258+ * The transport drivers must guarantee AER submission here is safe by
4259+ * flushing ctrl async_event_work after changing the controller state
4260+ * from LIVE and before freeing the admin queue.
4261+ */
4262+ if (ctrl->state == NVME_CTRL_LIVE)
4263+ ctrl->ops->submit_async_event(ctrl);
42574264 }
42584265
42594266 static bool nvme_ctrl_pp_status(struct nvme_ctrl *ctrl)
drivers/nvme/host/fabrics.h+1−0
@@ -170,6 +170,7 @@ nvmf_ctlr_matches_baseopts(struct nvme_ctrl *ctrl, · 169 unmodified lines
170170 struct nvmf_ctrl_options *opts)
171171 {
172172 if (ctrl->state == NVME_CTRL_DELETING ||
173+ ctrl->state == NVME_CTRL_DELETING_NOIO ||
173174 ctrl->state == NVME_CTRL_DEAD ||
174175 strcmp(opts->subsysnqn, ctrl->opts->subsysnqn) ||
175176 strcmp(opts->host->nqn, ctrl->opts->host->nqn) ||
drivers/nvme/host/rdma.c+1−0
@@ -1200,6 +1200,7 @@ static void nvme_rdma_error_recovery_work(struct work_struct *work) · 1199 unmodified lines
12001200 struct nvme_rdma_ctrl, err_work);
12011201
12021202 nvme_stop_keep_alive(&ctrl->ctrl);
1203+ flush_work(&ctrl->ctrl.async_event_work);
12031204 nvme_rdma_teardown_io_queues(ctrl, false);
12041205 nvme_start_queues(&ctrl->ctrl);
12051206 nvme_rdma_teardown_admin_queue(ctrl, false);
drivers/nvme/host/tcp.c+1−0
@@ -2096,6 +2096,7 @@ static void nvme_tcp_error_recovery_work(struct work_struct *work) · 2095 unmodified lines
20962096 struct nvme_ctrl *ctrl = &tcp_ctrl->ctrl;
20972097
20982098 nvme_stop_keep_alive(ctrl);
2099+ flush_work(&ctrl->async_event_work);
20992100 nvme_tcp_teardown_io_queues(ctrl, false);
21002101 /* unquiesce to fail fast pending requests */
21012102 nvme_start_queues(ctrl);
drivers/pci/controller/cadence/pci-j721e.c+42−43
@@ -356,8 +356,8 @@ static int j721e_pcie_probe(struct platform_device *pdev) · 355 unmodified lines
356356 const struct j721e_pcie_data *data;
357357 struct cdns_pcie *cdns_pcie;
358358 struct j721e_pcie *pcie;
359− struct cdns_pcie_rc *rc;
360− struct cdns_pcie_ep *ep;
359+ struct cdns_pcie_rc *rc = NULL;
360+ struct cdns_pcie_ep *ep = NULL;
361361 struct gpio_desc *gpiod;
362362 void __iomem *base;
363363 struct clk *clk;
@@ -376,6 +376,46 @@ static int j721e_pcie_probe(struct platform_device *pdev) · 12 unmodified lines
376376 if (!pcie)
377377 return -ENOMEM;
378378
379+ switch (mode) {
380+ case PCI_MODE_RC:
381+ if (!IS_ENABLED(CONFIG_PCIE_CADENCE_HOST))
382+ return -ENODEV;
383+
384+ bridge = devm_pci_alloc_host_bridge(dev, sizeof(*rc));
385+ if (!bridge)
386+ return -ENOMEM;
387+
388+ if (!data->byte_access_allowed)
389+ bridge->ops = &cdns_ti_pcie_host_ops;
390+ rc = pci_host_bridge_priv(bridge);
391+ rc->quirk_retrain_flag = data->quirk_retrain_flag;
392+ rc->quirk_detect_quiet_flag = data->quirk_detect_quiet_flag;
393+
394+ cdns_pcie = &rc->pcie;
395+ cdns_pcie->dev = dev;
396+ cdns_pcie->ops = &j721e_pcie_ops;
397+ pcie->cdns_pcie = cdns_pcie;
398+ break;
399+ case PCI_MODE_EP:
400+ if (!IS_ENABLED(CONFIG_PCIE_CADENCE_EP))
401+ return -ENODEV;
402+
403+ ep = devm_kzalloc(dev, sizeof(*ep), GFP_KERNEL);
404+ if (!ep)
405+ return -ENOMEM;
406+
407+ ep->quirk_detect_quiet_flag = data->quirk_detect_quiet_flag;
408+
409+ cdns_pcie = &ep->pcie;
410+ cdns_pcie->dev = dev;
411+ cdns_pcie->ops = &j721e_pcie_ops;
412+ pcie->cdns_pcie = cdns_pcie;
413+ break;
414+ default:
415+ dev_err(dev, "INVALID device type %d\n", mode);
416+ return 0;
417+ }
418+
379419 pcie->mode = mode;
380420 pcie->linkdown_irq_regfield = data->linkdown_irq_regfield;
381421
@@ -426,28 +466,6 @@ static int j721e_pcie_probe(struct platform_device *pdev) · 44 unmodified lines
426466
427467 switch (mode) {
428468 case PCI_MODE_RC:
429− if (!IS_ENABLED(CONFIG_PCIE_CADENCE_HOST)) {
430− ret = -ENODEV;
431− goto err_get_sync;
432− }
433−
434− bridge = devm_pci_alloc_host_bridge(dev, sizeof(*rc));
435− if (!bridge) {
436− ret = -ENOMEM;
437− goto err_get_sync;
438− }
439−
440− if (!data->byte_access_allowed)
441− bridge->ops = &cdns_ti_pcie_host_ops;
442− rc = pci_host_bridge_priv(bridge);
443− rc->quirk_retrain_flag = data->quirk_retrain_flag;
444− rc->quirk_detect_quiet_flag = data->quirk_detect_quiet_flag;
445−
446− cdns_pcie = &rc->pcie;
447− cdns_pcie->dev = dev;
448− cdns_pcie->ops = &j721e_pcie_ops;
449− pcie->cdns_pcie = cdns_pcie;
450−
451469 gpiod = devm_gpiod_get_optional(dev, "reset", GPIOD_OUT_LOW);
452470 if (IS_ERR(gpiod)) {
453471 ret = PTR_ERR(gpiod);
@@ -497,23 +515,6 @@ static int j721e_pcie_probe(struct platform_device *pdev) · 43 unmodified lines
497515
498516 break;
499517 case PCI_MODE_EP:
500− if (!IS_ENABLED(CONFIG_PCIE_CADENCE_EP)) {
501− ret = -ENODEV;
502− goto err_get_sync;
503− }
504−
505− ep = devm_kzalloc(dev, sizeof(*ep), GFP_KERNEL);
506− if (!ep) {
507− ret = -ENOMEM;
508− goto err_get_sync;
509− }
510− ep->quirk_detect_quiet_flag = data->quirk_detect_quiet_flag;
511−
512− cdns_pcie = &ep->pcie;
513− cdns_pcie->dev = dev;
514− cdns_pcie->ops = &j721e_pcie_ops;
515− pcie->cdns_pcie = cdns_pcie;
516−
517518 ret = cdns_pcie_init_phy(dev, cdns_pcie);
518519 if (ret) {
519520 dev_err(dev, "Failed to init phy\n");
@@ -525,8 +526,6 @@ static int j721e_pcie_probe(struct platform_device *pdev) · 5 unmodified lines
525526 goto err_pcie_setup;
526527
527528 break;
528− default:
529− dev_err(dev, "INVALID device type %d\n", mode);
530529 }
531530
532531 return 0;
drivers/pci/controller/dwc/pcie-kirin.c+18−13
@@ -756,22 +756,28 @@ static int __exit kirin_pcie_remove(struct platform_device *pdev) · 755 unmodified lines
756756 return 0;
757757 }
758758
759+struct kirin_pcie_data {
760+ enum pcie_kirin_phy_type phy_type;
761+};
762+
763+static const struct kirin_pcie_data kirin_960_data = {
764+ .phy_type = PCIE_KIRIN_INTERNAL_PHY,
765+};
766+
767+static const struct kirin_pcie_data kirin_970_data = {
768+ .phy_type = PCIE_KIRIN_EXTERNAL_PHY,
769+};
770+
759771 static const struct of_device_id kirin_pcie_match[] = {
760− {
761− .compatible = "hisilicon,kirin960-pcie",
762− .data = (void *)PCIE_KIRIN_INTERNAL_PHY
763− },
764− {
765− .compatible = "hisilicon,kirin970-pcie",
766− .data = (void *)PCIE_KIRIN_EXTERNAL_PHY
767− },
772+ { .compatible = "hisilicon,kirin960-pcie", .data = &kirin_960_data },
773+ { .compatible = "hisilicon,kirin970-pcie", .data = &kirin_970_data },
768774 {},
769775 };
770776
771777 static int kirin_pcie_probe(struct platform_device *pdev)
772778 {
773− enum pcie_kirin_phy_type phy_type;
774779 struct device *dev = &pdev->dev;
780+ const struct kirin_pcie_data *data;
775781 struct kirin_pcie *kirin_pcie;
776782 struct dw_pcie *pci;
777783 int ret;
@@ -781,13 +787,12 @@ static int kirin_pcie_probe(struct platform_device *pdev) · 3 unmodified lines
781787 return -EINVAL;
782788 }
783789
784− phy_type = (long)of_device_get_match_data(dev);
785− if (!phy_type) {
790+ data = of_device_get_match_data(dev);
791+ if (!data) {
786792 dev_err(dev, "OF data missing\n");
787793 return -EINVAL;
788794 }
789795
790−
791796 kirin_pcie = devm_kzalloc(dev, sizeof(struct kirin_pcie), GFP_KERNEL);
792797 if (!kirin_pcie)
793798 return -ENOMEM;
@@ -800,7 +805,7 @@ static int kirin_pcie_probe(struct platform_device *pdev) · 6 unmodified lines
800805 pci->ops = &kirin_dw_pcie_ops;
801806 pci->pp.ops = &kirin_pcie_host_ops;
802807 kirin_pcie->pci = pci;
803− kirin_pcie->type = phy_type;
808+ kirin_pcie->type = data->phy_type;
804809
805810 ret = kirin_pcie_get_resource(kirin_pcie, pdev);
806811 if (ret)
drivers/pinctrl/Makefile+1−1
@@ -42,9 +42,9 @@ obj-$(CONFIG_PINCTRL_PISTACHIO) += pinctrl-pistachio.o · 41 unmodified lines
4242 obj-$(CONFIG_PINCTRL_RK805) += pinctrl-rk805.o
4343 obj-$(CONFIG_PINCTRL_ROCKCHIP) += pinctrl-rockchip.o
4444 obj-$(CONFIG_PINCTRL_SINGLE) += pinctrl-single.o
45+obj-$(CONFIG_PINCTRL_ST) += pinctrl-st.o
4546 obj-$(CONFIG_PINCTRL_STARFIVE) += pinctrl-starfive.o
4647 obj-$(CONFIG_PINCTRL_STMFX) += pinctrl-stmfx.o
47−obj-$(CONFIG_PINCTRL_ST) += pinctrl-st.o
4848 obj-$(CONFIG_PINCTRL_SX150X) += pinctrl-sx150x.o
4949 obj-$(CONFIG_PINCTRL_TB10X) += pinctrl-tb10x.o
5050 obj-$(CONFIG_PINCTRL_THUNDERBAY) += pinctrl-thunderbay.o
drivers/pinctrl/bcm/Kconfig+1−0
@@ -35,6 +35,7 @@ config PINCTRL_BCM63XX · 34 unmodified lines
3535 select PINCONF
3636 select GENERIC_PINCONF
3737 select GPIOLIB
38+ select REGMAP
3839 select GPIO_REGMAP
3940
4041 config PINCTRL_BCM6318
drivers/pinctrl/bcm/pinctrl-bcm2835.c+15−8
@@ -1269,16 +1269,18 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev) · 1268 unmodified lines
12691269 sizeof(*girq->parents),
12701270 GFP_KERNEL);
12711271 if (!girq->parents) {
1272− pinctrl_remove_gpio_range(pc->pctl_dev, &pc->gpio_range);
1273− return -ENOMEM;
1272+ err = -ENOMEM;
1273+ goto out_remove;
12741274 }
12751275
12761276 if (is_7211) {
12771277 pc->wake_irq = devm_kcalloc(dev, BCM2835_NUM_IRQS,
12781278 sizeof(*pc->wake_irq),
12791279 GFP_KERNEL);
1280− if (!pc->wake_irq)
1281− return -ENOMEM;
1280+ if (!pc->wake_irq) {
1281+ err = -ENOMEM;
1282+ goto out_remove;
1283+ }
12821284 }
12831285
12841286 /*
@@ -1306,8 +1308,10 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev) · 21 unmodified lines
13061308
13071309 len = strlen(dev_name(pc->dev)) + 16;
13081310 name = devm_kzalloc(pc->dev, len, GFP_KERNEL);
1309− if (!name)
1310− return -ENOMEM;
1311+ if (!name) {
1312+ err = -ENOMEM;
1313+ goto out_remove;
1314+ }
13111315
13121316 snprintf(name, len, "%s:bank%d", dev_name(pc->dev), i);
13131317
@@ -1326,11 +1330,14 @@ static int bcm2835_pinctrl_probe(struct platform_device *pdev) · 12 unmodified lines
13261330 err = gpiochip_add_data(&pc->gpio_chip, pc);
13271331 if (err) {
13281332 dev_err(dev, "could not add GPIO chip\n");
1329− pinctrl_remove_gpio_range(pc->pctl_dev, &pc->gpio_range);
1330− return err;
1333+ goto out_remove;
13311334 }
13321335
13331336 return 0;
1337+
1338+out_remove:
1339+ pinctrl_remove_gpio_range(pc->pctl_dev, &pc->gpio_range);
1340+ return err;
13341341 }
13351342
13361343 static struct platform_driver bcm2835_pinctrl_driver = {
drivers/pinctrl/intel/pinctrl-cherryview.c+3−2
@@ -1471,8 +1471,9 @@ static void chv_gpio_irq_handler(struct irq_desc *desc) · 1470 unmodified lines
14711471
14721472 offset = cctx->intr_lines[intr_line];
14731473 if (offset == CHV_INVALID_HWIRQ) {
1474− dev_err(dev, "interrupt on unused interrupt line %u\n", intr_line);
1475− continue;
1474+ dev_warn_once(dev, "interrupt on unmapped interrupt line %u\n", intr_line);
1475+ /* Some boards expect hwirq 0 to trigger in this case */
1476+ offset = 0;
14761477 }
14771478
14781479 generic_handle_domain_irq(gc->irq.domain, offset);
drivers/pinctrl/intel/pinctrl-intel.c+36−28
@@ -451,8 +451,8 @@ static void intel_gpio_set_gpio_mode(void __iomem *padcfg0) · 450 unmodified lines
451451 value &= ~PADCFG0_PMODE_MASK;
452452 value |= PADCFG0_PMODE_GPIO;
453453
454− /* Disable input and output buffers */
455− value |= PADCFG0_GPIORXDIS;
454+ /* Disable TX buffer and enable RX (this will be input) */
455+ value &= ~PADCFG0_GPIORXDIS;
456456 value |= PADCFG0_GPIOTXDIS;
457457
458458 /* Disable SCI/SMI/NMI generation */
@@ -497,9 +497,6 @@ static int intel_gpio_request_enable(struct pinctrl_dev *pctldev, · 38 unmodified lines
497497
498498 intel_gpio_set_gpio_mode(padcfg0);
499499
500− /* Disable TX buffer and enable RX (this will be input) */
501− __intel_gpio_set_direction(padcfg0, true);
502−
503500 raw_spin_unlock_irqrestore(&pctrl->lock, flags);
504501
505502 return 0;
@@ -1115,9 +1112,6 @@ static int intel_gpio_irq_type(struct irq_data *d, unsigned int type) · 609 unmodified lines
11151112
11161113 intel_gpio_set_gpio_mode(reg);
11171114
1118− /* Disable TX buffer and enable RX (this will be input) */
1119− __intel_gpio_set_direction(reg, true);
1120−
11211115 value = readl(reg);
11221116
11231117 value &= ~(PADCFG0_RXEVCFG_MASK | PADCFG0_RXINV);
@@ -1216,6 +1210,39 @@ static irqreturn_t intel_gpio_irq(int irq, void *data) · 92 unmodified lines
12161210 return IRQ_RETVAL(ret);
12171211 }
12181212
1213+static void intel_gpio_irq_init(struct intel_pinctrl *pctrl)
1214+{
1215+ int i;
1216+
1217+ for (i = 0; i < pctrl->ncommunities; i++) {
1218+ const struct intel_community *community;
1219+ void __iomem *base;
1220+ unsigned int gpp;
1221+
1222+ community = &pctrl->communities[i];
1223+ base = community->regs;
1224+
1225+ for (gpp = 0; gpp < community->ngpps; gpp++) {
1226+ /* Mask and clear all interrupts */
1227+ writel(0, base + community->ie_offset + gpp * 4);
1228+ writel(0xffff, base + community->is_offset + gpp * 4);
1229+ }
1230+ }
1231+}
1232+
1233+static int intel_gpio_irq_init_hw(struct gpio_chip *gc)
1234+{
1235+ struct intel_pinctrl *pctrl = gpiochip_get_data(gc);
1236+
1237+ /*
1238+ * Make sure the interrupt lines are in a proper state before
1239+ * further configuration.
1240+ */
1241+ intel_gpio_irq_init(pctrl);
1242+
1243+ return 0;
1244+}
1245+
12191246 static int intel_gpio_add_community_ranges(struct intel_pinctrl *pctrl,
12201247 const struct intel_community *community)
12211248 {
@@ -1320,6 +1347,7 @@ static int intel_gpio_probe(struct intel_pinctrl *pctrl, int irq) · 98 unmodified lines
13201347 girq->num_parents = 0;
13211348 girq->default_type = IRQ_TYPE_NONE;
13221349 girq->handler = handle_bad_irq;
1350+ girq->init_hw = intel_gpio_irq_init_hw;
13231351
13241352 ret = devm_gpiochip_add_data(pctrl->dev, &pctrl->chip, pctrl);
13251353 if (ret) {
@@ -1695,26 +1723,6 @@ int intel_pinctrl_suspend_noirq(struct device *dev) · 369 unmodified lines
16951723 }
16961724 EXPORT_SYMBOL_GPL(intel_pinctrl_suspend_noirq);
16971725
1698−static void intel_gpio_irq_init(struct intel_pinctrl *pctrl)
1699−{
1700− size_t i;
1701−
1702− for (i = 0; i < pctrl->ncommunities; i++) {
1703− const struct intel_community *community;
1704− void __iomem *base;
1705− unsigned int gpp;
1706−
1707− community = &pctrl->communities[i];
1708− base = community->regs;
1709−
1710− for (gpp = 0; gpp < community->ngpps; gpp++) {
1711− /* Mask and clear all interrupts */
1712− writel(0, base + community->ie_offset + gpp * 4);
1713− writel(0xffff, base + community->is_offset + gpp * 4);
1714− }
1715− }
1716−}
1717−
17181726 static bool intel_gpio_update_reg(void __iomem *reg, u32 mask, u32 value)
17191727 {
17201728 u32 curr, updated;
drivers/pinctrl/pinctrl-microchip-sgpio.c+2−1
@@ -137,7 +137,8 @@ static inline int sgpio_addr_to_pin(struct sgpio_priv *priv, int port, int bit) · 136 unmodified lines
137137
138138 static inline u32 sgpio_get_addr(struct sgpio_priv *priv, u32 rno, u32 off)
139139 {
140− return priv->properties->regoff[rno] + off;
140+ return (priv->properties->regoff[rno] + off) *
141+ regmap_get_reg_stride(priv->regs);
141142 }
142143
143144 static u32 sgpio_readl(struct sgpio_priv *priv, u32 rno, u32 off)
drivers/pinctrl/pinctrl-thunderbay.c+35−55
@@ -773,63 +773,42 @@ static int thunderbay_build_groups(struct thunderbay_pinctrl *tpc) · 772 unmodified lines
773773
774774 static int thunderbay_add_functions(struct thunderbay_pinctrl *tpc, struct function_desc *funcs)
775775 {
776− struct function_desc *function = funcs;
777776 int i;
778777
779778 /* Assign the groups for each function */
780− for (i = 0; i < tpc->soc->npins; i++) {
781− const struct pinctrl_pin_desc *pin_info = thunderbay_pins + i;
782− struct thunderbay_mux_desc *pin_mux = pin_info->drv_data;
783−
784− while (pin_mux->name) {
785− const char **grp;
786− int j, grp_num, match = 0;
787− size_t grp_size;
788− struct function_desc *func;
789−
790− for (j = 0; j < tpc->nfuncs; j++) {
791− if (!strcmp(pin_mux->name, function[j].name)) {
792− match = 1;
793− break;
794− }
795− }
796−
797− if (!match)
798− return -EINVAL;
799−
800− func = function + j;
801− grp_num = func->num_group_names;
802− grp_size = sizeof(*func->group_names);
803−
804− if (!func->group_names) {
805− func->group_names = devm_kcalloc(tpc->dev,
806− grp_num,
807− grp_size,
808− GFP_KERNEL);
809− if (!func->group_names) {
810− kfree(func);
811− return -ENOMEM;
812− }
779+ for (i = 0; i < tpc->nfuncs; i++) {
780+ struct function_desc *func = &funcs[i];
781+ const char **group_names;
782+ unsigned int grp_idx = 0;
783+ int j;
784+
785+ group_names = devm_kcalloc(tpc->dev, func->num_group_names,
786+ sizeof(*group_names), GFP_KERNEL);
787+ if (!group_names)
788+ return -ENOMEM;
789+
790+ for (j = 0; j < tpc->soc->npins; j++) {
791+ const struct pinctrl_pin_desc *pin_info = &thunderbay_pins[j];
792+ struct thunderbay_mux_desc *pin_mux;
793+
794+ for (pin_mux = pin_info->drv_data; pin_mux->name; pin_mux++) {
795+ if (!strcmp(pin_mux->name, func->name))
796+ group_names[grp_idx++] = pin_info->name;
813797 }
814−
815− grp = func->group_names;
816− while (*grp)
817− grp++;
818−
819− *grp = pin_info->name;
820− pin_mux++;
821798 }
799+
800+ func->group_names = group_names;
822801 }
823802
824803 /* Add all functions */
825804 for (i = 0; i < tpc->nfuncs; i++) {
826805 pinmux_generic_add_function(tpc->pctrl,
827− function[i].name,
828− function[i].group_names,
829− function[i].num_group_names,
830− function[i].data);
806+ funcs[i].name,
807+ funcs[i].group_names,
808+ funcs[i].num_group_names,
809+ funcs[i].data);
831810 }
832− kfree(function);
811+ kfree(funcs);
833812 return 0;
834813 }
835814
@@ -839,27 +818,30 @@ static int thunderbay_build_functions(struct thunderbay_pinctrl *tpc) · 3 unmodified lines
839818 void *ptr;
840819 int pin;
841820
842− /* Total number of functions is unknown at this point. Allocate first. */
821+ /*
822+ * Allocate maximum possible number of functions. Assume every pin
823+ * being part of 8 (hw maximum) globally unique muxes.
824+ */
843825 tpc->nfuncs = 0;
844826 thunderbay_funcs = kcalloc(tpc->soc->npins * 8,
845827 sizeof(*thunderbay_funcs), GFP_KERNEL);
846828 if (!thunderbay_funcs)
847829 return -ENOMEM;
848830
849− /* Find total number of functions and each's properties */
831+ /* Setup 1 function for each unique mux */
850832 for (pin = 0; pin < tpc->soc->npins; pin++) {
851833 const struct pinctrl_pin_desc *pin_info = thunderbay_pins + pin;
852− struct thunderbay_mux_desc *pin_mux = pin_info->drv_data;
834+ struct thunderbay_mux_desc *pin_mux;
853835
854− while (pin_mux->name) {
855− struct function_desc *func = thunderbay_funcs;
836+ for (pin_mux = pin_info->drv_data; pin_mux->name; pin_mux++) {
837+ struct function_desc *func;
856838
857− while (func->name) {
839+ /* Check if we already have function for this mux */
840+ for (func = thunderbay_funcs; func->name; func++) {
858841 if (!strcmp(pin_mux->name, func->name)) {
859842 func->num_group_names++;
860843 break;
861844 }
862− func++;
863845 }
864846
865847 if (!func->name) {
@@ -868,8 +850,6 @@ static int thunderbay_build_functions(struct thunderbay_pinctrl *tpc) · 2 unmodified lines
868850 func->data = (int *)&pin_mux->mode;
869851 tpc->nfuncs++;
870852 }
871−
872− pin_mux++;
873853 }
874854 }
875855
drivers/pinctrl/pinctrl-zynqmp.c+4−6
@@ -809,7 +809,6 @@ static int zynqmp_pinctrl_prepare_pin_desc(struct device *dev, · 808 unmodified lines
809809 unsigned int *npins)
810810 {
811811 struct pinctrl_pin_desc *pins, *pin;
812− char **pin_names;
813812 int ret;
814813 int i;
815814
@@ -821,14 +820,13 @@ static int zynqmp_pinctrl_prepare_pin_desc(struct device *dev, · 5 unmodified lines
821820 if (!pins)
822821 return -ENOMEM;
823822
824− pin_names = devm_kasprintf_strarray(dev, ZYNQMP_PIN_PREFIX, *npins);
825− if (IS_ERR(pin_names))
826− return PTR_ERR(pin_names);
827−
828823 for (i = 0; i < *npins; i++) {
829824 pin = &pins[i];
830825 pin->number = i;
831− pin->name = pin_names[i];
826+ pin->name = devm_kasprintf(dev, GFP_KERNEL, "%s%d",
827+ ZYNQMP_PIN_PREFIX, i);
828+ if (!pin->name)
829+ return -ENOMEM;
832830 }
833831
834832 *zynqmp_pins = pins;
drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c+4−4
@@ -363,16 +363,16 @@ static const struct sunxi_desc_pin h616_pins[] = { · 362 unmodified lines
363363 SUNXI_FUNCTION(0x0, "gpio_in"),
364364 SUNXI_FUNCTION(0x1, "gpio_out"),
365365 SUNXI_FUNCTION(0x2, "uart2"), /* CTS */
366− SUNXI_FUNCTION(0x3, "i2s3"), /* DO0 */
366+ SUNXI_FUNCTION(0x3, "i2s3_dout0"), /* DO0 */
367367 SUNXI_FUNCTION(0x4, "spi1"), /* MISO */
368− SUNXI_FUNCTION(0x5, "i2s3"), /* DI1 */
368+ SUNXI_FUNCTION(0x5, "i2s3_din1"), /* DI1 */
369369 SUNXI_FUNCTION_IRQ_BANK(0x6, 6, 8)), /* PH_EINT8 */
370370 SUNXI_PIN(SUNXI_PINCTRL_PIN(H, 9),
371371 SUNXI_FUNCTION(0x0, "gpio_in"),
372372 SUNXI_FUNCTION(0x1, "gpio_out"),
373− SUNXI_FUNCTION(0x3, "i2s3"), /* DI0 */
373+ SUNXI_FUNCTION(0x3, "i2s3_din0"), /* DI0 */
374374 SUNXI_FUNCTION(0x4, "spi1"), /* CS1 */
375− SUNXI_FUNCTION(0x3, "i2s3"), /* DO1 */
375+ SUNXI_FUNCTION(0x5, "i2s3_dout1"), /* DO1 */
376376 SUNXI_FUNCTION_IRQ_BANK(0x6, 6, 9)), /* PH_EINT9 */
377377 SUNXI_PIN(SUNXI_PINCTRL_PIN(H, 10),
378378 SUNXI_FUNCTION(0x0, "gpio_in"),
drivers/platform/surface/Kconfig+1−0
@@ -5,6 +5,7 @@ · 4 unmodified lines
55
66 menuconfig SURFACE_PLATFORMS
77 bool "Microsoft Surface Platform-Specific Device Drivers"
8+ depends on ARM64 || X86 || COMPILE_TEST
89 default y
910 help
1011 Say Y here to get to see options for platform-specific device drivers
drivers/platform/x86/amd-pmc.c+9−6
@@ -124,9 +124,10 @@ struct amd_pmc_dev { · 123 unmodified lines
124124 u32 cpu_id;
125125 u32 active_ips;
126126 /* SMU version information */
127− u16 major;
128− u16 minor;
129− u16 rev;
127+ u8 smu_program;
128+ u8 major;
129+ u8 minor;
130+ u8 rev;
130131 struct device *dev;
131132 struct pci_dev *rdev;
132133 struct mutex lock; /* generic mutex lock */
@@ -180,11 +181,13 @@ static int amd_pmc_get_smu_version(struct amd_pmc_dev *dev) · 47 unmodified lines
180181 if (rc)
181182 return rc;
182183
183− dev->major = (val >> 16) & GENMASK(15, 0);
184+ dev->smu_program = (val >> 24) & GENMASK(7, 0);
185+ dev->major = (val >> 16) & GENMASK(7, 0);
184186 dev->minor = (val >> 8) & GENMASK(7, 0);
185187 dev->rev = (val >> 0) & GENMASK(7, 0);
186188
187− dev_dbg(dev->dev, "SMU version is %u.%u.%u\n", dev->major, dev->minor, dev->rev);
189+ dev_dbg(dev->dev, "SMU program %u version is %u.%u.%u\n",
190+ dev->smu_program, dev->major, dev->minor, dev->rev);
188191
189192 return 0;
190193 }
@@ -226,7 +229,7 @@ static int amd_pmc_stb_debugfs_release(struct inode *inode, struct file *filp) · 35 unmodified lines
226229 return 0;
227230 }
228231
229−const struct file_operations amd_pmc_stb_debugfs_fops = {
232+static const struct file_operations amd_pmc_stb_debugfs_fops = {
230233 .owner = THIS_MODULE,
231234 .open = amd_pmc_stb_debugfs_open,
232235 .read = amd_pmc_stb_debugfs_read,
drivers/platform/x86/asus-tf103c-dock.c+2−2
@@ -250,7 +250,7 @@ static int tf103c_dock_hid_raw_request(struct hid_device *hid, u8 reportnum, · 249 unmodified lines
250250 return 0;
251251 }
252252
253−struct hid_ll_driver tf103c_dock_hid_ll_driver = {
253+static struct hid_ll_driver tf103c_dock_hid_ll_driver = {
254254 .parse = tf103c_dock_hid_parse,
255255 .start = tf103c_dock_hid_start,
256256 .stop = tf103c_dock_hid_stop,
@@ -921,7 +921,7 @@ static int __maybe_unused tf103c_dock_resume(struct device *dev) · 664 unmodified lines
921921 return 0;
922922 }
923923
924−SIMPLE_DEV_PM_OPS(tf103c_dock_pm_ops, tf103c_dock_suspend, tf103c_dock_resume);
924+static SIMPLE_DEV_PM_OPS(tf103c_dock_pm_ops, tf103c_dock_suspend, tf103c_dock_resume);
925925
926926 static const struct acpi_device_id tf103c_dock_acpi_match[] = {
927927 {"NPCE69A"},
drivers/platform/x86/intel/crystal_cove_charger.c+13−13
@@ -17,6 +17,7 @@ · 16 unmodified lines
1717 #include <linux/regmap.h>
1818
1919 #define CHGRIRQ_REG 0x0a
20+#define MCHGRIRQ_REG 0x17
2021
2122 struct crystal_cove_charger_data {
2223 struct mutex buslock; /* irq_bus_lock */
@@ -25,8 +26,8 @@ struct crystal_cove_charger_data { · 2 unmodified lines
2526 struct irq_domain *irq_domain;
2627 int irq;
2728 int charger_irq;
28− bool irq_enabled;
29− bool irq_is_enabled;
29+ u8 mask;
30+ u8 new_mask;
3031 };
3132
3233 static irqreturn_t crystal_cove_charger_irq(int irq, void *data)
@@ -53,13 +54,9 @@ static void crystal_cove_charger_irq_bus_sync_unlock(struct irq_data *data) · 20 unmodified lines
5354 {
5455 struct crystal_cove_charger_data *charger = irq_data_get_irq_chip_data(data);
5556
56− if (charger->irq_is_enabled != charger->irq_enabled) {
57− if (charger->irq_enabled)
58− enable_irq(charger->irq);
59− else
60− disable_irq(charger->irq);
61−
62− charger->irq_is_enabled = charger->irq_enabled;
57+ if (charger->mask != charger->new_mask) {
58+ regmap_write(charger->regmap, MCHGRIRQ_REG, charger->new_mask);
59+ charger->mask = charger->new_mask;
6360 }
6461
6562 mutex_unlock(&charger->buslock);
@@ -69,14 +66,14 @@ static void crystal_cove_charger_irq_unmask(struct irq_data *data) · 3 unmodified lines
6966 {
7067 struct crystal_cove_charger_data *charger = irq_data_get_irq_chip_data(data);
7168
72− charger->irq_enabled = true;
69+ charger->new_mask &= ~BIT(data->hwirq);
7370 }
7471
7572 static void crystal_cove_charger_irq_mask(struct irq_data *data)
7673 {
7774 struct crystal_cove_charger_data *charger = irq_data_get_irq_chip_data(data);
7875
79− charger->irq_enabled = false;
76+ charger->new_mask |= BIT(data->hwirq);
8077 }
8178
8279 static void crystal_cove_charger_rm_irq_domain(void *data)
@@ -130,10 +127,13 @@ static int crystal_cove_charger_probe(struct platform_device *pdev) · 47 unmodified lines
130127 irq_set_nested_thread(charger->charger_irq, true);
131128 irq_set_noprobe(charger->charger_irq);
132129
130+ /* Mask the single 2nd level IRQ before enabling the 1st level IRQ */
131+ charger->mask = charger->new_mask = BIT(0);
132+ regmap_write(charger->regmap, MCHGRIRQ_REG, charger->mask);
133+
133134 ret = devm_request_threaded_irq(&pdev->dev, charger->irq, NULL,
134135 crystal_cove_charger_irq,
135− IRQF_ONESHOT | IRQF_NO_AUTOEN,
136− KBUILD_MODNAME, charger);
136+ IRQF_ONESHOT, KBUILD_MODNAME, charger);
137137 if (ret)
138138 return dev_err_probe(&pdev->dev, ret, "requesting irq\n");
139139
drivers/platform/x86/intel/speed_select_if/isst_if_common.c+63−34
@@ -596,7 +596,10 @@ static long isst_if_def_ioctl(struct file *file, unsigned int cmd, · 595 unmodified lines
596596 return ret;
597597 }
598598
599−static DEFINE_MUTEX(punit_misc_dev_lock);
599+/* Lock to prevent module registration when already opened by user space */
600+static DEFINE_MUTEX(punit_misc_dev_open_lock);
601+/* Lock to allow one share misc device for all ISST interace */
602+static DEFINE_MUTEX(punit_misc_dev_reg_lock);
600603 static int misc_usage_count;
601604 static int misc_device_ret;
602605 static int misc_device_open;
@@ -606,7 +609,7 @@ static int isst_if_open(struct inode *inode, struct file *file) · 3 unmodified lines
606609 int i, ret = 0;
607610
608611 /* Fail open, if a module is going away */
609− mutex_lock(&punit_misc_dev_lock);
612+ mutex_lock(&punit_misc_dev_open_lock);
610613 for (i = 0; i < ISST_IF_DEV_MAX; ++i) {
611614 struct isst_if_cmd_cb *cb = &punit_callbacks[i];
612615
@@ -628,7 +631,7 @@ static int isst_if_open(struct inode *inode, struct file *file) · 15 unmodified lines
628631 } else {
629632 misc_device_open++;
630633 }
631− mutex_unlock(&punit_misc_dev_lock);
634+ mutex_unlock(&punit_misc_dev_open_lock);
632635
633636 return ret;
634637 }
@@ -637,7 +640,7 @@ static int isst_if_relase(struct inode *inode, struct file *f) · 2 unmodified lines
637640 {
638641 int i;
639642
640− mutex_lock(&punit_misc_dev_lock);
643+ mutex_lock(&punit_misc_dev_open_lock);
641644 misc_device_open--;
642645 for (i = 0; i < ISST_IF_DEV_MAX; ++i) {
643646 struct isst_if_cmd_cb *cb = &punit_callbacks[i];
@@ -645,7 +648,7 @@ static int isst_if_relase(struct inode *inode, struct file *f) · 1 unmodified line
645648 if (cb->registered)
646649 module_put(cb->owner);
647650 }
648− mutex_unlock(&punit_misc_dev_lock);
651+ mutex_unlock(&punit_misc_dev_open_lock);
649652
650653 return 0;
651654 }
@@ -662,6 +665,43 @@ static struct miscdevice isst_if_char_driver = { · 10 unmodified lines
662665 .fops = &isst_if_char_driver_ops,
663666 };
664667
668+static int isst_misc_reg(void)
669+{
670+ mutex_lock(&punit_misc_dev_reg_lock);
671+ if (misc_device_ret)
672+ goto unlock_exit;
673+
674+ if (!misc_usage_count) {
675+ misc_device_ret = isst_if_cpu_info_init();
676+ if (misc_device_ret)
677+ goto unlock_exit;
678+
679+ misc_device_ret = misc_register(&isst_if_char_driver);
680+ if (misc_device_ret) {
681+ isst_if_cpu_info_exit();
682+ goto unlock_exit;
683+ }
684+ }
685+ misc_usage_count++;
686+
687+unlock_exit:
688+ mutex_unlock(&punit_misc_dev_reg_lock);
689+
690+ return misc_device_ret;
691+}
692+
693+static void isst_misc_unreg(void)
694+{
695+ mutex_lock(&punit_misc_dev_reg_lock);
696+ if (misc_usage_count)
697+ misc_usage_count--;
698+ if (!misc_usage_count && !misc_device_ret) {
699+ misc_deregister(&isst_if_char_driver);
700+ isst_if_cpu_info_exit();
701+ }
702+ mutex_unlock(&punit_misc_dev_reg_lock);
703+}
704+
665705 /**
666706 * isst_if_cdev_register() - Register callback for IOCTL
667707 * @device_type: The device type this callback handling.
@@ -679,38 +719,31 @@ static struct miscdevice isst_if_char_driver = { · 11 unmodified lines
679719 */
680720 int isst_if_cdev_register(int device_type, struct isst_if_cmd_cb *cb)
681721 {
682− if (misc_device_ret)
683− return misc_device_ret;
722+ int ret;
684723
685724 if (device_type >= ISST_IF_DEV_MAX)
686725 return -EINVAL;
687726
688− mutex_lock(&punit_misc_dev_lock);
727+ mutex_lock(&punit_misc_dev_open_lock);
728+ /* Device is already open, we don't want to add new callbacks */
689729 if (misc_device_open) {
690− mutex_unlock(&punit_misc_dev_lock);
730+ mutex_unlock(&punit_misc_dev_open_lock);
691731 return -EAGAIN;
692732 }
693− if (!misc_usage_count) {
694− int ret;
695−
696− misc_device_ret = misc_register(&isst_if_char_driver);
697− if (misc_device_ret)
698− goto unlock_exit;
699−
700− ret = isst_if_cpu_info_init();
701− if (ret) {
702− misc_deregister(&isst_if_char_driver);
703− misc_device_ret = ret;
704− goto unlock_exit;
705− }
706− }
707733 memcpy(&punit_callbacks[device_type], cb, sizeof(*cb));
708734 punit_callbacks[device_type].registered = 1;
709− misc_usage_count++;
710−unlock_exit:
711− mutex_unlock(&punit_misc_dev_lock);
735+ mutex_unlock(&punit_misc_dev_open_lock);
712736
713− return misc_device_ret;
737+ ret = isst_misc_reg();
738+ if (ret) {
739+ /*
740+ * No need of mutex as the misc device register failed
741+ * as no one can open device yet. Hence no contention.
742+ */
743+ punit_callbacks[device_type].registered = 0;
744+ return ret;
745+ }
746+ return 0;
714747 }
715748 EXPORT_SYMBOL_GPL(isst_if_cdev_register);
716749
@@ -725,16 +758,12 @@ EXPORT_SYMBOL_GPL(isst_if_cdev_register); · 8 unmodified lines
725758 */
726759 void isst_if_cdev_unregister(int device_type)
727760 {
728− mutex_lock(&punit_misc_dev_lock);
729− misc_usage_count--;
761+ isst_misc_unreg();
762+ mutex_lock(&punit_misc_dev_open_lock);
730763 punit_callbacks[device_type].registered = 0;
731764 if (device_type == ISST_IF_DEV_MBOX)
732765 isst_delete_hash();
733− if (!misc_usage_count && !misc_device_ret) {
734− misc_deregister(&isst_if_char_driver);
735− isst_if_cpu_info_exit();
736− }
737− mutex_unlock(&punit_misc_dev_lock);
766+ mutex_unlock(&punit_misc_dev_open_lock);
738767 }
739768 EXPORT_SYMBOL_GPL(isst_if_cdev_unregister);
740769
drivers/platform/x86/thinkpad_acpi.c+22−3
@@ -8679,9 +8679,10 @@ static const struct attribute_group fan_driver_attr_group = { · 8678 unmodified lines
86798679 .attrs = fan_driver_attributes,
86808680 };
86818681
8682−#define TPACPI_FAN_Q1 0x0001 /* Unitialized HFSP */
8683−#define TPACPI_FAN_2FAN 0x0002 /* EC 0x31 bit 0 selects fan2 */
8684−#define TPACPI_FAN_2CTL 0x0004 /* selects fan2 control */
8682+#define TPACPI_FAN_Q1 0x0001 /* Uninitialized HFSP */
8683+#define TPACPI_FAN_2FAN 0x0002 /* EC 0x31 bit 0 selects fan2 */
8684+#define TPACPI_FAN_2CTL 0x0004 /* selects fan2 control */
8685+#define TPACPI_FAN_NOFAN 0x0008 /* no fan available */
86858686
86868687 static const struct tpacpi_quirk fan_quirk_table[] __initconst = {
86878688 TPACPI_QEC_IBM('1', 'Y', TPACPI_FAN_Q1),
@@ -8702,6 +8703,7 @@ static const struct tpacpi_quirk fan_quirk_table[] __initconst = { · 14 unmodified lines
87028703 TPACPI_Q_LNV3('N', '4', '0', TPACPI_FAN_2CTL), /* P1 / X1 Extreme (4nd gen) */
87038704 TPACPI_Q_LNV3('N', '3', '0', TPACPI_FAN_2CTL), /* P15 (1st gen) / P15v (1st gen) */
87048705 TPACPI_Q_LNV3('N', '3', '2', TPACPI_FAN_2CTL), /* X1 Carbon (9th gen) */
8706+ TPACPI_Q_LNV3('N', '1', 'O', TPACPI_FAN_NOFAN), /* X1 Tablet (2nd gen) */
87058707 };
87068708
87078709 static int __init fan_init(struct ibm_init_struct *iibm)
@@ -8730,6 +8732,11 @@ static int __init fan_init(struct ibm_init_struct *iibm) · 22 unmodified lines
87308732 quirks = tpacpi_check_quirks(fan_quirk_table,
87318733 ARRAY_SIZE(fan_quirk_table));
87328734
8735+ if (quirks & TPACPI_FAN_NOFAN) {
8736+ pr_info("No integrated ThinkPad fan available\n");
8737+ return -ENODEV;
8738+ }
8739+
87338740 if (gfan_handle) {
87348741 /* 570, 600e/x, 770e, 770x */
87358742 fan_status_access_mode = TPACPI_FAN_RD_ACPI_GFAN;
@@ -10112,6 +10119,9 @@ static struct ibm_struct proxsensor_driver_data = { · 1376 unmodified lines
1011210119 #define DYTC_CMD_MMC_GET 8 /* To get current MMC function and mode */
1011310120 #define DYTC_CMD_RESET 0x1ff /* To reset back to default */
1011410121
10122+#define DYTC_CMD_FUNC_CAP 3 /* To get DYTC capabilities */
10123+#define DYTC_FC_MMC 27 /* MMC Mode supported */
10124+
1011510125 #define DYTC_GET_FUNCTION_BIT 8 /* Bits 8-11 - function setting */
1011610126 #define DYTC_GET_MODE_BIT 12 /* Bits 12-15 - mode setting */
1011710127
@@ -10324,6 +10334,15 @@ static int tpacpi_dytc_profile_init(struct ibm_init_struct *iibm) · 206 unmodified lines
1032410334 if (dytc_version < 5)
1032510335 return -ENODEV;
1032610336
10337+ /* Check what capabilities are supported. Currently MMC is needed */
10338+ err = dytc_command(DYTC_CMD_FUNC_CAP, &output);
10339+ if (err)
10340+ return err;
10341+ if (!(output & BIT(DYTC_FC_MMC))) {
10342+ dbg_printk(TPACPI_DBG_INIT, " DYTC MMC mode not supported\n");
10343+ return -ENODEV;
10344+ }
10345+
1032710346 dbg_printk(TPACPI_DBG_INIT,
1032810347 "DYTC version %d: thermal mode available\n", dytc_version);
1032910348 /*
drivers/platform/x86/touchscreen_dmi.c+24−0
@@ -770,6 +770,21 @@ static const struct ts_dmi_data predia_basic_data = { · 769 unmodified lines
770770 .properties = predia_basic_props,
771771 };
772772
773+static const struct property_entry rwc_nanote_p8_props[] = {
774+ PROPERTY_ENTRY_U32("touchscreen-min-y", 46),
775+ PROPERTY_ENTRY_U32("touchscreen-size-x", 1728),
776+ PROPERTY_ENTRY_U32("touchscreen-size-y", 1140),
777+ PROPERTY_ENTRY_BOOL("touchscreen-inverted-y"),
778+ PROPERTY_ENTRY_STRING("firmware-name", "gsl1680-rwc-nanote-p8.fw"),
779+ PROPERTY_ENTRY_U32("silead,max-fingers", 10),
780+ { }
781+};
782+
783+static const struct ts_dmi_data rwc_nanote_p8_data = {
784+ .acpi_name = "MSSL1680:00",
785+ .properties = rwc_nanote_p8_props,
786+};
787+
773788 static const struct property_entry schneider_sct101ctm_props[] = {
774789 PROPERTY_ENTRY_U32("touchscreen-size-x", 1715),
775790 PROPERTY_ENTRY_U32("touchscreen-size-y", 1140),
@@ -1394,6 +1409,15 @@ const struct dmi_system_id touchscreen_dmi_table[] = { · 618 unmodified lines
13941409 DMI_EXACT_MATCH(DMI_BOARD_NAME, "0E57"),
13951410 },
13961411 },
1412+ {
1413+ /* RWC NANOTE P8 */
1414+ .driver_data = (void *)&rwc_nanote_p8_data,
1415+ .matches = {
1416+ DMI_MATCH(DMI_BOARD_VENDOR, "Default string"),
1417+ DMI_MATCH(DMI_PRODUCT_NAME, "AY07J"),
1418+ DMI_MATCH(DMI_PRODUCT_SKU, "0001")
1419+ },
1420+ },
13971421 {
13981422 /* Schneider SCT101CTM */
13991423 .driver_data = (void *)&schneider_sct101ctm_data,
drivers/platform/x86/x86-android-tablets.c+95−10
@@ -26,6 +26,7 @@ · 25 unmodified lines
2626 #include <linux/string.h>
2727 /* For gpio_get_desc() which is EXPORT_SYMBOL_GPL() */
2828 #include "../../gpio/gpiolib.h"
29+#include "../../gpio/gpiolib-acpi.h"
2930
3031 /*
3132 * Helper code to get Linux IRQ numbers given a description of the IRQ source
@@ -47,7 +48,7 @@ struct x86_acpi_irq_data { · 15 unmodified lines
4748 int polarity; /* ACPI_ACTIVE_HIGH / ACPI_ACTIVE_LOW / ACPI_ACTIVE_BOTH */
4849 };
4950
50−static int x86_acpi_irq_helper_gpiochip_find(struct gpio_chip *gc, void *data)
51+static int gpiochip_find_match_label(struct gpio_chip *gc, void *data)
5152 {
5253 return gc->label && !strcmp(gc->label, data);
5354 }
@@ -73,7 +74,7 @@ static int x86_acpi_irq_helper_get(const struct x86_acpi_irq_data *data) · 19 unmodified lines
7374 return irq;
7475 case X86_ACPI_IRQ_TYPE_GPIOINT:
7576 /* Like acpi_dev_gpio_irq_get(), but without parsing ACPI resources */
76− chip = gpiochip_find(data->chip, x86_acpi_irq_helper_gpiochip_find);
77+ chip = gpiochip_find(data->chip, gpiochip_find_match_label);
7778 if (!chip) {
7879 pr_err("error cannot find GPIO chip %s\n", data->chip);
7980 return -ENODEV;
@@ -143,14 +144,17 @@ struct x86_serdev_info { · 63 unmodified lines
143144 };
144145
145146 struct x86_dev_info {
147+ char *invalid_aei_gpiochip;
146148 const char * const *modules;
147− struct gpiod_lookup_table **gpiod_lookup_tables;
149+ struct gpiod_lookup_table * const *gpiod_lookup_tables;
148150 const struct x86_i2c_client_info *i2c_client_info;
149151 const struct platform_device_info *pdev_info;
150152 const struct x86_serdev_info *serdev_info;
151153 int i2c_client_count;
152154 int pdev_count;
153155 int serdev_count;
156+ int (*init)(void);
157+ void (*exit)(void);
154158 };
155159
156160 /* Generic / shared bq24190 settings */
@@ -187,8 +191,8 @@ static struct bq24190_platform_data bq24190_pdata = { · 30 unmodified lines
187191 };
188192
189193 static const char * const bq24190_modules[] __initconst = {
190− "crystal_cove_charger", /* For the bq24190 IRQ */
191− "bq24190_charger", /* For the Vbus regulator for intel-int3496 */
194+ "intel_crystal_cove_charger", /* For the bq24190 IRQ */
195+ "bq24190_charger", /* For the Vbus regulator for intel-int3496 */
192196 NULL
193197 };
194198
@@ -302,7 +306,7 @@ static struct gpiod_lookup_table asus_me176c_goodix_gpios = { · 107 unmodified lines
302306 },
303307 };
304308
305−static struct gpiod_lookup_table *asus_me176c_gpios[] = {
309+static struct gpiod_lookup_table * const asus_me176c_gpios[] = {
306310 &int3496_gpo2_pin22_gpios,
307311 &asus_me176c_goodix_gpios,
308312 NULL
@@ -317,6 +321,7 @@ static const struct x86_dev_info asus_me176c_info __initconst = { · 8 unmodified lines
317321 .serdev_count = ARRAY_SIZE(asus_me176c_serdevs),
318322 .gpiod_lookup_tables = asus_me176c_gpios,
319323 .modules = bq24190_modules,
324+ .invalid_aei_gpiochip = "INT33FC:02",
320325 };
321326
322327 /* Asus TF103C tablets have an Android factory img with everything hardcoded */
@@ -405,7 +410,7 @@ static const struct x86_i2c_client_info asus_tf103c_i2c_clients[] __initconst = · 82 unmodified lines
405410 },
406411 };
407412
408−static struct gpiod_lookup_table *asus_tf103c_gpios[] = {
413+static struct gpiod_lookup_table * const asus_tf103c_gpios[] = {
409414 &int3496_gpo2_pin22_gpios,
410415 NULL
411416 };
@@ -417,6 +422,7 @@ static const struct x86_dev_info asus_tf103c_info __initconst = { · 5 unmodified lines
417422 .pdev_count = ARRAY_SIZE(int3496_pdevs),
418423 .gpiod_lookup_tables = asus_tf103c_gpios,
419424 .modules = bq24190_modules,
425+ .invalid_aei_gpiochip = "INT33FC:02",
420426 };
421427
422428 /*
@@ -490,6 +496,39 @@ static const struct x86_dev_info chuwi_hi8_info __initconst = { · 67 unmodified lines
490496 .i2c_client_count = ARRAY_SIZE(chuwi_hi8_i2c_clients),
491497 };
492498
499+#define CZC_EC_EXTRA_PORT 0x68
500+#define CZC_EC_ANDROID_KEYS 0x63
501+
502+static int __init czc_p10t_init(void)
503+{
504+ /*
505+ * The device boots up in "Windows 7" mode, when the home button sends a
506+ * Windows specific key sequence (Left Meta + D) and the second button
507+ * sends an unknown one while also toggling the Radio Kill Switch.
508+ * This is a surprising behavior when the second button is labeled "Back".
509+ *
510+ * The vendor-supplied Android-x86 build switches the device to a "Android"
511+ * mode by writing value 0x63 to the I/O port 0x68. This just seems to just
512+ * set bit 6 on address 0x96 in the EC region; switching the bit directly
513+ * seems to achieve the same result. It uses a "p10t_switcher" to do the
514+ * job. It doesn't seem to be able to do anything else, and no other use
515+ * of the port 0x68 is known.
516+ *
517+ * In the Android mode, the home button sends just a single scancode,
518+ * which can be handled in Linux userspace more reasonably and the back
519+ * button only sends a scancode without toggling the kill switch.
520+ * The scancode can then be mapped either to Back or RF Kill functionality
521+ * in userspace, depending on how the button is labeled on that particular
522+ * model.
523+ */
524+ outb(CZC_EC_ANDROID_KEYS, CZC_EC_EXTRA_PORT);
525+ return 0;
526+}
527+
528+static const struct x86_dev_info czc_p10t __initconst = {
529+ .init = czc_p10t_init,
530+};
531+
493532 /*
494533 * Whitelabel (sold as various brands) TM800A550L tablets.
495534 * These tablet's DSDT contains a whole bunch of bogus ACPI I2C devices
@@ -559,7 +598,7 @@ static struct gpiod_lookup_table whitelabel_tm800a550l_goodix_gpios = { · 63 unmodified lines
559598 },
560599 };
561600
562−static struct gpiod_lookup_table *whitelabel_tm800a550l_gpios[] = {
601+static struct gpiod_lookup_table * const whitelabel_tm800a550l_gpios[] = {
563602 &whitelabel_tm800a550l_goodix_gpios,
564603 NULL
565604 };
@@ -641,6 +680,24 @@ static const struct dmi_system_id x86_android_tablet_ids[] __initconst = { · 75 unmodified lines
641680 },
642681 .driver_data = (void *)&chuwi_hi8_info,
643682 },
683+ {
684+ /* CZC P10T */
685+ .ident = "CZC ODEON TPC-10 (\"P10T\")",
686+ .matches = {
687+ DMI_MATCH(DMI_SYS_VENDOR, "CZC"),
688+ DMI_MATCH(DMI_PRODUCT_NAME, "ODEON*TPC-10"),
689+ },
690+ .driver_data = (void *)&czc_p10t,
691+ },
692+ {
693+ /* A variant of CZC P10T */
694+ .ident = "ViewSonic ViewPad 10",
695+ .matches = {
696+ DMI_MATCH(DMI_SYS_VENDOR, "ViewSonic"),
697+ DMI_MATCH(DMI_PRODUCT_NAME, "VPAD10"),
698+ },
699+ .driver_data = (void *)&czc_p10t,
700+ },
644701 {
645702 /* Whitelabel (sold as various brands) TM800A550L */
646703 .matches = {
@@ -669,7 +726,8 @@ static int serdev_count; · 22 unmodified lines
669726 static struct i2c_client **i2c_clients;
670727 static struct platform_device **pdevs;
671728 static struct serdev_device **serdevs;
672−static struct gpiod_lookup_table **gpiod_lookup_tables;
729+static struct gpiod_lookup_table * const *gpiod_lookup_tables;
730+static void (*exit_handler)(void);
673731
674732 static __init int x86_instantiate_i2c_client(const struct x86_dev_info *dev_info,
675733 int idx)
@@ -787,6 +845,9 @@ static void x86_android_tablet_cleanup(void) · 111 unmodified lines
787845
788846 kfree(i2c_clients);
789847
848+ if (exit_handler)
849+ exit_handler();
850+
790851 for (i = 0; gpiod_lookup_tables && gpiod_lookup_tables[i]; i++)
791852 gpiod_remove_lookup_table(gpiod_lookup_tables[i]);
792853 }
@@ -795,6 +856,7 @@ static __init int x86_android_tablet_init(void) · 2 unmodified lines
795856 {
796857 const struct x86_dev_info *dev_info;
797858 const struct dmi_system_id *id;
859+ struct gpio_chip *chip;
798860 int i, ret = 0;
799861
800862 id = dmi_first_match(x86_android_tablet_ids);
@@ -803,6 +865,20 @@ static __init int x86_android_tablet_init(void) · 2 unmodified lines
803865
804866 dev_info = id->driver_data;
805867
868+ /*
869+ * The broken DSDTs on these devices often also include broken
870+ * _AEI (ACPI Event Interrupt) handlers, disable these.
871+ */
872+ if (dev_info->invalid_aei_gpiochip) {
873+ chip = gpiochip_find(dev_info->invalid_aei_gpiochip,
874+ gpiochip_find_match_label);
875+ if (!chip) {
876+ pr_err("error cannot find GPIO chip %s\n", dev_info->invalid_aei_gpiochip);
877+ return -ENODEV;
878+ }
879+ acpi_gpiochip_free_interrupts(chip);
880+ }
881+
806882 /*
807883 * Since this runs from module_init() it cannot use -EPROBE_DEFER,
808884 * instead pre-load any modules which are listed as requirements.
@@ -814,6 +890,15 @@ static __init int x86_android_tablet_init(void) · 5 unmodified lines
814890 for (i = 0; gpiod_lookup_tables && gpiod_lookup_tables[i]; i++)
815891 gpiod_add_lookup_table(gpiod_lookup_tables[i]);
816892
893+ if (dev_info->init) {
894+ ret = dev_info->init();
895+ if (ret < 0) {
896+ x86_android_tablet_cleanup();
897+ return ret;
898+ }
899+ exit_handler = dev_info->exit;
900+ }
901+
817902 i2c_clients = kcalloc(dev_info->i2c_client_count, sizeof(*i2c_clients), GFP_KERNEL);
818903 if (!i2c_clients) {
819904 x86_android_tablet_cleanup();
@@ -865,6 +950,6 @@ static __init int x86_android_tablet_init(void) · 45 unmodified lines
865950 module_init(x86_android_tablet_init);
866951 module_exit(x86_android_tablet_cleanup);
867952
868−MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com");
953+MODULE_AUTHOR("Hans de Goede <hdegoede@redhat.com>");
869954 MODULE_DESCRIPTION("X86 Android tablets DSDT fixups driver");
870955 MODULE_LICENSE("GPL");
drivers/regulator/max20086-regulator.c+2−1
@@ -7,6 +7,7 @@ · 6 unmodified lines
77
88 #include <linux/err.h>
99 #include <linux/gpio.h>
10+#include <linux/gpio/consumer.h>
1011 #include <linux/i2c.h>
1112 #include <linux/module.h>
1213 #include <linux/regmap.h>
@@ -140,7 +141,7 @@ static int max20086_parse_regulators_dt(struct max20086 *chip, bool *boot_on) · 127 unmodified lines
140141 node = of_get_child_by_name(chip->dev->of_node, "regulators");
141142 if (!node) {
142143 dev_err(chip->dev, "regulators node not found\n");
143− return PTR_ERR(node);
144+ return -ENODEV;
144145 }
145146
146147 for (i = 0; i < chip->info->num_outputs; ++i)
drivers/scsi/bnx2fc/bnx2fc_fcoe.c+13−8
@@ -508,7 +508,8 @@ static int bnx2fc_l2_rcv_thread(void *arg) · 507 unmodified lines
508508
509509 static void bnx2fc_recv_frame(struct sk_buff *skb)
510510 {
511− u32 fr_len;
511+ u64 crc_err;
512+ u32 fr_len, fr_crc;
512513 struct fc_lport *lport;
513514 struct fcoe_rcv_info *fr;
514515 struct fc_stats *stats;
@@ -542,6 +543,11 @@ static void bnx2fc_recv_frame(struct sk_buff *skb) · 27 unmodified lines
542543 skb_pull(skb, sizeof(struct fcoe_hdr));
543544 fr_len = skb->len - sizeof(struct fcoe_crc_eof);
544545
546+ stats = per_cpu_ptr(lport->stats, get_cpu());
547+ stats->RxFrames++;
548+ stats->RxWords += fr_len / FCOE_WORD_TO_BYTE;
549+ put_cpu();
550+
545551 fp = (struct fc_frame *)skb;
546552 fc_frame_init(fp);
547553 fr_dev(fp) = lport;
@@ -624,16 +630,15 @@ static void bnx2fc_recv_frame(struct sk_buff *skb) · 76 unmodified lines
624630 return;
625631 }
626632
627− stats = per_cpu_ptr(lport->stats, smp_processor_id());
628− stats->RxFrames++;
629− stats->RxWords += fr_len / FCOE_WORD_TO_BYTE;
633+ fr_crc = le32_to_cpu(fr_crc(fp));
630634
631− if (le32_to_cpu(fr_crc(fp)) !=
632− ~crc32(~0, skb->data, fr_len)) {
633− if (stats->InvalidCRCCount < 5)
635+ if (unlikely(fr_crc != ~crc32(~0, skb->data, fr_len))) {
636+ stats = per_cpu_ptr(lport->stats, get_cpu());
637+ crc_err = (stats->InvalidCRCCount++);
638+ put_cpu();
639+ if (crc_err < 5)
634640 printk(KERN_WARNING PFX "dropping frame with "
635641 "CRC error\n");
636− stats->InvalidCRCCount++;
637642 kfree_skb(skb);
638643 return;
639644 }
drivers/scsi/hisi_sas/hisi_sas_main.c+6−8
@@ -400,8 +400,7 @@ void hisi_sas_task_deliver(struct hisi_hba *hisi_hba, · 399 unmodified lines
400400 struct hisi_sas_slot *slot,
401401 struct hisi_sas_dq *dq,
402402 struct hisi_sas_device *sas_dev,
403− struct hisi_sas_internal_abort *abort,
404− struct hisi_sas_tmf_task *tmf)
403+ struct hisi_sas_internal_abort *abort)
405404 {
406405 struct hisi_sas_cmd_hdr *cmd_hdr_base;
407406 int dlvry_queue_slot, dlvry_queue;
@@ -427,8 +426,6 @@ void hisi_sas_task_deliver(struct hisi_hba *hisi_hba, · 19 unmodified lines
427426 cmd_hdr_base = hisi_hba->cmd_hdr[dlvry_queue];
428427 slot->cmd_hdr = &cmd_hdr_base[dlvry_queue_slot];
429428
430− slot->tmf = tmf;
431− slot->is_internal = tmf;
432429 task->lldd_task = slot;
433430
434431 memset(slot->cmd_hdr, 0, sizeof(struct hisi_sas_cmd_hdr));
@@ -587,7 +584,7 @@ static int hisi_sas_task_exec(struct sas_task *task, gfp_t gfp_flags, · 152 unmodified lines
587584 slot->is_internal = tmf;
588585
589586 /* protect task_prep and start_delivery sequence */
590− hisi_sas_task_deliver(hisi_hba, slot, dq, sas_dev, NULL, tmf);
587+ hisi_sas_task_deliver(hisi_hba, slot, dq, sas_dev, NULL);
591588
592589 return 0;
593590
@@ -1380,12 +1377,13 @@ static int hisi_sas_softreset_ata_disk(struct domain_device *device) · 786 unmodified lines
13801377 struct hisi_hba *hisi_hba = dev_to_hisi_hba(device);
13811378 struct device *dev = hisi_hba->dev;
13821379 int s = sizeof(struct host_to_dev_fis);
1380+ struct hisi_sas_tmf_task tmf = {};
13831381
13841382 ata_for_each_link(link, ap, EDGE) {
13851383 int pmp = sata_srst_pmp(link);
13861384
13871385 hisi_sas_fill_ata_reset_cmd(link->device, 1, pmp, fis);
1388− rc = hisi_sas_exec_internal_tmf_task(device, fis, s, NULL);
1386+ rc = hisi_sas_exec_internal_tmf_task(device, fis, s, &tmf);
13891387 if (rc != TMF_RESP_FUNC_COMPLETE)
13901388 break;
13911389 }
@@ -1396,7 +1394,7 @@ static int hisi_sas_softreset_ata_disk(struct domain_device *device) · 4 unmodified lines
13961394
13971395 hisi_sas_fill_ata_reset_cmd(link->device, 0, pmp, fis);
13981396 rc = hisi_sas_exec_internal_tmf_task(device, fis,
1399− s, NULL);
1397+ s, &tmf);
14001398 if (rc != TMF_RESP_FUNC_COMPLETE)
14011399 dev_err(dev, "ata disk %016llx de-reset failed\n",
14021400 SAS_ADDR(device->sas_addr));
@@ -2067,7 +2065,7 @@ hisi_sas_internal_abort_task_exec(struct hisi_hba *hisi_hba, int device_id, · 664 unmodified lines
20672065 slot->port = port;
20682066 slot->is_internal = true;
20692067
2070− hisi_sas_task_deliver(hisi_hba, slot, dq, sas_dev, abort, NULL);
2068+ hisi_sas_task_deliver(hisi_hba, slot, dq, sas_dev, abort);
20712069
20722070 return 0;
20732071
drivers/scsi/pm8001/pm8001_hwi.c+0−18
@@ -2692,7 +2692,6 @@ static void mpi_sata_event(struct pm8001_hba_info *pm8001_ha, void *piomb) · 2691 unmodified lines
26922692 u32 tag = le32_to_cpu(psataPayload->tag);
26932693 u32 port_id = le32_to_cpu(psataPayload->port_id);
26942694 u32 dev_id = le32_to_cpu(psataPayload->device_id);
2695− unsigned long flags;
26962695
26972696 if (event)
26982697 pm8001_dbg(pm8001_ha, FAIL, "SATA EVENT 0x%x\n", event);
@@ -2724,8 +2723,6 @@ static void mpi_sata_event(struct pm8001_hba_info *pm8001_ha, void *piomb) · 25 unmodified lines
27242723 ts->resp = SAS_TASK_COMPLETE;
27252724 ts->stat = SAS_DATA_OVERRUN;
27262725 ts->residual = 0;
2727− if (pm8001_dev)
2728− atomic_dec(&pm8001_dev->running_req);
27292726 break;
27302727 case IO_XFER_ERROR_BREAK:
27312728 pm8001_dbg(pm8001_ha, IO, "IO_XFER_ERROR_BREAK\n");
@@ -2767,7 +2764,6 @@ static void mpi_sata_event(struct pm8001_hba_info *pm8001_ha, void *piomb) · 35 unmodified lines
27672764 IO_OPEN_CNX_ERROR_IT_NEXUS_LOSS);
27682765 ts->resp = SAS_TASK_COMPLETE;
27692766 ts->stat = SAS_QUEUE_FULL;
2770− pm8001_ccb_task_free_done(pm8001_ha, t, ccb, tag);
27712767 return;
27722768 }
27732769 break;
@@ -2853,20 +2849,6 @@ static void mpi_sata_event(struct pm8001_hba_info *pm8001_ha, void *piomb) · 79 unmodified lines
28532849 ts->stat = SAS_OPEN_TO;
28542850 break;
28552851 }
2856− spin_lock_irqsave(&t->task_state_lock, flags);
2857− t->task_state_flags &= ~SAS_TASK_STATE_PENDING;
2858− t->task_state_flags &= ~SAS_TASK_AT_INITIATOR;
2859− t->task_state_flags |= SAS_TASK_STATE_DONE;
2860− if (unlikely((t->task_state_flags & SAS_TASK_STATE_ABORTED))) {
2861− spin_unlock_irqrestore(&t->task_state_lock, flags);
2862− pm8001_dbg(pm8001_ha, FAIL,
2863− "task 0x%p done with io_status 0x%x resp 0x%x stat 0x%x but aborted by upper layer!\n",
2864− t, event, ts->resp, ts->stat);
2865− pm8001_ccb_task_free(pm8001_ha, t, ccb, tag);
2866− } else {
2867− spin_unlock_irqrestore(&t->task_state_lock, flags);
2868− pm8001_ccb_task_free_done(pm8001_ha, t, ccb, tag);
2869− }
28702852 }
28712853
28722854 /*See the comments for mpi_ssp_completion */
drivers/scsi/pm8001/pm8001_sas.c+5−0
@@ -769,8 +769,13 @@ static int pm8001_exec_internal_tmf_task(struct domain_device *dev, · 768 unmodified lines
769769 res = -TMF_RESP_FUNC_FAILED;
770770 /* Even TMF timed out, return direct. */
771771 if (task->task_state_flags & SAS_TASK_STATE_ABORTED) {
772+ struct pm8001_ccb_info *ccb = task->lldd_task;
773+
772774 pm8001_dbg(pm8001_ha, FAIL, "TMF task[%x]timeout.\n",
773775 tmf->tmf);
776+
777+ if (ccb)
778+ ccb->task = NULL;
774779 goto ex_err;
775780 }
776781
drivers/scsi/pm8001/pm80xx_hwi.c+3−28
@@ -2185,9 +2185,9 @@ mpi_ssp_completion(struct pm8001_hba_info *pm8001_ha, void *piomb) · 2184 unmodified lines
21852185 pm8001_dbg(pm8001_ha, FAIL,
21862186 "task 0x%p done with io_status 0x%x resp 0x%x stat 0x%x but aborted by upper layer!\n",
21872187 t, status, ts->resp, ts->stat);
2188+ pm8001_ccb_task_free(pm8001_ha, t, ccb, tag);
21882189 if (t->slow_task)
21892190 complete(&t->slow_task->completion);
2190− pm8001_ccb_task_free(pm8001_ha, t, ccb, tag);
21912191 } else {
21922192 spin_unlock_irqrestore(&t->task_state_lock, flags);
21932193 pm8001_ccb_task_free(pm8001_ha, t, ccb, tag);
@@ -2794,9 +2794,9 @@ mpi_sata_completion(struct pm8001_hba_info *pm8001_ha, · 600 unmodified lines
27942794 pm8001_dbg(pm8001_ha, FAIL,
27952795 "task 0x%p done with io_status 0x%x resp 0x%x stat 0x%x but aborted by upper layer!\n",
27962796 t, status, ts->resp, ts->stat);
2797+ pm8001_ccb_task_free(pm8001_ha, t, ccb, tag);
27972798 if (t->slow_task)
27982799 complete(&t->slow_task->completion);
2799− pm8001_ccb_task_free(pm8001_ha, t, ccb, tag);
28002800 } else {
28012801 spin_unlock_irqrestore(&t->task_state_lock, flags);
28022802 spin_unlock_irqrestore(&circularQ->oq_lock,
@@ -2821,7 +2821,6 @@ static void mpi_sata_event(struct pm8001_hba_info *pm8001_ha, · 18 unmodified lines
28212821 u32 tag = le32_to_cpu(psataPayload->tag);
28222822 u32 port_id = le32_to_cpu(psataPayload->port_id);
28232823 u32 dev_id = le32_to_cpu(psataPayload->device_id);
2824− unsigned long flags;
28252824
28262825 if (event)
28272826 pm8001_dbg(pm8001_ha, FAIL, "SATA EVENT 0x%x\n", event);
@@ -2854,8 +2853,6 @@ static void mpi_sata_event(struct pm8001_hba_info *pm8001_ha, · 26 unmodified lines
28542853 ts->resp = SAS_TASK_COMPLETE;
28552854 ts->stat = SAS_DATA_OVERRUN;
28562855 ts->residual = 0;
2857− if (pm8001_dev)
2858− atomic_dec(&pm8001_dev->running_req);
28592856 break;
28602857 case IO_XFER_ERROR_BREAK:
28612858 pm8001_dbg(pm8001_ha, IO, "IO_XFER_ERROR_BREAK\n");
@@ -2904,11 +2901,6 @@ static void mpi_sata_event(struct pm8001_hba_info *pm8001_ha, · 42 unmodified lines
29042901 IO_OPEN_CNX_ERROR_IT_NEXUS_LOSS);
29052902 ts->resp = SAS_TASK_COMPLETE;
29062903 ts->stat = SAS_QUEUE_FULL;
2907− spin_unlock_irqrestore(&circularQ->oq_lock,
2908− circularQ->lock_flags);
2909− pm8001_ccb_task_free_done(pm8001_ha, t, ccb, tag);
2910− spin_lock_irqsave(&circularQ->oq_lock,
2911− circularQ->lock_flags);
29122904 return;
29132905 }
29142906 break;
@@ -3008,24 +3000,6 @@ static void mpi_sata_event(struct pm8001_hba_info *pm8001_ha, · 93 unmodified lines
30083000 ts->stat = SAS_OPEN_TO;
30093001 break;
30103002 }
3011− spin_lock_irqsave(&t->task_state_lock, flags);
3012− t->task_state_flags &= ~SAS_TASK_STATE_PENDING;
3013− t->task_state_flags &= ~SAS_TASK_AT_INITIATOR;
3014− t->task_state_flags |= SAS_TASK_STATE_DONE;
3015− if (unlikely((t->task_state_flags & SAS_TASK_STATE_ABORTED))) {
3016− spin_unlock_irqrestore(&t->task_state_lock, flags);
3017− pm8001_dbg(pm8001_ha, FAIL,
3018− "task 0x%p done with io_status 0x%x resp 0x%x stat 0x%x but aborted by upper layer!\n",
3019− t, event, ts->resp, ts->stat);
3020− pm8001_ccb_task_free(pm8001_ha, t, ccb, tag);
3021− } else {
3022− spin_unlock_irqrestore(&t->task_state_lock, flags);
3023− spin_unlock_irqrestore(&circularQ->oq_lock,
3024− circularQ->lock_flags);
3025− pm8001_ccb_task_free_done(pm8001_ha, t, ccb, tag);
3026− spin_lock_irqsave(&circularQ->oq_lock,
3027− circularQ->lock_flags);
3028− }
30293003 }
30303004
30313005 /*See the comments for mpi_ssp_completion */
@@ -3931,6 +3905,7 @@ static int ssp_coalesced_comp_resp(struct pm8001_hba_info *pm8001_ha, · 899 unmodified lines
39313905 /**
39323906 * process_one_iomb - process one outbound Queue memory block
39333907 * @pm8001_ha: our hba card information
3908+ * @circularQ: outbound circular queue
39343909 * @piomb: IO message buffer
39353910 */
39363911 static void process_one_iomb(struct pm8001_hba_info *pm8001_ha,
drivers/scsi/scsi_scan.c+50−5
@@ -214,6 +214,48 @@ static void scsi_unlock_floptical(struct scsi_device *sdev, · 213 unmodified lines
214214 SCSI_TIMEOUT, 3, NULL);
215215 }
216216
217+static int scsi_realloc_sdev_budget_map(struct scsi_device *sdev,
218+ unsigned int depth)
219+{
220+ int new_shift = sbitmap_calculate_shift(depth);
221+ bool need_alloc = !sdev->budget_map.map;
222+ bool need_free = false;
223+ int ret;
224+ struct sbitmap sb_backup;
225+
226+ /*
227+ * realloc if new shift is calculated, which is caused by setting
228+ * up one new default queue depth after calling ->slave_configure
229+ */
230+ if (!need_alloc && new_shift != sdev->budget_map.shift)
231+ need_alloc = need_free = true;
232+
233+ if (!need_alloc)
234+ return 0;
235+
236+ /*
237+ * Request queue has to be frozen for reallocating budget map,
238+ * and here disk isn't added yet, so freezing is pretty fast
239+ */
240+ if (need_free) {
241+ blk_mq_freeze_queue(sdev->request_queue);
242+ sb_backup = sdev->budget_map;
243+ }
244+ ret = sbitmap_init_node(&sdev->budget_map,
245+ scsi_device_max_queue_depth(sdev),
246+ new_shift, GFP_KERNEL,
247+ sdev->request_queue->node, false, true);
248+ if (need_free) {
249+ if (ret)
250+ sdev->budget_map = sb_backup;
251+ else
252+ sbitmap_free(&sb_backup);
253+ ret = 0;
254+ blk_mq_unfreeze_queue(sdev->request_queue);
255+ }
256+ return ret;
257+}
258+
217259 /**
218260 * scsi_alloc_sdev - allocate and setup a scsi_Device
219261 * @starget: which target to allocate a &scsi_device for
@@ -306,11 +348,7 @@ static struct scsi_device *scsi_alloc_sdev(struct scsi_target *starget, · 86 unmodified lines
306348 * default device queue depth to figure out sbitmap shift
307349 * since we use this queue depth most of times.
308350 */
309− if (sbitmap_init_node(&sdev->budget_map,
310− scsi_device_max_queue_depth(sdev),
311− sbitmap_calculate_shift(depth),
312− GFP_KERNEL, sdev->request_queue->node,
313− false, true)) {
351+ if (scsi_realloc_sdev_budget_map(sdev, depth)) {
314352 put_device(&starget->dev);
315353 kfree(sdev);
316354 goto out;
@@ -1017,6 +1055,13 @@ static int scsi_add_lun(struct scsi_device *sdev, unsigned char *inq_result, · 700 unmodified lines
10171055 }
10181056 return SCSI_SCAN_NO_RESPONSE;
10191057 }
1058+
1059+ /*
1060+ * The queue_depth is often changed in ->slave_configure.
1061+ * Set up budget map again since memory consumption of
1062+ * the map depends on actual queue depth.
1063+ */
1064+ scsi_realloc_sdev_budget_map(sdev, sdev->queue_depth);
10201065 }
10211066
10221067 if (sdev->scsi_level >= SCSI_3)
drivers/spi/spi-bcm-qspi.c+1−1
@@ -585,7 +585,7 @@ static void bcm_qspi_chip_select(struct bcm_qspi *qspi, int cs) · 584 unmodified lines
585585 u32 rd = 0;
586586 u32 wr = 0;
587587
588− if (qspi->base[CHIP_SELECT]) {
588+ if (cs >= 0 && qspi->base[CHIP_SELECT]) {
589589 rd = bcm_qspi_read(qspi, CHIP_SELECT, 0);
590590 wr = (rd & ~0xff) | (1 << cs);
591591 if (rd == wr)
drivers/spi/spi-meson-spicc.c+5−0
@@ -693,6 +693,11 @@ static int meson_spicc_probe(struct platform_device *pdev) · 692 unmodified lines
693693 writel_relaxed(0, spicc->base + SPICC_INTREG);
694694
695695 irq = platform_get_irq(pdev, 0);
696+ if (irq < 0) {
697+ ret = irq;
698+ goto out_master;
699+ }
700+
696701 ret = devm_request_irq(&pdev->dev, irq, meson_spicc_irq,
697702 0, NULL, spicc);
698703 if (ret) {
drivers/spi/spi-mt65xx.c+1−1
@@ -624,7 +624,7 @@ static irqreturn_t mtk_spi_interrupt(int irq, void *dev_id) · 623 unmodified lines
624624 else
625625 mdata->state = MTK_SPI_IDLE;
626626
627− if (!master->can_dma(master, master->cur_msg->spi, trans)) {
627+ if (!master->can_dma(master, NULL, trans)) {
628628 if (trans->rx_buf) {
629629 cnt = mdata->xfer_len / 4;
630630 ioread32_rep(mdata->base + SPI_RX_DATA_REG,
drivers/spi/spi-stm32-qspi.c+17−30
@@ -688,7 +688,7 @@ static int stm32_qspi_probe(struct platform_device *pdev) · 687 unmodified lines
688688 struct resource *res;
689689 int ret, irq;
690690
691− ctrl = spi_alloc_master(dev, sizeof(*qspi));
691+ ctrl = devm_spi_alloc_master(dev, sizeof(*qspi));
692692 if (!ctrl)
693693 return -ENOMEM;
694694
@@ -697,58 +697,46 @@ static int stm32_qspi_probe(struct platform_device *pdev) · 2 unmodified lines
697697
698698 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi");
699699 qspi->io_base = devm_ioremap_resource(dev, res);
700− if (IS_ERR(qspi->io_base)) {
701− ret = PTR_ERR(qspi->io_base);
702− goto err_master_put;
703− }
700+ if (IS_ERR(qspi->io_base))
701+ return PTR_ERR(qspi->io_base);
704702
705703 qspi->phys_base = res->start;
706704
707705 res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "qspi_mm");
708706 qspi->mm_base = devm_ioremap_resource(dev, res);
709− if (IS_ERR(qspi->mm_base)) {
710− ret = PTR_ERR(qspi->mm_base);
711− goto err_master_put;
712− }
707+ if (IS_ERR(qspi->mm_base))
708+ return PTR_ERR(qspi->mm_base);
713709
714710 qspi->mm_size = resource_size(res);
715− if (qspi->mm_size > STM32_QSPI_MAX_MMAP_SZ) {
716− ret = -EINVAL;
717− goto err_master_put;
718− }
711+ if (qspi->mm_size > STM32_QSPI_MAX_MMAP_SZ)
712+ return -EINVAL;
719713
720714 irq = platform_get_irq(pdev, 0);
721− if (irq < 0) {
722− ret = irq;
723− goto err_master_put;
724− }
715+ if (irq < 0)
716+ return irq;
725717
726718 ret = devm_request_irq(dev, irq, stm32_qspi_irq, 0,
727719 dev_name(dev), qspi);
728720 if (ret) {
729721 dev_err(dev, "failed to request irq\n");
730− goto err_master_put;
722+ return ret;
731723 }
732724
733725 init_completion(&qspi->data_completion);
734726 init_completion(&qspi->match_completion);
735727
736728 qspi->clk = devm_clk_get(dev, NULL);
737− if (IS_ERR(qspi->clk)) {
738− ret = PTR_ERR(qspi->clk);
739− goto err_master_put;
740− }
729+ if (IS_ERR(qspi->clk))
730+ return PTR_ERR(qspi->clk);
741731
742732 qspi->clk_rate = clk_get_rate(qspi->clk);
743− if (!qspi->clk_rate) {
744− ret = -EINVAL;
745− goto err_master_put;
746− }
733+ if (!qspi->clk_rate)
734+ return -EINVAL;
747735
748736 ret = clk_prepare_enable(qspi->clk);
749737 if (ret) {
750738 dev_err(dev, "can not enable the clock\n");
751− goto err_master_put;
739+ return ret;
752740 }
753741
754742 rstc = devm_reset_control_get_exclusive(dev, NULL);
@@ -784,7 +772,7 @@ static int stm32_qspi_probe(struct platform_device *pdev) · 29 unmodified lines
784772 pm_runtime_enable(dev);
785773 pm_runtime_get_noresume(dev);
786774
787− ret = devm_spi_register_master(dev, ctrl);
775+ ret = spi_register_master(ctrl);
788776 if (ret)
789777 goto err_pm_runtime_free;
790778
@@ -806,8 +794,6 @@ err_dma_free: · 15 unmodified lines
806794 stm32_qspi_dma_free(qspi);
807795 err_clk_disable:
808796 clk_disable_unprepare(qspi->clk);
809−err_master_put:
810− spi_master_put(qspi->ctrl);
811797
812798 return ret;
813799 }
@@ -817,6 +803,7 @@ static int stm32_qspi_remove(struct platform_device *pdev) · 3 unmodified lines
817803 struct stm32_qspi *qspi = platform_get_drvdata(pdev);
818804
819805 pm_runtime_get_sync(qspi->dev);
806+ spi_unregister_master(qspi->ctrl);
820807 /* disable qspi */
821808 writel_relaxed(0, qspi->io_base + QSPI_CR);
822809 stm32_qspi_dma_free(qspi);
drivers/spi/spi-stm32.c+4−3
@@ -221,7 +221,6 @@ struct stm32_spi; · 220 unmodified lines
221221 * time between frames (if driver has this functionality)
222222 * @set_number_of_data: optional routine to configure registers to desired
223223 * number of data (if driver has this functionality)
224− * @can_dma: routine to determine if the transfer is eligible for DMA use
225224 * @transfer_one_dma_start: routine to start transfer a single spi_transfer
226225 * using DMA
227226 * @dma_rx_cb: routine to call after DMA RX channel operation is complete
@@ -232,7 +231,7 @@ struct stm32_spi; · 4 unmodified lines
232231 * @baud_rate_div_min: minimum baud rate divisor
233232 * @baud_rate_div_max: maximum baud rate divisor
234233 * @has_fifo: boolean to know if fifo is used for driver
235− * @has_startbit: boolean to know if start bit is used to start transfer
234+ * @flags: compatible specific SPI controller flags used at registration time
236235 */
237236 struct stm32_spi_cfg {
238237 const struct stm32_spi_regspec *regs;
@@ -253,6 +252,7 @@ struct stm32_spi_cfg { · 14 unmodified lines
253252 unsigned int baud_rate_div_min;
254253 unsigned int baud_rate_div_max;
255254 bool has_fifo;
255+ u16 flags;
256256 };
257257
258258 /**
@@ -1722,6 +1722,7 @@ static const struct stm32_spi_cfg stm32f4_spi_cfg = { · 1463 unmodified lines
17221722 .baud_rate_div_min = STM32F4_SPI_BR_DIV_MIN,
17231723 .baud_rate_div_max = STM32F4_SPI_BR_DIV_MAX,
17241724 .has_fifo = false,
1725+ .flags = SPI_MASTER_MUST_TX,
17251726 };
17261727
17271728 static const struct stm32_spi_cfg stm32h7_spi_cfg = {
@@ -1854,7 +1855,7 @@ static int stm32_spi_probe(struct platform_device *pdev) · 126 unmodified lines
18541855 master->prepare_message = stm32_spi_prepare_msg;
18551856 master->transfer_one = stm32_spi_transfer_one;
18561857 master->unprepare_message = stm32_spi_unprepare_msg;
1857− master->flags = SPI_MASTER_MUST_TX;
1858+ master->flags = spi->cfg->flags;
18581859
18591860 spi->dma_tx = dma_request_chan(spi->dev, "tx");
18601861 if (IS_ERR(spi->dma_tx)) {
drivers/spi/spi-uniphier.c+14−4
@@ -726,7 +726,7 @@ static int uniphier_spi_probe(struct platform_device *pdev) · 725 unmodified lines
726726 if (ret) {
727727 dev_err(&pdev->dev, "failed to get TX DMA capacities: %d\n",
728728 ret);
729− goto out_disable_clk;
729+ goto out_release_dma;
730730 }
731731 dma_tx_burst = caps.max_burst;
732732 }
@@ -735,7 +735,7 @@ static int uniphier_spi_probe(struct platform_device *pdev) · 2 unmodified lines
735735 if (IS_ERR_OR_NULL(master->dma_rx)) {
736736 if (PTR_ERR(master->dma_rx) == -EPROBE_DEFER) {
737737 ret = -EPROBE_DEFER;
738− goto out_disable_clk;
738+ goto out_release_dma;
739739 }
740740 master->dma_rx = NULL;
741741 dma_rx_burst = INT_MAX;
@@ -744,7 +744,7 @@ static int uniphier_spi_probe(struct platform_device *pdev) · 2 unmodified lines
744744 if (ret) {
745745 dev_err(&pdev->dev, "failed to get RX DMA capacities: %d\n",
746746 ret);
747− goto out_disable_clk;
747+ goto out_release_dma;
748748 }
749749 dma_rx_burst = caps.max_burst;
750750 }
@@ -753,10 +753,20 @@ static int uniphier_spi_probe(struct platform_device *pdev) · 2 unmodified lines
753753
754754 ret = devm_spi_register_master(&pdev->dev, master);
755755 if (ret)
756− goto out_disable_clk;
756+ goto out_release_dma;
757757
758758 return 0;
759759
760+out_release_dma:
761+ if (!IS_ERR_OR_NULL(master->dma_rx)) {
762+ dma_release_channel(master->dma_rx);
763+ master->dma_rx = NULL;
764+ }
765+ if (!IS_ERR_OR_NULL(master->dma_tx)) {
766+ dma_release_channel(master->dma_tx);
767+ master->dma_tx = NULL;
768+ }
769+
760770 out_disable_clk:
761771 clk_disable_unprepare(priv->clk);
762772
drivers/video/console/Kconfig+20−0
@@ -78,6 +78,26 @@ config FRAMEBUFFER_CONSOLE · 77 unmodified lines
7878 help
7979 Low-level framebuffer-based console driver.
8080
81+config FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION
82+ bool "Enable legacy fbcon hardware acceleration code"
83+ depends on FRAMEBUFFER_CONSOLE
84+ default y if PARISC
85+ default n
86+ help
87+ This option enables the fbcon (framebuffer text-based) hardware
88+ acceleration for graphics drivers which were written for the fbdev
89+ graphics interface.
90+
91+ On modern machines, on mainstream machines (like x86-64) or when
92+ using a modern Linux distribution those fbdev drivers usually aren't used.
93+ So enabling this option wouldn't have any effect, which is why you want
94+ to disable this option on such newer machines.
95+
96+ If you compile this kernel for older machines which still require the
97+ fbdev drivers, you may want to say Y.
98+
99+ If unsure, select n.
100+
81101 config FRAMEBUFFER_CONSOLE_DETECT_PRIMARY
82102 bool "Map the console to the primary display device"
83103 depends on FRAMEBUFFER_CONSOLE
drivers/video/fbdev/core/bitblit.c+16−0
@@ -43,6 +43,21 @@ static void update_attr(u8 *dst, u8 *src, int attribute, · 42 unmodified lines
4343 }
4444 }
4545
46+static void bit_bmove(struct vc_data *vc, struct fb_info *info, int sy,
47+ int sx, int dy, int dx, int height, int width)
48+{
49+ struct fb_copyarea area;
50+
51+ area.sx = sx * vc->vc_font.width;
52+ area.sy = sy * vc->vc_font.height;
53+ area.dx = dx * vc->vc_font.width;
54+ area.dy = dy * vc->vc_font.height;
55+ area.height = height * vc->vc_font.height;
56+ area.width = width * vc->vc_font.width;
57+
58+ info->fbops->fb_copyarea(info, &area);
59+}
60+
4661 static void bit_clear(struct vc_data *vc, struct fb_info *info, int sy,
4762 int sx, int height, int width)
4863 {
@@ -378,6 +393,7 @@ static int bit_update_start(struct fb_info *info) · 329 unmodified lines
378393
379394 void fbcon_set_bitops(struct fbcon_ops *ops)
380395 {
396+ ops->bmove = bit_bmove;
381397 ops->clear = bit_clear;
382398 ops->putcs = bit_putcs;
383399 ops->clear_margins = bit_clear_margins;
drivers/video/fbdev/core/fbcon.c+536−21
@@ -173,6 +173,8 @@ static void fbcon_putcs(struct vc_data *vc, const unsigned short *s, · 172 unmodified lines
173173 int count, int ypos, int xpos);
174174 static void fbcon_clear_margins(struct vc_data *vc, int bottom_only);
175175 static void fbcon_cursor(struct vc_data *vc, int mode);
176+static void fbcon_bmove(struct vc_data *vc, int sy, int sx, int dy, int dx,
177+ int height, int width);
176178 static int fbcon_switch(struct vc_data *vc);
177179 static int fbcon_blank(struct vc_data *vc, int blank, int mode_switch);
178180 static void fbcon_set_palette(struct vc_data *vc, const unsigned char *table);
@@ -180,8 +182,16 @@ static void fbcon_set_palette(struct vc_data *vc, const unsigned char *table); · 1 unmodified line
180182 /*
181183 * Internal routines
182184 */
185+static __inline__ void ywrap_up(struct vc_data *vc, int count);
186+static __inline__ void ywrap_down(struct vc_data *vc, int count);
187+static __inline__ void ypan_up(struct vc_data *vc, int count);
188+static __inline__ void ypan_down(struct vc_data *vc, int count);
189+static void fbcon_bmove_rec(struct vc_data *vc, struct fbcon_display *p, int sy, int sx,
190+ int dy, int dx, int height, int width, u_int y_break);
183191 static void fbcon_set_disp(struct fb_info *info, struct fb_var_screeninfo *var,
184192 int unit);
193+static void fbcon_redraw_move(struct vc_data *vc, struct fbcon_display *p,
194+ int line, int count, int dy);
185195 static void fbcon_modechanged(struct fb_info *info);
186196 static void fbcon_set_all_vcs(struct fb_info *info);
187197 static void fbcon_start(void);
@@ -1015,7 +1025,7 @@ static void fbcon_init(struct vc_data *vc, int init) · 827 unmodified lines
10151025 struct vc_data *svc = *default_mode;
10161026 struct fbcon_display *t, *p = &fb_display[vc->vc_num];
10171027 int logo = 1, new_rows, new_cols, rows, cols;
1018− int ret;
1028+ int cap, ret;
10191029
10201030 if (WARN_ON(info_idx == -1))
10211031 return;
@@ -1024,6 +1034,7 @@ static void fbcon_init(struct vc_data *vc, int init) · 2 unmodified lines
10241034 con2fb_map[vc->vc_num] = info_idx;
10251035
10261036 info = registered_fb[con2fb_map[vc->vc_num]];
1037+ cap = info->flags;
10271038
10281039 if (logo_shown < 0 && console_loglevel <= CONSOLE_LOGLEVEL_QUIET)
10291040 logo_shown = FBCON_LOGO_DONTSHOW;
@@ -1125,6 +1136,14 @@ static void fbcon_init(struct vc_data *vc, int init) · 95 unmodified lines
11251136
11261137 ops->graphics = 0;
11271138
1139+#ifdef CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION
1140+ if ((cap & FBINFO_HWACCEL_COPYAREA) &&
1141+ !(cap & FBINFO_HWACCEL_DISABLED))
1142+ p->scrollmode = SCROLL_MOVE;
1143+ else /* default to something safe */
1144+ p->scrollmode = SCROLL_REDRAW;
1145+#endif
1146+
11281147 /*
11291148 * ++guenther: console.c:vc_allocate() relies on initializing
11301149 * vc_{cols,rows}, but we must not set those if we are only
@@ -1211,13 +1230,14 @@ finished: · 80 unmodified lines
12111230 * This system is now divided into two levels because of complications
12121231 * caused by hardware scrolling. Top level functions:
12131232 *
1214− * fbcon_clear(), fbcon_putc(), fbcon_clear_margins()
1233+ * fbcon_bmove(), fbcon_clear(), fbcon_putc(), fbcon_clear_margins()
12151234 *
12161235 * handles y values in range [0, scr_height-1] that correspond to real
12171236 * screen positions. y_wrap shift means that first line of bitmap may be
12181237 * anywhere on this display. These functions convert lineoffsets to
12191238 * bitmap offsets and deal with the wrap-around case by splitting blits.
12201239 *
1240+ * fbcon_bmove_physical_8() -- These functions fast implementations
12211241 * fbcon_clear_physical_8() -- of original fbcon_XXX fns.
12221242 * fbcon_putc_physical_8() -- (font width != 8) may be added later
12231243 *
@@ -1390,6 +1410,224 @@ static void fbcon_set_disp(struct fb_info *info, struct fb_var_screeninfo *var, · 166 unmodified lines
13901410 }
13911411 }
13921412
1413+static __inline__ void ywrap_up(struct vc_data *vc, int count)
1414+{
1415+ struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
1416+ struct fbcon_ops *ops = info->fbcon_par;
1417+ struct fbcon_display *p = &fb_display[vc->vc_num];
1418+
1419+ p->yscroll += count;
1420+ if (p->yscroll >= p->vrows) /* Deal with wrap */
1421+ p->yscroll -= p->vrows;
1422+ ops->var.xoffset = 0;
1423+ ops->var.yoffset = p->yscroll * vc->vc_font.height;
1424+ ops->var.vmode |= FB_VMODE_YWRAP;
1425+ ops->update_start(info);
1426+ scrollback_max += count;
1427+ if (scrollback_max > scrollback_phys_max)
1428+ scrollback_max = scrollback_phys_max;
1429+ scrollback_current = 0;
1430+}
1431+
1432+static __inline__ void ywrap_down(struct vc_data *vc, int count)
1433+{
1434+ struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
1435+ struct fbcon_ops *ops = info->fbcon_par;
1436+ struct fbcon_display *p = &fb_display[vc->vc_num];
1437+
1438+ p->yscroll -= count;
1439+ if (p->yscroll < 0) /* Deal with wrap */
1440+ p->yscroll += p->vrows;
1441+ ops->var.xoffset = 0;
1442+ ops->var.yoffset = p->yscroll * vc->vc_font.height;
1443+ ops->var.vmode |= FB_VMODE_YWRAP;
1444+ ops->update_start(info);
1445+ scrollback_max -= count;
1446+ if (scrollback_max < 0)
1447+ scrollback_max = 0;
1448+ scrollback_current = 0;
1449+}
1450+
1451+static __inline__ void ypan_up(struct vc_data *vc, int count)
1452+{
1453+ struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
1454+ struct fbcon_display *p = &fb_display[vc->vc_num];
1455+ struct fbcon_ops *ops = info->fbcon_par;
1456+
1457+ p->yscroll += count;
1458+ if (p->yscroll > p->vrows - vc->vc_rows) {
1459+ ops->bmove(vc, info, p->vrows - vc->vc_rows,
1460+ 0, 0, 0, vc->vc_rows, vc->vc_cols);
1461+ p->yscroll -= p->vrows - vc->vc_rows;
1462+ }
1463+
1464+ ops->var.xoffset = 0;
1465+ ops->var.yoffset = p->yscroll * vc->vc_font.height;
1466+ ops->var.vmode &= ~FB_VMODE_YWRAP;
1467+ ops->update_start(info);
1468+ fbcon_clear_margins(vc, 1);
1469+ scrollback_max += count;
1470+ if (scrollback_max > scrollback_phys_max)
1471+ scrollback_max = scrollback_phys_max;
1472+ scrollback_current = 0;
1473+}
1474+
1475+static __inline__ void ypan_up_redraw(struct vc_data *vc, int t, int count)
1476+{
1477+ struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
1478+ struct fbcon_ops *ops = info->fbcon_par;
1479+ struct fbcon_display *p = &fb_display[vc->vc_num];
1480+
1481+ p->yscroll += count;
1482+
1483+ if (p->yscroll > p->vrows - vc->vc_rows) {
1484+ p->yscroll -= p->vrows - vc->vc_rows;
1485+ fbcon_redraw_move(vc, p, t + count, vc->vc_rows - count, t);
1486+ }
1487+
1488+ ops->var.xoffset = 0;
1489+ ops->var.yoffset = p->yscroll * vc->vc_font.height;
1490+ ops->var.vmode &= ~FB_VMODE_YWRAP;
1491+ ops->update_start(info);
1492+ fbcon_clear_margins(vc, 1);
1493+ scrollback_max += count;
1494+ if (scrollback_max > scrollback_phys_max)
1495+ scrollback_max = scrollback_phys_max;
1496+ scrollback_current = 0;
1497+}
1498+
1499+static __inline__ void ypan_down(struct vc_data *vc, int count)
1500+{
1501+ struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
1502+ struct fbcon_display *p = &fb_display[vc->vc_num];
1503+ struct fbcon_ops *ops = info->fbcon_par;
1504+
1505+ p->yscroll -= count;
1506+ if (p->yscroll < 0) {
1507+ ops->bmove(vc, info, 0, 0, p->vrows - vc->vc_rows,
1508+ 0, vc->vc_rows, vc->vc_cols);
1509+ p->yscroll += p->vrows - vc->vc_rows;
1510+ }
1511+
1512+ ops->var.xoffset = 0;
1513+ ops->var.yoffset = p->yscroll * vc->vc_font.height;
1514+ ops->var.vmode &= ~FB_VMODE_YWRAP;
1515+ ops->update_start(info);
1516+ fbcon_clear_margins(vc, 1);
1517+ scrollback_max -= count;
1518+ if (scrollback_max < 0)
1519+ scrollback_max = 0;
1520+ scrollback_current = 0;
1521+}
1522+
1523+static __inline__ void ypan_down_redraw(struct vc_data *vc, int t, int count)
1524+{
1525+ struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
1526+ struct fbcon_ops *ops = info->fbcon_par;
1527+ struct fbcon_display *p = &fb_display[vc->vc_num];
1528+
1529+ p->yscroll -= count;
1530+
1531+ if (p->yscroll < 0) {
1532+ p->yscroll += p->vrows - vc->vc_rows;
1533+ fbcon_redraw_move(vc, p, t, vc->vc_rows - count, t + count);
1534+ }
1535+
1536+ ops->var.xoffset = 0;
1537+ ops->var.yoffset = p->yscroll * vc->vc_font.height;
1538+ ops->var.vmode &= ~FB_VMODE_YWRAP;
1539+ ops->update_start(info);
1540+ fbcon_clear_margins(vc, 1);
1541+ scrollback_max -= count;
1542+ if (scrollback_max < 0)
1543+ scrollback_max = 0;
1544+ scrollback_current = 0;
1545+}
1546+
1547+static void fbcon_redraw_move(struct vc_data *vc, struct fbcon_display *p,
1548+ int line, int count, int dy)
1549+{
1550+ unsigned short *s = (unsigned short *)
1551+ (vc->vc_origin + vc->vc_size_row * line);
1552+
1553+ while (count--) {
1554+ unsigned short *start = s;
1555+ unsigned short *le = advance_row(s, 1);
1556+ unsigned short c;
1557+ int x = 0;
1558+ unsigned short attr = 1;
1559+
1560+ do {
1561+ c = scr_readw(s);
1562+ if (attr != (c & 0xff00)) {
1563+ attr = c & 0xff00;
1564+ if (s > start) {
1565+ fbcon_putcs(vc, start, s - start,
1566+ dy, x);
1567+ x += s - start;
1568+ start = s;
1569+ }
1570+ }
1571+ console_conditional_schedule();
1572+ s++;
1573+ } while (s < le);
1574+ if (s > start)
1575+ fbcon_putcs(vc, start, s - start, dy, x);
1576+ console_conditional_schedule();
1577+ dy++;
1578+ }
1579+}
1580+
1581+static void fbcon_redraw_blit(struct vc_data *vc, struct fb_info *info,
1582+ struct fbcon_display *p, int line, int count, int ycount)
1583+{
1584+ int offset = ycount * vc->vc_cols;
1585+ unsigned short *d = (unsigned short *)
1586+ (vc->vc_origin + vc->vc_size_row * line);
1587+ unsigned short *s = d + offset;
1588+ struct fbcon_ops *ops = info->fbcon_par;
1589+
1590+ while (count--) {
1591+ unsigned short *start = s;
1592+ unsigned short *le = advance_row(s, 1);
1593+ unsigned short c;
1594+ int x = 0;
1595+
1596+ do {
1597+ c = scr_readw(s);
1598+
1599+ if (c == scr_readw(d)) {
1600+ if (s > start) {
1601+ ops->bmove(vc, info, line + ycount, x,
1602+ line, x, 1, s-start);
1603+ x += s - start + 1;
1604+ start = s + 1;
1605+ } else {
1606+ x++;
1607+ start++;
1608+ }
1609+ }
1610+
1611+ scr_writew(c, d);
1612+ console_conditional_schedule();
1613+ s++;
1614+ d++;
1615+ } while (s < le);
1616+ if (s > start)
1617+ ops->bmove(vc, info, line + ycount, x, line, x, 1,
1618+ s-start);
1619+ console_conditional_schedule();
1620+ if (ycount > 0)
1621+ line++;
1622+ else {
1623+ line--;
1624+ /* NOTE: We subtract two lines from these pointers */
1625+ s -= vc->vc_size_row;
1626+ d -= vc->vc_size_row;
1627+ }
1628+ }
1629+}
1630+
13931631 static void fbcon_redraw(struct vc_data *vc, struct fbcon_display *p,
13941632 int line, int count, int offset)
13951633 {
@@ -1450,6 +1688,7 @@ static bool fbcon_scroll(struct vc_data *vc, unsigned int t, unsigned int b, · 54 unmodified lines
14501688 {
14511689 struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
14521690 struct fbcon_display *p = &fb_display[vc->vc_num];
1691+ int scroll_partial = info->flags & FBINFO_PARTIAL_PAN_OK;
14531692
14541693 if (fbcon_is_inactive(vc, info))
14551694 return true;
@@ -1466,32 +1705,291 @@ static bool fbcon_scroll(struct vc_data *vc, unsigned int t, unsigned int b, · 10 unmodified lines
14661705 case SM_UP:
14671706 if (count > vc->vc_rows) /* Maximum realistic size */
14681707 count = vc->vc_rows;
1469− fbcon_redraw(vc, p, t, b - t - count,
1470− count * vc->vc_cols);
1471− fbcon_clear(vc, b - count, 0, count, vc->vc_cols);
1472− scr_memsetw((unsigned short *) (vc->vc_origin +
1473− vc->vc_size_row *
1474− (b - count)),
1475− vc->vc_video_erase_char,
1476− vc->vc_size_row * count);
1477− return true;
1708+ if (logo_shown >= 0)
1709+ goto redraw_up;
1710+ switch (fb_scrollmode(p)) {
1711+ case SCROLL_MOVE:
1712+ fbcon_redraw_blit(vc, info, p, t, b - t - count,
1713+ count);
1714+ fbcon_clear(vc, b - count, 0, count, vc->vc_cols);
1715+ scr_memsetw((unsigned short *) (vc->vc_origin +
1716+ vc->vc_size_row *
1717+ (b - count)),
1718+ vc->vc_video_erase_char,
1719+ vc->vc_size_row * count);
1720+ return true;
1721+
1722+ case SCROLL_WRAP_MOVE:
1723+ if (b - t - count > 3 * vc->vc_rows >> 2) {
1724+ if (t > 0)
1725+ fbcon_bmove(vc, 0, 0, count, 0, t,
1726+ vc->vc_cols);
1727+ ywrap_up(vc, count);
1728+ if (vc->vc_rows - b > 0)
1729+ fbcon_bmove(vc, b - count, 0, b, 0,
1730+ vc->vc_rows - b,
1731+ vc->vc_cols);
1732+ } else if (info->flags & FBINFO_READS_FAST)
1733+ fbcon_bmove(vc, t + count, 0, t, 0,
1734+ b - t - count, vc->vc_cols);
1735+ else
1736+ goto redraw_up;
1737+ fbcon_clear(vc, b - count, 0, count, vc->vc_cols);
1738+ break;
1739+
1740+ case SCROLL_PAN_REDRAW:
1741+ if ((p->yscroll + count <=
1742+ 2 * (p->vrows - vc->vc_rows))
1743+ && ((!scroll_partial && (b - t == vc->vc_rows))
1744+ || (scroll_partial
1745+ && (b - t - count >
1746+ 3 * vc->vc_rows >> 2)))) {
1747+ if (t > 0)
1748+ fbcon_redraw_move(vc, p, 0, t, count);
1749+ ypan_up_redraw(vc, t, count);
1750+ if (vc->vc_rows - b > 0)
1751+ fbcon_redraw_move(vc, p, b,
1752+ vc->vc_rows - b, b);
1753+ } else
1754+ fbcon_redraw_move(vc, p, t + count, b - t - count, t);
1755+ fbcon_clear(vc, b - count, 0, count, vc->vc_cols);
1756+ break;
1757+
1758+ case SCROLL_PAN_MOVE:
1759+ if ((p->yscroll + count <=
1760+ 2 * (p->vrows - vc->vc_rows))
1761+ && ((!scroll_partial && (b - t == vc->vc_rows))
1762+ || (scroll_partial
1763+ && (b - t - count >
1764+ 3 * vc->vc_rows >> 2)))) {
1765+ if (t > 0)
1766+ fbcon_bmove(vc, 0, 0, count, 0, t,
1767+ vc->vc_cols);
1768+ ypan_up(vc, count);
1769+ if (vc->vc_rows - b > 0)
1770+ fbcon_bmove(vc, b - count, 0, b, 0,
1771+ vc->vc_rows - b,
1772+ vc->vc_cols);
1773+ } else if (info->flags & FBINFO_READS_FAST)
1774+ fbcon_bmove(vc, t + count, 0, t, 0,
1775+ b - t - count, vc->vc_cols);
1776+ else
1777+ goto redraw_up;
1778+ fbcon_clear(vc, b - count, 0, count, vc->vc_cols);
1779+ break;
1780+
1781+ case SCROLL_REDRAW:
1782+ redraw_up:
1783+ fbcon_redraw(vc, p, t, b - t - count,
1784+ count * vc->vc_cols);
1785+ fbcon_clear(vc, b - count, 0, count, vc->vc_cols);
1786+ scr_memsetw((unsigned short *) (vc->vc_origin +
1787+ vc->vc_size_row *
1788+ (b - count)),
1789+ vc->vc_video_erase_char,
1790+ vc->vc_size_row * count);
1791+ return true;
1792+ }
1793+ break;
14781794
14791795 case SM_DOWN:
14801796 if (count > vc->vc_rows) /* Maximum realistic size */
14811797 count = vc->vc_rows;
1482− fbcon_redraw(vc, p, b - 1, b - t - count,
1483− -count * vc->vc_cols);
1484− fbcon_clear(vc, t, 0, count, vc->vc_cols);
1485− scr_memsetw((unsigned short *) (vc->vc_origin +
1486− vc->vc_size_row *
1487− t),
1488− vc->vc_video_erase_char,
1489− vc->vc_size_row * count);
1490− return true;
1798+ if (logo_shown >= 0)
1799+ goto redraw_down;
1800+ switch (fb_scrollmode(p)) {
1801+ case SCROLL_MOVE:
1802+ fbcon_redraw_blit(vc, info, p, b - 1, b - t - count,
1803+ -count);
1804+ fbcon_clear(vc, t, 0, count, vc->vc_cols);
1805+ scr_memsetw((unsigned short *) (vc->vc_origin +
1806+ vc->vc_size_row *
1807+ t),
1808+ vc->vc_video_erase_char,
1809+ vc->vc_size_row * count);
1810+ return true;
1811+
1812+ case SCROLL_WRAP_MOVE:
1813+ if (b - t - count > 3 * vc->vc_rows >> 2) {
1814+ if (vc->vc_rows - b > 0)
1815+ fbcon_bmove(vc, b, 0, b - count, 0,
1816+ vc->vc_rows - b,
1817+ vc->vc_cols);
1818+ ywrap_down(vc, count);
1819+ if (t > 0)
1820+ fbcon_bmove(vc, count, 0, 0, 0, t,
1821+ vc->vc_cols);
1822+ } else if (info->flags & FBINFO_READS_FAST)
1823+ fbcon_bmove(vc, t, 0, t + count, 0,
1824+ b - t - count, vc->vc_cols);
1825+ else
1826+ goto redraw_down;
1827+ fbcon_clear(vc, t, 0, count, vc->vc_cols);
1828+ break;
1829+
1830+ case SCROLL_PAN_MOVE:
1831+ if ((count - p->yscroll <= p->vrows - vc->vc_rows)
1832+ && ((!scroll_partial && (b - t == vc->vc_rows))
1833+ || (scroll_partial
1834+ && (b - t - count >
1835+ 3 * vc->vc_rows >> 2)))) {
1836+ if (vc->vc_rows - b > 0)
1837+ fbcon_bmove(vc, b, 0, b - count, 0,
1838+ vc->vc_rows - b,
1839+ vc->vc_cols);
1840+ ypan_down(vc, count);
1841+ if (t > 0)
1842+ fbcon_bmove(vc, count, 0, 0, 0, t,
1843+ vc->vc_cols);
1844+ } else if (info->flags & FBINFO_READS_FAST)
1845+ fbcon_bmove(vc, t, 0, t + count, 0,
1846+ b - t - count, vc->vc_cols);
1847+ else
1848+ goto redraw_down;
1849+ fbcon_clear(vc, t, 0, count, vc->vc_cols);
1850+ break;
1851+
1852+ case SCROLL_PAN_REDRAW:
1853+ if ((count - p->yscroll <= p->vrows - vc->vc_rows)
1854+ && ((!scroll_partial && (b - t == vc->vc_rows))
1855+ || (scroll_partial
1856+ && (b - t - count >
1857+ 3 * vc->vc_rows >> 2)))) {
1858+ if (vc->vc_rows - b > 0)
1859+ fbcon_redraw_move(vc, p, b, vc->vc_rows - b,
1860+ b - count);
1861+ ypan_down_redraw(vc, t, count);
1862+ if (t > 0)
1863+ fbcon_redraw_move(vc, p, count, t, 0);
1864+ } else
1865+ fbcon_redraw_move(vc, p, t, b - t - count, t + count);
1866+ fbcon_clear(vc, t, 0, count, vc->vc_cols);
1867+ break;
1868+
1869+ case SCROLL_REDRAW:
1870+ redraw_down:
1871+ fbcon_redraw(vc, p, b - 1, b - t - count,
1872+ -count * vc->vc_cols);
1873+ fbcon_clear(vc, t, 0, count, vc->vc_cols);
1874+ scr_memsetw((unsigned short *) (vc->vc_origin +
1875+ vc->vc_size_row *
1876+ t),
1877+ vc->vc_video_erase_char,
1878+ vc->vc_size_row * count);
1879+ return true;
1880+ }
14911881 }
14921882 return false;
14931883 }
14941884
1885+
1886+static void fbcon_bmove(struct vc_data *vc, int sy, int sx, int dy, int dx,
1887+ int height, int width)
1888+{
1889+ struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
1890+ struct fbcon_display *p = &fb_display[vc->vc_num];
1891+
1892+ if (fbcon_is_inactive(vc, info))
1893+ return;
1894+
1895+ if (!width || !height)
1896+ return;
1897+
1898+ /* Split blits that cross physical y_wrap case.
1899+ * Pathological case involves 4 blits, better to use recursive
1900+ * code rather than unrolled case
1901+ *
1902+ * Recursive invocations don't need to erase the cursor over and
1903+ * over again, so we use fbcon_bmove_rec()
1904+ */
1905+ fbcon_bmove_rec(vc, p, sy, sx, dy, dx, height, width,
1906+ p->vrows - p->yscroll);
1907+}
1908+
1909+static void fbcon_bmove_rec(struct vc_data *vc, struct fbcon_display *p, int sy, int sx,
1910+ int dy, int dx, int height, int width, u_int y_break)
1911+{
1912+ struct fb_info *info = registered_fb[con2fb_map[vc->vc_num]];
1913+ struct fbcon_ops *ops = info->fbcon_par;
1914+ u_int b;
1915+
1916+ if (sy < y_break && sy + height > y_break) {
1917+ b = y_break - sy;
1918+ if (dy < sy) { /* Avoid trashing self */
1919+ fbcon_bmove_rec(vc, p, sy, sx, dy, dx, b, width,
1920+ y_break);
1921+ fbcon_bmove_rec(vc, p, sy + b, sx, dy + b, dx,
1922+ height - b, width, y_break);
1923+ } else {
1924+ fbcon_bmove_rec(vc, p, sy + b, sx, dy + b, dx,
1925+ height - b, width, y_break);
1926+ fbcon_bmove_rec(vc, p, sy, sx, dy, dx, b, width,
1927+ y_break);
1928+ }
1929+ return;
1930+ }
1931+
1932+ if (dy < y_break && dy + height > y_break) {
1933+ b = y_break - dy;
1934+ if (dy < sy) { /* Avoid trashing self */
1935+ fbcon_bmove_rec(vc, p, sy, sx, dy, dx, b, width,
1936+ y_break);
1937+ fbcon_bmove_rec(vc, p, sy + b, sx, dy + b, dx,
1938+ height - b, width, y_break);
1939+ } else {
1940+ fbcon_bmove_rec(vc, p, sy + b, sx, dy + b, dx,
1941+ height - b, width, y_break);
1942+ fbcon_bmove_rec(vc, p, sy, sx, dy, dx, b, width,
1943+ y_break);
1944+ }
1945+ return;
1946+ }
1947+ ops->bmove(vc, info, real_y(p, sy), sx, real_y(p, dy), dx,
1948+ height, width);
1949+}
1950+
1951+static void updatescrollmode_accel(struct fbcon_display *p,
1952+ struct fb_info *info,
1953+ struct vc_data *vc)
1954+{
1955+#ifdef CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION
1956+ struct fbcon_ops *ops = info->fbcon_par;
1957+ int cap = info->flags;
1958+ u16 t = 0;
1959+ int ypan = FBCON_SWAP(ops->rotate, info->fix.ypanstep,
1960+ info->fix.xpanstep);
1961+ int ywrap = FBCON_SWAP(ops->rotate, info->fix.ywrapstep, t);
1962+ int yres = FBCON_SWAP(ops->rotate, info->var.yres, info->var.xres);
1963+ int vyres = FBCON_SWAP(ops->rotate, info->var.yres_virtual,
1964+ info->var.xres_virtual);
1965+ int good_pan = (cap & FBINFO_HWACCEL_YPAN) &&
1966+ divides(ypan, vc->vc_font.height) && vyres > yres;
1967+ int good_wrap = (cap & FBINFO_HWACCEL_YWRAP) &&
1968+ divides(ywrap, vc->vc_font.height) &&
1969+ divides(vc->vc_font.height, vyres) &&
1970+ divides(vc->vc_font.height, yres);
1971+ int reading_fast = cap & FBINFO_READS_FAST;
1972+ int fast_copyarea = (cap & FBINFO_HWACCEL_COPYAREA) &&
1973+ !(cap & FBINFO_HWACCEL_DISABLED);
1974+ int fast_imageblit = (cap & FBINFO_HWACCEL_IMAGEBLIT) &&
1975+ !(cap & FBINFO_HWACCEL_DISABLED);
1976+
1977+ if (good_wrap || good_pan) {
1978+ if (reading_fast || fast_copyarea)
1979+ p->scrollmode = good_wrap ?
1980+ SCROLL_WRAP_MOVE : SCROLL_PAN_MOVE;
1981+ else
1982+ p->scrollmode = good_wrap ? SCROLL_REDRAW :
1983+ SCROLL_PAN_REDRAW;
1984+ } else {
1985+ if (reading_fast || (fast_copyarea && !fast_imageblit))
1986+ p->scrollmode = SCROLL_MOVE;
1987+ else
1988+ p->scrollmode = SCROLL_REDRAW;
1989+ }
1990+#endif
1991+}
1992+
14951993 static void updatescrollmode(struct fbcon_display *p,
14961994 struct fb_info *info,
14971995 struct vc_data *vc)
@@ -1507,6 +2005,9 @@ static void updatescrollmode(struct fbcon_display *p, · 9 unmodified lines
15072005 p->vrows -= (yres - (fh * vc->vc_rows)) / fh;
15082006 if ((yres % fh) && (vyres % fh < yres % fh))
15092007 p->vrows--;
2008+
2009+ /* update scrollmode in case hardware acceleration is used */
2010+ updatescrollmode_accel(p, info, vc);
15102011 }
15112012
15122013 #define PITCH(w) (((w) + 7) >> 3)
@@ -1664,7 +2165,21 @@ static int fbcon_switch(struct vc_data *vc) · 151 unmodified lines
16642165
16652166 updatescrollmode(p, info, vc);
16662167
1667− scrollback_phys_max = 0;
2168+ switch (fb_scrollmode(p)) {
2169+ case SCROLL_WRAP_MOVE:
2170+ scrollback_phys_max = p->vrows - vc->vc_rows;
2171+ break;
2172+ case SCROLL_PAN_MOVE:
2173+ case SCROLL_PAN_REDRAW:
2174+ scrollback_phys_max = p->vrows - 2 * vc->vc_rows;
2175+ if (scrollback_phys_max < 0)
2176+ scrollback_phys_max = 0;
2177+ break;
2178+ default:
2179+ scrollback_phys_max = 0;
2180+ break;
2181+ }
2182+
16682183 scrollback_max = 0;
16692184 scrollback_current = 0;
16702185
drivers/video/fbdev/core/fbcon.h+72−0
@@ -29,6 +29,9 @@ struct fbcon_display { · 28 unmodified lines
2929 /* Filled in by the low-level console driver */
3030 const u_char *fontdata;
3131 int userfont; /* != 0 if fontdata kmalloc()ed */
32+#ifdef CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION
33+ u_short scrollmode; /* Scroll Method, use fb_scrollmode() */
34+#endif
3235 u_short inverse; /* != 0 text black on white as default */
3336 short yscroll; /* Hardware scrolling */
3437 int vrows; /* number of virtual rows */
@@ -51,6 +54,8 @@ struct fbcon_display { · 16 unmodified lines
5154 };
5255
5356 struct fbcon_ops {
57+ void (*bmove)(struct vc_data *vc, struct fb_info *info, int sy,
58+ int sx, int dy, int dx, int height, int width);
5459 void (*clear)(struct vc_data *vc, struct fb_info *info, int sy,
5560 int sx, int height, int width);
5661 void (*putcs)(struct vc_data *vc, struct fb_info *info,
@@ -149,6 +154,73 @@ static inline int attr_col_ec(int shift, struct vc_data *vc, · 92 unmodified lines
149154 #define attr_bgcol_ec(bgshift, vc, info) attr_col_ec(bgshift, vc, info, 0)
150155 #define attr_fgcol_ec(fgshift, vc, info) attr_col_ec(fgshift, vc, info, 1)
151156
157+ /*
158+ * Scroll Method
159+ */
160+
161+/* There are several methods fbcon can use to move text around the screen:
162+ *
163+ * Operation Pan Wrap
164+ *---------------------------------------------
165+ * SCROLL_MOVE copyarea No No
166+ * SCROLL_PAN_MOVE copyarea Yes No
167+ * SCROLL_WRAP_MOVE copyarea No Yes
168+ * SCROLL_REDRAW imageblit No No
169+ * SCROLL_PAN_REDRAW imageblit Yes No
170+ * SCROLL_WRAP_REDRAW imageblit No Yes
171+ *
172+ * (SCROLL_WRAP_REDRAW is not implemented yet)
173+ *
174+ * In general, fbcon will choose the best scrolling
175+ * method based on the rule below:
176+ *
177+ * Pan/Wrap > accel imageblit > accel copyarea >
178+ * soft imageblit > (soft copyarea)
179+ *
180+ * Exception to the rule: Pan + accel copyarea is
181+ * preferred over Pan + accel imageblit.
182+ *
183+ * The above is typical for PCI/AGP cards. Unless
184+ * overridden, fbcon will never use soft copyarea.
185+ *
186+ * If you need to override the above rule, set the
187+ * appropriate flags in fb_info->flags. For example,
188+ * to prefer copyarea over imageblit, set
189+ * FBINFO_READS_FAST.
190+ *
191+ * Other notes:
192+ * + use the hardware engine to move the text
193+ * (hw-accelerated copyarea() and fillrect())
194+ * + use hardware-supported panning on a large virtual screen
195+ * + amifb can not only pan, but also wrap the display by N lines
196+ * (i.e. visible line i = physical line (i+N) % yres).
197+ * + read what's already rendered on the screen and
198+ * write it in a different place (this is cfb_copyarea())
199+ * + re-render the text to the screen
200+ *
201+ * Whether to use wrapping or panning can only be figured out at
202+ * runtime (when we know whether our font height is a multiple
203+ * of the pan/wrap step)
204+ *
205+ */
206+
207+#define SCROLL_MOVE 0x001
208+#define SCROLL_PAN_MOVE 0x002
209+#define SCROLL_WRAP_MOVE 0x003
210+#define SCROLL_REDRAW 0x004
211+#define SCROLL_PAN_REDRAW 0x005
212+
213+static inline u_short fb_scrollmode(struct fbcon_display *fb)
214+{
215+#ifdef CONFIG_FRAMEBUFFER_CONSOLE_LEGACY_ACCELERATION
216+ return fb->scrollmode;
217+#else
218+ /* hardcoded to SCROLL_REDRAW if acceleration was disabled. */
219+ return SCROLL_REDRAW;
220+#endif
221+}
222+
223+
152224 #ifdef CONFIG_FB_TILEBLITTING
153225 extern void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info);
154226 #endif
drivers/video/fbdev/core/fbcon_ccw.c+24−4
@@ -59,12 +59,31 @@ static void ccw_update_attr(u8 *dst, u8 *src, int attribute, · 58 unmodified lines
5959 }
6060 }
6161
62+
63+static void ccw_bmove(struct vc_data *vc, struct fb_info *info, int sy,
64+ int sx, int dy, int dx, int height, int width)
65+{
66+ struct fbcon_ops *ops = info->fbcon_par;
67+ struct fb_copyarea area;
68+ u32 vyres = GETVYRES(ops->p, info);
69+
70+ area.sx = sy * vc->vc_font.height;
71+ area.sy = vyres - ((sx + width) * vc->vc_font.width);
72+ area.dx = dy * vc->vc_font.height;
73+ area.dy = vyres - ((dx + width) * vc->vc_font.width);
74+ area.width = height * vc->vc_font.height;
75+ area.height = width * vc->vc_font.width;
76+
77+ info->fbops->fb_copyarea(info, &area);
78+}
79+
6280 static void ccw_clear(struct vc_data *vc, struct fb_info *info, int sy,
6381 int sx, int height, int width)
6482 {
83+ struct fbcon_ops *ops = info->fbcon_par;
6584 struct fb_fillrect region;
6685 int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
67− u32 vyres = info->var.yres;
86+ u32 vyres = GETVYRES(ops->p, info);
6887
6988 region.color = attr_bgcol_ec(bgshift,vc,info);
7089 region.dx = sy * vc->vc_font.height;
@@ -121,7 +140,7 @@ static void ccw_putcs(struct vc_data *vc, struct fb_info *info, · 50 unmodified lines
121140 u32 cnt, pitch, size;
122141 u32 attribute = get_attribute(info, scr_readw(s));
123142 u8 *dst, *buf = NULL;
124− u32 vyres = info->var.yres;
143+ u32 vyres = GETVYRES(ops->p, info);
125144
126145 if (!ops->fontbuffer)
127146 return;
@@ -210,7 +229,7 @@ static void ccw_cursor(struct vc_data *vc, struct fb_info *info, int mode, · 82 unmodified lines
210229 int attribute, use_sw = vc->vc_cursor_type & CUR_SW;
211230 int err = 1, dx, dy;
212231 char *src;
213− u32 vyres = info->var.yres;
232+ u32 vyres = GETVYRES(ops->p, info);
214233
215234 if (!ops->fontbuffer)
216235 return;
@@ -368,7 +387,7 @@ static int ccw_update_start(struct fb_info *info) · 151 unmodified lines
368387 {
369388 struct fbcon_ops *ops = info->fbcon_par;
370389 u32 yoffset;
371− u32 vyres = info->var.yres;
390+ u32 vyres = GETVYRES(ops->p, info);
372391 int err;
373392
374393 yoffset = (vyres - info->var.yres) - ops->var.xoffset;
@@ -383,6 +402,7 @@ static int ccw_update_start(struct fb_info *info) · 8 unmodified lines
383402
384403 void fbcon_rotate_ccw(struct fbcon_ops *ops)
385404 {
405+ ops->bmove = ccw_bmove;
386406 ops->clear = ccw_clear;
387407 ops->putcs = ccw_putcs;
388408 ops->clear_margins = ccw_clear_margins;
drivers/video/fbdev/core/fbcon_cw.c+24−4
@@ -44,12 +44,31 @@ static void cw_update_attr(u8 *dst, u8 *src, int attribute, · 43 unmodified lines
4444 }
4545 }
4646
47+
48+static void cw_bmove(struct vc_data *vc, struct fb_info *info, int sy,
49+ int sx, int dy, int dx, int height, int width)
50+{
51+ struct fbcon_ops *ops = info->fbcon_par;
52+ struct fb_copyarea area;
53+ u32 vxres = GETVXRES(ops->p, info);
54+
55+ area.sx = vxres - ((sy + height) * vc->vc_font.height);
56+ area.sy = sx * vc->vc_font.width;
57+ area.dx = vxres - ((dy + height) * vc->vc_font.height);
58+ area.dy = dx * vc->vc_font.width;
59+ area.width = height * vc->vc_font.height;
60+ area.height = width * vc->vc_font.width;
61+
62+ info->fbops->fb_copyarea(info, &area);
63+}
64+
4765 static void cw_clear(struct vc_data *vc, struct fb_info *info, int sy,
4866 int sx, int height, int width)
4967 {
68+ struct fbcon_ops *ops = info->fbcon_par;
5069 struct fb_fillrect region;
5170 int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
52− u32 vxres = info->var.xres;
71+ u32 vxres = GETVXRES(ops->p, info);
5372
5473 region.color = attr_bgcol_ec(bgshift,vc,info);
5574 region.dx = vxres - ((sy + height) * vc->vc_font.height);
@@ -106,7 +125,7 @@ static void cw_putcs(struct vc_data *vc, struct fb_info *info, · 50 unmodified lines
106125 u32 cnt, pitch, size;
107126 u32 attribute = get_attribute(info, scr_readw(s));
108127 u8 *dst, *buf = NULL;
109− u32 vxres = info->var.xres;
128+ u32 vxres = GETVXRES(ops->p, info);
110129
111130 if (!ops->fontbuffer)
112131 return;
@@ -193,7 +212,7 @@ static void cw_cursor(struct vc_data *vc, struct fb_info *info, int mode, · 80 unmodified lines
193212 int attribute, use_sw = vc->vc_cursor_type & CUR_SW;
194213 int err = 1, dx, dy;
195214 char *src;
196− u32 vxres = info->var.xres;
215+ u32 vxres = GETVXRES(ops->p, info);
197216
198217 if (!ops->fontbuffer)
199218 return;
@@ -350,7 +369,7 @@ static void cw_cursor(struct vc_data *vc, struct fb_info *info, int mode, · 150 unmodified lines
350369 static int cw_update_start(struct fb_info *info)
351370 {
352371 struct fbcon_ops *ops = info->fbcon_par;
353− u32 vxres = info->var.xres;
372+ u32 vxres = GETVXRES(ops->p, info);
354373 u32 xoffset;
355374 int err;
356375
@@ -366,6 +385,7 @@ static int cw_update_start(struct fb_info *info) · 9 unmodified lines
366385
367386 void fbcon_rotate_cw(struct fbcon_ops *ops)
368387 {
388+ ops->bmove = cw_bmove;
369389 ops->clear = cw_clear;
370390 ops->putcs = cw_putcs;
371391 ops->clear_margins = cw_clear_margins;
drivers/video/fbdev/core/fbcon_rotate.h+9−0
@@ -11,6 +11,15 @@ · 10 unmodified lines
1111 #ifndef _FBCON_ROTATE_H
1212 #define _FBCON_ROTATE_H
1313
14+#define GETVYRES(s,i) ({ \
15+ (fb_scrollmode(s) == SCROLL_REDRAW || fb_scrollmode(s) == SCROLL_MOVE) ? \
16+ (i)->var.yres : (i)->var.yres_virtual; })
17+
18+#define GETVXRES(s,i) ({ \
19+ (fb_scrollmode(s) == SCROLL_REDRAW || fb_scrollmode(s) == SCROLL_MOVE || !(i)->fix.xpanstep) ? \
20+ (i)->var.xres : (i)->var.xres_virtual; })
21+
22+
1423 static inline int pattern_test_bit(u32 x, u32 y, u32 pitch, const char *pat)
1524 {
1625 u32 tmp = (y * pitch) + x, index = tmp / 8, bit = tmp % 8;
drivers/video/fbdev/core/fbcon_ud.c+29−8
@@ -44,13 +44,33 @@ static void ud_update_attr(u8 *dst, u8 *src, int attribute, · 43 unmodified lines
4444 }
4545 }
4646
47+
48+static void ud_bmove(struct vc_data *vc, struct fb_info *info, int sy,
49+ int sx, int dy, int dx, int height, int width)
50+{
51+ struct fbcon_ops *ops = info->fbcon_par;
52+ struct fb_copyarea area;
53+ u32 vyres = GETVYRES(ops->p, info);
54+ u32 vxres = GETVXRES(ops->p, info);
55+
56+ area.sy = vyres - ((sy + height) * vc->vc_font.height);
57+ area.sx = vxres - ((sx + width) * vc->vc_font.width);
58+ area.dy = vyres - ((dy + height) * vc->vc_font.height);
59+ area.dx = vxres - ((dx + width) * vc->vc_font.width);
60+ area.height = height * vc->vc_font.height;
61+ area.width = width * vc->vc_font.width;
62+
63+ info->fbops->fb_copyarea(info, &area);
64+}
65+
4766 static void ud_clear(struct vc_data *vc, struct fb_info *info, int sy,
4867 int sx, int height, int width)
4968 {
69+ struct fbcon_ops *ops = info->fbcon_par;
5070 struct fb_fillrect region;
5171 int bgshift = (vc->vc_hi_font_mask) ? 13 : 12;
52− u32 vyres = info->var.yres;
53− u32 vxres = info->var.xres;
72+ u32 vyres = GETVYRES(ops->p, info);
73+ u32 vxres = GETVXRES(ops->p, info);
5474
5575 region.color = attr_bgcol_ec(bgshift,vc,info);
5676 region.dy = vyres - ((sy + height) * vc->vc_font.height);
@@ -142,8 +162,8 @@ static void ud_putcs(struct vc_data *vc, struct fb_info *info, · 85 unmodified lines
142162 u32 mod = vc->vc_font.width % 8, cnt, pitch, size;
143163 u32 attribute = get_attribute(info, scr_readw(s));
144164 u8 *dst, *buf = NULL;
145− u32 vyres = info->var.yres;
146− u32 vxres = info->var.xres;
165+ u32 vyres = GETVYRES(ops->p, info);
166+ u32 vxres = GETVXRES(ops->p, info);
147167
148168 if (!ops->fontbuffer)
149169 return;
@@ -239,8 +259,8 @@ static void ud_cursor(struct vc_data *vc, struct fb_info *info, int mode, · 89 unmodified lines
239259 int attribute, use_sw = vc->vc_cursor_type & CUR_SW;
240260 int err = 1, dx, dy;
241261 char *src;
242− u32 vyres = info->var.yres;
243− u32 vxres = info->var.xres;
262+ u32 vyres = GETVYRES(ops->p, info);
263+ u32 vxres = GETVXRES(ops->p, info);
244264
245265 if (!ops->fontbuffer)
246266 return;
@@ -390,8 +410,8 @@ static int ud_update_start(struct fb_info *info) · 143 unmodified lines
390410 {
391411 struct fbcon_ops *ops = info->fbcon_par;
392412 int xoffset, yoffset;
393− u32 vyres = info->var.yres;
394− u32 vxres = info->var.xres;
413+ u32 vyres = GETVYRES(ops->p, info);
414+ u32 vxres = GETVXRES(ops->p, info);
395415 int err;
396416
397417 xoffset = vxres - info->var.xres - ops->var.xoffset;
@@ -409,6 +429,7 @@ static int ud_update_start(struct fb_info *info) · 11 unmodified lines
409429
410430 void fbcon_rotate_ud(struct fbcon_ops *ops)
411431 {
432+ ops->bmove = ud_bmove;
412433 ops->clear = ud_clear;
413434 ops->putcs = ud_putcs;
414435 ops->clear_margins = ud_clear_margins;
drivers/video/fbdev/core/tileblit.c+16−0
@@ -16,6 +16,21 @@ · 15 unmodified lines
1616 #include <asm/types.h>
1717 #include "fbcon.h"
1818
19+static void tile_bmove(struct vc_data *vc, struct fb_info *info, int sy,
20+ int sx, int dy, int dx, int height, int width)
21+{
22+ struct fb_tilearea area;
23+
24+ area.sx = sx;
25+ area.sy = sy;
26+ area.dx = dx;
27+ area.dy = dy;
28+ area.height = height;
29+ area.width = width;
30+
31+ info->tileops->fb_tilecopy(info, &area);
32+}
33+
1934 static void tile_clear(struct vc_data *vc, struct fb_info *info, int sy,
2035 int sx, int height, int width)
2136 {
@@ -118,6 +133,7 @@ void fbcon_set_tileops(struct vc_data *vc, struct fb_info *info) · 96 unmodified lines
118133 struct fb_tilemap map;
119134 struct fbcon_ops *ops = info->fbcon_par;
120135
136+ ops->bmove = tile_bmove;
121137 ops->clear = tile_clear;
122138 ops->putcs = tile_putcs;
123139 ops->clear_margins = tile_clear_margins;
drivers/video/fbdev/skeletonfb.c+6−6
@@ -505,15 +505,15 @@ void xxxfb_fillrect(struct fb_info *p, const struct fb_fillrect *region) · 504 unmodified lines
505505 }
506506
507507 /**
508− * xxxfb_copyarea - OBSOLETE function.
508+ * xxxfb_copyarea - REQUIRED function. Can use generic routines if
509+ * non acclerated hardware and packed pixel based.
509510 * Copies one area of the screen to another area.
510− * Will be deleted in a future version
511511 *
512512 * @info: frame buffer structure that represents a single frame buffer
513513 * @area: Structure providing the data to copy the framebuffer contents
514514 * from one region to another.
515515 *
516− * This drawing operation copied a rectangular area from one area of the
516+ * This drawing operation copies a rectangular area from one area of the
517517 * screen to another area.
518518 */
519519 void xxxfb_copyarea(struct fb_info *p, const struct fb_copyarea *area)
@@ -645,9 +645,9 @@ static const struct fb_ops xxxfb_ops = { · 125 unmodified lines
645645 .fb_setcolreg = xxxfb_setcolreg,
646646 .fb_blank = xxxfb_blank,
647647 .fb_pan_display = xxxfb_pan_display,
648− .fb_fillrect = xxxfb_fillrect, /* Needed !!! */
649− .fb_copyarea = xxxfb_copyarea, /* Obsolete */
650− .fb_imageblit = xxxfb_imageblit, /* Needed !!! */
648+ .fb_fillrect = xxxfb_fillrect, /* Needed !!! */
649+ .fb_copyarea = xxxfb_copyarea, /* Needed !!! */
650+ .fb_imageblit = xxxfb_imageblit, /* Needed !!! */
651651 .fb_cursor = xxxfb_cursor, /* Optional !!! */
652652 .fb_sync = xxxfb_sync,
653653 .fb_ioctl = xxxfb_ioctl,
fs/9p/fid.c+4−5
@@ -96,12 +96,8 @@ static struct p9_fid *v9fs_fid_find(struct dentry *dentry, kuid_t uid, int any) · 95 unmodified lines
9696 dentry, dentry, from_kuid(&init_user_ns, uid),
9797 any);
9898 ret = NULL;
99−
100− if (d_inode(dentry))
101− ret = v9fs_fid_find_inode(d_inode(dentry), uid);
102−
10399 /* we'll recheck under lock if there's anything to look in */
104− if (!ret && dentry->d_fsdata) {
100+ if (dentry->d_fsdata) {
105101 struct hlist_head *h = (struct hlist_head *)&dentry->d_fsdata;
106102
107103 spin_lock(&dentry->d_lock);
@@ -113,6 +109,9 @@ static struct p9_fid *v9fs_fid_find(struct dentry *dentry, kuid_t uid, int any) · 5 unmodified lines
113109 }
114110 }
115111 spin_unlock(&dentry->d_lock);
112+ } else {
113+ if (dentry->d_inode)
114+ ret = v9fs_fid_find_inode(dentry->d_inode, uid);
116115 }
117116
118117 return ret;
fs/Makefile+1−1
@@ -96,7 +96,7 @@ obj-$(CONFIG_EXPORTFS) += exportfs/ · 95 unmodified lines
9696 obj-$(CONFIG_NFSD) += nfsd/
9797 obj-$(CONFIG_LOCKD) += lockd/
9898 obj-$(CONFIG_NLS) += nls/
99−obj-$(CONFIG_UNICODE) += unicode/
99+obj-y += unicode/
100100 obj-$(CONFIG_SYSV_FS) += sysv/
101101 obj-$(CONFIG_SMBFS_COMMON) += smbfs_common/
102102 obj-$(CONFIG_CIFS) += cifs/
fs/btrfs/block-group.c+37−2
@@ -124,7 +124,16 @@ void btrfs_put_block_group(struct btrfs_block_group *cache) · 123 unmodified lines
124124 {
125125 if (refcount_dec_and_test(&cache->refs)) {
126126 WARN_ON(cache->pinned > 0);
127− WARN_ON(cache->reserved > 0);
127+ /*
128+ * If there was a failure to cleanup a log tree, very likely due
129+ * to an IO failure on a writeback attempt of one or more of its
130+ * extent buffers, we could not do proper (and cheap) unaccounting
131+ * of their reserved space, so don't warn on reserved > 0 in that
132+ * case.
133+ */
134+ if (!(cache->flags & BTRFS_BLOCK_GROUP_METADATA) ||
135+ !BTRFS_FS_LOG_CLEANUP_ERROR(cache->fs_info))
136+ WARN_ON(cache->reserved > 0);
128137
129138 /*
130139 * A block_group shouldn't be on the discard_list anymore.
@@ -2544,6 +2553,19 @@ int btrfs_inc_block_group_ro(struct btrfs_block_group *cache, · 2413 unmodified lines
25442553 int ret;
25452554 bool dirty_bg_running;
25462555
2556+ /*
2557+ * This can only happen when we are doing read-only scrub on read-only
2558+ * mount.
2559+ * In that case we should not start a new transaction on read-only fs.
2560+ * Thus here we skip all chunk allocations.
2561+ */
2562+ if (sb_rdonly(fs_info->sb)) {
2563+ mutex_lock(&fs_info->ro_block_group_mutex);
2564+ ret = inc_block_group_ro(cache, 0);
2565+ mutex_unlock(&fs_info->ro_block_group_mutex);
2566+ return ret;
2567+ }
2568+
25472569 do {
25482570 trans = btrfs_join_transaction(root);
25492571 if (IS_ERR(trans))
@@ -3974,9 +3996,22 @@ int btrfs_free_block_groups(struct btrfs_fs_info *info) · 1424 unmodified lines
39743996 * important and indicates a real bug if this happens.
39753997 */
39763998 if (WARN_ON(space_info->bytes_pinned > 0 ||
3977− space_info->bytes_reserved > 0 ||
39783999 space_info->bytes_may_use > 0))
39794000 btrfs_dump_space_info(info, space_info, 0, 0);
4001+
4002+ /*
4003+ * If there was a failure to cleanup a log tree, very likely due
4004+ * to an IO failure on a writeback attempt of one or more of its
4005+ * extent buffers, we could not do proper (and cheap) unaccounting
4006+ * of their reserved space, so don't warn on bytes_reserved > 0 in
4007+ * that case.
4008+ */
4009+ if (!(space_info->flags & BTRFS_BLOCK_GROUP_METADATA) ||
4010+ !BTRFS_FS_LOG_CLEANUP_ERROR(info)) {
4011+ if (WARN_ON(space_info->bytes_reserved > 0))
4012+ btrfs_dump_space_info(info, space_info, 0, 0);
4013+ }
4014+
39804015 WARN_ON(space_info->reclaim_size > 0);
39814016 list_del(&space_info->list);
39824017 btrfs_sysfs_remove_space_info(space_info);
fs/btrfs/ctree.h+6−0
@@ -145,6 +145,9 @@ enum { · 144 unmodified lines
145145 BTRFS_FS_STATE_DUMMY_FS_INFO,
146146
147147 BTRFS_FS_STATE_NO_CSUMS,
148+
149+ /* Indicates there was an error cleaning up a log tree. */
150+ BTRFS_FS_STATE_LOG_CLEANUP_ERROR,
148151 };
149152
150153 #define BTRFS_BACKREF_REV_MAX 256
@@ -3593,6 +3596,9 @@ do { \ · 3442 unmodified lines
35933596
35943597 #define BTRFS_FS_ERROR(fs_info) (unlikely(test_bit(BTRFS_FS_STATE_ERROR, \
35953598 &(fs_info)->fs_state)))
3599+#define BTRFS_FS_LOG_CLEANUP_ERROR(fs_info) \
3600+ (unlikely(test_bit(BTRFS_FS_STATE_LOG_CLEANUP_ERROR, \
3601+ &(fs_info)->fs_state)))
35963602
35973603 __printf(5, 6)
35983604 __cold
fs/btrfs/ioctl.c+2−5
@@ -805,10 +805,7 @@ static int create_snapshot(struct btrfs_root *root, struct inode *dir, · 804 unmodified lines
805805 goto fail;
806806 }
807807
808− spin_lock(&fs_info->trans_lock);
809− list_add(&pending_snapshot->list,
810− &trans->transaction->pending_snapshots);
811− spin_unlock(&fs_info->trans_lock);
808+ trans->pending_snapshot = pending_snapshot;
812809
813810 ret = btrfs_commit_transaction(trans);
814811 if (ret)
@@ -3354,7 +3351,7 @@ static long btrfs_ioctl_rm_dev(struct file *file, void __user *arg) · 2539 unmodified lines
33543351 struct block_device *bdev = NULL;
33553352 fmode_t mode;
33563353 int ret;
3357− bool cancel;
3354+ bool cancel = false;
33583355
33593356 if (!capable(CAP_SYS_ADMIN))
33603357 return -EPERM;
fs/btrfs/qgroup.c+19−2
@@ -1185,9 +1185,24 @@ int btrfs_quota_disable(struct btrfs_fs_info *fs_info) · 1184 unmodified lines
11851185 struct btrfs_trans_handle *trans = NULL;
11861186 int ret = 0;
11871187
1188+ /*
1189+ * We need to have subvol_sem write locked, to prevent races between
1190+ * concurrent tasks trying to disable quotas, because we will unlock
1191+ * and relock qgroup_ioctl_lock across BTRFS_FS_QUOTA_ENABLED changes.
1192+ */
1193+ lockdep_assert_held_write(&fs_info->subvol_sem);
1194+
11881195 mutex_lock(&fs_info->qgroup_ioctl_lock);
11891196 if (!fs_info->quota_root)
11901197 goto out;
1198+
1199+ /*
1200+ * Request qgroup rescan worker to complete and wait for it. This wait
1201+ * must be done before transaction start for quota disable since it may
1202+ * deadlock with transaction by the qgroup rescan worker.
1203+ */
1204+ clear_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags);
1205+ btrfs_qgroup_wait_for_completion(fs_info, false);
11911206 mutex_unlock(&fs_info->qgroup_ioctl_lock);
11921207
11931208 /*
@@ -1205,14 +1220,13 @@ int btrfs_quota_disable(struct btrfs_fs_info *fs_info) · 11 unmodified lines
12051220 if (IS_ERR(trans)) {
12061221 ret = PTR_ERR(trans);
12071222 trans = NULL;
1223+ set_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags);
12081224 goto out;
12091225 }
12101226
12111227 if (!fs_info->quota_root)
12121228 goto out;
12131229
1214− clear_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags);
1215− btrfs_qgroup_wait_for_completion(fs_info, false);
12161230 spin_lock(&fs_info->qgroup_lock);
12171231 quota_root = fs_info->quota_root;
12181232 fs_info->quota_root = NULL;
@@ -3383,6 +3397,9 @@ qgroup_rescan_init(struct btrfs_fs_info *fs_info, u64 progress_objectid, · 2164 unmodified lines
33833397 btrfs_warn(fs_info,
33843398 "qgroup rescan init failed, qgroup is not enabled");
33853399 ret = -EINVAL;
3400+ } else if (!test_bit(BTRFS_FS_QUOTA_ENABLED, &fs_info->flags)) {
3401+ /* Quota disable is in progress */
3402+ ret = -EBUSY;
33863403 }
33873404
33883405 if (ret) {
fs/btrfs/transaction.c+24−0
@@ -2000,6 +2000,27 @@ static inline void btrfs_wait_delalloc_flush(struct btrfs_fs_info *fs_info) · 1999 unmodified lines
20002000 btrfs_wait_ordered_roots(fs_info, U64_MAX, 0, (u64)-1);
20012001 }
20022002
2003+/*
2004+ * Add a pending snapshot associated with the given transaction handle to the
2005+ * respective handle. This must be called after the transaction commit started
2006+ * and while holding fs_info->trans_lock.
2007+ * This serves to guarantee a caller of btrfs_commit_transaction() that it can
2008+ * safely free the pending snapshot pointer in case btrfs_commit_transaction()
2009+ * returns an error.
2010+ */
2011+static void add_pending_snapshot(struct btrfs_trans_handle *trans)
2012+{
2013+ struct btrfs_transaction *cur_trans = trans->transaction;
2014+
2015+ if (!trans->pending_snapshot)
2016+ return;
2017+
2018+ lockdep_assert_held(&trans->fs_info->trans_lock);
2019+ ASSERT(cur_trans->state >= TRANS_STATE_COMMIT_START);
2020+
2021+ list_add(&trans->pending_snapshot->list, &cur_trans->pending_snapshots);
2022+}
2023+
20032024 int btrfs_commit_transaction(struct btrfs_trans_handle *trans)
20042025 {
20052026 struct btrfs_fs_info *fs_info = trans->fs_info;
@@ -2073,6 +2094,8 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans) · 67 unmodified lines
20732094 if (cur_trans->state >= TRANS_STATE_COMMIT_START) {
20742095 enum btrfs_trans_state want_state = TRANS_STATE_COMPLETED;
20752096
2097+ add_pending_snapshot(trans);
2098+
20762099 spin_unlock(&fs_info->trans_lock);
20772100 refcount_inc(&cur_trans->use_count);
20782101
@@ -2163,6 +2186,7 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans) · 84 unmodified lines
21632186 * COMMIT_DOING so make sure to wait for num_writers to == 1 again.
21642187 */
21652188 spin_lock(&fs_info->trans_lock);
2189+ add_pending_snapshot(trans);
21662190 cur_trans->state = TRANS_STATE_COMMIT_DOING;
21672191 spin_unlock(&fs_info->trans_lock);
21682192 wait_event(cur_trans->writer_wait,
fs/btrfs/transaction.h+2−0
@@ -123,6 +123,8 @@ struct btrfs_trans_handle { · 122 unmodified lines
123123 struct btrfs_transaction *transaction;
124124 struct btrfs_block_rsv *block_rsv;
125125 struct btrfs_block_rsv *orig_rsv;
126+ /* Set by a task that wants to create a snapshot. */
127+ struct btrfs_pending_snapshot *pending_snapshot;
126128 refcount_t use_count;
127129 unsigned int type;
128130 /*
fs/btrfs/tree-checker.c+15−0
@@ -965,6 +965,7 @@ static int check_dev_item(struct extent_buffer *leaf, · 964 unmodified lines
965965 struct btrfs_key *key, int slot)
966966 {
967967 struct btrfs_dev_item *ditem;
968+ const u32 item_size = btrfs_item_size(leaf, slot);
968969
969970 if (unlikely(key->objectid != BTRFS_DEV_ITEMS_OBJECTID)) {
970971 dev_item_err(leaf, slot,
@@ -972,6 +973,13 @@ static int check_dev_item(struct extent_buffer *leaf, · 1 unmodified line
972973 key->objectid, BTRFS_DEV_ITEMS_OBJECTID);
973974 return -EUCLEAN;
974975 }
976+
977+ if (unlikely(item_size != sizeof(*ditem))) {
978+ dev_item_err(leaf, slot, "invalid item size: has %u expect %zu",
979+ item_size, sizeof(*ditem));
980+ return -EUCLEAN;
981+ }
982+
975983 ditem = btrfs_item_ptr(leaf, slot, struct btrfs_dev_item);
976984 if (unlikely(btrfs_device_id(leaf, ditem) != key->offset)) {
977985 dev_item_err(leaf, slot,
@@ -1007,6 +1015,7 @@ static int check_inode_item(struct extent_buffer *leaf, · 29 unmodified lines
10071015 struct btrfs_inode_item *iitem;
10081016 u64 super_gen = btrfs_super_generation(fs_info->super_copy);
10091017 u32 valid_mask = (S_IFMT | S_ISUID | S_ISGID | S_ISVTX | 0777);
1018+ const u32 item_size = btrfs_item_size(leaf, slot);
10101019 u32 mode;
10111020 int ret;
10121021 u32 flags;
@@ -1016,6 +1025,12 @@ static int check_inode_item(struct extent_buffer *leaf, · 3 unmodified lines
10161025 if (unlikely(ret < 0))
10171026 return ret;
10181027
1028+ if (unlikely(item_size != sizeof(*iitem))) {
1029+ generic_err(leaf, slot, "invalid item size: has %u expect %zu",
1030+ item_size, sizeof(*iitem));
1031+ return -EUCLEAN;
1032+ }
1033+
10191034 iitem = btrfs_item_ptr(leaf, slot, struct btrfs_inode_item);
10201035
10211036 /* Here we use super block generation + 1 to handle log tree */
fs/btrfs/tree-log.c+23−0
@@ -3414,6 +3414,29 @@ static void free_log_tree(struct btrfs_trans_handle *trans, · 3413 unmodified lines
34143414 if (log->node) {
34153415 ret = walk_log_tree(trans, log, &wc);
34163416 if (ret) {
3417+ /*
3418+ * We weren't able to traverse the entire log tree, the
3419+ * typical scenario is getting an -EIO when reading an
3420+ * extent buffer of the tree, due to a previous writeback
3421+ * failure of it.
3422+ */
3423+ set_bit(BTRFS_FS_STATE_LOG_CLEANUP_ERROR,
3424+ &log->fs_info->fs_state);
3425+
3426+ /*
3427+ * Some extent buffers of the log tree may still be dirty
3428+ * and not yet written back to storage, because we may
3429+ * have updates to a log tree without syncing a log tree,
3430+ * such as during rename and link operations. So flush
3431+ * them out and wait for their writeback to complete, so
3432+ * that we properly cleanup their state and pages.
3433+ */
3434+ btrfs_write_marked_extents(log->fs_info,
3435+ &log->dirty_log_pages,
3436+ EXTENT_DIRTY | EXTENT_NEW);
3437+ btrfs_wait_tree_log_extents(log,
3438+ EXTENT_DIRTY | EXTENT_NEW);
3439+
34173440 if (trans)
34183441 btrfs_abort_transaction(trans, ret);
34193442 else
fs/cachefiles/io.c+59−0
@@ -191,6 +191,64 @@ presubmission_error: · 190 unmodified lines
191191 return ret;
192192 }
193193
194+/*
195+ * Query the occupancy of the cache in a region, returning where the next chunk
196+ * of data starts and how long it is.
197+ */
198+static int cachefiles_query_occupancy(struct netfs_cache_resources *cres,
199+ loff_t start, size_t len, size_t granularity,
200+ loff_t *_data_start, size_t *_data_len)
201+{
202+ struct cachefiles_object *object;
203+ struct file *file;
204+ loff_t off, off2;
205+
206+ *_data_start = -1;
207+ *_data_len = 0;
208+
209+ if (!fscache_wait_for_operation(cres, FSCACHE_WANT_READ))
210+ return -ENOBUFS;
211+
212+ object = cachefiles_cres_object(cres);
213+ file = cachefiles_cres_file(cres);
214+ granularity = max_t(size_t, object->volume->cache->bsize, granularity);
215+
216+ _enter("%pD,%li,%llx,%zx/%llx",
217+ file, file_inode(file)->i_ino, start, len,
218+ i_size_read(file_inode(file)));
219+
220+ off = cachefiles_inject_read_error();
221+ if (off == 0)
222+ off = vfs_llseek(file, start, SEEK_DATA);
223+ if (off == -ENXIO)
224+ return -ENODATA; /* Beyond EOF */
225+ if (off < 0 && off >= (loff_t)-MAX_ERRNO)
226+ return -ENOBUFS; /* Error. */
227+ if (round_up(off, granularity) >= start + len)
228+ return -ENODATA; /* No data in range */
229+
230+ off2 = cachefiles_inject_read_error();
231+ if (off2 == 0)
232+ off2 = vfs_llseek(file, off, SEEK_HOLE);
233+ if (off2 == -ENXIO)
234+ return -ENODATA; /* Beyond EOF */
235+ if (off2 < 0 && off2 >= (loff_t)-MAX_ERRNO)
236+ return -ENOBUFS; /* Error. */
237+
238+ /* Round away partial blocks */
239+ off = round_up(off, granularity);
240+ off2 = round_down(off2, granularity);
241+ if (off2 <= off)
242+ return -ENODATA;
243+
244+ *_data_start = off;
245+ if (off2 > start + len)
246+ *_data_len = len;
247+ else
248+ *_data_len = off2 - off;
249+ return 0;
250+}
251+
194252 /*
195253 * Handle completion of a write to the cache.
196254 */
@@ -545,6 +603,7 @@ static const struct netfs_cache_ops cachefiles_netfs_cache_ops = { · 348 unmodified lines
545603 .write = cachefiles_write,
546604 .prepare_read = cachefiles_prepare_read,
547605 .prepare_write = cachefiles_prepare_write,
606+ .query_occupancy = cachefiles_query_occupancy,
548607 };
549608
550609 /*
fs/cifs/connect.c+16−7
@@ -162,7 +162,7 @@ static void cifs_resolve_server(struct work_struct *work) · 161 unmodified lines
162162 mutex_unlock(&server->srv_mutex);
163163 }
164164
165−/**
165+/*
166166 * Mark all sessions and tcons for reconnect.
167167 *
168168 * @server needs to be previously set to CifsNeedReconnect.
@@ -1831,13 +1831,9 @@ void cifs_put_smb_ses(struct cifs_ses *ses) · 1662 unmodified lines
18311831 int i;
18321832
18331833 for (i = 1; i < chan_count; i++) {
1834− /*
1835− * note: for now, we're okay accessing ses->chans
1836− * without chan_lock. But when chans can go away, we'll
1837− * need to introduce ref counting to make sure that chan
1838− * is not freed from under us.
1839− */
1834+ spin_unlock(&ses->chan_lock);
18401835 cifs_put_tcp_session(ses->chans[i].server, 0);
1836+ spin_lock(&ses->chan_lock);
18411837 ses->chans[i].server = NULL;
18421838 }
18431839 }
@@ -1981,6 +1977,19 @@ cifs_set_cifscreds(struct smb3_fs_context *ctx, struct cifs_ses *ses) · 137 unmodified lines
19811977 }
19821978 }
19831979
1980+ ctx->workstation_name = kstrdup(ses->workstation_name, GFP_KERNEL);
1981+ if (!ctx->workstation_name) {
1982+ cifs_dbg(FYI, "Unable to allocate memory for workstation_name\n");
1983+ rc = -ENOMEM;
1984+ kfree(ctx->username);
1985+ ctx->username = NULL;
1986+ kfree_sensitive(ctx->password);
1987+ ctx->password = NULL;
1988+ kfree(ctx->domainname);
1989+ ctx->domainname = NULL;
1990+ goto out_key_put;
1991+ }
1992+
19841993 out_key_put:
19851994 up_read(&key->sem);
19861995 key_put(key);
fs/cifs/file.c+82−139
@@ -4269,8 +4269,6 @@ cifs_readv_complete(struct work_struct *work) · 4268 unmodified lines
42694269 for (i = 0; i < rdata->nr_pages; i++) {
42704270 struct page *page = rdata->pages[i];
42714271
4272− lru_cache_add(page);
4273−
42744272 if (rdata->result == 0 ||
42754273 (rdata->result == -EAGAIN && got_bytes)) {
42764274 flush_dcache_page(page);
@@ -4278,12 +4276,12 @@ cifs_readv_complete(struct work_struct *work) · 1 unmodified line
42784276 } else
42794277 SetPageError(page);
42804278
4281− unlock_page(page);
4282−
42834279 if (rdata->result == 0 ||
42844280 (rdata->result == -EAGAIN && got_bytes))
42854281 cifs_readpage_to_fscache(rdata->mapping->host, page);
42864282
4283+ unlock_page(page);
4284+
42874285 got_bytes -= min_t(unsigned int, PAGE_SIZE, got_bytes);
42884286
42894287 put_page(page);
@@ -4340,7 +4338,6 @@ readpages_fill_pages(struct TCP_Server_Info *server, · 50 unmodified lines
43404338 * fill them until the writes are flushed.
43414339 */
43424340 zero_user(page, 0, PAGE_SIZE);
4343− lru_cache_add(page);
43444341 flush_dcache_page(page);
43454342 SetPageUptodate(page);
43464343 unlock_page(page);
@@ -4350,7 +4347,6 @@ readpages_fill_pages(struct TCP_Server_Info *server, · 3 unmodified lines
43504347 continue;
43514348 } else {
43524349 /* no need to hold page hostage */
4353− lru_cache_add(page);
43544350 unlock_page(page);
43554351 put_page(page);
43564352 rdata->pages[i] = NULL;
@@ -4393,92 +4389,20 @@ cifs_readpages_copy_into_pages(struct TCP_Server_Info *server, · 36 unmodified lines
43934389 return readpages_fill_pages(server, rdata, iter, iter->count);
43944390 }
43954391
4396−static int
4397−readpages_get_pages(struct address_space *mapping, struct list_head *page_list,
4398− unsigned int rsize, struct list_head *tmplist,
4399− unsigned int *nr_pages, loff_t *offset, unsigned int *bytes)
4400−{
4401− struct page *page, *tpage;
4402− unsigned int expected_index;
4403− int rc;
4404− gfp_t gfp = readahead_gfp_mask(mapping);
4405−
4406− INIT_LIST_HEAD(tmplist);
4407−
4408− page = lru_to_page(page_list);
4409−
4410− /*
4411− * Lock the page and put it in the cache. Since no one else
4412− * should have access to this page, we're safe to simply set
4413− * PG_locked without checking it first.
4414− */
4415− __SetPageLocked(page);
4416− rc = add_to_page_cache_locked(page, mapping,
4417− page->index, gfp);
4418−
4419− /* give up if we can't stick it in the cache */
4420− if (rc) {
4421− __ClearPageLocked(page);
4422− return rc;
4423− }
4424−
4425− /* move first page to the tmplist */
4426− *offset = (loff_t)page->index << PAGE_SHIFT;
4427− *bytes = PAGE_SIZE;
4428− *nr_pages = 1;
4429− list_move_tail(&page->lru, tmplist);
4430−
4431− /* now try and add more pages onto the request */
4432− expected_index = page->index + 1;
4433− list_for_each_entry_safe_reverse(page, tpage, page_list, lru) {
4434− /* discontinuity ? */
4435− if (page->index != expected_index)
4436− break;
4437−
4438− /* would this page push the read over the rsize? */
4439− if (*bytes + PAGE_SIZE > rsize)
4440− break;
4441−
4442− __SetPageLocked(page);
4443− rc = add_to_page_cache_locked(page, mapping, page->index, gfp);
4444− if (rc) {
4445− __ClearPageLocked(page);
4446− break;
4447− }
4448− list_move_tail(&page->lru, tmplist);
4449− (*bytes) += PAGE_SIZE;
4450− expected_index++;
4451− (*nr_pages)++;
4452− }
4453− return rc;
4454−}
4455−
4456−static int cifs_readpages(struct file *file, struct address_space *mapping,
4457− struct list_head *page_list, unsigned num_pages)
4392+static void cifs_readahead(struct readahead_control *ractl)
44584393 {
44594394 int rc;
4460− int err = 0;
4461− struct list_head tmplist;
4462− struct cifsFileInfo *open_file = file->private_data;
4463− struct cifs_sb_info *cifs_sb = CIFS_FILE_SB(file);
4395+ struct cifsFileInfo *open_file = ractl->file->private_data;
4396+ struct cifs_sb_info *cifs_sb = CIFS_FILE_SB(ractl->file);
44644397 struct TCP_Server_Info *server;
44654398 pid_t pid;
4466− unsigned int xid;
4399+ unsigned int xid, nr_pages, last_batch_size = 0, cache_nr_pages = 0;
4400+ pgoff_t next_cached = ULONG_MAX;
4401+ bool caching = fscache_cookie_enabled(cifs_inode_cookie(ractl->mapping->host)) &&
4402+ cifs_inode_cookie(ractl->mapping->host)->cache_priv;
4403+ bool check_cache = caching;
44674404
44684405 xid = get_xid();
4469− /*
4470− * Reads as many pages as possible from fscache. Returns -ENOBUFS
4471− * immediately if the cookie is negative
4472− *
4473− * After this point, every page in the list might have PG_fscache set,
4474− * so we will need to clean that up off of every page we don't use.
4475− */
4476− rc = cifs_readpages_from_fscache(mapping->host, mapping, page_list,
4477− &num_pages);
4478− if (rc == 0) {
4479− free_xid(xid);
4480− return rc;
4481− }
44824406
44834407 if (cifs_sb->mnt_cifs_flags & CIFS_MOUNT_RWPIDFORWARD)
44844408 pid = open_file->pid;
@@ -4489,39 +4413,73 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, · 4 unmodified lines
44894413 server = cifs_pick_channel(tlink_tcon(open_file->tlink)->ses);
44904414
44914415 cifs_dbg(FYI, "%s: file=%p mapping=%p num_pages=%u\n",
4492− __func__, file, mapping, num_pages);
4416+ __func__, ractl->file, ractl->mapping, readahead_count(ractl));
44934417
44944418 /*
4495− * Start with the page at end of list and move it to private
4496− * list. Do the same with any following pages until we hit
4497− * the rsize limit, hit an index discontinuity, or run out of
4498− * pages. Issue the async read and then start the loop again
4499− * until the list is empty.
4500− *
4501− * Note that list order is important. The page_list is in
4502− * the order of declining indexes. When we put the pages in
4503− * the rdata->pages, then we want them in increasing order.
4419+ * Chop the readahead request up into rsize-sized read requests.
45044420 */
4505− while (!list_empty(page_list) && !err) {
4506− unsigned int i, nr_pages, bytes, rsize;
4507− loff_t offset;
4508− struct page *page, *tpage;
4421+ while ((nr_pages = readahead_count(ractl) - last_batch_size)) {
4422+ unsigned int i, got, rsize;
4423+ struct page *page;
45094424 struct cifs_readdata *rdata;
45104425 struct cifs_credits credits_on_stack;
45114426 struct cifs_credits *credits = &credits_on_stack;
4427+ pgoff_t index = readahead_index(ractl) + last_batch_size;
4428+
4429+ /*
4430+ * Find out if we have anything cached in the range of
4431+ * interest, and if so, where the next chunk of cached data is.
4432+ */
4433+ if (caching) {
4434+ if (check_cache) {
4435+ rc = cifs_fscache_query_occupancy(
4436+ ractl->mapping->host, index, nr_pages,
4437+ &next_cached, &cache_nr_pages);
4438+ if (rc < 0)
4439+ caching = false;
4440+ check_cache = false;
4441+ }
4442+
4443+ if (index == next_cached) {
4444+ /*
4445+ * TODO: Send a whole batch of pages to be read
4446+ * by the cache.
4447+ */
4448+ page = readahead_page(ractl);
4449+ last_batch_size = 1 << thp_order(page);
4450+ if (cifs_readpage_from_fscache(ractl->mapping->host,
4451+ page) < 0) {
4452+ /*
4453+ * TODO: Deal with cache read failure
4454+ * here, but for the moment, delegate
4455+ * that to readpage.
4456+ */
4457+ caching = false;
4458+ }
4459+ unlock_page(page);
4460+ next_cached++;
4461+ cache_nr_pages--;
4462+ if (cache_nr_pages == 0)
4463+ check_cache = true;
4464+ continue;
4465+ }
4466+ }
45124467
45134468 if (open_file->invalidHandle) {
45144469 rc = cifs_reopen_file(open_file, true);
4515− if (rc == -EAGAIN)
4516− continue;
4517− else if (rc)
4470+ if (rc) {
4471+ if (rc == -EAGAIN)
4472+ continue;
45184473 break;
4474+ }
45194475 }
45204476
45214477 rc = server->ops->wait_mtu_credits(server, cifs_sb->ctx->rsize,
45224478 &rsize, credits);
45234479 if (rc)
45244480 break;
4481+ nr_pages = min_t(size_t, rsize / PAGE_SIZE, readahead_count(ractl));
4482+ nr_pages = min_t(size_t, nr_pages, next_cached - index);
45254483
45264484 /*
45274485 * Give up immediately if rsize is too small to read an entire
@@ -4529,16 +4487,7 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, · 1 unmodified line
45294487 * reach this point however since we set ra_pages to 0 when the
45304488 * rsize is smaller than a cache page.
45314489 */
4532− if (unlikely(rsize < PAGE_SIZE)) {
4533− add_credits_and_wake_if(server, credits, 0);
4534− free_xid(xid);
4535− return 0;
4536− }
4537−
4538− nr_pages = 0;
4539− err = readpages_get_pages(mapping, page_list, rsize, &tmplist,
4540− &nr_pages, &offset, &bytes);
4541− if (!nr_pages) {
4490+ if (unlikely(!nr_pages)) {
45424491 add_credits_and_wake_if(server, credits, 0);
45434492 break;
45444493 }
@@ -4546,36 +4495,31 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, · 1 unmodified line
45464495 rdata = cifs_readdata_alloc(nr_pages, cifs_readv_complete);
45474496 if (!rdata) {
45484497 /* best to give up if we're out of mem */
4549− list_for_each_entry_safe(page, tpage, &tmplist, lru) {
4550− list_del(&page->lru);
4551− lru_cache_add(page);
4552− unlock_page(page);
4553− put_page(page);
4554− }
4555− rc = -ENOMEM;
45564498 add_credits_and_wake_if(server, credits, 0);
45574499 break;
45584500 }
45594501
4560− rdata->cfile = cifsFileInfo_get(open_file);
4561− rdata->server = server;
4562− rdata->mapping = mapping;
4563− rdata->offset = offset;
4564− rdata->bytes = bytes;
4565− rdata->pid = pid;
4566− rdata->pagesz = PAGE_SIZE;
4567− rdata->tailsz = PAGE_SIZE;
4502+ got = __readahead_batch(ractl, rdata->pages, nr_pages);
4503+ if (got != nr_pages) {
4504+ pr_warn("__readahead_batch() returned %u/%u\n",
4505+ got, nr_pages);
4506+ nr_pages = got;
4507+ }
4508+
4509+ rdata->nr_pages = nr_pages;
4510+ rdata->bytes = readahead_batch_length(ractl);
4511+ rdata->cfile = cifsFileInfo_get(open_file);
4512+ rdata->server = server;
4513+ rdata->mapping = ractl->mapping;
4514+ rdata->offset = readahead_pos(ractl);
4515+ rdata->pid = pid;
4516+ rdata->pagesz = PAGE_SIZE;
4517+ rdata->tailsz = PAGE_SIZE;
45684518 rdata->read_into_pages = cifs_readpages_read_into_pages;
45694519 rdata->copy_into_pages = cifs_readpages_copy_into_pages;
4570− rdata->credits = credits_on_stack;
4571−
4572− list_for_each_entry_safe(page, tpage, &tmplist, lru) {
4573− list_del(&page->lru);
4574− rdata->pages[rdata->nr_pages++] = page;
4575− }
4520+ rdata->credits = credits_on_stack;
45764521
45774522 rc = adjust_credits(server, &rdata->credits, rdata->bytes);
4578−
45794523 if (!rc) {
45804524 if (rdata->cfile->invalidHandle)
45814525 rc = -EAGAIN;
@@ -4587,7 +4531,6 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, · 5 unmodified lines
45874531 add_credits_and_wake_if(server, &rdata->credits, 0);
45884532 for (i = 0; i < rdata->nr_pages; i++) {
45894533 page = rdata->pages[i];
4590− lru_cache_add(page);
45914534 unlock_page(page);
45924535 put_page(page);
45934536 }
@@ -4597,10 +4540,10 @@ static int cifs_readpages(struct file *file, struct address_space *mapping, · 3 unmodified lines
45974540 }
45984541
45994542 kref_put(&rdata->refcount, cifs_readdata_release);
4543+ last_batch_size = nr_pages;
46004544 }
46014545
46024546 free_xid(xid);
4603− return rc;
46044547 }
46054548
46064549 /*
@@ -4924,7 +4867,7 @@ oplock_break_done: · 317 unmodified lines
49244867 * In the non-cached mode (mount with cache=none), we shunt off direct read and write requests
49254868 * so this method should never be called.
49264869 *
4927− * Direct IO is not yet supported in the cached mode.
4870+ * Direct IO is not yet supported in the cached mode.
49284871 */
49294872 static ssize_t
49304873 cifs_direct_io(struct kiocb *iocb, struct iov_iter *iter)
@@ -5006,7 +4949,7 @@ static int cifs_set_page_dirty(struct page *page) · 75 unmodified lines
50064949
50074950 const struct address_space_operations cifs_addr_ops = {
50084951 .readpage = cifs_readpage,
5009− .readpages = cifs_readpages,
4952+ .readahead = cifs_readahead,
50104953 .writepage = cifs_writepage,
50114954 .writepages = cifs_writepages,
50124955 .write_begin = cifs_write_begin,
fs/cifs/fscache.c+108−18
@@ -134,37 +134,127 @@ void cifs_fscache_release_inode_cookie(struct inode *inode) · 133 unmodified lines
134134 }
135135 }
136136
137+static inline void fscache_end_operation(struct netfs_cache_resources *cres)
138+{
139+ const struct netfs_cache_ops *ops = fscache_operation_valid(cres);
140+
141+ if (ops)
142+ ops->end_operation(cres);
143+}
144+
137145 /*
138− * Retrieve a page from FS-Cache
146+ * Fallback page reading interface.
139147 */
140−int __cifs_readpage_from_fscache(struct inode *inode, struct page *page)
148+static int fscache_fallback_read_page(struct inode *inode, struct page *page)
141149 {
142− cifs_dbg(FYI, "%s: (fsc:%p, p:%p, i:0x%p\n",
143− __func__, CIFS_I(inode)->fscache, page, inode);
144− return -ENOBUFS; // Needs conversion to using netfslib
150+ struct netfs_cache_resources cres;
151+ struct fscache_cookie *cookie = cifs_inode_cookie(inode);
152+ struct iov_iter iter;
153+ struct bio_vec bvec[1];
154+ int ret;
155+
156+ memset(&cres, 0, sizeof(cres));
157+ bvec[0].bv_page = page;
158+ bvec[0].bv_offset = 0;
159+ bvec[0].bv_len = PAGE_SIZE;
160+ iov_iter_bvec(&iter, READ, bvec, ARRAY_SIZE(bvec), PAGE_SIZE);
161+
162+ ret = fscache_begin_read_operation(&cres, cookie);
163+ if (ret < 0)
164+ return ret;
165+
166+ ret = fscache_read(&cres, page_offset(page), &iter, NETFS_READ_HOLE_FAIL,
167+ NULL, NULL);
168+ fscache_end_operation(&cres);
169+ return ret;
145170 }
146171
147172 /*
148− * Retrieve a set of pages from FS-Cache
173+ * Fallback page writing interface.
149174 */
150−int __cifs_readpages_from_fscache(struct inode *inode,
151− struct address_space *mapping,
152− struct list_head *pages,
153− unsigned *nr_pages)
175+static int fscache_fallback_write_page(struct inode *inode, struct page *page,
176+ bool no_space_allocated_yet)
154177 {
155− cifs_dbg(FYI, "%s: (0x%p/%u/0x%p)\n",
156− __func__, CIFS_I(inode)->fscache, *nr_pages, inode);
157− return -ENOBUFS; // Needs conversion to using netfslib
178+ struct netfs_cache_resources cres;
179+ struct fscache_cookie *cookie = cifs_inode_cookie(inode);
180+ struct iov_iter iter;
181+ struct bio_vec bvec[1];
182+ loff_t start = page_offset(page);
183+ size_t len = PAGE_SIZE;
184+ int ret;
185+
186+ memset(&cres, 0, sizeof(cres));
187+ bvec[0].bv_page = page;
188+ bvec[0].bv_offset = 0;
189+ bvec[0].bv_len = PAGE_SIZE;
190+ iov_iter_bvec(&iter, WRITE, bvec, ARRAY_SIZE(bvec), PAGE_SIZE);
191+
192+ ret = fscache_begin_write_operation(&cres, cookie);
193+ if (ret < 0)
194+ return ret;
195+
196+ ret = cres.ops->prepare_write(&cres, &start, &len, i_size_read(inode),
197+ no_space_allocated_yet);
198+ if (ret == 0)
199+ ret = fscache_write(&cres, page_offset(page), &iter, NULL, NULL);
200+ fscache_end_operation(&cres);
201+ return ret;
158202 }
159203
160−void __cifs_readpage_to_fscache(struct inode *inode, struct page *page)
204+/*
205+ * Retrieve a page from FS-Cache
206+ */
207+int __cifs_readpage_from_fscache(struct inode *inode, struct page *page)
161208 {
162− struct cifsInodeInfo *cifsi = CIFS_I(inode);
209+ int ret;
163210
164− WARN_ON(!cifsi->fscache);
211+ cifs_dbg(FYI, "%s: (fsc:%p, p:%p, i:0x%p\n",
212+ __func__, cifs_inode_cookie(inode), page, inode);
165213
214+ ret = fscache_fallback_read_page(inode, page);
215+ if (ret < 0)
216+ return ret;
217+
218+ /* Read completed synchronously */
219+ SetPageUptodate(page);
220+ return 0;
221+}
222+
223+void __cifs_readpage_to_fscache(struct inode *inode, struct page *page)
224+{
166225 cifs_dbg(FYI, "%s: (fsc: %p, p: %p, i: %p)\n",
167− __func__, cifsi->fscache, page, inode);
226+ __func__, cifs_inode_cookie(inode), page, inode);
227+
228+ fscache_fallback_write_page(inode, page, true);
229+}
230+
231+/*
232+ * Query the cache occupancy.
233+ */
234+int __cifs_fscache_query_occupancy(struct inode *inode,
235+ pgoff_t first, unsigned int nr_pages,
236+ pgoff_t *_data_first,
237+ unsigned int *_data_nr_pages)
238+{
239+ struct netfs_cache_resources cres;
240+ struct fscache_cookie *cookie = cifs_inode_cookie(inode);
241+ loff_t start, data_start;
242+ size_t len, data_len;
243+ int ret;
168244
169− // Needs conversion to using netfslib
245+ ret = fscache_begin_read_operation(&cres, cookie);
246+ if (ret < 0)
247+ return ret;
248+
249+ start = first * PAGE_SIZE;
250+ len = nr_pages * PAGE_SIZE;
251+ ret = cres.ops->query_occupancy(&cres, start, len, PAGE_SIZE,
252+ &data_start, &data_len);
253+ if (ret == 0) {
254+ *_data_first = data_start / PAGE_SIZE;
255+ *_data_nr_pages = len / PAGE_SIZE;
256+ }
257+
258+ fscache_end_operation(&cres);
259+ return ret;
170260 }
fs/cifs/fscache.h+49−30
@@ -9,6 +9,7 @@ · 8 unmodified lines
99 #ifndef _CIFS_FSCACHE_H
1010 #define _CIFS_FSCACHE_H
1111
12+#include <linux/swap.h>
1213 #include <linux/fscache.h>
1314
1415 #include "cifsglob.h"
@@ -58,14 +59,6 @@ void cifs_fscache_fill_coherency(struct inode *inode, · 43 unmodified lines
5859 }
5960
6061
61−extern int cifs_fscache_release_page(struct page *page, gfp_t gfp);
62−extern int __cifs_readpage_from_fscache(struct inode *, struct page *);
63−extern int __cifs_readpages_from_fscache(struct inode *,
64− struct address_space *,
65− struct list_head *,
66− unsigned *);
67−extern void __cifs_readpage_to_fscache(struct inode *, struct page *);
68−
6962 static inline struct fscache_cookie *cifs_inode_cookie(struct inode *inode)
7063 {
7164 return CIFS_I(inode)->fscache;
@@ -80,33 +73,52 @@ static inline void cifs_invalidate_cache(struct inode *inode, unsigned int flags · 8 unmodified lines
8073 i_size_read(inode), flags);
8174 }
8275
83−static inline int cifs_readpage_from_fscache(struct inode *inode,
84− struct page *page)
85−{
86− if (CIFS_I(inode)->fscache)
87− return __cifs_readpage_from_fscache(inode, page);
76+extern int __cifs_fscache_query_occupancy(struct inode *inode,
77+ pgoff_t first, unsigned int nr_pages,
78+ pgoff_t *_data_first,
79+ unsigned int *_data_nr_pages);
8880
89− return -ENOBUFS;
81+static inline int cifs_fscache_query_occupancy(struct inode *inode,
82+ pgoff_t first, unsigned int nr_pages,
83+ pgoff_t *_data_first,
84+ unsigned int *_data_nr_pages)
85+{
86+ if (!cifs_inode_cookie(inode))
87+ return -ENOBUFS;
88+ return __cifs_fscache_query_occupancy(inode, first, nr_pages,
89+ _data_first, _data_nr_pages);
9090 }
9191
92−static inline int cifs_readpages_from_fscache(struct inode *inode,
93− struct address_space *mapping,
94− struct list_head *pages,
95− unsigned *nr_pages)
92+extern int __cifs_readpage_from_fscache(struct inode *pinode, struct page *ppage);
93+extern void __cifs_readpage_to_fscache(struct inode *pinode, struct page *ppage);
94+
95+
96+static inline int cifs_readpage_from_fscache(struct inode *inode,
97+ struct page *page)
9698 {
97− if (CIFS_I(inode)->fscache)
98− return __cifs_readpages_from_fscache(inode, mapping, pages,
99− nr_pages);
99+ if (cifs_inode_cookie(inode))
100+ return __cifs_readpage_from_fscache(inode, page);
100101 return -ENOBUFS;
101102 }
102103
103104 static inline void cifs_readpage_to_fscache(struct inode *inode,
104105 struct page *page)
105106 {
106− if (PageFsCache(page))
107+ if (cifs_inode_cookie(inode))
107108 __cifs_readpage_to_fscache(inode, page);
108109 }
109110
111+static inline int cifs_fscache_release_page(struct page *page, gfp_t gfp)
112+{
113+ if (PageFsCache(page)) {
114+ if (current_is_kswapd() || !(gfp & __GFP_FS))
115+ return false;
116+ wait_on_page_fscache(page);
117+ fscache_note_page_release(cifs_inode_cookie(page->mapping->host));
118+ }
119+ return true;
120+}
121+
110122 #else /* CONFIG_CIFS_FSCACHE */
111123 static inline
112124 void cifs_fscache_fill_coherency(struct inode *inode,
@@ -123,22 +135,29 @@ static inline void cifs_fscache_unuse_inode_cookie(struct inode *inode, bool upd · 10 unmodified lines
123135 static inline struct fscache_cookie *cifs_inode_cookie(struct inode *inode) { return NULL; }
124136 static inline void cifs_invalidate_cache(struct inode *inode, unsigned int flags) {}
125137
126−static inline int
127−cifs_readpage_from_fscache(struct inode *inode, struct page *page)
138+static inline int cifs_fscache_query_occupancy(struct inode *inode,
139+ pgoff_t first, unsigned int nr_pages,
140+ pgoff_t *_data_first,
141+ unsigned int *_data_nr_pages)
128142 {
143+ *_data_first = ULONG_MAX;
144+ *_data_nr_pages = 0;
129145 return -ENOBUFS;
130146 }
131147
132−static inline int cifs_readpages_from_fscache(struct inode *inode,
133− struct address_space *mapping,
134− struct list_head *pages,
135− unsigned *nr_pages)
148+static inline int
149+cifs_readpage_from_fscache(struct inode *inode, struct page *page)
136150 {
137151 return -ENOBUFS;
138152 }
139153
140−static inline void cifs_readpage_to_fscache(struct inode *inode,
141− struct page *page) {}
154+static inline
155+void cifs_readpage_to_fscache(struct inode *inode, struct page *page) {}
156+
157+static inline int nfs_fscache_release_page(struct page *page, gfp_t gfp)
158+{
159+ return true; /* May release page */
160+}
142161
143162 #endif /* CONFIG_CIFS_FSCACHE */
144163
fs/cifs/inode.c+4−4
@@ -83,6 +83,7 @@ static void cifs_set_ops(struct inode *inode) · 82 unmodified lines
8383 static void
8484 cifs_revalidate_cache(struct inode *inode, struct cifs_fattr *fattr)
8585 {
86+ struct cifs_fscache_inode_coherency_data cd;
8687 struct cifsInodeInfo *cifs_i = CIFS_I(inode);
8788
8889 cifs_dbg(FYI, "%s: revalidating inode %llu\n",
@@ -113,6 +114,9 @@ cifs_revalidate_cache(struct inode *inode, struct cifs_fattr *fattr) · 24 unmodified lines
113114 cifs_dbg(FYI, "%s: invalidating inode %llu mapping\n",
114115 __func__, cifs_i->uniqueid);
115116 set_bit(CIFS_INO_INVALID_MAPPING, &cifs_i->flags);
117+ /* Invalidate fscache cookie */
118+ cifs_fscache_fill_coherency(&cifs_i->vfs_inode, &cd);
119+ fscache_invalidate(cifs_inode_cookie(inode), &cd, i_size_read(inode), 0);
116120 }
117121
118122 /*
@@ -2261,8 +2265,6 @@ cifs_dentry_needs_reval(struct dentry *dentry) · 2142 unmodified lines
22612265 int
22622266 cifs_invalidate_mapping(struct inode *inode)
22632267 {
2264− struct cifs_fscache_inode_coherency_data cd;
2265− struct cifsInodeInfo *cifsi = CIFS_I(inode);
22662268 int rc = 0;
22672269
22682270 if (inode->i_mapping && inode->i_mapping->nrpages != 0) {
@@ -2272,8 +2274,6 @@ cifs_invalidate_mapping(struct inode *inode) · 3 unmodified lines
22722274 __func__, inode);
22732275 }
22742276
2275− cifs_fscache_fill_coherency(&cifsi->vfs_inode, &cd);
2276− fscache_invalidate(cifs_inode_cookie(inode), &cd, i_size_read(inode), 0);
22772277 return rc;
22782278 }
22792279
fs/cifs/sess.c+5−1
@@ -713,7 +713,11 @@ static int size_of_ntlmssp_blob(struct cifs_ses *ses, int base_size) · 712 unmodified lines
713713 else
714714 sz += sizeof(__le16);
715715
716− sz += sizeof(__le16) * strnlen(ses->workstation_name, CIFS_MAX_WORKSTATION_LEN);
716+ if (ses->workstation_name)
717+ sz += sizeof(__le16) * strnlen(ses->workstation_name,
718+ CIFS_MAX_WORKSTATION_LEN);
719+ else
720+ sz += sizeof(__le16);
717721
718722 return sz;
719723 }
fs/erofs/data.c+4−4
@@ -252,12 +252,10 @@ static int erofs_iomap_begin(struct inode *inode, loff_t offset, loff_t length, · 251 unmodified lines
252252 return ret;
253253
254254 iomap->offset = map.m_la;
255− if (flags & IOMAP_DAX) {
255+ if (flags & IOMAP_DAX)
256256 iomap->dax_dev = mdev.m_daxdev;
257− iomap->offset += mdev.m_dax_part_off;
258− } else {
257+ else
259258 iomap->bdev = mdev.m_bdev;
260− }
261259 iomap->length = map.m_llen;
262260 iomap->flags = 0;
263261 iomap->private = NULL;
@@ -284,6 +282,8 @@ static int erofs_iomap_begin(struct inode *inode, loff_t offset, loff_t length, · 20 unmodified lines
284282 } else {
285283 iomap->type = IOMAP_MAPPED;
286284 iomap->addr = mdev.m_pa;
285+ if (flags & IOMAP_DAX)
286+ iomap->addr += mdev.m_dax_part_off;
287287 }
288288 return 0;
289289 }
fs/erofs/zdata.c+56−57
@@ -810,68 +810,11 @@ static bool z_erofs_get_sync_decompress_policy(struct erofs_sb_info *sbi, · 809 unmodified lines
810810 return false;
811811 }
812812
813−static void z_erofs_decompressqueue_work(struct work_struct *work);
814−static void z_erofs_decompress_kickoff(struct z_erofs_decompressqueue *io,
815− bool sync, int bios)
816−{
817− struct erofs_sb_info *const sbi = EROFS_SB(io->sb);
818−
819− /* wake up the caller thread for sync decompression */
820− if (sync) {
821− unsigned long flags;
822−
823− spin_lock_irqsave(&io->u.wait.lock, flags);
824− if (!atomic_add_return(bios, &io->pending_bios))
825− wake_up_locked(&io->u.wait);
826− spin_unlock_irqrestore(&io->u.wait.lock, flags);
827− return;
828− }
829−
830− if (atomic_add_return(bios, &io->pending_bios))
831− return;
832− /* Use workqueue and sync decompression for atomic contexts only */
833− if (in_atomic() || irqs_disabled()) {
834− queue_work(z_erofs_workqueue, &io->u.work);
835− /* enable sync decompression for readahead */
836− if (sbi->opt.sync_decompress == EROFS_SYNC_DECOMPRESS_AUTO)
837− sbi->opt.sync_decompress = EROFS_SYNC_DECOMPRESS_FORCE_ON;
838− return;
839− }
840− z_erofs_decompressqueue_work(&io->u.work);
841−}
842−
843813 static bool z_erofs_page_is_invalidated(struct page *page)
844814 {
845815 return !page->mapping && !z_erofs_is_shortlived_page(page);
846816 }
847817
848−static void z_erofs_decompressqueue_endio(struct bio *bio)
849−{
850− tagptr1_t t = tagptr_init(tagptr1_t, bio->bi_private);
851− struct z_erofs_decompressqueue *q = tagptr_unfold_ptr(t);
852− blk_status_t err = bio->bi_status;
853− struct bio_vec *bvec;
854− struct bvec_iter_all iter_all;
855−
856− bio_for_each_segment_all(bvec, bio, iter_all) {
857− struct page *page = bvec->bv_page;
858−
859− DBG_BUGON(PageUptodate(page));
860− DBG_BUGON(z_erofs_page_is_invalidated(page));
861−
862− if (err)
863− SetPageError(page);
864−
865− if (erofs_page_is_managed(EROFS_SB(q->sb), page)) {
866− if (!err)
867− SetPageUptodate(page);
868− unlock_page(page);
869− }
870− }
871− z_erofs_decompress_kickoff(q, tagptr_unfold_tags(t), -1);
872− bio_put(bio);
873−}
874−
875818 static int z_erofs_decompress_pcluster(struct super_block *sb,
876819 struct z_erofs_pcluster *pcl,
877820 struct page **pagepool)
@@ -1123,6 +1066,35 @@ static void z_erofs_decompressqueue_work(struct work_struct *work) · 245 unmodified lines
11231066 kvfree(bgq);
11241067 }
11251068
1069+static void z_erofs_decompress_kickoff(struct z_erofs_decompressqueue *io,
1070+ bool sync, int bios)
1071+{
1072+ struct erofs_sb_info *const sbi = EROFS_SB(io->sb);
1073+
1074+ /* wake up the caller thread for sync decompression */
1075+ if (sync) {
1076+ unsigned long flags;
1077+
1078+ spin_lock_irqsave(&io->u.wait.lock, flags);
1079+ if (!atomic_add_return(bios, &io->pending_bios))
1080+ wake_up_locked(&io->u.wait);
1081+ spin_unlock_irqrestore(&io->u.wait.lock, flags);
1082+ return;
1083+ }
1084+
1085+ if (atomic_add_return(bios, &io->pending_bios))
1086+ return;
1087+ /* Use workqueue and sync decompression for atomic contexts only */
1088+ if (in_atomic() || irqs_disabled()) {
1089+ queue_work(z_erofs_workqueue, &io->u.work);
1090+ /* enable sync decompression for readahead */
1091+ if (sbi->opt.sync_decompress == EROFS_SYNC_DECOMPRESS_AUTO)
1092+ sbi->opt.sync_decompress = EROFS_SYNC_DECOMPRESS_FORCE_ON;
1093+ return;
1094+ }
1095+ z_erofs_decompressqueue_work(&io->u.work);
1096+}
1097+
11261098 static struct page *pickup_page_for_submission(struct z_erofs_pcluster *pcl,
11271099 unsigned int nr,
11281100 struct page **pagepool,
@@ -1300,6 +1272,33 @@ static void move_to_bypass_jobqueue(struct z_erofs_pcluster *pcl, · 171 unmodified lines
13001272 qtail[JQ_BYPASS] = &pcl->next;
13011273 }
13021274
1275+static void z_erofs_decompressqueue_endio(struct bio *bio)
1276+{
1277+ tagptr1_t t = tagptr_init(tagptr1_t, bio->bi_private);
1278+ struct z_erofs_decompressqueue *q = tagptr_unfold_ptr(t);
1279+ blk_status_t err = bio->bi_status;
1280+ struct bio_vec *bvec;
1281+ struct bvec_iter_all iter_all;
1282+
1283+ bio_for_each_segment_all(bvec, bio, iter_all) {
1284+ struct page *page = bvec->bv_page;
1285+
1286+ DBG_BUGON(PageUptodate(page));
1287+ DBG_BUGON(z_erofs_page_is_invalidated(page));
1288+
1289+ if (err)
1290+ SetPageError(page);
1291+
1292+ if (erofs_page_is_managed(EROFS_SB(q->sb), page)) {
1293+ if (!err)
1294+ SetPageUptodate(page);
1295+ unlock_page(page);
1296+ }
1297+ }
1298+ z_erofs_decompress_kickoff(q, tagptr_unfold_tags(t), -1);
1299+ bio_put(bio);
1300+}
1301+
13031302 static void z_erofs_submit_queue(struct super_block *sb,
13041303 struct z_erofs_decompress_frontend *f,
13051304 struct page **pagepool,
fs/erofs/zmap.c+7−0
@@ -630,6 +630,13 @@ static int z_erofs_do_map_blocks(struct inode *inode, · 629 unmodified lines
630630 if (endoff >= m.clusterofs) {
631631 m.headtype = m.type;
632632 map->m_la = (m.lcn << lclusterbits) | m.clusterofs;
633+ /*
634+ * For ztailpacking files, in order to inline data more
635+ * effectively, special EOF lclusters are now supported
636+ * which can have three parts at most.
637+ */
638+ if (ztailpacking && end > inode->i_size)
639+ end = inode->i_size;
633640 break;
634641 }
635642 /* m.lcn should be >= 1 if endoff < m.clusterofs */
fs/ext4/ext4.h+7−7
@@ -2485,7 +2485,7 @@ struct ext4_filename { · 2484 unmodified lines
24852485 #ifdef CONFIG_FS_ENCRYPTION
24862486 struct fscrypt_str crypto_buf;
24872487 #endif
2488−#ifdef CONFIG_UNICODE
2488+#if IS_ENABLED(CONFIG_UNICODE)
24892489 struct fscrypt_str cf_name;
24902490 #endif
24912491 };
@@ -2721,7 +2721,7 @@ extern unsigned ext4_free_clusters_after_init(struct super_block *sb, · 229 unmodified lines
27212721 struct ext4_group_desc *gdp);
27222722 ext4_fsblk_t ext4_inode_to_goal_block(struct inode *);
27232723
2724−#ifdef CONFIG_UNICODE
2724+#if IS_ENABLED(CONFIG_UNICODE)
27252725 extern int ext4_fname_setup_ci_filename(struct inode *dir,
27262726 const struct qstr *iname,
27272727 struct ext4_filename *fname);
@@ -2754,7 +2754,7 @@ static inline int ext4_fname_setup_filename(struct inode *dir, · 26 unmodified lines
27542754
27552755 ext4_fname_from_fscrypt_name(fname, &name);
27562756
2757−#ifdef CONFIG_UNICODE
2757+#if IS_ENABLED(CONFIG_UNICODE)
27582758 err = ext4_fname_setup_ci_filename(dir, iname, fname);
27592759 #endif
27602760 return err;
@@ -2773,7 +2773,7 @@ static inline int ext4_fname_prepare_lookup(struct inode *dir, · 12 unmodified lines
27732773
27742774 ext4_fname_from_fscrypt_name(fname, &name);
27752775
2776−#ifdef CONFIG_UNICODE
2776+#if IS_ENABLED(CONFIG_UNICODE)
27772777 err = ext4_fname_setup_ci_filename(dir, &dentry->d_name, fname);
27782778 #endif
27792779 return err;
@@ -2790,7 +2790,7 @@ static inline void ext4_fname_free_filename(struct ext4_filename *fname) · 10 unmodified lines
27902790 fname->usr_fname = NULL;
27912791 fname->disk_name.name = NULL;
27922792
2793−#ifdef CONFIG_UNICODE
2793+#if IS_ENABLED(CONFIG_UNICODE)
27942794 kfree(fname->cf_name.name);
27952795 fname->cf_name.name = NULL;
27962796 #endif
@@ -2806,7 +2806,7 @@ static inline int ext4_fname_setup_filename(struct inode *dir, · 9 unmodified lines
28062806 fname->disk_name.name = (unsigned char *) iname->name;
28072807 fname->disk_name.len = iname->len;
28082808
2809−#ifdef CONFIG_UNICODE
2809+#if IS_ENABLED(CONFIG_UNICODE)
28102810 err = ext4_fname_setup_ci_filename(dir, iname, fname);
28112811 #endif
28122812
@@ -2822,7 +2822,7 @@ static inline int ext4_fname_prepare_lookup(struct inode *dir, · 9 unmodified lines
28222822
28232823 static inline void ext4_fname_free_filename(struct ext4_filename *fname)
28242824 {
2825−#ifdef CONFIG_UNICODE
2825+#if IS_ENABLED(CONFIG_UNICODE)
28262826 kfree(fname->cf_name.name);
28272827 fname->cf_name.name = NULL;
28282828 #endif
fs/ext4/hash.c+1−1
@@ -290,7 +290,7 @@ static int __ext4fs_dirhash(const struct inode *dir, const char *name, int len, · 289 unmodified lines
290290 int ext4fs_dirhash(const struct inode *dir, const char *name, int len,
291291 struct dx_hash_info *hinfo)
292292 {
293−#ifdef CONFIG_UNICODE
293+#if IS_ENABLED(CONFIG_UNICODE)
294294 const struct unicode_map *um = dir->i_sb->s_encoding;
295295 int r, dlen;
296296 unsigned char *buff;
fs/ext4/namei.c+6−6
@@ -1317,7 +1317,7 @@ static void dx_insert_block(struct dx_frame *frame, u32 hash, ext4_lblk_t block) · 1316 unmodified lines
13171317 dx_set_count(entries, count + 1);
13181318 }
13191319
1320−#ifdef CONFIG_UNICODE
1320+#if IS_ENABLED(CONFIG_UNICODE)
13211321 /*
13221322 * Test whether a case-insensitive directory entry matches the filename
13231323 * being searched for. If quick is set, assume the name being looked up
@@ -1428,7 +1428,7 @@ static bool ext4_match(struct inode *parent, · 104 unmodified lines
14281428 f.crypto_buf = fname->crypto_buf;
14291429 #endif
14301430
1431−#ifdef CONFIG_UNICODE
1431+#if IS_ENABLED(CONFIG_UNICODE)
14321432 if (parent->i_sb->s_encoding && IS_CASEFOLDED(parent) &&
14331433 (!IS_ENCRYPTED(parent) || fscrypt_has_encryption_key(parent))) {
14341434 if (fname->cf_name.name) {
@@ -1800,7 +1800,7 @@ static struct dentry *ext4_lookup(struct inode *dir, struct dentry *dentry, unsi · 365 unmodified lines
18001800 }
18011801 }
18021802
1803−#ifdef CONFIG_UNICODE
1803+#if IS_ENABLED(CONFIG_UNICODE)
18041804 if (!inode && IS_CASEFOLDED(dir)) {
18051805 /* Eventually we want to call d_add_ci(dentry, NULL)
18061806 * for negative dentries in the encoding case as
@@ -2308,7 +2308,7 @@ static int ext4_add_entry(handle_t *handle, struct dentry *dentry, · 501 unmodified lines
23082308 if (fscrypt_is_nokey_name(dentry))
23092309 return -ENOKEY;
23102310
2311−#ifdef CONFIG_UNICODE
2311+#if IS_ENABLED(CONFIG_UNICODE)
23122312 if (sb_has_strict_encoding(sb) && IS_CASEFOLDED(dir) &&
23132313 sb->s_encoding && utf8_validate(sb->s_encoding, &dentry->d_name))
23142314 return -EINVAL;
@@ -3126,7 +3126,7 @@ static int ext4_rmdir(struct inode *dir, struct dentry *dentry) · 811 unmodified lines
31263126 ext4_fc_track_unlink(handle, dentry);
31273127 retval = ext4_mark_inode_dirty(handle, dir);
31283128
3129−#ifdef CONFIG_UNICODE
3129+#if IS_ENABLED(CONFIG_UNICODE)
31303130 /* VFS negative dentries are incompatible with Encoding and
31313131 * Case-insensitiveness. Eventually we'll want avoid
31323132 * invalidating the dentries here, alongside with returning the
@@ -3231,7 +3231,7 @@ static int ext4_unlink(struct inode *dir, struct dentry *dentry) · 98 unmodified lines
32313231 retval = __ext4_unlink(handle, dir, &dentry->d_name, d_inode(dentry));
32323232 if (!retval)
32333233 ext4_fc_track_unlink(handle, dentry);
3234−#ifdef CONFIG_UNICODE
3234+#if IS_ENABLED(CONFIG_UNICODE)
32353235 /* VFS negative dentries are incompatible with Encoding and
32363236 * Case-insensitiveness. Eventually we'll want avoid
32373237 * invalidating the dentries here, alongside with returning the
fs/ext4/super.c+5−5
@@ -1301,7 +1301,7 @@ static void ext4_put_super(struct super_block *sb) · 1300 unmodified lines
13011301 kfree(sbi->s_blockgroup_lock);
13021302 fs_put_dax(sbi->s_daxdev);
13031303 fscrypt_free_dummy_policy(&sbi->s_dummy_enc_policy);
1304−#ifdef CONFIG_UNICODE
1304+#if IS_ENABLED(CONFIG_UNICODE)
13051305 utf8_unload(sb->s_encoding);
13061306 #endif
13071307 kfree(sbi);
@@ -1961,7 +1961,7 @@ static const struct mount_opts { · 653 unmodified lines
19611961 {Opt_err, 0, 0}
19621962 };
19631963
1964−#ifdef CONFIG_UNICODE
1964+#if IS_ENABLED(CONFIG_UNICODE)
19651965 static const struct ext4_sb_encodings {
19661966 __u16 magic;
19671967 char *name;
@@ -3606,7 +3606,7 @@ int ext4_feature_set_ok(struct super_block *sb, int readonly) · 1638 unmodified lines
36063606 return 0;
36073607 }
36083608
3609−#ifndef CONFIG_UNICODE
3609+#if !IS_ENABLED(CONFIG_UNICODE)
36103610 if (ext4_has_feature_casefold(sb)) {
36113611 ext4_msg(sb, KERN_ERR,
36123612 "Filesystem with casefold feature cannot be "
@@ -4610,7 +4610,7 @@ static int __ext4_fill_super(struct fs_context *fc, struct super_block *sb) · 997 unmodified lines
46104610 if (err < 0)
46114611 goto failed_mount;
46124612
4613−#ifdef CONFIG_UNICODE
4613+#if IS_ENABLED(CONFIG_UNICODE)
46144614 if (ext4_has_feature_casefold(sb) && !sb->s_encoding) {
46154615 const struct ext4_sb_encodings *encoding_info;
46164616 struct unicode_map *encoding;
@@ -5514,7 +5514,7 @@ failed_mount: · 897 unmodified lines
55145514 if (sbi->s_chksum_driver)
55155515 crypto_free_shash(sbi->s_chksum_driver);
55165516
5517−#ifdef CONFIG_UNICODE
5517+#if IS_ENABLED(CONFIG_UNICODE)
55185518 utf8_unload(sb->s_encoding);
55195519 #endif
55205520
fs/ext4/sysfs.c+4−4
@@ -309,7 +309,7 @@ EXT4_ATTR_FEATURE(meta_bg_resize); · 308 unmodified lines
309309 EXT4_ATTR_FEATURE(encryption);
310310 EXT4_ATTR_FEATURE(test_dummy_encryption_v2);
311311 #endif
312−#ifdef CONFIG_UNICODE
312+#if IS_ENABLED(CONFIG_UNICODE)
313313 EXT4_ATTR_FEATURE(casefold);
314314 #endif
315315 #ifdef CONFIG_FS_VERITY
@@ -317,7 +317,7 @@ EXT4_ATTR_FEATURE(verity); · 1 unmodified line
317317 #endif
318318 EXT4_ATTR_FEATURE(metadata_csum_seed);
319319 EXT4_ATTR_FEATURE(fast_commit);
320−#if defined(CONFIG_UNICODE) && defined(CONFIG_FS_ENCRYPTION)
320+#if IS_ENABLED(CONFIG_UNICODE) && defined(CONFIG_FS_ENCRYPTION)
321321 EXT4_ATTR_FEATURE(encrypted_casefold);
322322 #endif
323323
@@ -329,7 +329,7 @@ static struct attribute *ext4_feat_attrs[] = { · 5 unmodified lines
329329 ATTR_LIST(encryption),
330330 ATTR_LIST(test_dummy_encryption_v2),
331331 #endif
332−#ifdef CONFIG_UNICODE
332+#if IS_ENABLED(CONFIG_UNICODE)
333333 ATTR_LIST(casefold),
334334 #endif
335335 #ifdef CONFIG_FS_VERITY
@@ -337,7 +337,7 @@ static struct attribute *ext4_feat_attrs[] = { · 1 unmodified line
337337 #endif
338338 ATTR_LIST(metadata_csum_seed),
339339 ATTR_LIST(fast_commit),
340−#if defined(CONFIG_UNICODE) && defined(CONFIG_FS_ENCRYPTION)
340+#if IS_ENABLED(CONFIG_UNICODE) && defined(CONFIG_FS_ENCRYPTION)
341341 ATTR_LIST(encrypted_casefold),
342342 #endif
343343 NULL,
fs/f2fs/dir.c+5−5
@@ -16,7 +16,7 @@ · 15 unmodified lines
1616 #include "xattr.h"
1717 #include <trace/events/f2fs.h>
1818
19−#ifdef CONFIG_UNICODE
19+#if IS_ENABLED(CONFIG_UNICODE)
2020 extern struct kmem_cache *f2fs_cf_name_slab;
2121 #endif
2222
@@ -79,7 +79,7 @@ unsigned char f2fs_get_de_type(struct f2fs_dir_entry *de) · 56 unmodified lines
7979 int f2fs_init_casefolded_name(const struct inode *dir,
8080 struct f2fs_filename *fname)
8181 {
82−#ifdef CONFIG_UNICODE
82+#if IS_ENABLED(CONFIG_UNICODE)
8383 struct super_block *sb = dir->i_sb;
8484
8585 if (IS_CASEFOLDED(dir)) {
@@ -174,7 +174,7 @@ void f2fs_free_filename(struct f2fs_filename *fname) · 88 unmodified lines
174174 kfree(fname->crypto_buf.name);
175175 fname->crypto_buf.name = NULL;
176176 #endif
177−#ifdef CONFIG_UNICODE
177+#if IS_ENABLED(CONFIG_UNICODE)
178178 if (fname->cf_name.name) {
179179 kmem_cache_free(f2fs_cf_name_slab, fname->cf_name.name);
180180 fname->cf_name.name = NULL;
@@ -208,7 +208,7 @@ static struct f2fs_dir_entry *find_in_block(struct inode *dir, · 27 unmodified lines
208208 return f2fs_find_target_dentry(&d, fname, max_slots);
209209 }
210210
211−#ifdef CONFIG_UNICODE
211+#if IS_ENABLED(CONFIG_UNICODE)
212212 /*
213213 * Test whether a case-insensitive directory entry matches the filename
214214 * being searched for.
@@ -266,7 +266,7 @@ static inline int f2fs_match_name(const struct inode *dir, · 51 unmodified lines
266266 {
267267 struct fscrypt_name f;
268268
269−#ifdef CONFIG_UNICODE
269+#if IS_ENABLED(CONFIG_UNICODE)
270270 if (fname->cf_name.name) {
271271 struct qstr cf = FSTR_TO_QSTR(&fname->cf_name);
272272
fs/f2fs/f2fs.h+1−1
@@ -488,7 +488,7 @@ struct f2fs_filename { · 487 unmodified lines
488488 */
489489 struct fscrypt_str crypto_buf;
490490 #endif
491−#ifdef CONFIG_UNICODE
491+#if IS_ENABLED(CONFIG_UNICODE)
492492 /*
493493 * For casefolded directories: the casefolded name, but it's left NULL
494494 * if the original name is not valid Unicode, if the directory is both
fs/f2fs/hash.c+1−1
@@ -105,7 +105,7 @@ void f2fs_hash_filename(const struct inode *dir, struct f2fs_filename *fname) · 104 unmodified lines
105105 return;
106106 }
107107
108−#ifdef CONFIG_UNICODE
108+#if IS_ENABLED(CONFIG_UNICODE)
109109 if (IS_CASEFOLDED(dir)) {
110110 /*
111111 * If the casefolded name is provided, hash it instead of the
fs/f2fs/namei.c+2−2
@@ -561,7 +561,7 @@ static struct dentry *f2fs_lookup(struct inode *dir, struct dentry *dentry, · 560 unmodified lines
561561 goto out_iput;
562562 }
563563 out_splice:
564−#ifdef CONFIG_UNICODE
564+#if IS_ENABLED(CONFIG_UNICODE)
565565 if (!inode && IS_CASEFOLDED(dir)) {
566566 /* Eventually we want to call d_add_ci(dentry, NULL)
567567 * for negative dentries in the encoding case as
@@ -622,7 +622,7 @@ static int f2fs_unlink(struct inode *dir, struct dentry *dentry) · 54 unmodified lines
622622 goto fail;
623623 }
624624 f2fs_delete_entry(de, page, dir, inode);
625−#ifdef CONFIG_UNICODE
625+#if IS_ENABLED(CONFIG_UNICODE)
626626 /* VFS negative dentries are incompatible with Encoding and
627627 * Case-insensitiveness. Eventually we'll want avoid
628628 * invalidating the dentries here, alongside with returning the
fs/f2fs/recovery.c+2−2
@@ -46,7 +46,7 @@ · 45 unmodified lines
4646
4747 static struct kmem_cache *fsync_entry_slab;
4848
49−#ifdef CONFIG_UNICODE
49+#if IS_ENABLED(CONFIG_UNICODE)
5050 extern struct kmem_cache *f2fs_cf_name_slab;
5151 #endif
5252
@@ -149,7 +149,7 @@ static int init_recovered_filename(const struct inode *dir, · 96 unmodified lines
149149 if (err)
150150 return err;
151151 f2fs_hash_filename(dir, fname);
152−#ifdef CONFIG_UNICODE
152+#if IS_ENABLED(CONFIG_UNICODE)
153153 /* Case-sensitive match is fine for recovery */
154154 kmem_cache_free(f2fs_cf_name_slab, fname->cf_name.name);
155155 fname->cf_name.name = NULL;
fs/f2fs/super.c+5−5
@@ -257,7 +257,7 @@ void f2fs_printk(struct f2fs_sb_info *sbi, const char *fmt, ...) · 256 unmodified lines
257257 va_end(args);
258258 }
259259
260−#ifdef CONFIG_UNICODE
260+#if IS_ENABLED(CONFIG_UNICODE)
261261 static const struct f2fs_sb_encodings {
262262 __u16 magic;
263263 char *name;
@@ -1259,7 +1259,7 @@ default_check: · 995 unmodified lines
12591259 return -EINVAL;
12601260 }
12611261 #endif
1262−#ifndef CONFIG_UNICODE
1262+#if !IS_ENABLED(CONFIG_UNICODE)
12631263 if (f2fs_sb_has_casefold(sbi)) {
12641264 f2fs_err(sbi,
12651265 "Filesystem with casefold feature cannot be mounted without CONFIG_UNICODE");
@@ -1619,7 +1619,7 @@ static void f2fs_put_super(struct super_block *sb) · 353 unmodified lines
16191619 f2fs_destroy_iostat(sbi);
16201620 for (i = 0; i < NR_PAGE_TYPE; i++)
16211621 kvfree(sbi->write_io[i]);
1622−#ifdef CONFIG_UNICODE
1622+#if IS_ENABLED(CONFIG_UNICODE)
16231623 utf8_unload(sb->s_encoding);
16241624 #endif
16251625 kfree(sbi);
@@ -3903,7 +3903,7 @@ static int f2fs_scan_devices(struct f2fs_sb_info *sbi) · 2277 unmodified lines
39033903
39043904 static int f2fs_setup_casefold(struct f2fs_sb_info *sbi)
39053905 {
3906−#ifdef CONFIG_UNICODE
3906+#if IS_ENABLED(CONFIG_UNICODE)
39073907 if (f2fs_sb_has_casefold(sbi) && !sbi->sb->s_encoding) {
39083908 const struct f2fs_sb_encodings *encoding_info;
39093909 struct unicode_map *encoding;
@@ -4458,7 +4458,7 @@ free_bio_info: · 548 unmodified lines
44584458 for (i = 0; i < NR_PAGE_TYPE; i++)
44594459 kvfree(sbi->write_io[i]);
44604460
4461−#ifdef CONFIG_UNICODE
4461+#if IS_ENABLED(CONFIG_UNICODE)
44624462 utf8_unload(sb->s_encoding);
44634463 sb->s_encoding = NULL;
44644464 #endif
fs/f2fs/sysfs.c+5−5
@@ -201,7 +201,7 @@ static ssize_t unusable_show(struct f2fs_attr *a, · 200 unmodified lines
201201 static ssize_t encoding_show(struct f2fs_attr *a,
202202 struct f2fs_sb_info *sbi, char *buf)
203203 {
204−#ifdef CONFIG_UNICODE
204+#if IS_ENABLED(CONFIG_UNICODE)
205205 struct super_block *sb = sbi->sb;
206206
207207 if (f2fs_sb_has_casefold(sbi))
@@ -778,7 +778,7 @@ F2FS_GENERAL_RO_ATTR(avg_vblocks); · 570 unmodified lines
778778 #ifdef CONFIG_FS_ENCRYPTION
779779 F2FS_FEATURE_RO_ATTR(encryption);
780780 F2FS_FEATURE_RO_ATTR(test_dummy_encryption_v2);
781−#ifdef CONFIG_UNICODE
781+#if IS_ENABLED(CONFIG_UNICODE)
782782 F2FS_FEATURE_RO_ATTR(encrypted_casefold);
783783 #endif
784784 #endif /* CONFIG_FS_ENCRYPTION */
@@ -797,7 +797,7 @@ F2FS_FEATURE_RO_ATTR(lost_found); · 12 unmodified lines
797797 F2FS_FEATURE_RO_ATTR(verity);
798798 #endif
799799 F2FS_FEATURE_RO_ATTR(sb_checksum);
800−#ifdef CONFIG_UNICODE
800+#if IS_ENABLED(CONFIG_UNICODE)
801801 F2FS_FEATURE_RO_ATTR(casefold);
802802 #endif
803803 F2FS_FEATURE_RO_ATTR(readonly);
@@ -910,7 +910,7 @@ static struct attribute *f2fs_feat_attrs[] = { · 106 unmodified lines
910910 #ifdef CONFIG_FS_ENCRYPTION
911911 ATTR_LIST(encryption),
912912 ATTR_LIST(test_dummy_encryption_v2),
913−#ifdef CONFIG_UNICODE
913+#if IS_ENABLED(CONFIG_UNICODE)
914914 ATTR_LIST(encrypted_casefold),
915915 #endif
916916 #endif /* CONFIG_FS_ENCRYPTION */
@@ -929,7 +929,7 @@ static struct attribute *f2fs_feat_attrs[] = { · 12 unmodified lines
929929 ATTR_LIST(verity),
930930 #endif
931931 ATTR_LIST(sb_checksum),
932−#ifdef CONFIG_UNICODE
932+#if IS_ENABLED(CONFIG_UNICODE)
933933 ATTR_LIST(casefold),
934934 #endif
935935 ATTR_LIST(readonly),
fs/iomap/buffered-io.c+48−4
@@ -21,6 +21,8 @@ · 20 unmodified lines
2121
2222 #include "../internal.h"
2323
24+#define IOEND_BATCH_SIZE 4096
25+
2426 /*
2527 * Structure allocated for each folio when block size < folio size
2628 * to track sub-folio uptodate status and I/O completions.
@@ -1039,7 +1041,7 @@ static void iomap_finish_folio_write(struct inode *inode, struct folio *folio, · 1012 unmodified lines
10391041 * state, release holds on bios, and finally free up memory. Do not use the
10401042 * ioend after this.
10411043 */
1042−static void
1044+static u32
10431045 iomap_finish_ioend(struct iomap_ioend *ioend, int error)
10441046 {
10451047 struct inode *inode = ioend->io_inode;
@@ -1048,6 +1050,7 @@ iomap_finish_ioend(struct iomap_ioend *ioend, int error) · 2 unmodified lines
10481050 u64 start = bio->bi_iter.bi_sector;
10491051 loff_t offset = ioend->io_offset;
10501052 bool quiet = bio_flagged(bio, BIO_QUIET);
1053+ u32 folio_count = 0;
10511054
10521055 for (bio = &ioend->io_inline_bio; bio; bio = next) {
10531056 struct folio_iter fi;
@@ -1062,9 +1065,11 @@ iomap_finish_ioend(struct iomap_ioend *ioend, int error) · 8 unmodified lines
10621065 next = bio->bi_private;
10631066
10641067 /* walk all folios in bio, ending page IO on them */
1065− bio_for_each_folio_all(fi, bio)
1068+ bio_for_each_folio_all(fi, bio) {
10661069 iomap_finish_folio_write(inode, fi.folio, fi.length,
10671070 error);
1071+ folio_count++;
1072+ }
10681073 bio_put(bio);
10691074 }
10701075 /* The ioend has been freed by bio_put() */
@@ -1074,20 +1079,36 @@ iomap_finish_ioend(struct iomap_ioend *ioend, int error) · 3 unmodified lines
10741079 "%s: writeback error on inode %lu, offset %lld, sector %llu",
10751080 inode->i_sb->s_id, inode->i_ino, offset, start);
10761081 }
1082+ return folio_count;
10771083 }
10781084
1085+/*
1086+ * Ioend completion routine for merged bios. This can only be called from task
1087+ * contexts as merged ioends can be of unbound length. Hence we have to break up
1088+ * the writeback completions into manageable chunks to avoid long scheduler
1089+ * holdoffs. We aim to keep scheduler holdoffs down below 10ms so that we get
1090+ * good batch processing throughput without creating adverse scheduler latency
1091+ * conditions.
1092+ */
10791093 void
10801094 iomap_finish_ioends(struct iomap_ioend *ioend, int error)
10811095 {
10821096 struct list_head tmp;
1097+ u32 completions;
1098+
1099+ might_sleep();
10831100
10841101 list_replace_init(&ioend->io_list, &tmp);
1085− iomap_finish_ioend(ioend, error);
1102+ completions = iomap_finish_ioend(ioend, error);
10861103
10871104 while (!list_empty(&tmp)) {
1105+ if (completions > IOEND_BATCH_SIZE * 8) {
1106+ cond_resched();
1107+ completions = 0;
1108+ }
10881109 ioend = list_first_entry(&tmp, struct iomap_ioend, io_list);
10891110 list_del_init(&ioend->io_list);
1090− iomap_finish_ioend(ioend, error);
1111+ completions += iomap_finish_ioend(ioend, error);
10911112 }
10921113 }
10931114 EXPORT_SYMBOL_GPL(iomap_finish_ioends);
@@ -1108,6 +1129,18 @@ iomap_ioend_can_merge(struct iomap_ioend *ioend, struct iomap_ioend *next) · 14 unmodified lines
11081129 return false;
11091130 if (ioend->io_offset + ioend->io_size != next->io_offset)
11101131 return false;
1132+ /*
1133+ * Do not merge physically discontiguous ioends. The filesystem
1134+ * completion functions will have to iterate the physical
1135+ * discontiguities even if we merge the ioends at a logical level, so
1136+ * we don't gain anything by merging physical discontiguities here.
1137+ *
1138+ * We cannot use bio->bi_iter.bi_sector here as it is modified during
1139+ * submission so does not point to the start sector of the bio at
1140+ * completion.
1141+ */
1142+ if (ioend->io_sector + (ioend->io_size >> 9) != next->io_sector)
1143+ return false;
11111144 return true;
11121145 }
11131146
@@ -1209,8 +1242,10 @@ iomap_alloc_ioend(struct inode *inode, struct iomap_writepage_ctx *wpc, · 95 unmodified lines
12091242 ioend->io_flags = wpc->iomap.flags;
12101243 ioend->io_inode = inode;
12111244 ioend->io_size = 0;
1245+ ioend->io_folios = 0;
12121246 ioend->io_offset = offset;
12131247 ioend->io_bio = bio;
1248+ ioend->io_sector = sector;
12141249 return ioend;
12151250 }
12161251
@@ -1251,6 +1286,13 @@ iomap_can_add_to_ioend(struct iomap_writepage_ctx *wpc, loff_t offset, · 34 unmodified lines
12511286 return false;
12521287 if (sector != bio_end_sector(wpc->ioend->io_bio))
12531288 return false;
1289+ /*
1290+ * Limit ioend bio chain lengths to minimise IO completion latency. This
1291+ * also prevents long tight loops ending page writeback on all the
1292+ * folios in the ioend.
1293+ */
1294+ if (wpc->ioend->io_folios >= IOEND_BATCH_SIZE)
1295+ return false;
12541296 return true;
12551297 }
12561298
@@ -1335,6 +1377,8 @@ iomap_writepage_map(struct iomap_writepage_ctx *wpc, · 78 unmodified lines
13351377 &submit_list);
13361378 count++;
13371379 }
1380+ if (count)
1381+ wpc->ioend->io_folios++;
13381382
13391383 WARN_ON_ONCE(!wpc->ioend && !list_empty(&submit_list));
13401384 WARN_ON_ONCE(!folio_test_locked(folio));
fs/libfs.c+5−5
@@ -1379,7 +1379,7 @@ bool is_empty_dir_inode(struct inode *inode) · 1378 unmodified lines
13791379 (inode->i_op == &empty_dir_inode_operations);
13801380 }
13811381
1382−#ifdef CONFIG_UNICODE
1382+#if IS_ENABLED(CONFIG_UNICODE)
13831383 /*
13841384 * Determine if the name of a dentry should be casefolded.
13851385 *
@@ -1473,7 +1473,7 @@ static const struct dentry_operations generic_encrypted_dentry_ops = { · 87 unmodified lines
14731473 };
14741474 #endif
14751475
1476−#if defined(CONFIG_FS_ENCRYPTION) && defined(CONFIG_UNICODE)
1476+#if defined(CONFIG_FS_ENCRYPTION) && IS_ENABLED(CONFIG_UNICODE)
14771477 static const struct dentry_operations generic_encrypted_ci_dentry_ops = {
14781478 .d_hash = generic_ci_d_hash,
14791479 .d_compare = generic_ci_d_compare,
@@ -1508,10 +1508,10 @@ void generic_set_encrypted_ci_d_ops(struct dentry *dentry) · 28 unmodified lines
15081508 #ifdef CONFIG_FS_ENCRYPTION
15091509 bool needs_encrypt_ops = dentry->d_flags & DCACHE_NOKEY_NAME;
15101510 #endif
1511−#ifdef CONFIG_UNICODE
1511+#if IS_ENABLED(CONFIG_UNICODE)
15121512 bool needs_ci_ops = dentry->d_sb->s_encoding;
15131513 #endif
1514−#if defined(CONFIG_FS_ENCRYPTION) && defined(CONFIG_UNICODE)
1514+#if defined(CONFIG_FS_ENCRYPTION) && IS_ENABLED(CONFIG_UNICODE)
15151515 if (needs_encrypt_ops && needs_ci_ops) {
15161516 d_set_d_op(dentry, &generic_encrypted_ci_dentry_ops);
15171517 return;
@@ -1523,7 +1523,7 @@ void generic_set_encrypted_ci_d_ops(struct dentry *dentry) · 5 unmodified lines
15231523 return;
15241524 }
15251525 #endif
1526−#ifdef CONFIG_UNICODE
1526+#if IS_ENABLED(CONFIG_UNICODE)
15271527 if (needs_ci_ops) {
15281528 d_set_d_op(dentry, &generic_ci_dentry_ops);
15291529 return;
fs/lockd/svcsubs.c+10−8
@@ -179,19 +179,21 @@ nlm_delete_file(struct nlm_file *file) · 178 unmodified lines
179179 static int nlm_unlock_files(struct nlm_file *file)
180180 {
181181 struct file_lock lock;
182− struct file *f;
183182
183+ locks_init_lock(&lock);
184184 lock.fl_type = F_UNLCK;
185185 lock.fl_start = 0;
186186 lock.fl_end = OFFSET_MAX;
187− for (f = file->f_file[0]; f <= file->f_file[1]; f++) {
188− if (f && vfs_lock_file(f, F_SETLK, &lock, NULL) < 0) {
189− pr_warn("lockd: unlock failure in %s:%d\n",
190− __FILE__, __LINE__);
191− return 1;
192− }
193− }
187+ if (file->f_file[O_RDONLY] &&
188+ vfs_lock_file(file->f_file[O_RDONLY], F_SETLK, &lock, NULL))
189+ goto out_err;
190+ if (file->f_file[O_WRONLY] &&
191+ vfs_lock_file(file->f_file[O_WRONLY], F_SETLK, &lock, NULL))
192+ goto out_err;
194193 return 0;
194+out_err:
195+ pr_warn("lockd: unlock failure in %s:%d\n", __FILE__, __LINE__);
196+ return 1;
195197 }
196198
197199 /*
fs/nfsd/nfs4state.c+3−1
@@ -4130,8 +4130,10 @@ nfsd4_setclientid_confirm(struct svc_rqst *rqstp, · 4129 unmodified lines
41304130 status = nfserr_clid_inuse;
41314131 if (client_has_state(old)
41324132 && !same_creds(&unconf->cl_cred,
4133− &old->cl_cred))
4133+ &old->cl_cred)) {
4134+ old = NULL;
41344135 goto out;
4136+ }
41354137 status = mark_client_expired_locked(old);
41364138 if (status) {
41374139 old = NULL;
fs/notify/fanotify/fanotify_user.c+3−3
@@ -701,9 +701,6 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group, · 700 unmodified lines
701701 if (fanotify_is_perm_event(event->mask))
702702 FANOTIFY_PERM(event)->fd = fd;
703703
704− if (f)
705− fd_install(fd, f);
706−
707704 if (info_mode) {
708705 ret = copy_info_records_to_user(event, info, info_mode, pidfd,
709706 buf, count);
@@ -711,6 +708,9 @@ static ssize_t copy_event_to_user(struct fsnotify_group *group, · 1 unmodified line
711708 goto out_close_fd;
712709 }
713710
711+ if (f)
712+ fd_install(fd, f);
713+
714714 return metadata.event_len;
715715
716716 out_close_fd:
fs/overlayfs/copy_up.c+13−3
@@ -145,7 +145,7 @@ static int ovl_copy_fileattr(struct inode *inode, struct path *old, · 144 unmodified lines
145145 if (err == -ENOTTY || err == -EINVAL)
146146 return 0;
147147 pr_warn("failed to retrieve lower fileattr (%pd2, err=%i)\n",
148− old, err);
148+ old->dentry, err);
149149 return err;
150150 }
151151
@@ -157,7 +157,9 @@ static int ovl_copy_fileattr(struct inode *inode, struct path *old, · 5 unmodified lines
157157 */
158158 if (oldfa.flags & OVL_PROT_FS_FLAGS_MASK) {
159159 err = ovl_set_protattr(inode, new->dentry, &oldfa);
160− if (err)
160+ if (err == -EPERM)
161+ pr_warn_once("copying fileattr: no xattr on upper\n");
162+ else if (err)
161163 return err;
162164 }
163165
@@ -167,8 +169,16 @@ static int ovl_copy_fileattr(struct inode *inode, struct path *old, · 3 unmodified lines
167169
168170 err = ovl_real_fileattr_get(new, &newfa);
169171 if (err) {
172+ /*
173+ * Returning an error if upper doesn't support fileattr will
174+ * result in a regression, so revert to the old behavior.
175+ */
176+ if (err == -ENOTTY || err == -EINVAL) {
177+ pr_warn_once("copying fileattr: no support on upper\n");
178+ return 0;
179+ }
170180 pr_warn("failed to retrieve upper fileattr (%pd2, err=%i)\n",
171− new, err);
181+ new->dentry, err);
172182 return err;
173183 }
174184
fs/quota/dquot.c+8−3
@@ -690,9 +690,14 @@ int dquot_quota_sync(struct super_block *sb, int type) · 689 unmodified lines
690690 /* This is not very clever (and fast) but currently I don't know about
691691 * any other simple way of getting quota data to disk and we must get
692692 * them there for userspace to be visible... */
693− if (sb->s_op->sync_fs)
694− sb->s_op->sync_fs(sb, 1);
695− sync_blockdev(sb->s_bdev);
693+ if (sb->s_op->sync_fs) {
694+ ret = sb->s_op->sync_fs(sb, 1);
695+ if (ret)
696+ return ret;
697+ }
698+ ret = sync_blockdev(sb->s_bdev);
699+ if (ret)
700+ return ret;
696701
697702 /*
698703 * Now when everything is written we can discard the pagecache so
fs/super.c+12−7
@@ -1616,11 +1616,9 @@ static void lockdep_sb_freeze_acquire(struct super_block *sb) · 1615 unmodified lines
16161616 percpu_rwsem_acquire(sb->s_writers.rw_sem + level, 0, _THIS_IP_);
16171617 }
16181618
1619−static void sb_freeze_unlock(struct super_block *sb)
1619+static void sb_freeze_unlock(struct super_block *sb, int level)
16201620 {
1621− int level;
1622−
1623− for (level = SB_FREEZE_LEVELS - 1; level >= 0; level--)
1621+ for (level--; level >= 0; level--)
16241622 percpu_up_write(sb->s_writers.rw_sem + level);
16251623 }
16261624
@@ -1691,7 +1689,14 @@ int freeze_super(struct super_block *sb) · 64 unmodified lines
16911689 sb_wait_write(sb, SB_FREEZE_PAGEFAULT);
16921690
16931691 /* All writers are done so after syncing there won't be dirty data */
1694− sync_filesystem(sb);
1692+ ret = sync_filesystem(sb);
1693+ if (ret) {
1694+ sb->s_writers.frozen = SB_UNFROZEN;
1695+ sb_freeze_unlock(sb, SB_FREEZE_PAGEFAULT);
1696+ wake_up(&sb->s_writers.wait_unfrozen);
1697+ deactivate_locked_super(sb);
1698+ return ret;
1699+ }
16951700
16961701 /* Now wait for internal filesystem counter */
16971702 sb->s_writers.frozen = SB_FREEZE_FS;
@@ -1703,7 +1708,7 @@ int freeze_super(struct super_block *sb) · 5 unmodified lines
17031708 printk(KERN_ERR
17041709 "VFS:Filesystem freeze failed\n");
17051710 sb->s_writers.frozen = SB_UNFROZEN;
1706− sb_freeze_unlock(sb);
1711+ sb_freeze_unlock(sb, SB_FREEZE_FS);
17071712 wake_up(&sb->s_writers.wait_unfrozen);
17081713 deactivate_locked_super(sb);
17091714 return ret;
@@ -1748,7 +1753,7 @@ static int thaw_super_locked(struct super_block *sb) · 38 unmodified lines
17481753 }
17491754
17501755 sb->s_writers.frozen = SB_UNFROZEN;
1751− sb_freeze_unlock(sb);
1756+ sb_freeze_unlock(sb, SB_FREEZE_FS);
17521757 out:
17531758 wake_up(&sb->s_writers.wait_unfrozen);
17541759 deactivate_locked_super(sb);
fs/sync.c+12−6
@@ -29,7 +29,7 @@ · 28 unmodified lines
2929 */
3030 int sync_filesystem(struct super_block *sb)
3131 {
32− int ret;
32+ int ret = 0;
3333
3434 /*
3535 * We need to be protected against the filesystem going from
@@ -52,15 +52,21 @@ int sync_filesystem(struct super_block *sb) · 16 unmodified lines
5252 * at a time.
5353 */
5454 writeback_inodes_sb(sb, WB_REASON_SYNC);
55− if (sb->s_op->sync_fs)
56− sb->s_op->sync_fs(sb, 0);
55+ if (sb->s_op->sync_fs) {
56+ ret = sb->s_op->sync_fs(sb, 0);
57+ if (ret)
58+ return ret;
59+ }
5760 ret = sync_blockdev_nowait(sb->s_bdev);
58− if (ret < 0)
61+ if (ret)
5962 return ret;
6063
6164 sync_inodes_sb(sb);
62− if (sb->s_op->sync_fs)
63− sb->s_op->sync_fs(sb, 1);
65+ if (sb->s_op->sync_fs) {
66+ ret = sb->s_op->sync_fs(sb, 1);
67+ if (ret)
68+ return ret;
69+ }
6470 return sync_blockdev(sb->s_bdev);
6571 }
6672 EXPORT_SYMBOL(sync_filesystem);
fs/unicode/Kconfig+5−13
@@ -3,21 +3,13 @@ · 2 unmodified lines
33 # UTF-8 normalization
44 #
55 config UNICODE
6− bool "UTF-8 normalization and casefolding support"
6+ tristate "UTF-8 normalization and casefolding support"
77 help
88 Say Y here to enable UTF-8 NFD normalization and NFD+CF casefolding
9− support.
10−
11−config UNICODE_UTF8_DATA
12− tristate "UTF-8 normalization and casefolding tables"
13− depends on UNICODE
14− default UNICODE
15− help
16− This contains a large table of case foldings, which can be loaded as
17− a separate module if you say M here. To be on the safe side stick
18− to the default of Y. Saying N here makes no sense, if you do not want
19− utf8 casefolding support, disable CONFIG_UNICODE instead.
9+ support. If you say M here the large table of case foldings will
10+ be a separate loadable module that gets requested only when a file
11+ system actually use it.
2012
2113 config UNICODE_NORMALIZATION_SELFTEST
2214 tristate "Test UTF-8 normalization support"
23− depends on UNICODE_UTF8_DATA
15+ depends on UNICODE
fs/unicode/Makefile+4−2
@@ -1,8 +1,10 @@
11 # SPDX-License-Identifier: GPL-2.0
22
3−obj-$(CONFIG_UNICODE) += unicode.o
3+ifneq ($(CONFIG_UNICODE),)
4+obj-y += unicode.o
5+endif
6+obj-$(CONFIG_UNICODE) += utf8data.o
47 obj-$(CONFIG_UNICODE_NORMALIZATION_SELFTEST) += utf8-selftest.o
5−obj-$(CONFIG_UNICODE_UTF8_DATA) += utf8data.o
68
79 unicode-y := utf8-norm.o utf8-core.o
810
fs/xfs/xfs_aops.c+15−1
@@ -136,7 +136,20 @@ done: · 135 unmodified lines
136136 memalloc_nofs_restore(nofs_flag);
137137 }
138138
139−/* Finish all pending io completions. */
139+/*
140+ * Finish all pending IO completions that require transactional modifications.
141+ *
142+ * We try to merge physical and logically contiguous ioends before completion to
143+ * minimise the number of transactions we need to perform during IO completion.
144+ * Both unwritten extent conversion and COW remapping need to iterate and modify
145+ * one physical extent at a time, so we gain nothing by merging physically
146+ * discontiguous extents here.
147+ *
148+ * The ioend chain length that we can be processing here is largely unbound in
149+ * length and we may have to perform significant amounts of work on each ioend
150+ * to complete it. Hence we have to be careful about holding the CPU for too
151+ * long in this loop.
152+ */
140153 void
141154 xfs_end_io(
142155 struct work_struct *work)
@@ -157,6 +170,7 @@ xfs_end_io( · 14 unmodified lines
157170 list_del_init(&ioend->io_list);
158171 iomap_ioend_try_merge(ioend, &tmp);
159172 xfs_end_ioend(ioend);
173+ cond_resched();
160174 }
161175 }
162176
fs/xfs/xfs_bmap_util.c+3−6
@@ -850,9 +850,6 @@ xfs_alloc_file_space( · 849 unmodified lines
850850 rblocks = 0;
851851 }
852852
853− /*
854− * Allocate and setup the transaction.
855− */
856853 error = xfs_trans_alloc_inode(ip, &M_RES(mp)->tr_write,
857854 dblocks, rblocks, false, &tp);
858855 if (error)
@@ -869,9 +866,9 @@ xfs_alloc_file_space( · 10 unmodified lines
869866 if (error)
870867 goto error;
871868
872− /*
873− * Complete the transaction
874− */
869+ ip->i_diflags |= XFS_DIFLAG_PREALLOC;
870+ xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
871+
875872 error = xfs_trans_commit(tp);
876873 xfs_iunlock(ip, XFS_ILOCK_EXCL);
877874 if (error)
fs/xfs/xfs_file.c+26−60
@@ -66,40 +66,6 @@ xfs_is_falloc_aligned( · 65 unmodified lines
6666 return !((pos | len) & mask);
6767 }
6868
69−int
70−xfs_update_prealloc_flags(
71− struct xfs_inode *ip,
72− enum xfs_prealloc_flags flags)
73−{
74− struct xfs_trans *tp;
75− int error;
76−
77− error = xfs_trans_alloc(ip->i_mount, &M_RES(ip->i_mount)->tr_writeid,
78− 0, 0, 0, &tp);
79− if (error)
80− return error;
81−
82− xfs_ilock(ip, XFS_ILOCK_EXCL);
83− xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
84−
85− if (!(flags & XFS_PREALLOC_INVISIBLE)) {
86− VFS_I(ip)->i_mode &= ~S_ISUID;
87− if (VFS_I(ip)->i_mode & S_IXGRP)
88− VFS_I(ip)->i_mode &= ~S_ISGID;
89− xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG);
90− }
91−
92− if (flags & XFS_PREALLOC_SET)
93− ip->i_diflags |= XFS_DIFLAG_PREALLOC;
94− if (flags & XFS_PREALLOC_CLEAR)
95− ip->i_diflags &= ~XFS_DIFLAG_PREALLOC;
96−
97− xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
98− if (flags & XFS_PREALLOC_SYNC)
99− xfs_trans_set_sync(tp);
100− return xfs_trans_commit(tp);
101−}
102−
10369 /*
10470 * Fsync operations on directories are much simpler than on regular files,
10571 * as there is no file data to flush, and thus also no need for explicit
@@ -895,6 +861,21 @@ xfs_break_layouts( · 789 unmodified lines
895861 return error;
896862 }
897863
864+/* Does this file, inode, or mount want synchronous writes? */
865+static inline bool xfs_file_sync_writes(struct file *filp)
866+{
867+ struct xfs_inode *ip = XFS_I(file_inode(filp));
868+
869+ if (xfs_has_wsync(ip->i_mount))
870+ return true;
871+ if (filp->f_flags & (__O_SYNC | O_DSYNC))
872+ return true;
873+ if (IS_SYNC(file_inode(filp)))
874+ return true;
875+
876+ return false;
877+}
878+
898879 #define XFS_FALLOC_FL_SUPPORTED \
899880 (FALLOC_FL_KEEP_SIZE | FALLOC_FL_PUNCH_HOLE | \
900881 FALLOC_FL_COLLAPSE_RANGE | FALLOC_FL_ZERO_RANGE | \
@@ -910,7 +891,6 @@ xfs_file_fallocate( · 9 unmodified lines
910891 struct inode *inode = file_inode(file);
911892 struct xfs_inode *ip = XFS_I(inode);
912893 long error;
913− enum xfs_prealloc_flags flags = 0;
914894 uint iolock = XFS_IOLOCK_EXCL | XFS_MMAPLOCK_EXCL;
915895 loff_t new_size = 0;
916896 bool do_file_insert = false;
@@ -955,6 +935,10 @@ xfs_file_fallocate( · 38 unmodified lines
955935 goto out_unlock;
956936 }
957937
938+ error = file_modified(file);
939+ if (error)
940+ goto out_unlock;
941+
958942 if (mode & FALLOC_FL_PUNCH_HOLE) {
959943 error = xfs_free_file_space(ip, offset, len);
960944 if (error)
@@ -1004,8 +988,6 @@ xfs_file_fallocate( · 43 unmodified lines
1004988 }
1005989 do_file_insert = true;
1006990 } else {
1007− flags |= XFS_PREALLOC_SET;
1008−
1009991 if (!(mode & FALLOC_FL_KEEP_SIZE) &&
1010992 offset + len > i_size_read(inode)) {
1011993 new_size = offset + len;
@@ -1057,13 +1039,6 @@ xfs_file_fallocate( · 45 unmodified lines
10571039 }
10581040 }
10591041
1060− if (file->f_flags & O_DSYNC)
1061− flags |= XFS_PREALLOC_SYNC;
1062−
1063− error = xfs_update_prealloc_flags(ip, flags);
1064− if (error)
1065− goto out_unlock;
1066−
10671042 /* Change file size if needed */
10681043 if (new_size) {
10691044 struct iattr iattr;
@@ -1082,8 +1057,14 @@ xfs_file_fallocate( · 12 unmodified lines
10821057 * leave shifted extents past EOF and hence losing access to
10831058 * the data that is contained within them.
10841059 */
1085− if (do_file_insert)
1060+ if (do_file_insert) {
10861061 error = xfs_insert_file_space(ip, offset, len);
1062+ if (error)
1063+ goto out_unlock;
1064+ }
1065+
1066+ if (xfs_file_sync_writes(file))
1067+ error = xfs_log_force_inode(ip);
10871068
10881069 out_unlock:
10891070 xfs_iunlock(ip, iolock);
@@ -1115,21 +1096,6 @@ xfs_file_fadvise( · 25 unmodified lines
11151096 return ret;
11161097 }
11171098
1118−/* Does this file, inode, or mount want synchronous writes? */
1119−static inline bool xfs_file_sync_writes(struct file *filp)
1120−{
1121− struct xfs_inode *ip = XFS_I(file_inode(filp));
1122−
1123− if (xfs_has_wsync(ip->i_mount))
1124− return true;
1125− if (filp->f_flags & (__O_SYNC | O_DSYNC))
1126− return true;
1127− if (IS_SYNC(file_inode(filp)))
1128− return true;
1129−
1130− return false;
1131−}
1132−
11331099 STATIC loff_t
11341100 xfs_file_remap_range(
11351101 struct file *file_in,
fs/xfs/xfs_inode.h+0−9
@@ -462,15 +462,6 @@ xfs_itruncate_extents( · 461 unmodified lines
462462 }
463463
464464 /* from xfs_file.c */
465−enum xfs_prealloc_flags {
466− XFS_PREALLOC_SET = (1 << 1),
467− XFS_PREALLOC_CLEAR = (1 << 2),
468− XFS_PREALLOC_SYNC = (1 << 3),
469− XFS_PREALLOC_INVISIBLE = (1 << 4),
470−};
471−
472−int xfs_update_prealloc_flags(struct xfs_inode *ip,
473− enum xfs_prealloc_flags flags);
474465 int xfs_break_layouts(struct inode *inode, uint *iolock,
475466 enum layout_break_reason reason);
476467
fs/xfs/xfs_ioctl.c+1−1
@@ -1464,7 +1464,7 @@ xfs_ioc_getbmap( · 1463 unmodified lines
14641464
14651465 if (bmx.bmv_count < 2)
14661466 return -EINVAL;
1467− if (bmx.bmv_count > ULONG_MAX / recsize)
1467+ if (bmx.bmv_count >= INT_MAX / recsize)
14681468 return -ENOMEM;
14691469
14701470 buf = kvcalloc(bmx.bmv_count, sizeof(*buf), GFP_KERNEL);
fs/xfs/xfs_pnfs.c+39−3
@@ -70,6 +70,40 @@ xfs_fs_get_uuid( · 69 unmodified lines
7070 return 0;
7171 }
7272
73+/*
74+ * We cannot use file based VFS helpers such as file_modified() to update
75+ * inode state as we modify the data/metadata in the inode here. Hence we have
76+ * to open code the timestamp updates and SUID/SGID stripping. We also need
77+ * to set the inode prealloc flag to ensure that the extents we allocate are not
78+ * removed if the inode is reclaimed from memory before xfs_fs_block_commit()
79+ * is from the client to indicate that data has been written and the file size
80+ * can be extended.
81+ */
82+static int
83+xfs_fs_map_update_inode(
84+ struct xfs_inode *ip)
85+{
86+ struct xfs_trans *tp;
87+ int error;
88+
89+ error = xfs_trans_alloc(ip->i_mount, &M_RES(ip->i_mount)->tr_writeid,
90+ 0, 0, 0, &tp);
91+ if (error)
92+ return error;
93+
94+ xfs_ilock(ip, XFS_ILOCK_EXCL);
95+ xfs_trans_ijoin(tp, ip, XFS_ILOCK_EXCL);
96+
97+ VFS_I(ip)->i_mode &= ~S_ISUID;
98+ if (VFS_I(ip)->i_mode & S_IXGRP)
99+ VFS_I(ip)->i_mode &= ~S_ISGID;
100+ xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_MOD | XFS_ICHGTIME_CHG);
101+ ip->i_diflags |= XFS_DIFLAG_PREALLOC;
102+
103+ xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE);
104+ return xfs_trans_commit(tp);
105+}
106+
73107 /*
74108 * Get a layout for the pNFS client.
75109 */
@@ -164,10 +198,12 @@ xfs_fs_map_blocks( · 88 unmodified lines
164198 * that the blocks allocated and handed out to the client are
165199 * guaranteed to be present even after a server crash.
166200 */
167− error = xfs_update_prealloc_flags(ip,
168− XFS_PREALLOC_SET | XFS_PREALLOC_SYNC);
201+ error = xfs_fs_map_update_inode(ip);
202+ if (!error)
203+ error = xfs_log_force_inode(ip);
169204 if (error)
170205 goto out_unlock;
206+
171207 } else {
172208 xfs_iunlock(ip, lock_flags);
173209 }
@@ -255,7 +291,7 @@ xfs_fs_commit_blocks( · 81 unmodified lines
255291 length = end - start;
256292 if (!length)
257293 continue;
258−
294+
259295 /*
260296 * Make sure reads through the pagecache see the new data.
261297 */
fs/xfs/xfs_super.c+5−1
@@ -735,6 +735,7 @@ xfs_fs_sync_fs( · 734 unmodified lines
735735 int wait)
736736 {
737737 struct xfs_mount *mp = XFS_M(sb);
738+ int error;
738739
739740 trace_xfs_fs_sync_fs(mp, __return_address);
740741
@@ -744,7 +745,10 @@ xfs_fs_sync_fs( · 3 unmodified lines
744745 if (!wait)
745746 return 0;
746747
747− xfs_log_force(mp, XFS_LOG_SYNC);
748+ error = xfs_log_force(mp, XFS_LOG_SYNC);
749+ if (error)
750+ return error;
751+
748752 if (laptop_mode) {
749753 /*
750754 * The disk must be active because we're syncing.
include/crypto/internal/blake2s.h+25−15
@@ -24,14 +24,11 @@ static inline void blake2s_set_lastblock(struct blake2s_state *state) · 23 unmodified lines
2424 state->f[0] = -1;
2525 }
2626
27−typedef void (*blake2s_compress_t)(struct blake2s_state *state,
28− const u8 *block, size_t nblocks, u32 inc);
29−
3027 /* Helper functions for BLAKE2s shared by the library and shash APIs */
3128
32−static inline void __blake2s_update(struct blake2s_state *state,
33− const u8 *in, size_t inlen,
34− blake2s_compress_t compress)
29+static __always_inline void
30+__blake2s_update(struct blake2s_state *state, const u8 *in, size_t inlen,
31+ bool force_generic)
3532 {
3633 const size_t fill = BLAKE2S_BLOCK_SIZE - state->buflen;
3734
@@ -39,7 +36,12 @@ static inline void __blake2s_update(struct blake2s_state *state, · 1 unmodified line
3936 return;
4037 if (inlen > fill) {
4138 memcpy(state->buf + state->buflen, in, fill);
42− (*compress)(state, state->buf, 1, BLAKE2S_BLOCK_SIZE);
39+ if (force_generic)
40+ blake2s_compress_generic(state, state->buf, 1,
41+ BLAKE2S_BLOCK_SIZE);
42+ else
43+ blake2s_compress(state, state->buf, 1,
44+ BLAKE2S_BLOCK_SIZE);
4345 state->buflen = 0;
4446 in += fill;
4547 inlen -= fill;
@@ -47,7 +49,12 @@ static inline void __blake2s_update(struct blake2s_state *state, · 1 unmodified line
4749 if (inlen > BLAKE2S_BLOCK_SIZE) {
4850 const size_t nblocks = DIV_ROUND_UP(inlen, BLAKE2S_BLOCK_SIZE);
4951 /* Hash one less (full) block than strictly possible */
50− (*compress)(state, in, nblocks - 1, BLAKE2S_BLOCK_SIZE);
52+ if (force_generic)
53+ blake2s_compress_generic(state, in, nblocks - 1,
54+ BLAKE2S_BLOCK_SIZE);
55+ else
56+ blake2s_compress(state, in, nblocks - 1,
57+ BLAKE2S_BLOCK_SIZE);
5158 in += BLAKE2S_BLOCK_SIZE * (nblocks - 1);
5259 inlen -= BLAKE2S_BLOCK_SIZE * (nblocks - 1);
5360 }
@@ -55,13 +62,16 @@ static inline void __blake2s_update(struct blake2s_state *state, · 1 unmodified line
5562 state->buflen += inlen;
5663 }
5764
58−static inline void __blake2s_final(struct blake2s_state *state, u8 *out,
59− blake2s_compress_t compress)
65+static __always_inline void
66+__blake2s_final(struct blake2s_state *state, u8 *out, bool force_generic)
6067 {
6168 blake2s_set_lastblock(state);
6269 memset(state->buf + state->buflen, 0,
6370 BLAKE2S_BLOCK_SIZE - state->buflen); /* Padding */
64− (*compress)(state, state->buf, 1, state->buflen);
71+ if (force_generic)
72+ blake2s_compress_generic(state, state->buf, 1, state->buflen);
73+ else
74+ blake2s_compress(state, state->buf, 1, state->buflen);
6575 cpu_to_le32_array(state->h, ARRAY_SIZE(state->h));
6676 memcpy(out, state->h, state->outlen);
6777 }
@@ -99,20 +109,20 @@ static inline int crypto_blake2s_init(struct shash_desc *desc) · 31 unmodified lines
99109
100110 static inline int crypto_blake2s_update(struct shash_desc *desc,
101111 const u8 *in, unsigned int inlen,
102− blake2s_compress_t compress)
112+ bool force_generic)
103113 {
104114 struct blake2s_state *state = shash_desc_ctx(desc);
105115
106− __blake2s_update(state, in, inlen, compress);
116+ __blake2s_update(state, in, inlen, force_generic);
107117 return 0;
108118 }
109119
110120 static inline int crypto_blake2s_final(struct shash_desc *desc, u8 *out,
111− blake2s_compress_t compress)
121+ bool force_generic)
112122 {
113123 struct blake2s_state *state = shash_desc_ctx(desc);
114124
115− __blake2s_final(state, out, compress);
125+ __blake2s_final(state, out, force_generic);
116126 return 0;
117127 }
118128
include/linux/ceph/libceph.h+1−0
@@ -35,6 +35,7 @@ · 34 unmodified lines
3535 #define CEPH_OPT_TCP_NODELAY (1<<4) /* TCP_NODELAY on TCP sockets */
3636 #define CEPH_OPT_NOMSGSIGN (1<<5) /* don't sign msgs (msgr1) */
3737 #define CEPH_OPT_ABORT_ON_FULL (1<<6) /* abort w/ ENOSPC when full */
38+#define CEPH_OPT_RXBOUNCE (1<<7) /* double-buffer read data */
3839
3940 #define CEPH_OPT_DEFAULT (CEPH_OPT_TCP_NODELAY)
4041
include/linux/ceph/messenger.h+5−0
@@ -383,6 +383,10 @@ struct ceph_connection_v2_info { · 382 unmodified lines
383383 struct ceph_gcm_nonce in_gcm_nonce;
384384 struct ceph_gcm_nonce out_gcm_nonce;
385385
386+ struct page **in_enc_pages;
387+ int in_enc_page_cnt;
388+ int in_enc_resid;
389+ int in_enc_i;
386390 struct page **out_enc_pages;
387391 int out_enc_page_cnt;
388392 int out_enc_resid;
@@ -457,6 +461,7 @@ struct ceph_connection { · 68 unmodified lines
457461 struct ceph_msg *out_msg; /* sending message (== tail of
458462 out_sent) */
459463
464+ struct page *bounce_page;
460465 u32 in_front_crc, in_middle_crc, in_data_crc; /* calculated crc */
461466
462467 struct timespec64 last_keepalive_ack; /* keepalive2 ack stamp */
include/linux/fb.h+1−1
@@ -262,7 +262,7 @@ struct fb_ops { · 261 unmodified lines
262262
263263 /* Draws a rectangle */
264264 void (*fb_fillrect) (struct fb_info *info, const struct fb_fillrect *rect);
265− /* Copy data from area to another. Obsolete. */
265+ /* Copy data from area to another */
266266 void (*fb_copyarea) (struct fb_info *info, const struct fb_copyarea *region);
267267 /* Draws a image to the display */
268268 void (*fb_imageblit) (struct fb_info *info, const struct fb_image *image);
include/linux/fs.h+1−1
@@ -1483,7 +1483,7 @@ struct super_block { · 1482 unmodified lines
14831483 #ifdef CONFIG_FS_VERITY
14841484 const struct fsverity_operations *s_vop;
14851485 #endif
1486−#ifdef CONFIG_UNICODE
1486+#if IS_ENABLED(CONFIG_UNICODE)
14871487 struct unicode_map *s_encoding;
14881488 __u16 s_encoding_flags;
14891489 #endif
include/linux/if_vlan.h+4−2
@@ -46,8 +46,10 @@ struct vlan_hdr { · 45 unmodified lines
4646 * @h_vlan_encapsulated_proto: packet type ID or len
4747 */
4848 struct vlan_ethhdr {
49− unsigned char h_dest[ETH_ALEN];
50− unsigned char h_source[ETH_ALEN];
49+ struct_group(addrs,
50+ unsigned char h_dest[ETH_ALEN];
51+ unsigned char h_source[ETH_ALEN];
52+ );
5153 __be16 h_vlan_proto;
5254 __be16 h_vlan_TCI;
5355 __be16 h_vlan_encapsulated_proto;
include/linux/iomap.h+2−0
@@ -263,9 +263,11 @@ struct iomap_ioend { · 262 unmodified lines
263263 struct list_head io_list; /* next ioend in chain */
264264 u16 io_type;
265265 u16 io_flags; /* IOMAP_F_* */
266+ u32 io_folios; /* folios added to ioend */
266267 struct inode *io_inode; /* file being written to */
267268 size_t io_size; /* size of the extent */
268269 loff_t io_offset; /* offset in the file */
270+ sector_t io_sector; /* start sector of ioend */
269271 struct bio *io_bio; /* bio being built */
270272 struct bio io_inline_bio; /* MUST BE LAST! */
271273 };
include/linux/kvm_host.h+109−3
@@ -29,7 +29,9 @@ · 28 unmodified lines
2929 #include <linux/refcount.h>
3030 #include <linux/nospec.h>
3131 #include <linux/notifier.h>
32+#include <linux/ftrace.h>
3233 #include <linux/hashtable.h>
34+#include <linux/instrumentation.h>
3335 #include <linux/interval_tree.h>
3436 #include <linux/rbtree.h>
3537 #include <linux/xarray.h>
@@ -368,8 +370,11 @@ struct kvm_vcpu { · 332 unmodified lines
368370 u64 last_used_slot_gen;
369371 };
370372
371−/* must be called with irqs disabled */
372−static __always_inline void guest_enter_irqoff(void)
373+/*
374+ * Start accounting time towards a guest.
375+ * Must be called before entering guest context.
376+ */
377+static __always_inline void guest_timing_enter_irqoff(void)
373378 {
374379 /*
375380 * This is running in ioctl context so its safe to assume that it's the
@@ -378,7 +383,18 @@ static __always_inline void guest_enter_irqoff(void) · 2 unmodified lines
378383 instrumentation_begin();
379384 vtime_account_guest_enter();
380385 instrumentation_end();
386+}
381387
388+/*
389+ * Enter guest context and enter an RCU extended quiescent state.
390+ *
391+ * Between guest_context_enter_irqoff() and guest_context_exit_irqoff() it is
392+ * unsafe to use any code which may directly or indirectly use RCU, tracing
393+ * (including IRQ flag tracing), or lockdep. All code in this period must be
394+ * non-instrumentable.
395+ */
396+static __always_inline void guest_context_enter_irqoff(void)
397+{
382398 /*
383399 * KVM does not hold any references to rcu protected data when it
384400 * switches CPU into a guest mode. In fact switching to a guest mode
@@ -394,16 +410,79 @@ static __always_inline void guest_enter_irqoff(void) · 9 unmodified lines
394410 }
395411 }
396412
397−static __always_inline void guest_exit_irqoff(void)
413+/*
414+ * Deprecated. Architectures should move to guest_timing_enter_irqoff() and
415+ * guest_state_enter_irqoff().
416+ */
417+static __always_inline void guest_enter_irqoff(void)
418+{
419+ guest_timing_enter_irqoff();
420+ guest_context_enter_irqoff();
421+}
422+
423+/**
424+ * guest_state_enter_irqoff - Fixup state when entering a guest
425+ *
426+ * Entry to a guest will enable interrupts, but the kernel state is interrupts
427+ * disabled when this is invoked. Also tell RCU about it.
428+ *
429+ * 1) Trace interrupts on state
430+ * 2) Invoke context tracking if enabled to adjust RCU state
431+ * 3) Tell lockdep that interrupts are enabled
432+ *
433+ * Invoked from architecture specific code before entering a guest.
434+ * Must be called with interrupts disabled and the caller must be
435+ * non-instrumentable.
436+ * The caller has to invoke guest_timing_enter_irqoff() before this.
437+ *
438+ * Note: this is analogous to exit_to_user_mode().
439+ */
440+static __always_inline void guest_state_enter_irqoff(void)
441+{
442+ instrumentation_begin();
443+ trace_hardirqs_on_prepare();
444+ lockdep_hardirqs_on_prepare(CALLER_ADDR0);
445+ instrumentation_end();
446+
447+ guest_context_enter_irqoff();
448+ lockdep_hardirqs_on(CALLER_ADDR0);
449+}
450+
451+/*
452+ * Exit guest context and exit an RCU extended quiescent state.
453+ *
454+ * Between guest_context_enter_irqoff() and guest_context_exit_irqoff() it is
455+ * unsafe to use any code which may directly or indirectly use RCU, tracing
456+ * (including IRQ flag tracing), or lockdep. All code in this period must be
457+ * non-instrumentable.
458+ */
459+static __always_inline void guest_context_exit_irqoff(void)
398460 {
399461 context_tracking_guest_exit();
462+}
400463
464+/*
465+ * Stop accounting time towards a guest.
466+ * Must be called after exiting guest context.
467+ */
468+static __always_inline void guest_timing_exit_irqoff(void)
469+{
401470 instrumentation_begin();
402471 /* Flush the guest cputime we spent on the guest */
403472 vtime_account_guest_exit();
404473 instrumentation_end();
405474 }
406475
476+/*
477+ * Deprecated. Architectures should move to guest_state_exit_irqoff() and
478+ * guest_timing_exit_irqoff().
479+ */
480+static __always_inline void guest_exit_irqoff(void)
481+{
482+ guest_context_exit_irqoff();
483+ guest_timing_exit_irqoff();
484+}
485+
407486 static inline void guest_exit(void)
408487 {
409488 unsigned long flags;
@@ -413,6 +492,33 @@ static inline void guest_exit(void) · 3 unmodified lines
413492 local_irq_restore(flags);
414493 }
415494
495+/**
496+ * guest_state_exit_irqoff - Establish state when returning from guest mode
497+ *
498+ * Entry from a guest disables interrupts, but guest mode is traced as
499+ * interrupts enabled. Also with NO_HZ_FULL RCU might be idle.
500+ *
501+ * 1) Tell lockdep that interrupts are disabled
502+ * 2) Invoke context tracking if enabled to reactivate RCU
503+ * 3) Trace interrupts off state
504+ *
505+ * Invoked from architecture specific code after exiting a guest.
506+ * Must be invoked with interrupts disabled and the caller must be
507+ * non-instrumentable.
508+ * The caller has to invoke guest_timing_exit_irqoff() after this.
509+ *
510+ * Note: this is analogous to enter_from_user_mode().
511+ */
512+static __always_inline void guest_state_exit_irqoff(void)
513+{
514+ lockdep_hardirqs_off(CALLER_ADDR0);
515+ guest_context_exit_irqoff();
516+
517+ instrumentation_begin();
518+ trace_hardirqs_off_finish();
519+ instrumentation_end();
520+}
521+
416522 static inline int kvm_vcpu_exiting_guest_mode(struct kvm_vcpu *vcpu)
417523 {
418524 /*
include/linux/libata.h+1−0
@@ -380,6 +380,7 @@ enum { · 379 unmodified lines
380380 ATA_HORKAGE_MAX_TRIM_128M = (1 << 26), /* Limit max trim size to 128M */
381381 ATA_HORKAGE_NO_NCQ_ON_ATI = (1 << 27), /* Disable NCQ on ATI chipset */
382382 ATA_HORKAGE_NO_ID_DEV_LOG = (1 << 28), /* Identify device log missing */
383+ ATA_HORKAGE_NO_LOG_DIR = (1 << 29), /* Do not read log directory */
383384
384385 /* DMA mask for user DMA control: User visible values; DO NOT
385386 renumber */
include/linux/netfs.h+7−0
@@ -244,6 +244,13 @@ struct netfs_cache_ops { · 243 unmodified lines
244244 int (*prepare_write)(struct netfs_cache_resources *cres,
245245 loff_t *_start, size_t *_len, loff_t i_size,
246246 bool no_space_allocated_yet);
247+
248+ /* Query the occupancy of the cache in a region, returning where the
249+ * next chunk of data starts and how long it is.
250+ */
251+ int (*query_occupancy)(struct netfs_cache_resources *cres,
252+ loff_t start, size_t len, size_t granularity,
253+ loff_t *_data_start, size_t *_data_len);
247254 };
248255
249256 struct readahead_control;
include/linux/page_table_check.h+19−0
@@ -26,6 +26,9 @@ void __page_table_check_pmd_set(struct mm_struct *mm, unsigned long addr, · 25 unmodified lines
2626 pmd_t *pmdp, pmd_t pmd);
2727 void __page_table_check_pud_set(struct mm_struct *mm, unsigned long addr,
2828 pud_t *pudp, pud_t pud);
29+void __page_table_check_pte_clear_range(struct mm_struct *mm,
30+ unsigned long addr,
31+ pmd_t pmd);
2932
3033 static inline void page_table_check_alloc(struct page *page, unsigned int order)
3134 {
@@ -100,6 +103,16 @@ static inline void page_table_check_pud_set(struct mm_struct *mm, · 68 unmodified lines
100103 __page_table_check_pud_set(mm, addr, pudp, pud);
101104 }
102105
106+static inline void page_table_check_pte_clear_range(struct mm_struct *mm,
107+ unsigned long addr,
108+ pmd_t pmd)
109+{
110+ if (static_branch_likely(&page_table_check_disabled))
111+ return;
112+
113+ __page_table_check_pte_clear_range(mm, addr, pmd);
114+}
115+
103116 #else
104117
105118 static inline void page_table_check_alloc(struct page *page, unsigned int order)
@@ -143,5 +156,11 @@ static inline void page_table_check_pud_set(struct mm_struct *mm, · 37 unmodified lines
143156 {
144157 }
145158
159+static inline void page_table_check_pte_clear_range(struct mm_struct *mm,
160+ unsigned long addr,
161+ pmd_t pmd)
162+{
163+}
164+
146165 #endif /* CONFIG_PAGE_TABLE_CHECK */
147166 #endif /* __LINUX_PAGE_TABLE_CHECK_H */
include/linux/pgtable.h+1−0
@@ -62,6 +62,7 @@ static inline unsigned long pte_index(unsigned long address) · 61 unmodified lines
6262 {
6363 return (address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1);
6464 }
65+#define pte_index pte_index
6566
6667 #ifndef pmd_index
6768 static inline unsigned long pmd_index(unsigned long address)
include/linux/sched.h+0−1
@@ -1680,7 +1680,6 @@ extern struct pid *cad_pid; · 1679 unmodified lines
16801680 #define PF_MEMALLOC 0x00000800 /* Allocating memory */
16811681 #define PF_NPROC_EXCEEDED 0x00001000 /* set_user() noticed that RLIMIT_NPROC was exceeded */
16821682 #define PF_USED_MATH 0x00002000 /* If unset the fpu must be initialized before use */
1683−#define PF_USED_ASYNC 0x00004000 /* Used async_schedule*(), used by module init */
16841683 #define PF_NOFREEZE 0x00008000 /* This thread should not be frozen */
16851684 #define PF_FROZEN 0x00010000 /* Frozen for system suspend */
16861685 #define PF_KSWAPD 0x00020000 /* I am kswapd */
include/net/ax25.h+12−0
@@ -239,6 +239,7 @@ typedef struct ax25_dev { · 238 unmodified lines
239239 #if defined(CONFIG_AX25_DAMA_SLAVE) || defined(CONFIG_AX25_DAMA_MASTER)
240240 ax25_dama_info dama;
241241 #endif
242+ refcount_t refcount;
242243 } ax25_dev;
243244
244245 typedef struct ax25_cb {
@@ -293,6 +294,17 @@ static __inline__ void ax25_cb_put(ax25_cb *ax25) · 48 unmodified lines
293294 }
294295 }
295296
297+static inline void ax25_dev_hold(ax25_dev *ax25_dev)
298+{
299+ refcount_inc(&ax25_dev->refcount);
300+}
301+
302+static inline void ax25_dev_put(ax25_dev *ax25_dev)
303+{
304+ if (refcount_dec_and_test(&ax25_dev->refcount)) {
305+ kfree(ax25_dev);
306+ }
307+}
296308 static inline __be16 ax25_type_trans(struct sk_buff *skb, struct net_device *dev)
297309 {
298310 skb->dev = dev;
include/net/neighbour.h+13−5
@@ -350,7 +350,8 @@ static inline struct neighbour *neigh_create(struct neigh_table *tbl, · 349 unmodified lines
350350 return __neigh_create(tbl, pkey, dev, true);
351351 }
352352 void neigh_destroy(struct neighbour *neigh);
353−int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb);
353+int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb,
354+ const bool immediate_ok);
354355 int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new, u32 flags,
355356 u32 nlmsg_pid);
356357 void __neigh_set_probe_once(struct neighbour *neigh);
@@ -460,17 +461,24 @@ static inline struct neighbour * neigh_clone(struct neighbour *neigh) · 103 unmodified lines
460461
461462 #define neigh_hold(n) refcount_inc(&(n)->refcnt)
462463
463−static inline int neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
464+static __always_inline int neigh_event_send_probe(struct neighbour *neigh,
465+ struct sk_buff *skb,
466+ const bool immediate_ok)
464467 {
465468 unsigned long now = jiffies;
466−
469+
467470 if (READ_ONCE(neigh->used) != now)
468471 WRITE_ONCE(neigh->used, now);
469− if (!(neigh->nud_state&(NUD_CONNECTED|NUD_DELAY|NUD_PROBE)))
470− return __neigh_event_send(neigh, skb);
472+ if (!(neigh->nud_state & (NUD_CONNECTED | NUD_DELAY | NUD_PROBE)))
473+ return __neigh_event_send(neigh, skb, immediate_ok);
471474 return 0;
472475 }
473476
477+static inline int neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
478+{
479+ return neigh_event_send_probe(neigh, skb, true);
480+}
481+
474482 #if IS_ENABLED(CONFIG_BRIDGE_NETFILTER)
475483 static inline int neigh_hh_bridge(struct hh_cache *hh, struct sk_buff *skb)
476484 {
include/sound/pcm.h+15−0
@@ -617,6 +617,7 @@ void snd_pcm_stream_unlock(struct snd_pcm_substream *substream); · 616 unmodified lines
617617 void snd_pcm_stream_lock_irq(struct snd_pcm_substream *substream);
618618 void snd_pcm_stream_unlock_irq(struct snd_pcm_substream *substream);
619619 unsigned long _snd_pcm_stream_lock_irqsave(struct snd_pcm_substream *substream);
620+unsigned long _snd_pcm_stream_lock_irqsave_nested(struct snd_pcm_substream *substream);
620621
621622 /**
622623 * snd_pcm_stream_lock_irqsave - Lock the PCM stream
@@ -635,6 +636,20 @@ unsigned long _snd_pcm_stream_lock_irqsave(struct snd_pcm_substream *substream); · 12 unmodified lines
635636 void snd_pcm_stream_unlock_irqrestore(struct snd_pcm_substream *substream,
636637 unsigned long flags);
637638
639+/**
640+ * snd_pcm_stream_lock_irqsave_nested - Single-nested PCM stream locking
641+ * @substream: PCM substream
642+ * @flags: irq flags
643+ *
644+ * This locks the PCM stream like snd_pcm_stream_lock_irqsave() but with
645+ * the single-depth lockdep subclass.
646+ */
647+#define snd_pcm_stream_lock_irqsave_nested(substream, flags) \
648+ do { \
649+ typecheck(unsigned long, flags); \
650+ flags = _snd_pcm_stream_lock_irqsave_nested(substream); \
651+ } while (0)
652+
638653 /**
639654 * snd_pcm_group_for_each_entry - iterate over the linked substreams
640655 * @s: the iterator
include/uapi/linux/kvm.h+3−3
@@ -1624,9 +1624,6 @@ struct kvm_enc_region { · 1623 unmodified lines
16241624 #define KVM_S390_NORMAL_RESET _IO(KVMIO, 0xc3)
16251625 #define KVM_S390_CLEAR_RESET _IO(KVMIO, 0xc4)
16261626
1627−/* Available with KVM_CAP_XSAVE2 */
1628−#define KVM_GET_XSAVE2 _IOR(KVMIO, 0xcf, struct kvm_xsave)
1629−
16301627 struct kvm_s390_pv_sec_parm {
16311628 __u64 origin;
16321629 __u64 length;
@@ -2048,4 +2045,7 @@ struct kvm_stats_desc { · 415 unmodified lines
20482045
20492046 #define KVM_GET_STATS_FD _IO(KVMIO, 0xce)
20502047
2048+/* Available with KVM_CAP_XSAVE2 */
2049+#define KVM_GET_XSAVE2 _IOR(KVMIO, 0xcf, struct kvm_xsave)
2050+
20512051 #endif /* __LINUX_KVM_H */
include/uapi/linux/smc_diag.h+5−6
@@ -84,12 +84,11 @@ struct smc_diag_conninfo { · 83 unmodified lines
8484 /* SMC_DIAG_LINKINFO */
8585
8686 struct smc_diag_linkinfo {
87− __u8 link_id; /* link identifier */
88− __u8 ibname[IB_DEVICE_NAME_MAX]; /* name of the RDMA device */
89− __u8 ibport; /* RDMA device port number */
90− __u8 gid[40]; /* local GID */
91− __u8 peer_gid[40]; /* peer GID */
92− __aligned_u64 net_cookie; /* RDMA device net namespace */
87+ __u8 link_id; /* link identifier */
88+ __u8 ibname[IB_DEVICE_NAME_MAX]; /* name of the RDMA device */
89+ __u8 ibport; /* RDMA device port number */
90+ __u8 gid[40]; /* local GID */
91+ __u8 peer_gid[40]; /* peer GID */
9392 };
9493
9594 struct smc_diag_lgrinfo {
include/uapi/sound/asound.h+3−1
@@ -56,8 +56,10 @@ · 55 unmodified lines
5656 * *
5757 ****************************************************************************/
5858
59+#define AES_IEC958_STATUS_SIZE 24
60+
5961 struct snd_aes_iec958 {
60− unsigned char status[24]; /* AES/IEC958 channel status bits */
62+ unsigned char status[AES_IEC958_STATUS_SIZE]; /* AES/IEC958 channel status bits */
6163 unsigned char subcode[147]; /* AES/IEC958 subcode bits */
6264 unsigned char pad; /* nothing */
6365 unsigned char dig_subframe[4]; /* AES/IEC958 subframe bits */
include/uapi/xen/gntdev.h+7−1
@@ -47,7 +47,13 @@ struct ioctl_gntdev_grant_ref { · 46 unmodified lines
4747 /*
4848 * Inserts the grant references into the mapping table of an instance
4949 * of gntdev. N.B. This does not perform the mapping, which is deferred
50− * until mmap() is called with @index as the offset.
50+ * until mmap() is called with @index as the offset. @index should be
51+ * considered opaque to userspace, with one exception: if no grant
52+ * references have ever been inserted into the mapping table of this
53+ * instance, @index will be set to 0. This is necessary to use gntdev
54+ * with userspace APIs that expect a file descriptor that can be
55+ * mmap()'d at offset 0, such as Wayland. If @count is set to 0, this
56+ * ioctl will fail.
5157 */
5258 #define IOCTL_GNTDEV_MAP_GRANT_REF \
5359 _IOC(_IOC_NONE, 'G', 0, sizeof(struct ioctl_gntdev_map_grant_ref))
include/xen/xenbus_dev.h+0−2
@@ -1,6 +1,4 @@
11 /******************************************************************************
2− * evtchn.h
3− *
42 * Interface to /dev/xen/xenbus_backend.
53 *
64 * Copyright (c) 2011 Bastian Blank <waldi@debian.org>
ipc/sem.c+2−2
@@ -1964,6 +1964,7 @@ static struct sem_undo *find_alloc_undo(struct ipc_namespace *ns, int semid) · 1963 unmodified lines
19641964 */
19651965 un = lookup_undo(ulp, semid);
19661966 if (un) {
1967+ spin_unlock(&ulp->lock);
19671968 kvfree(new);
19681969 goto success;
19691970 }
@@ -1976,9 +1977,8 @@ static struct sem_undo *find_alloc_undo(struct ipc_namespace *ns, int semid) · 6 unmodified lines
19761977 ipc_assert_locked_object(&sma->sem_perm);
19771978 list_add(&new->list_id, &sma->list_id);
19781979 un = new;
1979−
1980−success:
19811980 spin_unlock(&ulp->lock);
1981+success:
19821982 sem_unlock(sma, -1);
19831983 out:
19841984 return un;
kernel/async.c+0−3
@@ -205,9 +205,6 @@ async_cookie_t async_schedule_node_domain(async_func_t func, void *data, · 204 unmodified lines
205205 atomic_inc(&entry_count);
206206 spin_unlock_irqrestore(&async_lock, flags);
207207
208− /* mark that this task has queued an async job, used by module init */
209− current->flags |= PF_USED_ASYNC;
210−
211208 /* schedule for execution */
212209 queue_work_node(node, system_unbound_wq, &entry->work);
213210
kernel/audit.c+43−19
@@ -541,20 +541,22 @@ static void kauditd_printk_skb(struct sk_buff *skb) · 540 unmodified lines
541541 /**
542542 * kauditd_rehold_skb - Handle a audit record send failure in the hold queue
543543 * @skb: audit record
544+ * @error: error code (unused)
544545 *
545546 * Description:
546547 * This should only be used by the kauditd_thread when it fails to flush the
547548 * hold queue.
548549 */
549−static void kauditd_rehold_skb(struct sk_buff *skb)
550+static void kauditd_rehold_skb(struct sk_buff *skb, __always_unused int error)
550551 {
551− /* put the record back in the queue at the same place */
552− skb_queue_head(&audit_hold_queue, skb);
552+ /* put the record back in the queue */
553+ skb_queue_tail(&audit_hold_queue, skb);
553554 }
554555
555556 /**
556557 * kauditd_hold_skb - Queue an audit record, waiting for auditd
557558 * @skb: audit record
559+ * @error: error code
558560 *
559561 * Description:
560562 * Queue the audit record, waiting for an instance of auditd. When this
@@ -564,19 +566,31 @@ static void kauditd_rehold_skb(struct sk_buff *skb) · 3 unmodified lines
564566 * and queue it, if we have room. If we want to hold on to the record, but we
565567 * don't have room, record a record lost message.
566568 */
567−static void kauditd_hold_skb(struct sk_buff *skb)
569+static void kauditd_hold_skb(struct sk_buff *skb, int error)
568570 {
569571 /* at this point it is uncertain if we will ever send this to auditd so
570572 * try to send the message via printk before we go any further */
571573 kauditd_printk_skb(skb);
572574
573575 /* can we just silently drop the message? */
574− if (!audit_default) {
575− kfree_skb(skb);
576− return;
576+ if (!audit_default)
577+ goto drop;
578+
579+ /* the hold queue is only for when the daemon goes away completely,
580+ * not -EAGAIN failures; if we are in a -EAGAIN state requeue the
581+ * record on the retry queue unless it's full, in which case drop it
582+ */
583+ if (error == -EAGAIN) {
584+ if (!audit_backlog_limit ||
585+ skb_queue_len(&audit_retry_queue) < audit_backlog_limit) {
586+ skb_queue_tail(&audit_retry_queue, skb);
587+ return;
588+ }
589+ audit_log_lost("kauditd retry queue overflow");
590+ goto drop;
577591 }
578592
579− /* if we have room, queue the message */
593+ /* if we have room in the hold queue, queue the message */
580594 if (!audit_backlog_limit ||
581595 skb_queue_len(&audit_hold_queue) < audit_backlog_limit) {
582596 skb_queue_tail(&audit_hold_queue, skb);
@@ -585,24 +599,32 @@ static void kauditd_hold_skb(struct sk_buff *skb) · 2 unmodified lines
585599
586600 /* we have no other options - drop the message */
587601 audit_log_lost("kauditd hold queue overflow");
602+drop:
588603 kfree_skb(skb);
589604 }
590605
591606 /**
592607 * kauditd_retry_skb - Queue an audit record, attempt to send again to auditd
593608 * @skb: audit record
609+ * @error: error code (unused)
594610 *
595611 * Description:
596612 * Not as serious as kauditd_hold_skb() as we still have a connected auditd,
597613 * but for some reason we are having problems sending it audit records so
598614 * queue the given record and attempt to resend.
599615 */
600−static void kauditd_retry_skb(struct sk_buff *skb)
616+static void kauditd_retry_skb(struct sk_buff *skb, __always_unused int error)
601617 {
602− /* NOTE: because records should only live in the retry queue for a
603− * short period of time, before either being sent or moved to the hold
604− * queue, we don't currently enforce a limit on this queue */
605− skb_queue_tail(&audit_retry_queue, skb);
618+ if (!audit_backlog_limit ||
619+ skb_queue_len(&audit_retry_queue) < audit_backlog_limit) {
620+ skb_queue_tail(&audit_retry_queue, skb);
621+ return;
622+ }
623+
624+ /* we have to drop the record, send it via printk as a last effort */
625+ kauditd_printk_skb(skb);
626+ audit_log_lost("kauditd retry queue overflow");
627+ kfree_skb(skb);
606628 }
607629
608630 /**
@@ -640,7 +662,7 @@ static void auditd_reset(const struct auditd_connection *ac) · 31 unmodified lines
640662 /* flush the retry queue to the hold queue, but don't touch the main
641663 * queue since we need to process that normally for multicast */
642664 while ((skb = skb_dequeue(&audit_retry_queue)))
643− kauditd_hold_skb(skb);
665+ kauditd_hold_skb(skb, -ECONNREFUSED);
644666 }
645667
646668 /**
@@ -714,16 +736,18 @@ static int kauditd_send_queue(struct sock *sk, u32 portid, · 67 unmodified lines
714736 struct sk_buff_head *queue,
715737 unsigned int retry_limit,
716738 void (*skb_hook)(struct sk_buff *skb),
717− void (*err_hook)(struct sk_buff *skb))
739+ void (*err_hook)(struct sk_buff *skb, int error))
718740 {
719741 int rc = 0;
720− struct sk_buff *skb;
742+ struct sk_buff *skb = NULL;
743+ struct sk_buff *skb_tail;
721744 unsigned int failed = 0;
722745
723746 /* NOTE: kauditd_thread takes care of all our locking, we just use
724747 * the netlink info passed to us (e.g. sk and portid) */
725748
726− while ((skb = skb_dequeue(queue))) {
749+ skb_tail = skb_peek_tail(queue);
750+ while ((skb != skb_tail) && (skb = skb_dequeue(queue))) {
727751 /* call the skb_hook for each skb we touch */
728752 if (skb_hook)
729753 (*skb_hook)(skb);
@@ -731,7 +755,7 @@ static int kauditd_send_queue(struct sock *sk, u32 portid, · 1 unmodified line
731755 /* can we send to anyone via unicast? */
732756 if (!sk) {
733757 if (err_hook)
734− (*err_hook)(skb);
758+ (*err_hook)(skb, -ECONNREFUSED);
735759 continue;
736760 }
737761
@@ -745,7 +769,7 @@ retry: · 7 unmodified lines
745769 rc == -ECONNREFUSED || rc == -EPERM) {
746770 sk = NULL;
747771 if (err_hook)
748− (*err_hook)(skb);
772+ (*err_hook)(skb, rc);
749773 if (rc == -EAGAIN)
750774 rc = 0;
751775 /* continue to drain the queue */
kernel/bpf/bpf_lsm.c+1−1
@@ -207,7 +207,7 @@ BTF_ID(func, bpf_lsm_socket_socketpair) · 206 unmodified lines
207207
208208 BTF_ID(func, bpf_lsm_syslog)
209209 BTF_ID(func, bpf_lsm_task_alloc)
210−BTF_ID(func, bpf_lsm_task_getsecid_subj)
210+BTF_ID(func, bpf_lsm_current_getsecid_subj)
211211 BTF_ID(func, bpf_lsm_task_getsecid_obj)
212212 BTF_ID(func, bpf_lsm_task_prctl)
213213 BTF_ID(func, bpf_lsm_task_setscheduler)
kernel/bpf/ringbuf.c+1−1
@@ -104,7 +104,7 @@ static struct bpf_ringbuf *bpf_ringbuf_area_alloc(size_t data_sz, int numa_node) · 103 unmodified lines
104104 }
105105
106106 rb = vmap(pages, nr_meta_pages + 2 * nr_data_pages,
107− VM_ALLOC | VM_USERMAP, PAGE_KERNEL);
107+ VM_MAP | VM_USERMAP, PAGE_KERNEL);
108108 if (rb) {
109109 kmemleak_not_leak(pages);
110110 rb->pages = pages;
kernel/bpf/trampoline.c+3−2
@@ -550,11 +550,12 @@ static __always_inline u64 notrace bpf_prog_start_time(void) · 549 unmodified lines
550550 static void notrace inc_misses_counter(struct bpf_prog *prog)
551551 {
552552 struct bpf_prog_stats *stats;
553+ unsigned int flags;
553554
554555 stats = this_cpu_ptr(prog->stats);
555− u64_stats_update_begin(&stats->syncp);
556+ flags = u64_stats_update_begin_irqsave(&stats->syncp);
556557 u64_stats_inc(&stats->misses);
557− u64_stats_update_end(&stats->syncp);
558+ u64_stats_update_end_irqrestore(&stats->syncp, flags);
558559 }
559560
560561 /* The logic is similar to bpf_prog_run(), but with an explicit
kernel/cgroup/cgroup-v1.c+14−0
@@ -549,6 +549,14 @@ static ssize_t cgroup_release_agent_write(struct kernfs_open_file *of, · 548 unmodified lines
549549
550550 BUILD_BUG_ON(sizeof(cgrp->root->release_agent_path) < PATH_MAX);
551551
552+ /*
553+ * Release agent gets called with all capabilities,
554+ * require capabilities to set release agent.
555+ */
556+ if ((of->file->f_cred->user_ns != &init_user_ns) ||
557+ !capable(CAP_SYS_ADMIN))
558+ return -EPERM;
559+
552560 cgrp = cgroup_kn_lock_live(of->kn, false);
553561 if (!cgrp)
554562 return -ENODEV;
@@ -954,6 +962,12 @@ int cgroup1_parse_param(struct fs_context *fc, struct fs_parameter *param) · 399 unmodified lines
954962 /* Specifying two release agents is forbidden */
955963 if (ctx->release_agent)
956964 return invalfc(fc, "release_agent respecified");
965+ /*
966+ * Release agent gets called with all capabilities,
967+ * require capabilities to set release agent.
968+ */
969+ if ((fc->user_ns != &init_user_ns) || !capable(CAP_SYS_ADMIN))
970+ return invalfc(fc, "Setting release_agent not allowed");
957971 ctx->release_agent = param->string;
958972 param->string = NULL;
959973 break;
kernel/cgroup/cpuset.c+51−14
@@ -590,6 +590,35 @@ static inline void free_cpuset(struct cpuset *cs) · 589 unmodified lines
590590 kfree(cs);
591591 }
592592
593+/*
594+ * validate_change_legacy() - Validate conditions specific to legacy (v1)
595+ * behavior.
596+ */
597+static int validate_change_legacy(struct cpuset *cur, struct cpuset *trial)
598+{
599+ struct cgroup_subsys_state *css;
600+ struct cpuset *c, *par;
601+ int ret;
602+
603+ WARN_ON_ONCE(!rcu_read_lock_held());
604+
605+ /* Each of our child cpusets must be a subset of us */
606+ ret = -EBUSY;
607+ cpuset_for_each_child(c, css, cur)
608+ if (!is_cpuset_subset(c, trial))
609+ goto out;
610+
611+ /* On legacy hierarchy, we must be a subset of our parent cpuset. */
612+ ret = -EACCES;
613+ par = parent_cs(cur);
614+ if (par && !is_cpuset_subset(trial, par))
615+ goto out;
616+
617+ ret = 0;
618+out:
619+ return ret;
620+}
621+
593622 /*
594623 * validate_change() - Used to validate that any proposed cpuset change
595624 * follows the structural rules for cpusets.
@@ -614,20 +643,21 @@ static int validate_change(struct cpuset *cur, struct cpuset *trial) · 18 unmodified lines
614643 {
615644 struct cgroup_subsys_state *css;
616645 struct cpuset *c, *par;
617− int ret;
618−
619− /* The checks don't apply to root cpuset */
620− if (cur == &top_cpuset)
621− return 0;
646+ int ret = 0;
622647
623648 rcu_read_lock();
624− par = parent_cs(cur);
625649
626− /* On legacy hierarchy, we must be a subset of our parent cpuset. */
627− ret = -EACCES;
628− if (!is_in_v2_mode() && !is_cpuset_subset(trial, par))
650+ if (!is_in_v2_mode())
651+ ret = validate_change_legacy(cur, trial);
652+ if (ret)
653+ goto out;
654+
655+ /* Remaining checks don't apply to root cpuset */
656+ if (cur == &top_cpuset)
629657 goto out;
630658
659+ par = parent_cs(cur);
660+
631661 /*
632662 * If either I or some sibling (!= me) is exclusive, we can't
633663 * overlap
@@ -1175,9 +1205,7 @@ enum subparts_cmd { · 541 unmodified lines
11751205 *
11761206 * Because of the implicit cpu exclusive nature of a partition root,
11771207 * cpumask changes that violates the cpu exclusivity rule will not be
1178− * permitted when checked by validate_change(). The validate_change()
1179− * function will also prevent any changes to the cpu list if it is not
1180− * a superset of children's cpu lists.
1208+ * permitted when checked by validate_change().
11811209 */
11821210 static int update_parent_subparts_cpumask(struct cpuset *cpuset, int cmd,
11831211 struct cpumask *newmask,
@@ -1522,10 +1550,15 @@ static void update_sibling_cpumasks(struct cpuset *parent, struct cpuset *cs, · 338 unmodified lines
15221550 struct cpuset *sibling;
15231551 struct cgroup_subsys_state *pos_css;
15241552
1553+ percpu_rwsem_assert_held(&cpuset_rwsem);
1554+
15251555 /*
15261556 * Check all its siblings and call update_cpumasks_hier()
15271557 * if their use_parent_ecpus flag is set in order for them
15281558 * to use the right effective_cpus value.
1559+ *
1560+ * The update_cpumasks_hier() function may sleep. So we have to
1561+ * release the RCU read lock before calling it.
15291562 */
15301563 rcu_read_lock();
15311564 cpuset_for_each_child(sibling, pos_css, parent) {
@@ -1533,8 +1566,13 @@ static void update_sibling_cpumasks(struct cpuset *parent, struct cpuset *cs, · 1 unmodified line
15331566 continue;
15341567 if (!sibling->use_parent_ecpus)
15351568 continue;
1569+ if (!css_tryget_online(&sibling->css))
1570+ continue;
15361571
1572+ rcu_read_unlock();
15371573 update_cpumasks_hier(sibling, tmp);
1574+ rcu_read_lock();
1575+ css_put(&sibling->css);
15381576 }
15391577 rcu_read_unlock();
15401578 }
@@ -1607,8 +1645,7 @@ static int update_cpumask(struct cpuset *cs, struct cpuset *trialcs, · 66 unmodified lines
16071645 * Make sure that subparts_cpus is a subset of cpus_allowed.
16081646 */
16091647 if (cs->nr_subparts_cpus) {
1610− cpumask_andnot(cs->subparts_cpus, cs->subparts_cpus,
1611− cs->cpus_allowed);
1648+ cpumask_and(cs->subparts_cpus, cs->subparts_cpus, cs->cpus_allowed);
16121649 cs->nr_subparts_cpus = cpumask_weight(cs->subparts_cpus);
16131650 }
16141651 spin_unlock_irq(&callback_lock);
kernel/module.c+5−20
@@ -3725,12 +3725,6 @@ static noinline int do_init_module(struct module *mod) · 3724 unmodified lines
37253725 }
37263726 freeinit->module_init = mod->init_layout.base;
37273727
3728− /*
3729− * We want to find out whether @mod uses async during init. Clear
3730− * PF_USED_ASYNC. async_schedule*() will set it.
3731− */
3732− current->flags &= ~PF_USED_ASYNC;
3733−
37343728 do_mod_ctors(mod);
37353729 /* Start the module */
37363730 if (mod->init != NULL)
@@ -3756,22 +3750,13 @@ static noinline int do_init_module(struct module *mod) · 19 unmodified lines
37563750
37573751 /*
37583752 * We need to finish all async code before the module init sequence
3759− * is done. This has potential to deadlock. For example, a newly
3760− * detected block device can trigger request_module() of the
3761− * default iosched from async probing task. Once userland helper
3762− * reaches here, async_synchronize_full() will wait on the async
3763− * task waiting on request_module() and deadlock.
3764− *
3765− * This deadlock is avoided by perfomring async_synchronize_full()
3766− * iff module init queued any async jobs. This isn't a full
3767− * solution as it will deadlock the same if module loading from
3768− * async jobs nests more than once; however, due to the various
3769− * constraints, this hack seems to be the best option for now.
3770− * Please refer to the following thread for details.
3753+ * is done. This has potential to deadlock if synchronous module
3754+ * loading is requested from async (which is not allowed!).
37713755 *
3772− * http://thread.gmane.org/gmane.linux.kernel/1420814
3756+ * See commit 0fdff3ec6d87 ("async, kmod: warn on synchronous
3757+ * request_module() from async workers") for more details.
37733758 */
3774− if (!mod->async_probe_requested && (current->flags & PF_USED_ASYNC))
3759+ if (!mod->async_probe_requested)
37753760 async_synchronize_full();
37763761
37773762 ftrace_free_mem(mod, mod->init_layout.base, mod->init_layout.base +
kernel/printk/sysctl.c+1−1
@@ -12,7 +12,7 @@ · 11 unmodified lines
1212 static const int ten_thousand = 10000;
1313
1414 static int proc_dointvec_minmax_sysadmin(struct ctl_table *table, int write,
15− void __user *buffer, size_t *lenp, loff_t *ppos)
15+ void *buffer, size_t *lenp, loff_t *ppos)
1616 {
1717 if (write && !capable(CAP_SYS_ADMIN))
1818 return -EPERM;
kernel/stackleak.c+2−3
@@ -70,7 +70,7 @@ late_initcall(stackleak_sysctls_init); · 69 unmodified lines
7070 #define skip_erasing() false
7171 #endif /* CONFIG_STACKLEAK_RUNTIME_DISABLE */
7272
73−asmlinkage void notrace stackleak_erase(void)
73+asmlinkage void noinstr stackleak_erase(void)
7474 {
7575 /* It would be nice not to have 'kstack_ptr' and 'boundary' on stack */
7676 unsigned long kstack_ptr = current->lowest_stack;
@@ -124,9 +124,8 @@ asmlinkage void notrace stackleak_erase(void) · 47 unmodified lines
124124 /* Reset the 'lowest_stack' value for the next syscall */
125125 current->lowest_stack = current_top_of_stack() - THREAD_SIZE/64;
126126 }
127−NOKPROBE_SYMBOL(stackleak_erase);
128127
129−void __used __no_caller_saved_registers notrace stackleak_track_stack(void)
128+void __used __no_caller_saved_registers noinstr stackleak_track_stack(void)
130129 {
131130 unsigned long sp = current_stack_pointer;
132131
lib/crypto/blake2s.c+2−2
@@ -18,14 +18,14 @@ · 17 unmodified lines
1818
1919 void blake2s_update(struct blake2s_state *state, const u8 *in, size_t inlen)
2020 {
21− __blake2s_update(state, in, inlen, blake2s_compress);
21+ __blake2s_update(state, in, inlen, false);
2222 }
2323 EXPORT_SYMBOL(blake2s_update);
2424
2525 void blake2s_final(struct blake2s_state *state, u8 *out)
2626 {
2727 WARN_ON(IS_ENABLED(DEBUG) && !out);
28− __blake2s_final(state, out, blake2s_compress);
28+ __blake2s_final(state, out, false);
2929 memzero_explicit(state, sizeof(*state));
3030 }
3131 EXPORT_SYMBOL(blake2s_final);
mm/debug_vm_pgtable.c+2−0
@@ -171,6 +171,8 @@ static void __init pte_advanced_tests(struct pgtable_debug_args *args) · 170 unmodified lines
171171 ptep_test_and_clear_young(args->vma, args->vaddr, args->ptep);
172172 pte = ptep_get(args->ptep);
173173 WARN_ON(pte_young(pte));
174+
175+ ptep_get_and_clear_full(args->mm, args->vaddr, args->ptep, 1);
174176 }
175177
176178 static void __init pte_savedwrite_tests(struct pgtable_debug_args *args)
mm/gup.c+30−5
@@ -124,8 +124,8 @@ static inline struct page *try_get_compound_head(struct page *page, int refs) · 123 unmodified lines
124124 * considered failure, and furthermore, a likely bug in the caller, so a warning
125125 * is also emitted.
126126 */
127−struct page *try_grab_compound_head(struct page *page,
128− int refs, unsigned int flags)
127+__maybe_unused struct page *try_grab_compound_head(struct page *page,
128+ int refs, unsigned int flags)
129129 {
130130 if (flags & FOLL_GET)
131131 return try_get_compound_head(page, refs);
@@ -208,10 +208,35 @@ static void put_compound_head(struct page *page, int refs, unsigned int flags) · 76 unmodified lines
208208 */
209209 bool __must_check try_grab_page(struct page *page, unsigned int flags)
210210 {
211− if (!(flags & (FOLL_GET | FOLL_PIN)))
212− return true;
211+ WARN_ON_ONCE((flags & (FOLL_GET | FOLL_PIN)) == (FOLL_GET | FOLL_PIN));
213212
214− return try_grab_compound_head(page, 1, flags);
213+ if (flags & FOLL_GET)
214+ return try_get_page(page);
215+ else if (flags & FOLL_PIN) {
216+ int refs = 1;
217+
218+ page = compound_head(page);
219+
220+ if (WARN_ON_ONCE(page_ref_count(page) <= 0))
221+ return false;
222+
223+ if (hpage_pincount_available(page))
224+ hpage_pincount_add(page, 1);
225+ else
226+ refs = GUP_PIN_COUNTING_BIAS;
227+
228+ /*
229+ * Similar to try_grab_compound_head(): even if using the
230+ * hpage_pincount_add/_sub() routines, be sure to
231+ * *also* increment the normal page refcount field at least
232+ * once, so that the page really is pinned.
233+ */
234+ page_ref_add(page, refs);
235+
236+ mod_node_page_state(page_pgdat(page), NR_FOLL_PIN_ACQUIRED, 1);
237+ }
238+
239+ return true;
215240 }
216241
217242 /**
mm/khugepaged.c+21−16
@@ -16,6 +16,7 @@ · 15 unmodified lines
1616 #include <linux/hashtable.h>
1717 #include <linux/userfaultfd_k.h>
1818 #include <linux/page_idle.h>
19+#include <linux/page_table_check.h>
1920 #include <linux/swapops.h>
2021 #include <linux/shmem_fs.h>
2122
@@ -1416,6 +1417,21 @@ static int khugepaged_add_pte_mapped_thp(struct mm_struct *mm, · 1394 unmodified lines
14161417 return 0;
14171418 }
14181419
1420+static void collapse_and_free_pmd(struct mm_struct *mm, struct vm_area_struct *vma,
1421+ unsigned long addr, pmd_t *pmdp)
1422+{
1423+ spinlock_t *ptl;
1424+ pmd_t pmd;
1425+
1426+ mmap_assert_write_locked(mm);
1427+ ptl = pmd_lock(vma->vm_mm, pmdp);
1428+ pmd = pmdp_collapse_flush(vma, addr, pmdp);
1429+ spin_unlock(ptl);
1430+ mm_dec_nr_ptes(mm);
1431+ page_table_check_pte_clear_range(mm, addr, pmd);
1432+ pte_free(mm, pmd_pgtable(pmd));
1433+}
1434+
14191435 /**
14201436 * collapse_pte_mapped_thp - Try to collapse a pte-mapped THP for mm at
14211437 * address haddr.
@@ -1433,7 +1449,7 @@ void collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr) · 11 unmodified lines
14331449 struct vm_area_struct *vma = find_vma(mm, haddr);
14341450 struct page *hpage;
14351451 pte_t *start_pte, *pte;
1436− pmd_t *pmd, _pmd;
1452+ pmd_t *pmd;
14371453 spinlock_t *ptl;
14381454 int count = 0;
14391455 int i;
@@ -1509,12 +1525,7 @@ void collapse_pte_mapped_thp(struct mm_struct *mm, unsigned long addr) · 69 unmodified lines
15091525 }
15101526
15111527 /* step 4: collapse pmd */
1512− ptl = pmd_lock(vma->vm_mm, pmd);
1513− _pmd = pmdp_collapse_flush(vma, haddr, pmd);
1514− spin_unlock(ptl);
1515− mm_dec_nr_ptes(mm);
1516− pte_free(mm, pmd_pgtable(_pmd));
1517−
1528+ collapse_and_free_pmd(mm, vma, haddr, pmd);
15181529 drop_hpage:
15191530 unlock_page(hpage);
15201531 put_page(hpage);
@@ -1552,7 +1563,7 @@ static void retract_page_tables(struct address_space *mapping, pgoff_t pgoff) · 31 unmodified lines
15521563 struct vm_area_struct *vma;
15531564 struct mm_struct *mm;
15541565 unsigned long addr;
1555− pmd_t *pmd, _pmd;
1566+ pmd_t *pmd;
15561567
15571568 i_mmap_lock_write(mapping);
15581569 vma_interval_tree_foreach(vma, &mapping->i_mmap, pgoff, pgoff) {
@@ -1591,14 +1602,8 @@ static void retract_page_tables(struct address_space *mapping, pgoff_t pgoff) · 32 unmodified lines
15911602 * reverse order. Trylock is a way to avoid deadlock.
15921603 */
15931604 if (mmap_write_trylock(mm)) {
1594− if (!khugepaged_test_exit(mm)) {
1595− spinlock_t *ptl = pmd_lock(mm, pmd);
1596− /* assume page table is clear */
1597− _pmd = pmdp_collapse_flush(vma, addr, pmd);
1598− spin_unlock(ptl);
1599− mm_dec_nr_ptes(mm);
1600− pte_free(mm, pmd_pgtable(_pmd));
1601− }
1605+ if (!khugepaged_test_exit(mm))
1606+ collapse_and_free_pmd(mm, vma, addr, pmd);
16021607 mmap_write_unlock(mm);
16031608 } else {
16041609 /* Try again later */
mm/kmemleak.c+7−6
@@ -1410,7 +1410,8 @@ static void kmemleak_scan(void) · 1409 unmodified lines
14101410 {
14111411 unsigned long flags;
14121412 struct kmemleak_object *object;
1413− int i;
1413+ struct zone *zone;
1414+ int __maybe_unused i;
14141415 int new_leaks = 0;
14151416
14161417 jiffies_last_scan = jiffies;
@@ -1450,9 +1451,9 @@ static void kmemleak_scan(void) · 33 unmodified lines
14501451 * Struct page scanning for each node.
14511452 */
14521453 get_online_mems();
1453− for_each_online_node(i) {
1454− unsigned long start_pfn = node_start_pfn(i);
1455− unsigned long end_pfn = node_end_pfn(i);
1454+ for_each_populated_zone(zone) {
1455+ unsigned long start_pfn = zone->zone_start_pfn;
1456+ unsigned long end_pfn = zone_end_pfn(zone);
14561457 unsigned long pfn;
14571458
14581459 for (pfn = start_pfn; pfn < end_pfn; pfn++) {
@@ -1461,8 +1462,8 @@ static void kmemleak_scan(void) · 2 unmodified lines
14611462 if (!page)
14621463 continue;
14631464
1464− /* only scan pages belonging to this node */
1465− if (page_to_nid(page) != i)
1465+ /* only scan pages belonging to this zone */
1466+ if (page_zone(page) != zone)
14661467 continue;
14671468 /* only scan if page is in use */
14681469 if (page_count(page) == 0)
mm/page_isolation.c+1−1
@@ -115,7 +115,7 @@ static void unset_migratetype_isolate(struct page *page, unsigned migratetype) · 114 unmodified lines
115115 * onlining - just onlined memory won't immediately be considered for
116116 * allocation.
117117 */
118− if (!isolated_page && PageBuddy(page)) {
118+ if (!isolated_page) {
119119 nr_pages = move_freepages_block(zone, page, migratetype, NULL);
120120 __mod_zone_freepage_state(zone, nr_pages, migratetype);
121121 }
mm/page_table_check.c+27−28
@@ -86,8 +86,8 @@ static void page_table_check_clear(struct mm_struct *mm, unsigned long addr, · 85 unmodified lines
8686 {
8787 struct page_ext *page_ext;
8888 struct page *page;
89+ unsigned long i;
8990 bool anon;
90− int i;
9191
9292 if (!pfn_valid(pfn))
9393 return;
@@ -121,8 +121,8 @@ static void page_table_check_set(struct mm_struct *mm, unsigned long addr, · 27 unmodified lines
121121 {
122122 struct page_ext *page_ext;
123123 struct page *page;
124+ unsigned long i;
124125 bool anon;
125− int i;
126126
127127 if (!pfn_valid(pfn))
128128 return;
@@ -152,10 +152,10 @@ static void page_table_check_set(struct mm_struct *mm, unsigned long addr, · 23 unmodified lines
152152 void __page_table_check_zero(struct page *page, unsigned int order)
153153 {
154154 struct page_ext *page_ext = lookup_page_ext(page);
155− int i;
155+ unsigned long i;
156156
157157 BUG_ON(!page_ext);
158− for (i = 0; i < (1 << order); i++) {
158+ for (i = 0; i < (1ul << order); i++) {
159159 struct page_table_check *ptc = get_page_table_check(page_ext);
160160
161161 BUG_ON(atomic_read(&ptc->anon_map_count));
@@ -206,17 +206,10 @@ EXPORT_SYMBOL(__page_table_check_pud_clear); · 44 unmodified lines
206206 void __page_table_check_pte_set(struct mm_struct *mm, unsigned long addr,
207207 pte_t *ptep, pte_t pte)
208208 {
209− pte_t old_pte;
210−
211209 if (&init_mm == mm)
212210 return;
213211
214− old_pte = *ptep;
215− if (pte_user_accessible_page(old_pte)) {
216− page_table_check_clear(mm, addr, pte_pfn(old_pte),
217− PAGE_SIZE >> PAGE_SHIFT);
218− }
219−
212+ __page_table_check_pte_clear(mm, addr, *ptep);
220213 if (pte_user_accessible_page(pte)) {
221214 page_table_check_set(mm, addr, pte_pfn(pte),
222215 PAGE_SIZE >> PAGE_SHIFT,
@@ -228,17 +221,10 @@ EXPORT_SYMBOL(__page_table_check_pte_set); · 5 unmodified lines
228221 void __page_table_check_pmd_set(struct mm_struct *mm, unsigned long addr,
229222 pmd_t *pmdp, pmd_t pmd)
230223 {
231− pmd_t old_pmd;
232−
233224 if (&init_mm == mm)
234225 return;
235226
236− old_pmd = *pmdp;
237− if (pmd_user_accessible_page(old_pmd)) {
238− page_table_check_clear(mm, addr, pmd_pfn(old_pmd),
239− PMD_PAGE_SIZE >> PAGE_SHIFT);
240− }
241−
227+ __page_table_check_pmd_clear(mm, addr, *pmdp);
242228 if (pmd_user_accessible_page(pmd)) {
243229 page_table_check_set(mm, addr, pmd_pfn(pmd),
244230 PMD_PAGE_SIZE >> PAGE_SHIFT,
@@ -250,17 +236,10 @@ EXPORT_SYMBOL(__page_table_check_pmd_set); · 5 unmodified lines
250236 void __page_table_check_pud_set(struct mm_struct *mm, unsigned long addr,
251237 pud_t *pudp, pud_t pud)
252238 {
253− pud_t old_pud;
254−
255239 if (&init_mm == mm)
256240 return;
257241
258− old_pud = *pudp;
259− if (pud_user_accessible_page(old_pud)) {
260− page_table_check_clear(mm, addr, pud_pfn(old_pud),
261− PUD_PAGE_SIZE >> PAGE_SHIFT);
262− }
263−
242+ __page_table_check_pud_clear(mm, addr, *pudp);
264243 if (pud_user_accessible_page(pud)) {
265244 page_table_check_set(mm, addr, pud_pfn(pud),
266245 PUD_PAGE_SIZE >> PAGE_SHIFT,
@@ -268,3 +247,23 @@ void __page_table_check_pud_set(struct mm_struct *mm, unsigned long addr, · 1 unmodified line
268247 }
269248 }
270249 EXPORT_SYMBOL(__page_table_check_pud_set);
250+
251+void __page_table_check_pte_clear_range(struct mm_struct *mm,
252+ unsigned long addr,
253+ pmd_t pmd)
254+{
255+ if (&init_mm == mm)
256+ return;
257+
258+ if (!pmd_bad(pmd) && !pmd_leaf(pmd)) {
259+ pte_t *ptep = pte_offset_map(&pmd, addr);
260+ unsigned long i;
261+
262+ pte_unmap(ptep);
263+ for (i = 0; i < PTRS_PER_PTE; i++) {
264+ __page_table_check_pte_clear(mm, addr, *ptep);
265+ addr += PAGE_SIZE;
266+ ptep++;
267+ }
268+ }
269+}
net/ax25/af_ax25.c+16−7
@@ -77,6 +77,7 @@ static void ax25_kill_by_device(struct net_device *dev) · 76 unmodified lines
7777 {
7878 ax25_dev *ax25_dev;
7979 ax25_cb *s;
80+ struct sock *sk;
8081
8182 if ((ax25_dev = ax25_dev_ax25dev(dev)) == NULL)
8283 return;
@@ -85,13 +86,16 @@ static void ax25_kill_by_device(struct net_device *dev) · 2 unmodified lines
8586 again:
8687 ax25_for_each(s, &ax25_list) {
8788 if (s->ax25_dev == ax25_dev) {
89+ sk = s->sk;
90+ sock_hold(sk);
8891 spin_unlock_bh(&ax25_list_lock);
89− lock_sock(s->sk);
92+ lock_sock(sk);
9093 s->ax25_dev = NULL;
91− release_sock(s->sk);
94+ ax25_dev_put(ax25_dev);
95+ release_sock(sk);
9296 ax25_disconnect(s, ENETUNREACH);
9397 spin_lock_bh(&ax25_list_lock);
94−
98+ sock_put(sk);
9599 /* The entry could have been deleted from the
96100 * list meanwhile and thus the next pointer is
97101 * no longer valid. Play it safe and restart
@@ -355,21 +359,25 @@ static int ax25_ctl_ioctl(const unsigned int cmd, void __user *arg) · 257 unmodified lines
355359 if (copy_from_user(&ax25_ctl, arg, sizeof(ax25_ctl)))
356360 return -EFAULT;
357361
358− if ((ax25_dev = ax25_addr_ax25dev(&ax25_ctl.port_addr)) == NULL)
359− return -ENODEV;
360−
361362 if (ax25_ctl.digi_count > AX25_MAX_DIGIS)
362363 return -EINVAL;
363364
364365 if (ax25_ctl.arg > ULONG_MAX / HZ && ax25_ctl.cmd != AX25_KILL)
365366 return -EINVAL;
366367
368+ ax25_dev = ax25_addr_ax25dev(&ax25_ctl.port_addr);
369+ if (!ax25_dev)
370+ return -ENODEV;
371+
367372 digi.ndigi = ax25_ctl.digi_count;
368373 for (k = 0; k < digi.ndigi; k++)
369374 digi.calls[k] = ax25_ctl.digi_addr[k];
370375
371− if ((ax25 = ax25_find_cb(&ax25_ctl.source_addr, &ax25_ctl.dest_addr, &digi, ax25_dev->dev)) == NULL)
376+ ax25 = ax25_find_cb(&ax25_ctl.source_addr, &ax25_ctl.dest_addr, &digi, ax25_dev->dev);
377+ if (!ax25) {
378+ ax25_dev_put(ax25_dev);
372379 return -ENOTCONN;
380+ }
373381
374382 switch (ax25_ctl.cmd) {
375383 case AX25_KILL:
@@ -436,6 +444,7 @@ static int ax25_ctl_ioctl(const unsigned int cmd, void __user *arg) · 60 unmodified lines
436444 }
437445
438446 out_put:
447+ ax25_dev_put(ax25_dev);
439448 ax25_cb_put(ax25);
440449 return ret;
441450
net/ax25/ax25_dev.c+23−5
@@ -37,6 +37,7 @@ ax25_dev *ax25_addr_ax25dev(ax25_address *addr) · 36 unmodified lines
3737 for (ax25_dev = ax25_dev_list; ax25_dev != NULL; ax25_dev = ax25_dev->next)
3838 if (ax25cmp(addr, (const ax25_address *)ax25_dev->dev->dev_addr) == 0) {
3939 res = ax25_dev;
40+ ax25_dev_hold(ax25_dev);
4041 }
4142 spin_unlock_bh(&ax25_dev_lock);
4243
@@ -56,6 +57,7 @@ void ax25_dev_device_up(struct net_device *dev) · 13 unmodified lines
5657 return;
5758 }
5859
60+ refcount_set(&ax25_dev->refcount, 1);
5961 dev->ax25_ptr = ax25_dev;
6062 ax25_dev->dev = dev;
6163 dev_hold_track(dev, &ax25_dev->dev_tracker, GFP_ATOMIC);
@@ -84,6 +86,7 @@ void ax25_dev_device_up(struct net_device *dev) · 22 unmodified lines
8486 ax25_dev->next = ax25_dev_list;
8587 ax25_dev_list = ax25_dev;
8688 spin_unlock_bh(&ax25_dev_lock);
89+ ax25_dev_hold(ax25_dev);
8790
8891 ax25_register_dev_sysctl(ax25_dev);
8992 }
@@ -113,9 +116,10 @@ void ax25_dev_device_down(struct net_device *dev) · 23 unmodified lines
113116 if ((s = ax25_dev_list) == ax25_dev) {
114117 ax25_dev_list = s->next;
115118 spin_unlock_bh(&ax25_dev_lock);
119+ ax25_dev_put(ax25_dev);
116120 dev->ax25_ptr = NULL;
117121 dev_put_track(dev, &ax25_dev->dev_tracker);
118− kfree(ax25_dev);
122+ ax25_dev_put(ax25_dev);
119123 return;
120124 }
121125
@@ -123,9 +127,10 @@ void ax25_dev_device_down(struct net_device *dev) · 1 unmodified line
123127 if (s->next == ax25_dev) {
124128 s->next = ax25_dev->next;
125129 spin_unlock_bh(&ax25_dev_lock);
130+ ax25_dev_put(ax25_dev);
126131 dev->ax25_ptr = NULL;
127132 dev_put_track(dev, &ax25_dev->dev_tracker);
128− kfree(ax25_dev);
133+ ax25_dev_put(ax25_dev);
129134 return;
130135 }
131136
@@ -133,6 +138,7 @@ void ax25_dev_device_down(struct net_device *dev) · 1 unmodified line
133138 }
134139 spin_unlock_bh(&ax25_dev_lock);
135140 dev->ax25_ptr = NULL;
141+ ax25_dev_put(ax25_dev);
136142 }
137143
138144 int ax25_fwd_ioctl(unsigned int cmd, struct ax25_fwd_struct *fwd)
@@ -144,20 +150,32 @@ int ax25_fwd_ioctl(unsigned int cmd, struct ax25_fwd_struct *fwd) · 5 unmodified lines
144150
145151 switch (cmd) {
146152 case SIOCAX25ADDFWD:
147− if ((fwd_dev = ax25_addr_ax25dev(&fwd->port_to)) == NULL)
153+ fwd_dev = ax25_addr_ax25dev(&fwd->port_to);
154+ if (!fwd_dev) {
155+ ax25_dev_put(ax25_dev);
148156 return -EINVAL;
149− if (ax25_dev->forward != NULL)
157+ }
158+ if (ax25_dev->forward) {
159+ ax25_dev_put(fwd_dev);
160+ ax25_dev_put(ax25_dev);
150161 return -EINVAL;
162+ }
151163 ax25_dev->forward = fwd_dev->dev;
164+ ax25_dev_put(fwd_dev);
165+ ax25_dev_put(ax25_dev);
152166 break;
153167
154168 case SIOCAX25DELFWD:
155− if (ax25_dev->forward == NULL)
169+ if (!ax25_dev->forward) {
170+ ax25_dev_put(ax25_dev);
156171 return -EINVAL;
172+ }
157173 ax25_dev->forward = NULL;
174+ ax25_dev_put(ax25_dev);
158175 break;
159176
160177 default:
178+ ax25_dev_put(ax25_dev);
161179 return -EINVAL;
162180 }
163181
net/ax25/ax25_route.c+11−2
@@ -75,11 +75,13 @@ static int __must_check ax25_rt_add(struct ax25_routes_struct *route) · 74 unmodified lines
7575 ax25_dev *ax25_dev;
7676 int i;
7777
78− if ((ax25_dev = ax25_addr_ax25dev(&route->port_addr)) == NULL)
79− return -EINVAL;
8078 if (route->digi_count > AX25_MAX_DIGIS)
8179 return -EINVAL;
8280
81+ ax25_dev = ax25_addr_ax25dev(&route->port_addr);
82+ if (!ax25_dev)
83+ return -EINVAL;
84+
8385 write_lock_bh(&ax25_route_lock);
8486
8587 ax25_rt = ax25_route_list;
@@ -91,6 +93,7 @@ static int __must_check ax25_rt_add(struct ax25_routes_struct *route) · 5 unmodified lines
9193 if (route->digi_count != 0) {
9294 if ((ax25_rt->digipeat = kmalloc(sizeof(ax25_digi), GFP_ATOMIC)) == NULL) {
9395 write_unlock_bh(&ax25_route_lock);
96+ ax25_dev_put(ax25_dev);
9497 return -ENOMEM;
9598 }
9699 ax25_rt->digipeat->lastrepeat = -1;
@@ -101,6 +104,7 @@ static int __must_check ax25_rt_add(struct ax25_routes_struct *route) · 4 unmodified lines
101104 }
102105 }
103106 write_unlock_bh(&ax25_route_lock);
107+ ax25_dev_put(ax25_dev);
104108 return 0;
105109 }
106110 ax25_rt = ax25_rt->next;
@@ -108,6 +112,7 @@ static int __must_check ax25_rt_add(struct ax25_routes_struct *route) · 1 unmodified line
108112
109113 if ((ax25_rt = kmalloc(sizeof(ax25_route), GFP_ATOMIC)) == NULL) {
110114 write_unlock_bh(&ax25_route_lock);
115+ ax25_dev_put(ax25_dev);
111116 return -ENOMEM;
112117 }
113118
@@ -120,6 +125,7 @@ static int __must_check ax25_rt_add(struct ax25_routes_struct *route) · 6 unmodified lines
120125 if ((ax25_rt->digipeat = kmalloc(sizeof(ax25_digi), GFP_ATOMIC)) == NULL) {
121126 write_unlock_bh(&ax25_route_lock);
122127 kfree(ax25_rt);
128+ ax25_dev_put(ax25_dev);
123129 return -ENOMEM;
124130 }
125131 ax25_rt->digipeat->lastrepeat = -1;
@@ -132,6 +138,7 @@ static int __must_check ax25_rt_add(struct ax25_routes_struct *route) · 6 unmodified lines
132138 ax25_rt->next = ax25_route_list;
133139 ax25_route_list = ax25_rt;
134140 write_unlock_bh(&ax25_route_lock);
141+ ax25_dev_put(ax25_dev);
135142
136143 return 0;
137144 }
@@ -173,6 +180,7 @@ static int ax25_rt_del(struct ax25_routes_struct *route) · 35 unmodified lines
173180 }
174181 }
175182 write_unlock_bh(&ax25_route_lock);
183+ ax25_dev_put(ax25_dev);
176184
177185 return 0;
178186 }
@@ -215,6 +223,7 @@ static int ax25_rt_opt(struct ax25_route_opt_struct *rt_option) · 36 unmodified lines
215223
216224 out:
217225 write_unlock_bh(&ax25_route_lock);
226+ ax25_dev_put(ax25_dev);
218227 return err;
219228 }
220229
net/bridge/netfilter/nft_reject_bridge.c+4−4
@@ -49,7 +49,7 @@ static void nft_reject_br_send_v4_tcp_reset(struct net *net, · 48 unmodified lines
4949 {
5050 struct sk_buff *nskb;
5151
52− nskb = nf_reject_skb_v4_tcp_reset(net, oldskb, dev, hook);
52+ nskb = nf_reject_skb_v4_tcp_reset(net, oldskb, NULL, hook);
5353 if (!nskb)
5454 return;
5555
@@ -65,7 +65,7 @@ static void nft_reject_br_send_v4_unreach(struct net *net, · 9 unmodified lines
6565 {
6666 struct sk_buff *nskb;
6767
68− nskb = nf_reject_skb_v4_unreach(net, oldskb, dev, hook, code);
68+ nskb = nf_reject_skb_v4_unreach(net, oldskb, NULL, hook, code);
6969 if (!nskb)
7070 return;
7171
@@ -81,7 +81,7 @@ static void nft_reject_br_send_v6_tcp_reset(struct net *net, · 9 unmodified lines
8181 {
8282 struct sk_buff *nskb;
8383
84− nskb = nf_reject_skb_v6_tcp_reset(net, oldskb, dev, hook);
84+ nskb = nf_reject_skb_v6_tcp_reset(net, oldskb, NULL, hook);
8585 if (!nskb)
8686 return;
8787
@@ -98,7 +98,7 @@ static void nft_reject_br_send_v6_unreach(struct net *net, · 10 unmodified lines
9898 {
9999 struct sk_buff *nskb;
100100
101− nskb = nf_reject_skb_v6_unreach(net, oldskb, dev, hook, code);
101+ nskb = nf_reject_skb_v6_unreach(net, oldskb, NULL, hook, code);
102102 if (!nskb)
103103 return;
104104
net/ceph/ceph_common.c+7−0
@@ -246,6 +246,7 @@ enum { · 245 unmodified lines
246246 Opt_cephx_sign_messages,
247247 Opt_tcp_nodelay,
248248 Opt_abort_on_full,
249+ Opt_rxbounce,
249250 };
250251
251252 enum {
@@ -295,6 +296,7 @@ static const struct fs_parameter_spec ceph_parameters[] = { · 43 unmodified lines
295296 fsparam_u32 ("osdkeepalive", Opt_osdkeepalivetimeout),
296297 fsparam_enum ("read_from_replica", Opt_read_from_replica,
297298 ceph_param_read_from_replica),
299+ fsparam_flag ("rxbounce", Opt_rxbounce),
298300 fsparam_enum ("ms_mode", Opt_ms_mode,
299301 ceph_param_ms_mode),
300302 fsparam_string ("secret", Opt_secret),
@@ -584,6 +586,9 @@ int ceph_parse_param(struct fs_parameter *param, struct ceph_options *opt, · 283 unmodified lines
584586 case Opt_abort_on_full:
585587 opt->flags |= CEPH_OPT_ABORT_ON_FULL;
586588 break;
589+ case Opt_rxbounce:
590+ opt->flags |= CEPH_OPT_RXBOUNCE;
591+ break;
587592
588593 default:
589594 BUG();
@@ -660,6 +665,8 @@ int ceph_print_client_options(struct seq_file *m, struct ceph_client *client, · 70 unmodified lines
660665 seq_puts(m, "notcp_nodelay,");
661666 if (show_all && (opt->flags & CEPH_OPT_ABORT_ON_FULL))
662667 seq_puts(m, "abort_on_full,");
668+ if (opt->flags & CEPH_OPT_RXBOUNCE)
669+ seq_puts(m, "rxbounce,");
663670
664671 if (opt->mount_timeout != CEPH_MOUNT_TIMEOUT_DEFAULT)
665672 seq_printf(m, "mount_timeout=%d,",
net/ceph/messenger.c+4−0
@@ -515,6 +515,10 @@ static void ceph_con_reset_protocol(struct ceph_connection *con) · 514 unmodified lines
515515 ceph_msg_put(con->out_msg);
516516 con->out_msg = NULL;
517517 }
518+ if (con->bounce_page) {
519+ __free_page(con->bounce_page);
520+ con->bounce_page = NULL;
521+ }
518522
519523 if (ceph_msgr2(from_msgr(con->msgr)))
520524 ceph_con_v2_reset_protocol(con);
net/ceph/messenger_v1.c+48−6
@@ -992,8 +992,7 @@ static int read_partial_message_section(struct ceph_connection *con, · 991 unmodified lines
992992
993993 static int read_partial_msg_data(struct ceph_connection *con)
994994 {
995− struct ceph_msg *msg = con->in_msg;
996− struct ceph_msg_data_cursor *cursor = &msg->cursor;
995+ struct ceph_msg_data_cursor *cursor = &con->in_msg->cursor;
997996 bool do_datacrc = !ceph_test_opt(from_msgr(con->msgr), NOCRC);
998997 struct page *page;
999998 size_t page_offset;
@@ -1001,9 +1000,6 @@ static int read_partial_msg_data(struct ceph_connection *con) · 1 unmodified line
10011000 u32 crc = 0;
10021001 int ret;
10031002
1004− if (!msg->num_data_items)
1005− return -EIO;
1006−
10071003 if (do_datacrc)
10081004 crc = con->in_data_crc;
10091005 while (cursor->total_resid) {
@@ -1031,6 +1027,46 @@ static int read_partial_msg_data(struct ceph_connection *con) · 21 unmodified lines
10311027 return 1; /* must return > 0 to indicate success */
10321028 }
10331029
1030+static int read_partial_msg_data_bounce(struct ceph_connection *con)
1031+{
1032+ struct ceph_msg_data_cursor *cursor = &con->in_msg->cursor;
1033+ struct page *page;
1034+ size_t off, len;
1035+ u32 crc;
1036+ int ret;
1037+
1038+ if (unlikely(!con->bounce_page)) {
1039+ con->bounce_page = alloc_page(GFP_NOIO);
1040+ if (!con->bounce_page) {
1041+ pr_err("failed to allocate bounce page\n");
1042+ return -ENOMEM;
1043+ }
1044+ }
1045+
1046+ crc = con->in_data_crc;
1047+ while (cursor->total_resid) {
1048+ if (!cursor->resid) {
1049+ ceph_msg_data_advance(cursor, 0);
1050+ continue;
1051+ }
1052+
1053+ page = ceph_msg_data_next(cursor, &off, &len, NULL);
1054+ ret = ceph_tcp_recvpage(con->sock, con->bounce_page, 0, len);
1055+ if (ret <= 0) {
1056+ con->in_data_crc = crc;
1057+ return ret;
1058+ }
1059+
1060+ crc = crc32c(crc, page_address(con->bounce_page), ret);
1061+ memcpy_to_page(page, off, page_address(con->bounce_page), ret);
1062+
1063+ ceph_msg_data_advance(cursor, ret);
1064+ }
1065+ con->in_data_crc = crc;
1066+
1067+ return 1; /* must return > 0 to indicate success */
1068+}
1069+
10341070 /*
10351071 * read (part of) a message.
10361072 */
@@ -1141,7 +1177,13 @@ static int read_partial_message(struct ceph_connection *con) · 104 unmodified lines
11411177
11421178 /* (page) data */
11431179 if (data_len) {
1144− ret = read_partial_msg_data(con);
1180+ if (!m->num_data_items)
1181+ return -EIO;
1182+
1183+ if (ceph_test_opt(from_msgr(con->msgr), RXBOUNCE))
1184+ ret = read_partial_msg_data_bounce(con);
1185+ else
1186+ ret = read_partial_msg_data(con);
11451187 if (ret <= 0)
11461188 return ret;
11471189 }
net/ceph/messenger_v2.c+186−64
@@ -57,8 +57,9 @@ · 56 unmodified lines
5757 #define IN_S_HANDLE_CONTROL_REMAINDER 3
5858 #define IN_S_PREPARE_READ_DATA 4
5959 #define IN_S_PREPARE_READ_DATA_CONT 5
60−#define IN_S_HANDLE_EPILOGUE 6
61−#define IN_S_FINISH_SKIP 7
60+#define IN_S_PREPARE_READ_ENC_PAGE 6
61+#define IN_S_HANDLE_EPILOGUE 7
62+#define IN_S_FINISH_SKIP 8
6263
6364 #define OUT_S_QUEUE_DATA 1
6465 #define OUT_S_QUEUE_DATA_CONT 2
@@ -1032,22 +1033,41 @@ static int decrypt_control_remainder(struct ceph_connection *con) · 967 unmodified lines
10321033 padded_len(rem_len) + CEPH_GCM_TAG_LEN);
10331034 }
10341035
1035−static int decrypt_message(struct ceph_connection *con)
1036+static int decrypt_tail(struct ceph_connection *con)
10361037 {
1038+ struct sg_table enc_sgt = {};
10371039 struct sg_table sgt = {};
1040+ int tail_len;
10381041 int ret;
10391042
1043+ tail_len = tail_onwire_len(con->in_msg, true);
1044+ ret = sg_alloc_table_from_pages(&enc_sgt, con->v2.in_enc_pages,
1045+ con->v2.in_enc_page_cnt, 0, tail_len,
1046+ GFP_NOIO);
1047+ if (ret)
1048+ goto out;
1049+
10401050 ret = setup_message_sgs(&sgt, con->in_msg, FRONT_PAD(con->v2.in_buf),
10411051 MIDDLE_PAD(con->v2.in_buf), DATA_PAD(con->v2.in_buf),
10421052 con->v2.in_buf, true);
10431053 if (ret)
10441054 goto out;
10451055
1046− ret = gcm_crypt(con, false, sgt.sgl, sgt.sgl,
1047− tail_onwire_len(con->in_msg, true));
1056+ dout("%s con %p msg %p enc_page_cnt %d sg_cnt %d\n", __func__, con,
1057+ con->in_msg, con->v2.in_enc_page_cnt, sgt.orig_nents);
1058+ ret = gcm_crypt(con, false, enc_sgt.sgl, sgt.sgl, tail_len);
1059+ if (ret)
1060+ goto out;
1061+
1062+ WARN_ON(!con->v2.in_enc_page_cnt);
1063+ ceph_release_page_vector(con->v2.in_enc_pages,
1064+ con->v2.in_enc_page_cnt);
1065+ con->v2.in_enc_pages = NULL;
1066+ con->v2.in_enc_page_cnt = 0;
10481067
10491068 out:
10501069 sg_free_table(&sgt);
1070+ sg_free_table(&enc_sgt);
10511071 return ret;
10521072 }
10531073
@@ -1733,54 +1753,157 @@ static int prepare_read_control_remainder(struct ceph_connection *con) · 679 unmodified lines
17331753 return 0;
17341754 }
17351755
1736−static void prepare_read_data(struct ceph_connection *con)
1756+static int prepare_read_data(struct ceph_connection *con)
17371757 {
17381758 struct bio_vec bv;
17391759
1740− if (!con_secure(con))
1741− con->in_data_crc = -1;
1760+ con->in_data_crc = -1;
17421761 ceph_msg_data_cursor_init(&con->v2.in_cursor, con->in_msg,
17431762 data_len(con->in_msg));
17441763
17451764 get_bvec_at(&con->v2.in_cursor, &bv);
1746− set_in_bvec(con, &bv);
1765+ if (ceph_test_opt(from_msgr(con->msgr), RXBOUNCE)) {
1766+ if (unlikely(!con->bounce_page)) {
1767+ con->bounce_page = alloc_page(GFP_NOIO);
1768+ if (!con->bounce_page) {
1769+ pr_err("failed to allocate bounce page\n");
1770+ return -ENOMEM;
1771+ }
1772+ }
1773+
1774+ bv.bv_page = con->bounce_page;
1775+ bv.bv_offset = 0;
1776+ set_in_bvec(con, &bv);
1777+ } else {
1778+ set_in_bvec(con, &bv);
1779+ }
17471780 con->v2.in_state = IN_S_PREPARE_READ_DATA_CONT;
1781+ return 0;
17481782 }
17491783
17501784 static void prepare_read_data_cont(struct ceph_connection *con)
17511785 {
17521786 struct bio_vec bv;
17531787
1754− if (!con_secure(con))
1788+ if (ceph_test_opt(from_msgr(con->msgr), RXBOUNCE)) {
1789+ con->in_data_crc = crc32c(con->in_data_crc,
1790+ page_address(con->bounce_page),
1791+ con->v2.in_bvec.bv_len);
1792+
1793+ get_bvec_at(&con->v2.in_cursor, &bv);
1794+ memcpy_to_page(bv.bv_page, bv.bv_offset,
1795+ page_address(con->bounce_page),
1796+ con->v2.in_bvec.bv_len);
1797+ } else {
17551798 con->in_data_crc = ceph_crc32c_page(con->in_data_crc,
17561799 con->v2.in_bvec.bv_page,
17571800 con->v2.in_bvec.bv_offset,
17581801 con->v2.in_bvec.bv_len);
1802+ }
17591803
17601804 ceph_msg_data_advance(&con->v2.in_cursor, con->v2.in_bvec.bv_len);
17611805 if (con->v2.in_cursor.total_resid) {
17621806 get_bvec_at(&con->v2.in_cursor, &bv);
1763− set_in_bvec(con, &bv);
1807+ if (ceph_test_opt(from_msgr(con->msgr), RXBOUNCE)) {
1808+ bv.bv_page = con->bounce_page;
1809+ bv.bv_offset = 0;
1810+ set_in_bvec(con, &bv);
1811+ } else {
1812+ set_in_bvec(con, &bv);
1813+ }
17641814 WARN_ON(con->v2.in_state != IN_S_PREPARE_READ_DATA_CONT);
17651815 return;
17661816 }
17671817
17681818 /*
1769− * We've read all data. Prepare to read data padding (if any)
1770− * and epilogue.
1819+ * We've read all data. Prepare to read epilogue.
17711820 */
17721821 reset_in_kvecs(con);
1773− if (con_secure(con)) {
1774− if (need_padding(data_len(con->in_msg)))
1775− add_in_kvec(con, DATA_PAD(con->v2.in_buf),
1776− padding_len(data_len(con->in_msg)));
1777− add_in_kvec(con, con->v2.in_buf, CEPH_EPILOGUE_SECURE_LEN);
1822+ add_in_kvec(con, con->v2.in_buf, CEPH_EPILOGUE_PLAIN_LEN);
1823+ con->v2.in_state = IN_S_HANDLE_EPILOGUE;
1824+}
1825+
1826+static int prepare_read_tail_plain(struct ceph_connection *con)
1827+{
1828+ struct ceph_msg *msg = con->in_msg;
1829+
1830+ if (!front_len(msg) && !middle_len(msg)) {
1831+ WARN_ON(!data_len(msg));
1832+ return prepare_read_data(con);
1833+ }
1834+
1835+ reset_in_kvecs(con);
1836+ if (front_len(msg)) {
1837+ add_in_kvec(con, msg->front.iov_base, front_len(msg));
1838+ WARN_ON(msg->front.iov_len != front_len(msg));
1839+ }
1840+ if (middle_len(msg)) {
1841+ add_in_kvec(con, msg->middle->vec.iov_base, middle_len(msg));
1842+ WARN_ON(msg->middle->vec.iov_len != middle_len(msg));
1843+ }
1844+
1845+ if (data_len(msg)) {
1846+ con->v2.in_state = IN_S_PREPARE_READ_DATA;
17781847 } else {
17791848 add_in_kvec(con, con->v2.in_buf, CEPH_EPILOGUE_PLAIN_LEN);
1849+ con->v2.in_state = IN_S_HANDLE_EPILOGUE;
17801850 }
1851+ return 0;
1852+}
1853+
1854+static void prepare_read_enc_page(struct ceph_connection *con)
1855+{
1856+ struct bio_vec bv;
1857+
1858+ dout("%s con %p i %d resid %d\n", __func__, con, con->v2.in_enc_i,
1859+ con->v2.in_enc_resid);
1860+ WARN_ON(!con->v2.in_enc_resid);
1861+
1862+ bv.bv_page = con->v2.in_enc_pages[con->v2.in_enc_i];
1863+ bv.bv_offset = 0;
1864+ bv.bv_len = min(con->v2.in_enc_resid, (int)PAGE_SIZE);
1865+
1866+ set_in_bvec(con, &bv);
1867+ con->v2.in_enc_i++;
1868+ con->v2.in_enc_resid -= bv.bv_len;
1869+
1870+ if (con->v2.in_enc_resid) {
1871+ con->v2.in_state = IN_S_PREPARE_READ_ENC_PAGE;
1872+ return;
1873+ }
1874+
1875+ /*
1876+ * We are set to read the last piece of ciphertext (ending
1877+ * with epilogue) + auth tag.
1878+ */
1879+ WARN_ON(con->v2.in_enc_i != con->v2.in_enc_page_cnt);
17811880 con->v2.in_state = IN_S_HANDLE_EPILOGUE;
17821881 }
17831882
1883+static int prepare_read_tail_secure(struct ceph_connection *con)
1884+{
1885+ struct page **enc_pages;
1886+ int enc_page_cnt;
1887+ int tail_len;
1888+
1889+ tail_len = tail_onwire_len(con->in_msg, true);
1890+ WARN_ON(!tail_len);
1891+
1892+ enc_page_cnt = calc_pages_for(0, tail_len);
1893+ enc_pages = ceph_alloc_page_vector(enc_page_cnt, GFP_NOIO);
1894+ if (IS_ERR(enc_pages))
1895+ return PTR_ERR(enc_pages);
1896+
1897+ WARN_ON(con->v2.in_enc_pages || con->v2.in_enc_page_cnt);
1898+ con->v2.in_enc_pages = enc_pages;
1899+ con->v2.in_enc_page_cnt = enc_page_cnt;
1900+ con->v2.in_enc_resid = tail_len;
1901+ con->v2.in_enc_i = 0;
1902+
1903+ prepare_read_enc_page(con);
1904+ return 0;
1905+}
1906+
17841907 static void __finish_skip(struct ceph_connection *con)
17851908 {
17861909 con->in_seq++;
@@ -2589,47 +2712,26 @@ static int __handle_control(struct ceph_connection *con, void *p) · 802 unmodified lines
25892712 }
25902713
25912714 msg = con->in_msg; /* set in process_message_header() */
2592− if (!front_len(msg) && !middle_len(msg)) {
2593− if (!data_len(msg))
2594− return process_message(con);
2595−
2596− prepare_read_data(con);
2597− return 0;
2598− }
2599−
2600− reset_in_kvecs(con);
26012715 if (front_len(msg)) {
26022716 WARN_ON(front_len(msg) > msg->front_alloc_len);
2603− add_in_kvec(con, msg->front.iov_base, front_len(msg));
26042717 msg->front.iov_len = front_len(msg);
2605−
2606− if (con_secure(con) && need_padding(front_len(msg)))
2607− add_in_kvec(con, FRONT_PAD(con->v2.in_buf),
2608− padding_len(front_len(msg)));
26092718 } else {
26102719 msg->front.iov_len = 0;
26112720 }
26122721 if (middle_len(msg)) {
26132722 WARN_ON(middle_len(msg) > msg->middle->alloc_len);
2614− add_in_kvec(con, msg->middle->vec.iov_base, middle_len(msg));
26152723 msg->middle->vec.iov_len = middle_len(msg);
2616−
2617− if (con_secure(con) && need_padding(middle_len(msg)))
2618− add_in_kvec(con, MIDDLE_PAD(con->v2.in_buf),
2619− padding_len(middle_len(msg)));
26202724 } else if (msg->middle) {
26212725 msg->middle->vec.iov_len = 0;
26222726 }
26232727
2624− if (data_len(msg)) {
2625− con->v2.in_state = IN_S_PREPARE_READ_DATA;
2626− } else {
2627− add_in_kvec(con, con->v2.in_buf,
2628− con_secure(con) ? CEPH_EPILOGUE_SECURE_LEN :
2629− CEPH_EPILOGUE_PLAIN_LEN);
2630− con->v2.in_state = IN_S_HANDLE_EPILOGUE;
2631− }
2632− return 0;
2728+ if (!front_len(msg) && !middle_len(msg) && !data_len(msg))
2729+ return process_message(con);
2730+
2731+ if (con_secure(con))
2732+ return prepare_read_tail_secure(con);
2733+
2734+ return prepare_read_tail_plain(con);
26332735 }
26342736
26352737 static int handle_preamble(struct ceph_connection *con)
@@ -2717,7 +2819,7 @@ static int handle_epilogue(struct ceph_connection *con) · 81 unmodified lines
27172819 int ret;
27182820
27192821 if (con_secure(con)) {
2720− ret = decrypt_message(con);
2822+ ret = decrypt_tail(con);
27212823 if (ret) {
27222824 if (ret == -EBADMSG)
27232825 con->error_msg = "integrity error, bad epilogue auth tag";
@@ -2785,13 +2887,16 @@ static int populate_in_iter(struct ceph_connection *con) · 61 unmodified lines
27852887 ret = handle_control_remainder(con);
27862888 break;
27872889 case IN_S_PREPARE_READ_DATA:
2788− prepare_read_data(con);
2789− ret = 0;
2890+ ret = prepare_read_data(con);
27902891 break;
27912892 case IN_S_PREPARE_READ_DATA_CONT:
27922893 prepare_read_data_cont(con);
27932894 ret = 0;
27942895 break;
2896+ case IN_S_PREPARE_READ_ENC_PAGE:
2897+ prepare_read_enc_page(con);
2898+ ret = 0;
2899+ break;
27952900 case IN_S_HANDLE_EPILOGUE:
27962901 ret = handle_epilogue(con);
27972902 break;
@@ -3326,20 +3431,16 @@ void ceph_con_v2_revoke(struct ceph_connection *con) · 528 unmodified lines
33263431
33273432 static void revoke_at_prepare_read_data(struct ceph_connection *con)
33283433 {
3329− int remaining; /* data + [data padding] + epilogue */
3434+ int remaining;
33303435 int resid;
33313436
3437+ WARN_ON(con_secure(con));
33323438 WARN_ON(!data_len(con->in_msg));
33333439 WARN_ON(!iov_iter_is_kvec(&con->v2.in_iter));
33343440 resid = iov_iter_count(&con->v2.in_iter);
33353441 WARN_ON(!resid);
33363442
3337− if (con_secure(con))
3338− remaining = padded_len(data_len(con->in_msg)) +
3339− CEPH_EPILOGUE_SECURE_LEN;
3340− else
3341− remaining = data_len(con->in_msg) + CEPH_EPILOGUE_PLAIN_LEN;
3342−
3443+ remaining = data_len(con->in_msg) + CEPH_EPILOGUE_PLAIN_LEN;
33433444 dout("%s con %p resid %d remaining %d\n", __func__, con, resid,
33443445 remaining);
33453446 con->v2.in_iter.count -= resid;
@@ -3350,8 +3451,9 @@ static void revoke_at_prepare_read_data(struct ceph_connection *con) · 4 unmodified lines
33503451 static void revoke_at_prepare_read_data_cont(struct ceph_connection *con)
33513452 {
33523453 int recved, resid; /* current piece of data */
3353− int remaining; /* [data padding] + epilogue */
3454+ int remaining;
33543455
3456+ WARN_ON(con_secure(con));
33553457 WARN_ON(!data_len(con->in_msg));
33563458 WARN_ON(!iov_iter_is_bvec(&con->v2.in_iter));
33573459 resid = iov_iter_count(&con->v2.in_iter);
@@ -3363,12 +3465,7 @@ static void revoke_at_prepare_read_data_cont(struct ceph_connection *con) · 5 unmodified lines
33633465 ceph_msg_data_advance(&con->v2.in_cursor, recved);
33643466 WARN_ON(resid > con->v2.in_cursor.total_resid);
33653467
3366− if (con_secure(con))
3367− remaining = padding_len(data_len(con->in_msg)) +
3368− CEPH_EPILOGUE_SECURE_LEN;
3369− else
3370− remaining = CEPH_EPILOGUE_PLAIN_LEN;
3371−
3468+ remaining = CEPH_EPILOGUE_PLAIN_LEN;
33723469 dout("%s con %p total_resid %zu remaining %d\n", __func__, con,
33733470 con->v2.in_cursor.total_resid, remaining);
33743471 con->v2.in_iter.count -= resid;
@@ -3376,11 +3473,26 @@ static void revoke_at_prepare_read_data_cont(struct ceph_connection *con) · 1 unmodified line
33763473 con->v2.in_state = IN_S_FINISH_SKIP;
33773474 }
33783475
3476+static void revoke_at_prepare_read_enc_page(struct ceph_connection *con)
3477+{
3478+ int resid; /* current enc page (not necessarily data) */
3479+
3480+ WARN_ON(!con_secure(con));
3481+ WARN_ON(!iov_iter_is_bvec(&con->v2.in_iter));
3482+ resid = iov_iter_count(&con->v2.in_iter);
3483+ WARN_ON(!resid || resid > con->v2.in_bvec.bv_len);
3484+
3485+ dout("%s con %p resid %d enc_resid %d\n", __func__, con, resid,
3486+ con->v2.in_enc_resid);
3487+ con->v2.in_iter.count -= resid;
3488+ set_in_skip(con, resid + con->v2.in_enc_resid);
3489+ con->v2.in_state = IN_S_FINISH_SKIP;
3490+}
3491+
33793492 static void revoke_at_handle_epilogue(struct ceph_connection *con)
33803493 {
33813494 int resid;
33823495
3383− WARN_ON(!iov_iter_is_kvec(&con->v2.in_iter));
33843496 resid = iov_iter_count(&con->v2.in_iter);
33853497 WARN_ON(!resid);
33863498
@@ -3399,6 +3511,9 @@ void ceph_con_v2_revoke_incoming(struct ceph_connection *con) · 12 unmodified lines
33993511 case IN_S_PREPARE_READ_DATA_CONT:
34003512 revoke_at_prepare_read_data_cont(con);
34013513 break;
3514+ case IN_S_PREPARE_READ_ENC_PAGE:
3515+ revoke_at_prepare_read_enc_page(con);
3516+ break;
34023517 case IN_S_HANDLE_EPILOGUE:
34033518 revoke_at_handle_epilogue(con);
34043519 break;
@@ -3432,6 +3547,13 @@ void ceph_con_v2_reset_protocol(struct ceph_connection *con) · 27 unmodified lines
34323547 clear_out_sign_kvecs(con);
34333548 free_conn_bufs(con);
34343549
3550+ if (con->v2.in_enc_pages) {
3551+ WARN_ON(!con->v2.in_enc_page_cnt);
3552+ ceph_release_page_vector(con->v2.in_enc_pages,
3553+ con->v2.in_enc_page_cnt);
3554+ con->v2.in_enc_pages = NULL;
3555+ con->v2.in_enc_page_cnt = 0;
3556+ }
34353557 if (con->v2.out_enc_pages) {
34363558 WARN_ON(!con->v2.out_enc_page_cnt);
34373559 ceph_release_page_vector(con->v2.out_enc_pages,
net/core/neighbour.c+12−6
@@ -1133,7 +1133,8 @@ out: · 1132 unmodified lines
11331133 neigh_release(neigh);
11341134 }
11351135
1136−int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb)
1136+int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb,
1137+ const bool immediate_ok)
11371138 {
11381139 int rc;
11391140 bool immediate_probe = false;
@@ -1154,12 +1155,17 @@ int __neigh_event_send(struct neighbour *neigh, struct sk_buff *skb) · 14 unmodified lines
11541155 atomic_set(&neigh->probes,
11551156 NEIGH_VAR(neigh->parms, UCAST_PROBES));
11561157 neigh_del_timer(neigh);
1157− neigh->nud_state = NUD_INCOMPLETE;
1158+ neigh->nud_state = NUD_INCOMPLETE;
11581159 neigh->updated = now;
1159− next = now + max(NEIGH_VAR(neigh->parms, RETRANS_TIME),
1160− HZ/100);
1160+ if (!immediate_ok) {
1161+ next = now + 1;
1162+ } else {
1163+ immediate_probe = true;
1164+ next = now + max(NEIGH_VAR(neigh->parms,
1165+ RETRANS_TIME),
1166+ HZ / 100);
1167+ }
11611168 neigh_add_timer(neigh, next);
1162− immediate_probe = true;
11631169 } else {
11641170 neigh->nud_state = NUD_FAILED;
11651171 neigh->updated = jiffies;
@@ -1571,7 +1577,7 @@ static void neigh_managed_work(struct work_struct *work) · 405 unmodified lines
15711577
15721578 write_lock_bh(&tbl->lock);
15731579 list_for_each_entry(neigh, &tbl->managed_list, managed_list)
1574− neigh_event_send(neigh, NULL);
1580+ neigh_event_send_probe(neigh, NULL, false);
15751581 queue_delayed_work(system_power_efficient_wq, &tbl->managed_work,
15761582 NEIGH_VAR(&tbl->parms, DELAY_PROBE_TIME));
15771583 write_unlock_bh(&tbl->lock);
net/core/rtnetlink.c+4−2
@@ -3275,8 +3275,8 @@ static int __rtnl_newlink(struct sk_buff *skb, struct nlmsghdr *nlh, · 3274 unmodified lines
32753275 struct nlattr *slave_attr[RTNL_SLAVE_MAX_TYPE + 1];
32763276 unsigned char name_assign_type = NET_NAME_USER;
32773277 struct nlattr *linkinfo[IFLA_INFO_MAX + 1];
3278− const struct rtnl_link_ops *m_ops = NULL;
3279− struct net_device *master_dev = NULL;
3278+ const struct rtnl_link_ops *m_ops;
3279+ struct net_device *master_dev;
32803280 struct net *net = sock_net(skb->sk);
32813281 const struct rtnl_link_ops *ops;
32823282 struct nlattr *tb[IFLA_MAX + 1];
@@ -3314,6 +3314,8 @@ replay: · 31 unmodified lines
33143314 else
33153315 dev = NULL;
33163316
3317+ master_dev = NULL;
3318+ m_ops = NULL;
33173319 if (dev) {
33183320 master_dev = netdev_master_upper_dev_get(dev);
33193321 if (master_dev)
net/ieee802154/nl802154.c+4−4
@@ -1441,7 +1441,7 @@ static int nl802154_send_key(struct sk_buff *msg, u32 cmd, u32 portid, · 1440 unmodified lines
14411441
14421442 hdr = nl802154hdr_put(msg, portid, seq, flags, cmd);
14431443 if (!hdr)
1444− return -1;
1444+ return -ENOBUFS;
14451445
14461446 if (nla_put_u32(msg, NL802154_ATTR_IFINDEX, dev->ifindex))
14471447 goto nla_put_failure;
@@ -1634,7 +1634,7 @@ static int nl802154_send_device(struct sk_buff *msg, u32 cmd, u32 portid, · 186 unmodified lines
16341634
16351635 hdr = nl802154hdr_put(msg, portid, seq, flags, cmd);
16361636 if (!hdr)
1637− return -1;
1637+ return -ENOBUFS;
16381638
16391639 if (nla_put_u32(msg, NL802154_ATTR_IFINDEX, dev->ifindex))
16401640 goto nla_put_failure;
@@ -1812,7 +1812,7 @@ static int nl802154_send_devkey(struct sk_buff *msg, u32 cmd, u32 portid, · 171 unmodified lines
18121812
18131813 hdr = nl802154hdr_put(msg, portid, seq, flags, cmd);
18141814 if (!hdr)
1815− return -1;
1815+ return -ENOBUFS;
18161816
18171817 if (nla_put_u32(msg, NL802154_ATTR_IFINDEX, dev->ifindex))
18181818 goto nla_put_failure;
@@ -1988,7 +1988,7 @@ static int nl802154_send_seclevel(struct sk_buff *msg, u32 cmd, u32 portid, · 169 unmodified lines
19881988
19891989 hdr = nl802154hdr_put(msg, portid, seq, flags, cmd);
19901990 if (!hdr)
1991− return -1;
1991+ return -ENOBUFS;
19921992
19931993 if (nla_put_u32(msg, NL802154_ATTR_IFINDEX, dev->ifindex))
19941994 goto nla_put_failure;
net/ipv4/netfilter/Kconfig+0−4
@@ -58,10 +58,6 @@ config NF_TABLES_ARP · 57 unmodified lines
5858
5959 endif # NF_TABLES
6060
61−config NF_FLOW_TABLE_IPV4
62− tristate
63− select NF_FLOW_TABLE_INET
64−
6561 config NF_DUP_IPV4
6662 tristate "Netfilter IPv4 packet duplication to alternate destination"
6763 depends on !NF_CONNTRACK || NF_CONNTRACK
net/ipv4/tcp.c+5−2
@@ -1322,10 +1322,13 @@ new_segment: · 1321 unmodified lines
13221322
13231323 /* skb changing from pure zc to mixed, must charge zc */
13241324 if (unlikely(skb_zcopy_pure(skb))) {
1325− if (!sk_wmem_schedule(sk, skb->data_len))
1325+ u32 extra = skb->truesize -
1326+ SKB_TRUESIZE(skb_end_offset(skb));
1327+
1328+ if (!sk_wmem_schedule(sk, extra))
13261329 goto wait_for_space;
13271330
1328− sk_mem_charge(sk, skb->data_len);
1331+ sk_mem_charge(sk, extra);
13291332 skb_shinfo(skb)->flags &= ~SKBFL_PURE_ZEROCOPY;
13301333 }
13311334
net/ipv4/tcp_input.c+2−0
@@ -1660,6 +1660,8 @@ static struct sk_buff *tcp_shift_skb_data(struct sock *sk, struct sk_buff *skb, · 1659 unmodified lines
16601660 (mss != tcp_skb_seglen(skb)))
16611661 goto out;
16621662
1663+ if (!tcp_skb_can_collapse(prev, skb))
1664+ goto out;
16631665 len = skb->len;
16641666 pcount = tcp_skb_pcount(skb);
16651667 if (tcp_skb_shift(prev, skb, pcount, len))
net/ipv6/netfilter/Kconfig+0−4
@@ -47,10 +47,6 @@ config NFT_FIB_IPV6 · 46 unmodified lines
4747 endif # NF_TABLES_IPV6
4848 endif # NF_TABLES
4949
50−config NF_FLOW_TABLE_IPV6
51− tristate
52− select NF_FLOW_TABLE_INET
53−
5450 config NF_DUP_IPV6
5551 tristate "Netfilter IPv6 packet duplication to alternate destination"
5652 depends on !NF_CONNTRACK || NF_CONNTRACK
net/ipv6/netfilter/Makefile+0−3
@@ -28,9 +28,6 @@ obj-$(CONFIG_NFT_REJECT_IPV6) += nft_reject_ipv6.o · 27 unmodified lines
2828 obj-$(CONFIG_NFT_DUP_IPV6) += nft_dup_ipv6.o
2929 obj-$(CONFIG_NFT_FIB_IPV6) += nft_fib_ipv6.o
3030
31−# flow table support
32−obj-$(CONFIG_NF_FLOW_TABLE_IPV6) += nf_flow_table_ipv6.o
33−
3431 # matches
3532 obj-$(CONFIG_IP6_NF_MATCH_AH) += ip6t_ah.o
3633 obj-$(CONFIG_IP6_NF_MATCH_EUI64) += ip6t_eui64.o
net/ipv6/netfilter/nf_flow_table_ipv6.c+0−0

Empty file deleted.

net/netfilter/nf_tables_api.c+0−1
@@ -2011,7 +2011,6 @@ static void nft_last_rule(struct nft_rule_blob *blob, const void *ptr) · 2010 unmodified lines
20112011
20122012 prule = (struct nft_rule_dp *)ptr;
20132013 prule->is_last = 1;
2014− ptr += offsetof(struct nft_rule_dp, data);
20152014 /* blob size does not include the trailer rule */
20162015 }
20172016
net/netfilter/nft_byteorder.c+12−0
@@ -167,12 +167,24 @@ nla_put_failure: · 166 unmodified lines
167167 return -1;
168168 }
169169
170+static bool nft_byteorder_reduce(struct nft_regs_track *track,
171+ const struct nft_expr *expr)
172+{
173+ struct nft_byteorder *priv = nft_expr_priv(expr);
174+
175+ track->regs[priv->dreg].selector = NULL;
176+ track->regs[priv->dreg].bitwise = NULL;
177+
178+ return false;
179+}
180+
170181 static const struct nft_expr_ops nft_byteorder_ops = {
171182 .type = &nft_byteorder_type,
172183 .size = NFT_EXPR_SIZE(sizeof(struct nft_byteorder)),
173184 .eval = nft_byteorder_eval,
174185 .init = nft_byteorder_init,
175186 .dump = nft_byteorder_dump,
187+ .reduce = nft_byteorder_reduce,
176188 };
177189
178190 struct nft_expr_type nft_byteorder_type __read_mostly = {
net/netfilter/nft_ct.c+4−1
@@ -260,9 +260,12 @@ static void nft_ct_set_zone_eval(const struct nft_expr *expr, · 259 unmodified lines
260260 ct = this_cpu_read(nft_ct_pcpu_template);
261261
262262 if (likely(refcount_read(&ct->ct_general.use) == 1)) {
263+ refcount_inc(&ct->ct_general.use);
263264 nf_ct_zone_add(ct, &zone);
264265 } else {
265− /* previous skb got queued to userspace */
266+ /* previous skb got queued to userspace, allocate temporary
267+ * one until percpu template can be reused.
268+ */
266269 ct = nf_ct_tmpl_alloc(nft_net(pkt), &zone, GFP_ATOMIC);
267270 if (!ct) {
268271 regs->verdict.code = NF_DROP;
net/packet/af_packet.c+6−2
@@ -1789,7 +1789,10 @@ static int fanout_add(struct sock *sk, struct fanout_args *args) · 1788 unmodified lines
17891789 err = -ENOSPC;
17901790 if (refcount_read(&match->sk_ref) < match->max_num_members) {
17911791 __dev_remove_pack(&po->prot_hook);
1792− po->fanout = match;
1792+
1793+ /* Paired with packet_setsockopt(PACKET_FANOUT_DATA) */
1794+ WRITE_ONCE(po->fanout, match);
1795+
17931796 po->rollover = rollover;
17941797 rollover = NULL;
17951798 refcount_set(&match->sk_ref, refcount_read(&match->sk_ref) + 1);
@@ -3934,7 +3937,8 @@ packet_setsockopt(struct socket *sock, int level, int optname, sockptr_t optval, · 2138 unmodified lines
39343937 }
39353938 case PACKET_FANOUT_DATA:
39363939 {
3937− if (!po->fanout)
3940+ /* Paired with the WRITE_ONCE() in fanout_add() */
3941+ if (!READ_ONCE(po->fanout))
39383942 return -EINVAL;
39393943
39403944 return fanout_set_data(po, optval, optlen);
net/sched/cls_api.c+7−4
@@ -1945,9 +1945,9 @@ static int tc_new_tfilter(struct sk_buff *skb, struct nlmsghdr *n, · 1944 unmodified lines
19451945 bool prio_allocate;
19461946 u32 parent;
19471947 u32 chain_index;
1948− struct Qdisc *q = NULL;
1948+ struct Qdisc *q;
19491949 struct tcf_chain_info chain_info;
1950− struct tcf_chain *chain = NULL;
1950+ struct tcf_chain *chain;
19511951 struct tcf_block *block;
19521952 struct tcf_proto *tp;
19531953 unsigned long cl;
@@ -1976,6 +1976,8 @@ replay: · 22 unmodified lines
19761976 tp = NULL;
19771977 cl = 0;
19781978 block = NULL;
1979+ q = NULL;
1980+ chain = NULL;
19791981 flags = 0;
19801982
19811983 if (prio == 0) {
@@ -2798,8 +2800,8 @@ static int tc_ctl_chain(struct sk_buff *skb, struct nlmsghdr *n, · 816 unmodified lines
27982800 struct tcmsg *t;
27992801 u32 parent;
28002802 u32 chain_index;
2801− struct Qdisc *q = NULL;
2802− struct tcf_chain *chain = NULL;
2803+ struct Qdisc *q;
2804+ struct tcf_chain *chain;
28032805 struct tcf_block *block;
28042806 unsigned long cl;
28052807 int err;
@@ -2809,6 +2811,7 @@ static int tc_ctl_chain(struct sk_buff *skb, struct nlmsghdr *n, · 3 unmodified lines
28092811 return -EPERM;
28102812
28112813 replay:
2814+ q = NULL;
28122815 err = nlmsg_parse_deprecated(n, sizeof(*t), tca, TCA_MAX,
28132816 rtm_tca_policy, extack);
28142817 if (err < 0)
net/smc/af_smc.c+118−15
@@ -566,17 +566,115 @@ static void smc_stat_fallback(struct smc_sock *smc) · 565 unmodified lines
566566 mutex_unlock(&net->smc.mutex_fback_rsn);
567567 }
568568
569+/* must be called under rcu read lock */
570+static void smc_fback_wakeup_waitqueue(struct smc_sock *smc, void *key)
571+{
572+ struct socket_wq *wq;
573+ __poll_t flags;
574+
575+ wq = rcu_dereference(smc->sk.sk_wq);
576+ if (!skwq_has_sleeper(wq))
577+ return;
578+
579+ /* wake up smc sk->sk_wq */
580+ if (!key) {
581+ /* sk_state_change */
582+ wake_up_interruptible_all(&wq->wait);
583+ } else {
584+ flags = key_to_poll(key);
585+ if (flags & (EPOLLIN | EPOLLOUT))
586+ /* sk_data_ready or sk_write_space */
587+ wake_up_interruptible_sync_poll(&wq->wait, flags);
588+ else if (flags & EPOLLERR)
589+ /* sk_error_report */
590+ wake_up_interruptible_poll(&wq->wait, flags);
591+ }
592+}
593+
594+static int smc_fback_mark_woken(wait_queue_entry_t *wait,
595+ unsigned int mode, int sync, void *key)
596+{
597+ struct smc_mark_woken *mark =
598+ container_of(wait, struct smc_mark_woken, wait_entry);
599+
600+ mark->woken = true;
601+ mark->key = key;
602+ return 0;
603+}
604+
605+static void smc_fback_forward_wakeup(struct smc_sock *smc, struct sock *clcsk,
606+ void (*clcsock_callback)(struct sock *sk))
607+{
608+ struct smc_mark_woken mark = { .woken = false };
609+ struct socket_wq *wq;
610+
611+ init_waitqueue_func_entry(&mark.wait_entry,
612+ smc_fback_mark_woken);
613+ rcu_read_lock();
614+ wq = rcu_dereference(clcsk->sk_wq);
615+ if (!wq)
616+ goto out;
617+ add_wait_queue(sk_sleep(clcsk), &mark.wait_entry);
618+ clcsock_callback(clcsk);
619+ remove_wait_queue(sk_sleep(clcsk), &mark.wait_entry);
620+
621+ if (mark.woken)
622+ smc_fback_wakeup_waitqueue(smc, mark.key);
623+out:
624+ rcu_read_unlock();
625+}
626+
627+static void smc_fback_state_change(struct sock *clcsk)
628+{
629+ struct smc_sock *smc =
630+ smc_clcsock_user_data(clcsk);
631+
632+ if (!smc)
633+ return;
634+ smc_fback_forward_wakeup(smc, clcsk, smc->clcsk_state_change);
635+}
636+
637+static void smc_fback_data_ready(struct sock *clcsk)
638+{
639+ struct smc_sock *smc =
640+ smc_clcsock_user_data(clcsk);
641+
642+ if (!smc)
643+ return;
644+ smc_fback_forward_wakeup(smc, clcsk, smc->clcsk_data_ready);
645+}
646+
647+static void smc_fback_write_space(struct sock *clcsk)
648+{
649+ struct smc_sock *smc =
650+ smc_clcsock_user_data(clcsk);
651+
652+ if (!smc)
653+ return;
654+ smc_fback_forward_wakeup(smc, clcsk, smc->clcsk_write_space);
655+}
656+
657+static void smc_fback_error_report(struct sock *clcsk)
658+{
659+ struct smc_sock *smc =
660+ smc_clcsock_user_data(clcsk);
661+
662+ if (!smc)
663+ return;
664+ smc_fback_forward_wakeup(smc, clcsk, smc->clcsk_error_report);
665+}
666+
569667 static int smc_switch_to_fallback(struct smc_sock *smc, int reason_code)
570668 {
571− wait_queue_head_t *smc_wait = sk_sleep(&smc->sk);
572− wait_queue_head_t *clc_wait;
573− unsigned long flags;
669+ struct sock *clcsk;
574670
575671 mutex_lock(&smc->clcsock_release_lock);
576672 if (!smc->clcsock) {
577673 mutex_unlock(&smc->clcsock_release_lock);
578674 return -EBADF;
579675 }
676+ clcsk = smc->clcsock->sk;
677+
580678 smc->use_fallback = true;
581679 smc->fallback_rsn = reason_code;
582680 smc_stat_fallback(smc);
@@ -587,16 +685,22 @@ static int smc_switch_to_fallback(struct smc_sock *smc, int reason_code) · 4 unmodified lines
587685 smc->clcsock->wq.fasync_list =
588686 smc->sk.sk_socket->wq.fasync_list;
589687
590− /* There may be some entries remaining in
591− * smc socket->wq, which should be removed
592− * to clcsocket->wq during the fallback.
688+ /* There might be some wait entries remaining
689+ * in smc sk->sk_wq and they should be woken up
690+ * as clcsock's wait queue is woken up.
593691 */
594− clc_wait = sk_sleep(smc->clcsock->sk);
595− spin_lock_irqsave(&smc_wait->lock, flags);
596− spin_lock_nested(&clc_wait->lock, SINGLE_DEPTH_NESTING);
597− list_splice_init(&smc_wait->head, &clc_wait->head);
598− spin_unlock(&clc_wait->lock);
599− spin_unlock_irqrestore(&smc_wait->lock, flags);
692+ smc->clcsk_state_change = clcsk->sk_state_change;
693+ smc->clcsk_data_ready = clcsk->sk_data_ready;
694+ smc->clcsk_write_space = clcsk->sk_write_space;
695+ smc->clcsk_error_report = clcsk->sk_error_report;
696+
697+ clcsk->sk_state_change = smc_fback_state_change;
698+ clcsk->sk_data_ready = smc_fback_data_ready;
699+ clcsk->sk_write_space = smc_fback_write_space;
700+ clcsk->sk_error_report = smc_fback_error_report;
701+
702+ smc->clcsock->sk->sk_user_data =
703+ (void *)((uintptr_t)smc | SK_USER_DATA_NOCOPY);
600704 }
601705 mutex_unlock(&smc->clcsock_release_lock);
602706 return 0;
@@ -2115,10 +2219,9 @@ out: · 1512 unmodified lines
21152219
21162220 static void smc_clcsock_data_ready(struct sock *listen_clcsock)
21172221 {
2118− struct smc_sock *lsmc;
2222+ struct smc_sock *lsmc =
2223+ smc_clcsock_user_data(listen_clcsock);
21192224
2120− lsmc = (struct smc_sock *)
2121− ((uintptr_t)listen_clcsock->sk_user_data & ~SK_USER_DATA_NOCOPY);
21222225 if (!lsmc)
21232226 return;
21242227 lsmc->clcsk_data_ready(listen_clcsock);
net/smc/smc.h+19−1
@@ -139,6 +139,12 @@ enum smc_urg_state { · 138 unmodified lines
139139 SMC_URG_READ = 3, /* data was already read */
140140 };
141141
142+struct smc_mark_woken {
143+ bool woken;
144+ void *key;
145+ wait_queue_entry_t wait_entry;
146+};
147+
142148 struct smc_connection {
143149 struct rb_node alert_node;
144150 struct smc_link_group *lgr; /* link group of connection */
@@ -228,8 +234,14 @@ struct smc_connection { · 83 unmodified lines
228234 struct smc_sock { /* smc sock container */
229235 struct sock sk;
230236 struct socket *clcsock; /* internal tcp socket */
237+ void (*clcsk_state_change)(struct sock *sk);
238+ /* original stat_change fct. */
231239 void (*clcsk_data_ready)(struct sock *sk);
232− /* original data_ready fct. **/
240+ /* original data_ready fct. */
241+ void (*clcsk_write_space)(struct sock *sk);
242+ /* original write_space fct. */
243+ void (*clcsk_error_report)(struct sock *sk);
244+ /* original error_report fct. */
233245 struct smc_connection conn; /* smc connection */
234246 struct smc_sock *listen_smc; /* listen parent */
235247 struct work_struct connect_work; /* handle non-blocking connect*/
@@ -264,6 +276,12 @@ static inline struct smc_sock *smc_sk(const struct sock *sk) · 28 unmodified lines
264276 return (struct smc_sock *)sk;
265277 }
266278
279+static inline struct smc_sock *smc_clcsock_user_data(struct sock *clcsk)
280+{
281+ return (struct smc_sock *)
282+ ((uintptr_t)clcsk->sk_user_data & ~SK_USER_DATA_NOCOPY);
283+}
284+
267285 extern struct workqueue_struct *smc_hs_wq; /* wq for handshake work */
268286 extern struct workqueue_struct *smc_close_wq; /* wq for close work */
269287
net/smc/smc_diag.c+0−2
@@ -146,13 +146,11 @@ static int __smc_diag_dump(struct sock *sk, struct sk_buff *skb, · 145 unmodified lines
146146 (req->diag_ext & (1 << (SMC_DIAG_LGRINFO - 1))) &&
147147 !list_empty(&smc->conn.lgr->list)) {
148148 struct smc_link *link = smc->conn.lnk;
149− struct net *net = read_pnet(&link->smcibdev->ibdev->coredev.rdma_net);
150149
151150 struct smc_diag_lgrinfo linfo = {
152151 .role = smc->conn.lgr->role,
153152 .lnk[0].ibport = link->ibport,
154153 .lnk[0].link_id = link->link_id,
155− .lnk[0].net_cookie = net->net_cookie,
156154 };
157155
158156 memcpy(linfo.lnk[0].ibname,
security/selinux/ss/conditional.c+2−1
@@ -152,6 +152,8 @@ static void cond_list_destroy(struct policydb *p) · 151 unmodified lines
152152 for (i = 0; i < p->cond_list_len; i++)
153153 cond_node_destroy(&p->cond_list[i]);
154154 kfree(p->cond_list);
155+ p->cond_list = NULL;
156+ p->cond_list_len = 0;
155157 }
156158
157159 void cond_policydb_destroy(struct policydb *p)
@@ -441,7 +443,6 @@ int cond_read_list(struct policydb *p, void *fp) · 283 unmodified lines
441443 return 0;
442444 err:
443445 cond_list_destroy(p);
444− p->cond_list = NULL;
445446 return rc;
446447 }
447448
sound/core/pcm_native.c+13−0
@@ -172,6 +172,19 @@ unsigned long _snd_pcm_stream_lock_irqsave(struct snd_pcm_substream *substream) · 171 unmodified lines
172172 }
173173 EXPORT_SYMBOL_GPL(_snd_pcm_stream_lock_irqsave);
174174
175+unsigned long _snd_pcm_stream_lock_irqsave_nested(struct snd_pcm_substream *substream)
176+{
177+ unsigned long flags = 0;
178+ if (substream->pcm->nonatomic)
179+ mutex_lock_nested(&substream->self_group.mutex,
180+ SINGLE_DEPTH_NESTING);
181+ else
182+ spin_lock_irqsave_nested(&substream->self_group.lock, flags,
183+ SINGLE_DEPTH_NESTING);
184+ return flags;
185+}
186+EXPORT_SYMBOL_GPL(_snd_pcm_stream_lock_irqsave_nested);
187+
175188 /**
176189 * snd_pcm_stream_unlock_irqrestore - Unlock the PCM stream
177190 * @substream: PCM substream
sound/hda/intel-sdw-acpi.c+3−4
@@ -50,11 +50,11 @@ static bool is_link_enabled(struct fwnode_handle *fw_node, int i) · 49 unmodified lines
5050 static int
5151 sdw_intel_scan_controller(struct sdw_intel_acpi_info *info)
5252 {
53− struct acpi_device *adev;
53+ struct acpi_device *adev = acpi_fetch_acpi_dev(info->handle);
5454 int ret, i;
5555 u8 count;
5656
57− if (acpi_bus_get_device(info->handle, &adev))
57+ if (!adev)
5858 return -EINVAL;
5959
6060 /* Found controller, find links supported */
@@ -119,7 +119,6 @@ static acpi_status sdw_intel_acpi_cb(acpi_handle handle, u32 level, · 58 unmodified lines
119119 void *cdata, void **return_value)
120120 {
121121 struct sdw_intel_acpi_info *info = cdata;
122− struct acpi_device *adev;
123122 acpi_status status;
124123 u64 adr;
125124
@@ -127,7 +126,7 @@ static acpi_status sdw_intel_acpi_cb(acpi_handle handle, u32 level, · 1 unmodified line
127126 if (ACPI_FAILURE(status))
128127 return AE_OK; /* keep going */
129128
130− if (acpi_bus_get_device(handle, &adev)) {
129+ if (!acpi_fetch_acpi_dev(handle)) {
131130 pr_err("%s: Couldn't find ACPI handle\n", __func__);
132131 return AE_NOT_FOUND;
133132 }
sound/pci/hda/hda_auto_parser.c+1−1
@@ -981,7 +981,7 @@ void snd_hda_pick_fixup(struct hda_codec *codec, · 980 unmodified lines
981981 int id = HDA_FIXUP_ID_NOT_SET;
982982 const char *name = NULL;
983983 const char *type = NULL;
984− int vendor, device;
984+ unsigned int vendor, device;
985985
986986 if (codec->fixup_id != HDA_FIXUP_ID_NOT_SET)
987987 return;
sound/pci/hda/hda_codec.c+4−0
@@ -3000,6 +3000,10 @@ void snd_hda_codec_shutdown(struct hda_codec *codec) · 2999 unmodified lines
30003000 {
30013001 struct hda_pcm *cpcm;
30023002
3003+ /* Skip the shutdown if codec is not registered */
3004+ if (!codec->registered)
3005+ return;
3006+
30033007 list_for_each_entry(cpcm, &codec->pcm_list_head, list)
30043008 snd_pcm_suspend_all(cpcm->pcm);
30053009
sound/pci/hda/hda_generic.c+15−2
@@ -91,6 +91,12 @@ static void snd_hda_gen_spec_free(struct hda_gen_spec *spec) · 90 unmodified lines
9191 free_kctls(spec);
9292 snd_array_free(&spec->paths);
9393 snd_array_free(&spec->loopback_list);
94+#ifdef CONFIG_SND_HDA_GENERIC_LEDS
95+ if (spec->led_cdevs[LED_AUDIO_MUTE])
96+ led_classdev_unregister(spec->led_cdevs[LED_AUDIO_MUTE]);
97+ if (spec->led_cdevs[LED_AUDIO_MICMUTE])
98+ led_classdev_unregister(spec->led_cdevs[LED_AUDIO_MICMUTE]);
99+#endif
94100 }
95101
96102 /*
@@ -3922,7 +3928,10 @@ static int create_mute_led_cdev(struct hda_codec *codec, · 3825 unmodified lines
39223928 enum led_brightness),
39233929 bool micmute)
39243930 {
3931+ struct hda_gen_spec *spec = codec->spec;
39253932 struct led_classdev *cdev;
3933+ int idx = micmute ? LED_AUDIO_MICMUTE : LED_AUDIO_MUTE;
3934+ int err;
39263935
39273936 cdev = devm_kzalloc(&codec->core.dev, sizeof(*cdev), GFP_KERNEL);
39283937 if (!cdev)
@@ -3932,10 +3941,14 @@ static int create_mute_led_cdev(struct hda_codec *codec, · 3 unmodified lines
39323941 cdev->max_brightness = 1;
39333942 cdev->default_trigger = micmute ? "audio-micmute" : "audio-mute";
39343943 cdev->brightness_set_blocking = callback;
3935− cdev->brightness = ledtrig_audio_get(micmute ? LED_AUDIO_MICMUTE : LED_AUDIO_MUTE);
3944+ cdev->brightness = ledtrig_audio_get(idx);
39363945 cdev->flags = LED_CORE_SUSPENDRESUME;
39373946
3938− return devm_led_classdev_register(&codec->core.dev, cdev);
3947+ err = led_classdev_register(&codec->core.dev, cdev);
3948+ if (err < 0)
3949+ return err;
3950+ spec->led_cdevs[idx] = cdev;
3951+ return 0;
39393952 }
39403953
39413954 /**
sound/pci/hda/hda_generic.h+3−0
@@ -294,6 +294,9 @@ struct hda_gen_spec { · 293 unmodified lines
294294 struct hda_jack_callback *cb);
295295 void (*mic_autoswitch_hook)(struct hda_codec *codec,
296296 struct hda_jack_callback *cb);
297+
298+ /* leds */
299+ struct led_classdev *led_cdevs[NUM_AUDIO_LEDS];
297300 };
298301
299302 /* values for add_stereo_mix_input flag */
sound/pci/hda/patch_realtek.c+55−12
@@ -98,6 +98,7 @@ struct alc_spec { · 97 unmodified lines
9898 unsigned int gpio_mic_led_mask;
9999 struct alc_coef_led mute_led_coef;
100100 struct alc_coef_led mic_led_coef;
101+ struct mutex coef_mutex;
101102
102103 hda_nid_t headset_mic_pin;
103104 hda_nid_t headphone_mic_pin;
@@ -137,8 +138,8 @@ struct alc_spec { · 33 unmodified lines
137138 * COEF access helper functions
138139 */
139140
140−static int alc_read_coefex_idx(struct hda_codec *codec, hda_nid_t nid,
141− unsigned int coef_idx)
141+static int __alc_read_coefex_idx(struct hda_codec *codec, hda_nid_t nid,
142+ unsigned int coef_idx)
142143 {
143144 unsigned int val;
144145
@@ -147,28 +148,61 @@ static int alc_read_coefex_idx(struct hda_codec *codec, hda_nid_t nid, · 2 unmodified lines
147148 return val;
148149 }
149150
151+static int alc_read_coefex_idx(struct hda_codec *codec, hda_nid_t nid,
152+ unsigned int coef_idx)
153+{
154+ struct alc_spec *spec = codec->spec;
155+ unsigned int val;
156+
157+ mutex_lock(&spec->coef_mutex);
158+ val = __alc_read_coefex_idx(codec, nid, coef_idx);
159+ mutex_unlock(&spec->coef_mutex);
160+ return val;
161+}
162+
150163 #define alc_read_coef_idx(codec, coef_idx) \
151164 alc_read_coefex_idx(codec, 0x20, coef_idx)
152165
153−static void alc_write_coefex_idx(struct hda_codec *codec, hda_nid_t nid,
154− unsigned int coef_idx, unsigned int coef_val)
166+static void __alc_write_coefex_idx(struct hda_codec *codec, hda_nid_t nid,
167+ unsigned int coef_idx, unsigned int coef_val)
155168 {
156169 snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_COEF_INDEX, coef_idx);
157170 snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_PROC_COEF, coef_val);
158171 }
159172
173+static void alc_write_coefex_idx(struct hda_codec *codec, hda_nid_t nid,
174+ unsigned int coef_idx, unsigned int coef_val)
175+{
176+ struct alc_spec *spec = codec->spec;
177+
178+ mutex_lock(&spec->coef_mutex);
179+ __alc_write_coefex_idx(codec, nid, coef_idx, coef_val);
180+ mutex_unlock(&spec->coef_mutex);
181+}
182+
160183 #define alc_write_coef_idx(codec, coef_idx, coef_val) \
161184 alc_write_coefex_idx(codec, 0x20, coef_idx, coef_val)
162185
186+static void __alc_update_coefex_idx(struct hda_codec *codec, hda_nid_t nid,
187+ unsigned int coef_idx, unsigned int mask,
188+ unsigned int bits_set)
189+{
190+ unsigned int val = __alc_read_coefex_idx(codec, nid, coef_idx);
191+
192+ if (val != -1)
193+ __alc_write_coefex_idx(codec, nid, coef_idx,
194+ (val & ~mask) | bits_set);
195+}
196+
163197 static void alc_update_coefex_idx(struct hda_codec *codec, hda_nid_t nid,
164198 unsigned int coef_idx, unsigned int mask,
165199 unsigned int bits_set)
166200 {
167− unsigned int val = alc_read_coefex_idx(codec, nid, coef_idx);
201+ struct alc_spec *spec = codec->spec;
168202
169− if (val != -1)
170− alc_write_coefex_idx(codec, nid, coef_idx,
171− (val & ~mask) | bits_set);
203+ mutex_lock(&spec->coef_mutex);
204+ __alc_update_coefex_idx(codec, nid, coef_idx, mask, bits_set);
205+ mutex_unlock(&spec->coef_mutex);
172206 }
173207
174208 #define alc_update_coef_idx(codec, coef_idx, mask, bits_set) \
@@ -201,13 +235,17 @@ struct coef_fw { · 26 unmodified lines
201235 static void alc_process_coef_fw(struct hda_codec *codec,
202236 const struct coef_fw *fw)
203237 {
238+ struct alc_spec *spec = codec->spec;
239+
240+ mutex_lock(&spec->coef_mutex);
204241 for (; fw->nid; fw++) {
205242 if (fw->mask == (unsigned short)-1)
206− alc_write_coefex_idx(codec, fw->nid, fw->idx, fw->val);
243+ __alc_write_coefex_idx(codec, fw->nid, fw->idx, fw->val);
207244 else
208− alc_update_coefex_idx(codec, fw->nid, fw->idx,
209− fw->mask, fw->val);
245+ __alc_update_coefex_idx(codec, fw->nid, fw->idx,
246+ fw->mask, fw->val);
210247 }
248+ mutex_unlock(&spec->coef_mutex);
211249 }
212250
213251 /*
@@ -1153,6 +1191,7 @@ static int alc_alloc_spec(struct hda_codec *codec, hda_nid_t mixer_nid) · 939 unmodified lines
11531191 codec->spdif_status_reset = 1;
11541192 codec->forced_resume = 1;
11551193 codec->patch_ops = alc_patch_ops;
1194+ mutex_init(&spec->coef_mutex);
11561195
11571196 err = alc_codec_rename_from_preset(codec);
11581197 if (err < 0) {
@@ -2125,6 +2164,7 @@ static void alc1220_fixup_gb_x570(struct hda_codec *codec, · 966 unmodified lines
21252164 {
21262165 static const hda_nid_t conn1[] = { 0x0c };
21272166 static const struct coef_fw gb_x570_coefs[] = {
2167+ WRITE_COEF(0x07, 0x03c0),
21282168 WRITE_COEF(0x1a, 0x01c1),
21292169 WRITE_COEF(0x1b, 0x0202),
21302170 WRITE_COEF(0x43, 0x3005),
@@ -2551,7 +2591,8 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = { · 420 unmodified lines
25512591 SND_PCI_QUIRK(0x1458, 0xa002, "Gigabyte EP45-DS3/Z87X-UD3H", ALC889_FIXUP_FRONT_HP_NO_PRESENCE),
25522592 SND_PCI_QUIRK(0x1458, 0xa0b8, "Gigabyte AZ370-Gaming", ALC1220_FIXUP_GB_DUAL_CODECS),
25532593 SND_PCI_QUIRK(0x1458, 0xa0cd, "Gigabyte X570 Aorus Master", ALC1220_FIXUP_GB_X570),
2554− SND_PCI_QUIRK(0x1458, 0xa0ce, "Gigabyte X570 Aorus Xtreme", ALC1220_FIXUP_CLEVO_P950),
2594+ SND_PCI_QUIRK(0x1458, 0xa0ce, "Gigabyte X570 Aorus Xtreme", ALC1220_FIXUP_GB_X570),
2595+ SND_PCI_QUIRK(0x1458, 0xa0d5, "Gigabyte X570S Aorus Master", ALC1220_FIXUP_GB_X570),
25552596 SND_PCI_QUIRK(0x1462, 0x11f7, "MSI-GE63", ALC1220_FIXUP_CLEVO_P950),
25562597 SND_PCI_QUIRK(0x1462, 0x1228, "MSI-GP63", ALC1220_FIXUP_CLEVO_P950),
25572598 SND_PCI_QUIRK(0x1462, 0x1229, "MSI-GP73", ALC1220_FIXUP_CLEVO_P950),
@@ -2626,6 +2667,7 @@ static const struct hda_model_fixup alc882_fixup_models[] = { · 68 unmodified lines
26262667 {.id = ALC882_FIXUP_NO_PRIMARY_HP, .name = "no-primary-hp"},
26272668 {.id = ALC887_FIXUP_ASUS_BASS, .name = "asus-bass"},
26282669 {.id = ALC1220_FIXUP_GB_DUAL_CODECS, .name = "dual-codecs"},
2670+ {.id = ALC1220_FIXUP_GB_X570, .name = "gb-x570"},
26292671 {.id = ALC1220_FIXUP_CLEVO_P950, .name = "clevo-p950"},
26302672 {}
26312673 };
@@ -8969,6 +9011,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { · 6337 unmodified lines
89699011 SND_PCI_QUIRK(0x1043, 0x1e51, "ASUS Zephyrus M15", ALC294_FIXUP_ASUS_GU502_PINS),
89709012 SND_PCI_QUIRK(0x1043, 0x1e8e, "ASUS Zephyrus G15", ALC289_FIXUP_ASUS_GA401),
89719013 SND_PCI_QUIRK(0x1043, 0x1f11, "ASUS Zephyrus G14", ALC289_FIXUP_ASUS_GA401),
9014+ SND_PCI_QUIRK(0x1043, 0x16b2, "ASUS GU603", ALC289_FIXUP_ASUS_GA401),
89729015 SND_PCI_QUIRK(0x1043, 0x3030, "ASUS ZN270IE", ALC256_FIXUP_ASUS_AIO_GPIO2),
89739016 SND_PCI_QUIRK(0x1043, 0x831a, "ASUS P901", ALC269_FIXUP_STEREO_DMIC),
89749017 SND_PCI_QUIRK(0x1043, 0x834a, "ASUS S101", ALC269_FIXUP_STEREO_DMIC),
sound/soc/amd/acp/acp-mach-common.c+2−2
@@ -303,11 +303,11 @@ static const struct snd_soc_dapm_route rt1019_map_lr[] = { · 302 unmodified lines
303303
304304 static struct snd_soc_codec_conf rt1019_conf[] = {
305305 {
306− .dlc = COMP_CODEC_CONF("i2c-10EC1019:00"),
306+ .dlc = COMP_CODEC_CONF("i2c-10EC1019:01"),
307307 .name_prefix = "Left",
308308 },
309309 {
310− .dlc = COMP_CODEC_CONF("i2c-10EC1019:01"),
310+ .dlc = COMP_CODEC_CONF("i2c-10EC1019:00"),
311311 .name_prefix = "Right",
312312 },
313313 };
sound/soc/codecs/cpcap.c+2−0
@@ -1667,6 +1667,8 @@ static int cpcap_codec_probe(struct platform_device *pdev) · 1666 unmodified lines
16671667 {
16681668 struct device_node *codec_node =
16691669 of_get_child_by_name(pdev->dev.parent->of_node, "audio-codec");
1670+ if (!codec_node)
1671+ return -ENODEV;
16701672
16711673 pdev->dev.of_node = codec_node;
16721674
sound/soc/codecs/hdmi-codec.c+1−1
@@ -277,7 +277,7 @@ struct hdmi_codec_priv { · 276 unmodified lines
277277 bool busy;
278278 struct snd_soc_jack *jack;
279279 unsigned int jack_status;
280− u8 iec_status[5];
280+ u8 iec_status[AES_IEC958_STATUS_SIZE];
281281 };
282282
283283 static const struct snd_soc_dapm_widget hdmi_widgets[] = {
sound/soc/codecs/lpass-rx-macro.c+4−4
@@ -2688,8 +2688,8 @@ static uint32_t get_iir_band_coeff(struct snd_soc_component *component, · 2687 unmodified lines
26882688 int reg, b2_reg;
26892689
26902690 /* Address does not automatically update if reading */
2691− reg = CDC_RX_SIDETONE_IIR0_IIR_COEF_B1_CTL + 16 * iir_idx;
2692− b2_reg = CDC_RX_SIDETONE_IIR0_IIR_COEF_B2_CTL + 16 * iir_idx;
2691+ reg = CDC_RX_SIDETONE_IIR0_IIR_COEF_B1_CTL + 0x80 * iir_idx;
2692+ b2_reg = CDC_RX_SIDETONE_IIR0_IIR_COEF_B2_CTL + 0x80 * iir_idx;
26932693
26942694 snd_soc_component_write(component, reg,
26952695 ((band_idx * BAND_MAX + coeff_idx) *
@@ -2718,7 +2718,7 @@ static uint32_t get_iir_band_coeff(struct snd_soc_component *component, · 22 unmodified lines
27182718 static void set_iir_band_coeff(struct snd_soc_component *component,
27192719 int iir_idx, int band_idx, uint32_t value)
27202720 {
2721− int reg = CDC_RX_SIDETONE_IIR0_IIR_COEF_B2_CTL + 16 * iir_idx;
2721+ int reg = CDC_RX_SIDETONE_IIR0_IIR_COEF_B2_CTL + 0x80 * iir_idx;
27222722
27232723 snd_soc_component_write(component, reg, (value & 0xFF));
27242724 snd_soc_component_write(component, reg, (value >> 8) & 0xFF);
@@ -2739,7 +2739,7 @@ static int rx_macro_put_iir_band_audio_mixer( · 14 unmodified lines
27392739 int iir_idx = ctl->iir_idx;
27402740 int band_idx = ctl->band_idx;
27412741 u32 coeff[BAND_MAX];
2742− int reg = CDC_RX_SIDETONE_IIR0_IIR_COEF_B1_CTL + 16 * iir_idx;
2742+ int reg = CDC_RX_SIDETONE_IIR0_IIR_COEF_B1_CTL + 0x80 * iir_idx;
27432743
27442744 memcpy(&coeff[0], ucontrol->value.bytes.data, params->max);
27452745
sound/soc/codecs/max9759.c+2−1
@@ -64,7 +64,8 @@ static int speaker_gain_control_put(struct snd_kcontrol *kcontrol, · 63 unmodified lines
6464 struct snd_soc_component *c = snd_soc_kcontrol_component(kcontrol);
6565 struct max9759 *priv = snd_soc_component_get_drvdata(c);
6666
67− if (ucontrol->value.integer.value[0] > 3)
67+ if (ucontrol->value.integer.value[0] < 0 ||
68+ ucontrol->value.integer.value[0] > 3)
6869 return -EINVAL;
6970
7071 priv->gain = ucontrol->value.integer.value[0];
sound/soc/codecs/rt5682-i2c.c+4−11
@@ -59,18 +59,12 @@ static void rt5682_jd_check_handler(struct work_struct *work) · 58 unmodified lines
5959 struct rt5682_priv *rt5682 = container_of(work, struct rt5682_priv,
6060 jd_check_work.work);
6161
62− if (snd_soc_component_read(rt5682->component, RT5682_AJD1_CTRL)
63− & RT5682_JDH_RS_MASK) {
62+ if (snd_soc_component_read(rt5682->component, RT5682_AJD1_CTRL) & RT5682_JDH_RS_MASK)
6463 /* jack out */
65− rt5682->jack_type = rt5682_headset_detect(rt5682->component, 0);
66−
67− snd_soc_jack_report(rt5682->hs_jack, rt5682->jack_type,
68− SND_JACK_HEADSET |
69− SND_JACK_BTN_0 | SND_JACK_BTN_1 |
70− SND_JACK_BTN_2 | SND_JACK_BTN_3);
71− } else {
64+ mod_delayed_work(system_power_efficient_wq,
65+ &rt5682->jack_detect_work, 0);
66+ else
7267 schedule_delayed_work(&rt5682->jd_check_work, 500);
73− }
7468 }
7569
7670 static irqreturn_t rt5682_irq(int irq, void *data)
@@ -198,7 +192,6 @@ static int rt5682_i2c_probe(struct i2c_client *i2c, · 121 unmodified lines
198192 }
199193
200194 mutex_init(&rt5682->calibrate_mutex);
201− mutex_init(&rt5682->jdet_mutex);
202195 rt5682_calibrate(rt5682);
203196
204197 rt5682_apply_patch_list(rt5682, &i2c->dev);
sound/soc/codecs/rt5682.c+8−16
@@ -922,15 +922,13 @@ static void rt5682_enable_push_button_irq(struct snd_soc_component *component, · 921 unmodified lines
922922 *
923923 * Returns detect status.
924924 */
925−int rt5682_headset_detect(struct snd_soc_component *component, int jack_insert)
925+static int rt5682_headset_detect(struct snd_soc_component *component, int jack_insert)
926926 {
927927 struct rt5682_priv *rt5682 = snd_soc_component_get_drvdata(component);
928928 struct snd_soc_dapm_context *dapm = &component->dapm;
929929 unsigned int val, count;
930930
931931 if (jack_insert) {
932− snd_soc_dapm_mutex_lock(dapm);
933−
934932 snd_soc_component_update_bits(component, RT5682_PWR_ANLG_1,
935933 RT5682_PWR_VREF2 | RT5682_PWR_MB,
936934 RT5682_PWR_VREF2 | RT5682_PWR_MB);
@@ -981,8 +979,6 @@ int rt5682_headset_detect(struct snd_soc_component *component, int jack_insert) · 44 unmodified lines
981979 snd_soc_component_update_bits(component, RT5682_MICBIAS_2,
982980 RT5682_PWR_CLK25M_MASK | RT5682_PWR_CLK1M_MASK,
983981 RT5682_PWR_CLK25M_PU | RT5682_PWR_CLK1M_PU);
984−
985− snd_soc_dapm_mutex_unlock(dapm);
986982 } else {
987983 rt5682_enable_push_button_irq(component, false);
988984 snd_soc_component_update_bits(component, RT5682_CBJ_CTRL_1,
@@ -1011,7 +1007,6 @@ int rt5682_headset_detect(struct snd_soc_component *component, int jack_insert) · 22 unmodified lines
10111007 dev_dbg(component->dev, "jack_type = %d\n", rt5682->jack_type);
10121008 return rt5682->jack_type;
10131009 }
1014−EXPORT_SYMBOL_GPL(rt5682_headset_detect);
10151010
10161011 static int rt5682_set_jack_detect(struct snd_soc_component *component,
10171012 struct snd_soc_jack *hs_jack, void *data)
@@ -1094,6 +1089,7 @@ void rt5682_jack_detect_handler(struct work_struct *work) · 76 unmodified lines
10941089 {
10951090 struct rt5682_priv *rt5682 =
10961091 container_of(work, struct rt5682_priv, jack_detect_work.work);
1092+ struct snd_soc_dapm_context *dapm;
10971093 int val, btn_type;
10981094
10991095 while (!rt5682->component)
@@ -1102,7 +1098,9 @@ void rt5682_jack_detect_handler(struct work_struct *work) · 2 unmodified lines
11021098 while (!rt5682->component->card->instantiated)
11031099 usleep_range(10000, 15000);
11041100
1105− mutex_lock(&rt5682->jdet_mutex);
1101+ dapm = snd_soc_component_get_dapm(rt5682->component);
1102+
1103+ snd_soc_dapm_mutex_lock(dapm);
11061104 mutex_lock(&rt5682->calibrate_mutex);
11071105
11081106 val = snd_soc_component_read(rt5682->component, RT5682_AJD1_CTRL)
@@ -1162,6 +1160,9 @@ void rt5682_jack_detect_handler(struct work_struct *work) · 53 unmodified lines
11621160 rt5682->irq_work_delay_time = 50;
11631161 }
11641162
1163+ mutex_unlock(&rt5682->calibrate_mutex);
1164+ snd_soc_dapm_mutex_unlock(dapm);
1165+
11651166 snd_soc_jack_report(rt5682->hs_jack, rt5682->jack_type,
11661167 SND_JACK_HEADSET |
11671168 SND_JACK_BTN_0 | SND_JACK_BTN_1 |
@@ -1174,9 +1175,6 @@ void rt5682_jack_detect_handler(struct work_struct *work) · 6 unmodified lines
11741175 else
11751176 cancel_delayed_work_sync(&rt5682->jd_check_work);
11761177 }
1177−
1178− mutex_unlock(&rt5682->calibrate_mutex);
1179− mutex_unlock(&rt5682->jdet_mutex);
11801178 }
11811179 EXPORT_SYMBOL_GPL(rt5682_jack_detect_handler);
11821180
@@ -1526,7 +1524,6 @@ static int rt5682_hp_event(struct snd_soc_dapm_widget *w, · 343 unmodified lines
15261524 {
15271525 struct snd_soc_component *component =
15281526 snd_soc_dapm_to_component(w->dapm);
1529− struct rt5682_priv *rt5682 = snd_soc_component_get_drvdata(component);
15301527
15311528 switch (event) {
15321529 case SND_SOC_DAPM_PRE_PMU:
@@ -1538,17 +1535,12 @@ static int rt5682_hp_event(struct snd_soc_dapm_widget *w, · 5 unmodified lines
15381535 RT5682_DEPOP_1, 0x60, 0x60);
15391536 snd_soc_component_update_bits(component,
15401537 RT5682_DAC_ADC_DIG_VOL1, 0x00c0, 0x0080);
1541−
1542− mutex_lock(&rt5682->jdet_mutex);
1543−
15441538 snd_soc_component_update_bits(component, RT5682_HP_CTRL_2,
15451539 RT5682_HP_C2_DAC_L_EN | RT5682_HP_C2_DAC_R_EN,
15461540 RT5682_HP_C2_DAC_L_EN | RT5682_HP_C2_DAC_R_EN);
15471541 usleep_range(5000, 10000);
15481542 snd_soc_component_update_bits(component, RT5682_CHARGE_PUMP_1,
15491543 RT5682_CP_SW_SIZE_MASK, RT5682_CP_SW_SIZE_L);
1550−
1551− mutex_unlock(&rt5682->jdet_mutex);
15521544 break;
15531545
15541546 case SND_SOC_DAPM_POST_PMD:
sound/soc/codecs/rt5682.h+0−2
@@ -1463,7 +1463,6 @@ struct rt5682_priv { · 1462 unmodified lines
14631463
14641464 int jack_type;
14651465 int irq_work_delay_time;
1466− struct mutex jdet_mutex;
14671466 };
14681467
14691468 extern const char *rt5682_supply_names[RT5682_NUM_SUPPLIES];
@@ -1473,7 +1472,6 @@ int rt5682_sel_asrc_clk_src(struct snd_soc_component *component, · 3 unmodified lines
14731472
14741473 void rt5682_apply_patch_list(struct rt5682_priv *rt5682, struct device *dev);
14751474
1476−int rt5682_headset_detect(struct snd_soc_component *component, int jack_insert);
14771475 void rt5682_jack_detect_handler(struct work_struct *work);
14781476
14791477 bool rt5682_volatile_register(struct device *dev, unsigned int reg);
sound/soc/codecs/wcd938x.c+17−14
@@ -1432,14 +1432,10 @@ static int wcd938x_sdw_connect_port(struct wcd938x_sdw_ch_info *ch_info, · 1431 unmodified lines
14321432 return 0;
14331433 }
14341434
1435−static int wcd938x_connect_port(struct wcd938x_sdw_priv *wcd, u8 ch_id, u8 enable)
1435+static int wcd938x_connect_port(struct wcd938x_sdw_priv *wcd, u8 port_num, u8 ch_id, u8 enable)
14361436 {
1437− u8 port_num;
1438−
1439− port_num = wcd->ch_info[ch_id].port_num;
1440−
14411437 return wcd938x_sdw_connect_port(&wcd->ch_info[ch_id],
1442− &wcd->port_config[port_num],
1438+ &wcd->port_config[port_num - 1],
14431439 enable);
14441440 }
14451441
@@ -2563,7 +2559,7 @@ static int wcd938x_ear_pa_put_gain(struct snd_kcontrol *kcontrol, · 1117 unmodified lines
25632559 WCD938X_EAR_GAIN_MASK,
25642560 ucontrol->value.integer.value[0]);
25652561
2566− return 0;
2562+ return 1;
25672563 }
25682564
25692565 static int wcd938x_get_compander(struct snd_kcontrol *kcontrol,
@@ -2593,6 +2589,7 @@ static int wcd938x_set_compander(struct snd_kcontrol *kcontrol, · 23 unmodified lines
25932589 struct wcd938x_priv *wcd938x = snd_soc_component_get_drvdata(component);
25942590 struct wcd938x_sdw_priv *wcd;
25952591 int value = ucontrol->value.integer.value[0];
2592+ int portidx;
25962593 struct soc_mixer_control *mc;
25972594 bool hphr;
25982595
@@ -2606,12 +2603,14 @@ static int wcd938x_set_compander(struct snd_kcontrol *kcontrol, · 7 unmodified lines
26062603 else
26072604 wcd938x->comp1_enable = value;
26082605
2606+ portidx = wcd->ch_info[mc->reg].port_num;
2607+
26092608 if (value)
2610− wcd938x_connect_port(wcd, mc->reg, true);
2609+ wcd938x_connect_port(wcd, portidx, mc->reg, true);
26112610 else
2612− wcd938x_connect_port(wcd, mc->reg, false);
2611+ wcd938x_connect_port(wcd, portidx, mc->reg, false);
26132612
2614− return 0;
2613+ return 1;
26152614 }
26162615
26172616 static int wcd938x_ldoh_get(struct snd_kcontrol *kcontrol,
@@ -2882,9 +2881,11 @@ static int wcd938x_get_swr_port(struct snd_kcontrol *kcontrol, · 264 unmodified lines
28822881 struct wcd938x_sdw_priv *wcd;
28832882 struct soc_mixer_control *mixer = (struct soc_mixer_control *)kcontrol->private_value;
28842883 int dai_id = mixer->shift;
2885− int portidx = mixer->reg;
2884+ int portidx, ch_idx = mixer->reg;
2885+
28862886
28872887 wcd = wcd938x->sdw_priv[dai_id];
2888+ portidx = wcd->ch_info[ch_idx].port_num;
28882889
28892890 ucontrol->value.integer.value[0] = wcd->port_enable[portidx];
28902891
@@ -2899,12 +2900,14 @@ static int wcd938x_set_swr_port(struct snd_kcontrol *kcontrol, · 8 unmodified lines
28992900 struct wcd938x_sdw_priv *wcd;
29002901 struct soc_mixer_control *mixer =
29012902 (struct soc_mixer_control *)kcontrol->private_value;
2902− int portidx = mixer->reg;
2903+ int ch_idx = mixer->reg;
2904+ int portidx;
29032905 int dai_id = mixer->shift;
29042906 bool enable;
29052907
29062908 wcd = wcd938x->sdw_priv[dai_id];
29072909
2910+ portidx = wcd->ch_info[ch_idx].port_num;
29082911 if (ucontrol->value.integer.value[0])
29092912 enable = true;
29102913 else
@@ -2912,9 +2915,9 @@ static int wcd938x_set_swr_port(struct snd_kcontrol *kcontrol, · 1 unmodified line
29122915
29132916 wcd->port_enable[portidx] = enable;
29142917
2915− wcd938x_connect_port(wcd, portidx, enable);
2918+ wcd938x_connect_port(wcd, portidx, ch_idx, enable);
29162919
2917− return 0;
2920+ return 1;
29182921
29192922 }
29202923
sound/soc/fsl/pcm030-audio-fabric.c+8−3
@@ -93,16 +93,21 @@ static int pcm030_fabric_probe(struct platform_device *op) · 92 unmodified lines
9393 dev_err(&op->dev, "platform_device_alloc() failed\n");
9494
9595 ret = platform_device_add(pdata->codec_device);
96− if (ret)
96+ if (ret) {
9797 dev_err(&op->dev, "platform_device_add() failed: %d\n", ret);
98+ platform_device_put(pdata->codec_device);
99+ }
98100
99101 ret = snd_soc_register_card(card);
100− if (ret)
102+ if (ret) {
101103 dev_err(&op->dev, "snd_soc_register_card() failed: %d\n", ret);
104+ platform_device_del(pdata->codec_device);
105+ platform_device_put(pdata->codec_device);
106+ }
102107
103108 platform_set_drvdata(op, pdata);
104−
105109 return ret;
110+
106111 }
107112
108113 static int pcm030_fabric_remove(struct platform_device *op)
sound/soc/generic/simple-card.c+25−1
@@ -28,6 +28,30 @@ static const struct snd_soc_ops simple_ops = { · 27 unmodified lines
2828 .hw_params = asoc_simple_hw_params,
2929 };
3030
31+static int asoc_simple_parse_platform(struct device_node *node,
32+ struct snd_soc_dai_link_component *dlc)
33+{
34+ struct of_phandle_args args;
35+ int ret;
36+
37+ if (!node)
38+ return 0;
39+
40+ /*
41+ * Get node via "sound-dai = <&phandle port>"
42+ * it will be used as xxx_of_node on soc_bind_dai_link()
43+ */
44+ ret = of_parse_phandle_with_args(node, DAI, CELL, 0, &args);
45+ if (ret)
46+ return ret;
47+
48+ /* dai_name is not required and may not exist for plat component */
49+
50+ dlc->of_node = args.np;
51+
52+ return 0;
53+}
54+
3155 static int asoc_simple_parse_dai(struct device_node *node,
3256 struct snd_soc_dai_link_component *dlc,
3357 int *is_single_link)
@@ -289,7 +313,7 @@ static int simple_dai_link_of(struct asoc_simple_priv *priv, · 255 unmodified lines
289313 if (ret < 0)
290314 goto dai_link_of_err;
291315
292− ret = asoc_simple_parse_dai(plat, platforms, NULL);
316+ ret = asoc_simple_parse_platform(plat, platforms);
293317 if (ret < 0)
294318 goto dai_link_of_err;
295319
sound/soc/mediatek/Kconfig+1−1
@@ -216,7 +216,7 @@ config SND_SOC_MT8195_MT6359_RT1019_RT5682 · 215 unmodified lines
216216
217217 config SND_SOC_MT8195_MT6359_RT1011_RT5682
218218 tristate "ASoC Audio driver for MT8195 with MT6359 RT1011 RT5682 codec"
219− depends on I2C
219+ depends on I2C && GPIOLIB
220220 depends on SND_SOC_MT8195 && MTK_PMIC_WRAP
221221 select SND_SOC_MT6359
222222 select SND_SOC_RT1011
sound/soc/qcom/qdsp6/q6apm-dai.c+5−2
@@ -308,8 +308,11 @@ static int q6apm_dai_close(struct snd_soc_component *component, · 307 unmodified lines
308308 struct snd_pcm_runtime *runtime = substream->runtime;
309309 struct q6apm_dai_rtd *prtd = runtime->private_data;
310310
311− q6apm_graph_stop(prtd->graph);
312− q6apm_unmap_memory_regions(prtd->graph, substream->stream);
311+ if (prtd->state) { /* only stop graph that is started */
312+ q6apm_graph_stop(prtd->graph);
313+ q6apm_unmap_memory_regions(prtd->graph, substream->stream);
314+ }
315+
313316 q6apm_graph_close(prtd->graph);
314317 prtd->graph = NULL;
315318 kfree(prtd);
sound/soc/soc-acpi.c+2−5
@@ -55,16 +55,13 @@ EXPORT_SYMBOL_GPL(snd_soc_acpi_find_machine); · 54 unmodified lines
5555 static acpi_status snd_soc_acpi_find_package(acpi_handle handle, u32 level,
5656 void *context, void **ret)
5757 {
58− struct acpi_device *adev;
58+ struct acpi_device *adev = acpi_fetch_acpi_dev(handle);
5959 acpi_status status;
6060 struct snd_soc_acpi_package_context *pkg_ctx = context;
6161
6262 pkg_ctx->data_valid = false;
6363
64− if (acpi_bus_get_device(handle, &adev))
65− return AE_OK;
66−
67− if (adev->status.present && adev->status.functional) {
64+ if (adev && adev->status.present && adev->status.functional) {
6865 struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
6966 union acpi_object *myobj = NULL;
7067
sound/soc/soc-ops.c+26−3
@@ -316,13 +316,27 @@ int snd_soc_put_volsw(struct snd_kcontrol *kcontrol, · 315 unmodified lines
316316 if (sign_bit)
317317 mask = BIT(sign_bit + 1) - 1;
318318
319− val = ((ucontrol->value.integer.value[0] + min) & mask);
319+ if (ucontrol->value.integer.value[0] < 0)
320+ return -EINVAL;
321+ val = ucontrol->value.integer.value[0];
322+ if (mc->platform_max && val > mc->platform_max)
323+ return -EINVAL;
324+ if (val > max - min)
325+ return -EINVAL;
326+ val = (val + min) & mask;
320327 if (invert)
321328 val = max - val;
322329 val_mask = mask << shift;
323330 val = val << shift;
324331 if (snd_soc_volsw_is_stereo(mc)) {
325− val2 = ((ucontrol->value.integer.value[1] + min) & mask);
332+ if (ucontrol->value.integer.value[1] < 0)
333+ return -EINVAL;
334+ val2 = ucontrol->value.integer.value[1];
335+ if (mc->platform_max && val2 > mc->platform_max)
336+ return -EINVAL;
337+ if (val2 > max - min)
338+ return -EINVAL;
339+ val2 = (val2 + min) & mask;
326340 if (invert)
327341 val2 = max - val2;
328342 if (reg == reg2) {
@@ -409,8 +423,15 @@ int snd_soc_put_volsw_sx(struct snd_kcontrol *kcontrol, · 80 unmodified lines
409423 int err = 0;
410424 unsigned int val, val_mask;
411425
426+ if (ucontrol->value.integer.value[0] < 0)
427+ return -EINVAL;
428+ val = ucontrol->value.integer.value[0];
429+ if (mc->platform_max && val > mc->platform_max)
430+ return -EINVAL;
431+ if (val > max - min)
432+ return -EINVAL;
412433 val_mask = mask << shift;
413− val = (ucontrol->value.integer.value[0] + min) & mask;
434+ val = (val + min) & mask;
414435 val = val << shift;
415436
416437 err = snd_soc_component_update_bits(component, reg, val_mask, val);
@@ -858,6 +879,8 @@ int snd_soc_put_xr_sx(struct snd_kcontrol *kcontrol, · 441 unmodified lines
858879 long val = ucontrol->value.integer.value[0];
859880 unsigned int i;
860881
882+ if (val < mc->min || val > mc->max)
883+ return -EINVAL;
861884 if (invert)
862885 val = max - val;
863886 val &= mask;
sound/soc/soc-pcm.c+12−6
@@ -46,8 +46,8 @@ static inline void snd_soc_dpcm_stream_lock_irq(struct snd_soc_pcm_runtime *rtd, · 45 unmodified lines
4646 snd_pcm_stream_lock_irq(snd_soc_dpcm_get_substream(rtd, stream));
4747 }
4848
49−#define snd_soc_dpcm_stream_lock_irqsave(rtd, stream, flags) \
50− snd_pcm_stream_lock_irqsave(snd_soc_dpcm_get_substream(rtd, stream), flags)
49+#define snd_soc_dpcm_stream_lock_irqsave_nested(rtd, stream, flags) \
50+ snd_pcm_stream_lock_irqsave_nested(snd_soc_dpcm_get_substream(rtd, stream), flags)
5151
5252 static inline void snd_soc_dpcm_stream_unlock_irq(struct snd_soc_pcm_runtime *rtd,
5353 int stream)
@@ -1268,6 +1268,7 @@ static void dpcm_be_reparent(struct snd_soc_pcm_runtime *fe, · 1214 unmodified lines
12681268 void dpcm_be_disconnect(struct snd_soc_pcm_runtime *fe, int stream)
12691269 {
12701270 struct snd_soc_dpcm *dpcm, *d;
1271+ LIST_HEAD(deleted_dpcms);
12711272
12721273 snd_soc_dpcm_mutex_assert_held(fe);
12731274
@@ -1287,13 +1288,18 @@ void dpcm_be_disconnect(struct snd_soc_pcm_runtime *fe, int stream) · 13 unmodified lines
12871288 /* BEs still alive need new FE */
12881289 dpcm_be_reparent(fe, dpcm->be, stream);
12891290
1290− dpcm_remove_debugfs_state(dpcm);
1291−
12921291 list_del(&dpcm->list_be);
1292+ list_move(&dpcm->list_fe, &deleted_dpcms);
1293+ }
1294+ snd_soc_dpcm_stream_unlock_irq(fe, stream);
1295+
1296+ while (!list_empty(&deleted_dpcms)) {
1297+ dpcm = list_first_entry(&deleted_dpcms, struct snd_soc_dpcm,
1298+ list_fe);
12931299 list_del(&dpcm->list_fe);
1300+ dpcm_remove_debugfs_state(dpcm);
12941301 kfree(dpcm);
12951302 }
1296− snd_soc_dpcm_stream_unlock_irq(fe, stream);
12971303 }
12981304
12991305 /* get BE for DAI widget and stream */
@@ -2094,7 +2100,7 @@ int dpcm_be_dai_trigger(struct snd_soc_pcm_runtime *fe, int stream, · 794 unmodified lines
20942100 be = dpcm->be;
20952101 be_substream = snd_soc_dpcm_get_substream(be, stream);
20962102
2097− snd_soc_dpcm_stream_lock_irqsave(be, stream, flags);
2103+ snd_soc_dpcm_stream_lock_irqsave_nested(be, stream, flags);
20982104
20992105 /* is this op for this BE ? */
21002106 if (!snd_soc_dpcm_be_can_update(fe, be, stream))
sound/soc/xilinx/xlnx_formatter_pcm.c+24−3
@@ -37,6 +37,7 @@ · 36 unmodified lines
3737 #define XLNX_AUD_XFER_COUNT 0x28
3838 #define XLNX_AUD_CH_STS_START 0x2C
3939 #define XLNX_BYTES_PER_CH 0x44
40+#define XLNX_AUD_ALIGN_BYTES 64
4041
4142 #define AUD_STS_IOC_IRQ_MASK BIT(31)
4243 #define AUD_STS_CH_STS_MASK BIT(29)
@@ -368,12 +369,32 @@ static int xlnx_formatter_pcm_open(struct snd_soc_component *component, · 325 unmodified lines
368369 snd_soc_set_runtime_hwparams(substream, &xlnx_pcm_hardware);
369370 runtime->private_data = stream_data;
370371
371− /* Resize the period size divisible by 64 */
372+ /* Resize the period bytes as divisible by 64 */
372373 err = snd_pcm_hw_constraint_step(runtime, 0,
373− SNDRV_PCM_HW_PARAM_PERIOD_BYTES, 64);
374+ SNDRV_PCM_HW_PARAM_PERIOD_BYTES,
375+ XLNX_AUD_ALIGN_BYTES);
374376 if (err) {
375377 dev_err(component->dev,
376− "unable to set constraint on period bytes\n");
378+ "Unable to set constraint on period bytes\n");
379+ return err;
380+ }
381+
382+ /* Resize the buffer bytes as divisible by 64 */
383+ err = snd_pcm_hw_constraint_step(runtime, 0,
384+ SNDRV_PCM_HW_PARAM_BUFFER_BYTES,
385+ XLNX_AUD_ALIGN_BYTES);
386+ if (err) {
387+ dev_err(component->dev,
388+ "Unable to set constraint on buffer bytes\n");
389+ return err;
390+ }
391+
392+ /* Set periods as integer multiple */
393+ err = snd_pcm_hw_constraint_integer(runtime,
394+ SNDRV_PCM_HW_PARAM_PERIODS);
395+ if (err < 0) {
396+ dev_err(component->dev,
397+ "Unable to set constraint on periods to be integer\n");
377398 return err;
378399 }
379400
sound/usb/mixer.c+4−0
@@ -1527,6 +1527,10 @@ error: · 1526 unmodified lines
15271527 usb_audio_err(chip,
15281528 "cannot get connectors status: req = %#x, wValue = %#x, wIndex = %#x, type = %d\n",
15291529 UAC_GET_CUR, validx, idx, cval->val_type);
1530+
1531+ if (val)
1532+ *val = 0;
1533+
15301534 return filter_error(cval, ret);
15311535 }
15321536
sound/usb/quirks-table.h+1−1
@@ -84,7 +84,7 @@ · 83 unmodified lines
8484 * combination.
8585 */
8686 {
87− USB_DEVICE(0x041e, 0x4095),
87+ USB_AUDIO_DEVICE(0x041e, 0x4095),
8888 .driver_info = (unsigned long) &(const struct snd_usb_audio_quirk) {
8989 .ifnum = QUIRK_ANY_INTERFACE,
9090 .type = QUIRK_COMPOSITE,
tools/bpf/resolve_btfids/Makefile+5−1
@@ -9,7 +9,11 @@ ifeq ($(V),1) · 8 unmodified lines
99 msg =
1010 else
1111 Q = @
12− msg = @printf ' %-8s %s%s\n' "$(1)" "$(notdir $(2))" "$(if $(3), $(3))";
12+ ifeq ($(silent),1)
13+ msg =
14+ else
15+ msg = @printf ' %-8s %s%s\n' "$(1)" "$(notdir $(2))" "$(if $(3), $(3))";
16+ endif
1317 MAKEFLAGS=--no-print-directory
1418 endif
1519
tools/include/uapi/linux/lirc.h+0−229
@@ -1,229 +0,0 @@
1−/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */
2−/*
3− * lirc.h - linux infrared remote control header file
4− * last modified 2010/07/13 by Jarod Wilson
5− */
6−
7−#ifndef _LINUX_LIRC_H
8−#define _LINUX_LIRC_H
9−
10−#include <linux/types.h>
11−#include <linux/ioctl.h>
12−
13−#define PULSE_BIT 0x01000000
14−#define PULSE_MASK 0x00FFFFFF
15−
16−#define LIRC_MODE2_SPACE 0x00000000
17−#define LIRC_MODE2_PULSE 0x01000000
18−#define LIRC_MODE2_FREQUENCY 0x02000000
19−#define LIRC_MODE2_TIMEOUT 0x03000000
20−
21−#define LIRC_VALUE_MASK 0x00FFFFFF
22−#define LIRC_MODE2_MASK 0xFF000000
23−
24−#define LIRC_SPACE(val) (((val)&LIRC_VALUE_MASK) | LIRC_MODE2_SPACE)
25−#define LIRC_PULSE(val) (((val)&LIRC_VALUE_MASK) | LIRC_MODE2_PULSE)
26−#define LIRC_FREQUENCY(val) (((val)&LIRC_VALUE_MASK) | LIRC_MODE2_FREQUENCY)
27−#define LIRC_TIMEOUT(val) (((val)&LIRC_VALUE_MASK) | LIRC_MODE2_TIMEOUT)
28−
29−#define LIRC_VALUE(val) ((val)&LIRC_VALUE_MASK)
30−#define LIRC_MODE2(val) ((val)&LIRC_MODE2_MASK)
31−
32−#define LIRC_IS_SPACE(val) (LIRC_MODE2(val) == LIRC_MODE2_SPACE)
33−#define LIRC_IS_PULSE(val) (LIRC_MODE2(val) == LIRC_MODE2_PULSE)
34−#define LIRC_IS_FREQUENCY(val) (LIRC_MODE2(val) == LIRC_MODE2_FREQUENCY)
35−#define LIRC_IS_TIMEOUT(val) (LIRC_MODE2(val) == LIRC_MODE2_TIMEOUT)
36−
37−/* used heavily by lirc userspace */
38−#define lirc_t int
39−
40−/*** lirc compatible hardware features ***/
41−
42−#define LIRC_MODE2SEND(x) (x)
43−#define LIRC_SEND2MODE(x) (x)
44−#define LIRC_MODE2REC(x) ((x) << 16)
45−#define LIRC_REC2MODE(x) ((x) >> 16)
46−
47−#define LIRC_MODE_RAW 0x00000001
48−#define LIRC_MODE_PULSE 0x00000002
49−#define LIRC_MODE_MODE2 0x00000004
50−#define LIRC_MODE_SCANCODE 0x00000008
51−#define LIRC_MODE_LIRCCODE 0x00000010
52−
53−
54−#define LIRC_CAN_SEND_RAW LIRC_MODE2SEND(LIRC_MODE_RAW)
55−#define LIRC_CAN_SEND_PULSE LIRC_MODE2SEND(LIRC_MODE_PULSE)
56−#define LIRC_CAN_SEND_MODE2 LIRC_MODE2SEND(LIRC_MODE_MODE2)
57−#define LIRC_CAN_SEND_LIRCCODE LIRC_MODE2SEND(LIRC_MODE_LIRCCODE)
58−
59−#define LIRC_CAN_SEND_MASK 0x0000003f
60−
61−#define LIRC_CAN_SET_SEND_CARRIER 0x00000100
62−#define LIRC_CAN_SET_SEND_DUTY_CYCLE 0x00000200
63−#define LIRC_CAN_SET_TRANSMITTER_MASK 0x00000400
64−
65−#define LIRC_CAN_REC_RAW LIRC_MODE2REC(LIRC_MODE_RAW)
66−#define LIRC_CAN_REC_PULSE LIRC_MODE2REC(LIRC_MODE_PULSE)
67−#define LIRC_CAN_REC_MODE2 LIRC_MODE2REC(LIRC_MODE_MODE2)
68−#define LIRC_CAN_REC_SCANCODE LIRC_MODE2REC(LIRC_MODE_SCANCODE)
69−#define LIRC_CAN_REC_LIRCCODE LIRC_MODE2REC(LIRC_MODE_LIRCCODE)
70−
71−#define LIRC_CAN_REC_MASK LIRC_MODE2REC(LIRC_CAN_SEND_MASK)
72−
73−#define LIRC_CAN_SET_REC_CARRIER (LIRC_CAN_SET_SEND_CARRIER << 16)
74−#define LIRC_CAN_SET_REC_DUTY_CYCLE (LIRC_CAN_SET_SEND_DUTY_CYCLE << 16)
75−
76−#define LIRC_CAN_SET_REC_DUTY_CYCLE_RANGE 0x40000000
77−#define LIRC_CAN_SET_REC_CARRIER_RANGE 0x80000000
78−#define LIRC_CAN_GET_REC_RESOLUTION 0x20000000
79−#define LIRC_CAN_SET_REC_TIMEOUT 0x10000000
80−#define LIRC_CAN_SET_REC_FILTER 0x08000000
81−
82−#define LIRC_CAN_MEASURE_CARRIER 0x02000000
83−#define LIRC_CAN_USE_WIDEBAND_RECEIVER 0x04000000
84−
85−#define LIRC_CAN_SEND(x) ((x)&LIRC_CAN_SEND_MASK)
86−#define LIRC_CAN_REC(x) ((x)&LIRC_CAN_REC_MASK)
87−
88−#define LIRC_CAN_NOTIFY_DECODE 0x01000000
89−
90−/*** IOCTL commands for lirc driver ***/
91−
92−#define LIRC_GET_FEATURES _IOR('i', 0x00000000, __u32)
93−
94−#define LIRC_GET_SEND_MODE _IOR('i', 0x00000001, __u32)
95−#define LIRC_GET_REC_MODE _IOR('i', 0x00000002, __u32)
96−#define LIRC_GET_REC_RESOLUTION _IOR('i', 0x00000007, __u32)
97−
98−#define LIRC_GET_MIN_TIMEOUT _IOR('i', 0x00000008, __u32)
99−#define LIRC_GET_MAX_TIMEOUT _IOR('i', 0x00000009, __u32)
100−
101−/* code length in bits, currently only for LIRC_MODE_LIRCCODE */
102−#define LIRC_GET_LENGTH _IOR('i', 0x0000000f, __u32)
103−
104−#define LIRC_SET_SEND_MODE _IOW('i', 0x00000011, __u32)
105−#define LIRC_SET_REC_MODE _IOW('i', 0x00000012, __u32)
106−/* Note: these can reset the according pulse_width */
107−#define LIRC_SET_SEND_CARRIER _IOW('i', 0x00000013, __u32)
108−#define LIRC_SET_REC_CARRIER _IOW('i', 0x00000014, __u32)
109−#define LIRC_SET_SEND_DUTY_CYCLE _IOW('i', 0x00000015, __u32)
110−#define LIRC_SET_TRANSMITTER_MASK _IOW('i', 0x00000017, __u32)
111−
112−/*
113− * when a timeout != 0 is set the driver will send a
114− * LIRC_MODE2_TIMEOUT data packet, otherwise LIRC_MODE2_TIMEOUT is
115− * never sent, timeout is disabled by default
116− */
117−#define LIRC_SET_REC_TIMEOUT _IOW('i', 0x00000018, __u32)
118−
119−/* 1 enables, 0 disables timeout reports in MODE2 */
120−#define LIRC_SET_REC_TIMEOUT_REPORTS _IOW('i', 0x00000019, __u32)
121−
122−/*
123− * if enabled from the next key press on the driver will send
124− * LIRC_MODE2_FREQUENCY packets
125− */
126−#define LIRC_SET_MEASURE_CARRIER_MODE _IOW('i', 0x0000001d, __u32)
127−
128−/*
129− * to set a range use LIRC_SET_REC_CARRIER_RANGE with the
130− * lower bound first and later LIRC_SET_REC_CARRIER with the upper bound
131− */
132−#define LIRC_SET_REC_CARRIER_RANGE _IOW('i', 0x0000001f, __u32)
133−
134−#define LIRC_SET_WIDEBAND_RECEIVER _IOW('i', 0x00000023, __u32)
135−
136−/*
137− * Return the recording timeout, which is either set by
138− * the ioctl LIRC_SET_REC_TIMEOUT or by the kernel after setting the protocols.
139− */
140−#define LIRC_GET_REC_TIMEOUT _IOR('i', 0x00000024, __u32)
141−
142−/*
143− * struct lirc_scancode - decoded scancode with protocol for use with
144− * LIRC_MODE_SCANCODE
145− *
146− * @timestamp: Timestamp in nanoseconds using CLOCK_MONOTONIC when IR
147− * was decoded.
148− * @flags: should be 0 for transmit. When receiving scancodes,
149− * LIRC_SCANCODE_FLAG_TOGGLE or LIRC_SCANCODE_FLAG_REPEAT can be set
150− * depending on the protocol
151− * @rc_proto: see enum rc_proto
152− * @keycode: the translated keycode. Set to 0 for transmit.
153− * @scancode: the scancode received or to be sent
154− */
155−struct lirc_scancode {
156− __u64 timestamp;
157− __u16 flags;
158− __u16 rc_proto;
159− __u32 keycode;
160− __u64 scancode;
161−};
162−
163−/* Set if the toggle bit of rc-5 or rc-6 is enabled */
164−#define LIRC_SCANCODE_FLAG_TOGGLE 1
165−/* Set if this is a nec or sanyo repeat */
166−#define LIRC_SCANCODE_FLAG_REPEAT 2
167−
168−/**
169− * enum rc_proto - the Remote Controller protocol
170− *
171− * @RC_PROTO_UNKNOWN: Protocol not known
172− * @RC_PROTO_OTHER: Protocol known but proprietary
173− * @RC_PROTO_RC5: Philips RC5 protocol
174− * @RC_PROTO_RC5X_20: Philips RC5x 20 bit protocol
175− * @RC_PROTO_RC5_SZ: StreamZap variant of RC5
176− * @RC_PROTO_JVC: JVC protocol
177− * @RC_PROTO_SONY12: Sony 12 bit protocol
178− * @RC_PROTO_SONY15: Sony 15 bit protocol
179− * @RC_PROTO_SONY20: Sony 20 bit protocol
180− * @RC_PROTO_NEC: NEC protocol
181− * @RC_PROTO_NECX: Extended NEC protocol
182− * @RC_PROTO_NEC32: NEC 32 bit protocol
183− * @RC_PROTO_SANYO: Sanyo protocol
184− * @RC_PROTO_MCIR2_KBD: RC6-ish MCE keyboard
185− * @RC_PROTO_MCIR2_MSE: RC6-ish MCE mouse
186− * @RC_PROTO_RC6_0: Philips RC6-0-16 protocol
187− * @RC_PROTO_RC6_6A_20: Philips RC6-6A-20 protocol
188− * @RC_PROTO_RC6_6A_24: Philips RC6-6A-24 protocol
189− * @RC_PROTO_RC6_6A_32: Philips RC6-6A-32 protocol
190− * @RC_PROTO_RC6_MCE: MCE (Philips RC6-6A-32 subtype) protocol
191− * @RC_PROTO_SHARP: Sharp protocol
192− * @RC_PROTO_XMP: XMP protocol
193− * @RC_PROTO_CEC: CEC protocol
194− * @RC_PROTO_IMON: iMon Pad protocol
195− * @RC_PROTO_RCMM12: RC-MM protocol 12 bits
196− * @RC_PROTO_RCMM24: RC-MM protocol 24 bits
197− * @RC_PROTO_RCMM32: RC-MM protocol 32 bits
198− */
199−enum rc_proto {
200− RC_PROTO_UNKNOWN = 0,
201− RC_PROTO_OTHER = 1,
202− RC_PROTO_RC5 = 2,
203− RC_PROTO_RC5X_20 = 3,
204− RC_PROTO_RC5_SZ = 4,
205− RC_PROTO_JVC = 5,
206− RC_PROTO_SONY12 = 6,
207− RC_PROTO_SONY15 = 7,
208− RC_PROTO_SONY20 = 8,
209− RC_PROTO_NEC = 9,
210− RC_PROTO_NECX = 10,
211− RC_PROTO_NEC32 = 11,
212− RC_PROTO_SANYO = 12,
213− RC_PROTO_MCIR2_KBD = 13,
214− RC_PROTO_MCIR2_MSE = 14,
215− RC_PROTO_RC6_0 = 15,
216− RC_PROTO_RC6_6A_20 = 16,
217− RC_PROTO_RC6_6A_24 = 17,
218− RC_PROTO_RC6_6A_32 = 18,
219− RC_PROTO_RC6_MCE = 19,
220− RC_PROTO_SHARP = 20,
221− RC_PROTO_XMP = 21,
222− RC_PROTO_CEC = 22,
223− RC_PROTO_IMON = 23,
224− RC_PROTO_RCMM12 = 24,
225− RC_PROTO_RCMM24 = 25,
226− RC_PROTO_RCMM32 = 26,
227−};
228−
229−#endif
tools/scripts/Makefile.include+1−1
@@ -90,7 +90,7 @@ EXTRA_WARNINGS += -Wstrict-aliasing=3 · 89 unmodified lines
9090
9191 else ifneq ($(CROSS_COMPILE),)
9292 CLANG_CROSS_FLAGS := --target=$(notdir $(CROSS_COMPILE:%-=%))
93−GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)gcc))
93+GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)gcc 2>/dev/null))
9494 ifneq ($(GCC_TOOLCHAIN_DIR),)
9595 CLANG_CROSS_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)$(notdir $(CROSS_COMPILE))
9696 CLANG_CROSS_FLAGS += --sysroot=$(shell $(CROSS_COMPILE)gcc -print-sysroot)
tools/testing/kunit/kunit_kernel.py+1−0
@@ -6,6 +6,7 @@ · 5 unmodified lines
66 # Author: Felix Guo <felixguoxiuping@gmail.com>
77 # Author: Brendan Higgins <brendanhiggins@google.com>
88
9+import importlib.abc
910 import importlib.util
1011 import logging
1112 import subprocess
tools/testing/selftests/bpf/test_lirc_mode2_user.c+0−1
@@ -28,7 +28,6 @@ · 27 unmodified lines
2828 // 5. We can read keycode from same /dev/lirc device
2929
3030 #include <linux/bpf.h>
31−#include <linux/lirc.h>
3231 #include <linux/input.h>
3332 #include <errno.h>
3433 #include <stdio.h>
tools/testing/selftests/cpufreq/main.sh+1−1
@@ -194,5 +194,5 @@ prerequisite · 193 unmodified lines
194194
195195 # Run requested functions
196196 clear_dumps $OUTFILE
197−do_test >> $OUTFILE.txt
197+do_test | tee -a $OUTFILE.txt
198198 dmesg_dumps $OUTFILE
tools/testing/selftests/exec/Makefile+1−1
@@ -5,7 +5,7 @@ CFLAGS += -D_GNU_SOURCE · 4 unmodified lines
55
66 TEST_PROGS := binfmt_script non-regular
77 TEST_GEN_PROGS := execveat load_address_4096 load_address_2097152 load_address_16777216
8−TEST_GEN_FILES := execveat.symlink execveat.denatured script subdir pipe
8+TEST_GEN_FILES := execveat.symlink execveat.denatured script subdir
99 # Makefile is a run-time dependency, since it's accessed by the execveat test
1010 TEST_FILES := Makefile
1111
tools/testing/selftests/futex/Makefile+2−2
@@ -11,7 +11,7 @@ all: · 10 unmodified lines
1111 @for DIR in $(SUBDIRS); do \
1212 BUILD_TARGET=$(OUTPUT)/$$DIR; \
1313 mkdir $$BUILD_TARGET -p; \
14− make OUTPUT=$$BUILD_TARGET -C $$DIR $@;\
14+ $(MAKE) OUTPUT=$$BUILD_TARGET -C $$DIR $@;\
1515 if [ -e $$DIR/$(TEST_PROGS) ]; then \
1616 rsync -a $$DIR/$(TEST_PROGS) $$BUILD_TARGET/; \
1717 fi \
@@ -32,6 +32,6 @@ override define CLEAN · 14 unmodified lines
3232 @for DIR in $(SUBDIRS); do \
3333 BUILD_TARGET=$(OUTPUT)/$$DIR; \
3434 mkdir $$BUILD_TARGET -p; \
35− make OUTPUT=$$BUILD_TARGET -C $$DIR $@;\
35+ $(MAKE) OUTPUT=$$BUILD_TARGET -C $$DIR $@;\
3636 done
3737 endef
tools/testing/selftests/kselftest_harness.h+3−1
@@ -877,7 +877,8 @@ static void __timeout_handler(int sig, siginfo_t *info, void *ucontext) · 876 unmodified lines
877877 }
878878
879879 t->timed_out = true;
880− kill(t->pid, SIGKILL);
880+ // signal process group
881+ kill(-(t->pid), SIGKILL);
881882 }
882883
883884 void __wait_for_test(struct __test_metadata *t)
@@ -987,6 +988,7 @@ void __run_test(struct __fixture_metadata *f, · 103 unmodified lines
987988 ksft_print_msg("ERROR SPAWNING TEST CHILD\n");
988989 t->passed = 0;
989990 } else if (t->pid == 0) {
991+ setpgrp();
990992 t->fn(t, variant);
991993 if (t->skip)
992994 _exit(255);
tools/testing/selftests/mincore/mincore_selftest.c+14−6
@@ -207,15 +207,21 @@ TEST(check_file_mmap) · 206 unmodified lines
207207
208208 errno = 0;
209209 fd = open(".", O_TMPFILE | O_RDWR, 0600);
210− ASSERT_NE(-1, fd) {
211− TH_LOG("Can't create temporary file: %s",
212− strerror(errno));
210+ if (fd < 0) {
211+ ASSERT_EQ(errno, EOPNOTSUPP) {
212+ TH_LOG("Can't create temporary file: %s",
213+ strerror(errno));
214+ }
215+ SKIP(goto out_free, "O_TMPFILE not supported by filesystem.");
213216 }
214217 errno = 0;
215218 retval = fallocate(fd, 0, 0, FILE_SIZE);
216− ASSERT_EQ(0, retval) {
217− TH_LOG("Error allocating space for the temporary file: %s",
218− strerror(errno));
219+ if (retval) {
220+ ASSERT_EQ(errno, EOPNOTSUPP) {
221+ TH_LOG("Error allocating space for the temporary file: %s",
222+ strerror(errno));
223+ }
224+ SKIP(goto out_close, "fallocate not supported by filesystem.");
219225 }
220226
221227 /*
@@ -271,7 +277,9 @@ TEST(check_file_mmap) · 49 unmodified lines
271277 }
272278
273279 munmap(addr, FILE_SIZE);
280+out_close:
274281 close(fd);
282+out_free:
275283 free(vec);
276284 }
277285
tools/testing/selftests/netfilter/nft_concat_range.sh+71−1
@@ -27,7 +27,7 @@ TYPES="net_port port_net net6_port port_proto net6_port_mac net6_port_mac_proto · 26 unmodified lines
2727 net6_port_net6_port net_port_mac_proto_net"
2828
2929 # Reported bugs, also described by TYPE_ variables below
30−BUGS="flush_remove_add"
30+BUGS="flush_remove_add reload"
3131
3232 # List of possible paths to pktgen script from kernel tree for performance tests
3333 PKTGEN_SCRIPT_PATHS="
@@ -354,6 +354,23 @@ TYPE_flush_remove_add=" · 320 unmodified lines
354354 display Add two elements, flush, re-add
355355 "
356356
357+TYPE_reload="
358+display net,mac with reload
359+type_spec ipv4_addr . ether_addr
360+chain_spec ip daddr . ether saddr
361+dst addr4
362+src mac
363+start 1
364+count 1
365+src_delta 2000
366+tools sendip nc bash
367+proto udp
368+
369+race_repeat 0
370+
371+perf_duration 0
372+"
373+
357374 # Set template for all tests, types and rules are filled in depending on test
358375 set_template='
359376 flush ruleset
@@ -1473,6 +1490,59 @@ test_bug_flush_remove_add() { · 1113 unmodified lines
14731490 nft flush ruleset
14741491 }
14751492
1493+# - add ranged element, check that packets match it
1494+# - reload the set, check packets still match
1495+test_bug_reload() {
1496+ setup veth send_"${proto}" set || return ${KSELFTEST_SKIP}
1497+ rstart=${start}
1498+
1499+ range_size=1
1500+ for i in $(seq "${start}" $((start + count))); do
1501+ end=$((start + range_size))
1502+
1503+ # Avoid negative or zero-sized port ranges
1504+ if [ $((end / 65534)) -gt $((start / 65534)) ]; then
1505+ start=${end}
1506+ end=$((end + 1))
1507+ fi
1508+ srcstart=$((start + src_delta))
1509+ srcend=$((end + src_delta))
1510+
1511+ add "$(format)" || return 1
1512+ range_size=$((range_size + 1))
1513+ start=$((end + range_size))
1514+ done
1515+
1516+ # check kernel does allocate pcpu sctrach map
1517+ # for reload with no elemet add/delete
1518+ ( echo flush set inet filter test ;
1519+ nft list set inet filter test ) | nft -f -
1520+
1521+ start=${rstart}
1522+ range_size=1
1523+
1524+ for i in $(seq "${start}" $((start + count))); do
1525+ end=$((start + range_size))
1526+
1527+ # Avoid negative or zero-sized port ranges
1528+ if [ $((end / 65534)) -gt $((start / 65534)) ]; then
1529+ start=${end}
1530+ end=$((end + 1))
1531+ fi
1532+ srcstart=$((start + src_delta))
1533+ srcend=$((end + src_delta))
1534+
1535+ for j in $(seq ${start} $((range_size / 2 + 1)) ${end}); do
1536+ send_match "${j}" $((j + src_delta)) || return 1
1537+ done
1538+
1539+ range_size=$((range_size + 1))
1540+ start=$((end + range_size))
1541+ done
1542+
1543+ nft flush ruleset
1544+}
1545+
14761546 test_reported_issues() {
14771547 eval test_bug_"${subtest}"
14781548 }
tools/testing/selftests/netfilter/nft_nat.sh+152−0
@@ -899,6 +899,144 @@ EOF · 898 unmodified lines
899899 ip netns exec "$ns0" nft delete table $family nat
900900 }
901901
902+test_stateless_nat_ip()
903+{
904+ local lret=0
905+
906+ ip netns exec "$ns0" sysctl net.ipv4.conf.veth0.forwarding=1 > /dev/null
907+ ip netns exec "$ns0" sysctl net.ipv4.conf.veth1.forwarding=1 > /dev/null
908+
909+ ip netns exec "$ns2" ping -q -c 1 10.0.1.99 > /dev/null # ping ns2->ns1
910+ if [ $? -ne 0 ] ; then
911+ echo "ERROR: cannot ping $ns1 from $ns2 before loading stateless rules"
912+ return 1
913+ fi
914+
915+ip netns exec "$ns0" nft -f /dev/stdin <<EOF
916+table ip stateless {
917+ map xlate_in {
918+ typeof meta iifname . ip saddr . ip daddr : ip daddr
919+ elements = {
920+ "veth1" . 10.0.2.99 . 10.0.1.99 : 10.0.2.2,
921+ }
922+ }
923+ map xlate_out {
924+ typeof meta iifname . ip saddr . ip daddr : ip daddr
925+ elements = {
926+ "veth0" . 10.0.1.99 . 10.0.2.2 : 10.0.2.99
927+ }
928+ }
929+
930+ chain prerouting {
931+ type filter hook prerouting priority -400; policy accept;
932+ ip saddr set meta iifname . ip saddr . ip daddr map @xlate_in
933+ ip daddr set meta iifname . ip saddr . ip daddr map @xlate_out
934+ }
935+}
936+EOF
937+ if [ $? -ne 0 ]; then
938+ echo "SKIP: Could not add ip statless rules"
939+ return $ksft_skip
940+ fi
941+
942+ reset_counters
943+
944+ ip netns exec "$ns2" ping -q -c 1 10.0.1.99 > /dev/null # ping ns2->ns1
945+ if [ $? -ne 0 ] ; then
946+ echo "ERROR: cannot ping $ns1 from $ns2 with stateless rules"
947+ lret=1
948+ fi
949+
950+ # ns1 should have seen packets from .2.2, due to stateless rewrite.
951+ expect="packets 1 bytes 84"
952+ cnt=$(ip netns exec "$ns1" nft list counter inet filter ns0insl | grep -q "$expect")
953+ if [ $? -ne 0 ]; then
954+ bad_counter "$ns1" ns0insl "$expect" "test_stateless 1"
955+ lret=1
956+ fi
957+
958+ for dir in "in" "out" ; do
959+ cnt=$(ip netns exec "$ns2" nft list counter inet filter ns1${dir} | grep -q "$expect")
960+ if [ $? -ne 0 ]; then
961+ bad_counter "$ns2" ns1$dir "$expect" "test_stateless 2"
962+ lret=1
963+ fi
964+ done
965+
966+ # ns1 should not have seen packets from ns2, due to masquerade
967+ expect="packets 0 bytes 0"
968+ for dir in "in" "out" ; do
969+ cnt=$(ip netns exec "$ns1" nft list counter inet filter ns2${dir} | grep -q "$expect")
970+ if [ $? -ne 0 ]; then
971+ bad_counter "$ns1" ns0$dir "$expect" "test_stateless 3"
972+ lret=1
973+ fi
974+
975+ cnt=$(ip netns exec "$ns0" nft list counter inet filter ns1${dir} | grep -q "$expect")
976+ if [ $? -ne 0 ]; then
977+ bad_counter "$ns0" ns1$dir "$expect" "test_stateless 4"
978+ lret=1
979+ fi
980+ done
981+
982+ reset_counters
983+
984+ socat -h > /dev/null 2>&1
985+ if [ $? -ne 0 ];then
986+ echo "SKIP: Could not run stateless nat frag test without socat tool"
987+ if [ $lret -eq 0 ]; then
988+ return $ksft_skip
989+ fi
990+
991+ ip netns exec "$ns0" nft delete table ip stateless
992+ return $lret
993+ fi
994+
995+ local tmpfile=$(mktemp)
996+ dd if=/dev/urandom of=$tmpfile bs=4096 count=1 2>/dev/null
997+
998+ local outfile=$(mktemp)
999+ ip netns exec "$ns1" timeout 3 socat -u UDP4-RECV:4233 OPEN:$outfile < /dev/null &
1000+ sc_r=$!
1001+
1002+ sleep 1
1003+ # re-do with large ping -> ip fragmentation
1004+ ip netns exec "$ns2" timeout 3 socat - UDP4-SENDTO:"10.0.1.99:4233" < "$tmpfile" > /dev/null
1005+ if [ $? -ne 0 ] ; then
1006+ echo "ERROR: failed to test udp $ns1 to $ns2 with stateless ip nat" 1>&2
1007+ lret=1
1008+ fi
1009+
1010+ wait
1011+
1012+ cmp "$tmpfile" "$outfile"
1013+ if [ $? -ne 0 ]; then
1014+ ls -l "$tmpfile" "$outfile"
1015+ echo "ERROR: in and output file mismatch when checking udp with stateless nat" 1>&2
1016+ lret=1
1017+ fi
1018+
1019+ rm -f "$tmpfile" "$outfile"
1020+
1021+ # ns1 should have seen packets from 2.2, due to stateless rewrite.
1022+ expect="packets 3 bytes 4164"
1023+ cnt=$(ip netns exec "$ns1" nft list counter inet filter ns0insl | grep -q "$expect")
1024+ if [ $? -ne 0 ]; then
1025+ bad_counter "$ns1" ns0insl "$expect" "test_stateless 5"
1026+ lret=1
1027+ fi
1028+
1029+ ip netns exec "$ns0" nft delete table ip stateless
1030+ if [ $? -ne 0 ]; then
1031+ echo "ERROR: Could not delete table ip stateless" 1>&2
1032+ lret=1
1033+ fi
1034+
1035+ test $lret -eq 0 && echo "PASS: IP statless for $ns2"
1036+
1037+ return $lret
1038+}
1039+
9021040 # ip netns exec "$ns0" ping -c 1 -q 10.0.$i.99
9031041 for i in 0 1 2; do
9041042 ip netns exec ns$i-$sfx nft -f /dev/stdin <<EOF
@@ -965,6 +1103,19 @@ table inet filter { · 60 unmodified lines
9651103 EOF
9661104 done
9671105
1106+# special case for stateless nat check, counter needs to
1107+# be done before (input) ip defragmentation
1108+ip netns exec ns1-$sfx nft -f /dev/stdin <<EOF
1109+table inet filter {
1110+ counter ns0insl {}
1111+
1112+ chain pre {
1113+ type filter hook prerouting priority -400; policy accept;
1114+ ip saddr 10.0.2.2 counter name "ns0insl"
1115+ }
1116+}
1117+EOF
1118+
9681119 sleep 3
9691120 # test basic connectivity
9701121 for i in 1 2; do
@@ -1019,6 +1170,7 @@ $test_inet_nat && test_redirect inet · 48 unmodified lines
10191170 $test_inet_nat && test_redirect6 inet
10201171
10211172 test_port_shadowing
1173+test_stateless_nat_ip
10221174
10231175 if [ $ret -ne 0 ];then
10241176 echo -n "FAIL: "
tools/testing/selftests/netfilter/nft_zones_many.sh+6−6
@@ -9,7 +9,7 @@ ns="ns-$sfx" · 8 unmodified lines
99 # Kselftest framework requirement - SKIP code is 4.
1010 ksft_skip=4
1111
12−zones=20000
12+zones=2000
1313 have_ct_tool=0
1414 ret=0
1515
@@ -75,10 +75,10 @@ EOF · 59 unmodified lines
7575
7676 while [ $i -lt $max_zones ]; do
7777 local start=$(date +%s%3N)
78− i=$((i + 10000))
78+ i=$((i + 1000))
7979 j=$((j + 1))
8080 # nft rule in output places each packet in a different zone.
81− dd if=/dev/zero of=/dev/stdout bs=8k count=10000 2>/dev/null | ip netns exec "$ns" socat STDIN UDP:127.0.0.1:12345,sourceport=12345
81+ dd if=/dev/zero of=/dev/stdout bs=8k count=1000 2>/dev/null | ip netns exec "$ns" socat STDIN UDP:127.0.0.1:12345,sourceport=12345
8282 if [ $? -ne 0 ] ;then
8383 ret=1
8484 break
@@ -86,7 +86,7 @@ EOF · 1 unmodified line
8686
8787 stop=$(date +%s%3N)
8888 local duration=$((stop-start))
89− echo "PASS: added 10000 entries in $duration ms (now $i total, loop $j)"
89+ echo "PASS: added 1000 entries in $duration ms (now $i total, loop $j)"
9090 done
9191
9292 if [ $have_ct_tool -eq 1 ]; then
@@ -128,11 +128,11 @@ test_conntrack_tool() { · 35 unmodified lines
128128 break
129129 fi
130130
131− if [ $((i%10000)) -eq 0 ];then
131+ if [ $((i%1000)) -eq 0 ];then
132132 stop=$(date +%s%3N)
133133
134134 local duration=$((stop-start))
135− echo "PASS: added 10000 entries in $duration ms (now $i total)"
135+ echo "PASS: added 1000 entries in $duration ms (now $i total)"
136136 start=$stop
137137 fi
138138 done
tools/testing/selftests/openat2/Makefile+1−1
@@ -5,4 +5,4 @@ TEST_GEN_PROGS := openat2_test resolve_test rename_attack_test · 4 unmodified lines
55
66 include ../lib.mk
77
8−$(TEST_GEN_PROGS): helpers.c
8+$(TEST_GEN_PROGS): helpers.c helpers.h
tools/testing/selftests/openat2/helpers.h+7−5
@@ -9,6 +9,7 @@ · 8 unmodified lines
99
1010 #define _GNU_SOURCE
1111 #include <stdint.h>
12+#include <stdbool.h>
1213 #include <errno.h>
1314 #include <linux/types.h>
1415 #include "../kselftest.h"
@@ -62,11 +63,12 @@ bool needs_openat2(const struct open_how *how); · 47 unmodified lines
6263 (similar to chroot(2)). */
6364 #endif /* RESOLVE_IN_ROOT */
6465
65−#define E_func(func, ...) \
66− do { \
67− if (func(__VA_ARGS__) < 0) \
68− ksft_exit_fail_msg("%s:%d %s failed\n", \
69− __FILE__, __LINE__, #func);\
66+#define E_func(func, ...) \
67+ do { \
68+ errno = 0; \
69+ if (func(__VA_ARGS__) < 0) \
70+ ksft_exit_fail_msg("%s:%d %s failed - errno:%d\n", \
71+ __FILE__, __LINE__, #func, errno); \
7072 } while (0)
7173
7274 #define E_asprintf(...) E_func(asprintf, __VA_ARGS__)
tools/testing/selftests/openat2/openat2_test.c+11−1
@@ -259,6 +259,16 @@ void test_openat2_flags(void) · 258 unmodified lines
259259 unlink(path);
260260
261261 fd = sys_openat2(AT_FDCWD, path, &test->how);
262+ if (fd < 0 && fd == -EOPNOTSUPP) {
263+ /*
264+ * Skip the testcase if it failed because not supported
265+ * by FS. (e.g. a valid O_TMPFILE combination on NFS)
266+ */
267+ ksft_test_result_skip("openat2 with %s fails with %d (%s)\n",
268+ test->name, fd, strerror(-fd));
269+ goto next;
270+ }
271+
262272 if (test->err >= 0)
263273 failed = (fd < 0);
264274 else
@@ -303,7 +313,7 @@ skip: · 38 unmodified lines
303313 else
304314 resultfn("openat2 with %s fails with %d (%s)\n",
305315 test->name, test->err, strerror(-test->err));
306−
316+next:
307317 free(fdpath);
308318 fflush(stdout);
309319 }
tools/testing/selftests/rtc/settings+1−1
@@ -1 +1 @@
1−timeout=90
1+timeout=180
tools/testing/selftests/vDSO/vdso_test_abi.c+62−73
@@ -33,110 +33,114 @@ typedef long (*vdso_clock_gettime_t)(clockid_t clk_id, struct timespec *ts); · 32 unmodified lines
3333 typedef long (*vdso_clock_getres_t)(clockid_t clk_id, struct timespec *ts);
3434 typedef time_t (*vdso_time_t)(time_t *t);
3535
36−static int vdso_test_gettimeofday(void)
36+#define VDSO_TEST_PASS_MSG() "\n%s(): PASS\n", __func__
37+#define VDSO_TEST_FAIL_MSG(x) "\n%s(): %s FAIL\n", __func__, x
38+#define VDSO_TEST_SKIP_MSG(x) "\n%s(): SKIP: Could not find %s\n", __func__, x
39+
40+static void vdso_test_gettimeofday(void)
3741 {
3842 /* Find gettimeofday. */
3943 vdso_gettimeofday_t vdso_gettimeofday =
4044 (vdso_gettimeofday_t)vdso_sym(version, name[0]);
4145
4246 if (!vdso_gettimeofday) {
43− printf("Could not find %s\n", name[0]);
44− return KSFT_SKIP;
47+ ksft_test_result_skip(VDSO_TEST_SKIP_MSG(name[0]));
48+ return;
4549 }
4650
4751 struct timeval tv;
4852 long ret = vdso_gettimeofday(&tv, 0);
4953
5054 if (ret == 0) {
51− printf("The time is %lld.%06lld\n",
52− (long long)tv.tv_sec, (long long)tv.tv_usec);
55+ ksft_print_msg("The time is %lld.%06lld\n",
56+ (long long)tv.tv_sec, (long long)tv.tv_usec);
57+ ksft_test_result_pass(VDSO_TEST_PASS_MSG());
5358 } else {
54− printf("%s failed\n", name[0]);
55− return KSFT_FAIL;
59+ ksft_test_result_fail(VDSO_TEST_FAIL_MSG(name[0]));
5660 }
57−
58− return KSFT_PASS;
5961 }
6062
61−static int vdso_test_clock_gettime(clockid_t clk_id)
63+static void vdso_test_clock_gettime(clockid_t clk_id)
6264 {
6365 /* Find clock_gettime. */
6466 vdso_clock_gettime_t vdso_clock_gettime =
6567 (vdso_clock_gettime_t)vdso_sym(version, name[1]);
6668
6769 if (!vdso_clock_gettime) {
68− printf("Could not find %s\n", name[1]);
69− return KSFT_SKIP;
70+ ksft_test_result_skip(VDSO_TEST_SKIP_MSG(name[1]));
71+ return;
7072 }
7173
7274 struct timespec ts;
7375 long ret = vdso_clock_gettime(clk_id, &ts);
7476
7577 if (ret == 0) {
76− printf("The time is %lld.%06lld\n",
77− (long long)ts.tv_sec, (long long)ts.tv_nsec);
78+ ksft_print_msg("The time is %lld.%06lld\n",
79+ (long long)ts.tv_sec, (long long)ts.tv_nsec);
80+ ksft_test_result_pass(VDSO_TEST_PASS_MSG());
7881 } else {
79− printf("%s failed\n", name[1]);
80− return KSFT_FAIL;
82+ ksft_test_result_fail(VDSO_TEST_FAIL_MSG(name[1]));
8183 }
82−
83− return KSFT_PASS;
8484 }
8585
86−static int vdso_test_time(void)
86+static void vdso_test_time(void)
8787 {
8888 /* Find time. */
8989 vdso_time_t vdso_time =
9090 (vdso_time_t)vdso_sym(version, name[2]);
9191
9292 if (!vdso_time) {
93− printf("Could not find %s\n", name[2]);
94− return KSFT_SKIP;
93+ ksft_test_result_skip(VDSO_TEST_SKIP_MSG(name[2]));
94+ return;
9595 }
9696
9797 long ret = vdso_time(NULL);
9898
9999 if (ret > 0) {
100− printf("The time in hours since January 1, 1970 is %lld\n",
100+ ksft_print_msg("The time in hours since January 1, 1970 is %lld\n",
101101 (long long)(ret / 3600));
102+ ksft_test_result_pass(VDSO_TEST_PASS_MSG());
102103 } else {
103− printf("%s failed\n", name[2]);
104− return KSFT_FAIL;
104+ ksft_test_result_fail(VDSO_TEST_FAIL_MSG(name[2]));
105105 }
106−
107− return KSFT_PASS;
108106 }
109107
110−static int vdso_test_clock_getres(clockid_t clk_id)
108+static void vdso_test_clock_getres(clockid_t clk_id)
111109 {
110+ int clock_getres_fail = 0;
111+
112112 /* Find clock_getres. */
113113 vdso_clock_getres_t vdso_clock_getres =
114114 (vdso_clock_getres_t)vdso_sym(version, name[3]);
115115
116116 if (!vdso_clock_getres) {
117− printf("Could not find %s\n", name[3]);
118− return KSFT_SKIP;
117+ ksft_test_result_skip(VDSO_TEST_SKIP_MSG(name[3]));
118+ return;
119119 }
120120
121121 struct timespec ts, sys_ts;
122122 long ret = vdso_clock_getres(clk_id, &ts);
123123
124124 if (ret == 0) {
125− printf("The resolution is %lld %lld\n",
126− (long long)ts.tv_sec, (long long)ts.tv_nsec);
125+ ksft_print_msg("The vdso resolution is %lld %lld\n",
126+ (long long)ts.tv_sec, (long long)ts.tv_nsec);
127127 } else {
128− printf("%s failed\n", name[3]);
129− return KSFT_FAIL;
128+ clock_getres_fail++;
130129 }
131130
132131 ret = syscall(SYS_clock_getres, clk_id, &sys_ts);
133132
134− if ((sys_ts.tv_sec != ts.tv_sec) || (sys_ts.tv_nsec != ts.tv_nsec)) {
135− printf("%s failed\n", name[3]);
136− return KSFT_FAIL;
137− }
133+ ksft_print_msg("The syscall resolution is %lld %lld\n",
134+ (long long)sys_ts.tv_sec, (long long)sys_ts.tv_nsec);
138135
139− return KSFT_PASS;
136+ if ((sys_ts.tv_sec != ts.tv_sec) || (sys_ts.tv_nsec != ts.tv_nsec))
137+ clock_getres_fail++;
138+
139+ if (clock_getres_fail > 0) {
140+ ksft_test_result_fail(VDSO_TEST_FAIL_MSG(name[3]));
141+ } else {
142+ ksft_test_result_pass(VDSO_TEST_PASS_MSG());
143+ }
140144 }
141145
142146 const char *vdso_clock_name[12] = {
@@ -158,36 +162,23 @@ const char *vdso_clock_name[12] = { · 15 unmodified lines
158162 * This function calls vdso_test_clock_gettime and vdso_test_clock_getres
159163 * with different values for clock_id.
160164 */
161−static inline int vdso_test_clock(clockid_t clock_id)
165+static inline void vdso_test_clock(clockid_t clock_id)
162166 {
163− int ret0, ret1;
164−
165− ret0 = vdso_test_clock_gettime(clock_id);
166− /* A skipped test is considered passed */
167− if (ret0 == KSFT_SKIP)
168− ret0 = KSFT_PASS;
169−
170− ret1 = vdso_test_clock_getres(clock_id);
171− /* A skipped test is considered passed */
172− if (ret1 == KSFT_SKIP)
173− ret1 = KSFT_PASS;
167+ ksft_print_msg("\nclock_id: %s\n", vdso_clock_name[clock_id]);
174168
175− ret0 += ret1;
169+ vdso_test_clock_gettime(clock_id);
176170
177− printf("clock_id: %s", vdso_clock_name[clock_id]);
178−
179− if (ret0 > 0)
180− printf(" [FAIL]\n");
181− else
182− printf(" [PASS]\n");
183−
184− return ret0;
171+ vdso_test_clock_getres(clock_id);
185172 }
186173
174+#define VDSO_TEST_PLAN 16
175+
187176 int main(int argc, char **argv)
188177 {
189178 unsigned long sysinfo_ehdr = getauxval(AT_SYSINFO_EHDR);
190− int ret;
179+
180+ ksft_print_header();
181+ ksft_set_plan(VDSO_TEST_PLAN);
191182
192183 if (!sysinfo_ehdr) {
193184 printf("AT_SYSINFO_EHDR is not present!\n");
@@ -201,44 +192,42 @@ int main(int argc, char **argv) · 7 unmodified lines
201192
202193 vdso_init_from_sysinfo_ehdr(getauxval(AT_SYSINFO_EHDR));
203194
204− ret = vdso_test_gettimeofday();
195+ vdso_test_gettimeofday();
205196
206197 #if _POSIX_TIMERS > 0
207198
208199 #ifdef CLOCK_REALTIME
209− ret += vdso_test_clock(CLOCK_REALTIME);
200+ vdso_test_clock(CLOCK_REALTIME);
210201 #endif
211202
212203 #ifdef CLOCK_BOOTTIME
213− ret += vdso_test_clock(CLOCK_BOOTTIME);
204+ vdso_test_clock(CLOCK_BOOTTIME);
214205 #endif
215206
216207 #ifdef CLOCK_TAI
217− ret += vdso_test_clock(CLOCK_TAI);
208+ vdso_test_clock(CLOCK_TAI);
218209 #endif
219210
220211 #ifdef CLOCK_REALTIME_COARSE
221− ret += vdso_test_clock(CLOCK_REALTIME_COARSE);
212+ vdso_test_clock(CLOCK_REALTIME_COARSE);
222213 #endif
223214
224215 #ifdef CLOCK_MONOTONIC
225− ret += vdso_test_clock(CLOCK_MONOTONIC);
216+ vdso_test_clock(CLOCK_MONOTONIC);
226217 #endif
227218
228219 #ifdef CLOCK_MONOTONIC_RAW
229− ret += vdso_test_clock(CLOCK_MONOTONIC_RAW);
220+ vdso_test_clock(CLOCK_MONOTONIC_RAW);
230221 #endif
231222
232223 #ifdef CLOCK_MONOTONIC_COARSE
233− ret += vdso_test_clock(CLOCK_MONOTONIC_COARSE);
224+ vdso_test_clock(CLOCK_MONOTONIC_COARSE);
234225 #endif
235226
236227 #endif
237228
238− ret += vdso_test_time();
239−
240− if (ret > 0)
241− return KSFT_FAIL;
229+ vdso_test_time();
242230
243− return KSFT_PASS;
231+ ksft_print_cnts();
232+ return ksft_get_fail_cnt() == 0 ? KSFT_PASS : KSFT_FAIL;
244233 }
tools/testing/selftests/vm/userfaultfd.c+7−2
@@ -1417,6 +1417,7 @@ static void userfaultfd_pagemap_test(unsigned int test_pgsize) · 1416 unmodified lines
14171417 static int userfaultfd_stress(void)
14181418 {
14191419 void *area;
1420+ char *tmp_area;
14201421 unsigned long nr;
14211422 struct uffdio_register uffdio_register;
14221423 struct uffd_stats uffd_stats[nr_cpus];
@@ -1527,9 +1528,13 @@ static int userfaultfd_stress(void) · 104 unmodified lines
15271528 count_verify[nr], nr);
15281529
15291530 /* prepare next bounce */
1530− swap(area_src, area_dst);
1531+ tmp_area = area_src;
1532+ area_src = area_dst;
1533+ area_dst = tmp_area;
15311534
1532− swap(area_src_alias, area_dst_alias);
1535+ tmp_area = area_src_alias;
1536+ area_src_alias = area_dst_alias;
1537+ area_dst_alias = tmp_area;
15331538
15341539 uffd_stats_report(uffd_stats, nr_cpus);
15351540 }
tools/testing/selftests/zram/zram.sh+1−14
@@ -2,9 +2,6 @@ · 1 unmodified line
22 # SPDX-License-Identifier: GPL-2.0
33 TCID="zram.sh"
44
5−# Kselftest framework requirement - SKIP code is 4.
6−ksft_skip=4
7−
85 . ./zram_lib.sh
96
107 run_zram () {
@@ -18,14 +15,4 @@ echo "" · 7 unmodified lines
1815
1916 check_prereqs
2017
21−# check zram module exists
22−MODULE_PATH=/lib/modules/`uname -r`/kernel/drivers/block/zram/zram.ko
23−if [ -f $MODULE_PATH ]; then
24− run_zram
25−elif [ -b /dev/zram0 ]; then
26− run_zram
27−else
28− echo "$TCID : No zram.ko module or /dev/zram0 device file not found"
29− echo "$TCID : CONFIG_ZRAM is not set"
30− exit $ksft_skip
31−fi
18+run_zram
tools/testing/selftests/zram/zram01.sh+9−24
@@ -33,9 +33,7 @@ zram_algs="lzo" · 32 unmodified lines
3333
3434 zram_fill_fs()
3535 {
36− local mem_free0=$(free -m | awk 'NR==2 {print $4}')
37−
38− for i in $(seq 0 $(($dev_num - 1))); do
36+ for i in $(seq $dev_start $dev_end); do
3937 echo "fill zram$i..."
4038 local b=0
4139 while [ true ]; do
@@ -45,29 +43,17 @@ zram_fill_fs() · 3 unmodified lines
4543 b=$(($b + 1))
4644 done
4745 echo "zram$i can be filled with '$b' KB"
48− done
4946
50− local mem_free1=$(free -m | awk 'NR==2 {print $4}')
51− local used_mem=$(($mem_free0 - $mem_free1))
47+ local mem_used_total=`awk '{print $3}' "/sys/block/zram$i/mm_stat"`
48+ local v=$((100 * 1024 * $b / $mem_used_total))
49+ if [ "$v" -lt 100 ]; then
50+ echo "FAIL compression ratio: 0.$v:1"
51+ ERR_CODE=-1
52+ return
53+ fi
5254
53− local total_size=0
54− for sm in $zram_sizes; do
55− local s=$(echo $sm | sed 's/M//')
56− total_size=$(($total_size + $s))
55+ echo "zram compression ratio: $(echo "scale=2; $v / 100 " | bc):1: OK"
5756 done
58−
59− echo "zram used ${used_mem}M, zram disk sizes ${total_size}M"
60−
61− local v=$((100 * $total_size / $used_mem))
62−
63− if [ "$v" -lt 100 ]; then
64− echo "FAIL compression ratio: 0.$v:1"
65− ERR_CODE=-1
66− zram_cleanup
67− return
68− fi
69−
70− echo "zram compression ratio: $(echo "scale=2; $v / 100 " | bc):1: OK"
7157 }
7258
7359 check_prereqs
@@ -81,7 +67,6 @@ zram_mount · 7 unmodified lines
8167
8268 zram_fill_fs
8369 zram_cleanup
84−zram_unload
8570
8671 if [ $ERR_CODE -ne 0 ]; then
8772 echo "$TCID : [FAIL]"
tools/testing/selftests/zram/zram02.sh+0−1
@@ -36,7 +36,6 @@ zram_set_memlimit · 35 unmodified lines
3636 zram_makeswap
3737 zram_swapoff
3838 zram_cleanup
39−zram_unload
4039
4140 if [ $ERR_CODE -ne 0 ]; then
4241 echo "$TCID : [FAIL]"
tools/testing/selftests/zram/zram_lib.sh+88−46
@@ -5,12 +5,17 @@ · 4 unmodified lines
55 # Author: Alexey Kodanev <alexey.kodanev@oracle.com>
66 # Modified: Naresh Kamboju <naresh.kamboju@linaro.org>
77
8−MODULE=0
98 dev_makeswap=-1
109 dev_mounted=-1
11−
10+dev_start=0
11+dev_end=-1
12+module_load=-1
13+sys_control=-1
1214 # Kselftest framework requirement - SKIP code is 4.
1315 ksft_skip=4
16+kernel_version=`uname -r | cut -d'.' -f1,2`
17+kernel_major=${kernel_version%.*}
18+kernel_minor=${kernel_version#*.}
1419
1520 trap INT
1621
@@ -25,68 +30,104 @@ check_prereqs() · 8 unmodified lines
2530 fi
2631 }
2732
33+kernel_gte()
34+{
35+ major=${1%.*}
36+ minor=${1#*.}
37+
38+ if [ $kernel_major -gt $major ]; then
39+ return 0
40+ elif [[ $kernel_major -eq $major && $kernel_minor -ge $minor ]]; then
41+ return 0
42+ fi
43+
44+ return 1
45+}
46+
2847 zram_cleanup()
2948 {
3049 echo "zram cleanup"
3150 local i=
32− for i in $(seq 0 $dev_makeswap); do
51+ for i in $(seq $dev_start $dev_makeswap); do
3352 swapoff /dev/zram$i
3453 done
3554
36− for i in $(seq 0 $dev_mounted); do
55+ for i in $(seq $dev_start $dev_mounted); do
3756 umount /dev/zram$i
3857 done
3958
40− for i in $(seq 0 $(($dev_num - 1))); do
59+ for i in $(seq $dev_start $dev_end); do
4160 echo 1 > /sys/block/zram${i}/reset
4261 rm -rf zram$i
4362 done
4463
45−}
64+ if [ $sys_control -eq 1 ]; then
65+ for i in $(seq $dev_start $dev_end); do
66+ echo $i > /sys/class/zram-control/hot_remove
67+ done
68+ fi
4669
47−zram_unload()
48−{
49− if [ $MODULE -ne 0 ] ; then
50− echo "zram rmmod zram"
70+ if [ $module_load -eq 1 ]; then
5171 rmmod zram > /dev/null 2>&1
5272 fi
5373 }
5474
5575 zram_load()
5676 {
57− # check zram module exists
58− MODULE_PATH=/lib/modules/`uname -r`/kernel/drivers/block/zram/zram.ko
59− if [ -f $MODULE_PATH ]; then
60− MODULE=1
61− echo "create '$dev_num' zram device(s)"
62− modprobe zram num_devices=$dev_num
63− if [ $? -ne 0 ]; then
64− echo "failed to insert zram module"
65− exit 1
66− fi
67−
68− dev_num_created=$(ls /dev/zram* | wc -w)
77+ echo "create '$dev_num' zram device(s)"
78+
79+ # zram module loaded, new kernel
80+ if [ -d "/sys/class/zram-control" ]; then
81+ echo "zram modules already loaded, kernel supports" \
82+ "zram-control interface"
83+ dev_start=$(ls /dev/zram* | wc -w)
84+ dev_end=$(($dev_start + $dev_num - 1))
85+ sys_control=1
86+
87+ for i in $(seq $dev_start $dev_end); do
88+ cat /sys/class/zram-control/hot_add > /dev/null
89+ done
90+
91+ echo "all zram devices (/dev/zram$dev_start~$dev_end" \
92+ "successfully created"
93+ return 0
94+ fi
6995
70− if [ "$dev_num_created" -ne "$dev_num" ]; then
71− echo "unexpected num of devices: $dev_num_created"
72− ERR_CODE=-1
96+ # detect old kernel or built-in
97+ modprobe zram num_devices=$dev_num
98+ if [ ! -d "/sys/class/zram-control" ]; then
99+ if grep -q '^zram' /proc/modules; then
100+ rmmod zram > /dev/null 2>&1
101+ if [ $? -ne 0 ]; then
102+ echo "zram module is being used on old kernel" \
103+ "without zram-control interface"
104+ exit $ksft_skip
105+ fi
73106 else
74− echo "zram load module successful"
107+ echo "test needs CONFIG_ZRAM=m on old kernel without" \
108+ "zram-control interface"
109+ exit $ksft_skip
75110 fi
76− elif [ -b /dev/zram0 ]; then
77− echo "/dev/zram0 device file found: OK"
78− else
79− echo "ERROR: No zram.ko module or no /dev/zram0 device found"
80− echo "$TCID : CONFIG_ZRAM is not set"
81− exit 1
111+ modprobe zram num_devices=$dev_num
82112 fi
113+
114+ module_load=1
115+ dev_end=$(($dev_num - 1))
116+ echo "all zram devices (/dev/zram0~$dev_end) successfully created"
83117 }
84118
85119 zram_max_streams()
86120 {
87121 echo "set max_comp_streams to zram device(s)"
88122
89− local i=0
123+ kernel_gte 4.7
124+ if [ $? -eq 0 ]; then
125+ echo "The device attribute max_comp_streams was"\
126+ "deprecated in 4.7"
127+ return 0
128+ fi
129+
130+ local i=$dev_start
90131 for max_s in $zram_max_streams; do
91132 local sys_path="/sys/block/zram${i}/max_comp_streams"
92133 echo $max_s > $sys_path || \
@@ -98,7 +139,7 @@ zram_max_streams() · 5 unmodified lines
98139 echo "FAIL can't set max_streams '$max_s', get $max_stream"
99140
100141 i=$(($i + 1))
101− echo "$sys_path = '$max_streams' ($i/$dev_num)"
142+ echo "$sys_path = '$max_streams'"
102143 done
103144
104145 echo "zram max streams: OK"
@@ -108,15 +149,16 @@ zram_compress_alg() · 3 unmodified lines
108149 {
109150 echo "test that we can set compression algorithm"
110151
111− local algs=$(cat /sys/block/zram0/comp_algorithm)
152+ local i=$dev_start
153+ local algs=$(cat /sys/block/zram${i}/comp_algorithm)
112154 echo "supported algs: $algs"
113− local i=0
155+
114156 for alg in $zram_algs; do
115157 local sys_path="/sys/block/zram${i}/comp_algorithm"
116158 echo "$alg" > $sys_path || \
117159 echo "FAIL can't set '$alg' to $sys_path"
118160 i=$(($i + 1))
119− echo "$sys_path = '$alg' ($i/$dev_num)"
161+ echo "$sys_path = '$alg'"
120162 done
121163
122164 echo "zram set compression algorithm: OK"
@@ -125,14 +167,14 @@ zram_compress_alg() · 2 unmodified lines
125167 zram_set_disksizes()
126168 {
127169 echo "set disk size to zram device(s)"
128− local i=0
170+ local i=$dev_start
129171 for ds in $zram_sizes; do
130172 local sys_path="/sys/block/zram${i}/disksize"
131173 echo "$ds" > $sys_path || \
132174 echo "FAIL can't set '$ds' to $sys_path"
133175
134176 i=$(($i + 1))
135− echo "$sys_path = '$ds' ($i/$dev_num)"
177+ echo "$sys_path = '$ds'"
136178 done
137179
138180 echo "zram set disksizes: OK"
@@ -142,14 +184,14 @@ zram_set_memlimit() · 3 unmodified lines
142184 {
143185 echo "set memory limit to zram device(s)"
144186
145− local i=0
187+ local i=$dev_start
146188 for ds in $zram_mem_limits; do
147189 local sys_path="/sys/block/zram${i}/mem_limit"
148190 echo "$ds" > $sys_path || \
149191 echo "FAIL can't set '$ds' to $sys_path"
150192
151193 i=$(($i + 1))
152− echo "$sys_path = '$ds' ($i/$dev_num)"
194+ echo "$sys_path = '$ds'"
153195 done
154196
155197 echo "zram set memory limit: OK"
@@ -158,8 +200,8 @@ zram_set_memlimit() · 2 unmodified lines
158200 zram_makeswap()
159201 {
160202 echo "make swap with zram device(s)"
161− local i=0
162− for i in $(seq 0 $(($dev_num - 1))); do
203+ local i=$dev_start
204+ for i in $(seq $dev_start $dev_end); do
163205 mkswap /dev/zram$i > err.log 2>&1
164206 if [ $? -ne 0 ]; then
165207 cat err.log
@@ -182,7 +224,7 @@ zram_makeswap() · 16 unmodified lines
182224 zram_swapoff()
183225 {
184226 local i=
185− for i in $(seq 0 $dev_makeswap); do
227+ for i in $(seq $dev_start $dev_end); do
186228 swapoff /dev/zram$i > err.log 2>&1
187229 if [ $? -ne 0 ]; then
188230 cat err.log
@@ -196,7 +238,7 @@ zram_swapoff() · 7 unmodified lines
196238
197239 zram_makefs()
198240 {
199− local i=0
241+ local i=$dev_start
200242 for fs in $zram_filesystems; do
201243 # if requested fs not supported default it to ext2
202244 which mkfs.$fs > /dev/null 2>&1 || fs=ext2
@@ -215,7 +257,7 @@ zram_makefs() · 12 unmodified lines
215257 zram_mount()
216258 {
217259 local i=0
218− for i in $(seq 0 $(($dev_num - 1))); do
260+ for i in $(seq $dev_start $dev_end); do
219261 echo "mount /dev/zram$i"
220262 mkdir zram$i
221263 mount /dev/zram$i zram$i > /dev/null || \

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t