-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmUJdfMACgkQONu9yGCS aT7i/w//Wbvt3F9hF/9Rmg9A4J23OWl2o07Z8Fi0a4F4B0FJjuQGSPRvpSvKtIWv +7taCzOw9+Qi52hTR7BK+QpLpEPgMbv1IdgyPu1gtjL4WHuKk1aOeafISYuQDgeZ XSFoV1EGjxkg3wbMZkucnmQVitGxC/iV0ojvxKleiIE9UNzceQclGmmBL0FwmEYp c91XKEACZ5K/spSyyxocP4Fw6mbk98ISiju+74op5EDFry9qnIYa2pU/au3gZvh/ TScOYOQsBojOFTy/wuEfpOiVBK9gLFq8du0J/gHS2aUqswkp/qFcpH7wbS5Po3+l Ja9a76o2B4btMCz6UhyhwzB+0QTQ1Gdea35FHRbF3d4ssNJDqDtwBCHqd3zeMUYo uTDhyTsSGV40Gm9A5Sojyzjgj4X12rQ0ffL+zcXfXe60flE8SNIxR8DiIXPlAsC+ pgNQ5l/HcdJE1abRoTkvpsptaT2sNXgwZZij+VOBI3Vp4wr61U69CfP/QWWPZZF5 ECEh8ZDK1roiEyBjn6njqXmt5vbmNasgI5umgnNPBgKEB2OLXqox6rn9XK0qMJ+X /oiCaL9RveU/QL5qNvV6Z2beXPwT51Vdy8+bQBfb5bUFRGQcTVIWaBRG0ZIHeSGm pG10/VAnCGtNrC6M/HVGd0Wyih+ur65Jz/rNKbkMX69cvJuxPWk= =RAs8 -----END PGP SIGNATURE----- Merge 5.10.195 into android12-5.10-lts Changes in 5.10.195 erofs: ensure that the post-EOF tails are all zeroed ARM: pxa: remove use of symbol_get() mmc: au1xmmc: force non-modular build and remove symbol_get usage net: enetc: use EXPORT_SYMBOL_GPL for enetc_phc_index rtc: ds1685: use EXPORT_SYMBOL_GPL for ds1685_rtc_poweroff modules: only allow symbol_get of EXPORT_SYMBOL_GPL modules USB: serial: option: add Quectel EM05G variant (0x030e) USB: serial: option: add FOXCONN T99W368/T99W373 product usb: dwc3: meson-g12a: do post init to fix broken usb after resumption usb: chipidea: imx: improve logic if samsung,picophy-* parameter is 0 HID: wacom: remove the battery when the EKR is off staging: rtl8712: fix race condition Bluetooth: btsdio: fix use after free bug in btsdio_remove due to race condition configfs: fix a race in configfs_lookup() serial: qcom-geni: fix opp vote on shutdown serial: sc16is7xx: fix broken port 0 uart init serial: sc16is7xx: fix bug when first setting GPIO direction firmware: stratix10-svc: Fix an NULL vs IS_ERR() bug in probe fsi: master-ast-cf: Add MODULE_FIRMWARE macro nilfs2: fix general protection fault in nilfs_lookup_dirty_data_buffers() nilfs2: fix WARNING in mark_buffer_dirty due to discarded buffer reuse pinctrl: amd: Don't show `Invalid config param` errors ASoC: rt5682: Fix a problem with error handling in the io init function of the soundwire ARM: dts: imx: update sdma node name format ARM: dts: imx7s: Drop dma-apb interrupt-names ARM: dts: imx: Adjust dma-apbh node name ARM: dts: imx: Set default tuning step for imx7d usdhc phy: qcom-snps-femto-v2: use qcom_snps_hsphy_suspend/resume error code media: pulse8-cec: handle possible ping error media: pci: cx23885: fix error handling for cx23885 ATSC boards 9p: virtio: make sure 'offs' is initialized in zc_request ASoC: da7219: Flush pending AAD IRQ when suspending ASoC: da7219: Check for failure reading AAD IRQ events ethernet: atheros: fix return value check in atl1c_tso_csum() vxlan: generalize vxlan_parse_gpe_hdr and remove unused args m68k: Fix invalid .section syntax s390/dasd: use correct number of retries for ERP requests s390/dasd: fix hanging device after request requeue fs/nls: make load_nls() take a const parameter ASoc: codecs: ES8316: Fix DMIC config ASoC: atmel: Fix the 8K sample parameter in I2SC master platform/x86: intel: hid: Always call BTNL ACPI method platform/x86: huawei-wmi: Silence ambient light sensor drm/amd/display: Exit idle optimizations before attempt to access PHY ovl: Always reevaluate the file signature for IMA ata: pata_arasan_cf: Use dev_err_probe() instead dev_err() in data_xfer() security: keys: perform capable check only on privileged operations kprobes: Prohibit probing on CFI preamble symbol clk: fixed-mmio: make COMMON_CLK_FIXED_MMIO depend on HAS_IOMEM vmbus_testing: fix wrong python syntax for integer value comparison net: usb: qmi_wwan: add Quectel EM05GV2 idmaengine: make FSL_EDMA and INTEL_IDMA64 depends on HAS_IOMEM scsi: qedi: Fix potential deadlock on &qedi_percpu->p_work_lock netlabel: fix shift wrapping bug in netlbl_catmap_setlong() bnx2x: fix page fault following EEH recovery sctp: handle invalid error codes without calling BUG() scsi: storvsc: Always set no_report_opcodes ALSA: seq: oss: Fix racy open/close of MIDI devices tracing: Introduce pipe_cpumask to avoid race on trace_pipes platform/mellanox: Fix mlxbf-tmfifo not handling all virtio CONSOLE notifications net: Avoid address overwrite in kernel_connect udf: Check consistency of Space Bitmap Descriptor udf: Handle error when adding extent to a file Revert "net: macsec: preserve ingress frame ordering" reiserfs: Check the return value from __getblk() eventfd: Export eventfd_ctx_do_read() eventfd: prevent underflow for eventfd semaphores fs: Fix error checking for d_hash_and_lookup() tmpfs: verify {g,u}id mount options correctly selftests/harness: Actually report SKIP for signal tests refscale: Fix uninitalized use of wait_queue_head_t OPP: Fix passing 0 to PTR_ERR in _opp_attach_genpd() selftests/resctrl: Don't leak buffer in fill_cache() selftests/resctrl: Unmount resctrl FS if child fails to run benchmark selftests/resctrl: Close perf value read fd on errors x86/decompressor: Don't rely on upper 32 bits of GPRs being preserved perf/imx_ddr: don't enable counter0 if none of 4 counters are used s390/pkey: fix/harmonize internal keyblob headers s390/paes: fix PKEY_TYPE_EP11_AES handling for secure keyblobs x86/efistub: Fix PCI ROM preservation in mixed mode cpufreq: powernow-k8: Use related_cpus instead of cpus in driver.exit() bpftool: Use a local bpf_perf_event_value to fix accessing its fields bpf: Clear the probe_addr for uprobe tcp: tcp_enter_quickack_mode() should be static hwrng: nomadik - keep clock enabled while hwrng is registered regmap: rbtree: Use alloc_flags for memory allocations udp: re-score reuseport groups when connected sockets are present bpf: reject unhashed sockets in bpf_sk_assign wifi: mt76: testmode: add nla_policy for MT76_TM_ATTR_TX_LENGTH spi: tegra20-sflash: fix to check return value of platform_get_irq() in tegra_sflash_probe() can: gs_usb: gs_usb_receive_bulk_callback(): count RX overflow errors also in case of OOM wifi: mwifiex: Fix OOB and integer underflow when rx packets wifi: mwifiex: fix error recovery in PCIE buffer descriptor management selftests/bpf: fix static assert compilation issue for test_cls_*.c crypto: stm32 - Properly handle pm_runtime_get failing crypto: api - Use work queue in crypto_destroy_instance Bluetooth: nokia: fix value check in nokia_bluetooth_serdev_probe() Bluetooth: Fix potential use-after-free when clear keys net: tcp: fix unexcepted socket die when snd_wnd is 0 selftests/bpf: Clean up fmod_ret in bench_rename test script ice: ice_aq_check_events: fix off-by-one check when filling buffer crypto: caam - fix unchecked return value error hwrng: iproc-rng200 - Implement suspend and resume calls lwt: Fix return values of BPF xmit ops lwt: Check LWTUNNEL_XMIT_CONTINUE strictly fs: ocfs2: namei: check return value of ocfs2_add_entry() wifi: mwifiex: fix memory leak in mwifiex_histogram_read() wifi: mwifiex: Fix missed return in oob checks failed path samples/bpf: fix broken map lookup probe wifi: ath9k: fix races between ath9k_wmi_cmd and ath9k_wmi_ctrl_rx wifi: ath9k: protect WMI command response buffer replacement with a lock wifi: mwifiex: avoid possible NULL skb pointer dereference Bluetooth: btusb: Do not call kfree_skb() under spin_lock_irqsave() wifi: ath9k: use IS_ERR() with debugfs_create_dir() net: arcnet: Do not call kfree_skb() under local_irq_disable() mlxsw: i2c: Fix chunk size setting in output mailbox buffer mlxsw: i2c: Limit single transaction buffer size hwmon: (tmp513) Fix the channel number in tmp51x_is_visible() net/sched: sch_hfsc: Ensure inner classes have fsc curve netrom: Deny concurrent connect(). drm/bridge: tc358764: Fix debug print parameter order quota: factor out dquot_write_dquot() quota: rename dquot_active() to inode_quota_active() quota: add new helper dquot_active() quota: fix dqput() to follow the guarantees dquot_srcu should provide ASoC: stac9766: fix build errors with REGMAP_AC97 soc: qcom: ocmem: Add OCMEM hardware version print soc: qcom: ocmem: Fix NUM_PORTS & NUM_MACROS macros arm64: dts: qcom: msm8996: Add missing interrupt to the USB2 controller drm/amdgpu: avoid integer overflow warning in amdgpu_device_resize_fb_bar() ARM: dts: BCM5301X: Harmonize EHCI/OHCI DT nodes name ARM: dts: BCM53573: Describe on-SoC BCM53125 rev 4 switch ARM: dts: BCM53573: Drop nonexistent #usb-cells ARM: dts: BCM53573: Add cells sizes to PCIe node ARM: dts: BCM53573: Use updated "spi-gpio" binding properties drm/etnaviv: fix dumping of active MMU context x86/mm: Fix PAT bit missing from page protection modify mask ARM: dts: s3c64xx: align pinctrl with dtschema ARM: dts: samsung: s3c6410-mini6410: correct ethernet reg addresses (split) ARM: dts: s5pv210: adjust node names to DT spec ARM: dts: s5pv210: add dummy 5V regulator for backlight on SMDKv210 ARM: dts: samsung: s5pv210-smdkv210: correct ethernet reg addresses (split) drm: adv7511: Fix low refresh rate register for ADV7533/5 ARM: dts: BCM53573: Fix Ethernet info for Luxul devices arm64: dts: qcom: sdm845: Add missing RPMh power domain to GCC arm64: dts: qcom: sdm845: Fix the min frequency of "ice_core_clk" drm/amdgpu: Update min() to min_t() in 'amdgpu_info_ioctl' md/bitmap: don't set max_write_behind if there is no write mostly device md/md-bitmap: hold 'reconfig_mutex' in backlog_store() drm/tegra: Remove superfluous error messages around platform_get_irq() drm/tegra: dpaux: Fix incorrect return value of platform_get_irq of: unittest: fix null pointer dereferencing in of_unittest_find_node_by_name() drm/armada: Fix off-by-one error in armada_overlay_get_property() drm/panel: simple: Add missing connector type and pixel format for AUO T215HVN01 ima: Remove deprecated IMA_TRUSTED_KEYRING Kconfig drm: xlnx: zynqmp_dpsub: Add missing check for dma_set_mask drm/msm/mdp5: Don't leak some plane state firmware: meson_sm: fix to avoid potential NULL pointer dereference smackfs: Prevent underflow in smk_set_cipso() drm/amd/pm: fix variable dereferenced issue in amdgpu_device_attr_create() drm/msm/a2xx: Call adreno_gpu_init() earlier audit: fix possible soft lockup in __audit_inode_child() bus: ti-sysc: Fix build warning for 64-bit build drm/mediatek: Fix potential memory leak if vmap() fail bus: ti-sysc: Fix cast to enum warning of: unittest: Fix overlay type in apply/revert check ALSA: ac97: Fix possible error value of *rac97 ipmi:ssif: Add check for kstrdup ipmi:ssif: Fix a memory leak when scanning for an adapter drivers: clk: keystone: Fix parameter judgment in _of_pll_clk_init() clk: sunxi-ng: Modify mismatched function name clk: qcom: gcc-sc7180: use ARRAY_SIZE instead of specifying num_parents clk: qcom: gcc-sc7180: Fix up gcc_sdcc2_apps_clk_src ext4: correct grp validation in ext4_mb_good_group clk: qcom: gcc-sm8250: use ARRAY_SIZE instead of specifying num_parents clk: qcom: gcc-sm8250: Fix gcc_sdcc2_apps_clk_src clk: qcom: reset: Use the correct type of sleep/delay based on length PCI: Mark NVIDIA T4 GPUs to avoid bus reset pinctrl: mcp23s08: check return value of devm_kasprintf() PCI: pciehp: Use RMW accessors for changing LNKCTL PCI/ASPM: Use RMW accessors for changing LNKCTL clk: imx8mp: fix sai4 clock clk: imx: composite-8m: fix clock pauses when set_rate would be a no-op vfio/type1: fix cap_migration information leak powerpc/fadump: reset dump area size if fadump memory reserve fails powerpc/perf: Convert fsl_emb notifier to state machine callbacks drm/amdgpu: Use RMW accessors for changing LNKCTL drm/radeon: Use RMW accessors for changing LNKCTL net/mlx5: Use RMW accessors for changing LNKCTL wifi: ath10k: Use RMW accessors for changing LNKCTL powerpc: Don't include lppaca.h in paca.h powerpc/pseries: Rework lppaca_shared_proc() to avoid DEBUG_PREEMPT nfs/blocklayout: Use the passed in gfp flags powerpc/iommu: Fix notifiers being shared by PCI and VIO buses jfs: validate max amount of blocks before allocation. fs: lockd: avoid possible wrong NULL parameter NFSD: da_addr_body field missing in some GETDEVICEINFO replies NFS: Guard against READDIR loop when entry names exceed MAXNAMELEN NFSv4.2: fix handling of COPY ERR_OFFLOAD_NO_REQ media: ad5820: Drop unsupported ad5823 from i2c_ and of_device_id tables media: i2c: tvp5150: check return value of devm_kasprintf() media: v4l2-core: Fix a potential resource leak in v4l2_fwnode_parse_link() drivers: usb: smsusb: fix error handling code in smsusb_init_device media: dib7000p: Fix potential division by zero media: dvb-usb: m920x: Fix a potential memory leak in m920x_i2c_xfer() media: cx24120: Add retval check for cx24120_message_send() scsi: hisi_sas: Print SAS address for v3 hw erroneous completion print scsi: libsas: Introduce more SAM status code aliases in enum exec_status scsi: hisi_sas: Modify v3 HW SSP underflow error processing scsi: hisi_sas: Modify v3 HW SATA completion error processing scsi: hisi_sas: Fix warnings detected by sparse scsi: hisi_sas: Fix normally completed I/O analysed as failed media: rkvdec: increase max supported height for H.264 media: mediatek: vcodec: Return NULL if no vdec_fb is found usb: phy: mxs: fix getting wrong state with mxs_phy_is_otg_host() scsi: RDMA/srp: Fix residual handling scsi: iscsi: Rename iscsi_set_param() to iscsi_if_set_param() scsi: iscsi: Add length check for nlattr payload scsi: iscsi: Add strlen() check in iscsi_if_set{_host}_param() scsi: be2iscsi: Add length check when parsing nlattrs scsi: qla4xxx: Add length check when parsing nlattrs serial: sprd: Assign sprd_port after initialized to avoid wrong access serial: sprd: Fix DMA buffer leak issue x86/APM: drop the duplicate APM_MINOR_DEV macro scsi: qedf: Do not touch __user pointer in qedf_dbg_stop_io_on_error_cmd_read() directly scsi: qedf: Do not touch __user pointer in qedf_dbg_debug_cmd_read() directly scsi: qedf: Do not touch __user pointer in qedf_dbg_fp_int_cmd_read() directly coresight: tmc: Explicit type conversions to prevent integer overflow dma-buf/sync_file: Fix docs syntax driver core: test_async: fix an error code IB/uverbs: Fix an potential error pointer dereference fsi: aspeed: Reset master errors after CFAM reset iommu/qcom: Disable and reset context bank before programming iommu/vt-d: Fix to flush cache of PASID directory table media: go7007: Remove redundant if statement USB: gadget: f_mass_storage: Fix unused variable warning media: ov5640: Enable MIPI interface in ov5640_set_power_mipi() media: i2c: ov2680: Set V4L2_CTRL_FLAG_MODIFY_LAYOUT on flips media: ov2680: Remove auto-gain and auto-exposure controls media: ov2680: Fix ov2680_bayer_order() media: ov2680: Fix vflip / hflip set functions media: ov2680: Fix regulators being left enabled on ov2680_power_on() errors cgroup:namespace: Remove unused cgroup_namespaces_init() scsi: core: Use 32-bit hostnum in scsi_host_lookup() scsi: fcoe: Fix potential deadlock on &fip->ctlr_lock serial: tegra: handle clk prepare error in tegra_uart_hw_init() amba: bus: fix refcount leak Revert "IB/isert: Fix incorrect release of isert connection" RDMA/siw: Balance the reference of cep->kref in the error path RDMA/siw: Correct wrong debug message HID: logitech-dj: Fix error handling in logi_dj_recv_switch_to_dj_mode() HID: multitouch: Correct devm device reference for hidinput input_dev name x86/speculation: Mark all Skylake CPUs as vulnerable to GDS tracing: Fix race issue between cpu buffer write and swap mtd: rawnand: brcmnand: Fix mtd oobsize phy/rockchip: inno-hdmi: use correct vco_div_5 macro on rk3328 phy/rockchip: inno-hdmi: round fractal pixclock in rk3328 recalc_rate phy/rockchip: inno-hdmi: do not power on rk3328 post pll on reg write rpmsg: glink: Add check for kstrdup mtd: spi-nor: Check bus width while setting QE bit mtd: rawnand: fsmc: handle clk prepare error in fsmc_nand_resume() um: Fix hostaudio build errors dmaengine: ste_dma40: Add missing IRQ check in d40_probe cpufreq: Fix the race condition while updating the transition_task of policy virtio_ring: fix avail_wrap_counter in virtqueue_add_packed igmp: limit igmpv3_newpack() packet size to IP_MAX_MTU netfilter: ipset: add the missing IP_SET_HASH_WITH_NET0 macro for ip_set_hash_netportnet.c netfilter: xt_u32: validate user space input netfilter: xt_sctp: validate the flag_info count skbuff: skb_segment, Call zero copy functions before using skbuff frags igb: set max size RX buffer when store bad packet is enabled PM / devfreq: Fix leak in devfreq_dev_release() ALSA: pcm: Fix missing fixup call in compat hw_refine ioctl printk: ringbuffer: Fix truncating buffer size min_t cast scsi: core: Fix the scsi_set_resid() documentation ipmi_si: fix a memleak in try_smi_init() ARM: OMAP2+: Fix -Warray-bounds warning in _pwrdm_state_switch() backlight/gpio_backlight: Compare against struct fb_info.device backlight/bd6107: Compare against struct fb_info.device backlight/lv5207lp: Compare against struct fb_info.device xtensa: PMU: fix base address for the newer hardware arm64: csum: Fix OoB access in IP checksum code for negative lengths media: dvb: symbol fixup for dvb_attach() Revert "scsi: qla2xxx: Fix buffer overrun" scsi: mpt3sas: Perform additional retries if doorbell read returns 0 ntb: Drop packets when qp link is down ntb: Clean up tx tail index on link down ntb: Fix calculation ntb_transport_tx_free_entry() Revert "PCI: Mark NVIDIA T4 GPUs to avoid bus reset" procfs: block chmod on /proc/thread-self/comm parisc: Fix /proc/cpuinfo output for lscpu dlm: fix plock lookup when using multiple lockspaces dccp: Fix out of bounds access in DCCP error handler X.509: if signature is unsupported skip validation net: handle ARPHRD_PPP in dev_is_mac_header_xmit() fsverity: skip PKCS#7 parser when keyring is empty pstore/ram: Check start of empty przs during init s390/ipl: add missing secure/has_secure file to ipl type 'unknown' crypto: stm32 - fix loop iterating through scatterlist for DMA cpufreq: brcmstb-avs-cpufreq: Fix -Warray-bounds bug usb: typec: bus: verify partner exists in typec_altmode_attention USB: core: Unite old scheme and new scheme descriptor reads USB: core: Change usb_get_device_descriptor() API USB: core: Fix race by not overwriting udev->descriptor in hub_port_init() USB: core: Fix oversight in SuperSpeed initialization usb: typec: tcpci: clear the fault status bit tracing: Zero the pipe cpumask on alloc to avoid spurious -EBUSY md/md-bitmap: remove unnecessary local variable in backlog_store() udf: initialize newblock to 0 net/ipv6: SKB symmetric hash should incorporate transport ports io_uring: always lock in io_apoll_task_func io_uring: break out of iowq iopoll on teardown io_uring: break iopolling on signal scsi: qla2xxx: Fix deletion race condition scsi: qla2xxx: fix inconsistent TMF timeout scsi: qla2xxx: Fix erroneous link up failure scsi: qla2xxx: Turn off noisy message log scsi: qla2xxx: Remove unsupported ql2xenabledif option fbdev/ep93xx-fb: Do not assign to struct fb_info.dev drm/ast: Fix DRAM init on AST2200 lib/test_meminit: allocate pages up to order MAX_ORDER parisc: led: Fix LAN receive and transmit LEDs parisc: led: Reduce CPU overhead for disk & lan LED computation pinctrl: cherryview: fix address_space_handler() argument dt-bindings: clock: xlnx,versal-clk: drop select:false clk: imx: pll14xx: dynamically configure PLL for 393216000/361267200Hz clk: qcom: gcc-mdm9615: use proper parent for pll0_vote clock soc: qcom: qmi_encdec: Restrict string length in decode NFS: Fix a potential data corruption NFSv4/pnfs: minor fix for cleanup path in nfs4_get_device_info kconfig: fix possible buffer overflow backlight: gpio_backlight: Drop output GPIO direction check for initial power state perf annotate bpf: Don't enclose non-debug code with an assert() x86/virt: Drop unnecessary check on extended CPUID level in cpu_has_svm() perf top: Don't pass an ERR_PTR() directly to perf_session__delete() watchdog: intel-mid_wdt: add MODULE_ALIAS() to allow auto-load pwm: lpc32xx: Remove handling of PWM channels net/sched: fq_pie: avoid stalls in fq_pie_timer() sctp: annotate data-races around sk->sk_wmem_queued ipv4: annotate data-races around fi->fib_dead net: read sk->sk_family once in sk_mc_loop() drm/i915/gvt: Save/restore HW status to support GVT suspend/resume drm/i915/gvt: Drop unused helper intel_vgpu_reset_gtt() ipv4: ignore dst hint for multipath routes igb: disable virtualization features on 82580 veth: Fixing transmit return status for dropped packets net: ipv6/addrconf: avoid integer underflow in ipv6_create_tempaddr af_unix: Fix data-races around user->unix_inflight. af_unix: Fix data-race around unix_tot_inflight. af_unix: Fix data-races around sk->sk_shutdown. af_unix: Fix data race around sk->sk_err. net: sched: sch_qfq: Fix UAF in qfq_dequeue() kcm: Destroy mutex in kcm_exit_net() igc: Change IGC_MIN to allow set rx/tx value between 64 and 80 igbvf: Change IGBVF_MIN to allow set rx/tx value between 64 and 80 igb: Change IGB_MIN to allow set rx/tx value between 64 and 80 s390/zcrypt: don't leak memory if dev_set_name() fails idr: fix param name in idr_alloc_cyclic() doc ip_tunnels: use DEV_STATS_INC() net: dsa: sja1105: fix bandwidth discrepancy between tc-cbs software and offload net: dsa: sja1105: fix -ENOSPC when replacing the same tc-cbs too many times netfilter: nfnetlink_osf: avoid OOB read net: hns3: fix the port information display when sfp is absent sh: boards: Fix CEU buffer size passed to dma_declare_coherent_memory() ext4: add correct group descriptors and reserved GDT blocks to system zone ata: sata_gemini: Add missing MODULE_DESCRIPTION ata: pata_ftide010: Add missing MODULE_DESCRIPTION fuse: nlookup missing decrement in fuse_direntplus_link btrfs: don't start transaction when joining with TRANS_JOIN_NOSTART btrfs: use the correct superblock to compare fsid in btrfs_validate_super mtd: rawnand: brcmnand: Fix crash during the panic_write mtd: rawnand: brcmnand: Fix potential out-of-bounds access in oob write mtd: rawnand: brcmnand: Fix potential false time out warning drm/amd/display: prevent potential division by zero errors perf hists browser: Fix hierarchy mode header perf tools: Handle old data in PERF_RECORD_ATTR perf hists browser: Fix the number of entries for 'e' key ACPI: APEI: explicit init of HEST and GHES in apci_init() arm64: sdei: abort running SDEI handlers during crash scsi: qla2xxx: If fcport is undergoing deletion complete I/O with retry scsi: qla2xxx: Consolidate zio threshold setting for both FCP & NVMe scsi: qla2xxx: Fix crash in PCIe error handling scsi: qla2xxx: Flush mailbox commands on chip reset ARM: dts: samsung: exynos4210-i9100: Fix LCD screen's physical size ARM: dts: BCM5301X: Extend RAM to full 256MB for Linksys EA6500 V2 bus: mhi: host: Skip MHI reset if device is in RDDM net: ipv4: fix one memleak in __inet_del_ifa() selftests/kselftest/runner/run_one(): allow running non-executable files kselftest/runner.sh: Propagate SIGTERM to runner child net/smc: use smc_lgr_list.lock to protect smc_lgr_list.list iterate in smcr_port_add net: ethernet: mvpp2_main: fix possible OOB write in mvpp2_ethtool_get_rxnfc() net: ethernet: mtk_eth_soc: fix possible NULL pointer dereference in mtk_hwlro_get_fdir_all() hsr: Fix uninit-value access in fill_frame_info() r8152: check budget for r8152_poll() kcm: Fix memory leak in error path of kcm_sendmsg() platform/mellanox: mlxbf-tmfifo: Drop the Rx packet if no more descriptors platform/mellanox: mlxbf-tmfifo: Drop jumbo frames net/tls: do not free tls_rec on async operation in bpf_exec_tx_verdict() ipv6: fix ip6_sock_set_addr_preferences() typo ixgbe: fix timestamp configuration code kcm: Fix error handling for SOCK_DGRAM in kcm_sendmsg(). drm/amd/display: Fix a bug when searching for insert_above_mpcc parisc: Drop loops_per_jiffy from per_cpu struct Linux 5.10.195 Change-Id: I4eef618f573b6d4201e05c9cf56088d77d712d97 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
1626 lines
41 KiB
C
1626 lines
41 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
/*
|
|
* Copyright (C) 2018 HUAWEI, Inc.
|
|
* https://www.huawei.com/
|
|
* Created by Gao Xiang <gaoxiang25@huawei.com>
|
|
*/
|
|
#include "zdata.h"
|
|
#include "compress.h"
|
|
#include <linux/prefetch.h>
|
|
#include <linux/cpuhotplug.h>
|
|
#include <trace/events/erofs.h>
|
|
|
|
/*
|
|
* since pclustersize is variable for big pcluster feature, introduce slab
|
|
* pools implementation for different pcluster sizes.
|
|
*/
|
|
struct z_erofs_pcluster_slab {
|
|
struct kmem_cache *slab;
|
|
unsigned int maxpages;
|
|
char name[48];
|
|
};
|
|
|
|
#define _PCLP(n) { .maxpages = n }
|
|
|
|
static struct z_erofs_pcluster_slab pcluster_pool[] __read_mostly = {
|
|
_PCLP(1), _PCLP(4), _PCLP(16), _PCLP(64), _PCLP(128),
|
|
_PCLP(Z_EROFS_PCLUSTER_MAX_PAGES)
|
|
};
|
|
|
|
static void z_erofs_destroy_pcluster_pool(void)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(pcluster_pool); ++i) {
|
|
if (!pcluster_pool[i].slab)
|
|
continue;
|
|
kmem_cache_destroy(pcluster_pool[i].slab);
|
|
pcluster_pool[i].slab = NULL;
|
|
}
|
|
}
|
|
|
|
static int z_erofs_create_pcluster_pool(void)
|
|
{
|
|
struct z_erofs_pcluster_slab *pcs;
|
|
struct z_erofs_pcluster *a;
|
|
unsigned int size;
|
|
|
|
for (pcs = pcluster_pool;
|
|
pcs < pcluster_pool + ARRAY_SIZE(pcluster_pool); ++pcs) {
|
|
size = struct_size(a, compressed_pages, pcs->maxpages);
|
|
|
|
sprintf(pcs->name, "erofs_pcluster-%u", pcs->maxpages);
|
|
pcs->slab = kmem_cache_create(pcs->name, size, 0,
|
|
SLAB_RECLAIM_ACCOUNT, NULL);
|
|
if (pcs->slab)
|
|
continue;
|
|
|
|
z_erofs_destroy_pcluster_pool();
|
|
return -ENOMEM;
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
static struct z_erofs_pcluster *z_erofs_alloc_pcluster(unsigned int nrpages)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(pcluster_pool); ++i) {
|
|
struct z_erofs_pcluster_slab *pcs = pcluster_pool + i;
|
|
struct z_erofs_pcluster *pcl;
|
|
|
|
if (nrpages > pcs->maxpages)
|
|
continue;
|
|
|
|
pcl = kmem_cache_zalloc(pcs->slab, GFP_NOFS);
|
|
if (!pcl)
|
|
return ERR_PTR(-ENOMEM);
|
|
pcl->pclusterpages = nrpages;
|
|
return pcl;
|
|
}
|
|
return ERR_PTR(-EINVAL);
|
|
}
|
|
|
|
static void z_erofs_free_pcluster(struct z_erofs_pcluster *pcl)
|
|
{
|
|
int i;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(pcluster_pool); ++i) {
|
|
struct z_erofs_pcluster_slab *pcs = pcluster_pool + i;
|
|
|
|
if (pcl->pclusterpages > pcs->maxpages)
|
|
continue;
|
|
|
|
kmem_cache_free(pcs->slab, pcl);
|
|
return;
|
|
}
|
|
DBG_BUGON(1);
|
|
}
|
|
|
|
/*
|
|
* a compressed_pages[] placeholder in order to avoid
|
|
* being filled with file pages for in-place decompression.
|
|
*/
|
|
#define PAGE_UNALLOCATED ((void *)0x5F0E4B1D)
|
|
|
|
/* how to allocate cached pages for a pcluster */
|
|
enum z_erofs_cache_alloctype {
|
|
DONTALLOC, /* don't allocate any cached pages */
|
|
DELAYEDALLOC, /* delayed allocation (at the time of submitting io) */
|
|
/*
|
|
* try to use cached I/O if page allocation succeeds or fallback
|
|
* to in-place I/O instead to avoid any direct reclaim.
|
|
*/
|
|
TRYALLOC,
|
|
};
|
|
|
|
/*
|
|
* tagged pointer with 1-bit tag for all compressed pages
|
|
* tag 0 - the page is just found with an extra page reference
|
|
*/
|
|
typedef tagptr1_t compressed_page_t;
|
|
|
|
#define tag_compressed_page_justfound(page) \
|
|
tagptr_fold(compressed_page_t, page, 1)
|
|
|
|
static struct workqueue_struct *z_erofs_workqueue __read_mostly;
|
|
|
|
#ifdef CONFIG_EROFS_FS_PCPU_KTHREAD
|
|
static struct kthread_worker __rcu **z_erofs_pcpu_workers;
|
|
|
|
static void erofs_destroy_percpu_workers(void)
|
|
{
|
|
struct kthread_worker *worker;
|
|
unsigned int cpu;
|
|
|
|
for_each_possible_cpu(cpu) {
|
|
worker = rcu_dereference_protected(
|
|
z_erofs_pcpu_workers[cpu], 1);
|
|
rcu_assign_pointer(z_erofs_pcpu_workers[cpu], NULL);
|
|
if (worker)
|
|
kthread_destroy_worker(worker);
|
|
}
|
|
kfree(z_erofs_pcpu_workers);
|
|
}
|
|
|
|
static struct kthread_worker *erofs_init_percpu_worker(int cpu)
|
|
{
|
|
struct kthread_worker *worker =
|
|
kthread_create_worker_on_cpu(cpu, 0, "erofs_worker/%u", cpu);
|
|
|
|
if (IS_ERR(worker))
|
|
return worker;
|
|
if (IS_ENABLED(CONFIG_EROFS_FS_PCPU_KTHREAD_HIPRI))
|
|
sched_set_fifo_low(worker->task);
|
|
else
|
|
sched_set_normal(worker->task, 0);
|
|
return worker;
|
|
}
|
|
|
|
static int erofs_init_percpu_workers(void)
|
|
{
|
|
struct kthread_worker *worker;
|
|
unsigned int cpu;
|
|
|
|
z_erofs_pcpu_workers = kcalloc(num_possible_cpus(),
|
|
sizeof(struct kthread_worker *), GFP_ATOMIC);
|
|
if (!z_erofs_pcpu_workers)
|
|
return -ENOMEM;
|
|
|
|
for_each_online_cpu(cpu) { /* could miss cpu{off,on}line? */
|
|
worker = erofs_init_percpu_worker(cpu);
|
|
if (!IS_ERR(worker))
|
|
rcu_assign_pointer(z_erofs_pcpu_workers[cpu], worker);
|
|
}
|
|
return 0;
|
|
}
|
|
#else
|
|
static inline void erofs_destroy_percpu_workers(void) {}
|
|
static inline int erofs_init_percpu_workers(void) { return 0; }
|
|
#endif
|
|
|
|
#if defined(CONFIG_HOTPLUG_CPU) && defined(CONFIG_EROFS_FS_PCPU_KTHREAD)
|
|
static DEFINE_SPINLOCK(z_erofs_pcpu_worker_lock);
|
|
static enum cpuhp_state erofs_cpuhp_state;
|
|
|
|
static int erofs_cpu_online(unsigned int cpu)
|
|
{
|
|
struct kthread_worker *worker, *old;
|
|
|
|
worker = erofs_init_percpu_worker(cpu);
|
|
if (IS_ERR(worker))
|
|
return PTR_ERR(worker);
|
|
|
|
spin_lock(&z_erofs_pcpu_worker_lock);
|
|
old = rcu_dereference_protected(z_erofs_pcpu_workers[cpu],
|
|
lockdep_is_held(&z_erofs_pcpu_worker_lock));
|
|
if (!old)
|
|
rcu_assign_pointer(z_erofs_pcpu_workers[cpu], worker);
|
|
spin_unlock(&z_erofs_pcpu_worker_lock);
|
|
if (old)
|
|
kthread_destroy_worker(worker);
|
|
return 0;
|
|
}
|
|
|
|
static int erofs_cpu_offline(unsigned int cpu)
|
|
{
|
|
struct kthread_worker *worker;
|
|
|
|
spin_lock(&z_erofs_pcpu_worker_lock);
|
|
worker = rcu_dereference_protected(z_erofs_pcpu_workers[cpu],
|
|
lockdep_is_held(&z_erofs_pcpu_worker_lock));
|
|
rcu_assign_pointer(z_erofs_pcpu_workers[cpu], NULL);
|
|
spin_unlock(&z_erofs_pcpu_worker_lock);
|
|
|
|
synchronize_rcu();
|
|
if (worker)
|
|
kthread_destroy_worker(worker);
|
|
return 0;
|
|
}
|
|
|
|
static int erofs_cpu_hotplug_init(void)
|
|
{
|
|
int state;
|
|
|
|
state = cpuhp_setup_state_nocalls(CPUHP_AP_ONLINE_DYN,
|
|
"fs/erofs:online", erofs_cpu_online, erofs_cpu_offline);
|
|
if (state < 0)
|
|
return state;
|
|
|
|
erofs_cpuhp_state = state;
|
|
return 0;
|
|
}
|
|
|
|
static void erofs_cpu_hotplug_destroy(void)
|
|
{
|
|
if (erofs_cpuhp_state)
|
|
cpuhp_remove_state_nocalls(erofs_cpuhp_state);
|
|
}
|
|
#else /* !CONFIG_HOTPLUG_CPU || !CONFIG_EROFS_FS_PCPU_KTHREAD */
|
|
static inline int erofs_cpu_hotplug_init(void) { return 0; }
|
|
static inline void erofs_cpu_hotplug_destroy(void) {}
|
|
#endif
|
|
|
|
void z_erofs_exit_zip_subsystem(void)
|
|
{
|
|
erofs_cpu_hotplug_destroy();
|
|
erofs_destroy_percpu_workers();
|
|
destroy_workqueue(z_erofs_workqueue);
|
|
z_erofs_destroy_pcluster_pool();
|
|
}
|
|
|
|
int __init z_erofs_init_zip_subsystem(void)
|
|
{
|
|
int err = z_erofs_create_pcluster_pool();
|
|
|
|
if (err)
|
|
goto out_error_pcluster_pool;
|
|
|
|
z_erofs_workqueue = alloc_workqueue("erofs_worker",
|
|
WQ_UNBOUND | WQ_HIGHPRI, num_possible_cpus());
|
|
if (!z_erofs_workqueue) {
|
|
err = -ENOMEM;
|
|
goto out_error_workqueue_init;
|
|
}
|
|
|
|
err = erofs_init_percpu_workers();
|
|
if (err)
|
|
goto out_error_pcpu_worker;
|
|
|
|
err = erofs_cpu_hotplug_init();
|
|
if (err < 0)
|
|
goto out_error_cpuhp_init;
|
|
return err;
|
|
|
|
out_error_cpuhp_init:
|
|
erofs_destroy_percpu_workers();
|
|
out_error_pcpu_worker:
|
|
destroy_workqueue(z_erofs_workqueue);
|
|
out_error_workqueue_init:
|
|
z_erofs_destroy_pcluster_pool();
|
|
out_error_pcluster_pool:
|
|
return err;
|
|
}
|
|
|
|
enum z_erofs_collectmode {
|
|
COLLECT_SECONDARY,
|
|
COLLECT_PRIMARY,
|
|
/*
|
|
* The current collection was the tail of an exist chain, in addition
|
|
* that the previous processed chained collections are all decided to
|
|
* be hooked up to it.
|
|
* A new chain will be created for the remaining collections which are
|
|
* not processed yet, therefore different from COLLECT_PRIMARY_FOLLOWED,
|
|
* the next collection cannot reuse the whole page safely in
|
|
* the following scenario:
|
|
* ________________________________________________________________
|
|
* | tail (partial) page | head (partial) page |
|
|
* | (belongs to the next cl) | (belongs to the current cl) |
|
|
* |_______PRIMARY_FOLLOWED_______|________PRIMARY_HOOKED___________|
|
|
*/
|
|
COLLECT_PRIMARY_HOOKED,
|
|
/*
|
|
* a weak form of COLLECT_PRIMARY_FOLLOWED, the difference is that it
|
|
* could be dispatched into bypass queue later due to uptodated managed
|
|
* pages. All related online pages cannot be reused for inplace I/O (or
|
|
* pagevec) since it can be directly decoded without I/O submission.
|
|
*/
|
|
COLLECT_PRIMARY_FOLLOWED_NOINPLACE,
|
|
/*
|
|
* The current collection has been linked with the owned chain, and
|
|
* could also be linked with the remaining collections, which means
|
|
* if the processing page is the tail page of the collection, thus
|
|
* the current collection can safely use the whole page (since
|
|
* the previous collection is under control) for in-place I/O, as
|
|
* illustrated below:
|
|
* ________________________________________________________________
|
|
* | tail (partial) page | head (partial) page |
|
|
* | (of the current cl) | (of the previous collection) |
|
|
* | PRIMARY_FOLLOWED or | |
|
|
* |_____PRIMARY_HOOKED___|____________PRIMARY_FOLLOWED____________|
|
|
*
|
|
* [ (*) the above page can be used as inplace I/O. ]
|
|
*/
|
|
COLLECT_PRIMARY_FOLLOWED,
|
|
};
|
|
|
|
struct z_erofs_collector {
|
|
struct z_erofs_pagevec_ctor vector;
|
|
|
|
struct z_erofs_pcluster *pcl, *tailpcl;
|
|
struct z_erofs_collection *cl;
|
|
/* a pointer used to pick up inplace I/O pages */
|
|
struct page **icpage_ptr;
|
|
z_erofs_next_pcluster_t owned_head;
|
|
|
|
enum z_erofs_collectmode mode;
|
|
};
|
|
|
|
struct z_erofs_decompress_frontend {
|
|
struct inode *const inode;
|
|
|
|
struct z_erofs_collector clt;
|
|
struct erofs_map_blocks map;
|
|
|
|
bool readahead;
|
|
/* used for applying cache strategy on the fly */
|
|
bool backmost;
|
|
erofs_off_t headoffset;
|
|
};
|
|
|
|
#define COLLECTOR_INIT() { \
|
|
.owned_head = Z_EROFS_PCLUSTER_TAIL, \
|
|
.mode = COLLECT_PRIMARY_FOLLOWED }
|
|
|
|
#define DECOMPRESS_FRONTEND_INIT(__i) { \
|
|
.inode = __i, .clt = COLLECTOR_INIT(), \
|
|
.backmost = true, }
|
|
|
|
static struct page *z_pagemap_global[Z_EROFS_VMAP_GLOBAL_PAGES];
|
|
static DEFINE_MUTEX(z_pagemap_global_lock);
|
|
|
|
static void preload_compressed_pages(struct z_erofs_collector *clt,
|
|
struct address_space *mc,
|
|
enum z_erofs_cache_alloctype type,
|
|
struct list_head *pagepool)
|
|
{
|
|
struct z_erofs_pcluster *pcl = clt->pcl;
|
|
bool standalone = true;
|
|
gfp_t gfp = (mapping_gfp_mask(mc) & ~__GFP_DIRECT_RECLAIM) |
|
|
__GFP_NOMEMALLOC | __GFP_NORETRY | __GFP_NOWARN;
|
|
struct page **pages;
|
|
pgoff_t index;
|
|
|
|
if (clt->mode < COLLECT_PRIMARY_FOLLOWED)
|
|
return;
|
|
|
|
pages = pcl->compressed_pages;
|
|
index = pcl->obj.index;
|
|
for (; index < pcl->obj.index + pcl->pclusterpages; ++index, ++pages) {
|
|
struct page *page;
|
|
compressed_page_t t;
|
|
struct page *newpage = NULL;
|
|
|
|
/* the compressed page was loaded before */
|
|
if (READ_ONCE(*pages))
|
|
continue;
|
|
|
|
page = find_get_page(mc, index);
|
|
|
|
if (page) {
|
|
t = tag_compressed_page_justfound(page);
|
|
} else {
|
|
/* I/O is needed, no possible to decompress directly */
|
|
standalone = false;
|
|
switch (type) {
|
|
case DELAYEDALLOC:
|
|
t = tagptr_init(compressed_page_t,
|
|
PAGE_UNALLOCATED);
|
|
break;
|
|
case TRYALLOC:
|
|
newpage = erofs_allocpage(pagepool, gfp);
|
|
if (!newpage)
|
|
continue;
|
|
set_page_private(newpage,
|
|
Z_EROFS_PREALLOCATED_PAGE);
|
|
t = tag_compressed_page_justfound(newpage);
|
|
break;
|
|
default: /* DONTALLOC */
|
|
continue;
|
|
}
|
|
}
|
|
|
|
if (!cmpxchg_relaxed(pages, NULL, tagptr_cast_ptr(t)))
|
|
continue;
|
|
|
|
if (page) {
|
|
put_page(page);
|
|
} else if (newpage) {
|
|
set_page_private(newpage, 0);
|
|
list_add(&newpage->lru, pagepool);
|
|
}
|
|
}
|
|
|
|
/*
|
|
* don't do inplace I/O if all compressed pages are available in
|
|
* managed cache since it can be moved to the bypass queue instead.
|
|
*/
|
|
if (standalone)
|
|
clt->mode = COLLECT_PRIMARY_FOLLOWED_NOINPLACE;
|
|
}
|
|
|
|
/* called by erofs_shrinker to get rid of all compressed_pages */
|
|
int erofs_try_to_free_all_cached_pages(struct erofs_sb_info *sbi,
|
|
struct erofs_workgroup *grp)
|
|
{
|
|
struct z_erofs_pcluster *const pcl =
|
|
container_of(grp, struct z_erofs_pcluster, obj);
|
|
struct address_space *const mapping = MNGD_MAPPING(sbi);
|
|
int i;
|
|
|
|
/*
|
|
* refcount of workgroup is now freezed as 1,
|
|
* therefore no need to worry about available decompression users.
|
|
*/
|
|
for (i = 0; i < pcl->pclusterpages; ++i) {
|
|
struct page *page = pcl->compressed_pages[i];
|
|
|
|
if (!page)
|
|
continue;
|
|
|
|
/* block other users from reclaiming or migrating the page */
|
|
if (!trylock_page(page))
|
|
return -EBUSY;
|
|
|
|
if (page->mapping != mapping)
|
|
continue;
|
|
|
|
/* barrier is implied in the following 'unlock_page' */
|
|
WRITE_ONCE(pcl->compressed_pages[i], NULL);
|
|
detach_page_private(page);
|
|
unlock_page(page);
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
int erofs_try_to_free_cached_page(struct address_space *mapping,
|
|
struct page *page)
|
|
{
|
|
struct z_erofs_pcluster *const pcl = (void *)page_private(page);
|
|
int ret = 0; /* 0 - busy */
|
|
|
|
if (erofs_workgroup_try_to_freeze(&pcl->obj, 1)) {
|
|
unsigned int i;
|
|
|
|
for (i = 0; i < pcl->pclusterpages; ++i) {
|
|
if (pcl->compressed_pages[i] == page) {
|
|
WRITE_ONCE(pcl->compressed_pages[i], NULL);
|
|
ret = 1;
|
|
break;
|
|
}
|
|
}
|
|
erofs_workgroup_unfreeze(&pcl->obj, 1);
|
|
|
|
if (ret)
|
|
detach_page_private(page);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
/* page_type must be Z_EROFS_PAGE_TYPE_EXCLUSIVE */
|
|
static bool z_erofs_try_inplace_io(struct z_erofs_collector *clt,
|
|
struct page *page)
|
|
{
|
|
struct z_erofs_pcluster *const pcl = clt->pcl;
|
|
|
|
while (clt->icpage_ptr > pcl->compressed_pages)
|
|
if (!cmpxchg(--clt->icpage_ptr, NULL, page))
|
|
return true;
|
|
return false;
|
|
}
|
|
|
|
/* callers must be with collection lock held */
|
|
static int z_erofs_attach_page(struct z_erofs_collector *clt,
|
|
struct page *page, enum z_erofs_page_type type,
|
|
bool pvec_safereuse)
|
|
{
|
|
int ret;
|
|
|
|
/* give priority for inplaceio */
|
|
if (clt->mode >= COLLECT_PRIMARY &&
|
|
type == Z_EROFS_PAGE_TYPE_EXCLUSIVE &&
|
|
z_erofs_try_inplace_io(clt, page))
|
|
return 0;
|
|
|
|
ret = z_erofs_pagevec_enqueue(&clt->vector, page, type,
|
|
pvec_safereuse);
|
|
clt->cl->vcnt += (unsigned int)ret;
|
|
return ret ? 0 : -EAGAIN;
|
|
}
|
|
|
|
static enum z_erofs_collectmode
|
|
try_to_claim_pcluster(struct z_erofs_pcluster *pcl,
|
|
z_erofs_next_pcluster_t *owned_head)
|
|
{
|
|
/* let's claim these following types of pclusters */
|
|
retry:
|
|
if (pcl->next == Z_EROFS_PCLUSTER_NIL) {
|
|
/* type 1, nil pcluster */
|
|
if (cmpxchg(&pcl->next, Z_EROFS_PCLUSTER_NIL,
|
|
*owned_head) != Z_EROFS_PCLUSTER_NIL)
|
|
goto retry;
|
|
|
|
*owned_head = &pcl->next;
|
|
/* lucky, I am the followee :) */
|
|
return COLLECT_PRIMARY_FOLLOWED;
|
|
} else if (pcl->next == Z_EROFS_PCLUSTER_TAIL) {
|
|
/*
|
|
* type 2, link to the end of a existing open chain,
|
|
* be careful that its submission itself is governed
|
|
* by the original owned chain.
|
|
*/
|
|
if (cmpxchg(&pcl->next, Z_EROFS_PCLUSTER_TAIL,
|
|
*owned_head) != Z_EROFS_PCLUSTER_TAIL)
|
|
goto retry;
|
|
*owned_head = Z_EROFS_PCLUSTER_TAIL;
|
|
return COLLECT_PRIMARY_HOOKED;
|
|
}
|
|
return COLLECT_PRIMARY; /* :( better luck next time */
|
|
}
|
|
|
|
static int z_erofs_lookup_collection(struct z_erofs_collector *clt,
|
|
struct inode *inode,
|
|
struct erofs_map_blocks *map)
|
|
{
|
|
struct z_erofs_pcluster *pcl = clt->pcl;
|
|
struct z_erofs_collection *cl;
|
|
unsigned int length;
|
|
|
|
/* to avoid unexpected loop formed by corrupted images */
|
|
if (clt->owned_head == &pcl->next || pcl == clt->tailpcl) {
|
|
DBG_BUGON(1);
|
|
return -EFSCORRUPTED;
|
|
}
|
|
|
|
cl = z_erofs_primarycollection(pcl);
|
|
if (cl->pageofs != (map->m_la & ~PAGE_MASK)) {
|
|
DBG_BUGON(1);
|
|
return -EFSCORRUPTED;
|
|
}
|
|
|
|
length = READ_ONCE(pcl->length);
|
|
if (length & Z_EROFS_PCLUSTER_FULL_LENGTH) {
|
|
if ((map->m_llen << Z_EROFS_PCLUSTER_LENGTH_BIT) > length) {
|
|
DBG_BUGON(1);
|
|
return -EFSCORRUPTED;
|
|
}
|
|
} else {
|
|
unsigned int llen = map->m_llen << Z_EROFS_PCLUSTER_LENGTH_BIT;
|
|
|
|
if (map->m_flags & EROFS_MAP_FULL_MAPPED)
|
|
llen |= Z_EROFS_PCLUSTER_FULL_LENGTH;
|
|
|
|
while (llen > length &&
|
|
length != cmpxchg_relaxed(&pcl->length, length, llen)) {
|
|
cpu_relax();
|
|
length = READ_ONCE(pcl->length);
|
|
}
|
|
}
|
|
mutex_lock(&cl->lock);
|
|
/* used to check tail merging loop due to corrupted images */
|
|
if (clt->owned_head == Z_EROFS_PCLUSTER_TAIL)
|
|
clt->tailpcl = pcl;
|
|
clt->mode = try_to_claim_pcluster(pcl, &clt->owned_head);
|
|
/* clean tailpcl if the current owned_head is Z_EROFS_PCLUSTER_TAIL */
|
|
if (clt->owned_head == Z_EROFS_PCLUSTER_TAIL)
|
|
clt->tailpcl = NULL;
|
|
clt->cl = cl;
|
|
return 0;
|
|
}
|
|
|
|
static int z_erofs_register_collection(struct z_erofs_collector *clt,
|
|
struct inode *inode,
|
|
struct erofs_map_blocks *map)
|
|
{
|
|
struct z_erofs_pcluster *pcl;
|
|
struct z_erofs_collection *cl;
|
|
struct erofs_workgroup *grp;
|
|
int err;
|
|
|
|
/* no available pcluster, let's allocate one */
|
|
pcl = z_erofs_alloc_pcluster(map->m_plen >> PAGE_SHIFT);
|
|
if (IS_ERR(pcl))
|
|
return PTR_ERR(pcl);
|
|
|
|
atomic_set(&pcl->obj.refcount, 1);
|
|
pcl->obj.index = map->m_pa >> PAGE_SHIFT;
|
|
|
|
pcl->length = (map->m_llen << Z_EROFS_PCLUSTER_LENGTH_BIT) |
|
|
(map->m_flags & EROFS_MAP_FULL_MAPPED ?
|
|
Z_EROFS_PCLUSTER_FULL_LENGTH : 0);
|
|
|
|
if (map->m_flags & EROFS_MAP_ZIPPED)
|
|
pcl->algorithmformat = Z_EROFS_COMPRESSION_LZ4;
|
|
else
|
|
pcl->algorithmformat = Z_EROFS_COMPRESSION_SHIFTED;
|
|
|
|
/* new pclusters should be claimed as type 1, primary and followed */
|
|
pcl->next = clt->owned_head;
|
|
clt->mode = COLLECT_PRIMARY_FOLLOWED;
|
|
|
|
cl = z_erofs_primarycollection(pcl);
|
|
cl->pageofs = map->m_la & ~PAGE_MASK;
|
|
|
|
/*
|
|
* lock all primary followed works before visible to others
|
|
* and mutex_trylock *never* fails for a new pcluster.
|
|
*/
|
|
mutex_init(&cl->lock);
|
|
DBG_BUGON(!mutex_trylock(&cl->lock));
|
|
|
|
grp = erofs_insert_workgroup(inode->i_sb, &pcl->obj);
|
|
if (IS_ERR(grp)) {
|
|
err = PTR_ERR(grp);
|
|
goto err_out;
|
|
}
|
|
|
|
if (grp != &pcl->obj) {
|
|
clt->pcl = container_of(grp, struct z_erofs_pcluster, obj);
|
|
err = -EEXIST;
|
|
goto err_out;
|
|
}
|
|
/* used to check tail merging loop due to corrupted images */
|
|
if (clt->owned_head == Z_EROFS_PCLUSTER_TAIL)
|
|
clt->tailpcl = pcl;
|
|
clt->owned_head = &pcl->next;
|
|
clt->pcl = pcl;
|
|
clt->cl = cl;
|
|
return 0;
|
|
|
|
err_out:
|
|
mutex_unlock(&cl->lock);
|
|
z_erofs_free_pcluster(pcl);
|
|
return err;
|
|
}
|
|
|
|
static int z_erofs_collector_begin(struct z_erofs_collector *clt,
|
|
struct inode *inode,
|
|
struct erofs_map_blocks *map)
|
|
{
|
|
struct erofs_workgroup *grp;
|
|
int ret;
|
|
|
|
DBG_BUGON(clt->cl);
|
|
|
|
/* must be Z_EROFS_PCLUSTER_TAIL or pointed to previous collection */
|
|
DBG_BUGON(clt->owned_head == Z_EROFS_PCLUSTER_NIL);
|
|
DBG_BUGON(clt->owned_head == Z_EROFS_PCLUSTER_TAIL_CLOSED);
|
|
|
|
if (!PAGE_ALIGNED(map->m_pa)) {
|
|
DBG_BUGON(1);
|
|
return -EINVAL;
|
|
}
|
|
|
|
grp = erofs_find_workgroup(inode->i_sb, map->m_pa >> PAGE_SHIFT);
|
|
if (grp) {
|
|
clt->pcl = container_of(grp, struct z_erofs_pcluster, obj);
|
|
} else {
|
|
ret = z_erofs_register_collection(clt, inode, map);
|
|
|
|
if (!ret)
|
|
goto out;
|
|
if (ret != -EEXIST)
|
|
return ret;
|
|
}
|
|
|
|
ret = z_erofs_lookup_collection(clt, inode, map);
|
|
if (ret) {
|
|
erofs_workgroup_put(&clt->pcl->obj);
|
|
return ret;
|
|
}
|
|
|
|
out:
|
|
z_erofs_pagevec_ctor_init(&clt->vector, Z_EROFS_NR_INLINE_PAGEVECS,
|
|
clt->cl->pagevec, clt->cl->vcnt);
|
|
|
|
/* since file-backed online pages are traversed in reverse order */
|
|
clt->icpage_ptr = clt->pcl->compressed_pages + clt->pcl->pclusterpages;
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* keep in mind that no referenced pclusters will be freed
|
|
* only after a RCU grace period.
|
|
*/
|
|
static void z_erofs_rcu_callback(struct rcu_head *head)
|
|
{
|
|
struct z_erofs_collection *const cl =
|
|
container_of(head, struct z_erofs_collection, rcu);
|
|
|
|
z_erofs_free_pcluster(container_of(cl, struct z_erofs_pcluster,
|
|
primary_collection));
|
|
}
|
|
|
|
void erofs_workgroup_free_rcu(struct erofs_workgroup *grp)
|
|
{
|
|
struct z_erofs_pcluster *const pcl =
|
|
container_of(grp, struct z_erofs_pcluster, obj);
|
|
struct z_erofs_collection *const cl = z_erofs_primarycollection(pcl);
|
|
|
|
call_rcu(&cl->rcu, z_erofs_rcu_callback);
|
|
}
|
|
|
|
static void z_erofs_collection_put(struct z_erofs_collection *cl)
|
|
{
|
|
struct z_erofs_pcluster *const pcl =
|
|
container_of(cl, struct z_erofs_pcluster, primary_collection);
|
|
|
|
erofs_workgroup_put(&pcl->obj);
|
|
}
|
|
|
|
static bool z_erofs_collector_end(struct z_erofs_collector *clt)
|
|
{
|
|
struct z_erofs_collection *cl = clt->cl;
|
|
|
|
if (!cl)
|
|
return false;
|
|
|
|
z_erofs_pagevec_ctor_exit(&clt->vector, false);
|
|
mutex_unlock(&cl->lock);
|
|
|
|
/*
|
|
* if all pending pages are added, don't hold its reference
|
|
* any longer if the pcluster isn't hosted by ourselves.
|
|
*/
|
|
if (clt->mode < COLLECT_PRIMARY_FOLLOWED_NOINPLACE)
|
|
z_erofs_collection_put(cl);
|
|
|
|
clt->cl = NULL;
|
|
return true;
|
|
}
|
|
|
|
static bool should_alloc_managed_pages(struct z_erofs_decompress_frontend *fe,
|
|
unsigned int cachestrategy,
|
|
erofs_off_t la)
|
|
{
|
|
if (cachestrategy <= EROFS_ZIP_CACHE_DISABLED)
|
|
return false;
|
|
|
|
if (fe->backmost)
|
|
return true;
|
|
|
|
return cachestrategy >= EROFS_ZIP_CACHE_READAROUND &&
|
|
la < fe->headoffset;
|
|
}
|
|
|
|
static int z_erofs_do_read_page(struct z_erofs_decompress_frontend *fe,
|
|
struct page *page, struct list_head *pagepool)
|
|
{
|
|
struct inode *const inode = fe->inode;
|
|
struct erofs_sb_info *const sbi = EROFS_I_SB(inode);
|
|
struct erofs_map_blocks *const map = &fe->map;
|
|
struct z_erofs_collector *const clt = &fe->clt;
|
|
const loff_t offset = page_offset(page);
|
|
bool tight = true;
|
|
|
|
enum z_erofs_cache_alloctype cache_strategy;
|
|
enum z_erofs_page_type page_type;
|
|
unsigned int cur, end, spiltted, index;
|
|
int err = 0;
|
|
|
|
/* register locked file pages as online pages in pack */
|
|
z_erofs_onlinepage_init(page);
|
|
|
|
spiltted = 0;
|
|
end = PAGE_SIZE;
|
|
repeat:
|
|
cur = end - 1;
|
|
|
|
/* lucky, within the range of the current map_blocks */
|
|
if (offset + cur >= map->m_la &&
|
|
offset + cur < map->m_la + map->m_llen) {
|
|
/* didn't get a valid collection previously (very rare) */
|
|
if (!clt->cl)
|
|
goto restart_now;
|
|
goto hitted;
|
|
}
|
|
|
|
/* go ahead the next map_blocks */
|
|
erofs_dbg("%s: [out-of-range] pos %llu", __func__, offset + cur);
|
|
|
|
if (z_erofs_collector_end(clt))
|
|
fe->backmost = false;
|
|
|
|
map->m_la = offset + cur;
|
|
map->m_llen = 0;
|
|
err = z_erofs_map_blocks_iter(inode, map, 0);
|
|
if (err)
|
|
goto err_out;
|
|
|
|
restart_now:
|
|
if (!(map->m_flags & EROFS_MAP_MAPPED))
|
|
goto hitted;
|
|
|
|
err = z_erofs_collector_begin(clt, inode, map);
|
|
if (err)
|
|
goto err_out;
|
|
|
|
/* preload all compressed pages (maybe downgrade role if necessary) */
|
|
if (should_alloc_managed_pages(fe, sbi->ctx.cache_strategy, map->m_la))
|
|
cache_strategy = TRYALLOC;
|
|
else
|
|
cache_strategy = DONTALLOC;
|
|
|
|
preload_compressed_pages(clt, MNGD_MAPPING(sbi),
|
|
cache_strategy, pagepool);
|
|
|
|
hitted:
|
|
/*
|
|
* Ensure the current partial page belongs to this submit chain rather
|
|
* than other concurrent submit chains or the noio(bypass) chain since
|
|
* those chains are handled asynchronously thus the page cannot be used
|
|
* for inplace I/O or pagevec (should be processed in strict order.)
|
|
*/
|
|
tight &= (clt->mode >= COLLECT_PRIMARY_HOOKED &&
|
|
clt->mode != COLLECT_PRIMARY_FOLLOWED_NOINPLACE);
|
|
|
|
cur = end - min_t(erofs_off_t, offset + end - map->m_la, end);
|
|
if (!(map->m_flags & EROFS_MAP_MAPPED)) {
|
|
zero_user_segment(page, cur, end);
|
|
++spiltted;
|
|
tight = false;
|
|
goto next_part;
|
|
}
|
|
|
|
/* let's derive page type */
|
|
page_type = cur ? Z_EROFS_VLE_PAGE_TYPE_HEAD :
|
|
(!spiltted ? Z_EROFS_PAGE_TYPE_EXCLUSIVE :
|
|
(tight ? Z_EROFS_PAGE_TYPE_EXCLUSIVE :
|
|
Z_EROFS_VLE_PAGE_TYPE_TAIL_SHARED));
|
|
|
|
if (cur)
|
|
tight &= (clt->mode >= COLLECT_PRIMARY_FOLLOWED);
|
|
|
|
retry:
|
|
err = z_erofs_attach_page(clt, page, page_type,
|
|
clt->mode >= COLLECT_PRIMARY_FOLLOWED);
|
|
/* should allocate an additional staging page for pagevec */
|
|
if (err == -EAGAIN) {
|
|
struct page *const newpage =
|
|
alloc_page(GFP_NOFS | __GFP_NOFAIL);
|
|
|
|
set_page_private(newpage, Z_EROFS_SHORTLIVED_PAGE);
|
|
err = z_erofs_attach_page(clt, newpage,
|
|
Z_EROFS_PAGE_TYPE_EXCLUSIVE, true);
|
|
if (!err)
|
|
goto retry;
|
|
}
|
|
|
|
if (err)
|
|
goto err_out;
|
|
|
|
index = page->index - (map->m_la >> PAGE_SHIFT);
|
|
|
|
z_erofs_onlinepage_fixup(page, index, true);
|
|
|
|
/* bump up the number of spiltted parts of a page */
|
|
++spiltted;
|
|
/* also update nr_pages */
|
|
clt->cl->nr_pages = max_t(pgoff_t, clt->cl->nr_pages, index + 1);
|
|
next_part:
|
|
/* can be used for verification */
|
|
map->m_llen = offset + cur - map->m_la;
|
|
|
|
end = cur;
|
|
if (end > 0)
|
|
goto repeat;
|
|
|
|
out:
|
|
z_erofs_onlinepage_endio(page);
|
|
|
|
erofs_dbg("%s, finish page: %pK spiltted: %u map->m_llen %llu",
|
|
__func__, page, spiltted, map->m_llen);
|
|
return err;
|
|
|
|
/* if some error occurred while processing this page */
|
|
err_out:
|
|
SetPageError(page);
|
|
goto out;
|
|
}
|
|
|
|
static void z_erofs_decompressqueue_work(struct work_struct *work);
|
|
#ifdef CONFIG_EROFS_FS_PCPU_KTHREAD
|
|
static void z_erofs_decompressqueue_kthread_work(struct kthread_work *work)
|
|
{
|
|
z_erofs_decompressqueue_work((struct work_struct *)work);
|
|
}
|
|
#endif
|
|
static void z_erofs_decompress_kickoff(struct z_erofs_decompressqueue *io,
|
|
bool sync, int bios)
|
|
{
|
|
struct erofs_sb_info *const sbi = EROFS_SB(io->sb);
|
|
|
|
/* wake up the caller thread for sync decompression */
|
|
if (sync) {
|
|
if (!atomic_add_return(bios, &io->pending_bios))
|
|
complete(&io->u.done);
|
|
|
|
return;
|
|
}
|
|
|
|
if (atomic_add_return(bios, &io->pending_bios))
|
|
return;
|
|
/* Use workqueue and sync decompression for atomic contexts only */
|
|
if (in_atomic() || irqs_disabled()) {
|
|
#ifdef CONFIG_EROFS_FS_PCPU_KTHREAD
|
|
struct kthread_worker *worker;
|
|
|
|
rcu_read_lock();
|
|
worker = rcu_dereference(
|
|
z_erofs_pcpu_workers[raw_smp_processor_id()]);
|
|
if (!worker) {
|
|
INIT_WORK(&io->u.work, z_erofs_decompressqueue_work);
|
|
queue_work(z_erofs_workqueue, &io->u.work);
|
|
} else {
|
|
kthread_queue_work(worker, &io->u.kthread_work);
|
|
}
|
|
rcu_read_unlock();
|
|
#else
|
|
queue_work(z_erofs_workqueue, &io->u.work);
|
|
#endif
|
|
sbi->ctx.readahead_sync_decompress = true;
|
|
return;
|
|
}
|
|
z_erofs_decompressqueue_work(&io->u.work);
|
|
}
|
|
|
|
static bool z_erofs_page_is_invalidated(struct page *page)
|
|
{
|
|
return !page->mapping && !z_erofs_is_shortlived_page(page);
|
|
}
|
|
|
|
static void z_erofs_decompressqueue_endio(struct bio *bio)
|
|
{
|
|
tagptr1_t t = tagptr_init(tagptr1_t, bio->bi_private);
|
|
struct z_erofs_decompressqueue *q = tagptr_unfold_ptr(t);
|
|
blk_status_t err = bio->bi_status;
|
|
struct bio_vec *bvec;
|
|
struct bvec_iter_all iter_all;
|
|
|
|
bio_for_each_segment_all(bvec, bio, iter_all) {
|
|
struct page *page = bvec->bv_page;
|
|
|
|
DBG_BUGON(PageUptodate(page));
|
|
DBG_BUGON(z_erofs_page_is_invalidated(page));
|
|
|
|
if (err)
|
|
SetPageError(page);
|
|
|
|
if (erofs_page_is_managed(EROFS_SB(q->sb), page)) {
|
|
if (!err)
|
|
SetPageUptodate(page);
|
|
unlock_page(page);
|
|
}
|
|
}
|
|
z_erofs_decompress_kickoff(q, tagptr_unfold_tags(t), -1);
|
|
bio_put(bio);
|
|
}
|
|
|
|
static int z_erofs_decompress_pcluster(struct super_block *sb,
|
|
struct z_erofs_pcluster *pcl,
|
|
struct list_head *pagepool)
|
|
{
|
|
struct erofs_sb_info *const sbi = EROFS_SB(sb);
|
|
struct z_erofs_pagevec_ctor ctor;
|
|
unsigned int i, inputsize, outputsize, llen, nr_pages;
|
|
struct page *pages_onstack[Z_EROFS_VMAP_ONSTACK_PAGES];
|
|
struct page **pages, **compressed_pages, *page;
|
|
|
|
enum z_erofs_page_type page_type;
|
|
bool overlapped, partial;
|
|
struct z_erofs_collection *cl;
|
|
int err;
|
|
|
|
might_sleep();
|
|
cl = z_erofs_primarycollection(pcl);
|
|
DBG_BUGON(!READ_ONCE(cl->nr_pages));
|
|
|
|
mutex_lock(&cl->lock);
|
|
nr_pages = cl->nr_pages;
|
|
|
|
if (nr_pages <= Z_EROFS_VMAP_ONSTACK_PAGES) {
|
|
pages = pages_onstack;
|
|
} else if (nr_pages <= Z_EROFS_VMAP_GLOBAL_PAGES &&
|
|
mutex_trylock(&z_pagemap_global_lock)) {
|
|
pages = z_pagemap_global;
|
|
} else {
|
|
gfp_t gfp_flags = GFP_KERNEL;
|
|
|
|
if (nr_pages > Z_EROFS_VMAP_GLOBAL_PAGES)
|
|
gfp_flags |= __GFP_NOFAIL;
|
|
|
|
pages = kvmalloc_array(nr_pages, sizeof(struct page *),
|
|
gfp_flags);
|
|
|
|
/* fallback to global pagemap for the lowmem scenario */
|
|
if (!pages) {
|
|
mutex_lock(&z_pagemap_global_lock);
|
|
pages = z_pagemap_global;
|
|
}
|
|
}
|
|
|
|
for (i = 0; i < nr_pages; ++i)
|
|
pages[i] = NULL;
|
|
|
|
err = 0;
|
|
z_erofs_pagevec_ctor_init(&ctor, Z_EROFS_NR_INLINE_PAGEVECS,
|
|
cl->pagevec, 0);
|
|
|
|
for (i = 0; i < cl->vcnt; ++i) {
|
|
unsigned int pagenr;
|
|
|
|
page = z_erofs_pagevec_dequeue(&ctor, &page_type);
|
|
|
|
/* all pages in pagevec ought to be valid */
|
|
DBG_BUGON(!page);
|
|
DBG_BUGON(z_erofs_page_is_invalidated(page));
|
|
|
|
if (z_erofs_put_shortlivedpage(pagepool, page))
|
|
continue;
|
|
|
|
if (page_type == Z_EROFS_VLE_PAGE_TYPE_HEAD)
|
|
pagenr = 0;
|
|
else
|
|
pagenr = z_erofs_onlinepage_index(page);
|
|
|
|
DBG_BUGON(pagenr >= nr_pages);
|
|
|
|
/*
|
|
* currently EROFS doesn't support multiref(dedup),
|
|
* so here erroring out one multiref page.
|
|
*/
|
|
if (pages[pagenr]) {
|
|
DBG_BUGON(1);
|
|
SetPageError(pages[pagenr]);
|
|
z_erofs_onlinepage_endio(pages[pagenr]);
|
|
err = -EFSCORRUPTED;
|
|
}
|
|
pages[pagenr] = page;
|
|
}
|
|
z_erofs_pagevec_ctor_exit(&ctor, true);
|
|
|
|
overlapped = false;
|
|
compressed_pages = pcl->compressed_pages;
|
|
|
|
for (i = 0; i < pcl->pclusterpages; ++i) {
|
|
unsigned int pagenr;
|
|
|
|
page = compressed_pages[i];
|
|
|
|
/* all compressed pages ought to be valid */
|
|
DBG_BUGON(!page);
|
|
DBG_BUGON(z_erofs_page_is_invalidated(page));
|
|
|
|
if (!z_erofs_is_shortlived_page(page)) {
|
|
if (erofs_page_is_managed(sbi, page)) {
|
|
if (!PageUptodate(page))
|
|
err = -EIO;
|
|
continue;
|
|
}
|
|
|
|
/*
|
|
* only if non-head page can be selected
|
|
* for inplace decompression
|
|
*/
|
|
pagenr = z_erofs_onlinepage_index(page);
|
|
|
|
DBG_BUGON(pagenr >= nr_pages);
|
|
if (pages[pagenr]) {
|
|
DBG_BUGON(1);
|
|
SetPageError(pages[pagenr]);
|
|
z_erofs_onlinepage_endio(pages[pagenr]);
|
|
err = -EFSCORRUPTED;
|
|
}
|
|
pages[pagenr] = page;
|
|
|
|
overlapped = true;
|
|
}
|
|
|
|
/* PG_error needs checking for all non-managed pages */
|
|
if (PageError(page)) {
|
|
DBG_BUGON(PageUptodate(page));
|
|
err = -EIO;
|
|
}
|
|
}
|
|
|
|
if (err)
|
|
goto out;
|
|
|
|
llen = pcl->length >> Z_EROFS_PCLUSTER_LENGTH_BIT;
|
|
if (nr_pages << PAGE_SHIFT >= cl->pageofs + llen) {
|
|
outputsize = llen;
|
|
partial = !(pcl->length & Z_EROFS_PCLUSTER_FULL_LENGTH);
|
|
} else {
|
|
outputsize = (nr_pages << PAGE_SHIFT) - cl->pageofs;
|
|
partial = true;
|
|
}
|
|
|
|
inputsize = pcl->pclusterpages * PAGE_SIZE;
|
|
err = z_erofs_decompress(&(struct z_erofs_decompress_req) {
|
|
.sb = sb,
|
|
.in = compressed_pages,
|
|
.out = pages,
|
|
.pageofs_out = cl->pageofs,
|
|
.inputsize = inputsize,
|
|
.outputsize = outputsize,
|
|
.alg = pcl->algorithmformat,
|
|
.inplace_io = overlapped,
|
|
.partial_decoding = partial
|
|
}, pagepool);
|
|
|
|
out:
|
|
/* must handle all compressed pages before ending pages */
|
|
for (i = 0; i < pcl->pclusterpages; ++i) {
|
|
page = compressed_pages[i];
|
|
|
|
if (erofs_page_is_managed(sbi, page))
|
|
continue;
|
|
|
|
/* recycle all individual short-lived pages */
|
|
(void)z_erofs_put_shortlivedpage(pagepool, page);
|
|
|
|
WRITE_ONCE(compressed_pages[i], NULL);
|
|
}
|
|
|
|
for (i = 0; i < nr_pages; ++i) {
|
|
page = pages[i];
|
|
if (!page)
|
|
continue;
|
|
|
|
DBG_BUGON(z_erofs_page_is_invalidated(page));
|
|
|
|
/* recycle all individual short-lived pages */
|
|
if (z_erofs_put_shortlivedpage(pagepool, page))
|
|
continue;
|
|
|
|
if (err < 0)
|
|
SetPageError(page);
|
|
|
|
z_erofs_onlinepage_endio(page);
|
|
}
|
|
|
|
if (pages == z_pagemap_global)
|
|
mutex_unlock(&z_pagemap_global_lock);
|
|
else if (pages != pages_onstack)
|
|
kvfree(pages);
|
|
|
|
cl->nr_pages = 0;
|
|
cl->vcnt = 0;
|
|
|
|
/* all cl locks MUST be taken before the following line */
|
|
WRITE_ONCE(pcl->next, Z_EROFS_PCLUSTER_NIL);
|
|
|
|
/* all cl locks SHOULD be released right now */
|
|
mutex_unlock(&cl->lock);
|
|
|
|
z_erofs_collection_put(cl);
|
|
return err;
|
|
}
|
|
|
|
static void z_erofs_decompress_queue(const struct z_erofs_decompressqueue *io,
|
|
struct list_head *pagepool)
|
|
{
|
|
z_erofs_next_pcluster_t owned = io->head;
|
|
|
|
while (owned != Z_EROFS_PCLUSTER_TAIL_CLOSED) {
|
|
struct z_erofs_pcluster *pcl;
|
|
|
|
/* no possible that 'owned' equals Z_EROFS_WORK_TPTR_TAIL */
|
|
DBG_BUGON(owned == Z_EROFS_PCLUSTER_TAIL);
|
|
|
|
/* no possible that 'owned' equals NULL */
|
|
DBG_BUGON(owned == Z_EROFS_PCLUSTER_NIL);
|
|
|
|
pcl = container_of(owned, struct z_erofs_pcluster, next);
|
|
owned = READ_ONCE(pcl->next);
|
|
|
|
z_erofs_decompress_pcluster(io->sb, pcl, pagepool);
|
|
}
|
|
}
|
|
|
|
static void z_erofs_decompressqueue_work(struct work_struct *work)
|
|
{
|
|
struct z_erofs_decompressqueue *bgq =
|
|
container_of(work, struct z_erofs_decompressqueue, u.work);
|
|
LIST_HEAD(pagepool);
|
|
|
|
DBG_BUGON(bgq->head == Z_EROFS_PCLUSTER_TAIL_CLOSED);
|
|
z_erofs_decompress_queue(bgq, &pagepool);
|
|
|
|
put_pages_list(&pagepool);
|
|
kvfree(bgq);
|
|
}
|
|
|
|
static struct page *pickup_page_for_submission(struct z_erofs_pcluster *pcl,
|
|
unsigned int nr,
|
|
struct list_head *pagepool,
|
|
struct address_space *mc,
|
|
gfp_t gfp)
|
|
{
|
|
const pgoff_t index = pcl->obj.index;
|
|
bool tocache = false;
|
|
|
|
struct address_space *mapping;
|
|
struct page *oldpage, *page;
|
|
|
|
compressed_page_t t;
|
|
int justfound;
|
|
|
|
repeat:
|
|
page = READ_ONCE(pcl->compressed_pages[nr]);
|
|
oldpage = page;
|
|
|
|
if (!page)
|
|
goto out_allocpage;
|
|
|
|
/*
|
|
* the cached page has not been allocated and
|
|
* an placeholder is out there, prepare it now.
|
|
*/
|
|
if (page == PAGE_UNALLOCATED) {
|
|
tocache = true;
|
|
goto out_allocpage;
|
|
}
|
|
|
|
/* process the target tagged pointer */
|
|
t = tagptr_init(compressed_page_t, page);
|
|
justfound = tagptr_unfold_tags(t);
|
|
page = tagptr_unfold_ptr(t);
|
|
|
|
/*
|
|
* preallocated cached pages, which is used to avoid direct reclaim
|
|
* otherwise, it will go inplace I/O path instead.
|
|
*/
|
|
if (page->private == Z_EROFS_PREALLOCATED_PAGE) {
|
|
WRITE_ONCE(pcl->compressed_pages[nr], page);
|
|
set_page_private(page, 0);
|
|
tocache = true;
|
|
goto out_tocache;
|
|
}
|
|
mapping = READ_ONCE(page->mapping);
|
|
|
|
/*
|
|
* file-backed online pages in plcuster are all locked steady,
|
|
* therefore it is impossible for `mapping' to be NULL.
|
|
*/
|
|
if (mapping && mapping != mc)
|
|
/* ought to be unmanaged pages */
|
|
goto out;
|
|
|
|
/* directly return for shortlived page as well */
|
|
if (z_erofs_is_shortlived_page(page))
|
|
goto out;
|
|
|
|
lock_page(page);
|
|
|
|
/* only true if page reclaim goes wrong, should never happen */
|
|
DBG_BUGON(justfound && PagePrivate(page));
|
|
|
|
/* the page is still in manage cache */
|
|
if (page->mapping == mc) {
|
|
WRITE_ONCE(pcl->compressed_pages[nr], page);
|
|
|
|
ClearPageError(page);
|
|
if (!PagePrivate(page)) {
|
|
/*
|
|
* impossible to be !PagePrivate(page) for
|
|
* the current restriction as well if
|
|
* the page is already in compressed_pages[].
|
|
*/
|
|
DBG_BUGON(!justfound);
|
|
|
|
justfound = 0;
|
|
set_page_private(page, (unsigned long)pcl);
|
|
SetPagePrivate(page);
|
|
}
|
|
|
|
/* no need to submit io if it is already up-to-date */
|
|
if (PageUptodate(page)) {
|
|
unlock_page(page);
|
|
page = NULL;
|
|
}
|
|
goto out;
|
|
}
|
|
|
|
/*
|
|
* the managed page has been truncated, it's unsafe to
|
|
* reuse this one, let's allocate a new cache-managed page.
|
|
*/
|
|
DBG_BUGON(page->mapping);
|
|
DBG_BUGON(!justfound);
|
|
|
|
tocache = true;
|
|
unlock_page(page);
|
|
put_page(page);
|
|
out_allocpage:
|
|
page = erofs_allocpage(pagepool, gfp | __GFP_NOFAIL);
|
|
if (oldpage != cmpxchg(&pcl->compressed_pages[nr], oldpage, page)) {
|
|
list_add(&page->lru, pagepool);
|
|
cond_resched();
|
|
goto repeat;
|
|
}
|
|
out_tocache:
|
|
if (!tocache || add_to_page_cache_lru(page, mc, index + nr, gfp)) {
|
|
/* turn into temporary page if fails (1 ref) */
|
|
set_page_private(page, Z_EROFS_SHORTLIVED_PAGE);
|
|
goto out;
|
|
}
|
|
attach_page_private(page, pcl);
|
|
/* drop a refcount added by allocpage (then we have 2 refs here) */
|
|
put_page(page);
|
|
|
|
out: /* the only exit (for tracing and debugging) */
|
|
return page;
|
|
}
|
|
|
|
static struct z_erofs_decompressqueue *
|
|
jobqueue_init(struct super_block *sb,
|
|
struct z_erofs_decompressqueue *fgq, bool *fg)
|
|
{
|
|
struct z_erofs_decompressqueue *q;
|
|
|
|
if (fg && !*fg) {
|
|
q = kvzalloc(sizeof(*q), GFP_KERNEL | __GFP_NOWARN);
|
|
if (!q) {
|
|
*fg = true;
|
|
goto fg_out;
|
|
}
|
|
#ifdef CONFIG_EROFS_FS_PCPU_KTHREAD
|
|
kthread_init_work(&q->u.kthread_work,
|
|
z_erofs_decompressqueue_kthread_work);
|
|
#else
|
|
INIT_WORK(&q->u.work, z_erofs_decompressqueue_work);
|
|
#endif
|
|
} else {
|
|
fg_out:
|
|
q = fgq;
|
|
init_completion(&fgq->u.done);
|
|
atomic_set(&fgq->pending_bios, 0);
|
|
}
|
|
q->sb = sb;
|
|
q->head = Z_EROFS_PCLUSTER_TAIL_CLOSED;
|
|
return q;
|
|
}
|
|
|
|
/* define decompression jobqueue types */
|
|
enum {
|
|
JQ_BYPASS,
|
|
JQ_SUBMIT,
|
|
NR_JOBQUEUES,
|
|
};
|
|
|
|
static void *jobqueueset_init(struct super_block *sb,
|
|
struct z_erofs_decompressqueue *q[],
|
|
struct z_erofs_decompressqueue *fgq, bool *fg)
|
|
{
|
|
/*
|
|
* if managed cache is enabled, bypass jobqueue is needed,
|
|
* no need to read from device for all pclusters in this queue.
|
|
*/
|
|
q[JQ_BYPASS] = jobqueue_init(sb, fgq + JQ_BYPASS, NULL);
|
|
q[JQ_SUBMIT] = jobqueue_init(sb, fgq + JQ_SUBMIT, fg);
|
|
|
|
return tagptr_cast_ptr(tagptr_fold(tagptr1_t, q[JQ_SUBMIT], *fg));
|
|
}
|
|
|
|
static void move_to_bypass_jobqueue(struct z_erofs_pcluster *pcl,
|
|
z_erofs_next_pcluster_t qtail[],
|
|
z_erofs_next_pcluster_t owned_head)
|
|
{
|
|
z_erofs_next_pcluster_t *const submit_qtail = qtail[JQ_SUBMIT];
|
|
z_erofs_next_pcluster_t *const bypass_qtail = qtail[JQ_BYPASS];
|
|
|
|
DBG_BUGON(owned_head == Z_EROFS_PCLUSTER_TAIL_CLOSED);
|
|
if (owned_head == Z_EROFS_PCLUSTER_TAIL)
|
|
owned_head = Z_EROFS_PCLUSTER_TAIL_CLOSED;
|
|
|
|
WRITE_ONCE(pcl->next, Z_EROFS_PCLUSTER_TAIL_CLOSED);
|
|
|
|
WRITE_ONCE(*submit_qtail, owned_head);
|
|
WRITE_ONCE(*bypass_qtail, &pcl->next);
|
|
|
|
qtail[JQ_BYPASS] = &pcl->next;
|
|
}
|
|
|
|
static void z_erofs_submit_queue(struct super_block *sb,
|
|
struct z_erofs_decompress_frontend *f,
|
|
struct list_head *pagepool,
|
|
struct z_erofs_decompressqueue *fgq,
|
|
bool *force_fg)
|
|
{
|
|
struct erofs_sb_info *const sbi = EROFS_SB(sb);
|
|
z_erofs_next_pcluster_t qtail[NR_JOBQUEUES];
|
|
struct z_erofs_decompressqueue *q[NR_JOBQUEUES];
|
|
void *bi_private;
|
|
z_erofs_next_pcluster_t owned_head = f->clt.owned_head;
|
|
/* since bio will be NULL, no need to initialize last_index */
|
|
pgoff_t last_index;
|
|
unsigned int nr_bios = 0;
|
|
struct bio *bio = NULL;
|
|
|
|
bi_private = jobqueueset_init(sb, q, fgq, force_fg);
|
|
qtail[JQ_BYPASS] = &q[JQ_BYPASS]->head;
|
|
qtail[JQ_SUBMIT] = &q[JQ_SUBMIT]->head;
|
|
|
|
/* by default, all need io submission */
|
|
q[JQ_SUBMIT]->head = owned_head;
|
|
|
|
do {
|
|
struct z_erofs_pcluster *pcl;
|
|
pgoff_t cur, end;
|
|
unsigned int i = 0;
|
|
bool bypass = true;
|
|
|
|
/* no possible 'owned_head' equals the following */
|
|
DBG_BUGON(owned_head == Z_EROFS_PCLUSTER_TAIL_CLOSED);
|
|
DBG_BUGON(owned_head == Z_EROFS_PCLUSTER_NIL);
|
|
|
|
pcl = container_of(owned_head, struct z_erofs_pcluster, next);
|
|
|
|
cur = pcl->obj.index;
|
|
end = cur + pcl->pclusterpages;
|
|
|
|
/* close the main owned chain at first */
|
|
owned_head = cmpxchg(&pcl->next, Z_EROFS_PCLUSTER_TAIL,
|
|
Z_EROFS_PCLUSTER_TAIL_CLOSED);
|
|
|
|
do {
|
|
struct page *page;
|
|
|
|
page = pickup_page_for_submission(pcl, i++, pagepool,
|
|
MNGD_MAPPING(sbi),
|
|
GFP_NOFS);
|
|
if (!page)
|
|
continue;
|
|
|
|
if (bio && cur != last_index + 1) {
|
|
submit_bio_retry:
|
|
submit_bio(bio);
|
|
bio = NULL;
|
|
}
|
|
|
|
if (!bio) {
|
|
bio = bio_alloc(GFP_NOIO, BIO_MAX_PAGES);
|
|
|
|
bio->bi_end_io = z_erofs_decompressqueue_endio;
|
|
bio_set_dev(bio, sb->s_bdev);
|
|
bio->bi_iter.bi_sector = (sector_t)cur <<
|
|
LOG_SECTORS_PER_BLOCK;
|
|
bio->bi_private = bi_private;
|
|
bio->bi_opf = REQ_OP_READ;
|
|
if (f->readahead)
|
|
bio->bi_opf |= REQ_RAHEAD;
|
|
++nr_bios;
|
|
}
|
|
|
|
if (bio_add_page(bio, page, PAGE_SIZE, 0) < PAGE_SIZE)
|
|
goto submit_bio_retry;
|
|
|
|
last_index = cur;
|
|
bypass = false;
|
|
} while (++cur < end);
|
|
|
|
if (!bypass)
|
|
qtail[JQ_SUBMIT] = &pcl->next;
|
|
else
|
|
move_to_bypass_jobqueue(pcl, qtail, owned_head);
|
|
} while (owned_head != Z_EROFS_PCLUSTER_TAIL);
|
|
|
|
if (bio)
|
|
submit_bio(bio);
|
|
|
|
/*
|
|
* although background is preferred, no one is pending for submission.
|
|
* don't issue decompression but drop it directly instead.
|
|
*/
|
|
if (!*force_fg && !nr_bios) {
|
|
kvfree(q[JQ_SUBMIT]);
|
|
return;
|
|
}
|
|
z_erofs_decompress_kickoff(q[JQ_SUBMIT], *force_fg, nr_bios);
|
|
}
|
|
|
|
static void z_erofs_runqueue(struct super_block *sb,
|
|
struct z_erofs_decompress_frontend *f,
|
|
struct list_head *pagepool, bool force_fg)
|
|
{
|
|
struct z_erofs_decompressqueue io[NR_JOBQUEUES];
|
|
|
|
if (f->clt.owned_head == Z_EROFS_PCLUSTER_TAIL)
|
|
return;
|
|
z_erofs_submit_queue(sb, f, pagepool, io, &force_fg);
|
|
|
|
/* handle bypass queue (no i/o pclusters) immediately */
|
|
z_erofs_decompress_queue(&io[JQ_BYPASS], pagepool);
|
|
|
|
if (!force_fg)
|
|
return;
|
|
|
|
/* wait until all bios are completed */
|
|
wait_for_completion_io(&io[JQ_SUBMIT].u.done);
|
|
|
|
/* handle synchronous decompress queue in the caller context */
|
|
z_erofs_decompress_queue(&io[JQ_SUBMIT], pagepool);
|
|
}
|
|
|
|
static int z_erofs_readpage(struct file *file, struct page *page)
|
|
{
|
|
struct inode *const inode = page->mapping->host;
|
|
struct z_erofs_decompress_frontend f = DECOMPRESS_FRONTEND_INIT(inode);
|
|
int err;
|
|
LIST_HEAD(pagepool);
|
|
|
|
trace_erofs_readpage(page, false);
|
|
|
|
f.headoffset = (erofs_off_t)page->index << PAGE_SHIFT;
|
|
|
|
err = z_erofs_do_read_page(&f, page, &pagepool);
|
|
(void)z_erofs_collector_end(&f.clt);
|
|
|
|
/* if some compressed cluster ready, need submit them anyway */
|
|
z_erofs_runqueue(inode->i_sb, &f, &pagepool, true);
|
|
|
|
if (err)
|
|
erofs_err(inode->i_sb, "failed to read, err [%d]", err);
|
|
|
|
if (f.map.mpage)
|
|
put_page(f.map.mpage);
|
|
|
|
/* clean up the remaining free pages */
|
|
put_pages_list(&pagepool);
|
|
return err;
|
|
}
|
|
|
|
static void z_erofs_readahead(struct readahead_control *rac)
|
|
{
|
|
struct inode *const inode = rac->mapping->host;
|
|
struct erofs_sb_info *const sbi = EROFS_I_SB(inode);
|
|
|
|
unsigned int nr_pages = readahead_count(rac);
|
|
bool sync = (sbi->ctx.readahead_sync_decompress &&
|
|
nr_pages <= sbi->ctx.max_sync_decompress_pages);
|
|
struct z_erofs_decompress_frontend f = DECOMPRESS_FRONTEND_INIT(inode);
|
|
struct page *page, *head = NULL;
|
|
LIST_HEAD(pagepool);
|
|
|
|
trace_erofs_readpages(inode, readahead_index(rac), nr_pages, false);
|
|
|
|
f.readahead = true;
|
|
f.headoffset = readahead_pos(rac);
|
|
|
|
while ((page = readahead_page(rac))) {
|
|
prefetchw(&page->flags);
|
|
|
|
/*
|
|
* A pure asynchronous readahead is indicated if
|
|
* a PG_readahead marked page is hitted at first.
|
|
* Let's also do asynchronous decompression for this case.
|
|
*/
|
|
sync &= !(PageReadahead(page) && !head);
|
|
|
|
set_page_private(page, (unsigned long)head);
|
|
head = page;
|
|
}
|
|
|
|
while (head) {
|
|
struct page *page = head;
|
|
int err;
|
|
|
|
/* traversal in reverse order */
|
|
head = (void *)page_private(page);
|
|
|
|
err = z_erofs_do_read_page(&f, page, &pagepool);
|
|
if (err)
|
|
erofs_err(inode->i_sb,
|
|
"readahead error at page %lu @ nid %llu",
|
|
page->index, EROFS_I(inode)->nid);
|
|
put_page(page);
|
|
}
|
|
|
|
(void)z_erofs_collector_end(&f.clt);
|
|
|
|
z_erofs_runqueue(inode->i_sb, &f, &pagepool, sync);
|
|
|
|
if (f.map.mpage)
|
|
put_page(f.map.mpage);
|
|
|
|
/* clean up the remaining free pages */
|
|
put_pages_list(&pagepool);
|
|
}
|
|
|
|
const struct address_space_operations z_erofs_aops = {
|
|
.readpage = z_erofs_readpage,
|
|
.readahead = z_erofs_readahead,
|
|
};
|
|
|