linaro-kernel October 2021

linaro-kernel@lists.linaro.org

1 participants
3 discussions

[TCWG CI] Regression caused by linux: samples: Add fs error monitoring example

by ci_notify＠linaro.org

[TCWG CI] Regression caused by linux: samples: Add fs error monitoring example: commit 5451093081db6ca1a708d149e11cfd219800bc4c Author: Gabriel Krisman Bertazi <krisman(a)collabora.com> samples: Add fs error monitoring example Results regressed to # reset_artifacts: -10 # build_abe binutils: -9 # build_abe stage1: -5 # build_abe qemu: -2 # linux_n_obj: 19813 # First few build errors in logs: # 00:01:45 samples/fanotify/fs-monitor.c:7:10: fatal error: errno.h: No such file or directory # 00:01:45 make[2]: *** [samples/fanotify/fs-monitor] Error 1 # 00:01:45 make[1]: *** [samples/fanotify] Error 2 # 00:02:18 make: *** [samples] Error 2 from # reset_artifacts: -10 # build_abe binutils: -9 # build_abe stage1: -5 # build_abe qemu: -2 # linux_n_obj: 19900 # linux build successful: all THIS IS THE END OF INTERESTING STUFF. BELOW ARE LINKS TO BUILDS, REPRODUCTION INSTRUCTIONS, AND THE RAW COMMIT. This commit has regressed these CI configurations: - tcwg_kernel/gnu-release-arm-next-allyesconfig First_bad build: https://ci.linaro.org/job/tcwg_kernel-gnu-bisect-gnu-release-arm-next-allye… Last_good build: https://ci.linaro.org/job/tcwg_kernel-gnu-bisect-gnu-release-arm-next-allye… Baseline build: https://ci.linaro.org/job/tcwg_kernel-gnu-bisect-gnu-release-arm-next-allye… Even more details: https://ci.linaro.org/job/tcwg_kernel-gnu-bisect-gnu-release-arm-next-allye… Reproduce builds: <cut> mkdir investigate-linux-5451093081db6ca1a708d149e11cfd219800bc4c cd investigate-linux-5451093081db6ca1a708d149e11cfd219800bc4c # Fetch scripts git clone https://git.linaro.org/toolchain/jenkins-scripts # Fetch manifests and test.sh script mkdir -p artifacts/manifests curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_kernel-gnu-bisect-gnu-release-arm-next-allye… --fail curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_kernel-gnu-bisect-gnu-release-arm-next-allye… --fail curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_kernel-gnu-bisect-gnu-release-arm-next-allye… --fail chmod +x artifacts/test.sh # Reproduce the baseline build (build all pre-requisites) ./jenkins-scripts/tcwg_kernel-build.sh @@ artifacts/manifests/build-baseline.sh # Save baseline build state (which is then restored in artifacts/test.sh) mkdir -p ./bisect rsync -a --del --delete-excluded --exclude /bisect/ --exclude /artifacts/ --exclude /linux/ ./ ./bisect/baseline/ cd linux # Reproduce first_bad build git checkout --detach 5451093081db6ca1a708d149e11cfd219800bc4c ../artifacts/test.sh # Reproduce last_good build git checkout --detach 9a089b21f79b47eed240d4da7ea0d049de7c9b4d ../artifacts/test.sh cd .. </cut> Full commit (up to 1000 lines): <cut> commit 5451093081db6ca1a708d149e11cfd219800bc4c Author: Gabriel Krisman Bertazi <krisman(a)collabora.com> Date: Mon Oct 25 16:27:45 2021 -0300 samples: Add fs error monitoring example Introduce an example of a FAN_FS_ERROR fanotify user to track filesystem errors. Link: https://lore.kernel.org/r/20211025192746.66445-31-krisman@collabora.com Reviewed-by: Amir Goldstein <amir73il(a)gmail.com> Reviewed-by: Jan Kara <jack(a)suse.cz> Signed-off-by: Gabriel Krisman Bertazi <krisman(a)collabora.com> Signed-off-by: Jan Kara <jack(a)suse.cz> --- samples/Kconfig | 9 +++ samples/Makefile | 1 + samples/fanotify/Makefile | 5 ++ samples/fanotify/fs-monitor.c | 142 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 157 insertions(+) diff --git a/samples/Kconfig b/samples/Kconfig index b0503ef058d3..88353b8eac0b 100644 --- a/samples/Kconfig +++ b/samples/Kconfig @@ -120,6 +120,15 @@ config SAMPLE_CONNECTOR with it. See also Documentation/driver-api/connector.rst +config SAMPLE_FANOTIFY_ERROR + bool "Build fanotify error monitoring sample" + depends on FANOTIFY + help + When enabled, this builds an example code that uses the + FAN_FS_ERROR fanotify mechanism to monitor filesystem + errors. + See also Documentation/admin-guide/filesystem-monitoring.rst. + config SAMPLE_HIDRAW bool "hidraw sample" depends on CC_CAN_LINK && HEADERS_INSTALL diff --git a/samples/Makefile b/samples/Makefile index 087e0988ccc5..931a81847c48 100644 --- a/samples/Makefile +++ b/samples/Makefile @@ -5,6 +5,7 @@ subdir-$(CONFIG_SAMPLE_AUXDISPLAY) += auxdisplay subdir-$(CONFIG_SAMPLE_ANDROID_BINDERFS) += binderfs obj-$(CONFIG_SAMPLE_CONFIGFS) += configfs/ obj-$(CONFIG_SAMPLE_CONNECTOR) += connector/ +obj-$(CONFIG_SAMPLE_FANOTIFY_ERROR) += fanotify/ subdir-$(CONFIG_SAMPLE_HIDRAW) += hidraw obj-$(CONFIG_SAMPLE_HW_BREAKPOINT) += hw_breakpoint/ obj-$(CONFIG_SAMPLE_KDB) += kdb/ diff --git a/samples/fanotify/Makefile b/samples/fanotify/Makefile new file mode 100644 index 000000000000..e20db1bdde3b --- /dev/null +++ b/samples/fanotify/Makefile @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0-only +userprogs-always-y += fs-monitor + +userccflags += -I usr/include -Wall + diff --git a/samples/fanotify/fs-monitor.c b/samples/fanotify/fs-monitor.c new file mode 100644 index 000000000000..a0e44cd31e6f --- /dev/null +++ b/samples/fanotify/fs-monitor.c @@ -0,0 +1,142 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Copyright 2021, Collabora Ltd. + */ + +#define _GNU_SOURCE +#include <errno.h> +#include <err.h> +#include <stdlib.h> +#include <stdio.h> +#include <fcntl.h> +#include <sys/fanotify.h> +#include <sys/types.h> +#include <unistd.h> +#include <sys/types.h> + +#ifndef FAN_FS_ERROR +#define FAN_FS_ERROR 0x00008000 +#define FAN_EVENT_INFO_TYPE_ERROR 5 + +struct fanotify_event_info_error { + struct fanotify_event_info_header hdr; + __s32 error; + __u32 error_count; +}; +#endif + +#ifndef FILEID_INO32_GEN +#define FILEID_INO32_GEN 1 +#endif + +#ifndef FILEID_INVALID +#define FILEID_INVALID 0xff +#endif + +static void print_fh(struct file_handle *fh) +{ + int i; + uint32_t *h = (uint32_t *) fh->f_handle; + + printf("\tfh: "); + for (i = 0; i < fh->handle_bytes; i++) + printf("%hhx", fh->f_handle[i]); + printf("\n"); + + printf("\tdecoded fh: "); + if (fh->handle_type == FILEID_INO32_GEN) + printf("inode=%u gen=%u\n", h[0], h[1]); + else if (fh->handle_type == FILEID_INVALID && !fh->handle_bytes) + printf("Type %d (Superblock error)\n", fh->handle_type); + else + printf("Type %d (Unknown)\n", fh->handle_type); + +} + +static void handle_notifications(char *buffer, int len) +{ + struct fanotify_event_metadata *event = + (struct fanotify_event_metadata *) buffer; + struct fanotify_event_info_header *info; + struct fanotify_event_info_error *err; + struct fanotify_event_info_fid *fid; + int off; + + for (; FAN_EVENT_OK(event, len); event = FAN_EVENT_NEXT(event, len)) { + + if (event->mask != FAN_FS_ERROR) { + printf("unexpected FAN MARK: %llx\n", event->mask); + goto next_event; + } + + if (event->fd != FAN_NOFD) { + printf("Unexpected fd (!= FAN_NOFD)\n"); + goto next_event; + } + + printf("FAN_FS_ERROR (len=%d)\n", event->event_len); + + for (off = sizeof(*event) ; off < event->event_len; + off += info->len) { + info = (struct fanotify_event_info_header *) + ((char *) event + off); + + switch (info->info_type) { + case FAN_EVENT_INFO_TYPE_ERROR: + err = (struct fanotify_event_info_error *) info; + + printf("\tGeneric Error Record: len=%d\n", + err->hdr.len); + printf("\terror: %d\n", err->error); + printf("\terror_count: %d\n", err->error_count); + break; + + case FAN_EVENT_INFO_TYPE_FID: + fid = (struct fanotify_event_info_fid *) info; + + printf("\tfsid: %x%x\n", + fid->fsid.val[0], fid->fsid.val[1]); + print_fh((struct file_handle *) &fid->handle); + break; + + default: + printf("\tUnknown info type=%d len=%d:\n", + info->info_type, info->len); + } + } +next_event: + printf("---\n\n"); + } +} + +int main(int argc, char **argv) +{ + int fd; + + char buffer[BUFSIZ]; + + if (argc < 2) { + printf("Missing path argument\n"); + return 1; + } + + fd = fanotify_init(FAN_CLASS_NOTIF|FAN_REPORT_FID, O_RDONLY); + if (fd < 0) + errx(1, "fanotify_init"); + + if (fanotify_mark(fd, FAN_MARK_ADD|FAN_MARK_FILESYSTEM, + FAN_FS_ERROR, AT_FDCWD, argv[1])) { + errx(1, "fanotify_mark"); + } + + while (1) { + int n = read(fd, buffer, BUFSIZ); + + if (n < 0) + errx(1, "read"); + + handle_notifications(buffer, n); + } + + return 0; +} </cut>

2 years, 5 months

[TCWG CI] Regression caused by linux: Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git

by ci_notify＠linaro.org

[TCWG CI] Regression caused by linux: Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git: commit 47f623f2a4ed4a6b712cb361f96609e0ec6af7e5 Merge: 9cec3feb65f9 08e438e6296c Author: Stephen Rothwell <sfr(a)canb.auug.org.au> Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git Results regressed to # reset_artifacts: -10 # build_abe binutils: -9 # build_abe stage1: -5 # build_abe qemu: -2 # linux_n_obj: 6879 # First few build errors in logs: # 00:01:43 make[1]: *** [modules-only.symvers] Error 1 # 00:01:43 make: *** [modules] Error 2 from # reset_artifacts: -10 # build_abe binutils: -9 # build_abe stage1: -5 # build_abe qemu: -2 # linux_n_obj: 7718 # linux build successful: all # linux boot successful: boot THIS IS THE END OF INTERESTING STUFF. BELOW ARE LINKS TO BUILDS, REPRODUCTION INSTRUCTIONS, AND THE RAW COMMIT. This commit has regressed these CI configurations: - tcwg_kernel/gnu-release-aarch64-next-defconfig First_bad build: https://ci.linaro.org/job/tcwg_kernel-gnu-bisect-gnu-release-aarch64-next-d… Last_good build: https://ci.linaro.org/job/tcwg_kernel-gnu-bisect-gnu-release-aarch64-next-d… Baseline build: https://ci.linaro.org/job/tcwg_kernel-gnu-bisect-gnu-release-aarch64-next-d… Even more details: https://ci.linaro.org/job/tcwg_kernel-gnu-bisect-gnu-release-aarch64-next-d… Reproduce builds: <cut> mkdir investigate-linux-47f623f2a4ed4a6b712cb361f96609e0ec6af7e5 cd investigate-linux-47f623f2a4ed4a6b712cb361f96609e0ec6af7e5 # Fetch scripts git clone https://git.linaro.org/toolchain/jenkins-scripts # Fetch manifests and test.sh script mkdir -p artifacts/manifests curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_kernel-gnu-bisect-gnu-release-aarch64-next-d… --fail curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_kernel-gnu-bisect-gnu-release-aarch64-next-d… --fail curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_kernel-gnu-bisect-gnu-release-aarch64-next-d… --fail chmod +x artifacts/test.sh # Reproduce the baseline build (build all pre-requisites) ./jenkins-scripts/tcwg_kernel-build.sh @@ artifacts/manifests/build-baseline.sh # Save baseline build state (which is then restored in artifacts/test.sh) mkdir -p ./bisect rsync -a --del --delete-excluded --exclude /bisect/ --exclude /artifacts/ --exclude /linux/ ./ ./bisect/baseline/ cd linux # Reproduce first_bad build git checkout --detach 47f623f2a4ed4a6b712cb361f96609e0ec6af7e5 ../artifacts/test.sh # Reproduce last_good build git checkout --detach 9cec3feb65f946f7fa4225f8df965aacbe97fd8c ../artifacts/test.sh cd .. </cut> Full commit (up to 1000 lines): <cut> commit 47f623f2a4ed4a6b712cb361f96609e0ec6af7e5 Merge: 9cec3feb65f9 08e438e6296c Author: Stephen Rothwell <sfr(a)canb.auug.org.au> Date: Thu Oct 28 18:26:16 2021 +1100 Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git # Conflicts: # drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c # drivers/gpu/drm/tegra/gem.c .../ABI/testing/debugfs-driver-habanalabs | 6 + Documentation/ABI/testing/sysfs-bus-counter | 38 +- .../ABI/testing/sysfs-bus-fsi-devices-sbefifo | 10 + Documentation/ABI/testing/sysfs-bus-iio | 42 + .../ABI/testing/sysfs-bus-iio-chemical-sunrise-co2 | 38 + Documentation/ABI/testing/sysfs-bus-iio-scd30 | 34 - .../ABI/testing/sysfs-bus-iio-temperature-max31865 | 20 + .../testing/sysfs-bus-platform-devices-occ-hwmon | 13 + .../devicetree/bindings/iio/accel/adi,adxl313.yaml | 86 + .../devicetree/bindings/iio/accel/adi,adxl355.yaml | 88 + .../bindings/iio/accel/kionix,kxcjk1013.yaml | 3 + .../devicetree/bindings/iio/adc/adi,ad7949.yaml | 51 +- .../devicetree/bindings/iio/adc/adi,ad799x.yaml | 73 + .../bindings/iio/adc/aspeed,ast2600-adc.yaml | 100 + .../bindings/iio/adc/atmel,sama5d2-adc.yaml | 1 + .../bindings/iio/adc/nxp,imx8qxp-adc.yaml | 78 + .../devicetree/bindings/iio/adc/st,stm32-adc.yaml | 108 +- .../bindings/iio/chemical/senseair,sunrise.yaml | 55 + .../bindings/iio/chemical/sensirion,scd4x.yaml | 46 + .../bindings/iio/frequency/adi,adrf6780.yaml | 131 ++ .../bindings/iio/light/liteon,ltr501.yaml | 51 + .../iio/magnetometer/asahi-kasei,ak8975.yaml | 7 + .../bindings/iio/multiplexer/io-channel-mux.yaml | 13 +- .../bindings/iio/temperature/maxim,max31865.yaml | 52 + .../devicetree/bindings/vendor-prefixes.yaml | 4 + Documentation/driver-api/driver-model/devres.rst | 1 + Documentation/driver-api/generic-counter.rst | 363 +++- Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + Documentation/virt/ne_overview.rst | 21 +- MAINTAINERS | 42 +- drivers/android/binder.c | 14 +- drivers/char/mem.c | 8 +- drivers/char/xillybus/xillybus.h | 31 +- drivers/char/xillybus/xillybus_core.c | 131 +- drivers/char/xillybus/xillybus_of.c | 86 +- drivers/char/xillybus/xillybus_pcie.c | 99 +- drivers/char/xillybus/xillyusb.c | 1 + drivers/comedi/drivers/vmk80xx.c | 28 +- drivers/counter/104-quad-8.c | 699 ++++--- drivers/counter/Kconfig | 6 +- drivers/counter/Makefile | 1 + drivers/counter/counter-chrdev.c | 573 ++++++ drivers/counter/counter-chrdev.h | 14 + drivers/counter/counter-core.c | 191 ++ drivers/counter/counter-sysfs.c | 959 ++++++++++ drivers/counter/counter-sysfs.h | 13 + drivers/counter/counter.c | 1496 --------------- drivers/counter/ftm-quaddec.c | 60 +- drivers/counter/intel-qep.c | 146 +- drivers/counter/interrupt-cnt.c | 62 +- drivers/counter/microchip-tcb-capture.c | 93 +- drivers/counter/stm32-lptimer-cnt.c | 212 +-- drivers/counter/stm32-timer-cnt.c | 195 +- drivers/counter/ti-eqep.c | 180 +- drivers/dma-buf/dma-buf.c | 34 +- drivers/fsi/fsi-occ.c | 218 ++- drivers/fsi/fsi-sbefifo.c | 28 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 + drivers/gpu/drm/armada/armada_gem.c | 2 + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 3 + drivers/gpu/drm/drm_gem_shmem_helper.c | 2 + drivers/gpu/drm/drm_prime.c | 3 + drivers/gpu/drm/etnaviv/etnaviv_gem_prime.c | 3 + drivers/gpu/drm/exynos/exynos_drm_gem.c | 3 + drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c | 3 + drivers/gpu/drm/omapdrm/omap_gem_dmabuf.c | 2 + drivers/gpu/drm/tegra/gem.c | 3 + drivers/gpu/drm/vmwgfx/ttm_object.c | 3 + drivers/hwmon/occ/common.c | 30 +- drivers/hwmon/occ/common.h | 3 +- drivers/hwmon/occ/p8_i2c.c | 15 +- drivers/hwmon/occ/p9_sbe.c | 90 +- drivers/iio/accel/Kconfig | 62 + drivers/iio/accel/Makefile | 6 + drivers/iio/accel/adxl313.h | 54 + drivers/iio/accel/adxl313_core.c | 332 ++++ drivers/iio/accel/adxl313_i2c.c | 66 + drivers/iio/accel/adxl313_spi.c | 92 + drivers/iio/accel/adxl355.h | 21 + drivers/iio/accel/adxl355_core.c | 765 ++++++++ drivers/iio/accel/adxl355_i2c.c | 62 + drivers/iio/accel/adxl355_spi.c | 65 + drivers/iio/accel/adxl372.c | 1 + drivers/iio/accel/bma400.h | 2 +- drivers/iio/accel/bma400_core.c | 7 +- drivers/iio/accel/bma400_i2c.c | 4 +- drivers/iio/accel/bma400_spi.c | 4 +- drivers/iio/accel/bmc150-accel-core.c | 5 +- drivers/iio/accel/bmc150-accel-i2c.c | 4 +- drivers/iio/accel/bmc150-accel-spi.c | 4 +- drivers/iio/accel/bmc150-accel.h | 2 +- drivers/iio/accel/bmi088-accel-core.c | 4 +- drivers/iio/accel/bmi088-accel-spi.c | 4 +- drivers/iio/accel/bmi088-accel.h | 2 +- drivers/iio/accel/fxls8962af-core.c | 347 +++- drivers/iio/accel/kxsd9-i2c.c | 4 +- drivers/iio/accel/kxsd9-spi.c | 4 +- drivers/iio/accel/kxsd9.c | 4 +- drivers/iio/accel/kxsd9.h | 2 +- drivers/iio/accel/mma7455.h | 2 +- drivers/iio/accel/mma7455_core.c | 4 +- drivers/iio/accel/mma7455_i2c.c | 4 +- drivers/iio/accel/mma7455_spi.c | 4 +- drivers/iio/accel/mma7660.c | 2 +- drivers/iio/accel/sca3000.c | 3 +- drivers/iio/accel/st_accel_core.c | 31 +- drivers/iio/accel/st_accel_i2c.c | 23 +- drivers/iio/accel/st_accel_spi.c | 23 +- drivers/iio/adc/Kconfig | 18 +- drivers/iio/adc/Makefile | 1 + drivers/iio/adc/ab8500-gpadc.c | 22 +- drivers/iio/adc/ad7291.c | 70 +- drivers/iio/adc/ad7949.c | 254 ++- drivers/iio/adc/ad799x.c | 68 +- drivers/iio/adc/aspeed_adc.c | 598 +++++- drivers/iio/adc/at91-sama5d2_adc.c | 598 ++++-- drivers/iio/adc/axp288_adc.c | 28 +- drivers/iio/adc/berlin2-adc.c | 34 +- drivers/iio/adc/da9150-gpadc.c | 27 +- drivers/iio/adc/ep93xx_adc.c | 4 +- drivers/iio/adc/fsl-imx25-gcq.c | 55 +- drivers/iio/adc/imx7d_adc.c | 18 +- drivers/iio/adc/imx8qxp-adc.c | 494 +++++ drivers/iio/adc/intel_mrfld_adc.c | 24 +- drivers/iio/adc/lp8788_adc.c | 31 +- drivers/iio/adc/lpc18xx_adc.c | 75 +- drivers/iio/adc/max1027.c | 278 ++- drivers/iio/adc/max1118.c | 7 +- drivers/iio/adc/max1241.c | 17 +- drivers/iio/adc/max1363.c | 82 +- drivers/iio/adc/meson_saradc.c | 39 +- drivers/iio/adc/nau7802.c | 50 +- drivers/iio/adc/qcom-pm8xxx-xoadc.c | 9 +- drivers/iio/adc/rn5t618-adc.c | 13 +- drivers/iio/adc/rockchip_saradc.c | 31 +- drivers/iio/adc/stm32-adc-core.c | 1 + drivers/iio/adc/stm32-adc-core.h | 10 + drivers/iio/adc/stm32-adc.c | 422 ++++- drivers/iio/adc/ti-adc108s102.c | 11 +- drivers/iio/adc/ti-adc128s052.c | 33 +- drivers/iio/adc/ti-ads7950.c | 4 +- drivers/iio/adc/ti-ads8344.c | 27 +- drivers/iio/adc/twl6030-gpadc.c | 6 +- drivers/iio/adc/xilinx-xadc-core.c | 5 +- drivers/iio/adc/xilinx-xadc.h | 1 - drivers/iio/buffer/industrialio-triggered-buffer.c | 8 +- drivers/iio/buffer/kfifo_buf.c | 50 + drivers/iio/chemical/Kconfig | 24 + drivers/iio/chemical/Makefile | 2 + drivers/iio/chemical/scd4x.c | 696 +++++++ drivers/iio/chemical/sunrise_co2.c | 537 ++++++ .../iio/common/hid-sensors/hid-sensor-trigger.c | 5 +- drivers/iio/common/st_sensors/st_sensors_core.c | 48 +- drivers/iio/common/st_sensors/st_sensors_i2c.c | 1 - drivers/iio/common/st_sensors/st_sensors_spi.c | 1 - drivers/iio/common/st_sensors/st_sensors_trigger.c | 53 +- drivers/iio/dac/ad5064.c | 49 +- drivers/iio/dac/ad5380.c | 15 +- drivers/iio/dac/ad5446.c | 12 +- drivers/iio/dac/ad5592r-base.c | 4 +- drivers/iio/dac/ad5592r-base.h | 2 +- drivers/iio/dac/ad5592r.c | 4 +- drivers/iio/dac/ad5593r.c | 4 +- drivers/iio/dac/ad5686-spi.c | 4 +- drivers/iio/dac/ad5686.c | 4 +- drivers/iio/dac/ad5686.h | 2 +- drivers/iio/dac/ad5696-i2c.c | 4 +- drivers/iio/dac/ad5766.c | 42 + drivers/iio/dac/ad5770r.c | 2 +- drivers/iio/dac/ad7303.c | 47 +- drivers/iio/dac/ad8801.c | 11 +- drivers/iio/dac/ds4424.c | 9 +- drivers/iio/dac/lpc18xx_dac.c | 14 +- drivers/iio/dac/ltc1660.c | 7 +- drivers/iio/dac/max5821.c | 9 +- drivers/iio/dac/mcp4922.c | 7 +- drivers/iio/dac/stm32-dac-core.c | 18 +- drivers/iio/dac/ti-dac7311.c | 7 +- drivers/iio/frequency/Kconfig | 12 + drivers/iio/frequency/Makefile | 1 + drivers/iio/frequency/adrf6780.c | 527 ++++++ drivers/iio/gyro/Kconfig | 1 - drivers/iio/gyro/adis16080.c | 11 +- drivers/iio/gyro/mpu3050-core.c | 24 +- drivers/iio/gyro/st_gyro_core.c | 27 +- drivers/iio/gyro/st_gyro_i2c.c | 23 +- drivers/iio/gyro/st_gyro_spi.c | 23 +- drivers/iio/health/afe4403.c | 14 +- drivers/iio/health/afe4404.c | 8 +- drivers/iio/iio_core.h | 4 + drivers/iio/imu/adis.c | 17 +- drivers/iio/imu/adis16400.c | 20 +- drivers/iio/imu/adis16460.c | 18 +- drivers/iio/imu/adis16475.c | 19 +- drivers/iio/imu/adis_trigger.c | 4 + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 2 +- drivers/iio/imu/inv_mpu6050/inv_mpu_magn.c | 36 +- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 4 +- drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 22 +- drivers/iio/imu/st_lsm9ds0/st_lsm9ds0.h | 1 - drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_core.c | 29 +- drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_i2c.c | 6 - drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_spi.c | 6 - drivers/iio/industrialio-buffer.c | 173 +- drivers/iio/industrialio-core.c | 1 + drivers/iio/inkern.c | 17 + drivers/iio/light/cm3605.c | 29 +- drivers/iio/light/cm36651.c | 7 +- drivers/iio/light/gp2ap002.c | 24 +- drivers/iio/light/ltr501.c | 37 + drivers/iio/light/max44000.c | 17 +- drivers/iio/light/noa1305.c | 7 +- drivers/iio/magnetometer/Kconfig | 2 +- drivers/iio/magnetometer/ak8975.c | 35 + drivers/iio/magnetometer/hmc5843.h | 2 +- drivers/iio/magnetometer/hmc5843_core.c | 4 +- drivers/iio/magnetometer/hmc5843_i2c.c | 4 +- drivers/iio/magnetometer/hmc5843_spi.c | 4 +- drivers/iio/magnetometer/st_magn_core.c | 29 +- drivers/iio/magnetometer/st_magn_i2c.c | 23 +- drivers/iio/magnetometer/st_magn_spi.c | 23 +- drivers/iio/multiplexer/iio-mux.c | 7 +- drivers/iio/potentiometer/max5487.c | 7 +- drivers/iio/pressure/ms5611.h | 2 +- drivers/iio/pressure/ms5611_core.c | 4 +- drivers/iio/pressure/ms5611_i2c.c | 4 +- drivers/iio/pressure/ms5611_spi.c | 4 +- drivers/iio/pressure/st_pressure_core.c | 27 +- drivers/iio/pressure/st_pressure_i2c.c | 23 +- drivers/iio/pressure/st_pressure_spi.c | 23 +- drivers/iio/temperature/Kconfig | 10 + drivers/iio/temperature/Makefile | 1 + drivers/iio/temperature/ltc2983.c | 16 + drivers/iio/temperature/max31865.c | 349 ++++ drivers/infiniband/core/umem_dmabuf.c | 3 + drivers/interconnect/qcom/icc-rpm.c | 263 ++- drivers/interconnect/qcom/icc-rpm.h | 56 +- drivers/interconnect/qcom/msm8916.c | 1214 +++++++++++- drivers/interconnect/qcom/msm8939.c | 1283 ++++++++++++- drivers/interconnect/qcom/qcs404.c | 967 +++++++++- drivers/interconnect/qcom/sdm660.c | 1940 ++++++++++++++------ drivers/interconnect/samsung/Kconfig | 6 +- drivers/ipack/devices/ipoctal.c | 48 +- drivers/media/common/videobuf2/videobuf2-core.c | 1 + .../media/common/videobuf2/videobuf2-dma-contig.c | 1 + drivers/media/common/videobuf2/videobuf2-dma-sg.c | 1 + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 1 + drivers/misc/ad525x_dpot-i2c.c | 3 +- drivers/misc/ad525x_dpot-spi.c | 3 +- drivers/misc/ad525x_dpot.c | 4 +- drivers/misc/ad525x_dpot.h | 2 +- drivers/misc/cardreader/rtsx_pcr.c | 2 +- drivers/misc/enclosure.c | 16 +- drivers/misc/fastrpc.c | 21 +- drivers/misc/genwqe/card_utils.c | 10 +- drivers/misc/habanalabs/Kconfig | 2 + drivers/misc/habanalabs/common/Makefile | 2 +- .../misc/habanalabs/common/command_submission.c | 105 +- drivers/misc/habanalabs/common/context.c | 8 +- drivers/misc/habanalabs/common/debugfs.c | 51 + drivers/misc/habanalabs/common/device.c | 159 +- drivers/misc/habanalabs/common/firmware_if.c | 28 +- drivers/misc/habanalabs/common/habanalabs.h | 64 +- drivers/misc/habanalabs/common/habanalabs_drv.c | 24 +- .../{gaudi/gaudi_hwmgr.c => common/hwmgr.c} | 38 +- drivers/misc/habanalabs/common/hwmon.c | 194 +- drivers/misc/habanalabs/common/irq.c | 5 +- drivers/misc/habanalabs/common/memory.c | 515 +++++- drivers/misc/habanalabs/common/mmu/mmu.c | 30 +- drivers/misc/habanalabs/common/sysfs.c | 6 +- drivers/misc/habanalabs/gaudi/Makefile | 2 +- drivers/misc/habanalabs/gaudi/gaudi.c | 22 +- drivers/misc/habanalabs/gaudi/gaudiP.h | 4 - drivers/misc/habanalabs/goya/goya.c | 13 +- drivers/misc/habanalabs/goya/goyaP.h | 1 - drivers/misc/habanalabs/goya/goya_hwmgr.c | 31 - drivers/misc/habanalabs/include/common/cpucp_if.h | 22 +- .../misc/habanalabs/include/common/hl_boot_if.h | 189 +- .../misc/habanalabs/include/gaudi/gaudi_fw_if.h | 10 +- .../misc/habanalabs/include/gaudi/gaudi_reg_map.h | 1 + drivers/misc/hisi_hikey_usb.c | 119 +- drivers/misc/lis3lv02d/lis3lv02d.c | 3 +- drivers/misc/lis3lv02d/lis3lv02d.h | 2 +- drivers/misc/lis3lv02d/lis3lv02d_spi.c | 4 +- drivers/misc/lkdtm/bugs.c | 77 + drivers/misc/lkdtm/core.c | 1 + drivers/misc/lkdtm/lkdtm.h | 1 + drivers/misc/mei/pci-txe.c | 4 +- drivers/misc/pvpanic/pvpanic-mmio.c | 9 +- drivers/misc/pvpanic/pvpanic-pci.c | 26 +- drivers/misc/pvpanic/pvpanic.c | 16 +- drivers/misc/tifm_7xx1.c | 2 +- drivers/misc/tifm_core.c | 8 +- drivers/most/most_usb.c | 5 +- drivers/mux/core.c | 38 +- drivers/nvmem/core.c | 174 +- drivers/nvmem/imx-ocotp.c | 25 + drivers/platform/x86/hp_accel.c | 3 +- drivers/soundwire/bus.c | 2 +- drivers/soundwire/debugfs.c | 2 +- drivers/soundwire/qcom.c | 27 + drivers/staging/iio/cdc/ad7746.c | 4 +- drivers/staging/iio/frequency/ad9832.c | 82 +- drivers/staging/media/tegra-vde/dmabuf-cache.c | 3 + drivers/tee/tee_shm.c | 3 + drivers/virt/acrn/hsm.c | 49 + drivers/virt/acrn/hypercall.h | 52 + drivers/virt/nitro_enclaves/Kconfig | 8 +- drivers/virt/nitro_enclaves/ne_misc_dev.c | 17 +- drivers/virt/nitro_enclaves/ne_pci_dev.c | 2 +- drivers/virt/nitro_enclaves/ne_pci_dev.h | 8 +- drivers/virtio/virtio_dma_buf.c | 1 + drivers/xen/gntdev-dmabuf.c | 3 + include/linux/counter.h | 715 ++++---- include/linux/counter_enum.h | 45 - include/linux/fsi-occ.h | 2 + include/linux/iio/buffer.h | 11 + include/linux/iio/buffer_impl.h | 11 + include/linux/iio/common/st_sensors.h | 13 - include/linux/iio/driver.h | 14 + include/linux/iio/iio-opaque.h | 4 + include/linux/iio/imu/adis.h | 2 + include/linux/iio/triggered_buffer.h | 11 +- include/linux/mfd/stm32-lptimer.h | 5 + include/linux/mfd/stm32-timers.h | 4 + include/linux/mux/consumer.h | 23 +- include/linux/mux/driver.h | 4 + include/linux/nvmem-provider.h | 5 + include/uapi/linux/acrn.h | 70 + include/uapi/linux/counter.h | 154 ++ include/uapi/linux/nitro_enclaves.h | 10 +- include/uapi/misc/habanalabs.h | 84 +- samples/kfifo/bytestream-example.c | 12 +- samples/kfifo/inttype-example.c | 12 +- samples/kfifo/record-example.c | 12 +- samples/nitro_enclaves/ne_ioctl_sample.c | 7 +- samples/vfio-mdev/mbochs.c | 1 + scripts/tags.sh | 6 +- tools/Makefile | 13 +- tools/counter/Build | 1 + tools/counter/Makefile | 53 + tools/counter/counter_example.c | 92 + tools/testing/selftests/lkdtm/config | 1 + tools/testing/selftests/lkdtm/run.sh | 10 +- tools/testing/selftests/lkdtm/tests.txt | 1 + 345 files changed, 19305 insertions(+), 6542 deletions(-) diff --cc drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c index a45d0ec2c5b6,abb854281347..3b1987b8f43c --- a/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c +++ b/drivers/gpu/drm/i915/gem/i915_gem_dmabuf.c @@@ -12,13 -13,8 +13,15 @@@ #include "i915_gem_object.h" #include "i915_scatterlist.h" +#if defined(CONFIG_X86) +#include <asm/smp.h> +#else +#define wbinvd_on_all_cpus() \ + pr_warn(DRIVER_NAME ": Missing cache flush in %s\n", __func__) +#endif + + MODULE_IMPORT_NS(DMA_BUF); + I915_SELFTEST_DECLARE(static bool force_different_devices;) static struct drm_i915_gem_object *dma_buf_to_obj(struct dma_buf *buf) diff --cc drivers/gpu/drm/tegra/gem.c index 62fc7e8429d4,d38fd7e12b57..fce0e52973c2 --- a/drivers/gpu/drm/tegra/gem.c +++ b/drivers/gpu/drm/tegra/gem.c @@@ -20,78 -21,60 +21,80 @@@ #include "drm.h" #include "gem.h" + MODULE_IMPORT_NS(DMA_BUF); + -static void tegra_bo_put(struct host1x_bo *bo) +static unsigned int sg_dma_count_chunks(struct scatterlist *sgl, unsigned int nents) { - struct tegra_bo *obj = host1x_to_tegra_bo(bo); + dma_addr_t next = ~(dma_addr_t)0; + unsigned int count = 0, i; + struct scatterlist *s; + + for_each_sg(sgl, s, nents, i) { + /* sg_dma_address(s) is only valid for entries that have sg_dma_len(s) != 0. */ + if (!sg_dma_len(s)) + continue; + + if (sg_dma_address(s) != next) { + next = sg_dma_address(s) + sg_dma_len(s); + count++; + } + } - drm_gem_object_put(&obj->gem); + return count; } -/* XXX move this into lib/scatterlist.c? */ -static int sg_alloc_table_from_sg(struct sg_table *sgt, struct scatterlist *sg, - unsigned int nents, gfp_t gfp_mask) +static inline unsigned int sgt_dma_count_chunks(struct sg_table *sgt) { - struct scatterlist *dst; - unsigned int i; - int err; - - err = sg_alloc_table(sgt, nents, gfp_mask); - if (err < 0) - return err; - - dst = sgt->sgl; + return sg_dma_count_chunks(sgt->sgl, sgt->nents); +} - for (i = 0; i < nents; i++) { - sg_set_page(dst, sg_page(sg), sg->length, 0); - dst = sg_next(dst); - sg = sg_next(sg); - } +static void tegra_bo_put(struct host1x_bo *bo) +{ + struct tegra_bo *obj = host1x_to_tegra_bo(bo); - return 0; + drm_gem_object_put(&obj->gem); } -static struct sg_table *tegra_bo_pin(struct device *dev, struct host1x_bo *bo, - dma_addr_t *phys) +static struct host1x_bo_mapping *tegra_bo_pin(struct device *dev, struct host1x_bo *bo, + enum dma_data_direction direction) { struct tegra_bo *obj = host1x_to_tegra_bo(bo); - struct sg_table *sgt; + struct drm_gem_object *gem = &obj->gem; + struct host1x_bo_mapping *map; int err; + map = kzalloc(sizeof(*map), GFP_KERNEL); + if (!map) + return ERR_PTR(-ENOMEM); + + kref_init(&map->ref); + map->bo = host1x_bo_get(bo); + map->direction = direction; + map->dev = dev; + /* - * If we've manually mapped the buffer object through the IOMMU, make - * sure to return the IOVA address of our mapping. - * - * Similarly, for buffers that have been allocated by the DMA API the - * physical address can be used for devices that are not attached to - * an IOMMU. For these devices, callers must pass a valid pointer via - * the @phys argument. - * - * Imported buffers were also already mapped at import time, so the - * existing mapping can be reused. + * Imported buffers need special treatment to satisfy the semantics of DMA-BUF. */ - if (phys) { - *phys = obj->iova; - return NULL; + if (gem->import_attach) { + struct dma_buf *buf = gem->import_attach->dmabuf; + + map->attach = dma_buf_attach(buf, dev); + if (IS_ERR(map->attach)) { + err = PTR_ERR(map->attach); + goto free; + } + + map->sgt = dma_buf_map_attachment(map->attach, direction); + if (IS_ERR(map->sgt)) { + dma_buf_detach(buf, map->attach); + err = PTR_ERR(map->sgt); + goto free; + } + + err = sgt_dma_count_chunks(map->sgt); + map->size = gem->size; + + goto out; } /* </cut>

2 years, 5 months

[TCWG CI] Regression caused by linux: btrfs: rework lzo_compress_pages() to make it subpage compatible

by ci_notify＠linaro.org

[TCWG CI] Regression caused by linux: btrfs: rework lzo_compress_pages() to make it subpage compatible: commit 0078783c7089fc83f0072066b23908120d7990e9 Author: Qu Wenruo <wqu(a)suse.com> btrfs: rework lzo_compress_pages() to make it subpage compatible Results regressed to # reset_artifacts: -10 # build_abe binutils: -9 # build_abe stage1: -5 # build_abe qemu: -2 # linux_n_obj: 19814 # First few build errors in logs: # 00:31:06 lzo.c:(.text+0x79c): undefined reference to `__aeabi_uldivmod' # 00:31:06 arm-linux-gnueabihf-ld: lzo.c:(.text+0xb2c): undefined reference to `__aeabi_uldivmod' # 00:31:06 arm-linux-gnueabihf-ld: lzo.c:(.text+0xb78): undefined reference to `__aeabi_uldivmod' # 00:31:14 make: *** [vmlinux] Error 1 from # reset_artifacts: -10 # build_abe binutils: -9 # build_abe stage1: -5 # build_abe qemu: -2 # linux_n_obj: 19899 # linux build successful: all THIS IS THE END OF INTERESTING STUFF. BELOW ARE LINKS TO BUILDS, REPRODUCTION INSTRUCTIONS, AND THE RAW COMMIT. This commit has regressed these CI configurations: - tcwg_kernel/gnu-release-arm-next-allyesconfig First_bad build: https://ci.linaro.org/job/tcwg_kernel-gnu-bisect-gnu-release-arm-next-allye… Last_good build: https://ci.linaro.org/job/tcwg_kernel-gnu-bisect-gnu-release-arm-next-allye… Baseline build: https://ci.linaro.org/job/tcwg_kernel-gnu-bisect-gnu-release-arm-next-allye… Even more details: https://ci.linaro.org/job/tcwg_kernel-gnu-bisect-gnu-release-arm-next-allye… Reproduce builds: <cut> mkdir investigate-linux-0078783c7089fc83f0072066b23908120d7990e9 cd investigate-linux-0078783c7089fc83f0072066b23908120d7990e9 # Fetch scripts git clone https://git.linaro.org/toolchain/jenkins-scripts # Fetch manifests and test.sh script mkdir -p artifacts/manifests curl -o artifacts/manifests/build-baseline.sh https://ci.linaro.org/job/tcwg_kernel-gnu-bisect-gnu-release-arm-next-allye… --fail curl -o artifacts/manifests/build-parameters.sh https://ci.linaro.org/job/tcwg_kernel-gnu-bisect-gnu-release-arm-next-allye… --fail curl -o artifacts/test.sh https://ci.linaro.org/job/tcwg_kernel-gnu-bisect-gnu-release-arm-next-allye… --fail chmod +x artifacts/test.sh # Reproduce the baseline build (build all pre-requisites) ./jenkins-scripts/tcwg_kernel-build.sh @@ artifacts/manifests/build-baseline.sh # Save baseline build state (which is then restored in artifacts/test.sh) mkdir -p ./bisect rsync -a --del --delete-excluded --exclude /bisect/ --exclude /artifacts/ --exclude /linux/ ./ ./bisect/baseline/ cd linux # Reproduce first_bad build git checkout --detach 0078783c7089fc83f0072066b23908120d7990e9 ../artifacts/test.sh # Reproduce last_good build git checkout --detach d116c176e6e20f3ac111e7e6d1dd0e56d0e4eda7 ../artifacts/test.sh cd .. </cut> Full commit (up to 1000 lines): <cut> commit 0078783c7089fc83f0072066b23908120d7990e9 Author: Qu Wenruo <wqu(a)suse.com> Date: Mon Sep 27 15:22:04 2021 +0800 btrfs: rework lzo_compress_pages() to make it subpage compatible There are several problems in lzo_compress_pages() preventing it from being subpage compatible: - No page offset is calculated when reading from inode pages For subpage case, we could have @start which is not aligned to PAGE_SIZE. Thus the destination where we read data from must take offset in page into consideration. - The padding for segment header is bound to PAGE_SIZE This means, for subpage case we can skip several corners where on x86 machines we need to add padding zeros. The rework will: - Update the comment to replace "page" with "sector" - Introduce a new helper, copy_compressed_data_to_page(), to do the copy So that we don't need to bother page switches for both input and output. Now in lzo_compress_pages() we only care about page switching for input, while in copy_compressed_data_to_page() we only care the page switching for output. - Only one main cursor For lzo_compress_pages() we use @cur_in as main curor. It will be the file offset we are currently at. All other helper variables will be only declared inside the loop. For copy_compressed_data_to_page() it's similar, we will have @cur_out at the main cursor, which records how many bytes are in the output. - Get rid of kmap()/kunmap() Instead of using __GFP_HIGHMEM and needs to do kmap()/kunmap(), just get rid of that GFP flag, so we can use page_address() and never bother the kmap()/kunmap() thing. Signed-off-by: Qu Wenruo <wqu(a)suse.com> Signed-off-by: David Sterba <dsterba(a)suse.com> --- fs/btrfs/lzo.c | 270 ++++++++++++++++++++++++++++----------------------------- 1 file changed, 134 insertions(+), 136 deletions(-) diff --git a/fs/btrfs/lzo.c b/fs/btrfs/lzo.c index c25dfd1a8a54..47003cec4046 100644 --- a/fs/btrfs/lzo.c +++ b/fs/btrfs/lzo.c @@ -32,19 +32,19 @@ * payload. * One regular LZO compressed extent can have one or more segments. * For inlined LZO compressed extent, only one segment is allowed. - * One segment represents at most one page of uncompressed data. + * One segment represents at most one sector of uncompressed data. * * 2.1 Segment header * Fixed size. LZO_LEN (4) bytes long, LE32. * Records the total size of the segment (not including the header). - * Segment header never crosses page boundary, thus it's possible to - * have at most 3 padding zeros at the end of the page. + * Segment header never crosses sector boundary, thus it's possible to + * have at most 3 padding zeros at the end of the sector. * * 2.2 Data Payload - * Variable size. Size up limit should be lzo1x_worst_compress(PAGE_SIZE) - * which is 4419 for a 4KiB page. + * Variable size. Size up limit should be lzo1x_worst_compress(sectorsize) + * which is 4419 for a 4KiB sectorsize. * - * Example: + * Example with 4K sectorsize: * Page 1: * 0 0x2 0x4 0x6 0x8 0xa 0xc 0xe 0x10 * 0x0000 | Header | SegHdr 01 | Data payload 01 ... | @@ -112,163 +112,161 @@ static inline size_t read_compress_length(const char *buf) return le32_to_cpu(dlen); } +/* + * Will do: + * + * - Write a segment header into the destination + * - Copy the compressed buffer into the destination + * - Make sure we have enough space in the last sector to fit a segment header + * If not, we will pad at most (LZO_LEN (4)) - 1 bytes of zeros. + * + * Will allocate new pages when needed. + */ +static int copy_compressed_data_to_page(char *compressed_data, + size_t compressed_size, + struct page **out_pages, + u32 *cur_out, + const u32 sectorsize) +{ + u32 sector_bytes_left; + u32 orig_out; + struct page *cur_page; + + /* + * We never allow a segment header crossing sector boundary, previous + * run should ensure we have enough space left inside the sector. + */ + ASSERT((*cur_out / sectorsize) == + (*cur_out + LZO_LEN - 1) / sectorsize); + + cur_page = out_pages[*cur_out / PAGE_SIZE]; + /* Allocate a new page */ + if (!cur_page) { + cur_page = alloc_page(GFP_NOFS); + if (!cur_page) + return -ENOMEM; + out_pages[*cur_out / PAGE_SIZE] = cur_page; + } + + write_compress_length(page_address(cur_page) + offset_in_page(*cur_out), + compressed_size); + *cur_out += LZO_LEN; + + orig_out = *cur_out; + + /* Copy compressed data */ + while (*cur_out - orig_out < compressed_size) { + u32 copy_len = min_t(u32, sectorsize - *cur_out % sectorsize, + orig_out + compressed_size - *cur_out); + + cur_page = out_pages[*cur_out / PAGE_SIZE]; + /* Allocate a new page */ + if (!cur_page) { + cur_page = alloc_page(GFP_NOFS); + if (!cur_page) + return -ENOMEM; + out_pages[*cur_out / PAGE_SIZE] = cur_page; + } + + memcpy(page_address(cur_page) + offset_in_page(*cur_out), + compressed_data + *cur_out - orig_out, copy_len); + + *cur_out += copy_len; + } + + /* + * Check if we can fit the next segment header into the remaining space + * of the sector. + */ + sector_bytes_left = round_up(*cur_out, sectorsize) - *cur_out; + if (sector_bytes_left >= LZO_LEN || sector_bytes_left == 0) + return 0; + + /* The remaining size is not enough, pad it with zeros */ + memset(page_address(cur_page) + offset_in_page(*cur_out), 0, + sector_bytes_left); + *cur_out += sector_bytes_left; + return 0; +} + int lzo_compress_pages(struct list_head *ws, struct address_space *mapping, u64 start, struct page **pages, unsigned long *out_pages, unsigned long *total_in, unsigned long *total_out) { struct workspace *workspace = list_entry(ws, struct workspace, list); + const u32 sectorsize = btrfs_sb(mapping->host->i_sb)->sectorsize; + struct page *page_in = NULL; int ret = 0; - char *data_in; - char *cpage_out, *sizes_ptr; - int nr_pages = 0; - struct page *in_page = NULL; - struct page *out_page = NULL; - unsigned long bytes_left; - unsigned long len = *total_out; - unsigned long nr_dest_pages = *out_pages; - const unsigned long max_out = nr_dest_pages * PAGE_SIZE; - size_t in_len; - size_t out_len; - char *buf; - unsigned long tot_in = 0; - unsigned long tot_out = 0; - unsigned long pg_bytes_left; - unsigned long out_offset; - unsigned long bytes; + u64 cur_in = start; /* Points to the file offset of input data */ + u32 cur_out = 0; /* Points to the current output byte */ + u32 len = *total_out; *out_pages = 0; *total_out = 0; *total_in = 0; - in_page = find_get_page(mapping, start >> PAGE_SHIFT); - data_in = page_address(in_page); - /* - * store the size of all chunks of compressed data in - * the first 4 bytes + * Skip the header for now, we will later come back and write the total + * compressed size */ - out_page = alloc_page(GFP_NOFS); - if (out_page == NULL) { - ret = -ENOMEM; - goto out; - } - cpage_out = page_address(out_page); - out_offset = LZO_LEN; - tot_out = LZO_LEN; - pages[0] = out_page; - nr_pages = 1; - pg_bytes_left = PAGE_SIZE - LZO_LEN; - - /* compress at most one page of data each time */ - in_len = min(len, PAGE_SIZE); - while (tot_in < len) { - ret = lzo1x_1_compress(data_in, in_len, workspace->cbuf, - &out_len, workspace->mem); - if (ret != LZO_E_OK) { - pr_debug("BTRFS: lzo in loop returned %d\n", - ret); + cur_out += LZO_LEN; + while (cur_in < start + len) { + u32 sector_off = (cur_in - start) % sectorsize; + u32 in_len; + size_t out_len; + + /* Get the input page first */ + if (!page_in) { + page_in = find_get_page(mapping, cur_in >> PAGE_SHIFT); + ASSERT(page_in); + } + + /* Compress at most one sector of data each time */ + in_len = min_t(u32, start + len - cur_in, + sectorsize - sector_off); + ASSERT(in_len); + ret = lzo1x_1_compress(page_address(page_in) + + offset_in_page(cur_in), in_len, + workspace->cbuf, &out_len, + workspace->mem); + if (ret < 0) { + pr_debug("BTRFS: lzo in loop returned %d\n", ret); ret = -EIO; goto out; } - /* store the size of this chunk of compressed data */ - write_compress_length(cpage_out + out_offset, out_len); - tot_out += LZO_LEN; - out_offset += LZO_LEN; - pg_bytes_left -= LZO_LEN; - - tot_in += in_len; - tot_out += out_len; - - /* copy bytes from the working buffer into the pages */ - buf = workspace->cbuf; - while (out_len) { - bytes = min_t(unsigned long, pg_bytes_left, out_len); - - memcpy(cpage_out + out_offset, buf, bytes); - - out_len -= bytes; - pg_bytes_left -= bytes; - buf += bytes; - out_offset += bytes; - - /* - * we need another page for writing out. - * - * Note if there's less than 4 bytes left, we just - * skip to a new page. - */ - if ((out_len == 0 && pg_bytes_left < LZO_LEN) || - pg_bytes_left == 0) { - if (pg_bytes_left) { - memset(cpage_out + out_offset, 0, - pg_bytes_left); - tot_out += pg_bytes_left; - } - - /* we're done, don't allocate new page */ - if (out_len == 0 && tot_in >= len) - break; - - if (nr_pages == nr_dest_pages) { - out_page = NULL; - ret = -E2BIG; - goto out; - } - - out_page = alloc_page(GFP_NOFS); - if (out_page == NULL) { - ret = -ENOMEM; - goto out; - } - cpage_out = page_address(out_page); - pages[nr_pages++] = out_page; - - pg_bytes_left = PAGE_SIZE; - out_offset = 0; - } - } + ret = copy_compressed_data_to_page(workspace->cbuf, out_len, + pages, &cur_out, sectorsize); + if (ret < 0) + goto out; + + cur_in += in_len; - /* we're making it bigger, give up */ - if (tot_in > 8192 && tot_in < tot_out) { + /* + * Check if we're making it bigger after two sectors. + * And if we're making it bigger, give up. + */ + if (cur_in - start > sectorsize * 2 && + cur_in - start < cur_out) { ret = -E2BIG; goto out; } - /* we're all done */ - if (tot_in >= len) - break; - - if (tot_out > max_out) - break; - - bytes_left = len - tot_in; - put_page(in_page); - - start += PAGE_SIZE; - in_page = find_get_page(mapping, start >> PAGE_SHIFT); - data_in = page_address(in_page); - in_len = min(bytes_left, PAGE_SIZE); - } - - if (tot_out >= tot_in) { - ret = -E2BIG; - goto out; + /* Check if we have reached page boundary */ + if (IS_ALIGNED(cur_in, PAGE_SIZE)) { + put_page(page_in); + page_in = NULL; + } } - /* store the size of all chunks of compressed data */ - sizes_ptr = page_address(pages[0]); - write_compress_length(sizes_ptr, tot_out); + /* Store the size of all chunks of compressed data */ + write_compress_length(page_address(pages[0]), cur_out); ret = 0; - *total_out = tot_out; - *total_in = tot_in; + *total_out = cur_out; + *total_in = cur_in - start; out: - *out_pages = nr_pages; - - if (in_page) - put_page(in_page); - + *out_pages = DIV_ROUND_UP(cur_out, PAGE_SIZE); return ret; } </cut>

2 years, 6 months

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

linaro-kernel October 2021