diff options
543 files changed, 53010 insertions, 12941 deletions
@@ -4,12 +4,12 @@ Patches to the kernel meta data should be submitted to the linux-yocto mailing list (subscripion only) and should cc' the maintainer. - list: https://lists.yoctoproject.org/listinfo/linux-yocto + list: https://lists.yoctoproject.org/g/linux-yocto Maintainers: Bruce Ashfield <bruce.ashfield@gmail.com> When sending single patches, please using something like: - $ git send-email -1 --to linux-yocto@yoctoproject.org --subject-prefix='kernel-cache][PATCH' + $ git send-email -1 --to=linux-yocto@lists.yoctoproject.org --subject-prefix='kernel-cache][PATCH' 1.0 Overview ============ diff --git a/SECURITY.md b/SECURITY.md new file mode 100644 index 00000000..7d2ce1f6 --- /dev/null +++ b/SECURITY.md @@ -0,0 +1,24 @@ +How to Report a Potential Vulnerability? +======================================== + +If you would like to report a public issue (for example, one with a released +CVE number), please report it using the +[https://bugzilla.yoctoproject.org/enter_bug.cgi?product=Security Security Bugzilla]. +If you have a patch ready, submit it following the same procedure as any other +patch as described in README.md. + +If you are dealing with a not-yet released or urgent issue, please send a +message to security AT yoctoproject DOT org, including as many details as +possible: the layer or software module affected, the recipe and its version, +and any example code, if available. + +Branches maintained with security fixes +--------------------------------------- + +See [https://wiki.yoctoproject.org/wiki/Stable_Release_and_LTS Stable release and LTS] +for detailed info regarding the policies and maintenance of Stable branches. + +The [https://wiki.yoctoproject.org/wiki/Releases Release page] contains a list of all +releases of the Yocto Project. Versions in grey are no longer actively maintained with +security patches, but well-tested patches may still be accepted for them for +significant issues. diff --git a/arch/arm/0001-drm-fb-helper-move-zeroing-code-to-drm_fb_helper_fil.patch b/arch/arm/0001-drm-fb-helper-move-zeroing-code-to-drm_fb_helper_fil.patch new file mode 100644 index 00000000..8282d25d --- /dev/null +++ b/arch/arm/0001-drm-fb-helper-move-zeroing-code-to-drm_fb_helper_fil.patch @@ -0,0 +1,98 @@ +From 72bad8cd7540f07ab54e08b83ad106dec0df123c Mon Sep 17 00:00:00 2001 +From: Jon Mason <jon.mason@arm.com> +Date: Tue, 8 Aug 2023 16:38:37 -0400 +Subject: [PATCH] drm/fb-helper: move zeroing code to drm_fb_helper_fill_var + +__fill_var is used by both drm_fb_helper_check_var and +drm_fb_helper_fill_var. In drm_fb_helper_check_var, it is possible that +some of the variables in fb_info-> var which are currently being zero'ed +have pre-existing values. Zeroing these causes some fb tests to fail +with (from the Xorg.log): + +[ 9.897] (II) Module fbdevhw: vendor="X.Org Foundation" +[ 9.897] compiled for 1.21.1.8, module version = 0.0.2 +[ 9.897] ABI class: X.Org Video Driver, version 25.2 +[ 9.898] (II) FBDEV(0): using default device +[ 9.901] (==) FBDEV(0): Depth 24, (==) framebuffer bpp 32 +[ 9.902] (==) FBDEV(0): RGB weight 888 +[ 9.902] (==) FBDEV(0): Default visual is TrueColor +[ 9.902] (==) FBDEV(0): Using gamma correction (1.0, 1.0, 1.0) +[ 9.902] (II) FBDEV(0): hardware: virtio_gpudrmfb (video memory: +4000kB) +[ 9.902] (DB) xf86MergeOutputClassOptions unsupported bus type 0 +[ 9.903] (II) FBDEV(0): checking modes against framebuffer device... +[ 9.904] (II) FBDEV(0): mode "640x480" test failed +[ 9.904] (II) FBDEV(0): mode "640x480" test failed +[ 9.904] (II) FBDEV(0): mode "640x480" test failed +[ 9.904] (II) FBDEV(0): mode "640x480" test failed +[ 9.904] (II) FBDEV(0): mode "640x480" not found +[ 9.904] (II) FBDEV(0): checking modes against monitor... +[ 9.905] (II) FBDEV(0): Virtual size is 1280x800 (pitch 1280) +[ 9.905] (**) FBDEV(0): Built-in mode "current" +[ 9.905] (==) FBDEV(0): DPI set to (96, 96) + +Previously, these values were not modified. Moving the zero'ing of the +variables to drm_fb_helper_fill_var resolves the issue. + +Fixes: ee4cce0a8f03 ("drm/fb-helper: fix input validation gaps in check_var") +Signed-off-by: Jon Mason <jon.mason@arm.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + drivers/gpu/drm/drm_fb_helper.c | 20 +++++++++----------- + 1 file changed, 9 insertions(+), 11 deletions(-) + +diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c +index fd27f1978635..ddc12c080dcc 100644 +--- a/drivers/gpu/drm/drm_fb_helper.c ++++ b/drivers/gpu/drm/drm_fb_helper.c +@@ -1548,8 +1548,6 @@ static void drm_fb_helper_fill_pixel_fmt(struct fb_var_screeninfo *var, + static void __fill_var(struct fb_var_screeninfo *var, struct fb_info *info, + struct drm_framebuffer *fb) + { +- int i; +- + var->xres_virtual = fb->width; + var->yres_virtual = fb->height; + var->accel_flags = 0; +@@ -1557,15 +1555,6 @@ static void __fill_var(struct fb_var_screeninfo *var, struct fb_info *info, + + var->height = info->var.height; + var->width = info->var.width; +- +- var->left_margin = var->right_margin = 0; +- var->upper_margin = var->lower_margin = 0; +- var->hsync_len = var->vsync_len = 0; +- var->sync = var->vmode = 0; +- var->rotate = 0; +- var->colorspace = 0; +- for (i = 0; i < 4; i++) +- var->reserved[i] = 0; + } + + /** +@@ -2059,6 +2048,7 @@ static void drm_fb_helper_fill_var(struct fb_info *info, + { + struct drm_framebuffer *fb = fb_helper->fb; + const struct drm_format_info *format = fb->format; ++ int i; + + switch (format->format) { + case DRM_FORMAT_C1: +@@ -2076,6 +2066,14 @@ static void drm_fb_helper_fill_var(struct fb_info *info, + info->pseudo_palette = fb_helper->pseudo_palette; + info->var.xoffset = 0; + info->var.yoffset = 0; ++ info->var.left_margin = info->var.right_margin = 0; ++ info->var.upper_margin = info->var.lower_margin = 0; ++ info->var.hsync_len = info->var.vsync_len = 0; ++ info->var.sync = info->var.vmode = 0; ++ info->var.rotate = 0; ++ info->var.colorspace = 0; ++ for (i = 0; i < 4; i++) ++ info->var.reserved[i] = 0; + __fill_var(&info->var, info, fb); + info->var.activate = FB_ACTIVATE_NOW; + +-- +2.34.1 + diff --git a/arch/arm/arm-ARM-EABI-socketcall.patch b/arch/arm/arm-ARM-EABI-socketcall.patch index a24b8767..53173c96 100644 --- a/arch/arm/arm-ARM-EABI-socketcall.patch +++ b/arch/arm/arm-ARM-EABI-socketcall.patch @@ -1,4 +1,4 @@ -From 1f05ef36493eb57d2b7bc4201b6bc105869ea702 Mon Sep 17 00:00:00 2001 +From 3502bc5ce0d25aae81727455869af362099c15bf Mon Sep 17 00:00:00 2001 From: Mark Asselstine <mark.asselstine@windriver.com> Date: Tue, 15 Jul 2008 15:49:27 -0400 Subject: [PATCH] arm: ARM EABI socketcall @@ -14,13 +14,13 @@ Signed-off-by: Zumeng Chen <zumeng.chen@windriver.com> 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S -index eb5cd77bf1d8..41021ceedca4 100644 +index 7f0b7aba1498..49719a7d721c 100644 --- a/arch/arm/kernel/entry-common.S +++ b/arch/arm/kernel/entry-common.S -@@ -316,7 +316,8 @@ ENTRY(\sym) +@@ -352,7 +352,8 @@ ENTRY(\sym) + * With EABI a couple syscalls are obsolete and defined as sys_ni_syscall. */ syscall_table_start sys_call_table - #define COMPAT(nr, native, compat) syscall nr, native -#ifdef CONFIG_AEABI + +#if defined(CONFIG_AEABI) && !defined(CONFIG_OABI_COMPAT) @@ -28,5 +28,5 @@ index eb5cd77bf1d8..41021ceedca4 100644 #else #include <calls-oabi.S> -- -2.5.0 +2.19.1 diff --git a/arch/arm/arm-Makefile-Fix-systemtap.patch b/arch/arm/arm-Makefile-Fix-systemtap.patch deleted file mode 100644 index 163f12cb..00000000 --- a/arch/arm/arm-Makefile-Fix-systemtap.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 37c8f2a3df1e3154087538a27228fad0c6e172c5 Mon Sep 17 00:00:00 2001 -From: Richard Purdie <richard.purdie@linuxfoundation.org> -Date: Sun, 10 Mar 2019 06:43:15 +0000 -Subject: [PATCH] arm/Makefile: Fix systemtap - -Currently systemtap fails to operate correctly on armv7 systems such as beaglebone and -soon, qemuarm. - -root@qemuarm:/usr/src/kernel# env -uARCH -uKBUILD_EXTMOD -uCROSS_COMPILE -uKBUILD_IMAGE -uKCONFIG_CONFIG -uINSTALL_PATH -uLD_LIBRARY_PATH PATH=/usr/bin:/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/sbin make -C /lib/modules/4.19.19-yocto-standard/build M=/tmp/staptcNU6M modules CONFIG_DEBUG_INFO= CONFIG_STACK_VALIDATION= ARCH=arm stap_4321_src.i --no-print-directory -j2 V=1 -test -e include/generated/autoconf.h -a -e include/config/auto.conf || ( \ -echo >&2; \ -echo >&2 " ERROR: Kernel configuration is invalid."; \ -echo >&2 " include/generated/autoconf.h or include/config/auto.conf are missing.";\ -echo >&2 " Run 'make oldconfig && make prepare' on kernel src to fix it."; \ -echo >&2 ; \ -/bin/false) -mkdir -p /tmp/staptcNU6M/.tmp_versions ; rm -f /tmp/staptcNU6M/.tmp_versions/* -make -f ./scripts/Makefile.build obj=/tmp/staptcNU6M -(cat /dev/null; echo kernel//tmp/staptcNU6M/stap_4321.ko;) > /tmp/staptcNU6M/modules.order - gcc -Wp,-MD,/tmp/staptcNU6M/.stap_4321_src.o.d -nostdinc -isystem /usr/lib/gcc/arm-poky-linux-gnueabi/8.3.0/include -I./arch/arm/include -I./arch/arm/include/generated -I./include -I./arch/arm/include/uapi -I./arch/arm/include/generated/uapi -I./include/uapi -I./include/generated/uapi -include ./include/linux/kconfig.h -include ./include/linux/compiler_types.h -D__KERNEL__ -mlittle-endian -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -fshort-wchar -Werror-implicit-function-declaration -Wno-format-security -std=gnu89 -fno-PIE -DCC_HAVE_ASM_GOTO -fno-dwarf2-cfi-asm -fno-omit-frame-pointer -mapcs -mno-sched-prolog -fno-ipa-sra -mabi=aapcs-linux -mfpu=vfp -funwind-tables -marm -Wa,-mno-warn-deprecated -D__LINUX_ARM_ARCH__=7 -march=armv5t -Wa,-march=armv7-a -msoft-float -Uarm -fno-delete-null-pointer-checks -Wno-frame-address -Wno-format-truncation -Wno-format-overflow -Wno-int-in-bool-context -Os -Wno-maybe-uninitialized --param=allow-store-data-races=0 -Wframe-larger-than=1024 -fstack-protector-strong -Wno-unused-but-set-variable -Wno-unused-const-variable -fno-omit-frame-pointer -fno-optimize-sibling-calls -fno-var-tracking-assignments -pg -Wdeclaration-after-statement -Wno-pointer-sign -Wno-stringop-truncation -fno-strict-overflow -fno-merge-all-constants -fmerge-constants -fno-stack-check -fconserve-stack -Werror=implicit-int -Werror=strict-prototypes -Werror=date-time -Werror=incompatible-pointer-types -Werror=designated-init -fmacro-prefix-map=./= -Wno-packed-not-aligned -Iinclude2/asm/mach-default -I/lib/modules/4.19.19-yocto-standard/build -include /tmp/staptcNU6M/stapconf_4321.h -D "STP_NO_VELREL_CHECK" -freorder-blocks -fasynchronous-unwind-tables -Wframe-larger-than=512 -fno-ipa-icf -Wno-unused -Wno-tautological-compare -Werror -I/usr/share/systemtap/runtime -DMODULE -DKBUILD_BASENAME='"stap_4321_src"' -DKBUILD_MODNAME='"stap_4321"' -c -o /tmp/staptcNU6M/stap_4321_src.o /tmp/staptcNU6M/stap_4321_src.c -/tmp/ccaE9CMG.s: Assembler messages: -/tmp/ccaE9CMG.s:49: Error: selected processor does not support `dmb ish' in ARM mode -/tmp/ccaE9CMG.s:52: Error: architectural extension `mp' is not allowed for the current b - -(which was from running the stap command with -v -v -v -k and then being able to run the command individually) - -Note that it says armv5t above. - -That comes from the code this patch changes - -root@qemuarm:/usr/src/kernel# gcc -march=armv7-a /tmp/staptcNU6M/stap_4321_aux_0.c -cc1: error: -mfloat-abi=hard: selected processor lacks an FPU - -which makes me wonder if cc-option fails unless -mfpu-vfp is on the commandline too. - -Since we have a gcc which accepts the armv7-a arch, just remove the cc-option -wrapper unconditionally here. - -Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> -Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ---- - arch/arm/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm/Makefile b/arch/arm/Makefile -index 1f95ede8063f..9253b7533cb1 100644 ---- a/arch/arm/Makefile -+++ b/arch/arm/Makefile -@@ -64,7 +64,7 @@ KBUILD_CFLAGS += $(call cc-option,-fno-ipa-sra) - # macro, but instead defines a whole series of macros which makes - # testing for a specific architecture or later rather impossible. - arch-$(CONFIG_CPU_32v7M) =-D__LINUX_ARM_ARCH__=7 -march=armv7-m -Wa,-march=armv7-m --arch-$(CONFIG_CPU_32v7) =-D__LINUX_ARM_ARCH__=7 $(call cc-option,-march=armv7-a,-march=armv5t -Wa$(comma)-march=armv7-a) -+arch-$(CONFIG_CPU_32v7) =-D__LINUX_ARM_ARCH__=7 -march=armv7-a -Wa$(comma)-march=armv7-a - arch-$(CONFIG_CPU_32v6) =-D__LINUX_ARM_ARCH__=6 $(call cc-option,-march=armv6,-march=armv5t -Wa$(comma)-march=armv6) - # Only override the compiler option if ARMv6. The ARMv6K extensions are - # always available in ARMv7 --- -2.19.1 - diff --git a/arch/arm/arm.cfg b/arch/arm/arm.cfg index d5380436..f2b36dca 100644 --- a/arch/arm/arm.cfg +++ b/arch/arm/arm.cfg @@ -2,8 +2,6 @@ # Build EABI kernels that support EABI system calls. CONFIG_AEABI=y -# Provide support for the old ABI's system calls. -CONFIG_OABI_COMPAT=y CONFIG_ARM_THUMB=y # Failure to use this on ARM results in lots of interesting runtime bugs. @@ -11,4 +9,4 @@ CONFIG_CC_OPTIMIZE_FOR_SIZE=y # CONFIG_UNWINDER_ARM=y -# CONFIG_FUNCTION_GRAPH_TRACER is not set +CONFIG_FUNCTION_GRAPH_TRACER=n diff --git a/arch/arm/arm.scc b/arch/arm/arm.scc index cfac7f13..39e0e6d7 100644 --- a/arch/arm/arm.scc +++ b/arch/arm/arm.scc @@ -10,4 +10,6 @@ include v7-A15/v7-A15.scc patch arm-ARM-EABI-socketcall.patch patch vexpress-Pass-LOADADDR-to-Makefile.patch -patch arm-Makefile-Fix-systemtap.patch +patch arm64-defconfig-cleanup-config-options.patch +patch 0001-drm-fb-helper-move-zeroing-code-to-drm_fb_helper_fil.patch +patch arm64-defconfig-remove-CONFIG_IPQ_APSS_5018.patch diff --git a/arch/arm/arm64-16kb-pages.cfg b/arch/arm/arm64-16kb-pages.cfg new file mode 100644 index 00000000..a83e1a50 --- /dev/null +++ b/arch/arm/arm64-16kb-pages.cfg @@ -0,0 +1 @@ +CONFIG_ARM64_16K_PAGES=y diff --git a/arch/arm/arm64-16kb-pages.scc b/arch/arm/arm64-16kb-pages.scc new file mode 100644 index 00000000..d2706c08 --- /dev/null +++ b/arch/arm/arm64-16kb-pages.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Use 16KB pages" +define KFEATURE_COMPATIBILITY arch + +kconf hardware arm64-16kb-pages.cfg diff --git a/arch/arm/arm64-4kb-pages.cfg b/arch/arm/arm64-4kb-pages.cfg new file mode 100644 index 00000000..5df91df1 --- /dev/null +++ b/arch/arm/arm64-4kb-pages.cfg @@ -0,0 +1 @@ +CONFIG_ARM64_4K_PAGES=y diff --git a/arch/arm/arm64-4kb-pages.scc b/arch/arm/arm64-4kb-pages.scc new file mode 100644 index 00000000..4ee7cac2 --- /dev/null +++ b/arch/arm/arm64-4kb-pages.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Use 4KB pages" +define KFEATURE_COMPATIBILITY arch + +kconf hardware arm64-4kb-pages.cfg diff --git a/arch/arm/arm64-64kb-pages.cfg b/arch/arm/arm64-64kb-pages.cfg new file mode 100644 index 00000000..bda5426d --- /dev/null +++ b/arch/arm/arm64-64kb-pages.cfg @@ -0,0 +1 @@ +CONFIG_ARM64_64K_PAGES=y diff --git a/arch/arm/arm64-64kb-pages.scc b/arch/arm/arm64-64kb-pages.scc new file mode 100644 index 00000000..efe60dae --- /dev/null +++ b/arch/arm/arm64-64kb-pages.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Use 64KB pages" +define KFEATURE_COMPATIBILITY arch + +kconf hardware arm64-64kb-pages.cfg diff --git a/arch/arm/arm64-defconfig-cleanup-config-options.patch b/arch/arm/arm64-defconfig-cleanup-config-options.patch new file mode 100644 index 00000000..46023e3c --- /dev/null +++ b/arch/arm/arm64-defconfig-cleanup-config-options.patch @@ -0,0 +1,49 @@ +From 14e71de7e9d610c2ce6d2cfa064e6c392304bd38 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross@burtonini.com> +Date: Tue, 11 Jan 2022 12:02:36 +0000 +Subject: [PATCH] arm64: defconfig: cleanup config options + +arm64: defconfig: drop unused POWER_AVS option +Commit 785b5bb41b0a ("PM: AVS: Drop the avs directory and the +corresponding Kconfig") moved AVS code to SOC-specific folders, and +removed corresponding Kconfig from drivers/power, leaving original +POWER_AVS config option enabled in some defconfigs. +Remove the options, which have no references in the tree anymore. + +arm64: defconfig: set CONFIG_USB_CONN_GPIO=y +Since 10a7b37b5b ("arm64: Update default configuration") PHY_TEGRA_XUSB +is set to y. That option needs USB_CONN_GPIO to also be y not m, so +set USB_CONN_GPIO explicitly to y to reflect reality. + +arm64: defconfig: remove obsolete CONFIG_ARCH_AGILEX and CONFIG_ARCH_N5X +These config options were removed in 4a9a1a5602 ("arm64: socfpga: merge +Agilex and N5X into ARCH_INTEL_SOCFPGA"), so remove them from the +defconfig. + +arm64: defconfig: don't set CONFIG_ACPI_APEI_PCIEAER +Since 8c8ff55 ("PCI/AER: Don't select CONFIG_PCIEAER by default"), PCIe +Advanced Error Reporting isn't enabled by default.. As this means just +enabling CONFIG_CPI_APEI_PCIEAR does not have an effect, remove it from +the defconfig for clarity. + +Signed-off-by: Ross Burton <ross.burton@arm.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + arch/arm64/configs/defconfig | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig +index 50aa3d75ab4f..cd1b2d865baf 100644 +--- a/arch/arm64/configs/defconfig ++++ b/arch/arm64/configs/defconfig +@@ -103,7 +103,6 @@ CONFIG_QORIQ_CPUFREQ=y + CONFIG_ACPI=y + CONFIG_ACPI_APEI=y + CONFIG_ACPI_APEI_GHES=y +-CONFIG_ACPI_APEI_PCIEAER=y + CONFIG_ACPI_APEI_MEMORY_FAILURE=y + CONFIG_ACPI_APEI_EINJ=y + CONFIG_VIRTUALIZATION=y +-- +2.19.1 + diff --git a/arch/arm/arm64-defconfig-remove-CONFIG_IPQ_APSS_5018.patch b/arch/arm/arm64-defconfig-remove-CONFIG_IPQ_APSS_5018.patch new file mode 100644 index 00000000..e36c20ff --- /dev/null +++ b/arch/arm/arm64-defconfig-remove-CONFIG_IPQ_APSS_5018.patch @@ -0,0 +1,29 @@ +From b0dbb1ddc539b556ac1920ff704ec4099f8ca392 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@arm.com> +Date: Thu, 4 Jan 2024 13:32:41 +0000 +Subject: [PATCH] arm64: defconfig: remove CONFIG_IPQ_APSS_5018 + +This was added in 7f0c873 ("Enable IPQ5018 SoC base configs"), but there +is no IPQ_APSS_5018 config defined in the kconfig at present. + +Signed-off-by: Ross Burton <ross.burton@arm.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + arch/arm64/configs/defconfig | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig +index 88c0cfdd5581..bd6b6be68d3f 100644 +--- a/arch/arm64/configs/defconfig ++++ b/arch/arm64/configs/defconfig +@@ -1248,7 +1248,6 @@ CONFIG_QCOM_CLK_APCC_MSM8996=y + CONFIG_QCOM_CLK_SMD_RPM=y + CONFIG_QCOM_CLK_RPMH=y + CONFIG_IPQ_APSS_6018=y +-CONFIG_IPQ_APSS_5018=y + CONFIG_IPQ_GCC_5018=y + CONFIG_IPQ_GCC_5332=y + CONFIG_IPQ_GCC_6018=y +-- +2.39.2 + diff --git a/arch/microblaze/microblaze.cfg b/arch/microblaze/microblaze.cfg index ba4773ba..db506551 100644 --- a/arch/microblaze/microblaze.cfg +++ b/arch/microblaze/microblaze.cfg @@ -15,5 +15,5 @@ CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=0 CONFIG_XILINX_MICROBLAZE0_USE_FPU=0 # Disable FTRACE, does not work with MicroBlaze -# CONFIG_FTRACE is not set +CONFIG_FTRACE=n diff --git a/arch/mips/mips-Kconfig-add-QEMUMIPS64-option.patch b/arch/mips/mips-Kconfig-add-QEMUMIPS64-option.patch new file mode 100644 index 00000000..1c1d9408 --- /dev/null +++ b/arch/mips/mips-Kconfig-add-QEMUMIPS64-option.patch @@ -0,0 +1,90 @@ +From 63911f5a1a7753ef0fb2a1b82fa268d7e13c3935 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Tue, 7 Jan 2020 03:34:12 +0000 +Subject: [PATCH] mips: Kconfig: add QEMUMIPS64 option + +In 5.4+ mips has switched to using the generic VDSO implementation, in +particular the following commits are the bulk of the changes: + + 932bb934ed4d mips: compat: vdso: Use legacy syscalls as fallback + cdab7e2c73d5 mips: vdso: Fix flip/flop vdso building bug + b4c0f7fa5308 mips: vdso: Fix source path + 1f66c45db330 mips: Add clock_gettime64 entry point + abed3d826f2f mips: Add clock_getres entry point + 6393e6064486 mips: fix vdso32 build, again + 24640f233b46 mips: Add support for generic vDSO + 8919975b6171 MIPS: VDSO: Fix build for binutils < 2.25 + 90800281e761 MIPS: VDSO: Remove unused gettimeofday.c + +There is a (currently) unknown interaction between qemumips64, the +mti_malta64 platform, glibc and VDSO that causes a segfault when +gettimeofday is called during boot. It appears that the VDSO +configuration of the gic address is incorrect, and hence when +read_gic_count() is called during do_hres() initialization, the +page is not properly mapped and a segfault is triggered. + +If we avoid reading the gic, and let the vdso syscall fallbacks +be enabled, we are find for boot. The most flexible way to avoid +these reads is to make the two malta clocksources not be selected +when we are booting under qemumips64. This allows other platforms +to not be impacted. + +Once a root cause of this bad mapping is found, we can drop the +new CONFIG_QEMUMIPS64 option and behaviour will revert to using +the git automatically. + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + arch/mips/Kconfig | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig +index d89efba3d8a4..bc0d3e1cf297 100644 +--- a/arch/mips/Kconfig ++++ b/arch/mips/Kconfig +@@ -118,6 +118,10 @@ config MACH_INGENIC + select CPU_SUPPORTS_CPUFREQ + select MIPS_EXTERNAL_TIMER + ++config QEMUMIPS64 ++ bool "Enable for qemumips64 specific configurations" ++ default n ++ + menu "Machine selection" + + choice +@@ -131,17 +135,17 @@ config MIPS_GENERIC_KERNEL + select BOOT_RAW + select BUILTIN_DTB + select CEVT_R4K +- select CLKSRC_MIPS_GIC + select COMMON_CLK + select CPU_MIPSR2_IRQ_EI + select CPU_MIPSR2_IRQ_VI +- select CSRC_R4K + select DMA_NONCOHERENT + select HAVE_PCI + select IRQ_MIPS_CPU + select MIPS_AUTO_PFN_OFFSET + select MIPS_CPU_SCACHE + select MIPS_GIC ++ select CLKSRC_MIPS_GIC if !QEMUMIPS64 ++ select CSRC_R4K if !QEMUMIPS64 + select MIPS_L1_CACHE_SHIFT_7 + select NO_EXCEPT_FILL + select PCI_DRIVERS_GENERIC +@@ -546,9 +550,9 @@ config MIPS_MALTA + select BOOT_RAW + select BUILTIN_DTB + select CEVT_R4K +- select CLKSRC_MIPS_GIC ++ select CLKSRC_MIPS_GIC if !QEMUMIPS64 ++ select CSRC_R4K if !QEMUMIPS64 + select COMMON_CLK +- select CSRC_R4K + select DMA_NONCOHERENT + select GENERIC_ISA_DMA + select HAVE_PCSPKR_PLATFORM +-- +2.19.1 + diff --git a/arch/mips/mips-make-current_cpu_data-preempt-safe.patch b/arch/mips/mips-make-current_cpu_data-preempt-safe.patch new file mode 100644 index 00000000..c68b5f46 --- /dev/null +++ b/arch/mips/mips-make-current_cpu_data-preempt-safe.patch @@ -0,0 +1,68 @@ +From 5b2595c3e0dce2912b32ef69aaaacd52cd0e720c Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Fri, 29 Sep 2023 00:11:41 +0000 +Subject: [PATCH] mips: make current_cpu_data preempt safe + +When DEBUG_PREEMPT is enabled, mips/mips64 boots are filled with +backtraces similar to: + + [ 130.730686] BUG: using smp_processor_id() in preemptible [00000000] code: systemd/1 + [ 130.738542] caller is blast_dcache32+0x40/0x190 + [ 130.745908] CPU: 0 PID: 1 Comm: systemd Not tainted 6.4.11-yocto-standard #1 + [ 130.753928] Stack : 0000000000000001 0000000000000000 0000000000000018 9000000004937798 + [ 130.762192] 9000000004937798 90000000049378c8 0000000000000000 0000000000000000 + [ 130.770458] 008fac6060240fea 0000000000014f20 9000000004937728 0000000000000000 + [ 130.778826] 00000000000b61b4 0000000000000030 ffffffff80e8eed0 0000000000000004 + [ 130.787111] 9000000084937577 0000000000000000 0000000000000000 ffffffff810c3b18 + [ 130.795440] ffffffff811f0000 0000000000000000 ffffffff81440000 0000000000000000 + [ 130.803830] 0000000000000000 0000000000000000 ffffffff809842e8 0000000000175097 + [ 130.812272] 0000000000000001 9000000004934000 9000000004937790 c0000000005d9000 + [ 130.820722] ffffffff8010b6fc 0000000000000000 0000000000000000 0000000000000000 + [ 130.829134] 0000000000000000 0000000000000000 ffffffff8010b71c 008fac6060240fea + [ 130.837649] ... + [ 130.845556] Call Trace: + [ 130.853432] [<ffffffff8010b71c>] show_stack+0x64/0x158 + [ 130.861534] [<ffffffff80ea1790>] dump_stack_lvl+0x5c/0x7c + [ 130.869565] [<ffffffff80ea29c4>] check_preemption_disabled+0x10c/0x118 + [ 130.877605] [<ffffffff8012d7c8>] blast_dcache32+0x40/0x190 + [ 130.885585] [<ffffffff8039f648>] __vmalloc_node_range+0x3e0/0x780 + [ 130.893527] [<ffffffff8039fbbc>] vzalloc+0x6c/0x78 + [ 130.901378] [<ffffffff8095d6c4>] n_tty_open+0x1c/0xb8 + [ 130.909252] [<ffffffff8095f5a8>] tty_ldisc_open+0x50/0xd0 + [ 130.917053] [<ffffffff80960150>] tty_ldisc_setup+0x20/0x70 + [ 130.924927] [<ffffffff80958694>] tty_init_dev.part.0+0xbc/0x2c0 + [ 130.932742] [<ffffffff80958da8>] tty_open+0x4b8/0x730 + [ 130.940486] [<ffffffff803e6960>] chrdev_open+0xe0/0x250 + [ 130.948211] [<ffffffff803da7f4>] do_dentry_open+0x274/0x520 + [ 130.955960] [<ffffffff803f642c>] path_openat+0xbc4/0x10d8 + [ 130.963718] [<ffffffff803f7460>] do_filp_open+0x148/0x190 + [ 130.971482] [<ffffffff803dc264>] do_sys_openat2+0xcc/0x1b0 + [ 130.979288] [<ffffffff803dc710>] sys_openat+0x50/0xa8 + [ 130.987077] [<ffffffff80119490>] syscall_common+0x34/0x58 + +We don't control the locking around current_cpu_data, so it cannot use +smp_processor_id() as the cpu index. + +To make ourselves safe in any context, we must use raw_smp_processor_id() + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + arch/mips/include/asm/cpu-info.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/mips/include/asm/cpu-info.h b/arch/mips/include/asm/cpu-info.h +index a600670d00e9..07f9cddd6c77 100644 +--- a/arch/mips/include/asm/cpu-info.h ++++ b/arch/mips/include/asm/cpu-info.h +@@ -117,7 +117,7 @@ struct cpuinfo_mips { + } __attribute__((aligned(SMP_CACHE_BYTES))); + + extern struct cpuinfo_mips cpu_data[]; +-#define current_cpu_data cpu_data[smp_processor_id()] ++#define current_cpu_data cpu_data[raw_smp_processor_id()] + #define raw_current_cpu_data cpu_data[raw_smp_processor_id()] + #define boot_cpu_data cpu_data[0] + +-- +2.34.1 + diff --git a/arch/mips/mips-vdso-fix-jalr-t9-crash-in-vdso-code.patch b/arch/mips/mips-vdso-fix-jalr-t9-crash-in-vdso-code.patch new file mode 100644 index 00000000..da88515c --- /dev/null +++ b/arch/mips/mips-vdso-fix-jalr-t9-crash-in-vdso-code.patch @@ -0,0 +1,50 @@ +From e8f6bebe11eb365466cfde324f99698dc8f7f4f8 Mon Sep 17 00:00:00 2001 +From: Victor Kamensky <kamensky@cisco.com> +Date: Fri, 31 Jan 2020 09:39:44 -0800 +Subject: [PATCH] mips: vdso: fix 'jalr $t9' crash in vdso code + +Observed that when kernel is built with Yocto mips64-poky-linux-gcc, +and mips64-poky-linux-gnun32-gcc toolchain, resuling vdso contains +'jalr $t9' instructions in its code and since in vdso case nobody +sets GOT table code crashes when instruction reached. On other hand +observed that when kernel is built mips-poky-linux-gcc toolchain, the +same 'jalr $t9' instruction are replaced with PC relative function +calls using 'bal' instructions. + +The difference boils down to -mrelax-pic-calls and -mexplicit-relocs +gcc options that gets different default values depending on gcc +target triplets and corresponding binutils. -mrelax-pic-calls got +enabled by default only in mips-poky-linux-gcc case. MIPS binuitls +ld relies on R_MIPS_JALR relocation to convert 'jalr $t9' into 'bal' +and such relocation is generated only if -mrelax-pic-calls option +is on. + +Solution call out -mrelax-pic-calls and -mexplicit-relocs options +explicitely while compiling MIPS vdso code. That would get correct +and consitent between different toolchains behavior. + +Reported-by: Bruce Ashfield <bruce.ashfield@gmail.com> +Signed-off-by: Victor Kamensky <kamensky@cisco.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + arch/mips/vdso/Makefile | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/arch/mips/vdso/Makefile b/arch/mips/vdso/Makefile +index 57fe83235281..374e1eca2791 100644 +--- a/arch/mips/vdso/Makefile ++++ b/arch/mips/vdso/Makefile +@@ -35,7 +35,9 @@ cflags-vdso := $(ccflags-vdso) \ + -O3 -g -fPIC -fno-strict-aliasing -fno-common -fno-builtin -G 0 \ + -mrelax-pic-calls $(call cc-option, -mexplicit-relocs) \ + -fno-stack-protector -fno-jump-tables -DDISABLE_BRANCH_PROFILING \ +- $(call cc-option, -fno-asynchronous-unwind-tables) ++ $(call cc-option, -fno-asynchronous-unwind-tables) \ ++ $(call cc-option, -mrelax-pic-calls) \ ++ $(call cc-option, -mexplicit-relocs) + aflags-vdso := $(ccflags-vdso) \ + -D__ASSEMBLY__ -Wa,-gdwarf-2 + +-- +2.19.1 + diff --git a/arch/mips/mips.scc b/arch/mips/mips.scc index 28f4be84..088a934b 100644 --- a/arch/mips/mips.scc +++ b/arch/mips/mips.scc @@ -7,4 +7,6 @@ fi patch malta-uhci-quirks-make-allowance-for-slow-4k-e-c.patch patch 4kc-cache-tlb-hazard-tlbp-cache-coherency.patch -patch staging-octeon-Add-a-workaround-for-the-issue-of-GCC.patch +patch mips-Kconfig-add-QEMUMIPS64-option.patch +patch mips-vdso-fix-jalr-t9-crash-in-vdso-code.patch +patch mips-make-current_cpu_data-preempt-safe.patch diff --git a/arch/mips/staging-octeon-Add-a-workaround-for-the-issue-of-GCC.patch b/arch/mips/staging-octeon-Add-a-workaround-for-the-issue-of-GCC.patch deleted file mode 100644 index 89f79090..00000000 --- a/arch/mips/staging-octeon-Add-a-workaround-for-the-issue-of-GCC.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 3373c0cf71f2812eeb9694839456df6f67fd32ac Mon Sep 17 00:00:00 2001 -From: Kevin Hao <kexin.hao@windriver.com> -Date: Wed, 20 Jun 2018 18:41:55 +0800 -Subject: [PATCH] staging: octeon: Add a workaround for the issue of GCC8 - -In function cvm_oct_xmit(), the packet length is set with code like -this: - pko_command.s.total_bytes = skb->len; - -But when building with gcc8, the pko_command.s.total_bytes doesn't -emit the right value when it is used in the following codes: - /* Send the packet to the output queue */ - if (unlikely(cvmx_pko_send_packet_finish(priv->port, - priv->queue + qos, - pko_command, hw_buffer, - CVMX_PKO_LOCK_NONE))) { - -Adding a barrier after the assignment would generate the right codes. - -Signed-off-by: Kevin Hao <kexin.hao@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - drivers/staging/octeon/ethernet-tx.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/drivers/staging/octeon/ethernet-tx.c b/drivers/staging/octeon/ethernet-tx.c -index 31f35025d19e..af9da2508e93 100644 ---- a/drivers/staging/octeon/ethernet-tx.c -+++ b/drivers/staging/octeon/ethernet-tx.c -@@ -264,6 +264,9 @@ int cvm_oct_xmit(struct sk_buff *skb, struct net_device *dev) - pko_command.s.n2 = 1; /* Don't pollute L2 with the outgoing packet */ - pko_command.s.segs = 1; - pko_command.s.total_bytes = skb->len; -+#if GCC_VERSION >= 80000 -+ barrier(); -+#endif - pko_command.s.size0 = CVMX_FAU_OP_SIZE_32; - pko_command.s.subone0 = 1; - --- -2.5.0 - diff --git a/arch/powerpc/crtsavres-fixups-for-5.4.patch b/arch/powerpc/crtsavres-fixups-for-5.4.patch deleted file mode 100644 index e3f09715..00000000 --- a/arch/powerpc/crtsavres-fixups-for-5.4.patch +++ /dev/null @@ -1,27 +0,0 @@ -From f103dbd2b479057481bef2bc21060e05304be15e Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@gmail.com> -Date: Tue, 15 Oct 2019 22:55:17 -0400 -Subject: [PATCH] crtsavres: fixups for 5.4+ - -Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ---- - arch/powerpc/Makefile | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile -index c76c406faa59..7471b0160e84 100644 ---- a/arch/powerpc/Makefile -+++ b/arch/powerpc/Makefile -@@ -416,6 +416,9 @@ endif - archclean: - $(Q)$(MAKE) $(clean)=$(boot) - -+arch/powerpc/lib/crtsavres.o: arch/powerpc/lib/crtsavres.S -+ $(Q)$(MAKE) $(build)=arch/powerpc/lib arch/powerpc/lib/crtsavres.o -+ - archprepare: checkbin arch/powerpc/lib/crtsavres.o - - archheaders: --- -2.19.1 - diff --git a/arch/powerpc/powerpc-Add-unwind-information-for-SPE-registers-of-.patch b/arch/powerpc/powerpc-Add-unwind-information-for-SPE-registers-of-.patch deleted file mode 100644 index a6b43fd4..00000000 --- a/arch/powerpc/powerpc-Add-unwind-information-for-SPE-registers-of-.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 87398e3c68b21d06817c44ca39449ef382d2ce31 Mon Sep 17 00:00:00 2001 -From: Liming Wang <liming.wang@windriver.com> -Date: Fri, 19 Dec 2008 11:16:39 +0800 -Subject: [PATCH 1/3] powerpc: Add unwind information for SPE registers of E500 core - -SPE registers use the high part bit0~bit31 of E500 GPR0~GPR31. -The unwind information in "eh_frame" section is used during exception -handling and describes register information in the signal frame. But -current unwind information doesn't cover SPE registers, which have -been saved in the signal frame. This patch adds this unwind information -to "eh_frame" section. - -SPE registers use register number 1200+N to identify register 'N', but -they start from 113 in unwind column, which is computed from gcc -source code, macro DWARF_REG_TO_UNWIND_COLUMN: - - #define FIRST_PSEUDO_REGISTER 114 - #define DWARF_REG_TO_UNWIND_COLUMN(r) \ - ((r) > 1200 ? ((r) - 1200 + FIRST_PSEUDO_REGISTER - 1) : (r)) - -Signed-off-by: Liming Wang <liming.wang@windriver.com> ---- - arch/powerpc/kernel/vdso32/sigtramp.S | 34 +++++++++++++++++++++++++++++++++ - 1 files changed, 34 insertions(+), 0 deletions(-) - -diff --git a/arch/powerpc/kernel/vdso32/sigtramp.S b/arch/powerpc/kernel/vdso32/sigtramp.S -index 68d49dd..789a343 100644 ---- a/arch/powerpc/kernel/vdso32/sigtramp.S -+++ b/arch/powerpc/kernel/vdso32/sigtramp.S -@@ -251,6 +251,40 @@ V_FUNCTION_END(__kernel_sigtramp_rt32) - vsave_msr1 (31); \ - vsave_msr2 (33, 32*16+12); \ - vsave (32, 32*16) -+#elif defined(CONFIG_SPE) -+#define EH_FRAME_VMX \ -+ rsave (113, VREGS); \ -+ rsave (114, VREGS + 1*4); \ -+ rsave (115, VREGS + 2*4); \ -+ rsave (116, VREGS + 3*4); \ -+ rsave (117, VREGS + 4*4); \ -+ rsave (118, VREGS + 5*4); \ -+ rsave (119, VREGS + 6*4); \ -+ rsave (120, VREGS + 7*4); \ -+ rsave (121, VREGS + 8*4); \ -+ rsave (122, VREGS + 9*4); \ -+ rsave (123, VREGS + 10*4); \ -+ rsave (124, VREGS + 11*4); \ -+ rsave (125, VREGS + 12*4); \ -+ rsave (126, VREGS + 13*4); \ -+ rsave (127, VREGS + 14*4); \ -+ rsave (128, VREGS + 15*4); \ -+ rsave (129, VREGS + 16*4); \ -+ rsave (130, VREGS + 17*4); \ -+ rsave (131, VREGS + 18*4); \ -+ rsave (132, VREGS + 19*4); \ -+ rsave (133, VREGS + 20*4); \ -+ rsave (134, VREGS + 21*4); \ -+ rsave (135, VREGS + 22*4); \ -+ rsave (136, VREGS + 23*4); \ -+ rsave (137, VREGS + 24*4); \ -+ rsave (138, VREGS + 25*4); \ -+ rsave (139, VREGS + 26*4); \ -+ rsave (140, VREGS + 27*4); \ -+ rsave (141, VREGS + 28*4); \ -+ rsave (142, VREGS + 29*4); \ -+ rsave (143, VREGS + 30*4); \ -+ rsave (144, VREGS + 31*4); - #else - #define EH_FRAME_VMX - #endif --- -1.6.5.2 - diff --git a/arch/powerpc/powerpc-Disable-attribute-alias-warnings-from-gcc8.patch b/arch/powerpc/powerpc-Disable-attribute-alias-warnings-from-gcc8.patch deleted file mode 100644 index 2e93b857..00000000 --- a/arch/powerpc/powerpc-Disable-attribute-alias-warnings-from-gcc8.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 59e401ffeda487d9b3bd092199ec9a98faf5abfe Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 4 May 2018 09:46:42 -0700 -Subject: [PATCH 1/2] powerpc: Disable attribute-alias warnings from gcc8 - -Fixes -alias between functions of incompatible types warnings -which are new with gcc8 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - arch/powerpc/kernel/Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile -index 1b6bc7fba996..7fab5ab9edc2 100644 ---- a/arch/powerpc/kernel/Makefile -+++ b/arch/powerpc/kernel/Makefile -@@ -3,7 +3,8 @@ - # Makefile for the linux kernel. - # - --CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"' -+CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"' $(call cc-disable-warning, attribute-alias) -+CFLAGS_syscalls.o += $(call cc-disable-warning, attribute-alias) - - subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror - --- -2.5.0 - diff --git a/arch/powerpc/powerpc-add-crtsavres.o-to-archprepare-for-kbuild.patch b/arch/powerpc/powerpc-add-crtsavres.o-to-archprepare-for-kbuild.patch deleted file mode 100644 index 27119879..00000000 --- a/arch/powerpc/powerpc-add-crtsavres.o-to-archprepare-for-kbuild.patch +++ /dev/null @@ -1,38 +0,0 @@ -From f13fd6af4120b8b42d77377c9989457cda41899f Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@windriver.com> -Date: Sun, 15 Feb 2009 16:57:14 -0500 -Subject: [PATCH 3/3] powerpc: add crtsavres.o to archprepare for kbuild - -upstream commit da3de6df33f5f42ff9dc40093fbc884f524c9a49 adds -a dependency to all kernel modules to crtsavres. This -ensures that out-of-line register saves/restores work when -CONFIG_CC_OPTIMIZE_FOR_SIZE is enabled. - -What it didn't do was ensure that it was built when -modules_prepare was run and hence out of tree powerpc kernel -modules can't properly link. - -The fix is to add crtsavres.o to the archprepare rule in -the arch/powerpc/Makefile - -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - arch/powerpc/Makefile | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/arch/powerpc/Makefile b/arch/powerpc/Makefile -index c3811ab..ad16ff3 100644 ---- a/arch/powerpc/Makefile -+++ b/arch/powerpc/Makefile -@@ -218,7 +218,7 @@ endif - archclean: - $(Q)$(MAKE) $(clean)=$(boot) - --archprepare: checkbin -+archprepare: checkbin arch/powerpc/lib/crtsavres.o - - # Use the file '.tmp_gas_check' for binutils tests, as gas won't output - # to stdout and these checks are run even on install targets. --- -1.6.5.2 - diff --git a/arch/powerpc/powerpc-debug.cfg b/arch/powerpc/powerpc-debug.cfg new file mode 100644 index 00000000..6ea12a12 --- /dev/null +++ b/arch/powerpc/powerpc-debug.cfg @@ -0,0 +1 @@ +CONFIG_PPC_DISABLE_WERROR=y diff --git a/arch/powerpc/powerpc-debug.scc b/arch/powerpc/powerpc-debug.scc new file mode 100644 index 00000000..aedb597c --- /dev/null +++ b/arch/powerpc/powerpc-debug.scc @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT + +kconf non-hardware powerpc-debug.cfg diff --git a/arch/powerpc/powerpc-kexec-fix-for-powerpc64.patch b/arch/powerpc/powerpc-kexec-fix-for-powerpc64.patch deleted file mode 100644 index d979885a..00000000 --- a/arch/powerpc/powerpc-kexec-fix-for-powerpc64.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 85388aad8ca15fcc28f5d0989265217351bada19 Mon Sep 17 00:00:00 2001 -From: Benjamin Walsh <benjamin.walsh@windriver.com> -Date: Mon, 9 Feb 2009 14:25:47 -0500 -Subject: [PATCH] powerpc: kexec fix for powerpc64 - -slbia instruction invalidates the SLB, but there was a hang on the first -instruction that caused an SLB miss exception. Doing a full sync after -the slbia causes the SLB to be in a consistent state for the handling of -the SLB exception. - -Signed-off by: Benjamin Walsh <benjamin.walsh@windriver.com> ---- - arch/powerpc/mm/book3s64/slb.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/powerpc/mm/book3s64/slb.c b/arch/powerpc/mm/book3s64/slb.c -index 515730e499fe..7a8b335003b6 100644 ---- a/arch/powerpc/mm/book3s64/slb.c -+++ b/arch/powerpc/mm/book3s64/slb.c -@@ -331,6 +331,7 @@ void slb_initialize(void) - asm volatile("isync":::"memory"); - asm volatile("slbmte %0,%0"::"r" (0) : "memory"); - asm volatile("isync; slbia; isync":::"memory"); -+ mb(); - create_shadowed_slbe(PAGE_OFFSET, mmu_kernel_ssize, lflags, LINEAR_INDEX); - create_shadowed_slbe(VMALLOC_START, mmu_kernel_ssize, vflags, VMALLOC_INDEX); - --- -2.1.0 - diff --git a/arch/powerpc/powerpc-ptrace-Disable-array-bounds-warning-with-gcc.patch b/arch/powerpc/powerpc-ptrace-Disable-array-bounds-warning-with-gcc.patch deleted file mode 100644 index 6033c020..00000000 --- a/arch/powerpc/powerpc-ptrace-Disable-array-bounds-warning-with-gcc.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 8632f470f02c70d9501ae21f57740ea23c14773f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 4 May 2018 09:50:05 -0700 -Subject: [PATCH 2/2] powerpc/ptrace: Disable array-bounds warning with gcc8 - -This masks the new gcc8 warning -include/linux/regset.h:270:4: error: 'memcpy' offset [-527, -529] is out of the bounds [0, 16] of object 'vrsave' with type 'union <anonymous>' - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - arch/powerpc/kernel/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile -index 7fab5ab9edc2..601118b43545 100644 ---- a/arch/powerpc/kernel/Makefile -+++ b/arch/powerpc/kernel/Makefile -@@ -4,6 +4,7 @@ - # - - CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"' $(call cc-disable-warning, attribute-alias) -+CFLAGS_ptrace.o += $(call cc-disable-warning, array-bounds) - CFLAGS_syscalls.o += $(call cc-disable-warning, attribute-alias) - - subdir-ccflags-$(CONFIG_PPC_WERROR) := -Werror --- -2.5.0 - diff --git a/arch/powerpc/powerpc.scc b/arch/powerpc/powerpc.scc index d3f7e2fb..548d2d44 100644 --- a/arch/powerpc/powerpc.scc +++ b/arch/powerpc/powerpc.scc @@ -1,7 +1 @@ # SPDX-License-Identifier: MIT -patch powerpc-Add-unwind-information-for-SPE-registers-of-.patch -patch powerpc-kexec-fix-for-powerpc64.patch -patch powerpc-add-crtsavres.o-to-archprepare-for-kbuild.patch -patch powerpc-Disable-attribute-alias-warnings-from-gcc8.patch -patch powerpc-ptrace-Disable-array-bounds-warning-with-gcc.patch -patch crtsavres-fixups-for-5.4.patch diff --git a/arch/x86/arch-x86-boot-use-prefix-map-to-avoid-embedded-paths.patch b/arch/x86/arch-x86-boot-use-prefix-map-to-avoid-embedded-paths.patch deleted file mode 100644 index 2889a379..00000000 --- a/arch/x86/arch-x86-boot-use-prefix-map-to-avoid-embedded-paths.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 55dd15336b7301b686a0c183f5372b49c1003d03 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@gmail.com> -Date: Thu, 8 Aug 2019 23:39:26 -0400 -Subject: [PATCH] arch/x86/boot: use prefix map to avoid embedded paths - -It was observed that the kernel embeds the path in the x86 boot -artifacts. - -From https://bugzilla.yoctoproject.org/show_bug.cgi?id=13458: - -[ - If you turn on the buildpaths QA test, or try a reproducible build, you - discover that the kernel image contains build paths. - - $ strings bzImage-5.0.19-yocto-standard |grep tmp/ - out of pgt_buf in - /data/poky-tmp/reproducible/tmp/work-shared/qemux86-64/kernel-source/arch/x86/boot/compressed/kaslr_64.c!? - - But what's this in the top-level Makefile: - - $ git grep prefix-map - Makefile:KBUILD_CFLAGS += $(call - cc-option,-fmacro-prefix-map=$(srctree)/=) - - So the __FILE__ shouldn't be using the full path. However - arch/x86/boot/compressed/Makefile has this: - - KBUILD_CFLAGS := -m$(BITS) -O2 - - So that clears KBUILD_FLAGS, removing the -fmacro-prefix-map option. -] - -Other architectures do not clear the flags, but instead prune before -adding boot or specific options. There's no obvious reason why x86 isn't -doing the same thing (pruning vs clearing) and no build or boot issues -have been observed. - -So we make x86 can do the same thing, and we no longer have embedded paths. - -Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ---- - arch/x86/boot/compressed/Makefile | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile -index f0515ac895a4..364d1c64c26e 100644 ---- a/arch/x86/boot/compressed/Makefile -+++ b/arch/x86/boot/compressed/Makefile -@@ -38,6 +38,7 @@ KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector) - KBUILD_CFLAGS += $(call cc-disable-warning, address-of-packed-member) - KBUILD_CFLAGS += $(call cc-disable-warning, gnu) - KBUILD_CFLAGS += -Wno-pointer-sign -+KBUILD_CFLAGS += $(call cc-option,-fmacro-prefix-map=$(srctree)/=) - - KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__ASSEMBLY__ - GCOV_PROFILE := n --- -2.19.1 - diff --git a/arch/x86/x86.scc b/arch/x86/x86.scc index 217cf09b..a055f389 100644 --- a/arch/x86/x86.scc +++ b/arch/x86/x86.scc @@ -1,2 +1,2 @@ # SPDX-License-Identifier: MIT -patch arch-x86-boot-use-prefix-map-to-avoid-embedded-paths.patch +patch x86_64_defconfig-Fix-warnings.patch diff --git a/arch/x86/x86_64_defconfig-Fix-warnings.patch b/arch/x86/x86_64_defconfig-Fix-warnings.patch new file mode 100644 index 00000000..163effb2 --- /dev/null +++ b/arch/x86/x86_64_defconfig-Fix-warnings.patch @@ -0,0 +1,109 @@ +From a9590c3b985938a5882f4b6f83deb0b108cceabd Mon Sep 17 00:00:00 2001 +From: Naveen Saini <naveen.kumar.saini@intel.com> +Date: Fri, 21 Jan 2022 16:46:21 +0800 +Subject: [PATCH] x86_64_defconfig: Fix warnings + +Configure CONFIG_EEEPC_LAPTOP & CONFIG_SND_SEQ_DUMMY as modules, because +dependencies are configured as modules. + [NOTE]: 'CONFIG_EEEPC_LAPTOP' last val (y) and .config val (m) do not match + [NOTE]: 'CONFIG_SND_SEQ_DUMMY' last val (y) and .config val (m) do not match + +Added dependency configurations: + CONFIG_HID_LOGITECH for CONFIG_LOGITECH_FF + CONFIG_NET_VENDOR_DEC for CONFIG_NET_TULIP + CONFIG_IOMMU_SUPPORT for CONFIG_AMD_IOOMU & CONFIG_INTEL_IOMMU + CONFIG_NET_VENDOR_NVIDIA for CONFIG_FORCEDETH + + Config 'LOGITECH_FF' has the following Direct dependencies (LOGITECH_FF=n): + HID_LOGITECH(=n) && HID(=y) && INPUT(=y) + Parent dependencies are: + HID_LOGITECH [n] HID [y] INPUT [y] + [INFO]: config 'CONFIG_LOGITECH_FF' was set, but it wasn't assignable, check (parent) dependencies + + Config 'NET_TULIP' has the following Direct dependencies (NET_TULIP=n): + PCI(=y) || EISA(=n) || CARDBUS(=y) (=y) && NET_VENDOR_DEC(=n) && ETHERNET(=y) && NETDEVICES(=y) + Parent dependencies are: + NET_VENDOR_DEC [n] ETHERNET [y] EISA [n] PCI [y] CARDBUS [y] NETDEVICES [y] + [INFO]: config 'CONFIG_NET_TULIP' was set, but it wasn't assignable, check (parent) dependencies + + Config 'FORCEDETH' has the following Direct dependencies (FORCEDETH=n): + PCI(=y) && NET_VENDOR_NVIDIA(=n) && ETHERNET(=y) && NETDEVICES(=y) + Parent dependencies are: + NETDEVICES [y] PCI [y] NET_VENDOR_NVIDIA [n] ETHERNET [y] + [INFO]: config 'CONFIG_FORCEDETH' was set, but it wasn't assignable, check (parent) dependencies + +Tested with qemux86-64 machine: +$ oe-selftest --run-tests kerneldevelopment.KernelConfigs + +Disabled debug configurations. Yocto-kernel-cahce have seperate debug configurations. + +Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + arch/x86/configs/x86_64_defconfig | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) + +diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig +index 27759236fd60..a3d260605161 100644 +--- a/arch/x86/configs/x86_64_defconfig ++++ b/arch/x86/configs/x86_64_defconfig +@@ -132,7 +132,7 @@ CONFIG_PCCARD=y + CONFIG_YENTA=y + CONFIG_DEVTMPFS=y + CONFIG_DEVTMPFS_MOUNT=y +-CONFIG_DEBUG_DEVRES=y ++CONFIG_DEBUG_DEVRES=n + CONFIG_CONNECTOR=y + CONFIG_BLK_DEV_LOOP=y + CONFIG_VIRTIO_BLK=y +@@ -160,11 +160,13 @@ CONFIG_NETCONSOLE=y + CONFIG_VIRTIO_NET=y + CONFIG_TIGON3=y + CONFIG_NET_TULIP=y ++CONFIG_NET_VENDOR_DEC=y + CONFIG_E100=y + CONFIG_E1000=y + CONFIG_E1000E=y + CONFIG_SKY2=y + CONFIG_FORCEDETH=y ++CONFIG_NET_VENDOR_NVIDIA=y + CONFIG_8139TOO=y + CONFIG_R8169=y + CONFIG_INPUT_EVDEV=y +@@ -201,12 +203,13 @@ CONFIG_SOUND=y + CONFIG_SND=y + CONFIG_SND_HRTIMER=y + CONFIG_SND_SEQUENCER=y +-CONFIG_SND_SEQ_DUMMY=y ++CONFIG_SND_SEQ_DUMMY=m + CONFIG_SND_HDA_INTEL=y + CONFIG_SND_HDA_HWDEP=y + CONFIG_HIDRAW=y + CONFIG_HID_GYRATION=y + CONFIG_LOGITECH_FF=y ++CONFIG_HID_LOGITECH=y + CONFIG_HID_NTRIG=y + CONFIG_HID_PANTHERLORD=y + CONFIG_PANTHERLORD_FF=y +@@ -231,10 +234,11 @@ CONFIG_RTC_CLASS=y + CONFIG_DMADEVICES=y + CONFIG_VIRTIO_PCI=y + CONFIG_VIRTIO_INPUT=y +-CONFIG_EEEPC_LAPTOP=y ++CONFIG_EEEPC_LAPTOP=m + CONFIG_AMD_IOMMU=y + CONFIG_INTEL_IOMMU=y + # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set ++CONFIG_IOMMU_SUPPORT=y + CONFIG_EXT4_FS=y + CONFIG_EXT4_FS_POSIX_ACL=y + CONFIG_EXT4_FS_SECURITY=y +@@ -276,4 +280,4 @@ CONFIG_SCHEDSTATS=y + CONFIG_BLK_DEV_IO_TRACE=y + CONFIG_PROVIDE_OHCI1394_DMA_INIT=y + CONFIG_EARLY_PRINTK_DBGP=y +-CONFIG_DEBUG_BOOT_PARAMS=y ++CONFIG_DEBUG_BOOT_PARAMS=n +-- +2.34.1 + diff --git a/bsp/amd-x86/amd-x86-64-preempt-rt.scc b/bsp/amd-x86/amd-x86-64-preempt-rt.scc new file mode 100644 index 00000000..2e503bbe --- /dev/null +++ b/bsp/amd-x86/amd-x86-64-preempt-rt.scc @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: MIT +define KMACHINE amd-x86-64 +define KTYPE preempt-rt +define KARCH x86-64 + +include ktypes/preempt-rt/preempt-rt.scc + +include amd-x86-64.scc diff --git a/bsp/amd-x86/amd-x86-64-standard.scc b/bsp/amd-x86/amd-x86-64-standard.scc new file mode 100644 index 00000000..d5a2a788 --- /dev/null +++ b/bsp/amd-x86/amd-x86-64-standard.scc @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: MIT +define KMACHINE amd-x86-64 +define KTYPE standard +define KARCH x86-64 + +include ktypes/standard/standard.scc +include features/transparent-hugepage/transparent-hugepage.scc +include amd-x86-64.scc diff --git a/bsp/amd-x86/amd-x86-64.scc b/bsp/amd-x86/amd-x86-64.scc new file mode 100644 index 00000000..87f23b51 --- /dev/null +++ b/bsp/amd-x86/amd-x86-64.scc @@ -0,0 +1,32 @@ +# SPDX-License-Identifier: MIT +# Core configuration settings for x86_64 +include cfg/x86_64.scc + +include cfg/vesafb.scc +include cfg/8250.scc +include cfg/sound.scc +include cfg/efi-ext.scc +include cfg/virtio.scc +include cfg/boot-live.scc +include cfg/usb-mass-storage.scc +include features/profiling/profiling.scc + +include features/netfilter/netfilter.scc +include features/scsi/cdrom.scc +include features/usb/ehci-hcd.scc +include features/usb/uhci-hcd.scc +include features/usb/ohci-hcd.scc +include features/usb/xhci-hcd.scc +include features/usb/touchscreen-composite.scc +include features/scsi/cdrom.scc +include features/spi/spi.scc +include features/spi/spidev.scc +include features/sound/snd_hda_intel.scc +include features/igb/igb.scc + +kconf hardware bsp/common-pc/common-pc-drivers.cfg +kconf hardware bsp/common-pc/common-pc-eth.cfg +kconf hardware bsp/common-pc/common-pc-gfx.cfg +kconf hardware bsp/common-pc/common-pc-wifi.cfg + +kconf hardware amd-x86.cfg diff --git a/bsp/amd-x86/amd-x86.cfg b/bsp/amd-x86/amd-x86.cfg new file mode 100644 index 00000000..45fa2b92 --- /dev/null +++ b/bsp/amd-x86/amd-x86.cfg @@ -0,0 +1,96 @@ +# SPDX-License-Identifier: MIT + +# +# Processor type and features +# +CONFIG_X86_AMD_PLATFORM_DEVICE=y +CONFIG_MICROCODE=y +CONFIG_PERF_EVENTS_AMD_POWER=y +CONFIG_PERF_EVENTS_AMD_UNCORE=y +CONFIG_AMD_MEM_ENCRYPT=y + +# +# Device Drivers +# +CONFIG_PCI_IOV=y +CONFIG_AMD_PMC=y +CONFIG_AMD_IOMMU=y +CONFIG_AMD_IOMMU_V2=y +CONFIG_E1000E=y +CONFIG_AMD_XGBE=y + +# +# DMA engine configuration +# +CONFIG_DMADEVICES=y + +# +# Serial drivers +# +CONFIG_SERIAL_8250_DMA=y +CONFIG_SERIAL_8250_NR_UARTS=16 +CONFIG_SERIAL_8250_RUNTIME_UARTS=16 +CONFIG_SERIAL_8250_DW=y + +# +# Graphics support +# +CONFIG_DRM_RADEON=m +CONFIG_DRM_RADEON_USERPTR=y + +# +# PPS generators support +# +CONFIG_PINCTRL_AMD=y + +# +# Native drivers +# +CONFIG_SENSORS_K10TEMP=m + +# +# Watchdog Device Drivers +# +CONFIG_SP5100_TCO=m + +# +#Miscellaneous filesystems +# +CONFIG_PSTORE=m + +# +# EFI (Extensible Firmware Interface) Support +# +CONFIG_EFI_VARS_PSTORE=m + +# +# I2C support +# +CONFIG_I2C_CHARDEV=m + +# +# I2C Hardware Bus support +# +CONFIG_I2C_PIIX4=m + +# +# I2C system bus drivers (mostly embedded / system-on-chip) +# +CONFIG_I2C_DESIGNWARE_CORE=m +CONFIG_I2C_DESIGNWARE_PLATFORM=m +CONFIG_I2C_DESIGNWARE_PCI=m + +# +# CPU frequency scaling drivers +# +CONFIG_X86_ACPI_CPUFREQ=m +CONFIG_X86_ACPI_CPUFREQ_CPB=y +CONFIG_X86_AMD_FREQ_SENSITIVITY=m + +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +CONFIG_CPU_FREQ_GOV_USERSPACE=m +CONFIG_CPU_FREQ_GOV_ONDEMAND=m +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y diff --git a/bsp/arm-versatile-926ejs/Omit-to-optimize-vsprintf.c-kasprintf.c.patch b/bsp/arm-versatile-926ejs/Omit-to-optimize-vsprintf.c-kasprintf.c.patch deleted file mode 100644 index f9270725..00000000 --- a/bsp/arm-versatile-926ejs/Omit-to-optimize-vsprintf.c-kasprintf.c.patch +++ /dev/null @@ -1,35 +0,0 @@ -From bbd565278d8849c836163c7ea55521c683bef188 Mon Sep 17 00:00:00 2001 -From: Jianchuan Wang <jianchuan.wang@windriver.com> -Date: Wed, 26 Aug 2015 13:54:57 +0800 -Subject: [PATCH] Omit to optimize vsprintf.c/kasprintf.c - -Add "-O0" for vsprintf.c/kasprintf.c - -Signed-off-by: Jianchuan Wang <jianchuan.wang@windriver.com> ---- - lib/Makefile | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/lib/Makefile b/lib/Makefile -index 095601ce371d..7f6a8a9ae031 100644 ---- a/lib/Makefile -+++ b/lib/Makefile -@@ -101,11 +101,15 @@ CFLAGS_kobject.o += -DDEBUG - CFLAGS_kobject_uevent.o += -DDEBUG - endif - -+ - obj-$(CONFIG_DEBUG_INFO_REDUCED) += debug_info.o - CFLAGS_debug_info.o += $(call cc-option, -femit-struct-debug-detailed=any) - - obj-y += math/ crypto/ - -+CFLAGS_vsprintf.o += -O0 -+CFLAGS_asprintf.o += -O0 -+ - obj-$(CONFIG_GENERIC_IOMAP) += iomap.o - obj-$(CONFIG_GENERIC_PCI_IOMAP) += pci_iomap.o - obj-$(CONFIG_HAS_IOMEM) += iomap_copy.o devres.o --- -2.19.1 - diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg index 5e7519e0..83c71ae6 100644 --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-gfx.cfg @@ -1,8 +1,16 @@ # SPDX-License-Identifier: MIT +CONFIG_INPUT=y +CONFIG_USB_HID=y + +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=y + +CONFIG_DRM_PANEL=y +CONFIG_DRM_PANEL_ARM_VERSATILE=y +CONFIG_DRM_PL111=y + CONFIG_FB=y CONFIG_FB_ARMCLCD=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_INPUT_TABLET=y -CONFIG_HID_WACOM=y -CONFIG_INPUT_MISC=y +CONFIG_AUXDISPLAY=y +CONFIG_ARM_CHARLCD=y diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg new file mode 100644 index 00000000..90b54382 --- /dev/null +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.cfg @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT +CONFIG_LEDS_TRIGGER_CPU=n +CONFIG_FUNCTION_GRAPH_TRACER=n diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc index 8dbe0e86..c1a9d34e 100644 --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-preempt-rt.scc @@ -1,10 +1,14 @@ # SPDX-License-Identifier: MIT define KMACHINE arm-versatile-926ejs define KMACHINE qemuarmv5 -define KMACHINE qemuarm define KTYPE preempt-rt define KARCH arm # no new branch required, re-use the ktypes/preempt-rt/preempt-rt.scc branch include ktypes/preempt-rt/preempt-rt.scc +branch arm-versatile-926ejs + include arm-versatile-926ejs.scc +kconf hardware arm-versatile-926ejs-preempt-rt.cfg + +patch arm_versatile_926ejs-kick-off-PrimeCell-RTC-PL031.patch diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc index 8897aeb6..a88f385d 100644 --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-standard.scc @@ -1,7 +1,6 @@ # SPDX-License-Identifier: MIT define KMACHINE arm-versatile-926ejs define KMACHINE qemuarmv5 -define KMACHINE qemuarm define KTYPE standard define KARCH arm @@ -12,4 +11,3 @@ branch arm-versatile-926ejs include arm-versatile-926ejs.scc patch arm_versatile_926ejs-kick-off-PrimeCell-RTC-PL031.patch -patch Omit-to-optimize-vsprintf.c-kasprintf.c.patch diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc index f0df211b..51d59703 100644 --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs-tiny.scc @@ -1,14 +1,13 @@ # SPDX-License-Identifier: MIT define KMACHINE arm-versatile-926ejs define KMACHINE qemuarmv5 -define KMACHINE qemuarm define KTYPE tiny define KARCH arm include ktypes/tiny/tiny.scc branch arm-versatile-926ejs +include features/hid/hid.scc include arm-versatile-926ejs.scc patch arm_versatile_926ejs-kick-off-PrimeCell-RTC-PL031.patch -patch Omit-to-optimize-vsprintf.c-kasprintf.c.patch diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg b/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg index e3fa6e4c..c1964054 100644 --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs.cfg @@ -1,75 +1,78 @@ # SPDX-License-Identifier: MIT -#......................................................................... -# WARNING -# -# This file is a kernel configuration fragment, and not a full kernel -# configuration file. The final kernel configuration is made up of -# an assembly of processed fragments, each of which is designed to -# capture a specific part of the final configuration (e.g. platform -# configuration, feature configuration, and board specific hardware -# configuration). For more information on kernel configuration, please -# consult the product documentation. -# -#......................................................................... CONFIG_ARM=y -CONFIG_ARM_AMBA=y -CONFIG_CPU_ARM926T=y -CONFIG_CPU_32v5=y +CONFIG_MMU=y +CONFIG_ARCH_MULTIPLATFORM=y +CONFIG_ARCH_MULTI_V7=n +CONFIG_ARCH_MULTI_V6=n CONFIG_ARCH_MULTI_V5=y -# CONFIG_ARCH_MULTI_V7 is not set -CONFIG_PCI_VERSATILE=y -CONFIG_CPU_CACHE_VIVT=y -CONFIG_CPU_TLB_V4WBI=y -CONFIG_CPU_COPY_V4WB=y -CONFIG_CPU_ABRT_EV5TJ=y CONFIG_ARCH_VERSATILE=y +CONFIG_PLAT_VERSATILE=y +CONFIG_AEABI=y +CONFIG_OABI_COMPAT=y +CONFIG_FPE_NWFPE=y CONFIG_VFP=y - -# CONFIG_PHYLIB is not set - +CONFIG_CMA=y CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y -CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y CONFIG_MTD_CFI=y -CONFIG_MTD_JEDECPROBE=y +CONFIG_MTD_CFI_ADV_OPTIONS=y CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_CFI_AMDSTD=y +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_PHYSMAP_OF=y +CONFIG_MTD_PHYSMAP_VERSATILE=y +CONFIG_I2C=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_VERSATILE=y +CONFIG_SPI=y +CONFIG_GPIOLIB=y +CONFIG_GPIO_PL061=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_PL031=y +CONFIG_RTC_DRV_DS1307=y -# CONFIG_SERIAL_8250 is not set -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +CONFIG_TTY=y +CONFIG_NULL_TTY=y +CONFIG_VT=y +CONFIG_VT_CONSOLE=y +CONFIG_VT_HW_CONSOLE_BINDING=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_EXTENDED=y +CONFIG_SERIAL_8250_MANY_PORTS=y +CONFIG_SERIAL_8250_SHARE_IRQ=y +CONFIG_SERIAL_8250_RSA=y CONFIG_SERIAL_AMBA_PL011=y +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_MMC=y -CONFIG_MMC_BLOCK=y CONFIG_MMC_ARMMMCI=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y +CONFIG_LEDS_SYSCON=y +CONFIG_LEDS_TRIGGERS=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LEDS_TRIGGER_CPU=y +CONFIG_ARM_VIC=y +CONFIG_ARM_TIMER_SP804=y +CONFIG_ARM_MODULE_PLTS=y +CONFIG_CLKSRC_VERSATILE=y +CONFIG_POWER_RESET_VERSATILE=y +CONFIG_VERSATILE_FPGA_IRQ=y +CONFIG_VERSATILE_FPGA_IRQ_NR=4 -CONFIG_JFFS2_FS=y -CONFIG_CRAMFS=y +CONFIG_NET_VENDOR_SMSC=y +CONFIG_SMC91X=y CONFIG_PCI=y +CONFIG_PCI_VERSATILE=y -CONFIG_SCSI=y -CONFIG_BLK_DEV_SD=y -CONFIG_SCSI_SYM53C8XX_2=y -CONFIG_SCSI_SYM53C8XX_DMA_ADDRESSING_MODE=1 -CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16 -CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64 -CONFIG_SCSI_SYM53C8XX_MMIO=y - +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_ARM=y +CONFIG_SND_ARMAACI=y CONFIG_SERIO=y -# CONFIG_SERIO_SERPORT is not set CONFIG_SERIO_AMBAKMI=y - -CONFIG_USB_MON=y -CONFIG_USB_OHCI_HCD=y -CONFIG_INPUT_EVDEV=y - -CONFIG_FRAME_POINTER=y - -# CONFIG_NO_HZ is not set -# CONFIG_HIGH_RES_TIMERS is not set diff --git a/bsp/arm-versatile-926ejs/arm-versatile-926ejs.scc b/bsp/arm-versatile-926ejs/arm-versatile-926ejs.scc index 9b1ea4b4..ca7b9682 100644 --- a/bsp/arm-versatile-926ejs/arm-versatile-926ejs.scc +++ b/bsp/arm-versatile-926ejs/arm-versatile-926ejs.scc @@ -2,11 +2,8 @@ kconf hardware arm-versatile-926ejs.cfg kconf hardware arm-versatile-926ejs-gfx.cfg -include features/profiling/profiling.scc -include features/latencytop/latencytop.scc - -include features/usb/ehci-hcd.scc -include features/usb/uhci-hcd.scc include features/usb/ohci-hcd.scc -include features/usb/xhci-hcd.scc +include features/net/net.scc +include features/pci/pci.scc +include cfg/virtio.scc diff --git a/bsp/bcm-2xxx-rpi/bcm-2xxx-rpi.cfg b/bsp/bcm-2xxx-rpi/bcm-2xxx-rpi.cfg index f10249fa..5df913c9 100755..100644 --- a/bsp/bcm-2xxx-rpi/bcm-2xxx-rpi.cfg +++ b/bsp/bcm-2xxx-rpi/bcm-2xxx-rpi.cfg @@ -17,6 +17,7 @@ CONFIG_MMU=y CONFIG_ARM64=y # CPU Core family selection +CONFIG_ARCH_BCM=y CONFIG_ARCH_BCM2835=y CONFIG_MAILBOX=y CONFIG_BCM2835_MBOX=y @@ -29,7 +30,8 @@ CONFIG_SMP=y CONFIG_NR_CPUS=4 # CPU Idle -# CONFIG_ATAGS is not set +CONFIG_ARM_PSCI_CPUIDLE=y +CONFIG_ATAGS=n CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE=y @@ -41,7 +43,12 @@ CONFIG_CPU_FREQ_GOV_POWERSAVE=y CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE_GOV_MENU=y -CONFIG_ARM_CPUIDLE=y + +# +# CPU frequency +# +CONFIG_CPUFREQ_DT=y +CONFIG_ARM_RASPBERRYPI_CPUFREQ=y # MTD devices CONFIG_MTD=y @@ -50,6 +57,8 @@ CONFIG_MTD_BLOCK=m # Ethernet devices CONFIG_NET=y CONFIG_BCMGENET=y +CONFIG_BROADCOM_PHY=y +CONFIG_MICREL_PHY=y # Serial drivers CONFIG_SERIAL_8250=y @@ -68,10 +77,12 @@ CONFIG_SERIAL_DEV_BUS=y # I2C device CONFIG_I2C=y +CONFIG_I2C_MUX=y CONFIG_I2C_CHARDEV=m CONFIG_I2C_BCM2708=m CONFIG_I2C_BCM2835=m CONFIG_I2C_GPIO=m +CONFIG_I2C_MUX_PINCTRL=m CONFIG_EEPROM_AT24=m # SPI device @@ -86,22 +97,29 @@ CONFIG_FB_BCM2708=y CONFIG_FB_UDL=m CONFIG_FB_SSD1307=m CONFIG_FB_RPISENSE=m +CONFIG_FB_SIMPLE=y CONFIG_BCM_VCIO=y CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_DRM=m +CONFIG_DRM=y CONFIG_DRM_LOAD_EDID_FIRMWARE=y CONFIG_DRM_UDL=m CONFIG_DRM_VC4=m +CONFIG_DRM_V3D=m +CONFIG_DRM_VC4_HDMI_CEC=y +CONFIG_DRM_DISPLAY_CONNECTOR=m +CONFIG_DRM_SIMPLE_BRIDGE=m #PCIe Bus support CONFIG_PCI=y CONFIG_PCIE_BRCMSTB=y +CONFIG_PCI_HOST_GENERIC=y # USB support CONFIG_USB=y CONFIG_USB_USBNET=y CONFIG_USB_NET_SMSC95XX=y +CONFIG_USB_NET_AQC111=y CONFIG_USB_ALI_M5632=y CONFIG_USB_AN2720=y CONFIG_USB_EPSON2888=y @@ -113,6 +131,12 @@ CONFIG_USB_DWCOTG=y CONFIG_USB_XHCI_HCD=y CONFIG_USB_PCI=y +# +# Input Device +# +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_TOUCHSCREEN_RASPBERRYPI_FW=m + #Media support CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_ANALOG_TV_SUPPORT=y @@ -120,18 +144,25 @@ CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y CONFIG_MEDIA_RADIO_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y CONFIG_MEDIA_SUPPORT=m +CONFIG_MEDIA_PLATFORM_SUPPORT=y CONFIG_MEDIA_USB_SUPPORT=y -CCONFIG_USB_VIDEO_CLASS=m -CONFIG_VIDEO_V4L2=m +CONFIG_MEDIA_CEC_RC=y +CONFIG_RC_CORE=y +CONFIG_USB_VIDEO_CLASS=m +CONFIG_VIDEO_DEV=m CONFIG_VIDEO_EM28XX=m CONFIG_VIDEO_EM28XX_V4L2=m CONFIG_VIDEO_EM28XX_ALSA=m CONFIG_VIDEO_EM28XX_DVB=m CONFIG_VIDEO_BCM2835=m +CONFIG_VIDEO_CODEC_BCM2835=m +CONFIG_VIDEO_ISP_BCM2835=m CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y # Thermal configuration CONFIG_THERMAL=y +CONFIG_BCM2711_THERMAL=y CONFIG_BCM2835_THERMAL=y # MMC/SD/SDIO Card Drivers @@ -186,16 +217,23 @@ CONFIG_SND_BCM2708_SOC_HIFIBERRY_DAC=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUS=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_DIGI=m CONFIG_SND_BCM2708_SOC_HIFIBERRY_AMP=m +CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADC=m +CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSADCPRO=m +CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSDSP=m +CONFIG_SND_BCM2708_SOC_PIFI_40=m CONFIG_SND_BCM2708_SOC_RPI_CIRRUS=m CONFIG_SND_BCM2708_SOC_RPI_DAC=m CONFIG_SND_BCM2708_SOC_RPI_PROTO=m CONFIG_SND_BCM2708_SOC_JUSTBOOM_DAC=m CONFIG_SND_BCM2708_SOC_JUSTBOOM_DIGI=m +CONFIG_SND_BCM2708_SOC_IQAUDIO_CODEC=m +CONFIG_SND_BCM2708_SOC_I_SABRE_Q2M=m CONFIG_SND_BCM2708_SOC_IQAUDIO_DAC=m CONFIG_SND_BCM2708_SOC_IQAUDIO_DIGI=m CONFIG_SND_BCM2708_SOC_ADAU1977_ADC=m CONFIG_SND_AUDIOINJECTOR_PI_SOUNDCARD=m CONFIG_SND_AUDIOINJECTOR_OCTO_SOUNDCARD=m +CONFIG_SND_AUDIOSENSE_PI=m CONFIG_SND_DIGIDAC1_SOUNDCARD=m CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO=m CONFIG_SND_BCM2708_SOC_DIONAUDIO_LOCO_V2=m @@ -205,16 +243,20 @@ CONFIG_SND_BCM2708_SOC_FE_PI_AUDIO=m CONFIG_SND_BCM2708_SOC_ALLO_BOSS_DAC=m CONFIG_SND_BCM2708_SOC_ALLO_DIGIONE=m CONFIG_SND_BCM2708_SOC_ALLO_KATANA_DAC=m +CONFIG_SND_BCM2708_SOC_HIFIBERRY_DACPLUSHD=m +CONFIG_SND_BCM2708_SOC_JUSTBOOM_BOTH=m +CONFIG_SND_AUDIOINJECTOR_ISOLATED_SOUNDCARD=m CONFIG_SND_PISOUND=m CONFIG_SND_BCM2835=m +CONFIG_SND_SOC_CS4271_I2C=m +CONFIG_SND_SOC_MA120X0P=m +CONFIG_SND_SOC_MAX98357A=m # GPIO Support CONFIG_MFD_CORE=y CONFIG_MFD_STMPE=y -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_BCM_VIRT=y CONFIG_MFD_ARIZONA_I2C=m -CONFIG_MFD_ARIZONA=y CONFIG_GPIO_ARIZONA=m CONFIG_GPIO_STMPE=y @@ -235,18 +277,36 @@ CONFIG_BT_HCIBPA10X=m CONFIG_BT_HCIBFUSB=m CONFIG_BT_HCIVHCI=m CONFIG_HOSTAP=y -CONFIG_WIMAX=m CONFIG_MWIFIEX=m CONFIG_MWIFIEX_SDIO=m -CONFIG_WIMAX_I2400M_USB=m # Regulator configuration CONFIG_REGULATOR=y -CONFIG_REGULATOR_FIXED_VOLTAGE=m +CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_ARIZONA_LDO1=m CONFIG_REGULATOR_ARIZONA_MICSUPP=m CONFIG_REGULATOR_GPIO=y +# Clock configuration +CONFIG_CLK_RASPBERRYPI=y + +# +# DMABUF options +# +CONFIG_DMABUF_HEAPS=y +CONFIG_DMABUF_HEAPS_SYSTEM=y +CONFIG_DMABUF_HEAPS_CMA=y + +# +# Multifunction device +# +CONFIG_MFD_SYSCON=y +CONFIG_MFD_WM5102=y + +# NVME configuration +CONFIG_BLK_DEV_NVME=y +CONFIG_NVMEM_RMEM=m + # Misc configuration CONFIG_BINFMT_MISC=m CONFIG_BRCM_CHAR_DRIVERS=y @@ -261,9 +321,11 @@ CONFIG_BCM_VIDEOCORE=y CONFIG_CRC_ITU_T=y CONFIG_LIBCRC32C=y CONFIG_HW_RANDOM=y -CONFIG_RAW_DRIVER=y CONFIG_HID_LOGITECH=m CONFIG_LOGITECH_FF=y CONFIG_LOGIRUMBLEPAD2_FF=y CONFIG_LOGIG940_FF=y -CONFIG_SENSORS_RPI_POE_FAN=m +CONFIG_LEDS_CLASS=y +CONFIG_NEW_LEDS=y +CONFIG_OF_OVERLAY=y +CONFIG_EXPERT=y diff --git a/bsp/bcm-2xxx-rpi/bcm-2xxx-rpi.scc b/bsp/bcm-2xxx-rpi/bcm-2xxx-rpi.scc index 42b9c691..8c654b99 100755 --- a/bsp/bcm-2xxx-rpi/bcm-2xxx-rpi.scc +++ b/bsp/bcm-2xxx-rpi/bcm-2xxx-rpi.scc @@ -3,7 +3,6 @@ kconf hardware bcm-2xxx-rpi.cfg include cfg/usb-mass-storage.scc include features/profiling/profiling.scc -include features/latencytop/latencytop.scc include features/hostapd/hostapd.scc include features/mac80211/mac80211.scc diff --git a/bsp/beaglebone/beaglebone-non_hardware.cfg b/bsp/beaglebone/beaglebone-non_hardware.cfg index 3fffd627..1e355515 100644 --- a/bsp/beaglebone/beaglebone-non_hardware.cfg +++ b/bsp/beaglebone/beaglebone-non_hardware.cfg @@ -7,7 +7,7 @@ CONFIG_NFS_DEF_FILE_IO_SIZE=1024 # # Multiple Device Support # -# CONFIG_MD is not set +CONFIG_MD=n # Kernel Features # diff --git a/bsp/beaglebone/beaglebone.cfg b/bsp/beaglebone/beaglebone.cfg index ce13e1a7..6e29ca3f 100644 --- a/bsp/beaglebone/beaglebone.cfg +++ b/bsp/beaglebone/beaglebone.cfg @@ -7,9 +7,7 @@ CONFIG_ARCH_OMAP3=y CONFIG_SOC_AM33XX=y CONFIG_ARCH_OMAP2PLUS=y -CONFIG_OMAP_32K_TIMER=y CONFIG_OMAP_DM_TIMER=y -CONFIG_OMAP_RESET_CLOCKS=y # # Processor Features @@ -93,6 +91,8 @@ CONFIG_SMSC911X=y CONFIG_TI_CPSW_PHY_SEL=y CONFIG_TI_CPSW=y CONFIG_TI_DAVINCI_MDIO=y +CONFIG_NET_SWITCHDEV=y +CONFIG_TI_CPSW_SWITCHDEV=y # # MII PHY device drivers @@ -148,7 +148,6 @@ CONFIG_PINMUX=y CONFIG_PINCONF=y CONFIG_GENERIC_PINCONF=y CONFIG_PINCTRL_SINGLE=y -CONFIG_GPIO_SYSFS=y # # I2C GPIO expanders: @@ -194,15 +193,11 @@ CONFIG_DRM=y CONFIG_DRM_I2C_NXP_TDA998X=y CONFIG_DRM_TILCDC=y CONFIG_DRM_OMAP=y -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLIT=y CONFIG_FB_MODE_HELPERS=y CONFIG_FB_TILEBLITTING=y # # Frame buffer hardware drivers -CONFIG_OMAP2_DSS=y CONFIG_OMAP2_DSS_DPI=y CONFIG_OMAP2_DSS_VENC=y CONFIG_OMAP2_DSS_DSI=y @@ -214,7 +209,6 @@ CONFIG_OMAP2_DSS_MIN_FCK_PER_PCK=0 CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_PLATFORM=y CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_GENERIC=y # # Console display driver support @@ -245,7 +239,6 @@ CONFIG_USB_EHCI_HCD_OMAP=y CONFIG_USB_MUSB_HDRC=y CONFIG_USB_MUSB_OMAP2PLUS=y CONFIG_USB_MUSB_DSPS=y -CONFIG_USB_MUSB_AM335X_CHILD=y CONFIG_USB_TI_CPPI41_DMA=y # @@ -262,7 +255,6 @@ CONFIG_USB_GADGET=y # CONFIG_USB_G_NCM=m CONFIG_USB_MASS_STORAGE=m -CONFIG_MMC=y # # MMC/SD/SDIO Card Drivers @@ -272,8 +264,10 @@ CONFIG_SDIO_UART=y # # MMC/SD/SDIO Host Controller Drivers # -CONFIG_MMC_OMAP=y -CONFIG_MMC_OMAP_HS=y +CONFIG_MMC=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_SDHCI_OMAP=y CONFIG_NEW_LEDS=y # diff --git a/bsp/common-pc-64/common-pc-64-tiny.scc b/bsp/common-pc-64/common-pc-64-tiny.scc new file mode 100644 index 00000000..0d083b0d --- /dev/null +++ b/bsp/common-pc-64/common-pc-64-tiny.scc @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: MIT +define KMACHINE common-pc-64 +define KMACHINE qemux86-64 +define KTYPE tiny +define KARCH i386 + +include ktypes/tiny/tiny.scc + +include features/hid/hid.scc +include bsp/common-pc-64/common-pc-64.scc diff --git a/bsp/common-pc-64/common-pc-64.scc b/bsp/common-pc-64/common-pc-64.scc index d01e9e92..82b5e2e7 100644 --- a/bsp/common-pc-64/common-pc-64.scc +++ b/bsp/common-pc-64/common-pc-64.scc @@ -23,7 +23,7 @@ include features/intel-e1xxxx/intel-e100.scc include features/intel-e1xxxx/intel-e1xxxx.scc include features/igb/igb.scc include features/scsi/cdrom.scc - +include features/igc/igc.scc include features/x2apic/x2apic.scc # generic Bluetooth support diff --git a/bsp/common-pc/common-pc-cpu.cfg b/bsp/common-pc/common-pc-cpu.cfg index 34888cf7..dfe3f9a1 100644 --- a/bsp/common-pc/common-pc-cpu.cfg +++ b/bsp/common-pc/common-pc-cpu.cfg @@ -16,4 +16,4 @@ CONFIG_X86_GENERIC=y CONFIG_X86_TSC=y CONFIG_X86_MCE=y CONFIG_PM=y -# CONFIG_64BIT is not set +CONFIG_64BIT=n diff --git a/bsp/common-pc/common-pc-drivers.cfg b/bsp/common-pc/common-pc-drivers.cfg index 9599ecc2..5e2018d6 100644 --- a/bsp/common-pc/common-pc-drivers.cfg +++ b/bsp/common-pc/common-pc-drivers.cfg @@ -4,7 +4,7 @@ CONFIG_ATA=y CONFIG_ATA_ACPI=y CONFIG_ATA_SFF=y CONFIG_ATA_BMDMA=y -CONFIG_ATA_PIIX=m +CONFIG_ATA_PIIX=y CONFIG_PATA_SCH=y CONFIG_INPUT=y @@ -14,6 +14,8 @@ CONFIG_INPUT_KEYBOARD=y CONFIG_KEYBOARD_ATKBD=y CONFIG_INPUT_MOUSE=y CONFIG_INPUT_TABLET=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=y CONFIG_HID_WACOM=y CONFIG_SERIO=y CONFIG_SERIO_I8042=y @@ -49,15 +51,12 @@ CONFIG_USB_SERIAL_PL2303=y CONFIG_I2C=y CONFIG_I2C_I801=y -CONFIG_IDE=y -CONFIG_IDE_GD=y -CONFIG_IDE_GD_ATA=y -CONFIG_BLK_DEV_PIIX=y CONFIG_SATA_AHCI=y -CONFIG_BLK_DEV_IDECD=y +CONFIG_ISA_DMA_API=y CONFIG_BLK_DEV_FD=m +CONFIG_BLK_DEV=y CONFIG_EEPROM_AT24=m diff --git a/bsp/common-pc/common-pc-preempt-rt.scc b/bsp/common-pc/common-pc-preempt-rt.scc index cdba3bd0..7044022d 100644 --- a/bsp/common-pc/common-pc-preempt-rt.scc +++ b/bsp/common-pc/common-pc-preempt-rt.scc @@ -12,6 +12,5 @@ include bsp/common-pc/common-pc.scc # default policy for preempt-rt kernels include cfg/boot-live.scc include cfg/usb-mass-storage.scc -include features/latencytop/latencytop.scc include features/profiling/profiling.scc include cfg/virtio.scc diff --git a/bsp/common-pc/common-pc-tiny.scc b/bsp/common-pc/common-pc-tiny.scc index 687414ae..9fe725ac 100644 --- a/bsp/common-pc/common-pc-tiny.scc +++ b/bsp/common-pc/common-pc-tiny.scc @@ -7,5 +7,5 @@ define KARCH i386 include ktypes/tiny/tiny.scc branch common-pc +include features/hid/hid.scc include common-pc.scc - diff --git a/bsp/common-pc/common-pc.cfg b/bsp/common-pc/common-pc.cfg index be09ed6a..f58d7b33 100644 --- a/bsp/common-pc/common-pc.cfg +++ b/bsp/common-pc/common-pc.cfg @@ -9,5 +9,5 @@ # value CONFIG_NR_CPUS=8 -# CONFIG_IRQ_REMAP is not set -# CONFIG_X86_X2APIC is not set +CONFIG_IRQ_REMAP=n +CONFIG_X86_X2APIC=n diff --git a/bsp/common-pc/common-pc.scc b/bsp/common-pc/common-pc.scc index 5956ec24..f5d782ff 100644 --- a/bsp/common-pc/common-pc.scc +++ b/bsp/common-pc/common-pc.scc @@ -34,6 +34,10 @@ include features/drm-gma500/drm-gma500.scc # generic Bluetooth support include features/bluetooth/bluetooth.scc +if [ "$KMACHINE" = "qemux86" ]; then +kconf hardware qemux86.cfg +fi + # This stays last in the list, since it is our final override of the # common fragments (if required) kconf hardware common-pc.cfg diff --git a/bsp/common-pc/non-hardware.cfg b/bsp/common-pc/non-hardware.cfg index 84cd8954..b3202f6c 100644 --- a/bsp/common-pc/non-hardware.cfg +++ b/bsp/common-pc/non-hardware.cfg @@ -20,5 +20,4 @@ CONFIG_IWLMVM CONFIG_IWLEGACY CONFIG_IWL3945 CONFIG_IWL4965 -CONFIG_DRM_KMS_FB_HELPER CONFIG_DRM_KMS_HELPER diff --git a/bsp/common-pc/qemux86.cfg b/bsp/common-pc/qemux86.cfg new file mode 100644 index 00000000..984b4377 --- /dev/null +++ b/bsp/common-pc/qemux86.cfg @@ -0,0 +1 @@ +CONFIG_QEMUX86=y diff --git a/bsp/edgerouter/edgerouter.cfg b/bsp/edgerouter/edgerouter.cfg index c8a11962..1fc7604b 100644 --- a/bsp/edgerouter/edgerouter.cfg +++ b/bsp/edgerouter/edgerouter.cfg @@ -48,7 +48,7 @@ CONFIG_BCM87XX_PHY=y #USB CONFIG_USB=y -CONFIG_OCTEON_USB=y +CONFIG_USB_OCTEON_HCD=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_OCTEON_EHCI=y CONFIG_USB_OHCI_HCD=y diff --git a/bsp/fsl-mpc8315e-rdb/fsl-mpc8315e-rdb-preempt-rt.scc b/bsp/fsl-mpc8315e-rdb/fsl-mpc8315e-rdb-preempt-rt.scc index 4f8bcf25..231d5654 100644 --- a/bsp/fsl-mpc8315e-rdb/fsl-mpc8315e-rdb-preempt-rt.scc +++ b/bsp/fsl-mpc8315e-rdb/fsl-mpc8315e-rdb-preempt-rt.scc @@ -9,5 +9,4 @@ include ktypes/preempt-rt/preempt-rt.scc include fsl-mpc8315e-rdb.scc # default policy for preempt-rt kernels -include features/latencytop/latencytop.scc include features/profiling/profiling.scc diff --git a/bsp/fsl-mpc8315e-rdb/fsl-mpc8315e-rdb-standard.scc b/bsp/fsl-mpc8315e-rdb/fsl-mpc8315e-rdb-standard.scc index 0f00d23e..fa797bad 100644 --- a/bsp/fsl-mpc8315e-rdb/fsl-mpc8315e-rdb-standard.scc +++ b/bsp/fsl-mpc8315e-rdb/fsl-mpc8315e-rdb-standard.scc @@ -10,5 +10,4 @@ branch fsl-mpc8315e-rdb include fsl-mpc8315e-rdb.scc # default policy for standard kernels -include features/latencytop/latencytop.scc include features/profiling/profiling.scc diff --git a/bsp/fsl-mpc8315e-rdb/fsl-mpc8315e-rdb.cfg b/bsp/fsl-mpc8315e-rdb/fsl-mpc8315e-rdb.cfg index d202a1d6..f5d2ede4 100644 --- a/bsp/fsl-mpc8315e-rdb/fsl-mpc8315e-rdb.cfg +++ b/bsp/fsl-mpc8315e-rdb/fsl-mpc8315e-rdb.cfg @@ -23,8 +23,8 @@ CONFIG_PPC_83xx=y # Platform support # CONFIG_MPC831x_RDB=y -# CONFIG_PPC_CHRP is not set -# CONFIG_PPC_PMAC is not set +CONFIG_PPC_CHRP=n +CONFIG_PPC_PMAC=n # # Bus options @@ -101,7 +101,7 @@ CONFIG_EEPROM_AT24=y # SPI support # CONFIG_SPI=y -# CONFIG_SPI_DEBUG is not set +CONFIG_SPI_DEBUG=n CONFIG_SPI_MASTER=y # diff --git a/bsp/genericarm64/genericarm64-arch.cfg b/bsp/genericarm64/genericarm64-arch.cfg new file mode 100644 index 00000000..6f341ed7 --- /dev/null +++ b/bsp/genericarm64/genericarm64-arch.cfg @@ -0,0 +1,131 @@ +# Actions Semi Platforms +CONFIG_ARCH_ACTIONS=y +# Allwinner sunxi 64-bit SoC Family +CONFIG_ARCH_SUNXI=y +# Annapurna Labs Alpine platform +CONFIG_ARCH_ALPINE=y +# Apple Silicon SoC family +CONFIG_ARCH_APPLE=y +# Broadcom SoC Support +CONFIG_ARCH_BCM=y +# Broadcom BCM2835 family +CONFIG_ARCH_BCM2835=y +# Broadcom iProc SoC Family +CONFIG_ARCH_BCM_IPROC=y +# Broadcom Broadband Carrier Access (BCA) origin SoC +CONFIG_ARCH_BCMBCA=y +# Broadcom Set-Top-Box SoCs +CONFIG_ARCH_BRCMSTB=y +# Marvell Berlin SoC Family +CONFIG_ARCH_BERLIN=y +# Samsung Exynos SoC family +CONFIG_ARCH_EXYNOS=y +# Microchip Sparx5 SoC family +CONFIG_ARCH_SPARX5=y +# Texas Instruments Inc. K3 multicore SoC architecture +CONFIG_ARCH_K3=y +# LG Electronics LG1K SoC Family +CONFIG_ARCH_LG1K=y +# Hisilicon SoC Family +CONFIG_ARCH_HISI=y +# Keem Bay SoC +CONFIG_ARCH_KEEMBAY=y +# MediaTek SoC Family +CONFIG_ARCH_MEDIATEK=y +# Amlogic Platforms +CONFIG_ARCH_MESON=y +# Marvell EBU SoC Family +CONFIG_ARCH_MVEBU=y +# NXP SoC support +CONFIG_ARCH_NXP=y +# Freescale Layerscape SoC family +CONFIG_ARCH_LAYERSCAPE=y +# NXP i.MX SoC family +CONFIG_ARCH_MXC=y +# NXP S32 SoC Family +CONFIG_ARCH_S32=y +# Nuvoton MA35 Architecture +CONFIG_ARCH_MA35=y +# Nuvoton NPCM Architecture +CONFIG_ARCH_NPCM=y +# Qualcomm Platforms +CONFIG_ARCH_QCOM=y +# Realtek Platforms +CONFIG_ARCH_REALTEK=y +# Renesas SoC Platforms +CONFIG_ARCH_RENESAS=y +# Rockchip Platforms +CONFIG_ARCH_ROCKCHIP=y +# AMD Seattle SoC Family +CONFIG_ARCH_SEATTLE=y +# Intel's SoCFPGA ARMv8 Families +CONFIG_ARCH_INTEL_SOCFPGA=y +# STMicroelectronics STM32 SoC Family +CONFIG_ARCH_STM32=y +# Socionext SynQuacer SoC Family +CONFIG_ARCH_SYNQUACER=y +# NVIDIA Tegra SoC Family +CONFIG_ARCH_TEGRA=y +# Tesla platform +CONFIG_ARCH_TESLA_FSD=y +# Spreadtrum SoC platform +CONFIG_ARCH_SPRD=y +# Cavium Inc. Thunder SoC Family +CONFIG_ARCH_THUNDER=y +# Cavium ThunderX2 Server Processors +CONFIG_ARCH_THUNDER2=y +# Socionext UniPhier SoC Family +CONFIG_ARCH_UNIPHIER=y +# ARMv8 software model (Versatile Express) +CONFIG_ARCH_VEXPRESS=y +# Toshiba Visconti SoC Family +CONFIG_ARCH_VISCONTI=y +# AppliedMicro X-Gene SOC Family +CONFIG_ARCH_XGENE=y +# Xilinx ZynqMP Family +CONFIG_ARCH_ZYNQMP=y + + +# Qualcomm SoC drivers +# Qualcomm AOSS Driver +CONFIG_QCOM_AOSS_QMP=y +# Qualcomm Command DB +CONFIG_QCOM_COMMAND_DB=y +# QCOM Core Power Reduction (CPR) support +CONFIG_QCOM_CPR=y +# QCOM GENI Serial Engine Driver +CONFIG_QCOM_GENI_SE=y +# Qualcomm Technologies, Inc. LLCC driver +CONFIG_QCOM_LLCC=m +# Qualcomm On Chip Memory (OCMEM) driver +CONFIG_QCOM_OCMEM=m +# Qualcomm PMIC GLINK driver +CONFIG_QCOM_PMIC_GLINK=m +# Qualcomm Remote Filesystem memory driver +CONFIG_QCOM_RMTFS_MEM=m +# Qualcomm RPM-Hardened (RPMH) Communication +CONFIG_QCOM_RPMH=y +# Qualcomm RPMh Power domain driver +CONFIG_QCOM_RPMHPD=y +# Qualcomm RPM Power domain driver +CONFIG_QCOM_RPMPD=y +# Qualcomm Shared Memory Manager (SMEM) +CONFIG_QCOM_SMEM=y +# Qualcomm Resource Power Manager (RPM) over SMD +CONFIG_QCOM_SMD_RPM=y +# Qualcomm Shared Memory Point to Point support +CONFIG_QCOM_SMP2P=y +# Qualcomm Shared Memory State Machine +CONFIG_QCOM_SMSM=y +# Qualcomm socinfo driver +CONFIG_QCOM_SOCINFO=m +# Qualcomm Subsystem Power Manager (SPM) +CONFIG_QCOM_SPM=m +# Qualcomm Technologies, Inc. (QTI) Sleep stats driver +CONFIG_QCOM_STATS=m +# Qualcomm WCNSS control driver +CONFIG_QCOM_WCNSS_CTRL=m +# Qualcomm APR/GPR Bus (Asynchronous/Generic Packet Router) +CONFIG_QCOM_APR=m +# QCOM Interconnect Bandwidth Monitor driver +CONFIG_QCOM_ICC_BWMON=m diff --git a/bsp/genericarm64/genericarm64-clock.cfg b/bsp/genericarm64/genericarm64-clock.cfg new file mode 100644 index 00000000..d3850278 --- /dev/null +++ b/bsp/genericarm64/genericarm64-clock.cfg @@ -0,0 +1,173 @@ +# Common Clock Framework +CONFIG_COMMON_CLK=y + +# Clock driver for RK805/RK808/RK809/RK817/RK818 +CONFIG_COMMON_CLK_RK808=m +# Clock driver controlled via SCMI interface +CONFIG_COMMON_CLK_SCMI=y +# Clock driver controlled via SCPI interface +CONFIG_COMMON_CLK_SCPI=m +# Clock driver for CS2000 Fractional-N Clock Synthesizer & Clock Multiplier +CONFIG_COMMON_CLK_CS2000_CP=m +# Clock driver for BCLK of Freescale SAI cores +CONFIG_COMMON_CLK_FSL_SAI=y +# Clock driver for S2MPS1X/S5M8767 MFD +CONFIG_COMMON_CLK_S2MPS11=m +# Clock driver for PWMs used as clock outputs +CONFIG_COMMON_CLK_PWM=m +# Clock driver for Renesas 9-series PCIe clock generators +CONFIG_COMMON_CLK_RS9_PCIE=m +# Clock driver for IDT VersaClock 5,6 devices +CONFIG_COMMON_CLK_VC5=m +# Clock driver for 32K clk gates on ROHM PMICs +CONFIG_COMMON_CLK_BD718XX=m +# Raspberry Pi firmware based clock support +CONFIG_CLK_RASPBERRYPI=m +# IMX8MM CCM Clock Driver +CONFIG_CLK_IMX8MM=y +# IMX8MN CCM Clock Driver +CONFIG_CLK_IMX8MN=y +# IMX8MP CCM Clock Driver +CONFIG_CLK_IMX8MP=y +# IMX8MQ CCM Clock Driver +CONFIG_CLK_IMX8MQ=y +# IMX8QXP SCU Clock +CONFIG_CLK_IMX8QXP=y +# IMX8ULP CCM Clock Driver +CONFIG_CLK_IMX8ULP=y +# IMX93 CCM Clock Driver +CONFIG_CLK_IMX93=y +# TI System Control Interface clock drivers +CONFIG_TI_SCI_CLK=m + +# Clock driver for MediaTek SoC +# Clock driver for MediaTek MT8192 audsys +CONFIG_COMMON_CLK_MT8192_AUDSYS=m +# Clock driver for MediaTek MT8192 camsys +CONFIG_COMMON_CLK_MT8192_CAMSYS=m +# Clock driver for MediaTek MT8192 imgsys +CONFIG_COMMON_CLK_MT8192_IMGSYS=m +# Clock driver for MediaTek MT8192 imp_iic_wrap +CONFIG_COMMON_CLK_MT8192_IMP_IIC_WRAP=m +# Clock driver for MediaTek MT8192 ipesys +CONFIG_COMMON_CLK_MT8192_IPESYS=m +# Clock driver for MediaTek MT8192 mdpsys +CONFIG_COMMON_CLK_MT8192_MDPSYS=m +# Clock driver for MediaTek MT8192 mfgcfg +CONFIG_COMMON_CLK_MT8192_MFGCFG=m +# Clock driver for MediaTek MT8192 mmsys +CONFIG_COMMON_CLK_MT8192_MMSYS=m +# Clock driver for MediaTek MT8192 msdc +CONFIG_COMMON_CLK_MT8192_MSDC=m +# Clock driver for MediaTek MT8192 scp_adsp +CONFIG_COMMON_CLK_MT8192_SCP_ADSP=m +# Clock driver for MediaTek MT8192 vdecsys +CONFIG_COMMON_CLK_MT8192_VDECSYS=m +# Clock driver for MediaTek MT8192 vencsys +CONFIG_COMMON_CLK_MT8192_VENCSYS=m +# Support for Qualcomm's clock controllers +CONFIG_COMMON_CLK_QCOM=m +# MSM8916 A53 PLL +CONFIG_QCOM_A53PLL=m +# MSM8916 APCS Clock Controller +CONFIG_QCOM_CLK_APCS_MSM8916=m +# MSM8996 CPU Clock Controller +CONFIG_QCOM_CLK_APCC_MSM8996=m +# RPM over SMD based Clock Controller +CONFIG_QCOM_CLK_SMD_RPM=m +# RPMh Clock Driver +CONFIG_QCOM_CLK_RPMH=m +# IPQ APSS Clock Controller +CONFIG_IPQ_APSS_6018=m +# IPQ5018 Global Clock Controller +CONFIG_IPQ_GCC_5018=m +# IPQ5332 Global Clock Controller +CONFIG_IPQ_GCC_5332=m +# IPQ6018 Global Clock Controller +CONFIG_IPQ_GCC_6018=m +# IPQ8074 Global Clock Controller +CONFIG_IPQ_GCC_8074=m +# IPQ9574 Global Clock Controller +CONFIG_IPQ_GCC_9574=m +# MSM8916 Global Clock Controller +CONFIG_MSM_GCC_8916=m +# MSM8994 Multimedia Clock Controller +CONFIG_MSM_MMCC_8994=m +# MSM8994 Global Clock Controller +CONFIG_MSM_GCC_8994=m +# MSM8996 Global Clock Controller +CONFIG_MSM_GCC_8996=m +# MSM8996 Multimedia Clock Controller +CONFIG_MSM_MMCC_8996=m +# MSM8998 Global Clock Controller +CONFIG_MSM_GCC_8998=m +# MSM8998 Multimedia Clock Controller +CONFIG_MSM_MMCC_8998=m +# QCM2290 Global Clock Controller +CONFIG_QCM_GCC_2290=m +# QCM2290 Display Clock Controller +CONFIG_QCM_DISPCC_2290=m +# QCS404 Global Clock Controller +CONFIG_QCS_GCC_404=m +# SC8280XP Display Clock Controller +CONFIG_SC_DISPCC_8280XP=m +# SA8775 Global Clock Controller +CONFIG_SA_GCC_8775P=m +# SA8775P Graphics clock controller +CONFIG_SA_GPUCC_8775P=m +# SC7180 Global Clock Controller +CONFIG_SC_GCC_7180=m +# SC7280 Global Clock Controller +CONFIG_SC_GCC_7280=m +# SC8180X Global Clock Controller +CONFIG_SC_GCC_8180X=m +# SC8280XP Global Clock Controller +CONFIG_SC_GCC_8280XP=m +# SC8280XP Graphics Clock Controller +CONFIG_SC_GPUCC_8280XP=m +# SC8280 Low Power Audio Subsystem (LPASS) Clock Controller +CONFIG_SC_LPASSCC_8280XP=m +# SDM845 Camera Clock Controller +CONFIG_SDM_CAMCC_845=m +# SDM845 Graphics Clock Controller +CONFIG_SDM_GPUCC_845=m +# SDM845 Video Clock Controller +CONFIG_SDM_VIDEOCC_845=m +# SDM845 Display Clock Controller +CONFIG_SDM_DISPCC_845=m +# SDM845 Low Power Audio Subsystem (LPAAS) Clock Controller +CONFIG_SDM_LPASSCC_845=m +# SM8250 Camera Clock Controller +CONFIG_SM_CAMCC_8250=m +# SM6115 Display Clock Controller +CONFIG_SM_DISPCC_6115=m +# SM8150/SM8250/SM8350 Display Clock Controller +CONFIG_SM_DISPCC_8250=m +# SM8450 Display Clock Controller +CONFIG_SM_DISPCC_8450=m +# SM8550 Display Clock Controller +CONFIG_SM_DISPCC_8550=m +# SM6115 and SM4250 Global Clock Controller +CONFIG_SM_GCC_6115=m +# SM8350 Global Clock Controller +CONFIG_SM_GCC_8350=m +# SM8450 Global Clock Controller +CONFIG_SM_GCC_8450=m +# SM8550 Global Clock Controller +CONFIG_SM_GCC_8550=m +# SM6115 Graphics Clock Controller +CONFIG_SM_GPUCC_6115=m +# SM8150 Graphics Clock Controller +CONFIG_SM_GPUCC_8150=m +# SM8250 Graphics Clock Controller +CONFIG_SM_GPUCC_8250=m +# SM8550 TCSR Clock Controller +CONFIG_SM_TCSRCC_8550=m +# SM8250 Video Clock Controller +CONFIG_SM_VIDEOCC_8250=m +# High-Frequency PLL (HFPLL) Clock Controller +CONFIG_QCOM_HFPLL=m +# SM8250 GFM LPASS Clocks +CONFIG_CLK_GFM_LPASS_SM8250=m +# Renesas R-Car USB2 clock selector support +CONFIG_CLK_RCAR_USB2_CLOCK_SEL=y diff --git a/bsp/genericarm64/genericarm64-gpio.cfg b/bsp/genericarm64/genericarm64-gpio.cfg new file mode 100644 index 00000000..126b193f --- /dev/null +++ b/bsp/genericarm64/genericarm64-gpio.cfg @@ -0,0 +1,54 @@ +# GPIO Support +# Memory mapped GPIO drivers +# Altera GPIO +CONFIG_GPIO_ALTERA=m +# Cadence GPIO support +CONFIG_GPIO_CADENCE=m +# TI Davinci/Keystone GPIO support +CONFIG_GPIO_DAVINCI=m +# Synopsys DesignWare APB GPIO driver +CONFIG_GPIO_DWAPB=m +# GPIO support for Fujitsu MB86S7x Platforms +CONFIG_GPIO_MB86S7X=m +# MPC512x/MPC8xxx/QorIQ GPIO support +CONFIG_GPIO_MPC8XXX=y +# i.MX GPIO support +CONFIG_GPIO_MXC=m +# PrimeCell PL061 GPIO support +CONFIG_GPIO_PL061=m +# Renesas R-Car and RZ/G GPIO support +CONFIG_GPIO_RCAR=m +# GPIO based on SYSCON +CONFIG_GPIO_SYSCON=m +# Cavium ThunderX/OCTEON-TX GPIO +CONFIG_GPIO_THUNDERX=m +# UniPhier GPIO support +CONFIG_GPIO_UNIPHIER=m +# Toshiba Visconti GPIO support +CONFIG_GPIO_VISCONTI=m +# APM X-Gene GPIO controller support +CONFIG_GPIO_XGENE=y +# APM X-Gene GPIO standby controller support +CONFIG_GPIO_XGENE_SB=m +# Xilinx GPIO support +CONFIG_GPIO_XILINX=m +# Xilinx Zynq GPIO support +CONFIG_GPIO_ZYNQ=m + +# I2C GPIO expanders +# MAX7319, MAX7320-7327 I2C Port Expanders +CONFIG_GPIO_MAX732X=m +# PCA95[357]x, PCA9698, TCA64xx, and MAX7310 I/O ports +CONFIG_GPIO_PCA953X=m +# Interrupt controller support for PCA953x +CONFIG_GPIO_PCA953X_IRQ=y + +# MFD GPIO expanders +# ROHM BD9571 GPIO support +CONFIG_GPIO_BD9571MWV=m +# GPIO support for PMIC MAX77620 and MAX20024 +CONFIG_GPIO_MAX77620=m +# Kontron sl28cpld GPIO support +CONFIG_GPIO_SL28CPLD=m +# TI TPS65086 GPO +CONFIG_GPIO_TPS65086=m diff --git a/bsp/genericarm64/genericarm64-i2c.cfg b/bsp/genericarm64/genericarm64-i2c.cfg new file mode 100644 index 00000000..46777402 --- /dev/null +++ b/bsp/genericarm64/genericarm64-i2c.cfg @@ -0,0 +1,63 @@ +# I2C support +CONFIG_I2C=y + +# I2C device interface +CONFIG_I2C_CHARDEV=y +# I2C bus multiplexing support +CONFIG_I2C_MUX=m + +# Multiplexer I2C Chip support +# NXP PCA954x/PCA984x and Maxim MAX735x/MAX736x I2C Mux/switches +CONFIG_I2C_MUX_PCA954x=m + +# I2C Hardware Bus support +# Broadcom BCM2835 I2C controller +CONFIG_I2C_BCM2835=m +# Cadence I2C Controller +CONFIG_I2C_CADENCE=m +# Synopsys DesignWare Platform +CONFIG_I2C_DESIGNWARE_PLATFORM=m +# GPIO-based bitbanging I2C +CONFIG_I2C_GPIO=m +# IMX I2C interface +CONFIG_I2C_IMX=m +# IMX Low Power I2C interface +CONFIG_I2C_IMX_LPI2C=m +# Amlogic Meson I2C controller +CONFIG_I2C_MESON=m +# MediaTek I2C adapter +CONFIG_I2C_MT65XX=m +# Marvell mv64xxx I2C Controller +CONFIG_I2C_MV64XXX=m +# OMAP I2C adapter +CONFIG_I2C_OMAP=m +# Actions Semiconductor Owl I2C Controller +CONFIG_I2C_OWL=m +# Intel PXA2XX I2C adapter +CONFIG_I2C_PXA=m +# Qualcomm Camera Control Interface +CONFIG_I2C_QCOM_CCI=m +# Qualcomm Technologies Inc.'s GENI based I2C controller +CONFIG_I2C_QCOM_GENI=m +# Qualcomm QUP based I2C controller +CONFIG_I2C_QUP=m +# Renesas RIIC adapter +CONFIG_I2C_RIIC=m +# Rockchip RK3xxx I2C adapter +CONFIG_I2C_RK3X=m +# Renesas RZ/V2M adapter +CONFIG_I2C_RZV2M=m +# S3C/Exynos I2C Driver +CONFIG_I2C_S3C2410=m +# SuperH Mobile I2C Controller +CONFIG_I2C_SH_MOBILE=m +# NVIDIA Tegra internal I2C controller +CONFIG_I2C_TEGRA=m +# UniPhier FIFO-builtin I2C controller +CONFIG_I2C_UNIPHIER_F=m +# Cavium ThunderX I2C bus support +CONFIG_I2C_THUNDERX=m +# Xilinx I2C Controller +CONFIG_I2C_XILINX=m +# Renesas R-Car I2C Controller +CONFIG_I2C_RCAR=m diff --git a/bsp/genericarm64/genericarm64-mmc.cfg b/bsp/genericarm64/genericarm64-mmc.cfg new file mode 100644 index 00000000..7e0489eb --- /dev/null +++ b/bsp/genericarm64/genericarm64-mmc.cfg @@ -0,0 +1,62 @@ +# MMC/SD/SDIO card support +CONFIG_MMC=m +# MMC block device driver +CONFIG_MMC_BLOCK=m +# Number of minors per block device +CONFIG_MMC_BLOCK_MINORS=32 +# ARM AMBA Multimedia Card Interface support +CONFIG_MMC_ARMMMCI=m +# Secure Digital Host Controller Interface support +CONFIG_MMC_SDHCI=m +# SDHCI support for ACPI enumerated SDHCI controllers +CONFIG_MMC_SDHCI_ACPI=m +# SDHCI platform and OF driver helper +CONFIG_MMC_SDHCI_PLTFM=m +# SDHCI OF support for the Arasan SDHCI controllers +CONFIG_MMC_SDHCI_OF_ARASAN=m +# SDHCI OF support for the Freescale eSDHC controller +CONFIG_MMC_SDHCI_OF_ESDHC=m +# SDHCI OF support for the Synopsys DWC MSHC +CONFIG_MMC_SDHCI_OF_DWCMSHC=m +# SDHCI OF support for the MCHP Sparx5 SoC +CONFIG_MMC_SDHCI_OF_SPARX5=m +# SDHCI support for the Cadence SD/SDIO/eMMC controller +CONFIG_MMC_SDHCI_CADENCE=m +# SDHCI support for the Freescale eSDHC/uSDHC i.MX controller +CONFIG_MMC_SDHCI_ESDHC_IMX=m +# SDHCI platform support for the Tegra SD/MMC Controller +CONFIG_MMC_SDHCI_TEGRA=m +# SDHCI support for Fujitsu Semiconductor F_SDH30 +CONFIG_MMC_SDHCI_F_SDH30=m +# Amlogic S905/GX*/AXG SD/MMC Host Controller support +CONFIG_MMC_MESON_GX=m +# Qualcomm SDHCI Controller Support +CONFIG_MMC_SDHCI_MSM=m +# MMC/SD/SDIO over SPI +CONFIG_MMC_SPI=m +# Renesas SDHI SD/SDIO controller support +CONFIG_MMC_SDHI=m +# UniPhier SD/eMMC Host Controller support +CONFIG_MMC_UNIPHIER=m +# Synopsys DesignWare Memory Card Interface +CONFIG_MMC_DW=m +# Exynos specific extensions for Synopsys DW Memory Card Interface +CONFIG_MMC_DW_EXYNOS=m +# Hi3798CV200 specific extensions for Synopsys DW Memory Card Interface +CONFIG_MMC_DW_HI3798CV200=m +# Rockchip specific extensions for Synopsys DW Memory Card Interface +CONFIG_MMC_DW_ROCKCHIP=m +# Allwinner sunxi SD/MMC Host Controller support +CONFIG_MMC_SUNXI=m +# Broadcom BCM2835 SDHOST MMC Controller support +CONFIG_MMC_BCM2835=m +# MediaTek SD/MMC Card Interface support +CONFIG_MMC_MTK=m +# Marvell Xenon eMMC/SD/SDIO SDHCI driver +CONFIG_MMC_SDHCI_XENON=m +# Support for the SDHCI Controller in TI's AM654 SOCs +CONFIG_MMC_SDHCI_AM654=m +# Actions Semi Owl SD/MMC Host Controller support +CONFIG_MMC_OWL=m +# Cavium ThunderX SD/MMC Card Interface support +CONFIG_MMC_CAVIUM_THUNDERX=m diff --git a/bsp/genericarm64/genericarm64-pinctrl.cfg b/bsp/genericarm64/genericarm64-pinctrl.cfg new file mode 100644 index 00000000..89f968e5 --- /dev/null +++ b/bsp/genericarm64/genericarm64-pinctrl.cfg @@ -0,0 +1,110 @@ +# MAX77620/MAX20024 Pincontrol support +CONFIG_PINCTRL_MAX77620=m +# Pinctrl and GPIO driver for RK805 PMIC +CONFIG_PINCTRL_RK805=m +# One-register-per-pin type device tree based pinctrl driver +CONFIG_PINCTRL_SINGLE=m +# Actions Semi OWL pinctrl driver +CONFIG_PINCTRL_OWL=y +# Actions Semi S700 pinctrl driver +CONFIG_PINCTRL_S700=y +# Actions Semi S900 pinctrl driver +CONFIG_PINCTRL_S900=y +# IMX8MM pinctrl driver +CONFIG_PINCTRL_IMX8MM=m +# IMX8MN pinctrl driver +CONFIG_PINCTRL_IMX8MN=m +# IMX8MP pinctrl driver +CONFIG_PINCTRL_IMX8MP=m +# IMX8MQ pinctrl driver +CONFIG_PINCTRL_IMX8MQ=m +# IMX8QM pinctrl driver +CONFIG_PINCTRL_IMX8QM=m +# IMX8QXP pinctrl driver +CONFIG_PINCTRL_IMX8QXP=m +# IMX8DXL pinctrl driver +CONFIG_PINCTRL_IMX8DXL=m +# IMX8ULP pinctrl driver +CONFIG_PINCTRL_IMX8ULP=m +# IMX93 pinctrl driver +CONFIG_PINCTRL_IMX93=m +# Qualcomm core pin controller driver +CONFIG_PINCTRL_MSM=m +# Qualcomm Technologies, Inc. IPQ5018 pin controller driver +CONFIG_PINCTRL_IPQ5018=m +# Qualcomm Technologies Inc IPQ5332 pin controller driver +CONFIG_PINCTRL_IPQ5332=m +# Qualcomm Technologies, Inc. IPQ8074 pin controller driver +CONFIG_PINCTRL_IPQ8074=m +# Qualcomm Technologies, Inc. IPQ6018 pin controller driver +CONFIG_PINCTRL_IPQ6018=m +# Qualcomm Technologies, Inc. IPQ9574 pin controller driver +CONFIG_PINCTRL_IPQ9574=m +# Qualcomm 8916 pin controller driver +CONFIG_PINCTRL_MSM8916=m +# Qualcomm 8953 pin controller driver +CONFIG_PINCTRL_MSM8953=m +# Qualcomm 8976 pin controller driver +CONFIG_PINCTRL_MSM8976=m +# Qualcomm 8994 pin controller driver +CONFIG_PINCTRL_MSM8994=m +# Qualcomm MSM8996 pin controller driver +CONFIG_PINCTRL_MSM8996=m +# Qualcomm MSM8998 pin controller driver +CONFIG_PINCTRL_MSM8998=m +# Qualcomm QCM2290 pin controller driver +CONFIG_PINCTRL_QCM2290=m +# Qualcomm QCS404 pin controller driver +CONFIG_PINCTRL_QCS404=m +# Qualcomm Technologies QDF2xxx pin controller driver +CONFIG_PINCTRL_QDF2XXX=m +# Qualcomm Technologies Inc QDU1000/QRU1000 pin controller driver +CONFIG_PINCTRL_QDU1000=m +# Qualcomm Technologies Inc SA8775P pin controller driver +CONFIG_PINCTRL_SA8775P=m +# Qualcomm Technologies Inc SC7180 pin controller driver +CONFIG_PINCTRL_SC7180=m +# Qualcomm Technologies Inc SC7280 pin controller driver +CONFIG_PINCTRL_SC7280=m +# Qualcomm Technologies Inc SC8180x pin controller driver +CONFIG_PINCTRL_SC8180X=m +# Qualcomm Technologies Inc SC8280xp pin controller driver +CONFIG_PINCTRL_SC8280XP=m +# Qualcomm Technologies Inc SDM660 pin controller driver +CONFIG_PINCTRL_SDM660=m +# Qualcomm Technologies Inc SDM670 pin controller driver +CONFIG_PINCTRL_SDM670=m +# Qualcomm Technologies Inc SDM845 pin controller driver +CONFIG_PINCTRL_SDM845=m +# Qualcomm Technologies Inc SM6115,SM4250 pin controller driver +CONFIG_PINCTRL_SM6115=m +# Qualcomm Technologies Inc SM6125 pin controller driver +CONFIG_PINCTRL_SM6125=m +# Qualcomm Technologies Inc SM6350 pin controller driver +CONFIG_PINCTRL_SM6350=m +# Qualcomm Technologies Inc SM6375 pin controller driver +CONFIG_PINCTRL_SM6375=m +# Qualcomm Technologies Inc SM8150 pin controller driver +CONFIG_PINCTRL_SM8150=m +# Qualcomm Technologies Inc SM8250 pin controller driver +CONFIG_PINCTRL_SM8250=m +# Qualcomm Technologies Inc SM8350 pin controller driver +CONFIG_PINCTRL_SM8350=m +# Qualcomm Technologies Inc SM8450 pin controller driver +CONFIG_PINCTRL_SM8450=m +# Qualcomm Technologies Inc SM8550 pin controller driver +CONFIG_PINCTRL_SM8550=m +# Qualcomm SPMI PMIC pin controller driver +CONFIG_PINCTRL_QCOM_SPMI_PMIC=m +# Qualcomm Technologies Inc LPASS LPI pin controller driver +CONFIG_PINCTRL_LPASS_LPI=m +# Qualcomm Technologies Inc SC7280 LPASS LPI pin controller driver +CONFIG_PINCTRL_SC7280_LPASS_LPI=m +# Qualcomm Technologies Inc SM8250 LPASS LPI pin controller driver +CONFIG_PINCTRL_SM8250_LPASS_LPI=m +# Qualcomm Technologies Inc SM8450 LPASS LPI pin controller driver +CONFIG_PINCTRL_SM8450_LPASS_LPI=m +# Qualcomm Technologies Inc SC8280XP LPASS LPI pin controller driver +CONFIG_PINCTRL_SC8280XP_LPASS_LPI=m +# Qualcomm Technologies Inc SM8550 LPASS LPI pin controller driver +CONFIG_PINCTRL_SM8550_LPASS_LPI=m diff --git a/bsp/genericarm64/genericarm64-regulator.cfg b/bsp/genericarm64/genericarm64-regulator.cfg new file mode 100644 index 00000000..d6102c60 --- /dev/null +++ b/bsp/genericarm64/genericarm64-regulator.cfg @@ -0,0 +1,64 @@ +# Voltage and Current Regulator Support +CONFIG_REGULATOR=y +# Fixed voltage regulator support +CONFIG_REGULATOR_FIXED_VOLTAGE=m +# X-POWERS AXP20X PMIC Regulators +CONFIG_REGULATOR_AXP20X=m +# ROHM BD71837 Power Regulator +CONFIG_REGULATOR_BD718XX=m +# ROHM BD9571MWV Regulators +CONFIG_REGULATOR_BD9571MWV=m +# Fairchild FAN53555 Regulator +CONFIG_REGULATOR_FAN53555=m +# GPIO regulator support +CONFIG_REGULATOR_GPIO=m +# HiSilicon Hi6421v530 PMIC voltage regulator support +CONFIG_REGULATOR_HI6421V530=m +# Hisilicon HI655X PMIC regulators support +CONFIG_REGULATOR_HI655X=m +# Maxim 77620/MAX20024 voltage regulator +CONFIG_REGULATOR_MAX77620=m +# Maxim MAX8973A voltage regulator +CONFIG_REGULATOR_MAX8973=m +# MPS MP8859 regulator driver +CONFIG_REGULATOR_MP8859=m +# MediaTek MT6315 PMIC +CONFIG_REGULATOR_MT6315=m +# MediaTek MT6357 PMIC +CONFIG_REGULATOR_MT6357=m +# MediaTek MT6358 PMIC +CONFIG_REGULATOR_MT6358=m +# MediaTek MT6359 PMIC +CONFIG_REGULATOR_MT6359=m +# MT6360 SubPMIC Regulator +CONFIG_REGULATOR_MT6360=m +# MediaTek MT6397 PMIC +CONFIG_REGULATOR_MT6397=m +# NXP PCA9450A/PCA9450B/PCA9450C regulator driver +CONFIG_REGULATOR_PCA9450=m +# NXP PF8100/PF8121A/PF8200 regulator driver +CONFIG_REGULATOR_PF8X00=m +# Freescale PFUZE100/200/3000/3001 regulator driver +CONFIG_REGULATOR_PFUZE100=m +# PWM voltage regulator +CONFIG_REGULATOR_PWM=m +# Qualcomm Technologies, Inc. RPMh regulator driver +CONFIG_REGULATOR_QCOM_RPMH=m +# Qualcomm SMD based RPM regulator driver +CONFIG_REGULATOR_QCOM_SMD_RPM=m +# Qualcomm SPMI regulator driver +CONFIG_REGULATOR_QCOM_SPMI=m +# Renesas RAA215300 driver +CONFIG_REGULATOR_RAA215300=m +# Rockchip RK805/RK808/RK809/RK817/RK818 Power regulators +CONFIG_REGULATOR_RK808=m +# Samsung S2MPS11/13/14/15/S2MPU02 voltage regulator +CONFIG_REGULATOR_S2MPS11=m +# TI TPS65132 Dual Output Power regulators +CONFIG_REGULATOR_TPS65132=m +# TI TPS65219 Power regulators +CONFIG_REGULATOR_TPS65219=m +# TI TPS6594 Power regulators +CONFIG_REGULATOR_TPS6594=m +# Voltage controlled regulators +CONFIG_REGULATOR_VCTRL=m diff --git a/bsp/genericarm64/genericarm64-remoteproc.cfg b/bsp/genericarm64/genericarm64-remoteproc.cfg new file mode 100644 index 00000000..aba5fba4 --- /dev/null +++ b/bsp/genericarm64/genericarm64-remoteproc.cfg @@ -0,0 +1,35 @@ +# Remoteproc drivers +# Support for Remote Processor subsystem +CONFIG_REMOTEPROC=y +# i.MX remoteproc support +CONFIG_IMX_REMOTEPROC=m +# Mediatek SCP support +CONFIG_MTK_SCP=m +# Qualcomm Technology Inc ADSP Peripheral Image Loader +CONFIG_QCOM_Q6V5_ADSP=m +# Qualcomm Hexagon V5 self-authenticating modem subsystem support +CONFIG_QCOM_Q6V5_MSS=m +# Qualcomm Hexagon v5 Peripheral Authentication Service support +CONFIG_QCOM_Q6V5_PAS=m +# Qualcomm sysmon driver +CONFIG_QCOM_SYSMON=m +# Qualcomm WCNSS Peripheral Image Loader +CONFIG_QCOM_WCNSS_PIL=m +# TI K3 DSP remoteproc support +CONFIG_TI_K3_DSP_REMOTEPROC=m +# TI K3 R5 remoteproc support +CONFIG_TI_K3_R5_REMOTEPROC=m +# TI PRU remoteproc support +CONFIG_PRU_REMOTEPROC=m + +# Rpmsg drivers +# RPMSG device interface +CONFIG_RPMSG_CHAR=m +# RPMSG control interface +CONFIG_RPMSG_CTRL=m +# Qualcomm RPM Glink driver +CONFIG_RPMSG_QCOM_GLINK_RPM=y +# Qualcomm SMEM Glink driver +CONFIG_RPMSG_QCOM_GLINK_SMEM=m +# Qualcomm Shared Memory Driver (SMD) +CONFIG_RPMSG_QCOM_SMD=y diff --git a/bsp/genericarm64/genericarm64-serial.cfg b/bsp/genericarm64/genericarm64-serial.cfg new file mode 100644 index 00000000..4d565dbc --- /dev/null +++ b/bsp/genericarm64/genericarm64-serial.cfg @@ -0,0 +1,72 @@ +# Serial drivers + +# 8250/16550 and compatible serial support +CONFIG_SERIAL_8250=m +# Console on 8250/16550 and compatible serial port +CONFIG_SERIAL_8250_CONSOLE=m +# Extended 8250/16550 serial driver options +CONFIG_SERIAL_8250_EXTENDED=y +# Support for sharing serial interrupts +CONFIG_SERIAL_8250_SHARE_IRQ=y +# BCM2835 auxiliar mini UART support +CONFIG_SERIAL_8250_BCM2835AUX=y +# Support for Synopsys DesignWare 8250 quirks +CONFIG_SERIAL_8250_DW=m +# Support for Emma Mobile integrated serial port +CONFIG_SERIAL_8250_EM=m +# Support for OMAP internal UART (8250 based driver) +CONFIG_SERIAL_8250_OMAP=m +# Mediatek serial port support +CONFIG_SERIAL_8250_MT6577=m +# Support for UniPhier on-chip UART +CONFIG_SERIAL_8250_UNIPHIER=m +# Devicetree based probing for 8250 ports +CONFIG_SERIAL_OF_PLATFORM=m +# ARM AMBA PL011 serial port support +CONFIG_SERIAL_AMBA_PL011=y +# Support for console on AMBA serial port +CONFIG_SERIAL_AMBA_PL011_CONSOLE=y +# Meson serial port support +CONFIG_SERIAL_MESON=m +# Support for console on meson +CONFIG_SERIAL_MESON_CONSOLE=y +# Samsung SoC serial support +CONFIG_SERIAL_SAMSUNG=m +# Support for console on Samsung SoC serial port +CONFIG_SERIAL_SAMSUNG_CONSOLE=y +# IMX serial port support +CONFIG_SERIAL_IMX=m +# Console on IMX serial port +CONFIG_SERIAL_IMX_CONSOLE=m +# SuperH SCI(F) serial port support +CONFIG_SERIAL_SH_SCI=m +# MSM on-chip serial port support +CONFIG_SERIAL_MSM=y +# MSM serial console support +CONFIG_SERIAL_MSM_CONSOLE=y +# QCOM on-chip GENI based serial port support +CONFIG_SERIAL_QCOM_GENI=m +# QCOM GENI Serial Console support +CONFIG_SERIAL_QCOM_GENI_CONSOLE=y +# Cadence (Xilinx Zynq) UART support +CONFIG_SERIAL_XILINX_PS_UART=y +# Cadence UART console support +CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y +# Freescale lpuart serial port support +CONFIG_SERIAL_FSL_LPUART=y +# Console on Freescale lpuart serial port +CONFIG_SERIAL_FSL_LPUART_CONSOLE=y +# Freescale LINFlexD UART serial port support +CONFIG_SERIAL_FSL_LINFLEXUART=y +# Console on Freescale LINFlexD UART serial port +CONFIG_SERIAL_FSL_LINFLEXUART_CONSOLE=y +# STMicroelectronics STM32 serial port support +CONFIG_SERIAL_STM32=y +# Support for console on STM32 +CONFIG_SERIAL_STM32_CONSOLE=y +# Marvell EBU serial port support +CONFIG_SERIAL_MVEBU_UART=y +# Actions Semi Owl serial port support +CONFIG_SERIAL_OWL=m +# Serial device bus +CONFIG_SERIAL_DEV_BUS=m diff --git a/bsp/genericarm64/genericarm64-standard.scc b/bsp/genericarm64/genericarm64-standard.scc new file mode 100644 index 00000000..25598192 --- /dev/null +++ b/bsp/genericarm64/genericarm64-standard.scc @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: MIT +define KMACHINE genericarm64 +define KTYPE standard +define KARCH arm64 + +include ktypes/standard/standard.scc + +include genericarm64.scc + +# default policy for standard kernels +include features/profiling/profiling.scc diff --git a/bsp/genericarm64/genericarm64.cfg b/bsp/genericarm64/genericarm64.cfg new file mode 100644 index 00000000..a782dac5 --- /dev/null +++ b/bsp/genericarm64/genericarm64.cfg @@ -0,0 +1,994 @@ +CONFIG_ARM64=y + +# Kernel Features +# Virtual address space size +# 48-bit +CONFIG_ARM64_VA_BITS_48=y +# Multi-core scheduler support +CONFIG_SCHED_MC=y +# SMT scheduler support +CONFIG_SCHED_SMT=y +# Enable the tagged user addresses syscall ABI +CONFIG_ARM64_TAGGED_ADDR_ABI=y + +# ARMv8.1 architectural features +# Support for hardware updates of the Access and Dirty page flags +CONFIG_ARM64_HW_AFDBM=y +# Enable support for Privileged Access Never (PAN) +CONFIG_ARM64_PAN=y +CONFIG_ARM64_LSE_ATOMICS=y +# Atomic instructions +CONFIG_ARM64_USE_LSE_ATOMICS=y + +# ARMv8.2 architectural features +# Enable support for RAS CPU Extensions +CONFIG_ARM64_RAS_EXTN=y +# Enable support for Common Not Private (CNP) translations +CONFIG_ARM64_CNP=y +# ARM Scalable Vector Extension support +CONFIG_ARM64_SVE=y +# ARM Scalable Matrix Extension support +CONFIG_ARM64_SME=y + +# Boot options +# UEFI runtime support +CONFIG_EFI=y +# Enable support for SMBIOS (DMI) tables +CONFIG_DMI=y + +# Power management options +# Enable workqueue power-efficient mode by default +CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y +# Energy Model for devices with DVFS (CPUs, GPUs, etc) +CONFIG_ENERGY_MODEL=y + +# CPU Power Management +# CPU Idle +# ARM CPU Idle Drivers +# PSCI CPU idle Driver +CONFIG_ARM_PSCI_CPUIDLE=y + +# CPU Frequency scaling +# 'powersave' governor +CONFIG_CPU_FREQ_GOV_POWERSAVE=m +# 'userspace' governor for userspace frequency scaling +CONFIG_CPU_FREQ_GOV_USERSPACE=m +# 'ondemand' cpufreq policy governor +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +# 'conservative' cpufreq governor +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m +# Generic DT based cpufreq driver +CONFIG_CPUFREQ_DT=m +# CPUFreq driver based on the ACPI CPPC spec +CONFIG_ACPI_CPPC_CPUFREQ=m +# Allwinner nvmem based SUN50I CPUFreq driver +CONFIG_ARM_ALLWINNER_SUN50I_CPUFREQ_NVMEM=m +# Armada 37xx CPUFreq support +CONFIG_ARM_ARMADA_37XX_CPUFREQ=m +# SCPI based CPUfreq driver +CONFIG_ARM_SCPI_CPUFREQ=m +# Freescale i.MX8M cpufreq support +CONFIG_ARM_IMX_CPUFREQ_DT=m +# CPU Frequency scaling support for MediaTek SoCs +CONFIG_ARM_MEDIATEK_CPUFREQ=m +# Qualcomm nvmem based CPUFreq +CONFIG_ARM_QCOM_CPUFREQ_NVMEM=m +# QCOM CPUFreq HW driver +CONFIG_ARM_QCOM_CPUFREQ_HW=m +# Raspberry Pi cpufreq support +CONFIG_ARM_RASPBERRYPI_CPUFREQ=m +# SCMI based CPUfreq driver +CONFIG_ARM_SCMI_CPUFREQ=m +# Texas Instruments CPUFreq support +CONFIG_ARM_TI_CPUFREQ=y +# CPU frequency scaling driver for Freescale QorIQ SoCs +CONFIG_QORIQ_CPUFREQ=m + +# ACPI (Advanced Configuration and Power Interface) Support +CONFIG_ACPI=y + +# Memory Management options +# Contiguous Memory Allocator +CONFIG_CMA=y + +# Networking support +# CAN bus subsystem support +CONFIG_CAN=m + +# Device Drivers +# PCI support +# PCI controller drivers +# Cavium Thunder PCIe controller to off-chip devices +CONFIG_PCI_HOST_THUNDER_PEM=y +# Cavium Thunder ECAM controller to on-chip devices on pass-1.x silicon +CONFIG_PCI_HOST_THUNDER_ECAM=y +# Generic PCI host controller +CONFIG_PCI_HOST_GENERIC=m +# Xilinx AXI PCIe controller +CONFIG_PCIE_XILINX=y +# Xilinx NWL PCIe controller +CONFIG_PCIE_XILINX_NWL=y + +# DesignWare-based PCIe controllers +# Freescale i.MX6/7/8 PCIe controller (host mode) +CONFIG_PCI_IMX6_HOST=y +# Freescale Layerscape PCIe controller (host mode) +CONFIG_PCI_LAYERSCAPE=y + +# Bus devices + +CONFIG_ARM_CCI=y +CONFIG_ARM_CCI400_COMMON=y +# TI sysc interconnect target module driver +CONFIG_TI_SYSC=y +# QorIQ DPAA2 fsl-mc bus driver +CONFIG_FSL_MC_BUS=y + +# Firmware Drivers +# ARM System Control and Management Interface Protocol +# ARM System Control and Management Interface (SCMI) Message Protocol +CONFIG_ARM_SCMI_PROTOCOL=y +# ARM System Control and Power Interface (SCPI) Message Protocol +CONFIG_ARM_SCPI_PROTOCOL=y +# Raspberry Pi Firmware Driver +CONFIG_RASPBERRYPI_FIRMWARE=y +# IMX SCU Protocol driver +CONFIG_IMX_SCU=y +# IMX SCU Power Domain driver +CONFIG_IMX_SCU_PD=y + +# Memory Technology Device (MTD) support +# RAM/ROM/Flash chip drivers +# Detect flash chips by Common Flash Interface (CFI) probe +CONFIG_MTD_CFI=m + +# NAND +# Raw/Parallel NAND Device Support +CONFIG_MTD_RAW_NAND=y +# Denali NAND controller as a DT device +CONFIG_MTD_NAND_DENALI_DT=y +# Marvell EBU NAND controller +CONFIG_MTD_NAND_MARVELL=y +# Broadcom STB NAND controller +CONFIG_MTD_NAND_BRCMNAND=m +# Freescale IFC NAND controller +CONFIG_MTD_NAND_FSL_IFC=y +# QCOM NAND controller +CONFIG_MTD_NAND_QCOM=y + +# SPI NOR device support +CONFIG_MTD_SPI_NOR=y + +# Enable UBI - Unsorted block images +CONFIG_MTD_UBI=m + +# Misc devices +# EEPROM support +# I2C EEPROMs / RAMs / ROMs from most vendors +CONFIG_EEPROM_AT24=m +# SPI EEPROMs (FRAMs) from most vendors +CONFIG_EEPROM_AT25=m + +# Serial ATA and Parallel ATA drivers (libata) +CONFIG_ATA=m +# AHCI SATA support +CONFIG_SATA_AHCI=m +# Platform AHCI SATA support +CONFIG_SATA_AHCI_PLATFORM=m + +# Network device support +# Ethernet driver support +# Cadence MACB/GEM support +CONFIG_MACB=m +# Use IEEE 1588 hwstamp +CONFIG_MACB_USE_HWSTAMP=y +# FEC ethernet controller (of ColdFire and some i.MX CPUs) +CONFIG_FEC=m +# ENETC PF driver +CONFIG_FSL_ENETC=m +# ENETC VF driver +CONFIG_FSL_ENETC_VF=m +# Intel(R) PRO/1000 Gigabit Ethernet support +CONFIG_E1000=m +# Intel(R) PRO/1000 PCI-Express Gigabit Ethernet support +CONFIG_E1000E=m +# Marvell OcteonTX2 RVU Admin Function driver +CONFIG_OCTEONTX2_AF=m +# Marvell OcteonTX2 NIC Physical Function driver +CONFIG_OCTEONTX2_PF=m +# Marvell OcteonTX2 NIC Virtual Function driver +CONFIG_OCTEONTX2_VF=m +# STMicroelectronics Multi-Gigabit Ethernet driver +CONFIG_STMMAC_ETH=m +# TI K3 AM654x/J721E CPSW Ethernet driver +CONFIG_TI_K3_AM65_CPSW_NUSS=m +# Xilinx 10/100 Ethernet Lite support +CONFIG_XILINX_EMACLITE=m +# Xilinx 10/100/1000 AXI Ethernet support +CONFIG_XILINX_AXI_EMAC=m +# Xilinx LL TEMAC (LocalLink Tri-mode Ethernet MAC) driver +CONFIG_XILINX_LL_TEMAC=m + +# PHY Device support and infrastructure +CONFIG_PHYLINK=m +# Amlogic Meson GXL Internal PHY +CONFIG_MESON_GXL_PHY=m +# Aquantia PHYs +CONFIG_AQUANTIA_PHY=m +# Broadcom BCM54140 PHY +CONFIG_BCM54140_PHY=m +# Marvell Alaska PHYs +CONFIG_MARVELL_PHY=m +# Marvell Alaska 10Gbit PHYs +CONFIG_MARVELL_10G_PHY=m +# Micrel PHYs +CONFIG_MICREL_PHY=m +# Microsemi PHYs +CONFIG_MICROSEMI_PHY=m +# Qualcomm Atheros AR803X PHYs and QCA833x PHYs +CONFIG_AT803X_PHY=m +# Realtek PHYs +CONFIG_REALTEK_PHY=m +# Rockchip Ethernet PHYs +CONFIG_ROCKCHIP_PHY=m +# Texas Instruments DP83867 Gigabit PHY +CONFIG_DP83867_PHY=m +# Texas Instruments DP83869 Gigabit PHY +CONFIG_DP83869_PHY=m +# Texas Instruments DP83TD510 Ethernet 10Base-T1L PHY +CONFIG_DP83TD510_PHY=m +# Vitesse PHYs +CONFIG_VITESSE_PHY=m +# Xilinx GMII2RGMII converter driver +CONFIG_XILINX_GMII2RGMII=m + +# CAN Device Drivers +CONFIG_CAN_DEV=m +# CAN device drivers with Netlink support +CONFIG_CAN_NETLINK=y +# Xilinx CAN +CONFIG_CAN_XILINXCAN=m + +# MDIO bus device drivers +# GPIO lib-based bitbanged MDIO buses +CONFIG_MDIO_GPIO=m +# ThunderX SOCs MDIO buses +CONFIG_MDIO_THUNDER=m +# MDIO bus multiplexer using kernel multiplexer subsystem +CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y +# MMIO device-controlled MDIO bus multiplexers +CONFIG_MDIO_BUS_MUX_MMIOREG=y + +# Wireless LAN +# Atheros 802.11ac wireless cards support +CONFIG_ATH10K=m +# Atheros ath10k PCI support +CONFIG_ATH10K_PCI=m +# Atheros ath10k SDIO support +CONFIG_ATH10K_SDIO=m +# Qualcomm ath10k SNOC support +CONFIG_ATH10K_SNOC=m +# Qualcomm Atheros WCN3660/3680 support +CONFIG_WCN36XX=m +# Qualcomm Technologies 802.11ax chipset support +CONFIG_ATH11K=m +# Atheros ath11k AHB support +CONFIG_ATH11K_AHB=m +# Atheros ath11k PCI support +CONFIG_ATH11K_PCI=m +# Broadcom FullMAC WLAN driver +CONFIG_BRCMFMAC=m +# Marvell WiFi-Ex Driver +CONFIG_MWIFIEX=m +# Marvell WiFi-Ex Driver for SD8786/SD8787/SD8797/SD8887/SD8897/SD8977/SD8978/SD8987/SD8997 +CONFIG_MWIFIEX_SDIO=m +# Marvell WiFi-Ex Driver for PCIE 8766/8897/8997 +CONFIG_MWIFIEX_PCIE=m +# MediaTek MT7921E (PCIe) support +CONFIG_MT7921E=m +# Redpine Signals Inc 91x WLAN driver support +CONFIG_RSI_91X=m +# TI wl18xx support +CONFIG_WL18XX=m +# TI wlcore support +CONFIG_WLCORE=m +# TI wlcore SDIO support +CONFIG_WLCORE_SDIO=m + +# Input device support +# Miscellaneous devices +# TPS65219 Power button driver +CONFIG_INPUT_TPS65219_PWRBUTTON=m + +# Character devices +# TPM Hardware Support +CONFIG_TCG_TPM=m +# TPM HW Random Number Generator support +CONFIG_HW_RANDOM_TPM=y +# TPM Interface Specification 1.3 Interface / TPM 2.0 FIFO Interface - (SPI) +CONFIG_TCG_TIS_SPI=m +# Cr50 SPI Interface +CONFIG_TCG_TIS_SPI_CR50=y + +# SPI support +# Marvell Armada 3700 SPI Controller +CONFIG_SPI_ARMADA_3700=m +# BCM2835 SPI controller +CONFIG_SPI_BCM2835=m +# BCM2835 SPI auxiliary controller +CONFIG_SPI_BCM2835AUX=m +# Cadence SPI controller +CONFIG_SPI_CADENCE=m +# Cadence Quad SPI controller +CONFIG_SPI_CADENCE_QUADSPI=m +# Cadence XSPI controller +CONFIG_SPI_CADENCE_XSPI=m +# DesignWare SPI controller core support +CONFIG_SPI_DESIGNWARE=m +# DMA support for DW SPI controller +CONFIG_SPI_DW_DMA=y +# Memory-mapped io interface driver for DW SPI core +CONFIG_SPI_DW_MMIO=m +# Freescale i.MX LPSPI controller +CONFIG_SPI_FSL_LPSPI=m +# Freescale QSPI controller +CONFIG_SPI_FSL_QUADSPI=m +# NXP Flex SPI controller +CONFIG_SPI_NXP_FLEXSPI=m +# Freescale i.MX SPI controllers +CONFIG_SPI_IMX=m +# Freescale DSPI controller +CONFIG_SPI_FSL_DSPI=m +# Amlogic Meson SPICC controller +CONFIG_SPI_MESON_SPICC=m +# Amlogic Meson SPIFC controller +CONFIG_SPI_MESON_SPIFC=m +# MediaTek SPI controller +CONFIG_SPI_MT65XX=m +# MediaTek SPI NOR controller +CONFIG_SPI_MTK_NOR=m +# McSPI driver for OMAP +CONFIG_SPI_OMAP24XX=m +# Orion SPI master +CONFIG_SPI_ORION=m +# ARM AMBA PL022 SSP controller +CONFIG_SPI_PL022=m +# Rockchip SPI controller driver +CONFIG_SPI_ROCKCHIP=m +# Rockchip Serial Flash Controller (SFC) +CONFIG_SPI_ROCKCHIP_SFC=m +# Renesas RSPI/QSPI controller +CONFIG_SPI_RSPI=m +# Renesas RZ/V2M CSI controller +CONFIG_SPI_RZV2M_CSI=m +# QTI QSPI controller +CONFIG_SPI_QCOM_QSPI=m +# Qualcomm SPI controller with QUP interface +CONFIG_SPI_QUP=m +# Qualcomm GENI based SPI controller +CONFIG_SPI_QCOM_GENI=m +# Samsung S3C64XX/Exynos SoC series type SPI +CONFIG_SPI_S3C64XX=m +# SuperH MSIOF SPI controller +CONFIG_SPI_SH_MSIOF=m +# Allwinner A31 SPI controller +CONFIG_SPI_SUN6I=m +# NVIDIA Tegra QSPI Controller +CONFIG_SPI_TEGRA210_QUAD=m +# Cavium ThunderX SPI controller +CONFIG_SPI_THUNDERX=m +# Xilinx SPI controller common module +CONFIG_SPI_XILINX=m +# Xilinx ZynqMP GQSPI controller +CONFIG_SPI_ZYNQMP_GQSPI=m +# User mode SPI device driver support +CONFIG_SPI_SPIDEV=m + +# SPMI support +CONFIG_SPMI=y + +# Hardware Monitoring support +# PWM fan +CONFIG_SENSORS_PWM_FAN=m + +# Thermal drivers +# Temperature sensor driver for Freescale i.MX8MM SoC +CONFIG_IMX8MM_THERMAL=m +# Texas Instruments K3 thermal support +CONFIG_K3_THERMAL=m + +# Watchdog Timer Support +CONFIG_WATCHDOG=y +# Xilinx Watchdog timer +CONFIG_XILINX_WATCHDOG=m +# Kontron sl28cpld Watchdog +CONFIG_SL28CPLD_WATCHDOG=m +# ARM SP805 Watchdog +CONFIG_ARM_SP805_WATCHDOG=m +# ARM SBSA Generic Watchdog +CONFIG_ARM_SBSA_WATCHDOG=m +# Cadence Watchdog Timer +CONFIG_CADENCE_WATCHDOG=m +# S3C6410/S5Pv210/Exynos Watchdog +CONFIG_S3C2410_WATCHDOG=m +# Synopsys DesignWare watchdog +CONFIG_DW_WATCHDOG=m +# Texas Instruments K3 RTI watchdog +CONFIG_K3_RTI_WATCHDOG=m +# Allwinner SoCs watchdog support +CONFIG_SUNXI_WATCHDOG=m +# Nuvoton NPCM750 watchdog +CONFIG_NPCM7XX_WATCHDOG=m +# IMX2+ Watchdog +CONFIG_IMX2_WDT=m +# IMX SC Watchdog +CONFIG_IMX_SC_WDT=m +# IMX7ULP Watchdog +CONFIG_IMX7ULP_WDT=m +# QCOM watchdog +CONFIG_QCOM_WDT=m +# Amlogic Meson GXBB SoCs watchdog support +CONFIG_MESON_GXBB_WATCHDOG=m +# Amlogic Meson SoCs watchdog support +CONFIG_MESON_WATCHDOG=m +# ARM Secure Monitor Call based watchdog support +CONFIG_ARM_SMC_WATCHDOG=m +# Renesas WDT Watchdog +CONFIG_RENESAS_WDT=m +# Renesas RZ/G2L WDT Watchdog +CONFIG_RENESAS_RZG2LWDT=m +# UniPhier watchdog support +CONFIG_UNIPHIER_WATCHDOG=m +# QCOM PM8916 pmic watchdog +CONFIG_PM8916_WATCHDOG=m +# Broadcom BCM2835 hardware watchdog +CONFIG_BCM2835_WDT=m +# BCM63xx/BCM7038 Watchdog +CONFIG_BCM7038_WDT=m + +# Multifunction device drivers +# Altera SOCFPGA System Manager +CONFIG_MFD_ALTERA_SYSMGR=y +# ROHM BD9571MWV PMIC +CONFIG_MFD_BD9571MWV=m +# X-Powers AXP series PMICs with I2C +CONFIG_MFD_AXP20X_I2C=m +# X-Powers AXP series PMICs with RSB +CONFIG_MFD_AXP20X_RSB=m +# Samsung Exynos SoC Low Power Audio Subsystem +CONFIG_MFD_EXYNOS_LPASS=m +# HiSilicon Hi6421 PMU/Codec IC +CONFIG_MFD_HI6421_PMIC=m +# HiSilicon Hi655X series PMU/Codec IC +CONFIG_MFD_HI655X_PMIC=m +# Maxim Semiconductor MAX77620 and MAX20024 PMIC Support +CONFIG_MFD_MAX77620=y +# Mediatek MT6360 SubPMIC +CONFIG_MFD_MT6360=m +# MediaTek MT6397 PMIC Support +CONFIG_MFD_MT6397=m +# Qualcomm SPMI PMICs +CONFIG_MFD_SPMI_PMIC=m +# Rockchip RK805/RK808/RK809/RK817/RK818 Power Management Chip +CONFIG_MFD_RK8XX_I2C=m +# Rockchip RK806 Power Management Chip +CONFIG_MFD_RK8XX_SPI=m +# Samsung Electronics PMIC Series Support +CONFIG_MFD_SEC_CORE=m +# Kontron sl28cpld Board Management Controller +CONFIG_MFD_SL28CPLD=m +# TI ADC / Touch Screen chip support +CONFIG_MFD_TI_AM335X_TSCADC=m +# TI TPS65086 Power Management Integrated Chips (PMICs) +CONFIG_MFD_TPS65086=m +# TI TPS65219 Power Management IC +CONFIG_MFD_TPS65219=m +# TI TPS6594 Power Management chip with I2C +CONFIG_MFD_TPS6594_I2C=m +# ROHM BD71837 Power Management IC +CONFIG_MFD_ROHM_BD718XX=m + +# Graphics support +# DRM DP AUX Interface +CONFIG_DRM_DP_AUX_CHARDEV=y +# Enable DisplayPort CEC-Tunneling-over-AUX HDMI support +CONFIG_DRM_DP_CEC=y + +# Display Interface Bridges +# Display connector support +CONFIG_DRM_DISPLAY_CONNECTOR=m +# ITE IT66121 HDMI bridge +CONFIG_DRM_ITE_IT66121=m +# LIMA (DRM support for ARM Mali 400/450 GPU) +CONFIG_DRM_LIMA=m +# DRM Support for TI Keystone +CONFIG_DRM_TIDSS=m +# ZynqMP DisplayPort Controller Driver +CONFIG_DRM_ZYNQMP_DPSUB=m + +# Sound card support +# Advanced Linux Sound Architecture +# ALSA for SoC audio support +CONFIG_SND_SOC=m + +# Audio support for Texas Instruments SoCs +# Multichannel Audio Serial Port (McASP) support +CONFIG_SND_SOC_DAVINCI_MCASP=m + +# CODEC drivers +# Dialog DA7213 CODEC +CONFIG_SND_SOC_DA7213=m + +# USB support +# OTG support +CONFIG_USB_OTG=y +# DesignWare USB3 DRD Core Support +CONFIG_USB_DWC3=m +# Texas Instruments AM62 Platforms +CONFIG_USB_DWC3_AM62=m +# ChipIdea Highspeed Dual Role Controller +CONFIG_USB_CHIPIDEA=m +# ChipIdea device controller +CONFIG_USB_CHIPIDEA_UDC=y +# ChipIdea host controller +CONFIG_USB_CHIPIDEA_HOST=y +# Onboard USB hub support +CONFIG_USB_ONBOARD_HUB=m + +# USB Physical Layer drivers +# NOP USB Transceiver Driver +CONFIG_NOP_USB_XCEIV=m +# Freescale MXS USB PHY support +CONFIG_USB_MXS_PHY=m + +# USB Gadget Support +CONFIG_USB_GADGET=m + +# USB Peripheral Controller +# Xilinx USB Driver +CONFIG_USB_GADGET_XILINX=m + +# USB Type-C Support +CONFIG_TYPEC=m +# USB Type-C Port Controller Manager +CONFIG_TYPEC_TCPM=m +# Type-C Port Controller Interface driver +CONFIG_TYPEC_TCPCI=m +# Fairchild FUSB302 Type-C chip driver +CONFIG_TYPEC_FUSB302=m +# USB Type-C Connector System Software Interface driver +CONFIG_TYPEC_UCSI=m +# UCSI Interface Driver for Cypress CCGx +CONFIG_UCSI_CCG=m +# UCSI Qualcomm PMIC GLINK Interface Driver +CONFIG_UCSI_PMIC_GLINK=m +# TI TPS6598x USB Power Delivery controller driver +CONFIG_TYPEC_TPS6598X=m +# TI HD3SS3220 Type-C DRP Port controller driver +CONFIG_TYPEC_HD3SS3220=m + +# USB Type-C Multiplexer/DeMultiplexer Switch support +# ON Semi FSA4480 Analog Audio Switch driver +CONFIG_TYPEC_MUX_FSA4480=m +# Generic GPIO based SBU mux for USB Type-C applications +CONFIG_TYPEC_MUX_GPIO_SBU=m + +# LED Support +# LED Support for GPIO connected LEDs +CONFIG_LEDS_GPIO=m + +# EDAC (Error Detection And Correction) reporting +CONFIG_EDAC=m +# Cavium ThunderX EDAC +CONFIG_EDAC_THUNDERX=m +# Synopsys DDR Memory Controller +CONFIG_EDAC_SYNOPSYS=m +# Xilinx ZynqMP OCM Controller +CONFIG_EDAC_ZYNQMP=m + +# Real Time Clock +# TI BQ32000 +CONFIG_RTC_DRV_BQ32K=m +# Xilinx Zynq Ultrascale+ MPSoC RTC +CONFIG_RTC_DRV_ZYNQMP=m +# TI K3 RTC +CONFIG_RTC_DRV_TI_K3=m + +# DMA Engine support +CONFIG_DMADEVICES=y +# i.MX SDMA support +CONFIG_IMX_SDMA=m +# Xilinx AXI DMAS Engine +CONFIG_XILINX_DMA=m +# Xilinx ZynqMP DMA Engine +CONFIG_XILINX_ZYNQMP_DMA=m +# Xilinx DPDMA Engine +CONFIG_XILINX_ZYNQMP_DPDMA=m +# Texas Instruments UDMA support +CONFIG_TI_K3_UDMA=m +# Texas Instruments UDMA Glue layer for non DMAengine users +CONFIG_TI_K3_UDMA_GLUE_LAYER=m + +# Common Clock Framework +# TI System Control Interface clock drivers +CONFIG_TI_SCI_CLK=m +# Syscon based clock driver for K2/K3 SoCs +CONFIG_TI_SYSCON_CLK=m +# Xilinx VCU logicoreIP Init +CONFIG_XILINX_VCU=m +# Xilinx Clocking Wizard +CONFIG_COMMON_CLK_XLNX_CLKWZRD=m + +# Hardware Spinlock drivers +CONFIG_HWSPINLOCK=y +# OMAP Hardware Spinlock device +CONFIG_HWSPINLOCK_OMAP=y +# Qualcomm Hardware Spinlock device +CONFIG_HWSPINLOCK_QCOM=y + +# Mailbox Hardware Support +CONFIG_MAILBOX=y +# ARM MHU Mailbox +CONFIG_ARM_MHU=y +# i.MX Mailbox +CONFIG_IMX_MBOX=y +# Platform MHU Mailbox +CONFIG_PLATFORM_MHU=y +# OMAP2+ Mailbox framework support +CONFIG_OMAP2PLUS_MBOX=y +# BCM2835 Mailbox +CONFIG_BCM2835_MBOX=y +# Qualcomm APCS IPC driver +CONFIG_QCOM_APCS_IPC=y +# Qualcomm Technologies, Inc. IPCC driver +CONFIG_QCOM_IPCC=y + +# IOMMU Hardware Support +CONFIG_IOMMU_SUPPORT=y +# Rockchip IOMMU Support +CONFIG_ROCKCHIP_IOMMU=y +# NVIDIA Tegra SMMU Support +CONFIG_TEGRA_IOMMU_SMMU=y +# ARM Ltd. System MMU (SMMU) Support +CONFIG_ARM_SMMU=y +# ARM Ltd. System MMU Version 3 (SMMUv3) Support +CONFIG_ARM_SMMU_V3=y +# MediaTek IOMMU Support +CONFIG_MTK_IOMMU=y +# Qualcomm IOMMU Support +CONFIG_QCOM_IOMMU=y + +# SOC (System On Chip) specific Drivers +# TI SOC drivers support +# TI SCI PM Domains Driver +CONFIG_TI_SCI_PM_DOMAINS=m +# TI PRU-ICSS Subsystem Platform drivers +CONFIG_TI_PRUSS=m + +# Generic Dynamic Voltage and Frequency Scaling (DVFS) support +CONFIG_PM_DEVFREQ=y + +# Memory Controller drivers +# Texas Instruments OMAP SoC GPMC driver +CONFIG_OMAP_GPMC=m + +# Industrial I/O support +CONFIG_IIO=y + +# Analog to digital converters +# Texas Instruments ADC128S052/ADC122S021/ADC124S021 +CONFIG_TI_ADC128S052=m +# Xilinx XADC driver +CONFIG_XILINX_XADC=m +# Xilinx AMS driver +CONFIG_XILINX_AMS=m + +# Pulse-Width Modulation (PWM) Support +CONFIG_PWM=y +# BCM2835 PWM support +CONFIG_PWM_BCM2835=m +# Broadcom STB PWM support +CONFIG_PWM_BRCMSTB=m +# i.MX27 PWM support +CONFIG_PWM_IMX27=m +# Amlogic Meson PWM driver +CONFIG_PWM_MESON=m +# MediaTek display PWM driver +CONFIG_PWM_MTK_DISP=m +# MediaTek PWM support +CONFIG_PWM_MEDIATEK=m +# Renesas R-Car PWM support +CONFIG_PWM_RCAR=m +# Renesas TPU PWM support +CONFIG_PWM_RENESAS_TPU=m +# Rockchip PWM support +CONFIG_PWM_ROCKCHIP=y +# Samsung PWM support +CONFIG_PWM_SAMSUNG=y +# Kontron sl28cpld PWM support +CONFIG_PWM_SL28CPLD=m +# Allwinner PWM support +CONFIG_PWM_SUN4I=m +# NVIDIA Tegra PWM support +CONFIG_PWM_TEGRA=m +# ECAP PWM support +CONFIG_PWM_TIECAP=m +# EHRPWM PWM support +CONFIG_PWM_TIEHRPWM=m +# Toshiba Visconti PWM support +CONFIG_PWM_VISCONTI=m +# Xilinx AXI Timer PWM support +CONFIG_PWM_XILINX=m + +# IRQ chip support +# Xilinx Interrupt Controller IP +CONFIG_XILINX_INTC=y + +# Reset Controller Support +# i.MX7/8 Reset Driver +CONFIG_RESET_IMX7=y +# TI System Control Interface (TI-SCI) reset driver +CONFIG_RESET_TI_SCI=m + +# PHY Subsystem +# APM X-Gene 15Gbps PHY support +CONFIG_PHY_XGENE=m +# CAN transceiver PHY +CONFIG_PHY_CAN_TRANSCEIVER=m +# Allwinner sunxi SoC USB PHY driver +CONFIG_PHY_SUN4I_USB=m +# Cadence Torrent PHY driver +CONFIG_PHY_CADENCE_TORRENT=m +# Cadence Sierra PHY Driver +CONFIG_PHY_CADENCE_SIERRA=m +# Mixel MIPI DSI PHY support +CONFIG_PHY_MIXEL_MIPI_DPHY=m +# Freescale i.MX8M PCIE PHY +CONFIG_PHY_FSL_IMX8M_PCIE=m +# hi6220 USB PHY support +CONFIG_PHY_HI6220_USB=m +# HiSilicon STB SoCs COMBPHY support +CONFIG_PHY_HISTB_COMBPHY=m +# HiSilicon INNO USB2 PHY support +CONFIG_PHY_HISI_INNO_USB2=m +# Marvell CP110 comphy driver +CONFIG_PHY_MVEBU_CP110_COMPHY=m +# MediaTek T-PHY Driver +CONFIG_PHY_MTK_TPHY=m +# Qualcomm eDP PHY driver +CONFIG_PHY_QCOM_EDP=m +# Qualcomm PCIe Gen2 PHY Driver +CONFIG_PHY_QCOM_PCIE2=m +# Qualcomm QMP PHY Drivers +CONFIG_PHY_QCOM_QMP=m +# Qualcomm QUSB2 PHY Driver +CONFIG_PHY_QCOM_QUSB2=m +# Qualcomm SNPS eUSB2 PHY Driver +CONFIG_PHY_QCOM_SNPS_EUSB2=m +# Qualcomm SNPS eUSB2 Repeater Driver +CONFIG_PHY_QCOM_EUSB2_REPEATER=m +# Qualcomm SNPS FEMTO USB HS PHY V2 module +CONFIG_PHY_QCOM_USB_SNPS_FEMTO_V2=m +# Qualcomm 28nm High-Speed PHY +CONFIG_PHY_QCOM_USB_HS_28NM=m +# Qualcomm USB Super-Speed PHY driver +CONFIG_PHY_QCOM_USB_SS=m +# Qualcomm DWMAC SGMII SerDes/PHY driver +CONFIG_PHY_QCOM_SGMII_ETH=m +# Renesas R-Car S4-8 Ethernet SERDES driver +CONFIG_PHY_R8A779F0_ETHERNET_SERDES=m +# Renesas R-Car generation 3 PCIe PHY driver +CONFIG_PHY_RCAR_GEN3_PCIE=m +# Renesas R-Car generation 3 USB 2.0 PHY driver +CONFIG_PHY_RCAR_GEN3_USB2=m +# Renesas R-Car generation 3 USB 3.0 PHY driver +CONFIG_PHY_RCAR_GEN3_USB3=m +# Rockchip EMMC PHY Driver +CONFIG_PHY_ROCKCHIP_EMMC=m +# Rockchip INNO HDMI PHY Driver +CONFIG_PHY_ROCKCHIP_INNO_HDMI=m +# Rockchip INNO USB2PHY Driver +CONFIG_PHY_ROCKCHIP_INNO_USB2=m +# Rockchip Innosilicon MIPI/LVDS/TTL PHY driver +CONFIG_PHY_ROCKCHIP_INNO_DSIDPHY=m +# Rockchip NANENG COMBO PHY Driver +CONFIG_PHY_ROCKCHIP_NANENG_COMBO_PHY=m +# Rockchip PCIe PHY Driver +CONFIG_PHY_ROCKCHIP_PCIE=m +# Rockchip Snps PCIe3 PHY Driver +CONFIG_PHY_ROCKCHIP_SNPS_PCIE3=m +# Rockchip TYPEC PHY Driver +CONFIG_PHY_ROCKCHIP_TYPEC=m +# Exynos SoC series UFS PHY driver +CONFIG_PHY_SAMSUNG_UFS=m +# UniPhier USB2 PHY driver +CONFIG_PHY_UNIPHIER_USB2=m +# UniPhier USB3 PHY driver +CONFIG_PHY_UNIPHIER_USB3=m +# NVIDIA Tegra XUSB pad controller driver +CONFIG_PHY_TEGRA_XUSB=m +# TI AM654 SERDES support +CONFIG_PHY_AM654_SERDES=m +# TI J721E WIZ (SERDES Wrapper) support +CONFIG_PHY_J721E_WIZ=m +# Xilinx ZynqMP PHY driver +CONFIG_PHY_XILINX_ZYNQMP=m + +# Performance monitor support +# ARM CCI PMU driver +CONFIG_ARM_CCI_PMU=m +# support CCI-400 +CONFIG_ARM_CCI400_PMU=y +# support CCI-500/CCI-550 +CONFIG_ARM_CCI5xx_PMU=y +# ARM PMUv3 support +CONFIG_ARM_PMUV3=y + +# Reliability, Availability and Serviceability (RAS) features +CONFIG_RAS=y + +# NVMEM Support +CONFIG_NVMEM=y + +# Layout Types +# Kontron sl28 VPD layout support +CONFIG_NVMEM_LAYOUT_SL28_VPD=m +# i.MX 6/7/8 On-Chip OTP Controller support +CONFIG_NVMEM_IMX_OCOTP=m +# i.MX On-Chip OTP Controller support +CONFIG_NVMEM_IMX_OCOTP_ELE=m +# i.MX8 SCU On-Chip OTP Controller support +CONFIG_NVMEM_IMX_OCOTP_SCU=m +# Layerscape SFP (Security Fuse Processor) support +CONFIG_NVMEM_LAYERSCAPE_SFP=m +# Amlogic Meson GX eFuse Support +CONFIG_NVMEM_MESON_EFUSE=m +# Mediatek SoCs EFUSE support +CONFIG_NVMEM_MTK_EFUSE=m +# QCOM QFPROM Support +CONFIG_NVMEM_QCOM_QFPROM=m +# Reserved Memory Based Driver Support +CONFIG_NVMEM_RMEM=m +# Rockchip eFuse Support +CONFIG_NVMEM_ROCKCHIP_EFUSE=m +# Rockchip OTP controller support +CONFIG_NVMEM_ROCKCHIP_OTP=m +# Support for Low Power General Purpose Register +CONFIG_NVMEM_SNVS_LPGPR=m +# SPMI SDAM Support +CONFIG_NVMEM_SPMI_SDAM=m +# Allwinner SoCs SID support +CONFIG_NVMEM_SUNXI_SID=m +# UniPhier SoCs eFuse support +CONFIG_NVMEM_UNIPHIER_EFUSE=m +# Xilinx ZYNQMP SoC nvmem firmware support +CONFIG_NVMEM_ZYNQMP=m + +# FPGA Configuration Framework +CONFIG_FPGA=m +# Xilinx Configuration over Slave Serial (SPI) +CONFIG_FPGA_MGR_XILINX_SPI=m +# FPGA Bridge Framework +CONFIG_FPGA_BRIDGE=m +# Xilinx LogiCORE PR Decoupler +CONFIG_XILINX_PR_DECOUPLER=m +# FPGA Region +CONFIG_FPGA_REGION=m +# FPGA Region Device Tree Overlay Support +CONFIG_OF_FPGA_REGION=m +# Xilinx ZynqMP FPGA +CONFIG_FPGA_MGR_ZYNQMP_FPGA=m +# Xilinx Versal FPGA +CONFIG_FPGA_MGR_VERSAL_FPGA=m + +# Multiplexer drivers +CONFIG_MULTIPLEXER=y +# GPIO-controlled Multiplexer +CONFIG_MUX_GPIO=y +# MMIO/Regmap register bitfield-controlled Multiplexer +CONFIG_MUX_MMIO=y + +# On-Chip Interconnect management support +CONFIG_INTERCONNECT=y +# i.MX interconnect drivers +CONFIG_INTERCONNECT_IMX=m +# i.MX8MM interconnect driver +CONFIG_INTERCONNECT_IMX8MM=m +# i.MX8MN interconnect driver +CONFIG_INTERCONNECT_IMX8MN=m +# i.MX8MQ interconnect driver +CONFIG_INTERCONNECT_IMX8MQ=m +# i.MX8MP interconnect driver +CONFIG_INTERCONNECT_IMX8MP=m +# Qualcomm Network-on-Chip interconnect drivers +CONFIG_INTERCONNECT_QCOM=m +# Qualcomm MSM8916 interconnect driver +CONFIG_INTERCONNECT_QCOM_MSM8916=m +# Qualcomm MSM8996 interconnect driver +CONFIG_INTERCONNECT_QCOM_MSM8996=m +# Qualcomm OSM L3 interconnect driver +CONFIG_INTERCONNECT_QCOM_OSM_L3=m +# Qualcomm QCM2290 interconnect driver +CONFIG_INTERCONNECT_QCOM_QCM2290=m +# Qualcomm QCS404 interconnect driver +CONFIG_INTERCONNECT_QCOM_QCS404=m +# Qualcomm SA8775P interconnect driver +CONFIG_INTERCONNECT_QCOM_SA8775P=m +# Qualcomm SC7180 interconnect driver +CONFIG_INTERCONNECT_QCOM_SC7180=m +# Qualcomm SC7280 interconnect driver +CONFIG_INTERCONNECT_QCOM_SC7280=m +# Qualcomm SC8180X interconnect driver +CONFIG_INTERCONNECT_QCOM_SC8180X=m +# Qualcomm SC8280XP interconnect driver +CONFIG_INTERCONNECT_QCOM_SC8280XP=m +# Qualcomm SDM845 interconnect driver +CONFIG_INTERCONNECT_QCOM_SDM845=m +# Qualcomm SM8150 interconnect driver +CONFIG_INTERCONNECT_QCOM_SM8150=m +# Qualcomm SM8250 interconnect driver +CONFIG_INTERCONNECT_QCOM_SM8250=m +# Qualcomm SM8350 interconnect driver +CONFIG_INTERCONNECT_QCOM_SM8350=m +# Qualcomm SM8450 interconnect driver +CONFIG_INTERCONNECT_QCOM_SM8450=m +# Qualcomm SM8550 interconnect driver +CONFIG_INTERCONNECT_QCOM_SM8550=m + +# File systems +# Inotify support for userspace +CONFIG_INOTIFY_USER=y +# Filesystem wide access notification +CONFIG_FANOTIFY=y +# fanotify permissions checking +CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y + +# Cryptographic API +# Accelerated Cryptographic Algorithms for CPU (arm64) +# Hash functions: GHASH (ARMv8 Crypto Extensions) +CONFIG_CRYPTO_GHASH_ARM64_CE=m +# Hash functions: SHA-1 (ARMv8 Crypto Extensions) +CONFIG_CRYPTO_SHA1_ARM64_CE=m +# Hash functions: SHA-224 and SHA-256 (ARMv8 Crypto Extensions) +CONFIG_CRYPTO_SHA2_ARM64_CE=m +# Hash functions: SHA-384 and SHA-512 (ARMv8 Crypto Extensions) +CONFIG_CRYPTO_SHA512_ARM64_CE=m +# Hash functions: SHA-3 (ARMv8.2 Crypto Extensions) +CONFIG_CRYPTO_SHA3_ARM64=m +# Hash functions: SM3 (ARMv8.2 Crypto Extensions) +CONFIG_CRYPTO_SM3_ARM64_CE=m +# Ciphers: AES, modes: ECB/CBC/CTR/XTS (ARMv8 Crypto Extensions) +CONFIG_CRYPTO_AES_ARM64_CE_BLK=m +# Ciphers: ChaCha (NEON) +CONFIG_CRYPTO_CHACHA20_NEON=m +# Ciphers: AES, modes: ECB/CBC/CTR/XCTR/XTS modes (bit-sliced NEON) +CONFIG_CRYPTO_AES_ARM64_BS=m +# AEAD cipher: AES in CCM mode (ARMv8 Crypto Extensions) +CONFIG_CRYPTO_AES_ARM64_CE_CCM=m + +# Hardware crypto devices +CONFIG_CRYPTO_HW=y +# Support for Allwinner Crypto Engine cryptographic offloader +CONFIG_CRYPTO_DEV_SUN8I_CE=m +# Freescale CAAM-Multicore platform driver backend +CONFIG_CRYPTO_DEV_FSL_CAAM=m +# Qualcomm crypto engine accelerator +CONFIG_CRYPTO_DEV_QCE=m +# Qualcomm Random Number Generator Driver +CONFIG_CRYPTO_DEV_QCOM_RNG=m +# Support for Xilinx ZynqMP AES hw accelerator +CONFIG_CRYPTO_DEV_ZYNQMP_AES=m +# Support for Xilinx ZynqMP SHA3 hardware accelerator +CONFIG_CRYPTO_DEV_ZYNQMP_SHA3=m +# Support for ARM TrustZone CryptoCell family of security processors +CONFIG_CRYPTO_DEV_CCREE=m +# Support for HiSilicon SEC2 crypto block cipher accelerator +CONFIG_CRYPTO_DEV_HISI_SEC2=m +# Support for HiSilicon ZIP accelerator +CONFIG_CRYPTO_DEV_HISI_ZIP=m +# Support for HISI HPRE accelerator +CONFIG_CRYPTO_DEV_HISI_HPRE=m +# Support for HISI TRNG Driver +CONFIG_CRYPTO_DEV_HISI_TRNG=m +# Support for TI security accelerator +CONFIG_CRYPTO_DEV_SA2UL=m diff --git a/bsp/genericarm64/genericarm64.scc b/bsp/genericarm64/genericarm64.scc new file mode 100644 index 00000000..7856fa82 --- /dev/null +++ b/bsp/genericarm64/genericarm64.scc @@ -0,0 +1,47 @@ +# SPDX-License-Identifier: MIT +kconf hardware genericarm64.cfg +kconf hardware genericarm64-arch.cfg +kconf hardware genericarm64-clock.cfg +kconf hardware genericarm64-i2c.cfg +kconf hardware genericarm64-gpio.cfg +kconf hardware genericarm64-mmc.cfg +kconf hardware genericarm64-pinctrl.cfg +kconf hardware genericarm64-regulator.cfg +kconf hardware genericarm64-remoteproc.cfg +kconf hardware genericarm64-serial.cfg + +include cfg/8250.scc +include cfg/boot-live.scc +include cfg/efi-ext.scc +include cfg/net/mdio.scc +include cfg/sound.scc +include cfg/timer/no_hz.scc +include cfg/timer/rtc.scc +include cfg/usb-mass-storage.scc +include cfg/virtio.scc +include cfg/fs/flash_fs.scc + +include features/bluetooth/bluetooth.scc +include features/input/input.scc +include features/input/keyboard-gpio.scc +include features/hid/hid.scc +include features/hugetlb/hugetlb.scc +include features/leds/leds.scc +include features/mmc/mmc-block.scc +include features/mmc/mmc-sdhci.scc +include features/mtd/mtd.scc +include features/net/net.scc +include features/netfilter/netfilter.scc +include features/numa/numa.scc +include features/pci-iov/pci-iov.scc +include features/pci/pci.scc +include features/power/arm.scc +include features/usb-net/usb-net.scc +include features/usb/ehci-hcd.scc +include features/usb/ohci-hcd.scc +include features/usb/uhci-hcd.scc +include features/usb/xhci-hcd.scc +include features/wifi/wifi-all.scc +include features/optee/optee.scc +include features/security/security.scc +include features/spi/spi.scc diff --git a/bsp/nsimhs/nsimhs-standard.scc b/bsp/hapshs/hapshs-standard.scc index 3201ca52..1842b00c 100644 --- a/bsp/nsimhs/nsimhs-standard.scc +++ b/bsp/hapshs/hapshs-standard.scc @@ -1,8 +1,8 @@ # SPDX-License-Identifier: MIT -define KMACHINE nsimhs +define KMACHINE hapshs define KTYPE standard define KARCH arc include ktypes/standard/standard.scc -include nsimhs.scc +include hapshs.scc diff --git a/bsp/hapshs/hapshs.cfg b/bsp/hapshs/hapshs.cfg new file mode 100644 index 00000000..adcc0531 --- /dev/null +++ b/bsp/hapshs/hapshs.cfg @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: MIT +# ARCv2 ISA +CONFIG_ISA_ARCV2=y + +# Serial port +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_DW=y +CONFIG_SERIAL_OF_PLATFORM=y + +# Built-in .dtb +CONFIG_ARC_BUILTIN_DTB_NAME="haps_hs" diff --git a/bsp/nsimhs/nsimhs.scc b/bsp/hapshs/hapshs.scc index 3c1613a6..ea2b8b6c 100644 --- a/bsp/nsimhs/nsimhs.scc +++ b/bsp/hapshs/hapshs.scc @@ -1,2 +1,2 @@ # SPDX-License-Identifier: MIT -kconf hardware nsimhs.cfg +kconf hardware hapshs.cfg diff --git a/bsp/hsdk/hsdk.cfg b/bsp/hsdk/hsdk.cfg index 1d75fb92..ee4d8b17 100644 --- a/bsp/hsdk/hsdk.cfg +++ b/bsp/hsdk/hsdk.cfg @@ -13,7 +13,7 @@ CONFIG_ARC_BUILTIN_DTB_NAME="hsdk" CONFIG_ARC_UBOOT_SUPPORT=y # Auto-selected by U-Boot support but if it is enabled slave cores won't start -# CONFIG_ARC_SMP_HALT_ON_RESET is not set +CONFIG_ARC_SMP_HALT_ON_RESET=n # Serial port CONFIG_SERIAL_8250=y @@ -42,7 +42,6 @@ CONFIG_MICREL_PHY=y # GPIO CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_DWAPB=y # Video diff --git a/bsp/intel-common/intel-common-drivers.scc b/bsp/intel-common/intel-common-drivers.scc index d452157c..33451730 100644 --- a/bsp/intel-common/intel-common-drivers.scc +++ b/bsp/intel-common/intel-common-drivers.scc @@ -42,6 +42,7 @@ include features/igb/igb.scc include features/iwlwifi/iwlwifi.scc include features/iwlegacy/iwlegacy.scc include features/i40e/i40e.scc +include features/igc/igc.scc # Various RF/Wireless technologies include features/nfc/nfc.scc @@ -84,8 +85,6 @@ include features/input/keyboard-gpio.scc include features/ciphers/ciphers.scc include features/pci-iov/pci-iov.scc include features/intel-tco/intel-tco.scc -include features/inline/inline.cfg -include features/random/random.scc # default policy for standard kernels include cfg/usb-mass-storage.scc diff --git a/bsp/intel-common/intel-core2-32.cfg b/bsp/intel-common/intel-core2-32.cfg index 10745035..0ecc393c 100644 --- a/bsp/intel-common/intel-core2-32.cfg +++ b/bsp/intel-common/intel-core2-32.cfg @@ -1,6 +1,6 @@ # SPDX-License-Identifier: MIT # Must explicitly disable 64BIT -# CONFIG_64BIT is not set +CONFIG_64BIT=n CONFIG_MCORE2=y diff --git a/bsp/intel-common/intel-corei7-64.scc b/bsp/intel-common/intel-corei7-64.scc index 9fa60099..ad9122c1 100644 --- a/bsp/intel-common/intel-corei7-64.scc +++ b/bsp/intel-common/intel-corei7-64.scc @@ -19,6 +19,12 @@ include features/dca/dca.scc # INTEL_TELEMETRY is currently 64 bit only include features/telemetry/intel-telemetry.scc +# CONFIG_X86_X2APIC is 64-bit +include features/x2apic/x2apic.scc + +# CONFIG_INTEL_SPEED_SELECT_INTERFACE is 64-bit only +include features/intel-sst/intel-sst.scc + # This line comes last as it has the final word on # CONFIG values. kconf hardware intel-corei7-64.cfg diff --git a/bsp/intel-common/intel-developer-drivers.scc b/bsp/intel-common/intel-developer-drivers.scc index 5bb73e3e..090d05ed 100644 --- a/bsp/intel-common/intel-developer-drivers.scc +++ b/bsp/intel-common/intel-developer-drivers.scc @@ -1,4 +1,3 @@ # SPDX-License-Identifier: MIT # Additional features for developer bsps -include features/latencytop/latencytop.scc include features/profiling/profiling.scc diff --git a/bsp/intel-common/intel-quark.cfg b/bsp/intel-common/intel-quark.cfg index b53a1a5e..13a7d6e0 100644 --- a/bsp/intel-common/intel-quark.cfg +++ b/bsp/intel-common/intel-quark.cfg @@ -5,7 +5,7 @@ CONFIG_X86_MCE=y CONFIG_PM=y # Must explicitly disable 64BIT -# CONFIG_64BIT is not set +CONFIG_64BIT=n CONFIG_X86_INTEL_QUARK=y CONFIG_MFD_INTEL_QUARK_I2C_GPIO=y diff --git a/bsp/intel-x86/intel-x86-32-preempt-rt.scc b/bsp/intel-x86/intel-x86-32-preempt-rt.scc index 59e708c0..34f76ad7 100644 --- a/bsp/intel-x86/intel-x86-32-preempt-rt.scc +++ b/bsp/intel-x86/intel-x86-32-preempt-rt.scc @@ -1,10 +1,10 @@ # SPDX-License-Identifier: MIT define KMACHINE intel-x86-32 define KTYPE preempt-rt -define KARCH x86 +define KARCH i386 include ktypes/preempt-rt -branch intel-x86 +branch x86 include intel-x86-32.scc kconf hardware cfs-bandwidth.cfg diff --git a/bsp/intel-x86/intel-x86-32-standard.scc b/bsp/intel-x86/intel-x86-32-standard.scc index bad28176..4b038ac0 100644 --- a/bsp/intel-x86/intel-x86-32-standard.scc +++ b/bsp/intel-x86/intel-x86-32-standard.scc @@ -1,11 +1,10 @@ # SPDX-License-Identifier: MIT define KMACHINE intel-x86-32 define KTYPE standard -define KARCH x86 +define KARCH i386 include ktypes/standard -branch intel-x86 - +branch x86 +include features/transparent-hugepage/transparent-hugepage.scc include intel-x86-32.scc -kconf hardware intel-x86-hugepage.cfg kconf hardware cfs-bandwidth.cfg diff --git a/bsp/intel-x86/intel-x86-32-tiny.scc b/bsp/intel-x86/intel-x86-32-tiny.scc index 9f00b536..2263c27f 100644 --- a/bsp/intel-x86/intel-x86-32-tiny.scc +++ b/bsp/intel-x86/intel-x86-32-tiny.scc @@ -1,9 +1,9 @@ # SPDX-License-Identifier: MIT define KMACHINE intel-x86-32 define KTYPE tiny -define KARCH x86 +define KARCH i386 include ktypes/tiny/tiny.scc -branch intel-x86 +branch x86 include bsp/intel-x86/intel-x86-32.scc diff --git a/bsp/intel-x86/intel-x86-32.cfg b/bsp/intel-x86/intel-x86-32.cfg index c4340925..67f06dbc 100644 --- a/bsp/intel-x86/intel-x86-32.cfg +++ b/bsp/intel-x86/intel-x86-32.cfg @@ -14,7 +14,7 @@ # Switch back to x86-32 from x86-64 CONFIG_X86_32=y -# CONFIG_64BIT is not set +CONFIG_64BIT=n # # Processor type and features diff --git a/bsp/intel-x86/intel-x86-64-preempt-rt.scc b/bsp/intel-x86/intel-x86-64-preempt-rt.scc index e759c884..e776cfa9 100644 --- a/bsp/intel-x86/intel-x86-64-preempt-rt.scc +++ b/bsp/intel-x86/intel-x86-64-preempt-rt.scc @@ -1,9 +1,10 @@ # SPDX-License-Identifier: MIT define KMACHINE intel-x86-64 define KTYPE preempt-rt -define KARCH x86 +define KARCH x86_64 include ktypes/preempt-rt include intel-x86-64.scc +include features/tsn/tsn.scc kconf hardware cfs-bandwidth.cfg diff --git a/bsp/intel-x86/intel-x86-64-standard.scc b/bsp/intel-x86/intel-x86-64-standard.scc index 64d89533..ba29fa80 100644 --- a/bsp/intel-x86/intel-x86-64-standard.scc +++ b/bsp/intel-x86/intel-x86-64-standard.scc @@ -1,10 +1,9 @@ # SPDX-License-Identifier: MIT define KMACHINE intel-x86-64 define KTYPE standard -define KARCH x86 +define KARCH x86_64 include ktypes/standard - +include features/transparent-hugepage/transparent-hugepage.scc include intel-x86-64.scc -kconf hardware intel-x86-hugepage.cfg kconf hardware cfs-bandwidth.cfg diff --git a/bsp/intel-x86/intel-x86-64-tiny.scc b/bsp/intel-x86/intel-x86-64-tiny.scc index 798c4a1f..5eaa689c 100644 --- a/bsp/intel-x86/intel-x86-64-tiny.scc +++ b/bsp/intel-x86/intel-x86-64-tiny.scc @@ -1,7 +1,7 @@ # SPDX-License-Identifier: MIT define KMACHINE intel-x86-64 define KTYPE tiny -define KARCH x86 +define KARCH x86_64 include ktypes/tiny/tiny.scc diff --git a/bsp/intel-x86/intel-x86-64.cfg b/bsp/intel-x86/intel-x86-64.cfg index e5fcc853..da9bc7b5 100644 --- a/bsp/intel-x86/intel-x86-64.cfg +++ b/bsp/intel-x86/intel-x86-64.cfg @@ -2,29 +2,6 @@ # # General setup # -CONFIG_NUMA_BALANCING=y -CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y - -# -# ACPI NUMA -# -CONFIG_X86_64_ACPI_NUMA=y -CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m -CONFIG_CRYPTO_AES_X86_64=m -CONFIG_CRYPTO_SHA1_SSSE3=m -CONFIG_CRYPTO_SHA256_SSSE3=m -CONFIG_CRYPTO_SHA512_SSSE3=m - -# EDAC -CONFIG_EDAC=y -CONFIG_EDAC_DEBUG=y -CONFIG_EDAC_SBRIDGE=m -CONFIG_ACPI_APEI=y -CONFIG_ACPI_APEI_EINJ=m -CONFIG_ACPI_APEI_GHES=y -CONFIG_EDAC_PND2=m -CONFIG_EDAC_SKX=m - # ISH CONFIG_INTEL_ISH_HID=m @@ -37,6 +14,10 @@ CONFIG_PCI_IOV=y CONFIG_CRYPTO=y CONFIG_CRYPTO_SHA1=y CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_CRCT10DIF_PCLMUL=m +CONFIG_CRYPTO_SHA1_SSSE3=m +CONFIG_CRYPTO_SHA256_SSSE3=m +CONFIG_CRYPTO_SHA512_SSSE3=m CONFIG_CRYPTO_AES_NI_INTEL=m # For different QAT devices @@ -44,11 +25,9 @@ CONFIG_CRYPTO_DEV_QAT_C3XXX=m CONFIG_CRYPTO_DEV_QAT_C3XXXVF=m CONFIG_CRYPTO_DEV_QAT_C62X=m CONFIG_CRYPTO_DEV_QAT_C62XVF=m +CONFIG_CRYPTO_DEV_QAT_4XXX=m CONFIG_CRYPTO_DEV_QAT_DH895xCC=m CONFIG_CRYPTO_DEV_QAT_DH895xCCVF=m # x86 CPU resource control support CONFIG_X86_CPU_RESCTRL=y - -# Processor type and features -CONFIG_NR_CPUS=256 diff --git a/bsp/intel-x86/intel-x86-64.scc b/bsp/intel-x86/intel-x86-64.scc index af8f474f..f50668c9 100644 --- a/bsp/intel-x86/intel-x86-64.scc +++ b/bsp/intel-x86/intel-x86-64.scc @@ -1,5 +1,5 @@ # SPDX-License-Identifier: MIT -branch intel-x86 +branch x86 # Core configuration settings for x86_64 include cfg/x86_64.scc nopatch diff --git a/bsp/intel-x86/intel-x86-acpi.cfg b/bsp/intel-x86/intel-x86-acpi.cfg index 8adc00f7..d5c2993b 100644 --- a/bsp/intel-x86/intel-x86-acpi.cfg +++ b/bsp/intel-x86/intel-x86-acpi.cfg @@ -1,6 +1,5 @@ # SPDX-License-Identifier: MIT CONFIG_ACPI=y -CONFIG_ACPI_PROCFS_POWER=y CONFIG_ACPI_EC_DEBUGFS=m CONFIG_ACPI_AC=m CONFIG_ACPI_BATTERY=m diff --git a/features/random/random.cfg b/bsp/intel-x86/intel-x86-dptf-overrides.cfg index bacab3cb..2c206883 100644 --- a/features/random/random.cfg +++ b/bsp/intel-x86/intel-x86-dptf-overrides.cfg @@ -1,2 +1,2 @@ # SPDX-License-Identifier: MIT -CONFIG_RANDOM_TRUST_CPU=y +CONFIG_ACPI_DPTF=y diff --git a/cfg/debug/misc/debug-optimize-inlining.cfg b/bsp/intel-x86/intel-x86-i40e-overrides.cfg index efb301db..0e92b020 100644 --- a/cfg/debug/misc/debug-optimize-inlining.cfg +++ b/bsp/intel-x86/intel-x86-i40e-overrides.cfg @@ -1,2 +1,2 @@ # SPDX-License-Identifier: MIT -CONFIG_OPTIMIZE_INLINING=y +CONFIG_I40E=y diff --git a/features/inline/inline.cfg b/bsp/intel-x86/intel-x86-i915-overrides.cfg index efb301db..8c0dac18 100644 --- a/features/inline/inline.cfg +++ b/bsp/intel-x86/intel-x86-i915-overrides.cfg @@ -1,2 +1,2 @@ # SPDX-License-Identifier: MIT -CONFIG_OPTIMIZE_INLINING=y +CONFIG_DRM_KMS_HELPER=y diff --git a/bsp/intel-x86/intel-x86-igc-overrides.cfg b/bsp/intel-x86/intel-x86-igc-overrides.cfg new file mode 100644 index 00000000..870e9883 --- /dev/null +++ b/bsp/intel-x86/intel-x86-igc-overrides.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_IGC=y diff --git a/bsp/intel-x86/intel-x86-serial-8250-overrides.cfg b/bsp/intel-x86/intel-x86-serial-8250-overrides.cfg new file mode 100644 index 00000000..76e13ade --- /dev/null +++ b/bsp/intel-x86/intel-x86-serial-8250-overrides.cfg @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT +CONFIG_SERIAL_8250_NR_UARTS=16 +CONFIG_SERIAL_8250_RUNTIME_UARTS=16 diff --git a/bsp/intel-x86/intel-x86.cfg b/bsp/intel-x86/intel-x86.cfg index 0ee0e92b..8266bf8f 100644 --- a/bsp/intel-x86/intel-x86.cfg +++ b/bsp/intel-x86/intel-x86.cfg @@ -28,12 +28,15 @@ CONFIG_PROCESSOR_SELECT=y CONFIG_CPU_SUP_INTEL=y CONFIG_X86_EXTENDED_PLATFORM=y CONFIG_KSM=y -CONFIG_CLEANCACHE=y CONFIG_X86_CHECK_BIOS_CORRUPTION=y CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y CONFIG_X86_MCE=y CONFIG_X86_MCE_INTEL=y +CONFIG_X86_MCELOG_LEGACY=y + +CONFIG_MEMORY_FAILURE=y +CONFIG_HWPOISON_INJECT=m CONFIG_X86_INTEL_LPSS=y # @@ -68,18 +71,9 @@ CONFIG_LPC_SCH=m # GPIO drivers # CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_SCH=m CONFIG_GPIO_ICH=m -CONFIG_GPIO_LYNXPOINT=y -GPIO_GENERIC_PLATFORM=m - -# -#PINCTRL drivers -# -CONFIG_PINCTRL=y -CONFIG_PINCTRL_BAYTRAIL=y -CONFIG_PINCTRL_BROXTON=m +CONFIG_GPIO_GENERIC_PLATFORM=m # # x86 CPU frequency scaling drivers @@ -149,7 +143,7 @@ CONFIG_EEPROM_LEGACY=m # # Intel Wireless WiFi Next Gen AGN # -# CONFIG_IWLWIFI_DEBUG is not set +CONFIG_IWLWIFI_DEBUG=n CONFIG_IWLDVM=m CONFIG_IWLMVM=m CONFIG_HOSTAP=y @@ -160,11 +154,6 @@ CONFIG_HOSTAP=y CONFIG_RTL8723BE=m # -# Intel devices -# -CONFIG_IXGB=y - -# # nvram support # CONFIG_NVRAM=m @@ -261,7 +250,7 @@ CONFIG_CRYPTO_AES_NI_INTEL=m # HID # CONFIG_HID=y -CONFIG_I2C_HID=y +CONFIG_I2C_HID_ACPI=y CONFIG_HID_SENSOR_HUB=y # @@ -275,11 +264,23 @@ CONFIG_HSU_DMA_PCI=y # #SPI # +CONFIG_SPI_DESIGNWARE=m +CONFIG_SPI_DW_DMA=y +CONFIG_SPI_DW_PCI=m +CONFIG_SPI_DW_MMIO=m CONFIG_SPI_PXA2XX=y CONFIG_SPI_PXA2XX_PCI=y CONFIG_VT_HW_CONSOLE_BINDING=y +# +# MTD SPI +# +CONFIG_MTD_SPI_NOR=m +CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=y +CONFIG_SPI_INTEL_PCI=m +CONFIG_SPI_INTEL_PLATFORM=m + # Bluetooth device drivers CONFIG_BT_HCIBTUSB=m @@ -292,6 +293,7 @@ CONFIG_PWM_SYSFS=y CONFIG_PWM_LPSS=y CONFIG_PWM_LPSS_PCI=y CONFIG_PWM_LPSS_PLATFORM=y +CONFIG_PWM_DWC=m # # USB Device Class drivers @@ -311,9 +313,10 @@ CONFIG_NOP_USB_XCEIV=y # NVMe support CONFIG_BLK_DEV_NVME=y +CONFIG_NVME_HWMON=y # PMC -CONFIG_INTEL_PMC_IPC=m +CONFIG_MFD_INTEL_PMC_BXT=m #CMA CONFIG_CMA=y @@ -322,7 +325,7 @@ CONFIG_DMA_CMA=y # Realtek Network Driver CONFIG_STAGING=y CONFIG_NET_VENDOR_REALTEK=y -CONFIG_R8169=y +CONFIG_R8169=m # Marvell WiFi-Ex Driver for PCIE 8766/8897/8997 CONFIG_MWIFIEX=m @@ -343,6 +346,9 @@ CONFIG_TOUCHSCREEN_ZFORCE=m CONFIG_DRM_NOUVEAU=m CONFIG_DRM_NOUVEAU_BACKLIGHT=y +# AST server chips +CONFIG_DRM_AST=m + # x86 CPU resource control support CONFIG_X86_CPU_RESCTRL=y @@ -352,3 +358,7 @@ CONFIG_POWERCAP=y CONFIG_INTEL_RAPL=m CONFIG_EXTCON=y + +# MII PHY device drivers +CONFIG_MARVELL_PHY=y +CONFIG_DP83867_PHY=y diff --git a/bsp/intel-x86/intel-x86.scc b/bsp/intel-x86/intel-x86.scc index b133ac44..7825075d 100644 --- a/bsp/intel-x86/intel-x86.scc +++ b/bsp/intel-x86/intel-x86.scc @@ -19,16 +19,19 @@ include features/i915/i915.scc include features/intel-e1xxxx/intel-e1xxxx.scc include features/igb/igb.scc include features/ixgbe/ixgbe.scc +include features/igc/igc.scc include features/iwlwifi/iwlwifi.scc include features/i40e/i40e.scc +include features/ice/ice.scc +include features/net/stmicro/stmmac.scc include features/usb/uhci-hcd.scc include features/usb/ehci-hcd.scc include features/usb/xhci-hcd.scc include features/hostapd/hostapd.scc -include features/latencytop/latencytop.scc include features/uio/uio.scc include features/spi/spi.scc +include features/mtd/mtd.scc include features/spi/spidev.scc include features/bluetooth/bluetooth.scc include features/input/input.scc @@ -41,9 +44,24 @@ include features/mfd/mfd-intel-lpss.scc include features/mmc/mmc-realtek.scc include features/intel-pinctrl/intel-pinctrl.scc include features/mgag200/mgag200.scc +include features/thunderbolt/thunderbolt.scc +include features/intel-th/intel-th.scc +include features/stm/stm.scc +include features/media/media-usb-webcams.scc +include features/intel-idxd/intel-idxd.scc +include features/intel-uncore-frequency/intel-uncore-frequency.scc +include features/intel-dptf/intel-dptf.scc +include features/can/m_can.scc +include features/vfio/vfio.scc +include features/i3c/i3c.scc kconf hardware intel-x86.cfg kconf hardware intel-x86-mga.cfg kconf hardware intel-x86-acpi.cfg kconf hardware intel-x86-igb-overrides.cfg kconf hardware intel-x86-ixgbe-overrides.cfg +kconf hardware intel-x86-i915-overrides.cfg +kconf hardware intel-x86-dptf-overrides.cfg +kconf hardware intel-x86-serial-8250-overrides.cfg +kconf hardware intel-x86-i40e-overrides.cfg +kconf hardware intel-x86-igc-overrides.cfg diff --git a/bsp/marvell-cn96xx/marvell-cn96xx.cfg b/bsp/marvell-cn96xx/marvell-cn96xx.cfg index 1d1f7af0..1b1c4af3 100644 --- a/bsp/marvell-cn96xx/marvell-cn96xx.cfg +++ b/bsp/marvell-cn96xx/marvell-cn96xx.cfg @@ -17,6 +17,7 @@ CONFIG_ARM64_VA_BITS_48=y CONFIG_ARM_SMMU_V3=y CONFIG_NR_CPUS=24 CONFIG_ARCH_THUNDER=y +CONFIG_JUMP_LABEL=y # uboot set "coherent_pool=16M" kernel parameter by default, so we need to # make sure CONFIG_FORCE_MAX_ZONEORDER is big enough @@ -50,7 +51,6 @@ CONFIG_OCTEONTX2_DPI_PF=y # MTD CONFIG_MTD=y CONFIG_MTD_SPI_NOR=y -CONFIG_MTD_M25P80=y CONFIG_MTD_BLOCK=y # USB @@ -83,6 +83,7 @@ CONFIG_GPIO_THUNDERX=y # HWMON CONFIG_SENSORS_MAX6697=y CONFIG_SENSORS_JC42=y +CONFIG_SENSORS_ARM_SCMI=y # RTC CONFIG_RTC_CLASS=y @@ -104,3 +105,20 @@ CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_CAVIUM=y CONFIG_OCTEONTX2_RM=y CONFIG_OCTEONTX2_RM_DOM_SYSFS=y + +# BPHY +CONFIG_MARVELL_OTX_BPHY_CTR=y + +# Mailbox +CONFIG_MAILBOX=y +CONFIG_MVL_MHU=y + +# SCMI +CONFIG_ARM_SCMI_PROTOCOL=y + +# CLK +CONFIG_COMMON_CLK_SCMI=y + +# CPU freq +CONFIG_CPU_FREQ=y +CONFIG_ARM_SCMI_CPUFREQ=y diff --git a/bsp/minnow/minnow-no-pch-gpio.cfg b/bsp/minnow/minnow-no-pch-gpio.cfg index d175ec96..b8548fe9 100644 --- a/bsp/minnow/minnow-no-pch-gpio.cfg +++ b/bsp/minnow/minnow-no-pch-gpio.cfg @@ -1,2 +1,2 @@ # SPDX-License-Identifier: MIT -# CONFIG_GPIO_PCH is not set +CONFIG_GPIO_PCH=n diff --git a/bsp/minnow/minnow-preempt-rt.scc b/bsp/minnow/minnow-preempt-rt.scc index f551544d..20710e7f 100644 --- a/bsp/minnow/minnow-preempt-rt.scc +++ b/bsp/minnow/minnow-preempt-rt.scc @@ -21,7 +21,6 @@ include cfg/efi-ext.scc # default policy for preempt-rt kernels include cfg/usb-mass-storage.scc include cfg/boot-live.scc -include features/latencytop/latencytop.scc include features/profiling/profiling.scc # Requested drivers that don't have an existing scc diff --git a/bsp/minnow/minnow-standard.scc b/bsp/minnow/minnow-standard.scc index 5591a330..46363027 100644 --- a/bsp/minnow/minnow-standard.scc +++ b/bsp/minnow/minnow-standard.scc @@ -18,7 +18,6 @@ include cfg/usb-mass-storage.scc include cfg/boot-live.scc # Basic profiling -include features/latencytop/latencytop.scc include features/profiling/profiling.scc # Requested drivers that don't have an existing scc diff --git a/bsp/minnow/minnow.cfg b/bsp/minnow/minnow.cfg index 89a86e6d..311ebcca 100644 --- a/bsp/minnow/minnow.cfg +++ b/bsp/minnow/minnow.cfg @@ -48,7 +48,6 @@ CONFIG_SERIAL_PCH_UART_CONSOLE=y ### Non-essential on-board features ### # GPIO Support -CONFIG_GPIO_SYSFS=y CONFIG_GPIOLIB=y CONFIG_GPIO_GENERIC=y @@ -63,7 +62,7 @@ CONFIG_INPUT_EVDEV=y # Ensure the performance govenor is the default for optimal boot time # (Leave it to userspace to change it after boot) -# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=n CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y # Enable readahead @@ -71,9 +70,9 @@ CONFIG_FANOTIFY=y CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y ### Standard configs we just do not need ### -# CONFIG_KEYBOARD_ATKBD is not set -# CONFIG_SERIO_I8042 is not set -# CONFIG_MOUSE_PS2 is not set +CONFIG_KEYBOARD_ATKBD=n +CONFIG_SERIO_I8042=n +CONFIG_MOUSE_PS2=n ### Should be specified elsewhere ### # Make sure these are on, otherwise the bootup won't be fun @@ -90,9 +89,5 @@ CONFIG_PRINTK_TIME=y CONFIG_TMPFS_POSIX_ACL=y CONFIG_TMPFS_XATTR=y -# Cleanup some warnings -# Avoid warnings with the x86.scc -# CONFIG_MICROCODE_AMD is not set - # No need to emulate an RTC, we have one, avoid the warning of it missing -# CONFIG_HPET_EMULATE_RTC is not set +CONFIG_HPET_EMULATE_RTC=n diff --git a/bsp/mti-malta32/mti-malta32-common.cfg b/bsp/mti-malta32/mti-malta32-common.cfg index 9f72dafe..5786da2e 100644 --- a/bsp/mti-malta32/mti-malta32-common.cfg +++ b/bsp/mti-malta32/mti-malta32-common.cfg @@ -28,9 +28,9 @@ CONFIG_MTD_PHYSMAP=y CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_PC_SUPERIO=y -# CONFIG_PARPORT_SERIAL is not set +CONFIG_PARPORT_SERIAL=n -# CONFIG_BLK_DEV_FD is not set +CONFIG_BLK_DEV_FD=n CONFIG_PCI=y @@ -39,13 +39,6 @@ CONFIG_BLK_DEV_SD=m CONFIG_BLK_DEV_SR=m CONFIG_CHR_DEV_SG=m -CONFIG_IDE=y -CONFIG_IDE_GENERIC=y -CONFIG_BLK_DEV_IDEPCI=y -CONFIG_BLK_DEV_IDEDMA_PCI=y -CONFIG_BLK_DEV_PIIX=y -CONFIG_BLK_DEV_IDEDMA=y - CONFIG_PCNET32=y CONFIG_SERIAL_CORE=y @@ -69,7 +62,7 @@ CONFIG_USB_STORAGE=m CONFIG_INPUT_EVDEV=y CONFIG_SERIO=y -# CONFIG_SERIO_SERPORT is not set +CONFIG_SERIO_SERPORT=n CONFIG_USB_MON=y CONFIG_USB_OHCI_HCD=y @@ -77,3 +70,5 @@ CONFIG_USB_OHCI_HCD=y # Board reset CONFIG_POWER_RESET=y CONFIG_POWER_RESET_PIIX4_POWEROFF=y + +CONFIG_COMPACTION=n diff --git a/bsp/mti-malta32/mti-malta32-rt.cfg b/bsp/mti-malta32/mti-malta32-rt.cfg index c80c1b6f..0ced014d 100644 --- a/bsp/mti-malta32/mti-malta32-rt.cfg +++ b/bsp/mti-malta32/mti-malta32-rt.cfg @@ -1,2 +1,2 @@ # SPDX-License-Identifier: MIT -# CONFIG_HIGHMEM is not set +CONFIG_HIGHMEM=n diff --git a/bsp/mti-malta32/mti-malta32.scc b/bsp/mti-malta32/mti-malta32.scc index 25f7b68d..e1b00f58 100644 --- a/bsp/mti-malta32/mti-malta32.scc +++ b/bsp/mti-malta32/mti-malta32.scc @@ -3,7 +3,6 @@ kconf hardware mti-malta32-common.cfg kconf hardware mti-malta32-gfx.cfg include features/profiling/profiling.scc -include features/latencytop/latencytop.scc include features/usb/ehci-hcd.scc include features/usb/uhci-hcd.scc @@ -17,3 +16,5 @@ patch Revert-Input-i8042-io-fix-up-region-handling-on-MIPS.patch # v3.8+ kernels have broken mips ftrace function tracing, disable it for now include features/ftrace/ftrace-function-tracer-disable.scc + +include cfg/net/mdio.scc diff --git a/bsp/mti-malta32/mti_malta32-fix-the-pci-resource-conflicts.patch b/bsp/mti-malta32/mti_malta32-fix-the-pci-resource-conflicts.patch index ef47a72f..e9679a96 100644 --- a/bsp/mti-malta32/mti_malta32-fix-the-pci-resource-conflicts.patch +++ b/bsp/mti-malta32/mti_malta32-fix-the-pci-resource-conflicts.patch @@ -1,4 +1,4 @@ -From ce7d0fb9680e32c86883a2689b394d57b5f3b7cd Mon Sep 17 00:00:00 2001 +From e4a8151a5225a9a547c70066e1c11f6b8206f73a Mon Sep 17 00:00:00 2001 From: Jack Tan <jack.tan@windriver.com> Date: Wed, 10 Mar 2010 15:05:39 +0800 Subject: [PATCH] mti_malta32: fix the pci resource conflicts @@ -40,22 +40,48 @@ pcnet32: No access methods ...... ...... +And a fixup to the original change: + +[ + mips: malta PCI fixup, fix __init annotation warning + + Currently we see the following link warning: + + WARNING: vmlinux.o(.pci_fixup_final+0xefc): Section mismatch in + reference from the variable __pci_fixup_malta_pcnet32_ioports_fixup164 + to the function .init.text:malta_pcnet32_ioports_fixup() + The variable __pci_fixup_malta_pcnet32_ioports_fixup164 references + a function __init malta_pcnet32_ioports_fixup(). + This is often seen when error handling in the init function + uses functionality in the exit path. + The fix is often to remove the __init annotation of + malta_pcnet32_ioports_fixup() so it may be used outside an exit section. + + This is from the addition of "mti_malta32: fix the pci resource conflicts" + (5c19c1c31c77 on v5.2/standard/mti-malta32) - which is a relatively old + commit, but w/o a malta+PCnet32, I can't speak to whether this commit is + still needed, or if the PCI resource overlap was solved another way. + + Hence here, we take the safe path and just remove the __init annotation. +] + Signed-off-by: Jack Tan <jack.tan@windriver.com> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> --- - arch/mips/pci/fixup-malta.c | 21 +++++++++++++++++++++ - 1 files changed, 21 insertions(+), 0 deletions(-) + arch/mips/pci/fixup-malta.c | 21 +++++++++++++++++++++ + 1 file changed, 21 insertions(+) diff --git a/arch/mips/pci/fixup-malta.c b/arch/mips/pci/fixup-malta.c -index 0f48498..d4075bb 100644 +index 8131e0ffe735..df1cae42ff9e 100644 --- a/arch/mips/pci/fixup-malta.c +++ b/arch/mips/pci/fixup-malta.c -@@ -101,3 +101,24 @@ static void __init malta_piix_func1_fixup(struct pci_dev *pdev) - +@@ -142,6 +142,27 @@ static void malta_piix_func1_fixup(struct pci_dev *pdev) DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB, malta_piix_func1_fixup); -+ + +/* Use the io resource allocated by YAMON */ -+static void __init malta_pcnet32_ioports_fixup(struct pci_dev *pdev) ++static void malta_pcnet32_ioports_fixup(struct pci_dev *pdev) +{ + u32 check = 0, new = 0x1060; + @@ -74,6 +100,10 @@ index 0f48498..d4075bb 100644 + +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_LANCE, + malta_pcnet32_ioports_fixup); ++ + /* Enable PCI 2.1 compatibility in PIIX4 */ + static void quirk_dlcsetup(struct pci_dev *dev) + { -- -1.6.5.2 +2.19.1 diff --git a/bsp/mti-malta64/0001-oprofile-mips-override-register-writes-for-qemu-mips.patch b/bsp/mti-malta64/0001-oprofile-mips-override-register-writes-for-qemu-mips.patch deleted file mode 100644 index 8e67d62c..00000000 --- a/bsp/mti-malta64/0001-oprofile-mips-override-register-writes-for-qemu-mips.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 473b4ece7967902bc2acac6dadc21e76ed83acea Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@windriver.com> -Date: Wed, 4 Apr 2012 13:58:38 -0400 -Subject: [PATCH] oprofile/mips: override register writes for qemu mips 64 - -Even when oprofile timer mode is enabled, during oprofile arch init -there are writes to registers that do not exist in the qemu malta -64 bit pseudo machine. - -To allow initialization to continue and the fallback to oprofile -timer mode to take effect, we stub the register writes. - -These two defines are only appropriate for qemu-system-mips. -This should not merge to a common location, and only be applied -to emulated boards. - -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - arch/mips/oprofile/op_model_mipsxx.c | 11 +++++++++++ - 1 files changed, 11 insertions(+), 0 deletions(-) - -diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c -index 54759f1..b0c1381 100644 ---- a/arch/mips/oprofile/op_model_mipsxx.c -+++ b/arch/mips/oprofile/op_model_mipsxx.c -@@ -122,6 +122,17 @@ __define_perf_accessors(perfctrl, 1, 3) - __define_perf_accessors(perfctrl, 2, 0) - __define_perf_accessors(perfctrl, 3, 1) - -+ -+/* These two defines are only appropriate for qemu-system-mips. -+ They prevent illegal writes to performance registers and allow -+ oprofile timer mode to continue and be initialized fully. -+ -+ This should not merge to a common location, and only be applied -+ to emulated boards. -+*/ -+#define w_c0_perfctrl0(reg) {} -+#define w_c0_perfcntr0(reg) {} -+ - struct op_mips_model op_model_mipsxx_ops; - - static struct mipsxx_register_config { --- -1.7.0.4 - diff --git a/bsp/mti-malta64/mti-malta64-be-developer.scc b/bsp/mti-malta64/mti-malta64-be-developer.scc new file mode 100644 index 00000000..f8ccdf43 --- /dev/null +++ b/bsp/mti-malta64/mti-malta64-be-developer.scc @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: MIT +define KMACHINE mti-malta64-be +define KMACHINE qemumips-64 +define KMACHINE qemumips64 +define KTYPE developer +define KARCH mips + +include ktypes/standard/standard.scc +branch mti-malta64 + +include mti-malta64.scc +kconf hardware mti-malta64-be.cfg + +include features/profiling/profiling.scc +include cfg/tracing.scc + diff --git a/bsp/mti-malta64/mti-malta64-common.cfg b/bsp/mti-malta64/mti-malta64-common.cfg index 52c44573..d920aa8b 100644 --- a/bsp/mti-malta64/mti-malta64-common.cfg +++ b/bsp/mti-malta64/mti-malta64-common.cfg @@ -14,7 +14,7 @@ CONFIG_MIPS=y CONFIG_MIPS_MALTA=y CONFIG_CPU_MIPS64_R1=y -# CONFIG_CPU_MIPS64_R2 is not set +CONFIG_CPU_MIPS64_R2=n CONFIG_CPU_MIPS64=y CONFIG_CPU_MIPSR1=y CONFIG_64BIT=y @@ -31,24 +31,17 @@ CONFIG_MTD_PHYSMAP=y CONFIG_PARPORT=m CONFIG_PARPORT_PC=m CONFIG_PARPORT_PC_SUPERIO=y -# CONFIG_PARPORT_SERIAL is not set +CONFIG_PARPORT_SERIAL=n -# CONFIG_BLK_DEV_FD is not set +CONFIG_BLK_DEV_FD=n CONFIG_PCI=y -CONFIG_SCSI=m +CONFIG_SCSI=y CONFIG_BLK_DEV_SD=m CONFIG_BLK_DEV_SR=m CONFIG_CHR_DEV_SG=m -CONFIG_IDE=y -CONFIG_IDE_GENERIC=y -CONFIG_BLK_DEV_IDEPCI=y -CONFIG_BLK_DEV_IDEDMA_PCI=y -CONFIG_BLK_DEV_PIIX=y -CONFIG_BLK_DEV_IDEDMA=y - CONFIG_PCNET32=y CONFIG_SERIAL_CORE=y @@ -72,13 +65,13 @@ CONFIG_USB_STORAGE=m CONFIG_INPUT_EVDEV=y CONFIG_SERIO=y -# CONFIG_SERIO_SERPORT is not set +CONFIG_SERIO_SERPORT=n CONFIG_USB_MON=y CONFIG_USB_OHCI_HCD=y -# CONFIG_VGA_CONSOLE is not set +CONFIG_VGA_CONSOLE=n # Board reset CONFIG_POWER_RESET=y diff --git a/bsp/mti-malta64/mti-malta64.scc b/bsp/mti-malta64/mti-malta64.scc index 533a5fe4..0025d971 100644 --- a/bsp/mti-malta64/mti-malta64.scc +++ b/bsp/mti-malta64/mti-malta64.scc @@ -1,7 +1,5 @@ # SPDX-License-Identifier: MIT -include features/profiling/profiling.scc -include features/latencytop/latencytop.scc -include cfg/tracing.scc + include cfg/mips64.scc include features/usb/ehci-hcd.scc @@ -14,11 +12,10 @@ patch bsp/mti-malta32/mti_malta32-fix-the-pci-resource-conflicts.patch patch bsp/mti-malta32/mousedev-mousedev-patch-for-qemumips.patch patch bsp/mti-malta32/Revert-Input-i8042-io-fix-up-region-handling-on-MIPS.patch -patch 0001-oprofile-mips-override-register-writes-for-qemu-mips.patch -patch oprofile-mips-do-not-set-perf_irq-for-qemu-mips-64.patch # v3.8+ kernels have broken mips ftrace function tracing, disable it for now include features/ftrace/ftrace-function-tracer-disable.scc kconf hardware mti-malta64-common.cfg kconf hardware mti-malta64-gfx.cfg + diff --git a/bsp/mti-malta64/oprofile-mips-do-not-set-perf_irq-for-qemu-mips-64.patch b/bsp/mti-malta64/oprofile-mips-do-not-set-perf_irq-for-qemu-mips-64.patch deleted file mode 100644 index 19c0825f..00000000 --- a/bsp/mti-malta64/oprofile-mips-do-not-set-perf_irq-for-qemu-mips-64.patch +++ /dev/null @@ -1,47 +0,0 @@ -From bbefde394205a1b317eae31942bfc13afce0b0ac Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@windriver.com> -Date: Fri, 5 Apr 2013 00:11:33 -0400 -Subject: [PATCH 2/2] oprofile/mips: do not set perf_irq for qemu mips 64 - -In a similar manner to the following commit: - - oprofile/mips: override register writes for qemu mips 64 - - Even when oprofile timer mode is enabled, during oprofile arch init - there are writes to registers that do not exist in the qemu malta - 64 bit pseudo machine. - - To allow initialization to continue and the fallback to oprofile - timer mode to take effect, we stub the register writes. - - These two defines are only appropriate for qemu-system-mips. - This should not merge to a common location, and only be applied - to emulated boards. - -We also cannot set perf_irq to mipsxx_perfcount_handler during oprofile -arch init, or unsupported register reads will be triggered before the -fallback to timer mode occurs. This commit is also only appropriate for -qemu mips based boards, and should not be applied to any general branch. - -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - arch/mips/oprofile/op_model_mipsxx.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c -index 1ab4f15..16ecbf4 100644 ---- a/arch/mips/oprofile/op_model_mipsxx.c -+++ b/arch/mips/oprofile/op_model_mipsxx.c -@@ -419,7 +419,9 @@ static int __init mipsxx_init(void) - } - - save_perf_irq = perf_irq; -+#if 0 - perf_irq = mipsxx_perfcount_handler; -+#endif - - if ((cp0_perfcount_irq >= 0) && (cp0_compare_irq != cp0_perfcount_irq)) - return request_irq(cp0_perfcount_irq, mipsxx_perfcount_int, --- -1.7.10.4 - diff --git a/bsp/nsimhs/nsimhs.cfg b/bsp/nsimhs/nsimhs.cfg deleted file mode 100644 index 34580a39..00000000 --- a/bsp/nsimhs/nsimhs.cfg +++ /dev/null @@ -1,10 +0,0 @@ -# SPDX-License-Identifier: MIT -# ARCv2 ISA -CONFIG_ISA_ARCV2=y - -# Legacy ARC UART -CONFIG_SERIAL_ARC=y -CONFIG_SERIAL_ARC_CONSOLE=y - -# Built-in .dtb -CONFIG_ARC_BUILTIN_DTB_NAME="nsim_hs" diff --git a/bsp/nxp-ls20xx/nxp-ls20xx.cfg b/bsp/nxp-ls20xx/nxp-ls20xx.cfg index 534d0897..a6850fb2 100755 --- a/bsp/nxp-ls20xx/nxp-ls20xx.cfg +++ b/bsp/nxp-ls20xx/nxp-ls20xx.cfg @@ -25,6 +25,8 @@ CONFIG_PCI_HOST_GENERIC=y CONFIG_PCI_XGENE=y CONFIG_PCI_MSI=y +CONFIG_ENERGY_MODEL=y + CONFIG_CPU_FREQ=y CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_GOV_POWERSAVE=y @@ -43,7 +45,6 @@ CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_CFI_AMDSTD=y CONFIG_MTD_CFI_STAA=y CONFIG_MTD_DATAFLASH=y -CONFIG_MTD_M25P80=y CONFIG_MTD_SST25L=y CONFIG_MTD_SPI_NOR=y CONFIG_MTD_RAW_NAND=y @@ -152,7 +153,7 @@ CONFIG_CRYPTO_SHA2_ARM64_CE=y CONFIG_CRYPTO_GHASH_ARM64_CE=y CONFIG_CRYPTO_AES_ARM64_CE_CCM=y CONFIG_CRYPTO_AES_ARM64_CE_BLK=y -# CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT is not set +CONFIG_ARM_SMMU_DISABLE_BYPASS_BY_DEFAULT=n # EDAC CONFIG_EDAC_LAYERSCAPE=y diff --git a/bsp/qemu-ppc32/powerpc-special-load-offset-for-qemu.patch b/bsp/qemu-ppc32/powerpc-special-load-offset-for-qemu.patch deleted file mode 100644 index ae9d48d7..00000000 --- a/bsp/qemu-ppc32/powerpc-special-load-offset-for-qemu.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9df586c4b4b112f55f1984697bfd6de663774118 Mon Sep 17 00:00:00 2001 -From: Jason Wessel <jason.wessel@windriver.com> -Date: Wed, 3 Feb 2010 13:51:19 -0500 -Subject: [PATCH 2/3] powerpc: special load offset for qemu - -Patch the load offset to work correctly with qemu_boot_loader. - -Signed-off-by: Jason Wessel <jason.wessel@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - arch/powerpc/kernel/vmlinux.lds.S | 5 +++++ - 1 files changed, 5 insertions(+), 0 deletions(-) - -diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S -index dcd01c8..4397f44 100644 ---- a/arch/powerpc/kernel/vmlinux.lds.S -+++ b/arch/powerpc/kernel/vmlinux.lds.S -@@ -8,6 +8,11 @@ - #include <asm/cache.h> - #include <asm/thread_info.h> - -+#ifdef CONFIG_PPC_QEMU -+#undef LOAD_OFFSET -+#define LOAD_OFFSET 0 -+#endif /* CONFIG_PPC_QEMU */ -+ - ENTRY(_stext) - - PHDRS { --- -1.6.5.2 - diff --git a/bsp/qemu-ppc32/qemu-platform-v2.patch b/bsp/qemu-ppc32/qemu-platform-v2.patch deleted file mode 100644 index 59b3fa3f..00000000 --- a/bsp/qemu-ppc32/qemu-platform-v2.patch +++ /dev/null @@ -1,1640 +0,0 @@ -From ed6c530bc35a3366a04dcf77ec0fd456da5ce480 Mon Sep 17 00:00:00 2001 -From: Milton Miller <miltonm@bga.com> -Date: Sat, 22 Sep 2007 09:08:31 +1000 -Subject: [PATCH 1/3] qemu platform, v2 - -Here is the second rev of patches to boot a arch powerpc kernel on -qemu with the prep architecture. - -The goal is to provide an environment for use with the existing qemu -hardware suppplied hardware, as oposed to changing the qemu -machine description. - -This patch contains only the kernel portion. While the diff was -generated against for-2.6.24, this first patch applies cleanly -to 2.6.23-rc7. With the rom image created in the next patch, -a kernel built by this patch should boot when using qemu -kernel. - -I debated putting this in the embedded6xx tree, especially when I -discovered that the bridge is suposedly a '105, but saw no advantage -in the end. - -pci config space is now working, however cirrusfb causes crashes -and ohci times out, so at least pci memory is likely still broken. - -ide and serial work, floppy and parallel are untested. - -I added a defconfig based on chrp32; hardware options still need -tweaking (eg isa ne2k). - -Signed-off-by: Jason Wessel <jason.wessel@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> -diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig -index c33e3ad..a0d28dc 100644 ---- a/arch/powerpc/Kconfig -+++ b/arch/powerpc/Kconfig -@@ -636,7 +636,7 @@ menu "Bus options" - - config ISA - bool "Support for ISA-bus hardware" -- depends on PPC_CHRP -+ depends on PPC_CHRP || PPC_QEMU - select PPC_I8259 - help - Find out whether you have ISA slots on your motherboard. ISA is the -diff --git a/arch/powerpc/configs/qemu_defconfig b/arch/powerpc/configs/qemu_defconfig -new file mode 100644 -index 0000000..a6d6721 ---- /dev/null -+++ b/arch/powerpc/configs/qemu_defconfig -@@ -0,0 +1,1217 @@ -+# -+# Automatically generated make config: don't edit -+# Linux kernel version: 2.6.23-rc6 -+# Tue Sep 18 15:18:32 2007 -+# -+# CONFIG_PPC64 is not set -+ -+# -+# Processor support -+# -+CONFIG_6xx=y -+# CONFIG_PPC_85xx is not set -+# CONFIG_PPC_8xx is not set -+# CONFIG_40x is not set -+# CONFIG_44x is not set -+# CONFIG_E200 is not set -+CONFIG_PPC_FPU=y -+# CONFIG_ALTIVEC is not set -+CONFIG_PPC_STD_MMU=y -+CONFIG_PPC_STD_MMU_32=y -+# CONFIG_PPC_MM_SLICES is not set -+# CONFIG_SMP is not set -+CONFIG_PPC32=y -+CONFIG_PPC_MERGE=y -+CONFIG_MMU=y -+CONFIG_GENERIC_HARDIRQS=y -+CONFIG_IRQ_PER_CPU=y -+CONFIG_RWSEM_XCHGADD_ALGORITHM=y -+CONFIG_ARCH_HAS_ILOG2_U32=y -+CONFIG_GENERIC_HWEIGHT=y -+CONFIG_GENERIC_CALIBRATE_DELAY=y -+CONFIG_GENERIC_FIND_NEXT_BIT=y -+# CONFIG_ARCH_NO_VIRT_TO_BUS is not set -+CONFIG_PPC=y -+CONFIG_EARLY_PRINTK=y -+CONFIG_GENERIC_NVRAM=y -+CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y -+CONFIG_ARCH_MAY_HAVE_PC_FDC=y -+CONFIG_PPC_OF=y -+CONFIG_OF=y -+CONFIG_PPC_UDBG_16550=y -+# CONFIG_GENERIC_TBSYNC is not set -+CONFIG_AUDIT_ARCH=y -+CONFIG_GENERIC_BUG=y -+# CONFIG_DEFAULT_UIMAGE is not set -+# CONFIG_PPC_DCR_NATIVE is not set -+# CONFIG_PPC_DCR_MMIO is not set -+CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config" -+ -+# -+# General setup -+# -+CONFIG_EXPERIMENTAL=y -+CONFIG_BROKEN_ON_SMP=y -+CONFIG_INIT_ENV_ARG_LIMIT=32 -+CONFIG_LOCALVERSION="" -+# CONFIG_LOCALVERSION_AUTO is not set -+CONFIG_SWAP=y -+CONFIG_SYSVIPC=y -+CONFIG_SYSVIPC_SYSCTL=y -+CONFIG_POSIX_MQUEUE=y -+# CONFIG_BSD_PROCESS_ACCT is not set -+# CONFIG_TASKSTATS is not set -+# CONFIG_USER_NS is not set -+# CONFIG_AUDIT is not set -+CONFIG_IKCONFIG=y -+CONFIG_IKCONFIG_PROC=y -+CONFIG_LOG_BUF_SHIFT=15 -+CONFIG_SYSFS_DEPRECATED=y -+# CONFIG_RELAY is not set -+CONFIG_BLK_DEV_INITRD=y -+CONFIG_INITRAMFS_SOURCE="" -+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set -+CONFIG_SYSCTL=y -+# CONFIG_EMBEDDED is not set -+CONFIG_SYSCTL_SYSCALL=y -+CONFIG_KALLSYMS=y -+# CONFIG_KALLSYMS_ALL is not set -+# CONFIG_KALLSYMS_EXTRA_PASS is not set -+CONFIG_HOTPLUG=y -+CONFIG_PRINTK=y -+CONFIG_BUG=y -+CONFIG_ELF_CORE=y -+CONFIG_BASE_FULL=y -+CONFIG_FUTEX=y -+CONFIG_ANON_INODES=y -+CONFIG_EPOLL=y -+CONFIG_SIGNALFD=y -+CONFIG_TIMERFD=y -+CONFIG_EVENTFD=y -+CONFIG_SHMEM=y -+CONFIG_VM_EVENT_COUNTERS=y -+CONFIG_SLAB=y -+# CONFIG_SLUB is not set -+# CONFIG_SLOB is not set -+CONFIG_RT_MUTEXES=y -+# CONFIG_TINY_SHMEM is not set -+CONFIG_BASE_SMALL=0 -+CONFIG_MODULES=y -+CONFIG_MODULE_UNLOAD=y -+CONFIG_MODULE_FORCE_UNLOAD=y -+# CONFIG_MODVERSIONS is not set -+# CONFIG_MODULE_SRCVERSION_ALL is not set -+CONFIG_KMOD=y -+CONFIG_BLOCK=y -+CONFIG_LBD=y -+# CONFIG_BLK_DEV_IO_TRACE is not set -+# CONFIG_LSF is not set -+# CONFIG_BLK_DEV_BSG is not set -+ -+# -+# IO Schedulers -+# -+CONFIG_IOSCHED_NOOP=y -+CONFIG_IOSCHED_AS=y -+CONFIG_IOSCHED_DEADLINE=y -+CONFIG_IOSCHED_CFQ=y -+CONFIG_DEFAULT_AS=y -+# CONFIG_DEFAULT_DEADLINE is not set -+# CONFIG_DEFAULT_CFQ is not set -+# CONFIG_DEFAULT_NOOP is not set -+CONFIG_DEFAULT_IOSCHED="anticipatory" -+ -+# -+# Platform support -+# -+CONFIG_PPC_MULTIPLATFORM=y -+# CONFIG_EMBEDDED6xx is not set -+# CONFIG_PPC_82xx is not set -+# CONFIG_PPC_83xx is not set -+# CONFIG_PPC_86xx is not set -+CONFIG_CLASSIC32=y -+# CONFIG_PPC_CHRP is not set -+# CONFIG_PPC_MPC52xx is not set -+# CONFIG_PPC_MPC5200 is not set -+# CONFIG_PPC_EFIKA is not set -+# CONFIG_PPC_LITE5200 is not set -+# CONFIG_PPC_PMAC is not set -+CONFIG_PPC_QEMU=y -+# CONFIG_PPC_CELL is not set -+# CONFIG_PPC_CELL_NATIVE is not set -+# CONFIG_PQ2ADS is not set -+CONFIG_PPC_NATIVE=y -+# CONFIG_MPIC is not set -+# CONFIG_MPIC_WEIRD is not set -+CONFIG_PPC_I8259=y -+# CONFIG_PPC_RTAS is not set -+# CONFIG_MMIO_NVRAM is not set -+# CONFIG_PPC_MPC106 is not set -+# CONFIG_PPC_970_NAP is not set -+# CONFIG_PPC_INDIRECT_IO is not set -+# CONFIG_GENERIC_IOMAP is not set -+# CONFIG_CPU_FREQ is not set -+# CONFIG_TAU is not set -+# CONFIG_CPM2 is not set -+# CONFIG_FSL_ULI1575 is not set -+ -+# -+# Kernel options -+# -+CONFIG_HIGHMEM=y -+# CONFIG_HZ_100 is not set -+CONFIG_HZ_250=y -+# CONFIG_HZ_300 is not set -+# CONFIG_HZ_1000 is not set -+CONFIG_HZ=250 -+CONFIG_PREEMPT_NONE=y -+# CONFIG_PREEMPT_VOLUNTARY is not set -+# CONFIG_PREEMPT is not set -+CONFIG_BINFMT_ELF=y -+CONFIG_BINFMT_MISC=y -+CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y -+# CONFIG_KEXEC is not set -+CONFIG_ARCH_FLATMEM_ENABLE=y -+CONFIG_ARCH_POPULATES_NODE_MAP=y -+CONFIG_SELECT_MEMORY_MODEL=y -+CONFIG_FLATMEM_MANUAL=y -+# CONFIG_DISCONTIGMEM_MANUAL is not set -+# CONFIG_SPARSEMEM_MANUAL is not set -+CONFIG_FLATMEM=y -+CONFIG_FLAT_NODE_MEM_MAP=y -+# CONFIG_SPARSEMEM_STATIC is not set -+CONFIG_SPLIT_PTLOCK_CPUS=4 -+# CONFIG_RESOURCES_64BIT is not set -+CONFIG_ZONE_DMA_FLAG=1 -+CONFIG_BOUNCE=y -+CONFIG_VIRT_TO_BUS=y -+CONFIG_PROC_DEVICETREE=y -+# CONFIG_CMDLINE_BOOL is not set -+# CONFIG_PM is not set -+CONFIG_SUSPEND_UP_POSSIBLE=y -+CONFIG_HIBERNATION_UP_POSSIBLE=y -+CONFIG_SECCOMP=y -+CONFIG_WANT_DEVICE_TREE=y -+CONFIG_DEVICE_TREE="qemu.dts" -+CONFIG_ISA_DMA_API=y -+ -+# -+# Bus options -+# -+CONFIG_ZONE_DMA=y -+CONFIG_GENERIC_ISA_DMA=y -+CONFIG_PPC_INDIRECT_PCI=y -+CONFIG_PCI=y -+CONFIG_PCI_DOMAINS=y -+CONFIG_PCI_SYSCALL=y -+# CONFIG_PCIEPORTBUS is not set -+CONFIG_ARCH_SUPPORTS_MSI=y -+# CONFIG_PCI_MSI is not set -+# CONFIG_PCI_DEBUG is not set -+ -+# -+# PCCARD (PCMCIA/CardBus) support -+# -+# CONFIG_PCCARD is not set -+# CONFIG_HOTPLUG_PCI is not set -+ -+# -+# Advanced setup -+# -+# CONFIG_ADVANCED_OPTIONS is not set -+ -+# -+# Default settings for advanced configuration options are used -+# -+CONFIG_HIGHMEM_START=0xfe000000 -+CONFIG_LOWMEM_SIZE=0x30000000 -+CONFIG_KERNEL_START=0xc0000000 -+CONFIG_TASK_SIZE=0x80000000 -+CONFIG_BOOT_LOAD=0x00800000 -+ -+# -+# Networking -+# -+CONFIG_NET=y -+ -+# -+# Networking options -+# -+CONFIG_PACKET=y -+# CONFIG_PACKET_MMAP is not set -+CONFIG_UNIX=y -+# CONFIG_NET_KEY is not set -+CONFIG_INET=y -+CONFIG_IP_MULTICAST=y -+# CONFIG_IP_ADVANCED_ROUTER is not set -+CONFIG_IP_FIB_HASH=y -+# CONFIG_IP_PNP is not set -+# CONFIG_NET_IPIP is not set -+# CONFIG_NET_IPGRE is not set -+# CONFIG_IP_MROUTE is not set -+# CONFIG_ARPD is not set -+CONFIG_SYN_COOKIES=y -+# CONFIG_INET_AH is not set -+# CONFIG_INET_ESP is not set -+# CONFIG_INET_IPCOMP is not set -+# CONFIG_INET_XFRM_TUNNEL is not set -+# CONFIG_INET_TUNNEL is not set -+# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -+# CONFIG_INET_XFRM_MODE_TUNNEL is not set -+# CONFIG_INET_XFRM_MODE_BEET is not set -+CONFIG_INET_DIAG=y -+CONFIG_INET_TCP_DIAG=y -+# CONFIG_TCP_CONG_ADVANCED is not set -+CONFIG_TCP_CONG_CUBIC=y -+CONFIG_DEFAULT_TCP_CONG="cubic" -+# CONFIG_TCP_MD5SIG is not set -+# CONFIG_IP_VS is not set -+# CONFIG_IPV6 is not set -+# CONFIG_INET6_XFRM_TUNNEL is not set -+# CONFIG_INET6_TUNNEL is not set -+# CONFIG_NETWORK_SECMARK is not set -+CONFIG_NETFILTER=y -+# CONFIG_NETFILTER_DEBUG is not set -+ -+# -+# Core Netfilter Configuration -+# -+# CONFIG_NETFILTER_NETLINK is not set -+CONFIG_NF_CONNTRACK_ENABLED=m -+CONFIG_NF_CONNTRACK=m -+# CONFIG_NF_CT_ACCT is not set -+# CONFIG_NF_CONNTRACK_MARK is not set -+# CONFIG_NF_CONNTRACK_EVENTS is not set -+# CONFIG_NF_CT_PROTO_SCTP is not set -+# CONFIG_NF_CT_PROTO_UDPLITE is not set -+# CONFIG_NF_CONNTRACK_AMANDA is not set -+CONFIG_NF_CONNTRACK_FTP=m -+# CONFIG_NF_CONNTRACK_H323 is not set -+CONFIG_NF_CONNTRACK_IRC=m -+# CONFIG_NF_CONNTRACK_NETBIOS_NS is not set -+# CONFIG_NF_CONNTRACK_PPTP is not set -+# CONFIG_NF_CONNTRACK_SANE is not set -+CONFIG_NF_CONNTRACK_SIP=m -+CONFIG_NF_CONNTRACK_TFTP=m -+CONFIG_NETFILTER_XTABLES=m -+# CONFIG_NETFILTER_XT_TARGET_CLASSIFY is not set -+# CONFIG_NETFILTER_XT_TARGET_MARK is not set -+# CONFIG_NETFILTER_XT_TARGET_NFQUEUE is not set -+# CONFIG_NETFILTER_XT_TARGET_NFLOG is not set -+# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set -+# CONFIG_NETFILTER_XT_MATCH_COMMENT is not set -+# CONFIG_NETFILTER_XT_MATCH_CONNBYTES is not set -+# CONFIG_NETFILTER_XT_MATCH_CONNLIMIT is not set -+# CONFIG_NETFILTER_XT_MATCH_CONNMARK is not set -+# CONFIG_NETFILTER_XT_MATCH_CONNTRACK is not set -+# CONFIG_NETFILTER_XT_MATCH_DCCP is not set -+# CONFIG_NETFILTER_XT_MATCH_DSCP is not set -+# CONFIG_NETFILTER_XT_MATCH_ESP is not set -+# CONFIG_NETFILTER_XT_MATCH_HELPER is not set -+# CONFIG_NETFILTER_XT_MATCH_LENGTH is not set -+# CONFIG_NETFILTER_XT_MATCH_LIMIT is not set -+# CONFIG_NETFILTER_XT_MATCH_MAC is not set -+# CONFIG_NETFILTER_XT_MATCH_MARK is not set -+# CONFIG_NETFILTER_XT_MATCH_MULTIPORT is not set -+# CONFIG_NETFILTER_XT_MATCH_PKTTYPE is not set -+# CONFIG_NETFILTER_XT_MATCH_QUOTA is not set -+# CONFIG_NETFILTER_XT_MATCH_REALM is not set -+# CONFIG_NETFILTER_XT_MATCH_SCTP is not set -+# CONFIG_NETFILTER_XT_MATCH_STATE is not set -+# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set -+# CONFIG_NETFILTER_XT_MATCH_STRING is not set -+# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set -+# CONFIG_NETFILTER_XT_MATCH_U32 is not set -+# CONFIG_NETFILTER_XT_MATCH_HASHLIMIT is not set -+ -+# -+# IP: Netfilter Configuration -+# -+CONFIG_NF_CONNTRACK_IPV4=m -+CONFIG_NF_CONNTRACK_PROC_COMPAT=y -+# CONFIG_IP_NF_QUEUE is not set -+CONFIG_IP_NF_IPTABLES=m -+# CONFIG_IP_NF_MATCH_IPRANGE is not set -+# CONFIG_IP_NF_MATCH_TOS is not set -+# CONFIG_IP_NF_MATCH_RECENT is not set -+# CONFIG_IP_NF_MATCH_ECN is not set -+# CONFIG_IP_NF_MATCH_AH is not set -+# CONFIG_IP_NF_MATCH_TTL is not set -+# CONFIG_IP_NF_MATCH_OWNER is not set -+# CONFIG_IP_NF_MATCH_ADDRTYPE is not set -+CONFIG_IP_NF_FILTER=m -+CONFIG_IP_NF_TARGET_REJECT=m -+CONFIG_IP_NF_TARGET_LOG=m -+# CONFIG_IP_NF_TARGET_ULOG is not set -+CONFIG_NF_NAT=m -+CONFIG_NF_NAT_NEEDED=y -+CONFIG_IP_NF_TARGET_MASQUERADE=m -+CONFIG_IP_NF_TARGET_REDIRECT=m -+# CONFIG_IP_NF_TARGET_NETMAP is not set -+# CONFIG_IP_NF_TARGET_SAME is not set -+# CONFIG_NF_NAT_SNMP_BASIC is not set -+CONFIG_NF_NAT_FTP=m -+CONFIG_NF_NAT_IRC=m -+CONFIG_NF_NAT_TFTP=m -+# CONFIG_NF_NAT_AMANDA is not set -+# CONFIG_NF_NAT_PPTP is not set -+# CONFIG_NF_NAT_H323 is not set -+CONFIG_NF_NAT_SIP=m -+# CONFIG_IP_NF_MANGLE is not set -+# CONFIG_IP_NF_RAW is not set -+# CONFIG_IP_NF_ARPTABLES is not set -+# CONFIG_IP_DCCP is not set -+# CONFIG_IP_SCTP is not set -+# CONFIG_TIPC is not set -+# CONFIG_ATM is not set -+# CONFIG_BRIDGE is not set -+# CONFIG_VLAN_8021Q is not set -+# CONFIG_DECNET is not set -+# CONFIG_LLC2 is not set -+# CONFIG_IPX is not set -+# CONFIG_ATALK is not set -+# CONFIG_X25 is not set -+# CONFIG_LAPB is not set -+# CONFIG_ECONET is not set -+# CONFIG_WAN_ROUTER is not set -+ -+# -+# QoS and/or fair queueing -+# -+# CONFIG_NET_SCHED is not set -+ -+# -+# Network testing -+# -+# CONFIG_NET_PKTGEN is not set -+# CONFIG_HAMRADIO is not set -+# CONFIG_IRDA is not set -+# CONFIG_BT is not set -+# CONFIG_AF_RXRPC is not set -+ -+# -+# Wireless -+# -+# CONFIG_CFG80211 is not set -+# CONFIG_WIRELESS_EXT is not set -+# CONFIG_MAC80211 is not set -+# CONFIG_IEEE80211 is not set -+# CONFIG_RFKILL is not set -+# CONFIG_NET_9P is not set -+ -+# -+# Device Drivers -+# -+ -+# -+# Generic Driver Options -+# -+# CONFIG_STANDALONE is not set -+CONFIG_PREVENT_FIRMWARE_BUILD=y -+# CONFIG_FW_LOADER is not set -+# CONFIG_DEBUG_DRIVER is not set -+# CONFIG_DEBUG_DEVRES is not set -+# CONFIG_SYS_HYPERVISOR is not set -+# CONFIG_CONNECTOR is not set -+# CONFIG_MTD is not set -+CONFIG_OF_DEVICE=y -+# CONFIG_PARPORT is not set -+CONFIG_BLK_DEV=y -+CONFIG_BLK_DEV_FD=y -+# CONFIG_BLK_CPQ_DA is not set -+# CONFIG_BLK_CPQ_CISS_DA is not set -+# CONFIG_BLK_DEV_DAC960 is not set -+# CONFIG_BLK_DEV_UMEM is not set -+# CONFIG_BLK_DEV_COW_COMMON is not set -+CONFIG_BLK_DEV_LOOP=y -+# CONFIG_BLK_DEV_CRYPTOLOOP is not set -+# CONFIG_BLK_DEV_NBD is not set -+# CONFIG_BLK_DEV_SX8 is not set -+# CONFIG_BLK_DEV_UB is not set -+CONFIG_BLK_DEV_RAM=y -+CONFIG_BLK_DEV_RAM_COUNT=16 -+CONFIG_BLK_DEV_RAM_SIZE=4096 -+CONFIG_BLK_DEV_RAM_BLOCKSIZE=1024 -+# CONFIG_CDROM_PKTCDVD is not set -+# CONFIG_ATA_OVER_ETH is not set -+CONFIG_MISC_DEVICES=y -+# CONFIG_PHANTOM is not set -+# CONFIG_EEPROM_93CX6 is not set -+# CONFIG_SGI_IOC4 is not set -+# CONFIG_TIFM_CORE is not set -+CONFIG_IDE=y -+CONFIG_BLK_DEV_IDE=y -+ -+# -+# Please see Documentation/ide.txt for help/info on IDE drives -+# -+# CONFIG_BLK_DEV_IDE_SATA is not set -+CONFIG_BLK_DEV_IDEDISK=y -+CONFIG_IDEDISK_MULTI_MODE=y -+CONFIG_BLK_DEV_IDECD=y -+# CONFIG_BLK_DEV_IDETAPE is not set -+# CONFIG_BLK_DEV_IDEFLOPPY is not set -+# CONFIG_IDE_TASK_IOCTL is not set -+CONFIG_IDE_PROC_FS=y -+ -+# -+# IDE chipset support/bugfixes -+# -+CONFIG_IDE_GENERIC=y -+CONFIG_BLK_DEV_IDEPCI=y -+CONFIG_IDEPCI_SHARE_IRQ=y -+CONFIG_IDEPCI_PCIBUS_ORDER=y -+# CONFIG_BLK_DEV_OFFBOARD is not set -+CONFIG_BLK_DEV_GENERIC=y -+# CONFIG_BLK_DEV_OPTI621 is not set -+CONFIG_BLK_DEV_IDEDMA_PCI=y -+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set -+# CONFIG_IDEDMA_ONLYDISK is not set -+# CONFIG_BLK_DEV_AEC62XX is not set -+# CONFIG_BLK_DEV_ALI15X3 is not set -+# CONFIG_BLK_DEV_AMD74XX is not set -+# CONFIG_BLK_DEV_CMD64X is not set -+# CONFIG_BLK_DEV_TRIFLEX is not set -+# CONFIG_BLK_DEV_CY82C693 is not set -+# CONFIG_BLK_DEV_CS5520 is not set -+# CONFIG_BLK_DEV_CS5530 is not set -+# CONFIG_BLK_DEV_HPT34X is not set -+# CONFIG_BLK_DEV_HPT366 is not set -+# CONFIG_BLK_DEV_JMICRON is not set -+# CONFIG_BLK_DEV_SC1200 is not set -+# CONFIG_BLK_DEV_PIIX is not set -+# CONFIG_BLK_DEV_IT8213 is not set -+# CONFIG_BLK_DEV_IT821X is not set -+# CONFIG_BLK_DEV_NS87415 is not set -+# CONFIG_BLK_DEV_PDC202XX_OLD is not set -+# CONFIG_BLK_DEV_PDC202XX_NEW is not set -+# CONFIG_BLK_DEV_SVWKS is not set -+# CONFIG_BLK_DEV_SIIMAGE is not set -+# CONFIG_BLK_DEV_SL82C105 is not set -+# CONFIG_BLK_DEV_SLC90E66 is not set -+# CONFIG_BLK_DEV_TRM290 is not set -+# CONFIG_BLK_DEV_VIA82CXXX is not set -+# CONFIG_BLK_DEV_TC86C001 is not set -+# CONFIG_IDE_ARM is not set -+CONFIG_BLK_DEV_IDEDMA=y -+# CONFIG_IDEDMA_IVB is not set -+# CONFIG_BLK_DEV_HD is not set -+ -+# -+# SCSI device support -+# -+# CONFIG_RAID_ATTRS is not set -+# CONFIG_SCSI is not set -+# CONFIG_SCSI_DMA is not set -+# CONFIG_SCSI_NETLINK is not set -+# CONFIG_ATA is not set -+# CONFIG_MD is not set -+ -+# -+# Fusion MPT device support -+# -+# CONFIG_FUSION is not set -+ -+# -+# IEEE 1394 (FireWire) support -+# -+# CONFIG_FIREWIRE is not set -+# CONFIG_IEEE1394 is not set -+# CONFIG_I2O is not set -+# CONFIG_MACINTOSH_DRIVERS is not set -+CONFIG_NETDEVICES=y -+# CONFIG_NETDEVICES_MULTIQUEUE is not set -+# CONFIG_DUMMY is not set -+# CONFIG_BONDING is not set -+# CONFIG_MACVLAN is not set -+# CONFIG_EQUALIZER is not set -+# CONFIG_TUN is not set -+# CONFIG_ARCNET is not set -+# CONFIG_PHYLIB is not set -+CONFIG_NET_ETHERNET=y -+CONFIG_MII=y -+# CONFIG_HAPPYMEAL is not set -+# CONFIG_SUNGEM is not set -+# CONFIG_CASSINI is not set -+# CONFIG_NET_VENDOR_3COM is not set -+# CONFIG_NET_TULIP is not set -+# CONFIG_HP100 is not set -+CONFIG_NET_PCI=y -+CONFIG_PCNET32=y -+# CONFIG_PCNET32_NAPI is not set -+# CONFIG_AMD8111_ETH is not set -+# CONFIG_ADAPTEC_STARFIRE is not set -+# CONFIG_B44 is not set -+# CONFIG_FORCEDETH is not set -+# CONFIG_DGRS is not set -+# CONFIG_EEPRO100 is not set -+# CONFIG_E100 is not set -+# CONFIG_FEALNX is not set -+# CONFIG_NATSEMI is not set -+CONFIG_NE2K_PCI=m -+CONFIG_8139CP=y -+CONFIG_8139TOO=y -+# CONFIG_8139TOO_PIO is not set -+# CONFIG_8139TOO_TUNE_TWISTER is not set -+# CONFIG_8139TOO_8129 is not set -+# CONFIG_8139_OLD_RX_RESET is not set -+# CONFIG_SIS900 is not set -+# CONFIG_EPIC100 is not set -+# CONFIG_SUNDANCE is not set -+# CONFIG_TLAN is not set -+# CONFIG_VIA_RHINE is not set -+# CONFIG_SC92031 is not set -+# CONFIG_NETDEV_1000 is not set -+# CONFIG_NETDEV_10000 is not set -+# CONFIG_TR is not set -+ -+# -+# Wireless LAN -+# -+# CONFIG_WLAN_PRE80211 is not set -+# CONFIG_WLAN_80211 is not set -+ -+# -+# USB Network Adapters -+# -+# CONFIG_USB_CATC is not set -+# CONFIG_USB_KAWETH is not set -+# CONFIG_USB_PEGASUS is not set -+# CONFIG_USB_RTL8150 is not set -+# CONFIG_USB_USBNET_MII is not set -+# CONFIG_USB_USBNET is not set -+# CONFIG_WAN is not set -+# CONFIG_FDDI is not set -+# CONFIG_HIPPI is not set -+CONFIG_PPP=m -+CONFIG_PPP_MULTILINK=y -+CONFIG_PPP_FILTER=y -+CONFIG_PPP_ASYNC=m -+CONFIG_PPP_SYNC_TTY=m -+CONFIG_PPP_DEFLATE=m -+CONFIG_PPP_BSDCOMP=m -+CONFIG_PPP_MPPE=m -+CONFIG_PPPOE=m -+# CONFIG_PPPOL2TP is not set -+# CONFIG_SLIP is not set -+CONFIG_SLHC=m -+# CONFIG_SHAPER is not set -+# CONFIG_NETCONSOLE is not set -+# CONFIG_NETPOLL is not set -+# CONFIG_NET_POLL_CONTROLLER is not set -+# CONFIG_ISDN is not set -+# CONFIG_PHONE is not set -+ -+# -+# Input device support -+# -+CONFIG_INPUT=y -+# CONFIG_INPUT_FF_MEMLESS is not set -+# CONFIG_INPUT_POLLDEV is not set -+ -+# -+# Userland interfaces -+# -+CONFIG_INPUT_MOUSEDEV=y -+CONFIG_INPUT_MOUSEDEV_PSAUX=y -+CONFIG_INPUT_MOUSEDEV_SCREEN_X=1024 -+CONFIG_INPUT_MOUSEDEV_SCREEN_Y=768 -+# CONFIG_INPUT_JOYDEV is not set -+CONFIG_INPUT_TSDEV=m -+CONFIG_INPUT_TSDEV_SCREEN_X=240 -+CONFIG_INPUT_TSDEV_SCREEN_Y=320 -+CONFIG_INPUT_EVDEV=y -+# CONFIG_INPUT_EVBUG is not set -+ -+# -+# Input Device Drivers -+# -+CONFIG_INPUT_KEYBOARD=y -+CONFIG_KEYBOARD_ATKBD=y -+# CONFIG_KEYBOARD_SUNKBD is not set -+# CONFIG_KEYBOARD_LKKBD is not set -+# CONFIG_KEYBOARD_XTKBD is not set -+# CONFIG_KEYBOARD_NEWTON is not set -+# CONFIG_KEYBOARD_STOWAWAY is not set -+CONFIG_INPUT_MOUSE=y -+CONFIG_MOUSE_PS2=y -+CONFIG_MOUSE_PS2_ALPS=y -+CONFIG_MOUSE_PS2_LOGIPS2PP=y -+CONFIG_MOUSE_PS2_SYNAPTICS=y -+CONFIG_MOUSE_PS2_LIFEBOOK=y -+CONFIG_MOUSE_PS2_TRACKPOINT=y -+# CONFIG_MOUSE_PS2_TOUCHKIT is not set -+# CONFIG_MOUSE_SERIAL is not set -+# CONFIG_MOUSE_APPLETOUCH is not set -+# CONFIG_MOUSE_VSXXXAA is not set -+# CONFIG_INPUT_JOYSTICK is not set -+CONFIG_INPUT_TABLET=y -+# CONFIG_TABLET_USB_ACECAD is not set -+# CONFIG_TABLET_USB_AIPTEK is not set -+# CONFIG_TABLET_USB_GTCO is not set -+# CONFIG_TABLET_USB_KBTAB is not set -+# CONFIG_TABLET_USB_WACOM is not set -+# CONFIG_INPUT_TOUCHSCREEN is not set -+CONFIG_INPUT_MISC=y -+# CONFIG_INPUT_ATI_REMOTE is not set -+# CONFIG_INPUT_ATI_REMOTE2 is not set -+# CONFIG_INPUT_KEYSPAN_REMOTE is not set -+# CONFIG_INPUT_POWERMATE is not set -+# CONFIG_INPUT_YEALINK is not set -+CONFIG_INPUT_UINPUT=y -+ -+# -+# Hardware I/O ports -+# -+CONFIG_SERIO=y -+CONFIG_SERIO_I8042=y -+# CONFIG_SERIO_SERPORT is not set -+# CONFIG_SERIO_PCIPS2 is not set -+CONFIG_SERIO_LIBPS2=y -+# CONFIG_SERIO_RAW is not set -+# CONFIG_GAMEPORT is not set -+ -+# -+# Character devices -+# -+CONFIG_VT=y -+CONFIG_VT_CONSOLE=y -+CONFIG_HW_CONSOLE=y -+# CONFIG_VT_HW_CONSOLE_BINDING is not set -+# CONFIG_SERIAL_NONSTANDARD is not set -+ -+# -+# Serial drivers -+# -+CONFIG_SERIAL_8250=y -+CONFIG_SERIAL_8250_CONSOLE=y -+CONFIG_SERIAL_8250_PCI=y -+CONFIG_SERIAL_8250_NR_UARTS=4 -+CONFIG_SERIAL_8250_RUNTIME_UARTS=4 -+# CONFIG_SERIAL_8250_EXTENDED is not set -+ -+# -+# Non-8250 serial port support -+# -+# CONFIG_SERIAL_UARTLITE is not set -+CONFIG_SERIAL_CORE=y -+CONFIG_SERIAL_CORE_CONSOLE=y -+# CONFIG_SERIAL_JSM is not set -+# CONFIG_SERIAL_OF_PLATFORM is not set -+CONFIG_UNIX98_PTYS=y -+CONFIG_LEGACY_PTYS=y -+CONFIG_LEGACY_PTY_COUNT=256 -+# CONFIG_IPMI_HANDLER is not set -+# CONFIG_WATCHDOG is not set -+CONFIG_HW_RANDOM=m -+CONFIG_NVRAM=y -+CONFIG_GEN_RTC=y -+# CONFIG_GEN_RTC_X is not set -+# CONFIG_R3964 is not set -+# CONFIG_APPLICOM is not set -+# CONFIG_AGP is not set -+# CONFIG_DRM is not set -+# CONFIG_RAW_DRIVER is not set -+# CONFIG_TCG_TPM is not set -+CONFIG_DEVPORT=y -+CONFIG_I2C=y -+CONFIG_I2C_BOARDINFO=y -+# CONFIG_I2C_CHARDEV is not set -+ -+# -+# I2C Algorithms -+# -+CONFIG_I2C_ALGOBIT=y -+# CONFIG_I2C_ALGOPCF is not set -+# CONFIG_I2C_ALGOPCA is not set -+ -+# -+# I2C Hardware Bus support -+# -+# CONFIG_I2C_ALI1535 is not set -+# CONFIG_I2C_ALI1563 is not set -+# CONFIG_I2C_ALI15X3 is not set -+# CONFIG_I2C_AMD756 is not set -+# CONFIG_I2C_AMD8111 is not set -+# CONFIG_I2C_I801 is not set -+# CONFIG_I2C_I810 is not set -+# CONFIG_I2C_PIIX4 is not set -+# CONFIG_I2C_MPC is not set -+# CONFIG_I2C_NFORCE2 is not set -+# CONFIG_I2C_OCORES is not set -+# CONFIG_I2C_PARPORT_LIGHT is not set -+# CONFIG_I2C_PROSAVAGE is not set -+# CONFIG_I2C_SAVAGE4 is not set -+# CONFIG_I2C_SIMTEC is not set -+# CONFIG_I2C_SIS5595 is not set -+# CONFIG_I2C_SIS630 is not set -+# CONFIG_I2C_SIS96X is not set -+# CONFIG_I2C_TAOS_EVM is not set -+# CONFIG_I2C_STUB is not set -+# CONFIG_I2C_TINY_USB is not set -+# CONFIG_I2C_VIA is not set -+# CONFIG_I2C_VIAPRO is not set -+# CONFIG_I2C_VOODOO3 is not set -+ -+# -+# Miscellaneous I2C Chip support -+# -+# CONFIG_SENSORS_DS1337 is not set -+# CONFIG_SENSORS_DS1374 is not set -+# CONFIG_DS1682 is not set -+# CONFIG_SENSORS_EEPROM is not set -+# CONFIG_SENSORS_PCF8574 is not set -+# CONFIG_SENSORS_PCA9539 is not set -+# CONFIG_SENSORS_PCF8591 is not set -+# CONFIG_SENSORS_M41T00 is not set -+# CONFIG_SENSORS_MAX6875 is not set -+# CONFIG_SENSORS_TSL2550 is not set -+# CONFIG_I2C_DEBUG_CORE is not set -+# CONFIG_I2C_DEBUG_ALGO is not set -+# CONFIG_I2C_DEBUG_BUS is not set -+# CONFIG_I2C_DEBUG_CHIP is not set -+ -+# -+# SPI support -+# -+# CONFIG_SPI is not set -+# CONFIG_SPI_MASTER is not set -+# CONFIG_W1 is not set -+# CONFIG_POWER_SUPPLY is not set -+# CONFIG_HWMON is not set -+ -+# -+# Multifunction device drivers -+# -+# CONFIG_MFD_SM501 is not set -+ -+# -+# Multimedia devices -+# -+# CONFIG_VIDEO_DEV is not set -+# CONFIG_DVB_CORE is not set -+# CONFIG_DAB is not set -+ -+# -+# Graphics support -+# -+# CONFIG_BACKLIGHT_LCD_SUPPORT is not set -+ -+# -+# Display device support -+# -+CONFIG_DISPLAY_SUPPORT=m -+ -+# -+# Display hardware drivers -+# -+# CONFIG_VGASTATE is not set -+# CONFIG_VIDEO_OUTPUT_CONTROL is not set -+# CONFIG_FB is not set -+# CONFIG_FB_IBM_GXT4500 is not set -+ -+# -+# Console display driver support -+# -+CONFIG_VGA_CONSOLE=y -+# CONFIG_VGACON_SOFT_SCROLLBACK is not set -+CONFIG_DUMMY_CONSOLE=y -+ -+# -+# Sound -+# -+# CONFIG_SOUND is not set -+CONFIG_HID_SUPPORT=y -+CONFIG_HID=y -+# CONFIG_HID_DEBUG is not set -+ -+# -+# USB Input Devices -+# -+CONFIG_USB_HID=y -+# CONFIG_USB_HIDINPUT_POWERBOOK is not set -+# CONFIG_HID_FF is not set -+# CONFIG_USB_HIDDEV is not set -+CONFIG_USB_SUPPORT=y -+CONFIG_USB_ARCH_HAS_HCD=y -+CONFIG_USB_ARCH_HAS_OHCI=y -+CONFIG_USB_ARCH_HAS_EHCI=y -+CONFIG_USB=y -+# CONFIG_USB_DEBUG is not set -+ -+# -+# Miscellaneous USB options -+# -+CONFIG_USB_DEVICEFS=y -+CONFIG_USB_DEVICE_CLASS=y -+# CONFIG_USB_DYNAMIC_MINORS is not set -+# CONFIG_USB_OTG is not set -+ -+# -+# USB Host Controller Drivers -+# -+# CONFIG_USB_EHCI_HCD is not set -+# CONFIG_USB_ISP116X_HCD is not set -+CONFIG_USB_OHCI_HCD=y -+# CONFIG_USB_OHCI_HCD_PPC_OF is not set -+# CONFIG_USB_OHCI_BIG_ENDIAN_DESC is not set -+# CONFIG_USB_OHCI_BIG_ENDIAN_MMIO is not set -+CONFIG_USB_OHCI_LITTLE_ENDIAN=y -+# CONFIG_USB_UHCI_HCD is not set -+# CONFIG_USB_SL811_HCD is not set -+# CONFIG_USB_R8A66597_HCD is not set -+ -+# -+# USB Device Class drivers -+# -+# CONFIG_USB_ACM is not set -+# CONFIG_USB_PRINTER is not set -+ -+# -+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' -+# -+ -+# -+# may also be needed; see USB_STORAGE Help for more information -+# -+# CONFIG_USB_LIBUSUAL is not set -+ -+# -+# USB Imaging devices -+# -+# CONFIG_USB_MDC800 is not set -+CONFIG_USB_MON=y -+ -+# -+# USB port drivers -+# -+ -+# -+# USB Serial Converter support -+# -+# CONFIG_USB_SERIAL is not set -+ -+# -+# USB Miscellaneous drivers -+# -+# CONFIG_USB_EMI62 is not set -+# CONFIG_USB_EMI26 is not set -+# CONFIG_USB_ADUTUX is not set -+# CONFIG_USB_AUERSWALD is not set -+# CONFIG_USB_RIO500 is not set -+# CONFIG_USB_LEGOTOWER is not set -+# CONFIG_USB_LCD is not set -+# CONFIG_USB_BERRY_CHARGE is not set -+# CONFIG_USB_LED is not set -+# CONFIG_USB_CYPRESS_CY7C63 is not set -+# CONFIG_USB_CYTHERM is not set -+# CONFIG_USB_PHIDGET is not set -+# CONFIG_USB_IDMOUSE is not set -+# CONFIG_USB_FTDI_ELAN is not set -+# CONFIG_USB_APPLEDISPLAY is not set -+# CONFIG_USB_LD is not set -+# CONFIG_USB_TRANCEVIBRATOR is not set -+# CONFIG_USB_IOWARRIOR is not set -+# CONFIG_USB_TEST is not set -+ -+# -+# USB DSL modem support -+# -+ -+# -+# USB Gadget Support -+# -+# CONFIG_USB_GADGET is not set -+# CONFIG_MMC is not set -+# CONFIG_NEW_LEDS is not set -+# CONFIG_INFINIBAND is not set -+# CONFIG_EDAC is not set -+# CONFIG_RTC_CLASS is not set -+ -+# -+# DMA Engine support -+# -+# CONFIG_DMA_ENGINE is not set -+ -+# -+# DMA Clients -+# -+ -+# -+# DMA Devices -+# -+ -+# -+# Userspace I/O -+# -+# CONFIG_UIO is not set -+ -+# -+# File systems -+# -+CONFIG_EXT2_FS=y -+# CONFIG_EXT2_FS_XATTR is not set -+# CONFIG_EXT2_FS_XIP is not set -+CONFIG_EXT3_FS=y -+CONFIG_EXT3_FS_XATTR=y -+# CONFIG_EXT3_FS_POSIX_ACL is not set -+# CONFIG_EXT3_FS_SECURITY is not set -+# CONFIG_EXT4DEV_FS is not set -+CONFIG_JBD=y -+# CONFIG_JBD_DEBUG is not set -+CONFIG_FS_MBCACHE=y -+# CONFIG_REISERFS_FS is not set -+# CONFIG_JFS_FS is not set -+# CONFIG_FS_POSIX_ACL is not set -+# CONFIG_XFS_FS is not set -+# CONFIG_GFS2_FS is not set -+# CONFIG_OCFS2_FS is not set -+# CONFIG_MINIX_FS is not set -+# CONFIG_ROMFS_FS is not set -+CONFIG_INOTIFY=y -+CONFIG_INOTIFY_USER=y -+# CONFIG_QUOTA is not set -+CONFIG_DNOTIFY=y -+# CONFIG_AUTOFS_FS is not set -+# CONFIG_AUTOFS4_FS is not set -+# CONFIG_FUSE_FS is not set -+ -+# -+# CD-ROM/DVD Filesystems -+# -+CONFIG_ISO9660_FS=y -+# CONFIG_JOLIET is not set -+# CONFIG_ZISOFS is not set -+# CONFIG_UDF_FS is not set -+ -+# -+# DOS/FAT/NT Filesystems -+# -+CONFIG_FAT_FS=m -+CONFIG_MSDOS_FS=m -+CONFIG_VFAT_FS=m -+CONFIG_FAT_DEFAULT_CODEPAGE=437 -+CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" -+# CONFIG_NTFS_FS is not set -+ -+# -+# Pseudo filesystems -+# -+CONFIG_PROC_FS=y -+CONFIG_PROC_KCORE=y -+CONFIG_PROC_SYSCTL=y -+CONFIG_SYSFS=y -+CONFIG_TMPFS=y -+# CONFIG_TMPFS_POSIX_ACL is not set -+# CONFIG_HUGETLB_PAGE is not set -+CONFIG_RAMFS=y -+# CONFIG_CONFIGFS_FS is not set -+ -+# -+# Miscellaneous filesystems -+# -+# CONFIG_ADFS_FS is not set -+# CONFIG_AFFS_FS is not set -+# CONFIG_HFS_FS is not set -+# CONFIG_HFSPLUS_FS is not set -+# CONFIG_BEFS_FS is not set -+# CONFIG_BFS_FS is not set -+# CONFIG_EFS_FS is not set -+# CONFIG_CRAMFS is not set -+# CONFIG_VXFS_FS is not set -+# CONFIG_HPFS_FS is not set -+# CONFIG_QNX4FS_FS is not set -+# CONFIG_SYSV_FS is not set -+# CONFIG_UFS_FS is not set -+ -+# -+# Network File Systems -+# -+# CONFIG_NFS_FS is not set -+# CONFIG_NFSD is not set -+# CONFIG_SMB_FS is not set -+# CONFIG_CIFS is not set -+# CONFIG_NCP_FS is not set -+# CONFIG_CODA_FS is not set -+# CONFIG_AFS_FS is not set -+ -+# -+# Partition Types -+# -+CONFIG_PARTITION_ADVANCED=y -+# CONFIG_ACORN_PARTITION is not set -+# CONFIG_OSF_PARTITION is not set -+# CONFIG_AMIGA_PARTITION is not set -+# CONFIG_ATARI_PARTITION is not set -+CONFIG_MAC_PARTITION=y -+CONFIG_MSDOS_PARTITION=y -+# CONFIG_BSD_DISKLABEL is not set -+# CONFIG_MINIX_SUBPARTITION is not set -+# CONFIG_SOLARIS_X86_PARTITION is not set -+# CONFIG_UNIXWARE_DISKLABEL is not set -+# CONFIG_LDM_PARTITION is not set -+# CONFIG_SGI_PARTITION is not set -+# CONFIG_ULTRIX_PARTITION is not set -+# CONFIG_SUN_PARTITION is not set -+# CONFIG_KARMA_PARTITION is not set -+# CONFIG_EFI_PARTITION is not set -+# CONFIG_SYSV68_PARTITION is not set -+ -+# -+# Native Language Support -+# -+CONFIG_NLS=y -+CONFIG_NLS_DEFAULT="iso8859-1" -+# CONFIG_NLS_CODEPAGE_437 is not set -+# CONFIG_NLS_CODEPAGE_737 is not set -+# CONFIG_NLS_CODEPAGE_775 is not set -+# CONFIG_NLS_CODEPAGE_850 is not set -+# CONFIG_NLS_CODEPAGE_852 is not set -+# CONFIG_NLS_CODEPAGE_855 is not set -+# CONFIG_NLS_CODEPAGE_857 is not set -+# CONFIG_NLS_CODEPAGE_860 is not set -+# CONFIG_NLS_CODEPAGE_861 is not set -+# CONFIG_NLS_CODEPAGE_862 is not set -+# CONFIG_NLS_CODEPAGE_863 is not set -+# CONFIG_NLS_CODEPAGE_864 is not set -+# CONFIG_NLS_CODEPAGE_865 is not set -+# CONFIG_NLS_CODEPAGE_866 is not set -+# CONFIG_NLS_CODEPAGE_869 is not set -+# CONFIG_NLS_CODEPAGE_936 is not set -+# CONFIG_NLS_CODEPAGE_950 is not set -+# CONFIG_NLS_CODEPAGE_932 is not set -+# CONFIG_NLS_CODEPAGE_949 is not set -+# CONFIG_NLS_CODEPAGE_874 is not set -+# CONFIG_NLS_ISO8859_8 is not set -+# CONFIG_NLS_CODEPAGE_1250 is not set -+# CONFIG_NLS_CODEPAGE_1251 is not set -+CONFIG_NLS_ASCII=y -+CONFIG_NLS_ISO8859_1=m -+# CONFIG_NLS_ISO8859_2 is not set -+# CONFIG_NLS_ISO8859_3 is not set -+# CONFIG_NLS_ISO8859_4 is not set -+# CONFIG_NLS_ISO8859_5 is not set -+# CONFIG_NLS_ISO8859_6 is not set -+# CONFIG_NLS_ISO8859_7 is not set -+# CONFIG_NLS_ISO8859_9 is not set -+# CONFIG_NLS_ISO8859_13 is not set -+# CONFIG_NLS_ISO8859_14 is not set -+# CONFIG_NLS_ISO8859_15 is not set -+# CONFIG_NLS_KOI8_R is not set -+# CONFIG_NLS_KOI8_U is not set -+# CONFIG_NLS_UTF8 is not set -+ -+# -+# Distributed Lock Manager -+# -+# CONFIG_DLM is not set -+# CONFIG_UCC_SLOW is not set -+ -+# -+# Library routines -+# -+CONFIG_BITREVERSE=y -+CONFIG_CRC_CCITT=m -+# CONFIG_CRC16 is not set -+# CONFIG_CRC_ITU_T is not set -+CONFIG_CRC32=y -+# CONFIG_CRC7 is not set -+# CONFIG_LIBCRC32C is not set -+CONFIG_ZLIB_INFLATE=m -+CONFIG_ZLIB_DEFLATE=m -+CONFIG_PLIST=y -+CONFIG_HAS_IOMEM=y -+CONFIG_HAS_IOPORT=y -+CONFIG_HAS_DMA=y -+ -+# -+# Instrumentation Support -+# -+# CONFIG_PROFILING is not set -+# CONFIG_KPROBES is not set -+ -+# -+# Kernel hacking -+# -+# CONFIG_PRINTK_TIME is not set -+CONFIG_ENABLE_MUST_CHECK=y -+CONFIG_MAGIC_SYSRQ=y -+# CONFIG_UNUSED_SYMBOLS is not set -+# CONFIG_DEBUG_FS is not set -+# CONFIG_HEADERS_CHECK is not set -+CONFIG_DEBUG_KERNEL=y -+# CONFIG_DEBUG_SHIRQ is not set -+CONFIG_DETECT_SOFTLOCKUP=y -+CONFIG_SCHED_DEBUG=y -+# CONFIG_SCHEDSTATS is not set -+# CONFIG_TIMER_STATS is not set -+# CONFIG_DEBUG_SLAB is not set -+# CONFIG_DEBUG_RT_MUTEXES is not set -+# CONFIG_RT_MUTEX_TESTER is not set -+# CONFIG_DEBUG_SPINLOCK is not set -+CONFIG_DEBUG_MUTEXES=y -+CONFIG_DEBUG_SPINLOCK_SLEEP=y -+# CONFIG_DEBUG_LOCKING_API_SELFTESTS is not set -+# CONFIG_DEBUG_KOBJECT is not set -+# CONFIG_DEBUG_HIGHMEM is not set -+CONFIG_DEBUG_BUGVERBOSE=y -+# CONFIG_DEBUG_INFO is not set -+# CONFIG_DEBUG_VM is not set -+# CONFIG_DEBUG_LIST is not set -+CONFIG_FORCED_INLINING=y -+# CONFIG_RCU_TORTURE_TEST is not set -+# CONFIG_FAULT_INJECTION is not set -+# CONFIG_DEBUG_STACKOVERFLOW is not set -+# CONFIG_DEBUG_STACK_USAGE is not set -+# CONFIG_DEBUG_PAGEALLOC is not set -+CONFIG_DEBUGGER=y -+CONFIG_XMON=y -+CONFIG_XMON_DEFAULT=y -+CONFIG_XMON_DISASSEMBLY=y -+# CONFIG_BDI_SWITCH is not set -+# CONFIG_BOOTX_TEXT is not set -+# CONFIG_PPC_EARLY_DEBUG is not set -+ -+# -+# Security options -+# -+# CONFIG_KEYS is not set -+# CONFIG_SECURITY is not set -+CONFIG_CRYPTO=y -+CONFIG_CRYPTO_ALGAPI=m -+CONFIG_CRYPTO_BLKCIPHER=m -+CONFIG_CRYPTO_MANAGER=m -+# CONFIG_CRYPTO_HMAC is not set -+# CONFIG_CRYPTO_XCBC is not set -+# CONFIG_CRYPTO_NULL is not set -+# CONFIG_CRYPTO_MD4 is not set -+# CONFIG_CRYPTO_MD5 is not set -+CONFIG_CRYPTO_SHA1=m -+# CONFIG_CRYPTO_SHA256 is not set -+# CONFIG_CRYPTO_SHA512 is not set -+# CONFIG_CRYPTO_WP512 is not set -+# CONFIG_CRYPTO_TGR192 is not set -+# CONFIG_CRYPTO_GF128MUL is not set -+CONFIG_CRYPTO_ECB=m -+CONFIG_CRYPTO_CBC=m -+CONFIG_CRYPTO_PCBC=m -+# CONFIG_CRYPTO_LRW is not set -+# CONFIG_CRYPTO_CRYPTD is not set -+# CONFIG_CRYPTO_DES is not set -+# CONFIG_CRYPTO_FCRYPT is not set -+# CONFIG_CRYPTO_BLOWFISH is not set -+# CONFIG_CRYPTO_TWOFISH is not set -+# CONFIG_CRYPTO_SERPENT is not set -+# CONFIG_CRYPTO_AES is not set -+# CONFIG_CRYPTO_CAST5 is not set -+# CONFIG_CRYPTO_CAST6 is not set -+# CONFIG_CRYPTO_TEA is not set -+CONFIG_CRYPTO_ARC4=m -+# CONFIG_CRYPTO_KHAZAD is not set -+# CONFIG_CRYPTO_ANUBIS is not set -+# CONFIG_CRYPTO_DEFLATE is not set -+# CONFIG_CRYPTO_MICHAEL_MIC is not set -+# CONFIG_CRYPTO_CRC32C is not set -+# CONFIG_CRYPTO_CAMELLIA is not set -+# CONFIG_CRYPTO_TEST is not set -+# CONFIG_CRYPTO_HW is not set -diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig -index b62aab3..572132c 100644 ---- a/arch/powerpc/platforms/Kconfig -+++ b/arch/powerpc/platforms/Kconfig -@@ -6,6 +6,7 @@ source "arch/powerpc/platforms/chrp/Kconfig" - source "arch/powerpc/platforms/512x/Kconfig" - source "arch/powerpc/platforms/52xx/Kconfig" - source "arch/powerpc/platforms/powermac/Kconfig" -+source "arch/powerpc/platforms/qemu/Kconfig" - source "arch/powerpc/platforms/maple/Kconfig" - source "arch/powerpc/platforms/pasemi/Kconfig" - source "arch/powerpc/platforms/ps3/Kconfig" -diff --git a/arch/powerpc/platforms/Makefile b/arch/powerpc/platforms/Makefile -index 879b4a4..946ba60 100644 ---- a/arch/powerpc/platforms/Makefile -+++ b/arch/powerpc/platforms/Makefile -@@ -15,6 +15,7 @@ obj-$(CONFIG_PPC_83xx) += 83xx/ - obj-$(CONFIG_FSL_SOC_BOOKE) += 85xx/ - obj-$(CONFIG_PPC_86xx) += 86xx/ - obj-$(CONFIG_PPC_POWERNV) += powernv/ -+obj-$(CONFIG_PPC_QEMU) += qemu/ - obj-$(CONFIG_PPC_PSERIES) += pseries/ - obj-$(CONFIG_PPC_MAPLE) += maple/ - obj-$(CONFIG_PPC_PASEMI) += pasemi/ -diff --git a/arch/powerpc/platforms/qemu/Kconfig b/arch/powerpc/platforms/qemu/Kconfig -new file mode 100644 -index 0000000..d64ed92 ---- /dev/null -+++ b/arch/powerpc/platforms/qemu/Kconfig -@@ -0,0 +1,10 @@ -+config PPC_QEMU -+ bool "QEMU emulated PowerPC Reference Platform (PReP) system" -+ depends on PPC_MULTIPLATFORM && PPC32 -+ select PPC_I8259 -+ select PPC_INDIRECT_PCI -+ select PPC_UDBG_16550 -+ select PPC_NATIVE -+ select WANT_DEVICE_TREE -+ default n -+ -diff --git a/arch/powerpc/platforms/qemu/Makefile b/arch/powerpc/platforms/qemu/Makefile -new file mode 100644 -index 0000000..b7288e8 ---- /dev/null -+++ b/arch/powerpc/platforms/qemu/Makefile -@@ -0,0 +1,2 @@ -+obj-y += setup.o -+obj-$(CONFIG_PCI) += pci.o -diff --git a/arch/powerpc/platforms/qemu/pci.c b/arch/powerpc/platforms/qemu/pci.c -new file mode 100644 -index 0000000..2bd3b00 ---- /dev/null -+++ b/arch/powerpc/platforms/qemu/pci.c -@@ -0,0 +1,133 @@ -+/* -+ * prep Port to arch/powerpc: -+ * Copyright 2007 David Gibson, IBM Corporation. -+ * -+ * prep Port to qemu: -+ * Copyright 2007 Milton Miller, IBM Corporation. -+ * -+ * Based on OpenHackware 0.4 -+ * Copyright (c) 2004-2005 Jocelyn Mayer -+ * -+ * pci config based on arch/powerpc/platforms/chrp/pci.c GoldenGate code -+ * -+ */ -+ -+#include <linux/init.h> -+ -+#include <asm/io.h> -+#include <asm/prom.h> -+#include <asm/pci-bridge.h> -+#include <asm/udbg.h> -+ -+static volatile void __iomem *qemu_config_addr(struct pci_bus *bus, -+ unsigned int devfn, int off) -+{ -+ int dev, fn; -+ struct pci_controller *hose = bus->sysdata; -+ -+ if (!hose->cfg_data) -+ return NULL; -+ -+ if (bus->number != 0) -+ return NULL; -+ -+ dev = devfn >> 3; -+ fn = devfn & 7; -+ -+ if (dev < 11 || dev > 21) -+ return NULL; -+ -+ return hose->cfg_data + ((1 << dev) | (fn << 8) | off); -+} -+ -+int qemu_read_config(struct pci_bus *bus, unsigned int devfn, int off, -+ int len, u32 *val) -+{ -+ volatile void __iomem *cfg_data = qemu_config_addr(bus, devfn, off); -+ -+ if (cfg_data == NULL) -+ return PCIBIOS_DEVICE_NOT_FOUND; -+ -+ /* -+ * Note: the caller has already checked that off is -+ * suitably aligned and that len is 1, 2 or 4. -+ */ -+ switch (len) { -+ case 1: -+ *val = in_8(cfg_data); -+ break; -+ case 2: -+ *val = in_le16(cfg_data); -+ break; -+ default: -+ *val = in_le32(cfg_data); -+ break; -+ } -+ return PCIBIOS_SUCCESSFUL; -+} -+ -+int qemu_write_config(struct pci_bus *bus, unsigned int devfn, int off, -+ int len, u32 val) -+{ -+ volatile void __iomem *cfg_data = qemu_config_addr(bus, devfn, off); -+ -+ if (cfg_data == NULL) -+ return PCIBIOS_DEVICE_NOT_FOUND; -+ -+ /* -+ * Note: the caller has already checked that off is -+ * suitably aligned and that len is 1, 2 or 4. -+ */ -+ switch (len) { -+ case 1: -+ out_8(cfg_data, val); -+ break; -+ case 2: -+ out_le16(cfg_data, val); -+ break; -+ default: -+ out_le32(cfg_data, val); -+ break; -+ } -+ return PCIBIOS_SUCCESSFUL; -+} -+ -+static struct pci_ops qemu_pci_ops = -+{ -+ qemu_read_config, -+ qemu_write_config -+}; -+ -+void __init qemu_find_bridges(void) -+{ -+ struct device_node *phb; -+ struct pci_controller *hose; -+ -+ phb = of_find_node_by_type(NULL, "pci"); -+ if (!phb) { -+ printk(KERN_ERR "PReP: Cannot find PCI bridge OF node\n"); -+ return; -+ } -+ -+ hose = pcibios_alloc_controller(phb); -+ if (!hose) -+ return; -+ -+ pci_process_bridge_OF_ranges(hose, phb, 1); -+ -+#define PREP_PCI_DRAM_OFFSET 0x80000000 -+ -+ pci_dram_offset = PREP_PCI_DRAM_OFFSET; -+ ISA_DMA_THRESHOLD = 0x00ffffff; -+ DMA_MODE_READ = 0x44; -+ DMA_MODE_WRITE = 0x48; -+ -+ hose->cfg_data = ioremap(0x80800000, 1 << 22); -+ -+ hose->ops = &qemu_pci_ops; -+ -+ udbg_init_uart(hose->io_base_virt + 0x3f8, 0, 0); -+ register_early_udbg_console(); -+ printk(KERN_INFO "qemu_find_bridges: config at %p\n", hose->cfg_data); -+} -+ -diff --git a/arch/powerpc/platforms/qemu/setup.c b/arch/powerpc/platforms/qemu/setup.c -new file mode 100644 -index 0000000..2d1ecf2 ---- /dev/null -+++ b/arch/powerpc/platforms/qemu/setup.c -@@ -0,0 +1,180 @@ -+/* -+ * Copyright (C) 1995 Linus Torvalds -+ * Adapted from 'alpha' version by Gary Thomas -+ * Modified by Cort Dougan (cort@cs.nmt.edu) -+ * -+ * Support for PReP (Motorola MTX/MVME) -+ * by Troy Benjegerdes (hozer@drgw.net) -+ * -+ * Port to arch/powerpc: -+ * Copyright 2007 David Gibson, IBM Corporation. -+ * -+ * Port to qemu: -+ * Copyright 2007 Milton Miller, IBM Corporation. -+ * -+ * Some information based on OpenHackware 0.4 -+ * Copyright (c) 2004-2005 Jocelyn Mayer -+ * -+ */ -+ -+#include <linux/init.h> -+#include <linux/seq_file.h> -+#include <linux/initrd.h> -+#include <linux/ide.h> -+ -+#include <asm/io.h> -+#include <asm/prom.h> -+#include <asm/pci-bridge.h> -+/* #include <asm/mpic.h> */ -+#include <asm/i8259.h> -+#include <asm/time.h> -+#include <asm/udbg.h> -+ -+static const char *qemu_model = "(unknown)"; -+ -+extern void qemu_find_bridges(void); -+ -+/* cpuinfo code common to all IBM PReP */ -+static void qemu_ibm_cpuinfo(struct seq_file *m) -+{ -+ seq_printf(m, "machine\t\t: PReP %s\n", qemu_model); -+} -+ -+#define NVRAM_AS0 0x74 -+#define NVRAM_AS1 0x75 -+#define NVRAM_DAT 0x77 -+ -+static unsigned char qemu_nvram_read_val(int addr) -+{ -+ outb(NVRAM_AS0, addr & 0xff); -+ outb(NVRAM_AS1, (addr >> 8) & 0xff); -+ return inb(NVRAM_DAT); -+} -+ -+ -+static void qemu_nvram_write_val(int addr, unsigned char val) -+{ -+ outb(NVRAM_AS0, addr & 0xff); -+ outb(NVRAM_AS1, (addr >> 8) & 0xff); -+ outb(NVRAM_DAT, val); -+} -+ -+ -+static void __init qemu_setup_arch(void) -+{ -+ struct device_node *root; -+ const char *model; -+ -+ root = of_find_node_by_path("/"); -+ model = of_get_property(root, "model", NULL); -+ of_node_put(root); -+ if (model) -+ qemu_model = model; -+ -+ /* Lookup PCI host bridges */ -+ qemu_find_bridges(); -+ -+ /* Read in NVRAM data */ -+/* init_qemu_nvram(); */ -+} -+ -+static void __init qemu_init_IRQ(void) -+{ -+ struct device_node *pic = NULL; -+ unsigned long int_ack = 0; -+ -+ pic = of_find_node_by_type(NULL, "i8259"); -+ if (!pic) { -+ printk(KERN_ERR "No interrupt controller found!\n"); -+ return; -+ } -+ -+ /* polling */ -+ i8259_init(pic, int_ack); -+ ppc_md.get_irq = i8259_irq; -+ -+ /* set default host */ -+ irq_set_default_host(i8259_get_host()); -+} -+ -+#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE) -+/* -+ * IDE stuff. -+ */ -+static int qemu_ide_default_irq(unsigned long base) -+{ -+ switch (base) { -+ case 0x1f0: return 13; -+ case 0x170: return 13; -+ case 0x1e8: return 11; -+ case 0x168: return 10; -+ case 0xfff0: return 14; /* MCP(N)750 ide0 */ -+ case 0xffe0: return 15; /* MCP(N)750 ide1 */ -+ default: return 0; -+ } -+} -+ -+static unsigned long qemu_ide_default_io_base(int index) -+{ -+ switch (index) { -+ case 0: return 0x1f0; -+ case 1: return 0x170; -+ case 2: return 0x1e8; -+ case 3: return 0x168; -+ default: -+ return 0; -+ } -+} -+#endif -+ -+#if 0 -+static int __init prep_request_io(void) -+{ -+#ifdef CONFIG_NVRAM -+ request_region(PREP_NVRAM_AS0, 0x8, "nvram"); -+#endif -+ request_region(0x00,0x20,"dma1"); -+ request_region(0x40,0x20,"timer"); -+ request_region(0x80,0x10,"dma page reg"); -+ request_region(0xc0,0x20,"dma2"); -+ -+ return 0; -+} -+device_initcall(prep_request_io); -+#endif -+ -+ -+static int __init qemu_probe(void) -+{ -+ if (!of_flat_dt_is_compatible(of_get_flat_dt_root(), "qemu-prep")) -+ return 0; -+ -+#if 0 -+#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_IDE_MODULE) -+ ppc_ide_md.default_irq = qemu_ide_default_irq; -+ ppc_ide_md.default_io_base = qemu_ide_default_io_base; -+#endif -+#endif -+ -+ return 1; -+} -+ -+define_machine(qemu) { -+ .name = "QEMU", -+ .probe = qemu_probe, -+ .setup_arch = qemu_setup_arch, -+ .progress = udbg_progress, -+ .show_cpuinfo = qemu_ibm_cpuinfo, -+ .init_IRQ = qemu_init_IRQ, -+/* .pcibios_fixup = qemu_pcibios_fixup, */ -+/* .restart = qemu_restart, */ -+/* .power_off = qemu_halt, */ -+/* .halt = qemu_halt, */ -+/* .time_init = todc_time_init, */ -+/* .set_rtc_time = todc_set_rtc_time, */ -+/* .get_rtc_time = todc_get_rtc_time, */ -+ .calibrate_decr = generic_calibrate_decr, -+ .nvram_read_val = qemu_nvram_read_val, -+ .nvram_write_val = qemu_nvram_write_val, -+ .phys_mem_access_prot = pci_phys_mem_access_prot, -+}; diff --git a/bsp/qemu-ppc32/qemu-powerpc-Added-qemu_restart-function.patch b/bsp/qemu-ppc32/qemu-powerpc-Added-qemu_restart-function.patch deleted file mode 100644 index 23713f10..00000000 --- a/bsp/qemu-ppc32/qemu-powerpc-Added-qemu_restart-function.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 4ea81210af681a20d425b52d42285e8c729b6f75 Mon Sep 17 00:00:00 2001 -From: J. Aaron Gamble <john.gamble@windriver.com> -Date: Wed, 22 Sep 2010 11:20:03 -0400 -Subject: [PATCH] qemu/powerpc: Added qemu_restart() function - -qemu_restart code taken from: - - http://www.mail-archive.com/linuxppc-dev@lists.ozlabs.org/msg03147.html - -Updated qemu machine description to use this function - -Signed-off-by: J. Aaron Gamble <john.gamble@windriver.com> ---- - arch/powerpc/platforms/qemu/setup.c | 18 +++++++++++++++++- - 1 files changed, 17 insertions(+), 1 deletions(-) - -diff --git a/arch/powerpc/platforms/qemu/setup.c b/arch/powerpc/platforms/qemu/setup.c -index 2d1ecf2..1f37f71 100644 ---- a/arch/powerpc/platforms/qemu/setup.c -+++ b/arch/powerpc/platforms/qemu/setup.c -@@ -159,6 +159,22 @@ static int __init qemu_probe(void) - return 1; - } - -+void qemu_restart(char *cmd) -+{ -+ local_irq_disable(); /* no interrupts */ -+ /* set exception prefix high - to the prom */ -+ mtmsr(mfmsr() | MSR_IP); -+ -+ /* make sure bit 0 (reset) is a 0 */ -+ outb(inb(0x92) & ~1L, 0x92); -+ /* signal a reset to system control port A - soft reset */ -+ outb(inb(0x92) | 1, 0x92); -+ -+ while(1); -+ -+ /* not reached */ -+} -+ - define_machine(qemu) { - .name = "QEMU", - .probe = qemu_probe, -@@ -167,7 +183,7 @@ define_machine(qemu) { - .show_cpuinfo = qemu_ibm_cpuinfo, - .init_IRQ = qemu_init_IRQ, - /* .pcibios_fixup = qemu_pcibios_fixup, */ --/* .restart = qemu_restart, */ -+ .restart = qemu_restart, - /* .power_off = qemu_halt, */ - /* .halt = qemu_halt, */ - /* .time_init = todc_time_init, */ --- -1.6.5.2 - diff --git a/bsp/qemu-ppc32/qemu-powerpc-work-around-for-qemu-powerpc-32-interru.patch b/bsp/qemu-ppc32/qemu-powerpc-work-around-for-qemu-powerpc-32-interru.patch deleted file mode 100644 index 313a04d7..00000000 --- a/bsp/qemu-ppc32/qemu-powerpc-work-around-for-qemu-powerpc-32-interru.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 209ea269a862451a4bed62f2930c4ba82aaf5368 Mon Sep 17 00:00:00 2001 -From: Jason Wessel <jason.wessel@windriver.com> -Date: Wed, 3 Feb 2010 13:51:19 -0500 -Subject: [PATCH] qemu, powerpc: work around for qemu powerpc 32 interrupts - -Workaround for QEMU powerpc 32 to force interrupt acknoledgement - -Signed-off-by: Jason Wessel <jason.wessel@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> -diff --git a/arch/powerpc/platforms/qemu/Kconfig b/arch/powerpc/platforms/qemu/Kconfig -index d64ed92..366e50c 100644 ---- a/arch/powerpc/platforms/qemu/Kconfig -+++ b/arch/powerpc/platforms/qemu/Kconfig -@@ -1,6 +1,6 @@ - config PPC_QEMU - bool "QEMU emulated PowerPC Reference Platform (PReP) system" -- depends on PPC_MULTIPLATFORM && PPC32 -+ depends on PPC32 - select PPC_I8259 - select PPC_INDIRECT_PCI - select PPC_UDBG_16550 -diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c -index 616ec1c..4a22fa6 100644 ---- a/kernel/irq/chip.c -+++ b/kernel/irq/chip.c -@@ -137,9 +137,18 @@ struct irq_data *irq_get_irq_data(unsigned int irq) - } - EXPORT_SYMBOL_GPL(irq_get_irq_data); - -+#define IRQ_DELAYED_DISABLE 0x10000000 /* IRQ disable (masking) happens delayed. */ -+ - static void irq_state_clr_disabled(struct irq_desc *desc) - { -+#ifdef CONFIG_PPC_QEMU -+ struct irq_desc *desc = irq_data_to_desc(irq); -+ -+ if (!(desc->status & IRQ_DELAYED_DISABLE)) -+ desc->chip->mask(irq); -+#else - irqd_clear(&desc->irq_data, IRQD_IRQ_DISABLED); -+#endif /* CONFIG_PPC_QEMU */ - } - - static void irq_state_set_disabled(struct irq_desc *desc) diff --git a/bsp/qemu-ppc32/qemu-ppc32-rt.cfg b/bsp/qemu-ppc32/qemu-ppc32-rt.cfg index 4de14194..4c8775e6 100644 --- a/bsp/qemu-ppc32/qemu-ppc32-rt.cfg +++ b/bsp/qemu-ppc32/qemu-ppc32-rt.cfg @@ -1,3 +1,2 @@ # SPDX-License-Identifier: MIT -# CONFIG_PROFILING is not set -# CONFIG_OPROFILE is not set +CONFIG_PROFILING=n diff --git a/bsp/qemu-ppc32/qemu-ppc32.cfg b/bsp/qemu-ppc32/qemu-ppc32.cfg index 39a71e5d..ff770844 100644 --- a/bsp/qemu-ppc32/qemu-ppc32.cfg +++ b/bsp/qemu-ppc32/qemu-ppc32.cfg @@ -10,23 +10,13 @@ # consult the product documentation. # #......................................................................... -# CONFIG_PPC_CHRP is not set +CONFIG_PPC_CHRP=n CONFIG_PPC_PMAC=y CONFIG_PCNET32=y CONFIG_NE2K_PCI=y CONFIG_MACE=y CONFIG_BMAC=y -CONFIG_SERIAL_PMACZILOG=y -CONFIG_SERIAL_PMACZILOG_TTYS=y -CONFIG_SERIAL_PMACZILOG_CONSOLE=y - -CONFIG_IDE=y -CONFIG_BLK_DEV_IDEPCI=y -CONFIG_BLK_DEV_IDEDMA_PCI=y -CONFIG_BLK_DEV_IDE_PMAC=y -CONFIG_BLK_DEV_IDEDMA=y - CONFIG_ADB=y CONFIG_ADB_CUDA=y CONFIG_INPUT_ADBHID=y @@ -34,7 +24,7 @@ CONFIG_INPUT_ADBHID=y CONFIG_INPUT_KEYBOARD=y CONFIG_INPUT_MOUSE=y -CONFIG_SCSI=m +CONFIG_SCSI=y CONFIG_BLK_DEV_SD=m CONFIG_USB_MON=y @@ -43,6 +33,11 @@ CONFIG_USB_STORAGE=m CONFIG_INPUT_EVDEV=y CONFIG_SERIO=y -# CONFIG_SERIO_SERPORT is not set +CONFIG_SERIO_SERPORT=n CONFIG_ALTIVEC=y + + +CONFIG_SERIAL_PMACZILOG=y +CONFIG_SERIAL_PMACZILOG_TTYS=y +CONFIG_SERIAL_PMACZILOG_CONSOLE=n diff --git a/bsp/qemu-ppc32/qemu-ppc32.scc b/bsp/qemu-ppc32/qemu-ppc32.scc index 30144cf4..c4e82cd7 100644 --- a/bsp/qemu-ppc32/qemu-ppc32.scc +++ b/bsp/qemu-ppc32/qemu-ppc32.scc @@ -3,17 +3,8 @@ kconf hardware qemu-ppc32.cfg kconf hardware qemu-ppc32-gfx.cfg include features/profiling/profiling.scc -include features/latencytop/latencytop.scc include features/usb/ehci-hcd.scc include features/usb/uhci-hcd.scc include features/usb/ohci-hcd.scc include features/usb/xhci-hcd.scc - -# patch qemu-platform-v2.patch -# patch powerpc-special-load-offset-for-qemu.patch -# patch qemu-powerpc-work-around-for-qemu-powerpc-32-interru.patch -# patch qemu_ppc32-support-multiple-ethernet-interfaces.patch -# patch qemu_ppc-enable-IDE-support.patch -# patch qemu-powerpc-Added-qemu_restart-function.patch -# patch qemuppc-irq-disable-fixups.patch diff --git a/bsp/qemu-ppc32/qemu_ppc-enable-IDE-support.patch b/bsp/qemu-ppc32/qemu_ppc-enable-IDE-support.patch deleted file mode 100644 index 54b1ad46..00000000 --- a/bsp/qemu-ppc32/qemu_ppc-enable-IDE-support.patch +++ /dev/null @@ -1,41 +0,0 @@ -From e22320e51878054af4863c7b8ee1f7c76f82030f Mon Sep 17 00:00:00 2001 -From: Jason Wessel <jason.wessel@windriver.com> -Date: Thu, 24 Jun 2010 04:10:55 -0700 -Subject: [PATCH] qemu_ppc: enable IDE support - -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - drivers/ide/Kconfig | 2 +- - drivers/ide/ide-generic.c | 3 +++ - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig -index 8fb46aab2d87..da2d105db376 100644 ---- a/drivers/ide/Kconfig -+++ b/drivers/ide/Kconfig -@@ -197,7 +197,7 @@ comment "IDE chipset support/bugfixes" - - config IDE_GENERIC - tristate "generic/default IDE chipset support" -- depends on ALPHA || X86 || IA64 || M32R || MIPS || ARCH_RPC -+ depends on ALPHA || X86 || IA64 || M32R || MIPS || ARCH_RPC || PPC_QEMU - default ARM && ARCH_RPC - help - This is the generic IDE driver. This driver attaches to the -diff --git a/drivers/ide/ide-generic.c b/drivers/ide/ide-generic.c -index 54d7c4685d23..eb74ba5423f7 100644 ---- a/drivers/ide/ide-generic.c -+++ b/drivers/ide/ide-generic.c -@@ -45,6 +45,9 @@ static const int legacy_irqs[] = { PLD_IRQ_CFIREQ, PLD_IRQ_IDEIREQ }; - #elif defined(CONFIG_ALPHA) - static const u16 legacy_bases[] = { 0x1f0, 0x170, 0x1e8, 0x168 }; - static const int legacy_irqs[] = { 14, 15, 11, 10 }; -+#elif defined(CONFIG_PPC_QEMU) -+static const u16 legacy_bases[] = { 0x1f0, 0x170, 0x1e8, 0x168 }; -+static const int legacy_irqs[] = { 13, 13, 11, 10 }; - #else - static const u16 legacy_bases[] = { 0x1f0, 0x170, 0x1e8, 0x168, 0x1e0, 0x160 }; - static const int legacy_irqs[] = { 14, 15, 11, 10, 8, 12 }; --- -1.8.1.2 - diff --git a/bsp/qemu-ppc32/qemu_ppc32-support-multiple-ethernet-interfaces.patch b/bsp/qemu-ppc32/qemu_ppc32-support-multiple-ethernet-interfaces.patch deleted file mode 100644 index 80b016b8..00000000 --- a/bsp/qemu-ppc32/qemu_ppc32-support-multiple-ethernet-interfaces.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 105af9c859bc4230ff68f876b63c1f36a80b0b64 Mon Sep 17 00:00:00 2001 -From: Tony Liu <Bo.Liu@windriver.com> -Date: Thu, 11 Mar 2010 14:38:49 +0800 -Subject: [PATCH] qemu_ppc32: support multiple ethernet interfaces - -Enable QEMU ppc32 to support at most 3 ethernet interfaces. - -Signed-off-by: Wessel Jason <jason.wessel@windriver.com> -Signed-off-by: Chunbo Luo <chunbo.luo@windriver.com> -diff --git a/drivers/net/ethernet/8390/ne.c b/drivers/net/ethernet/8390/ne.c -index 1063093..eb63fb9 100644 ---- a/drivers/net/ethernet/8390/ne.c -+++ b/drivers/net/ethernet/8390/ne.c -@@ -482,8 +482,19 @@ static int __init ne_probe1(struct net_device *dev, unsigned long ioaddr) - } else if (dev->irq == 2) - /* Fixup for users that don't know that IRQ 2 is really IRQ 9, - or don't know which one to set. */ -+ if (ioaddr == 0x300) - dev->irq = 9; -- -+ else if (ioaddr == 0x320) -+ dev->irq = 10; -+ else if (ioaddr == 0x340) -+ dev->irq = 11; -+ else { -+ printk(KERN_ERR "failed to probe %s, QEMU supports at most 3 interfaces.\n", -+ dev->name); -+ ret = -ENODEV; -+ goto err_out; -+ } -+#endif - if (! dev->irq) { - printk(" failed to detect IRQ line.\n"); - ret = -EAGAIN; diff --git a/bsp/qemu-ppc32/qemuppc-irq-disable-fixups.patch b/bsp/qemu-ppc32/qemuppc-irq-disable-fixups.patch deleted file mode 100644 index a8b5e05f..00000000 --- a/bsp/qemu-ppc32/qemuppc-irq-disable-fixups.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 11d9dbd47954597b215e75af246bcfeb4c0ca62e Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@windriver.com> -Date: Wed, 15 Jun 2011 16:12:17 -0400 -Subject: [PATCH] qemuppc: irq disable fixups - -Mapping the qemuppc interupt handling to the new interrupt -routines means that we call irq_state_clr_disabled -to enable irqs, not disable them. So we should modify function -"irq_state_set_disabled" with our custom qemppc mods. - -Signed-off-by: Liming Wang <liming.wang@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - kernel/irq/chip.c | 12 +++++------- - 1 files changed, 5 insertions(+), 7 deletions(-) - -diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c -index a813b57..c997226 100644 ---- a/kernel/irq/chip.c -+++ b/kernel/irq/chip.c -@@ -141,19 +141,17 @@ EXPORT_SYMBOL_GPL(irq_get_irq_data); - - static void irq_state_clr_disabled(struct irq_desc *desc) - { --#ifdef CONFIG_PPC_QEMU -- struct irq_desc *desc = irq_data_to_desc(irq); -- -- if (!(desc->status & IRQ_DELAYED_DISABLE)) -- desc->chip->mask(irq); --#else - irqd_clear(&desc->irq_data, IRQD_IRQ_DISABLED); --#endif /* CONFIG_PPC_QEMU */ - } - - static void irq_state_set_disabled(struct irq_desc *desc) - { -+#ifdef CONFIG_PPC_QEMU -+ if (!(desc->status_use_accessors & IRQ_DELAYED_DISABLE)) -+ desc->irq_data.chip->irq_mask(&desc->irq_data); -+#else - irqd_set(&desc->irq_data, IRQD_IRQ_DISABLED); -+#endif /* CONFIG_PPC_QEMU */ - } - - static void irq_state_clr_masked(struct irq_desc *desc) --- -1.7.4.1 - diff --git a/bsp/qemu-ppc64/qemu-ppc64-standard.scc b/bsp/qemu-ppc64/qemu-ppc64-standard.scc index 440af149..2c663cda 100644 --- a/bsp/qemu-ppc64/qemu-ppc64-standard.scc +++ b/bsp/qemu-ppc64/qemu-ppc64-standard.scc @@ -16,6 +16,3 @@ include features/scsi/cdrom.scc include cfg/virtio.scc include qemu-ppc64.scc - -# default policy for standard kernels -include features/latencytop/latencytop.scc diff --git a/bsp/qemu-ppc64/qemu-ppc64.cfg b/bsp/qemu-ppc64/qemu-ppc64.cfg index d2f9f040..b2a5194d 100644 --- a/bsp/qemu-ppc64/qemu-ppc64.cfg +++ b/bsp/qemu-ppc64/qemu-ppc64.cfg @@ -2,13 +2,10 @@ CONFIG_PPC64=y CONFIG_PPC_BOOK3S_64=y CONFIG_GENERIC_CPU=y -CONFIG_POWER4=y CONFIG_SMP=y CONFIG_NR_CPUS=2 -CONFIG_CPU_BIG_ENDIAN=y CONFIG_NR_IRQS=512 CONFIG_PPC=y -CONFIG_SYSVIPC_COMPAT=y CONFIG_GENERIC_BUG=y CONFIG_EPAPR_BOOT=y CONFIG_PPC_PSERIES=y @@ -28,12 +25,10 @@ CONFIG_NET_VENDOR_IBM=y CONFIG_IBMVETH=y CONFIG_NET_VENDOR_INTEL=y CONFIG_E1000=y -CONFIG_VMXNET3=y CONFIG_TTY=y CONFIG_VT=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_FB=y -CONFIG_FB_DDC=y CONFIG_FB_OF=y CONFIG_DUMMY_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE=y @@ -46,3 +41,38 @@ CONFIG_CPU_RMAP=y CONFIG_DQL=y CONFIG_NLATTR=y CONFIG_OID_REGISTRY=y + +CONFIG_CPU_LITTLE_ENDIAN=y +CONFIG_CPU_BIG_ENDIAN=n +CONFIG_HVC_CONSOLE=y +CONFIG_VIRTIO_CONSOLE=y + +CONFIG_ALTIVEC=y +CONFIG_VSX=y + +CONFIG_IRQ_ALL_CPUS=y +CONFIG_PPC_64K_PAGES=y +CONFIG_SCHED_SMT=y +CONFIG_VIRTUALIZATION=y + +CONFIG_INPUT_KEYBOARD=y +CONFIG_INPUT_MOUSE=y +CONFIG_INPUT_MOUSEDEV=y + +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_VT_CONSOLE=y +CONFIG_VT_CONSOLE_SLEEP=y +CONFIG_HW_CONSOLE=y + +CONFIG_HVCS=y +CONFIG_HVC_RTAS=y + +CONFIG_INPUT_MISC=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_XHCI_PCI=y +CONFIG_USB_XHCI_PLATFORM=y + +CONFIG_DRM_BOCHS=n + +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_GENERIC=y diff --git a/bsp/qemuarm64/qemuarm64-gfx.cfg b/bsp/qemuarm64/qemuarm64-gfx.cfg index 039bfae5..ceae36c5 100644 --- a/bsp/qemuarm64/qemuarm64-gfx.cfg +++ b/bsp/qemuarm64/qemuarm64-gfx.cfg @@ -1,8 +1,4 @@ # SPDX-License-Identifier: MIT -CONFIG_INPUT_TABLET=y -CONFIG_USB=y -CONFIG_USB_HID=y -CONFIG_USB_XHCI_HCD=y - -CONFIG_DRM=y -CONFIG_DRM_BOCHS=y +CONFIG_INPUT=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=y diff --git a/bsp/qemuarm64/qemuarm64-preempt-rt.scc b/bsp/qemuarm64/qemuarm64-preempt-rt.scc index f2004be0..87054501 100644 --- a/bsp/qemuarm64/qemuarm64-preempt-rt.scc +++ b/bsp/qemuarm64/qemuarm64-preempt-rt.scc @@ -6,7 +6,6 @@ define KARCH arm64 # no new branch required, re-use the ktypes/preempt-rt/preempt-rt.scc branch include ktypes/preempt-rt/preempt-rt.scc -include cfg/virtio.scc include qemuarm64.scc # enable the ability to run 32 bit apps diff --git a/bsp/qemuarm64/qemuarm64-standard.scc b/bsp/qemuarm64/qemuarm64-standard.scc index 361f4a20..e3d75080 100644 --- a/bsp/qemuarm64/qemuarm64-standard.scc +++ b/bsp/qemuarm64/qemuarm64-standard.scc @@ -6,7 +6,6 @@ define KARCH arm64 include ktypes/standard/standard.scc branch qemuarm64 -include cfg/virtio.scc include qemuarm64.scc # enable the ability to run 32 bit apps diff --git a/bsp/qemuarm64/qemuarm64-tiny.scc b/bsp/qemuarm64/qemuarm64-tiny.scc new file mode 100644 index 00000000..5fdb3416 --- /dev/null +++ b/bsp/qemuarm64/qemuarm64-tiny.scc @@ -0,0 +1,13 @@ +# SPDX-License-Identifier: MIT +define KMACHINE qemuarm64 +define KTYPE tiny +define KARCH arm64 + +include ktypes/tiny/tiny.scc + +include qemuarm64.scc + +include features/hid/hid.scc + +# enable the ability to run 32 bit apps +include arch/arm/32bit-compat.scc diff --git a/bsp/qemuarm64/qemuarm64.cfg b/bsp/qemuarm64/qemuarm64.cfg index ef8d3ed0..759ab8e6 100644 --- a/bsp/qemuarm64/qemuarm64.cfg +++ b/bsp/qemuarm64/qemuarm64.cfg @@ -14,6 +14,7 @@ CONFIG_ARM_AMBA=y # # Non-8250 serial port support # +CONFIG_TTY=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y @@ -32,3 +33,4 @@ CONFIG_RTC_DRV_PL031=y # PCI configs, needed for virtio-rng (and others) CONFIG_PCI=y CONFIG_PCI_HOST_GENERIC=y + diff --git a/bsp/qemuarm64/qemuarm64.scc b/bsp/qemuarm64/qemuarm64.scc index dee5741e..f97995da 100644 --- a/bsp/qemuarm64/qemuarm64.scc +++ b/bsp/qemuarm64/qemuarm64.scc @@ -1,3 +1,9 @@ # SPDX-License-Identifier: MIT kconf hardware qemuarm64.cfg kconf hardware qemuarm64-gfx.cfg + +include features/usb/xhci-hcd.scc +include features/net/net.scc +include features/pci/pci.scc +include cfg/virtio.scc +include cfg/net/mdio.scc diff --git a/bsp/qemuarma15/qemuarma15-gfx.cfg b/bsp/qemuarma15/qemuarma15-gfx.cfg index 039bfae5..c3e36f0d 100644 --- a/bsp/qemuarma15/qemuarma15-gfx.cfg +++ b/bsp/qemuarma15/qemuarma15-gfx.cfg @@ -1,8 +1,6 @@ # SPDX-License-Identifier: MIT -CONFIG_INPUT_TABLET=y -CONFIG_USB=y +CONFIG_INPUT=y CONFIG_USB_HID=y -CONFIG_USB_XHCI_HCD=y -CONFIG_DRM=y -CONFIG_DRM_BOCHS=y +CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=y diff --git a/bsp/qemuarma15/qemuarma15-preempt-rt.scc b/bsp/qemuarma15/qemuarma15-preempt-rt.scc index 216757bb..f6a2a400 100644 --- a/bsp/qemuarma15/qemuarma15-preempt-rt.scc +++ b/bsp/qemuarma15/qemuarma15-preempt-rt.scc @@ -3,11 +3,10 @@ define KMACHINE qemuarma15 define KTYPE preempt-rt define KARCH arm -# no new branch required, re-use the ktypes/preempt-rt/preempt-rt.scc branch include ktypes/preempt-rt/preempt-rt.scc -include cfg/virtio.scc -include cfg/dmaengine.scc -include cfg/timer/rtc.scc include qemuarma15.scc +include features/pci/pci.scc +# for emulated pci support +include features/pci/pci-of-generic.scc diff --git a/bsp/qemuarma15/qemuarma15-standard.scc b/bsp/qemuarma15/qemuarma15-standard.scc index cdee6332..804e89d3 100644 --- a/bsp/qemuarma15/qemuarma15-standard.scc +++ b/bsp/qemuarma15/qemuarma15-standard.scc @@ -4,12 +4,9 @@ define KTYPE standard define KARCH arm include ktypes/standard/standard.scc -# we aren't carrying patches specific to this platform, so let's -# skip the branch for now. -# branch qemuarma15 -include cfg/virtio.scc -include cfg/dmaengine.scc -include cfg/timer/rtc.scc include qemuarma15.scc +include features/pci/pci.scc +# for emulated pci support +include features/pci/pci-of-generic.scc diff --git a/bsp/qemuarma15/qemuarma15-tiny.cfg b/bsp/qemuarma15/qemuarma15-tiny.cfg deleted file mode 100644 index ed47939f..00000000 --- a/bsp/qemuarma15/qemuarma15-tiny.cfg +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: MIT -CONFIG_MMU=y -CONFIG_ARCH_MULTIPLATFORM=y -CONFIG_ARCH_MULTI_V7=y - -CONFIG_ARM_AMBA=y - -CONFIG_ARM_THUMB=y -CONFIG_KUSER_HELPERS=y -CONFIG_OABI_COMPAT=y -CONFIG_EXT4_FS=y - -# to keep things small, you really don't want these on. But to -# keep qemuarm's hvc0 console happy, we have them on for now -CONFIG_TTY=y -CONFIG_VIRTIO_MENU=y -CONFIG_VIRTIO_PCI=y -CONFIG_VIRTIO=y -CONFIG_VIRTIO_CONSOLE=y -CONFIG_HVC_DRIVER=y diff --git a/bsp/qemuarma15/qemuarma15-tiny.scc b/bsp/qemuarma15/qemuarma15-tiny.scc index 406f8111..058f2ddc 100644 --- a/bsp/qemuarma15/qemuarma15-tiny.scc +++ b/bsp/qemuarma15/qemuarma15-tiny.scc @@ -4,14 +4,7 @@ define KTYPE tiny define KARCH arm include ktypes/tiny/tiny.scc -# we aren't carrying patches specific to this platform, so let's -# skip the branch for now. -# branch qemuarma15 - -include cfg/virtio.scc -include cfg/dmaengine.scc -include cfg/timer/rtc.scc -include qemuarma15.scc +include features/hid/hid.scc -kconf hardware qemuarma15-tiny.cfg +include qemuarma15.scc diff --git a/bsp/qemuarma15/qemuarma15.cfg b/bsp/qemuarma15/qemuarma15.cfg index 48c68617..3c40bd0a 100644 --- a/bsp/qemuarma15/qemuarma15.cfg +++ b/bsp/qemuarma15/qemuarma15.cfg @@ -1,13 +1,18 @@ # SPDX-License-Identifier: MIT +CONFIG_MMU=y +CONFIG_ARCH_MULTIPLATFORM=y +CONFIG_ARCH_MULTI_V7=y CONFIG_ARCH_VIRT=y CONFIG_SMP=y CONFIG_NR_CPUS=8 CONFIG_CPU_IDLE=y CONFIG_ARM_CPUIDLE=y +CONFIG_ARM_PATCH_PHYS_VIRT=y CONFIG_VFP=y CONFIG_VFPv3=y CONFIG_NEON=y CONFIG_KERNEL_MODE_NEON=y +CONFIG_TTY=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y CONFIG_HW_RANDOM=y @@ -16,7 +21,6 @@ CONFIG_SPI_PL022=y CONFIG_ARM_SP805_WATCHDOG=y CONFIG_RTC_DRV_PL031=y CONFIG_PL330_DMA=y -CONFIG_ARM_CRYPTO=y CONFIG_CRYPTO_SHA1_ARM_NEON=y CONFIG_CRYPTO_SHA1_ARM_CE=y CONFIG_CRYPTO_SHA2_ARM_CE=y @@ -28,5 +32,8 @@ CONFIG_CRYPTO_GHASH_ARM_CE=y CONFIG_CRYPTO_CRC32_ARM_CE=y CONFIG_CRYPTO_CHACHA20_NEON=y CONFIG_ARM_LPAE=y -CONFIG_PCI=y -CONFIG_PCI_HOST_GENERIC=y +CONFIG_HIGHMEM=y +CONFIG_ARM_AMBA=y +CONFIG_ARM_THUMB=y + +CONFIG_FUNCTION_GRAPH_TRACER=n diff --git a/bsp/qemuarma15/qemuarma15.scc b/bsp/qemuarma15/qemuarma15.scc index 68d9e710..db49ee54 100644 --- a/bsp/qemuarma15/qemuarma15.scc +++ b/bsp/qemuarma15/qemuarma15.scc @@ -1,3 +1,11 @@ # SPDX-License-Identifier: MIT kconf hardware qemuarma15.cfg kconf hardware qemuarma15-gfx.cfg + +include features/usb/xhci-hcd.scc +include features/net/net.scc + +include cfg/virtio.scc +include cfg/dmaengine.scc +include cfg/timer/rtc.scc +include cfg/net/mdio.scc diff --git a/bsp/qemuarma9/qemuarma9-gfx.cfg b/bsp/qemuarma9/qemuarma9-gfx.cfg index 5e7519e0..193ff985 100644 --- a/bsp/qemuarma9/qemuarma9-gfx.cfg +++ b/bsp/qemuarma9/qemuarma9-gfx.cfg @@ -1,8 +1,11 @@ # SPDX-License-Identifier: MIT -CONFIG_FB=y -CONFIG_FB_ARMCLCD=y -CONFIG_FRAMEBUFFER_CONSOLE=y - CONFIG_INPUT_TABLET=y -CONFIG_HID_WACOM=y +CONFIG_USB=y +CONFIG_USB_HID=y +CONFIG_USB_XHCI_HCD=y + +CONFIG_DRM=y +CONFIG_DRM_VIRTIO_GPU=y + CONFIG_INPUT_MISC=y +CONFIG_INPUT_UINPUT=y diff --git a/bsp/qemumicroblaze/qemumicroblazeeb-standard.scc b/bsp/qemumicroblaze/qemumicroblazeeb-standard.scc index 8cfad860..824a4e5d 100644 --- a/bsp/qemumicroblaze/qemumicroblazeeb-standard.scc +++ b/bsp/qemumicroblaze/qemumicroblazeeb-standard.scc @@ -12,5 +12,4 @@ include bsp/xilinx/soc/drivers-softip.scc include bsp/xilinx/board-common.scc # default policy for standard kernels -include features/latencytop/latencytop.scc include features/profiling/profiling.scc diff --git a/bsp/qemumicroblaze/qemumicroblazeel-standard.scc b/bsp/qemumicroblaze/qemumicroblazeel-standard.scc index 7ac1eab8..69b7bdc2 100644 --- a/bsp/qemumicroblaze/qemumicroblazeel-standard.scc +++ b/bsp/qemumicroblaze/qemumicroblazeel-standard.scc @@ -12,5 +12,4 @@ include bsp/xilinx/soc/drivers-softip.scc include bsp/xilinx/board-common.scc # default policy for standard kernels -include features/latencytop/latencytop.scc include features/profiling/profiling.scc diff --git a/bsp/qemuriscv32/qemuriscv32.cfg b/bsp/qemuriscv32/qemuriscv32.cfg index e944f964..ae1dd6f3 100644 --- a/bsp/qemuriscv32/qemuriscv32.cfg +++ b/bsp/qemuriscv32/qemuriscv32.cfg @@ -4,11 +4,11 @@ # CONFIG_ARCH_RV32I=y CONFIG_32BIT=y +CONFIG_NONPORTABLE=y # # Platform type # -CONFIG_MAXPHYSMEM_2GB=y CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_PGTABLE_LEVELS=2 CONFIG_GENERIC_ATOMIC64=y @@ -41,3 +41,9 @@ CONFIG_VIRTIO_CONSOLE=y # IRQ chip support # CONFIG_SIFIVE_PLIC=y + +# +# Enable Goldfish RTC +# +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_GOLDFISH=y diff --git a/bsp/qemuriscv32/qemuriscv32.scc b/bsp/qemuriscv32/qemuriscv32.scc index 7d368aad..2a1e3292 100644 --- a/bsp/qemuriscv32/qemuriscv32.scc +++ b/bsp/qemuriscv32/qemuriscv32.scc @@ -3,3 +3,9 @@ kconf hardware qemuriscv32.cfg # Graphics support include features/drm-bochs/drm-bochs.scc + +# XHCI USB +include features/usb/xhci-hcd.scc +include features/net/net.scc +include features/pci/pci.scc +include cfg/net/mdio.scc diff --git a/bsp/qemuriscv64/qemuriscv64.cfg b/bsp/qemuriscv64/qemuriscv64.cfg index 5e28e46e..5dcfbe63 100644 --- a/bsp/qemuriscv64/qemuriscv64.cfg +++ b/bsp/qemuriscv64/qemuriscv64.cfg @@ -8,7 +8,6 @@ CONFIG_64BIT=y # # Platform type # -CONFIG_MAXPHYSMEM_128GB=y CONFIG_SMP=y CONFIG_NR_CPUS=8 CONFIG_TUNE_GENERIC=y @@ -38,3 +37,9 @@ CONFIG_VIRTIO_CONSOLE=y # IRQ chip support # CONFIG_SIFIVE_PLIC=y + +# +# Enable Goldfish RTC +# +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_GOLDFISH=y diff --git a/bsp/qemuriscv64/qemuriscv64.scc b/bsp/qemuriscv64/qemuriscv64.scc index 2f012c53..f7d834f5 100644 --- a/bsp/qemuriscv64/qemuriscv64.scc +++ b/bsp/qemuriscv64/qemuriscv64.scc @@ -3,3 +3,9 @@ kconf hardware qemuriscv64.cfg # Graphics support include features/drm-bochs/drm-bochs.scc + +# XHCI USB +include features/usb/xhci-hcd.scc +include features/net/net.scc +include features/pci/pci.scc +include cfg/net/mdio.scc diff --git a/bsp/renesas-rcar/renesas-rcar.cfg b/bsp/renesas-rcar/renesas-rcar.cfg index 32c08355..f0325826 100644 --- a/bsp/renesas-rcar/renesas-rcar.cfg +++ b/bsp/renesas-rcar/renesas-rcar.cfg @@ -18,8 +18,9 @@ CONFIG_SMP=y # Platform selection CONFIG_ARCH_RENESAS=y -CONFIG_ARCH_R8A7795=y -CONFIG_ARCH_R8A7796=y +CONFIG_ARCH_R8A77950=y +CONFIG_ARCH_R8A77951=y +CONFIG_ARCH_R8A77960=y CONFIG_ARM64_4K_PAGES=y CONFIG_ARM64_VA_BITS_48=y CONFIG_ARM64_VA_BITS=48 @@ -116,6 +117,7 @@ CONFIG_USB_RENESAS_USBHS=y CONFIG_USB_RENESAS_USBHS_UDC=y CONFIG_USB_RENESAS_USB3=m CONFIG_USB_DWC3=y +CONFIG_USB_ROLE_SWITCH=y CONFIG_GENERIC_PHY=y CONFIG_PHY_RCAR_GEN3_USB2=y CONFIG_PHY_RCAR_GEN3_USB3=y @@ -153,7 +155,6 @@ CONFIG_VIDEO_ADV7604_CEC=y # GPIO configuration CONFIG_GPIOLIB=y CONFIG_OF_GPIO=y -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_RCAR=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X_IRQ=y @@ -171,9 +172,10 @@ CONFIG_CAN_RCAR_CANFD=y # Multi-Media configuration CONFIG_MEDIA_SUPPORT=y +CONFIG_MEDIA_PLATFORM_SUPPORT=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_CONTROLLER=y -CONFIG_VIDEO_V4L2=y +CONFIG_VIDEO_DEV=y CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEOBUF2_DMA_CONTIG=y @@ -185,7 +187,7 @@ CONFIG_VIDEO_RENESAS_VSP1=y CONFIG_VIDEO_RCAR_VIN=y CONFIG_VIDEO_RCAR_CSI2=y CONFIG_VIDEO_OV5647=y -# CONFIG_MEDIA_SUBDRV_AUTOSELECT is not set +CONFIG_MEDIA_SUBDRV_AUTOSELECT=n # DMA configuration CONFIG_DMA_SHARED_BUFFER=y diff --git a/bsp/ti-am335x/ti-am335x.cfg b/bsp/ti-am335x/ti-am335x.cfg index 190cb876..bdf54c5d 100644 --- a/bsp/ti-am335x/ti-am335x.cfg +++ b/bsp/ti-am335x/ti-am335x.cfg @@ -64,12 +64,11 @@ CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y -CONFIG_MTD_NAND_ECC=y +CONFIG_MTD_NAND_ECC_SW_HAMMING=y CONFIG_MTD_RAW_NAND=y CONFIG_MTD_CFI=y CONFIG_MTD_CFI_INTELEXT=y -CONFIG_MTD_NAND=y CONFIG_MTD_NAND_OMAP2=y CONFIG_MTD_NAND_OMAP_BCH=y CONFIG_MTD_NAND_OMAP_BCH_BUILD=y @@ -82,9 +81,7 @@ CONFIG_BLK_DEV_SD=y CONFIG_ETHERNET=y CONFIG_NET_VENDOR_TI=y CONFIG_TI_DAVINCI_MDIO=y -CONFIG_TI_DAVINCI_CPDMA=y CONFIG_TI_CPSW_PHY_SEL=y -CONFIG_TI_CPSW_ALE=y CONFIG_TI_CPSW=y CONFIG_TI_CPTS=y CONFIG_PHYLIB=y @@ -138,7 +135,6 @@ CONFIG_PINCTRL_SINGLE=y CONFIG_GPIOLIB=y CONFIG_OF_GPIO=y CONFIG_GPIOLIB_IRQCHIP=y -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_OMAP=y CONFIG_GPIO_PCA953X=m @@ -163,10 +159,8 @@ CONFIG_DRM=y CONFIG_DRM_OMAP=y CONFIG_OMAP2_DSS_DPI=y CONFIG_DRM_TILCDC=y -CONFIG_DRM_OMAP_PANEL_DPI=y CONFIG_DRM_I2C_NXP_TDA998X=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_PLATFORM=y CONFIG_BACKLIGHT_CLASS_DEVICE=y @@ -179,13 +173,9 @@ CONFIG_BACKLIGHT_GPIO=y CONFIG_SOUND=m CONFIG_SND=m CONFIG_SND_SOC=m -CONFIG_SND_DAVINCI_SOC_MCASP=m CONFIG_SND_SIMPLE_CARD=m -#CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -#CONFIG_USB_MON=m - # # USB Host Controller Drivers # @@ -207,7 +197,6 @@ CONFIG_AM335X_PHY_USB=m # Platform Glue Layer CONFIG_USB_MUSB_DSPS=m -CONFIG_USB_MUSB_AM335X_CHILD=m # MUSB DMA mode CONFIG_USB_TI_CPPI41_DMA=y @@ -217,14 +206,16 @@ CONFIG_USB_TI_CPPI41_DMA=y # MMC/SD/SDIO Card Drivers # CONFIG_MMC=y -CONFIG_MMC_UNSAFE_RESUME=y CONFIG_MMC_BLOCK=y CONFIG_MMC_BLOCK_MINORS=8 -CONFIG_MMC_BLOCK_BOUNCE=y CONFIG_MMC_OMAP=y CONFIG_MMC_OMAP_HS=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_SDHCI_OMAP=y + # # I2C RTC drivers # diff --git a/bsp/ti-am65x/ti-am65x-standard.scc b/bsp/ti-am65x/ti-am65x-standard.scc new file mode 100644 index 00000000..d3ca7696 --- /dev/null +++ b/bsp/ti-am65x/ti-am65x-standard.scc @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: MIT +define KMACHINE ti-am65x +define KTYPE standard +define KARCH arm64 + +include ktypes/standard/standard.scc + +include ti-am65x.scc diff --git a/bsp/ti-am65x/ti-am65x.cfg b/bsp/ti-am65x/ti-am65x.cfg new file mode 100644 index 00000000..4d628d36 --- /dev/null +++ b/bsp/ti-am65x/ti-am65x.cfg @@ -0,0 +1,207 @@ +#........................................................................ +# WARNING +# +# This file is a kernel configuration fragment, and not a full kernel +# configuration file. The final kernel configuration is made up of +# an assembly of processed fragments, each of which is designed to +# capture a specific part of the final configuration (e.g. platform +# configuration, feature configuration, and board specific hardware +# configuration). For more information on kernel configuration, please +# consult the product documentation. +# +#......................................................................... + +# +# +# Platform selection +# +CONFIG_ARM64=y +CONFIG_ARCH_K3=y + +# +# DesignWare PCI Core Support +CONFIG_PCI=y +CONFIG_PCI_MSI=y +CONFIG_PCI_MSI_IRQ_DOMAIN=y +CONFIG_PCI_KEYSTONE=y +CONFIG_PCI_KEYSTONE_HOST=y + +# +# MMC/SD/SDIO Host Controller Drivers +# +CONFIG_MMC=y +CONFIG_MMC_SPI=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_SDHCI_AM654=y + +# +# Power management options +# +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_SMP=y +CONFIG_PM=y +CONFIG_PM_CLK=y +CONFIG_CPU_PM=y + +# +# CPU Frequency scaling +# +CONFIG_CPU_FREQ=y +CONFIG_CPU_FREQ_GOV_ATTR_SET=y +CONFIG_CPU_FREQ_GOV_COMMON=y +CONFIG_CPU_FREQ_STAT=y +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y + +# +# CPU frequency scaling drivers +# +CONFIG_CPUFREQ_DT=y +CONFIG_CPUFREQ_DT_PLATDEV=y + +# +# Bus devices +# +CONFIG_MTD=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_OF_PARTS=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y + +# +# SCSI device support +# +CONFIG_SCSI=y +CONFIG_BLK_DEV_SD=y + +# +# USB +# +CONFIG_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_DWC3=y +CONFIG_USB_DWC3_OF_SIMPLE=y +CONFIG_HAS_DMA=y +CONFIG_OMAP_USB2=y +CONFIG_USB_DWC3_KEYSTONE=y + +# +# USB for net +# +CONFIG_USB_NET_DRIVERS=y +CONFIG_USB_USBNET=y +CONFIG_USB_NET_AX8817X=y + +# +# Input device support +# +CONFIG_INPUT=y +CONFIG_INPUT_MATRIXKMAP=y +CONFIG_INPUT_EVDEV=y +CONFIG_INPUT_KEYBOARD=y +CONFIG_KEYBOARD_GPIO=y +CONFIG_INPUT_MOUSE=y +CONFIG_INPUT_MISC=y + +# +# Serial drivers +# +CONFIG_SERIAL_CORE=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_OF_PLATFORM=y +CONFIG_SERIAL_8250_OMAP=y + +# +# Pin Control subsystem +# +CONFIG_PINCTRL=y +CONFIG_PINCTRL_SINGLE=y + +# +# Memory mapped GPIO drivers +# +CONFIG_GPIOLIB=y +CONFIG_GPIO_DAVINCI=y + +# +# I2C support +# +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_MUX=y +CONFIG_I2C_OMAP=y + +# +# SPI Master Controller Drivers +# +CONFIG_SPI=y +CONFIG_SPI_MASTER=y +CONFIG_SPI_MEM=y +CONFIG_SPI_OMAP24XX=y + +# +# SPI-NOR Flash drivers +# +CONFIG_MTD_SPI_NOR=y +CONFIG_SPI_CADENCE_QUADSPI=y + +# +# DMA Devices +# +CONFIG_DMADEVICES=y +CONFIG_DMA_ENGINE=y +CONFIG_DMA_OF=y +CONFIG_TI_K3_UDMA=y +CONFIG_TI_K3_UDMA_GLUE_LAYER=y + +# +# Common Clock Framework +# +CONFIG_TI_SCI_CLK=y +CONFIG_TI_SCI_PROTOCOL=y +CONFIG_TI_SCI_CLK_PROBE_FROM_FW=y +CONFIG_PTP_1588_CLOCK=y + +# +# Qualcomm SoC drivers +# +CONFIG_SOC_TI=y +CONFIG_TI_SCI_PM_DOMAINS=y + +# +# IRQ chip support +# +CONFIG_IRQCHIP=y +CONFIG_ARM_GIC_V3=y +CONFIG_ARM_GIC_V3_ITS=y +CONFIG_ARM_GIC_V3_ITS_PCI=y +CONFIG_TI_SCI_INTR_IRQCHIP=y +CONFIG_TI_SCI_INTA_IRQCHIP=y +CONFIG_RESET_CONTROLLER=y +CONFIG_RESET_TI_SCI=y +CONFIG_RESET_TI_SYSCON=y + +# +# PHY Subsystem +# +CONFIG_GENERIC_PHY=y +CONFIG_PHY_XGENE=y +CONFIG_PHY_AM654_SERDES=y +CONFIG_PHYLIB=y +CONFIG_NETDEVICES=y +CONFIG_DP83867_PHY=y + +# +# NET Support +# +CONFIG_TI_K3_RINGACC=y +CONFIG_TI_K3_AM65_CPSW_NUSS=y +CONFIG_TI_CPSW_PHY_SEL=y +CONFIG_TI_K3_AM65_CPTS=y diff --git a/bsp/ti-am65x/ti-am65x.scc b/bsp/ti-am65x/ti-am65x.scc new file mode 100644 index 00000000..d7cb767c --- /dev/null +++ b/bsp/ti-am65x/ti-am65x.scc @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: MIT +include cfg/usb-mass-storage.scc +include cfg/fs/flash_fs.cfg +include features/hugetlb/hugetlb.scc +# Enable the ability to run 32 bit apps +include arch/arm/32bit-compat.scc + +kconf hardware ti-am65x.cfg diff --git a/bsp/xilinx-zynq/xilinx-zynq-standard.scc b/bsp/xilinx-zynq/xilinx-zynq-standard.scc new file mode 100644 index 00000000..34856f90 --- /dev/null +++ b/bsp/xilinx-zynq/xilinx-zynq-standard.scc @@ -0,0 +1,7 @@ +define KMACHINE xilinx-zynq +define KTYPE standard +define KARCH arm + +include ktypes/standard + +include xilinx-zynq.scc diff --git a/bsp/xilinx-zynq/xilinx-zynq.cfg b/bsp/xilinx-zynq/xilinx-zynq.cfg new file mode 100644 index 00000000..c4589de2 --- /dev/null +++ b/bsp/xilinx-zynq/xilinx-zynq.cfg @@ -0,0 +1,207 @@ +CONFIG_ARCH_ZYNQ=y +CONFIG_SMP=y +CONFIG_NR_CPUS=4 +CONFIG_HOTPLUG_CPU=y +CONFIG_VMSPLIT_2G=y + +# +# Xilinx Specific Options +# +CONFIG_XILINX_PREFETCH=y + +# ERRATA +CONFIG_PL310_ERRATA_588369=y +CONFIG_ARM_ERRATA_720789=y +CONFIG_PL310_ERRATA_727915=y +CONFIG_PL310_ERRATA_753970=y +CONFIG_ARM_ERRATA_754322=y +CONFIG_PL310_ERRATA_769419=y +CONFIG_ARM_ERRATA_775420=y + +CONFIG_VFP=y +CONFIG_NEON=y + +# DMA +CONFIG_AXI_DMAC=y +CONFIG_DMADEVICES=y +CONFIG_DMA_ENGINE=y +CONFIG_PL330_DMA=y +CONFIG_XILINX_DMA=y + +# Power Management +CONFIG_PMBUS=y +CONFIG_SENSORS_UCD9000=y + +# Watchdog +CONFIG_WATCHDOG=y +CONFIG_WATCHDOG_NOWAYOUT=y +CONFIG_CADENCE_WATCHDOG=y + +# GPIO +CONFIG_GPIOLIB=y +CONFIG_GPIO_CDEV=y +CONFIG_GPIO_XILINX=y +CONFIG_GPIO_ZYNQ=y +CONFIG_GPIO_PCA953X=y + +CONFIG_KEYBOARD_GPIO=y +CONFIG_LEDS_GPIO=y +CONFIG_NEW_LEDS=y +CONFIG_LEDS_CLASS=y + +# UART +CONFIG_SERIAL_XILINX_PS_UART=y +CONFIG_SERIAL_XILINX_PS_UART_CONSOLE=y + +# PTP clock support +CONFIG_PTP_1588_CLOCK=y + +# AXI Ethernet +CONFIG_NET_VENDOR_XILINX=y +CONFIG_XILINX_AXI_EMAC=y +CONFIG_XILINX_AXI_EMAC_HWTSTAMP=y + +# Cadence Ethernet +CONFIG_MACB=y +CONFIG_MACB_USE_HWSTAMP=y + +# PHY +CONFIG_MARVELL_PHY=y +CONFIG_VITESSE_PHY=y + +# I2C +CONFIG_I2C=y +CONFIG_I2C_MUX=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_MUX_PCA954x=y +CONFIG_I2C_CADENCE=y +CONFIG_I2C_XILINX=y + +# RTC +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_PCF8563=y +CONFIG_RTC_DRV_DS1307=y + +CONFIG_COMMON_CLK_AXI_CLKGEN=y + +# SPI +CONFIG_SPI_CADENCE=y +CONFIG_SPI_ZYNQ_QSPI=y + +# MTD +CONFIG_MTD=y +CONFIG_MTD_OF_PARTS=y +CONFIG_MTD_BLOCK=y +CONFIG_MTD_SPI_NOR=y +CONFIG_MTD_CFI=y +CONFIG_MTD_GEN_PROBE=y +CONFIG_MTD_PHYSMAP=y +CONFIG_MTD_PHYSMAP_OF=y + +CONFIG_SCSI=y +CONFIG_BLK_DEV_SD=y + +# MMC +CONFIG_MMC=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MMC_SDHCI_OF_ARASAN=y + +# USB +CONFIG_USB_OTG=y +CONFIG_USB_CHIPIDEA=y +CONFIG_USB_CHIPIDEA_OF=y +CONFIG_USB_CHIPIDEA_PCI=y +CONFIG_USB_CHIPIDEA_UDC=y +CONFIG_USB_CHIPIDEA_HOST=y + +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_XILINX=y + +CONFIG_USB_PHY=y +CONFIG_USB_ULPI=y +CONFIG_NOP_USB_XCEIV=y + +# PCIe +CONFIG_PCI=y +CONFIG_PCI_MSI=y +CONFIG_PCIE_XILINX=y + +# Graphic +CONFIG_FB=y +CONFIG_FRAMEBUFFER_CONSOLE=y + +CONFIG_DRM=y +CONFIG_DRM_KMS_HELPER=y +CONFIG_DRM_XILINX=y +CONFIG_FB_XILINX=y + +CONFIG_DRM_I2C_ADV7511=y +CONFIG_DRM_I2C_ADV7511_AUDIO=y +CONFIG_DRM_I2C_ADV7533=y +CONFIG_DRM_I2C_ADV7511_CEC=y + +# FPGA +CONFIG_FPGA=y +CONFIG_FPGA_MGR_ZYNQ_FPGA=y +CONFIG_FPGA_BRIDGE=y +CONFIG_FPGA_REGION=y +CONFIG_OF_FPGA_REGION=y + +# Misc +CONFIG_INPUT=y +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_EVDEV=y +CONFIG_CMA=y +CONFIG_DMA_CMA=y +CONFIG_UIO=y +CONFIG_UIO_PDRV_GENIRQ=y +CONFIG_UIO_XILINX_APM=y + +CONFIG_COMMON_CLK_SI570=y + +CONFIG_CPU_IDLE=y +CONFIG_ARM_CPUIDLE=y +CONFIG_ARM_ZYNQ_CPUIDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y + +CONFIG_EEPROM_AT24=y + +CONFIG_MEDIA_SUPPORT=y +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_CONTROLLER=y +CONFIG_VIDEO_V4L2_SUBDEV_API=y +CONFIG_MEDIA_PLATFORM_SUPPORT=y +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_MEDIA_SUBDRV_AUTOSELECT=y +CONFIG_MEDIA_USB_SUPPORT=y + +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_SOC=y +CONFIG_SND_SOC_ADI=y +CONFIG_SND_SOC_ADI_AXI_I2S=y +CONFIG_SND_SOC_ADI_AXI_SPDIF=y +CONFIG_SND_SIMPLE_CARD=y + +CONFIG_DEBUG_LL=y +CONFIG_DEBUG_ZYNQ_UART1=y +CONFIG_EARLY_PRINTK=y + +CONFIG_IIO=y +CONFIG_XILINX_TRAFGEN=y +CONFIG_IIO_CONFIGFS=y +CONFIG_IIO_SW_DEVICE=y +CONFIG_IIO_SW_TRIGGER=y +CONFIG_OF_OVERLAY=y +CONFIG_OF_CONFIGFS=y + +CONFIG_CORESIGHT=y +CONFIG_CORESIGHT_LINKS_AND_SINKS=y +CONFIG_CORESIGHT_LINK_AND_SINK_TMC=y +CONFIG_CORESIGHT_SINK_TPIU=y +CONFIG_CORESIGHT_SINK_ETBV10=y +CONFIG_CORESIGHT_SOURCE_ETM3X=y + +CONFIG_XILINX_XADC=y diff --git a/bsp/xilinx-zynq/xilinx-zynq.scc b/bsp/xilinx-zynq/xilinx-zynq.scc new file mode 100644 index 00000000..621f6954 --- /dev/null +++ b/bsp/xilinx-zynq/xilinx-zynq.scc @@ -0,0 +1,8 @@ +include arch/arm/arm.scc nopatch +include cfg/usb-mass-storage.scc +include features/spi/spi.scc +include features/spi/spidev.scc +include features/usb/ehci-hcd.scc +include features/debug/debug-kernel.scc + +kconf hardware xilinx-zynq.cfg diff --git a/bsp/xilinx-zynqmp/xilinx-zynqmp.cfg b/bsp/xilinx-zynqmp/xilinx-zynqmp.cfg index c86bda11..21a7e297 100644 --- a/bsp/xilinx-zynqmp/xilinx-zynqmp.cfg +++ b/bsp/xilinx-zynqmp/xilinx-zynqmp.cfg @@ -21,10 +21,9 @@ CONFIG_MTD=y CONFIG_MTD_OF_PARTS=y CONFIG_MTD_BLKDEVS=y CONFIG_MTD_BLOCK=y -CONFIG_MTD_M25P80=y CONFIG_MTD_SPI_NOR=y -# CONFIG_JFFS2_FS_WRITEBUFFER is not set -# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set +CONFIG_JFFS2_FS_WRITEBUFFER=n +CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=n CONFIG_BLK_DEV_SD=y CONFIG_ATA=y @@ -69,13 +68,16 @@ CONFIG_SPI_CADENCE=y CONFIG_SPI_XILINX=y CONFIG_SPI_ZYNQMP_GQSPI=y +CONFIG_PINCTRL=y + CONFIG_GPIOLIB=y CONFIG_OF_GPIO=y -CONFIG_GPIO_SYSFS=y +CONFIG_GPIO_CDEV=y CONFIG_GPIO_XILINX=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_PCA953X_IRQ=y CONFIG_GPIO_ZYNQ=y +CONFIG_GPIO_ZYNQMP_MODEPIN=y CONFIG_POWER_RESET=y CONFIG_SENSORS_INA2XX=y @@ -92,12 +94,17 @@ CONFIG_USB_OTG_FSM=m CONFIG_USB_GADGET=y CONFIG_USB_GADGET_XILINX=y +CONFIG_INPUT=y +CONFIG_INPUT_MOUSEDEV=y +CONFIG_INPUT_EVDEV=y + CONFIG_MMC=y CONFIG_MMC_BLOCK=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SDHCI_OF_ARASAN=y +CONFIG_RAS=y CONFIG_EDAC=y CONFIG_EDAC_SYNOPSYS=y CONFIG_EDAC_ZYNQMP_OCM=y @@ -109,7 +116,6 @@ CONFIG_RTC_INTF_SYSFS=y CONFIG_RTC_DRV_ZYNQMP=y CONFIG_DMADEVICES=y -CONFIG_XILINX_DMA_ENGINES=y CONFIG_DMA_ENGINE=y CONFIG_DMA_OF=y CONFIG_CMA=y @@ -124,7 +130,9 @@ CONFIG_UIO_XILINX_APM=y CONFIG_COMMON_CLK=y CONFIG_COMMON_CLK_SI570=y CONFIG_COMMON_CLK_SI5324=y +CONFIG_COMMON_CLK_SI5341=y CONFIG_COMMON_CLK_ZYNQMP=y +CONFIG_COMMON_CLK_XLNX_CLKWZRD=y CONFIG_IOMMU_API=y CONFIG_IOMMU_SUPPORT=y CONFIG_OF_IOMMU=y @@ -132,7 +140,7 @@ CONFIG_ARM_SMMU=y CONFIG_ARM_SMMU_V3=y # CONFIG_RPMSG=m -CONFIG_REMOTEPROC=m +CONFIG_REMOTEPROC=y CONFIG_ZYNQMP_R5_REMOTEPROC=m CONFIG_STAGING=y @@ -166,7 +174,7 @@ CONFIG_MEDIA_CONTROLLER=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_VIDEO_DEV=y CONFIG_VIDEO_V4L2_SUBDEV_API=y -CONFIG_VIDEO_V4L2=y +CONFIG_MEDIA_PLATFORM_SUPPORT=y CONFIG_V4L_PLATFORM_DRIVERS=y CONFIG_VIDEO_XILINX=y CONFIG_VIDEO_XILINX_CFA=y @@ -186,7 +194,6 @@ CONFIG_VIDEO_XILINX_MULTISCALER=y CONFIG_DRM=y CONFIG_DRM_KMS_HELPER=y -CONFIG_DRM_KMS_FB_HELPER=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_GEM_CMA_HELPER=y CONFIG_DRM_KMS_CMA_HELPER=y @@ -205,7 +212,7 @@ CONFIG_DRM_XLNX_SDI=y CONFIG_DRM_XLNX_BRIDGE_CSC=y CONFIG_DRM_XLNX_BRIDGE_SCALER=y CONFIG_XILINX_FRMBUF=y -CONFIG_XILINX_DPDMA=y +CONFIG_XILINX_ZYNQMP_DPDMA=y CONFIG_DRM_XILINX_SDI=y CONFIG_SOUND=y CONFIG_SND=y @@ -237,3 +244,11 @@ CONFIG_SENSORS_MAX20751=y CONFIG_OF_OVERLAY=y CONFIG_OF_CONFIGFS=y CONFIG_FPGA_MGR_DEBUG_FS=y + +CONFIG_ARM_PSCI_CPUIDLE=y + +CONFIG_ZYNQMP_FIRMWARE_DEBUG=y + +CONFIG_CRYPTO_DEV_ZYNQMP_SHA3=y +CONFIG_CRYPTO_DEV_XILINX_RSA=y +CONFIG_CRYPTO_DEV_ZYNQMP_AES=y diff --git a/bsp/xilinx/board-common.cfg b/bsp/xilinx/board-common.cfg index 6ba80905..0efca4cd 100644 --- a/bsp/xilinx/board-common.cfg +++ b/bsp/xilinx/board-common.cfg @@ -39,7 +39,7 @@ CONFIG_EEPROM_AT25=y # MTD CONFIG_MTD=y CONFIG_MTD_SPI_NOR=y -# CONFIG_MTD_SPI_NOR_USE_4K_SECTORS is not set +CONFIG_MTD_SPI_NOR_USE_4K_SECTORS=n CONFIG_MTD_M25P80=y CONFIG_MTD_CFI=y CONFIG_MTD_CFI_AMDSTD=y diff --git a/bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.cfg b/bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.cfg new file mode 100644 index 00000000..22eb8301 --- /dev/null +++ b/bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.cfg @@ -0,0 +1,18 @@ +# SPDX-License-Identifier: MIT +CONFIG_XILINX_MICROBLAZE0_FAMILY="kintex7" + +# CPU ISA Config +CONFIG_XILINX_MICROBLAZE0_USE_MSR_INSTR=1 +CONFIG_XILINX_MICROBLAZE0_USE_PCMP_INSTR=1 +CONFIG_XILINX_MICROBLAZE0_USE_BARREL=1 +CONFIG_XILINX_MICROBLAZE0_USE_DIV=1 +CONFIG_XILINX_MICROBLAZE0_USE_HW_MUL=2 +CONFIG_XILINX_MICROBLAZE0_USE_FPU=0 +CONFIG_XILINX_MICROBLAZE0_HW_VER="11.0" + +# Memory Base Address +CONFIG_KERNEL_BASE_ADDR=0x80000000 + +CONFIG_XILINX_AXI_EMAC=y +CONFIG_XILINX_PHY=y +CONFIG_BLK_DEV_INITRD=y diff --git a/bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc b/bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc new file mode 100644 index 00000000..2f9c2fbc --- /dev/null +++ b/bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Kernel Config for kc705-microblazeel specific setup" +define KFEATURE_COMPATIBILITY board + +kconf hardware kc705-microblazeel-features.cfg diff --git a/bsp/xilinx/soc/drivers-softip.cfg b/bsp/xilinx/soc/drivers-softip.cfg index 3d3e067c..01c29ba1 100644 --- a/bsp/xilinx/soc/drivers-softip.cfg +++ b/bsp/xilinx/soc/drivers-softip.cfg @@ -23,7 +23,6 @@ CONFIG_XILINX_AXI_EMAC=y # GPIO CONFIG_GPIOLIB=y CONFIG_OF_GPIO=y -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_XILINX=y # I2C diff --git a/bsp/xilinx/soc/drivers-zynq.cfg b/bsp/xilinx/soc/drivers-zynq.cfg index 560e0cb8..deee2b1c 100644 --- a/bsp/xilinx/soc/drivers-zynq.cfg +++ b/bsp/xilinx/soc/drivers-zynq.cfg @@ -29,11 +29,10 @@ CONFIG_WATCHDOG=y CONFIG_CADENCE_WATCHDOG=y # Ethernet -CONFIG_NET_CADENCE=y +CONFIG_NET_VENDOR_CADENCE=y CONFIG_MACB=y # GPIO -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_ZYNQ=y # I2C diff --git a/bsp/xilinx/ultra96-zynqmp/mipi-config-ultra96.cfg b/bsp/xilinx/ultra96-zynqmp/mipi-config-ultra96.cfg new file mode 100644 index 00000000..d7f65e7f --- /dev/null +++ b/bsp/xilinx/ultra96-zynqmp/mipi-config-ultra96.cfg @@ -0,0 +1,14 @@ +# SPDX-License-Identifier: MIT +CONFIG_VIDEO_ADV_DEBUG=y +CONFIG_VIDEO_OV5640=y +CONFIG_VIDEO_OV5645=y +CONFIG_XILINX_APF=y +CONFIG_XILINX_DMA_APF=y +CONFIG_COMMON_CLK_IDT8T49N24X=y +CONFIG_I2C_MUX=y +CONFIG_I2C_MUX_PCA9541=y +CONFIG_I2C_MUX_PCA954x=y +CONFIG_I2C_ALGOPCA=y +CONFIG_I2C_PCA_PLATFORM=y +CONFIG_I2C_DEBUG_CORE=y +CONFIG_I2C_DEBUG_BUS=y diff --git a/bsp/xilinx/ultra96-zynqmp/mipi-config-ultra96.scc b/bsp/xilinx/ultra96-zynqmp/mipi-config-ultra96.scc new file mode 100644 index 00000000..c326568b --- /dev/null +++ b/bsp/xilinx/ultra96-zynqmp/mipi-config-ultra96.scc @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Kernel Config for Ultra96 for MIPI" +define KFEATURE_COMPATIBILITY board + +kconf hardware mipi-config-ultra96.cfg + diff --git a/bsp/xilinx/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.cfg b/bsp/xilinx/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.cfg new file mode 100644 index 00000000..6c03a9d5 --- /dev/null +++ b/bsp/xilinx/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.cfg @@ -0,0 +1,20 @@ +# SPDX-License-Identifier: MIT +# Keyboard GPIO support +CONFIG_KEYBOARD_GPIO=y +CONFIG_KEYBOARD_GPIO_POLLED=y + +# Sound support for Zybo linux_bd project +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_SOC=y +CONFIG_SND_SOC_ADI=y +CONFIG_SND_SOC_ADI_AXI_I2S=y +CONFIG_SND_SIMPLE_CARD=y +CONFIG_SND_SOC_SSM2602_I2C=y + +# Drivers for Digilent DRM encoder +# DRM encoder +CONFIG_DRM_DIGILENT_ENCODER=y +# Common Clock Framework +CONFIG_COMMON_CLK_DGLNT_DYNCLK=y + diff --git a/bsp/xilinx/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.scc b/bsp/xilinx/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.scc new file mode 100644 index 00000000..35df82a2 --- /dev/null +++ b/bsp/xilinx/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.scc @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Kernel Config for ZYBO Linux-BD Design" +define KFEATURE_COMPATIBILITY board + +kconf hardware zybo-linux-bd-zynq7.cfg + +include bsp/xilinx/soc/drivers-drm.scc + diff --git a/bsp/xilinx/zynq-standard.scc b/bsp/xilinx/zynq-standard.scc index 889ba997..bad94870 100644 --- a/bsp/xilinx/zynq-standard.scc +++ b/bsp/xilinx/zynq-standard.scc @@ -12,5 +12,4 @@ include features/input/input.scc include cfg/usb-mass-storage.scc # default policy for standard kernels -include features/latencytop/latencytop.scc include features/profiling/profiling.scc diff --git a/cfg/8250.cfg b/cfg/8250.cfg index fe2d270c..403c736e 100644 --- a/cfg/8250.cfg +++ b/cfg/8250.cfg @@ -7,3 +7,4 @@ CONFIG_SERIAL_8250_NR_UARTS=4 CONFIG_SERIAL_8250_RUNTIME_UARTS=4 CONFIG_SERIAL_CORE=y CONFIG_SERIAL_CORE_CONSOLE=y +CONFIG_SERIAL_OF_PLATFORM=y diff --git a/cfg/amd.cfg b/cfg/amd.cfg index 2189810a..18213328 100644 --- a/cfg/amd.cfg +++ b/cfg/amd.cfg @@ -3,7 +3,6 @@ CONFIG_X86_AMD_PLATFORM_DEVICE=y CONFIG_MICROCODE=y -CONFIG_MICROCODE_AMD=y CONFIG_CPU_SUP_AMD=y diff --git a/cfg/boot-live.cfg b/cfg/boot-live.cfg index 03705e76..e13d04b5 100644 --- a/cfg/boot-live.cfg +++ b/cfg/boot-live.cfg @@ -2,7 +2,6 @@ CONFIG_BLK_DEV_LOOP=y CONFIG_RD_GZIP=y # Needed for booting (and using) CD images -CONFIG_BLK_DEV_IDECD=y CONFIG_ISO9660_FS=y CONFIG_BLK_DEV_SR=y CONFIG_ZISOFS=y diff --git a/cfg/cgroup-hugetlb.cfg b/cfg/cgroup-hugetlb.cfg new file mode 100644 index 00000000..417ca249 --- /dev/null +++ b/cfg/cgroup-hugetlb.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +# +# This requires CONFIG_HUGETLBFS + +CONFIG_CGROUP_HUGETLB=y diff --git a/cfg/cgroup-hugetlb.scc b/cfg/cgroup-hugetlb.scc new file mode 100644 index 00000000..7d1f9997 --- /dev/null +++ b/cfg/cgroup-hugetlb.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable hugetlb cgroup" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware cgroup-hugetlb.cfg diff --git a/cfg/criu.cfg b/cfg/criu.cfg new file mode 100644 index 00000000..dc9502a6 --- /dev/null +++ b/cfg/criu.cfg @@ -0,0 +1,8 @@ +#Networking options options for sock-diag subsystem +CONFIG_UNIX_DIAG=y +CONFIG_INET_DIAG=y +CONFIG_INET_UDP_DIAG=y +CONFIG_PACKET_DIAG=y +CONFIG_NETLINK_DIAG=y +CONFIG_NETFILTER_XT_MARK=y +CONFIG_TUN=m diff --git a/cfg/criu.scc b/cfg/criu.scc new file mode 100644 index 00000000..87a88113 --- /dev/null +++ b/cfg/criu.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Enable Networking Features needed by criu." +define KFEATURE_COMPATIBILITY board + +kconf non-hardware criu.cfg diff --git a/cfg/crypto-obsolete-disable.cfg b/cfg/crypto-obsolete-disable.cfg new file mode 100644 index 00000000..85128c87 --- /dev/null +++ b/cfg/crypto-obsolete-disable.cfg @@ -0,0 +1 @@ +CONFIG_CRYPTO_USER_API_ENABLE_OBSOLETE=n diff --git a/cfg/crypto-obsolete-disable.scc b/cfg/crypto-obsolete-disable.scc new file mode 100644 index 00000000..e7ead6a8 --- /dev/null +++ b/cfg/crypto-obsolete-disable.scc @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Disable obselete crypto options" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware crypto-obsolete-disable.cfg + diff --git a/cfg/debug/debug-info/debug-info.cfg b/cfg/debug/debug-info/debug-info.cfg index 0514cea3..1d75b16b 100644 --- a/cfg/debug/debug-info/debug-info.cfg +++ b/cfg/debug/debug-info/debug-info.cfg @@ -1,3 +1,2 @@ # SPDX-License-Identifier: MIT -# CONFIG_TEST is not set CONFIG_DEBUG_INFO=y diff --git a/cfg/debug/fault-inject/debug-fault-injection-debugfs.cfg b/cfg/debug/fault-inject/debug-fault-injection-debugfs.cfg new file mode 100644 index 00000000..7e5b692a --- /dev/null +++ b/cfg/debug/fault-inject/debug-fault-injection-debugfs.cfg @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT +# dependencies +CONFIG_SYSFS=y +CONFIG_DEBUG_FS=y + +CONFIG_FAULT_INJECTION_DEBUG_FS=y diff --git a/cfg/debug/fault-inject/debug-fault-injection-debugfs.scc b/cfg/debug/fault-inject/debug-fault-injection-debugfs.scc new file mode 100644 index 00000000..d12af702 --- /dev/null +++ b/cfg/debug/fault-inject/debug-fault-injection-debugfs.scc @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable fault injection debugfs capabilities" +define KFEATURE_COMPATIBILITY all + +include debug-fault-injection.scc + +kconf non-hardware debug-fault-injection-debugfs.cfg diff --git a/cfg/debug/kcov/debug-kcov.cfg b/cfg/debug/kcov/debug-kcov.cfg new file mode 100644 index 00000000..9cdd37ce --- /dev/null +++ b/cfg/debug/kcov/debug-kcov.cfg @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +CONFIG_KCOV=y +CONFIG_KCOV_ENABLE_COMPARISONS=y +CONFIG_KCOV_INSTRUMENT_ALL=y diff --git a/cfg/debug/kcov/debug-kcov.scc b/cfg/debug/kcov/debug-kcov.scc new file mode 100644 index 00000000..325c6f99 --- /dev/null +++ b/cfg/debug/kcov/debug-kcov.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable kernel code coverage support" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware debug-kcov.cfg diff --git a/cfg/debug/kcsan/debug-kcsan.cfg b/cfg/debug/kcsan/debug-kcsan.cfg new file mode 100644 index 00000000..57c4352e --- /dev/null +++ b/cfg/debug/kcsan/debug-kcsan.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_KCSAN=y diff --git a/cfg/debug/kcsan/debug-kcsan.scc b/cfg/debug/kcsan/debug-kcsan.scc new file mode 100644 index 00000000..b726d6b0 --- /dev/null +++ b/cfg/debug/kcsan/debug-kcsan.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable kernel concurrency sanitizer support" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware debug-kcsan.cfg diff --git a/cfg/debug/mem/debug-pagealloc.cfg b/cfg/debug/mem/debug-pagealloc.cfg index c4f1ade0..218f0756 100644 --- a/cfg/debug/mem/debug-pagealloc.cfg +++ b/cfg/debug/mem/debug-pagealloc.cfg @@ -1,4 +1,4 @@ # SPDX-License-Identifier: MIT -# CONFIG_HIBERNATION is not set +CONFIG_HIBERNATION=n CONFIG_DEBUG_PAGEALLOC=y CONFIG_DEBUG_PAGEALLOC_ENABLE_DEFAULT=y diff --git a/cfg/debug/misc/debug-credentials.cfg b/cfg/debug/misc/debug-credentials.cfg index e0d09198..548d2d44 100644 --- a/cfg/debug/misc/debug-credentials.cfg +++ b/cfg/debug/misc/debug-credentials.cfg @@ -1,2 +1 @@ # SPDX-License-Identifier: MIT -CONFIG_DEBUG_CREDENTIALS=y diff --git a/cfg/debug/misc/debug-optimize-inlining.scc b/cfg/debug/misc/debug-optimize-inlining.scc deleted file mode 100644 index 7e732402..00000000 --- a/cfg/debug/misc/debug-optimize-inlining.scc +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: MIT -if [ "$KARCH" = "x86_64" ] || [ "$KARCH" = "i386" ]; then - kconf non-hareware debug-optimize-inlining.cfg -fi diff --git a/cfg/debug/syzkaller/debug-syzkaller.scc b/cfg/debug/syzkaller/debug-syzkaller.scc new file mode 100644 index 00000000..ff99b281 --- /dev/null +++ b/cfg/debug/syzkaller/debug-syzkaller.scc @@ -0,0 +1,16 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable debug and emulation features needed for syzkaller fuzzing" +define KFEATURE_COMPATIBILITY all + +include cfg/debug/kcov/debug-kcov.scc +include cfg/debug/mem/debug-memleak.scc +include cfg/debug/kcsan/debug-kcsan.scc +include cfg/debug/fault-inject/debug-failslab-slab.scc +include cfg/debug/fault-inject/debug-fault-injection-debugfs.scc + +include features/tun/tun.scc +include features/usb/usb-dummy-hcd.scc +include features/usb/usb-raw-gadget.scc +include features/mac80211/mac80211-hwsim.scc +include features/bluetooth/bluetooth-vhci.scc +include features/ieee802154/ieee802154-hwsim.scc diff --git a/cfg/docker.cfg b/cfg/docker.cfg new file mode 100644 index 00000000..4d8d7e04 --- /dev/null +++ b/cfg/docker.cfg @@ -0,0 +1,15 @@ +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m +CONFIG_IP_NF_FILTER=m +CONFIG_NF_NAT=m +CONFIG_NF_CONNTRACK=y + +CONFIG_DM_THIN_PROVISIONING=m + + +CONFIG_IP_NF_NAT=m +CONFIG_IP_NF_TARGET_MASQUERADE=m +CONFIG_NETFILTER_XT_MATCH_IPVS=m + +CONFIG_OVERLAY_FS=y + +CONFIG_CGROUP_BPF=y diff --git a/cfg/docker.scc b/cfg/docker.scc new file mode 100644 index 00000000..e317456c --- /dev/null +++ b/cfg/docker.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Enable Features needed by docker in addition to LXC features" +define KFEATURE_COMPATIBILITY board + +kconf non-hardware docker.cfg diff --git a/cfg/drm-cdvpvr.cfg b/cfg/drm-cdvpvr.cfg index 2ba41584..c51904cf 100644 --- a/cfg/drm-cdvpvr.cfg +++ b/cfg/drm-cdvpvr.cfg @@ -7,5 +7,5 @@ CONFIG_SND_HDA_CODEC_HDMI=y CONFIG_DRM_INTEL_CDV=y CONFIG_DRM_CDV_RELEASE=y -# CONFIG_DRM_CDV_DEBUG is not set -# CONFIG_DRM_PVR_PDUMP is not set +CONFIG_DRM_CDV_DEBUG=n +CONFIG_DRM_PVR_PDUMP=n diff --git a/cfg/ebtables.cfg b/cfg/ebtables.cfg new file mode 100644 index 00000000..a3c514e1 --- /dev/null +++ b/cfg/ebtables.cfg @@ -0,0 +1,2 @@ +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_T_NAT=m diff --git a/cfg/ebtables.scc b/cfg/ebtables.scc new file mode 100644 index 00000000..b3895e58 --- /dev/null +++ b/cfg/ebtables.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Enable ebtables support" +define KFEATURE_COMPATIBILITY board + +kconf non-hardware ebtables.cfg diff --git a/cfg/efi-ext.cfg b/cfg/efi-ext.cfg index 55478ad9..b8fa0426 100644 --- a/cfg/efi-ext.cfg +++ b/cfg/efi-ext.cfg @@ -11,5 +11,4 @@ CONFIG_PARTITION_ADVANCED=y # Add support for optional EFI features CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FB_EFI=y -CONFIG_EFI_VARS=m CONFIG_EFI_PARTITION=y diff --git a/cfg/efi.cfg b/cfg/efi.cfg index d3dfd603..d729cbe9 100644 --- a/cfg/efi.cfg +++ b/cfg/efi.cfg @@ -3,7 +3,6 @@ # Dependencies CONFIG_PCI=y -CONFIG_ACPI=y # Enable basic EFI support CONFIG_EFI=y diff --git a/cfg/fs/ext2.cfg b/cfg/fs/ext2.cfg index 6a3efdf1..8bb8986c 100644 --- a/cfg/fs/ext2.cfg +++ b/cfg/fs/ext2.cfg @@ -2,4 +2,4 @@ CONFIG_EXT2_FS=y CONFIG_EXT2_FS_XATTR=y CONFIG_EXT2_FS_POSIX_ACL=y -# CONFIG_EXT2_FS_SECURITY is not set +CONFIG_EXT2_FS_SECURITY=n diff --git a/cfg/fs/flash_fs.cfg b/cfg/fs/flash_fs.cfg index 6f105599..f9aef96e 100644 --- a/cfg/fs/flash_fs.cfg +++ b/cfg/fs/flash_fs.cfg @@ -1,4 +1,9 @@ # SPDX-License-Identifier: MIT +CONFIG_MTD=y +CONFIG_MTD_CMDLINE_PARTS=y +CONFIG_MTD_BLKDEVS=y +CONFIG_MTD_BLOCK=y + CONFIG_JFFS2_FS=y CONFIG_JFFS2_FS_DEBUG=0 CONFIG_JFFS2_FS_WRITEBUFFER=y diff --git a/cfg/fs/squashfs.cfg b/cfg/fs/squashfs.cfg new file mode 100644 index 00000000..27906251 --- /dev/null +++ b/cfg/fs/squashfs.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_SQUASHFS=y diff --git a/cfg/fs/squashfs.scc b/cfg/fs/squashfs.scc new file mode 100644 index 00000000..bb82fe60 --- /dev/null +++ b/cfg/fs/squashfs.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable squashfs filesystem support" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware squashfs.cfg diff --git a/cfg/intel.cfg b/cfg/intel.cfg index 3096df33..01e865df 100644 --- a/cfg/intel.cfg +++ b/cfg/intel.cfg @@ -1,7 +1,6 @@ # SPDX-License-Identifier: MIT # Config settings specific to intel processors CONFIG_MICROCODE=y -CONFIG_MICROCODE_INTEL=y CONFIG_CPU_SUP_INTEL=y diff --git a/cfg/kubernetes.cfg b/cfg/kubernetes.cfg new file mode 100644 index 00000000..84fa8c57 --- /dev/null +++ b/cfg/kubernetes.cfg @@ -0,0 +1,39 @@ +CONFIG_BLK_CGROUP=y +CONFIG_BLK_DEV_THROTTLING=y +CONFIG_CGROUP_PERF=y +CONFIG_CGROUP_HUGETLB=y +CONFIG_NET_CLS_CGROUP=y +CONFIG_CFS_BANDWIDTH=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_RT_GROUP_SCHED=y +CONFIG_IP_NF_TARGET_REDIRECT=y +CONFIG_IP_SET=m +CONFIG_IP_VS=y +CONFIG_IP_VS_NFCT=y +CONFIG_IP_VS_PROTO_TCP=y +CONFIG_IP_VS_PROTO_UDP=y +CONFIG_IP_VS_RR=m +CONFIG_NETFILTER_NETLINK_LOG=m +CONFIG_NETFILTER_XT_CONNMARK=m +CONFIG_NETFILTER_XT_MATCH_COMMENT=m +CONFIG_NETFILTER_XT_MATCH_LIMIT=m +CONFIG_NETFILTER_XT_MATCH_MARK=m +CONFIG_NETFILTER_XT_MATCH_PHYSDEV=m +CONFIG_NETFILTER_XT_TARGET_NFLOG=m +CONFIG_NETFILTER_XT_TARGET_REDIRECT=m +CONFIG_NAMESPACES=y +CONFIG_NET_NS=y +CONFIG_PID_NS=y +CONFIG_IPC_NS=y +CONFIG_UTS_NS=y +CONFIG_CGROUPS=y +CONFIG_CGROUP_CPUACCT=y +CONFIG_CGROUP_DEVICE=y +CONFIG_CGROUP_FREEZER=y +CONFIG_CGROUP_SCHED=y +CONFIG_SMP=y +CONFIG_CPUSETS=y +CONFIG_MEMCG=y +CONFIG_INET=y +CONFIG_EXT4_FS=y +CONFIG_PROC_FS=y diff --git a/cfg/kubernetes.scc b/cfg/kubernetes.scc new file mode 100644 index 00000000..9ec5d13a --- /dev/null +++ b/cfg/kubernetes.scc @@ -0,0 +1,5 @@ +include docker.scc +include cgl/cfg/net/ip_vs.scc +include features/hugetlb/hugetlb.scc + +kconf non-hardware kubernetes.cfg diff --git a/cfg/lxc.cfg b/cfg/lxc.cfg new file mode 100644 index 00000000..09093319 --- /dev/null +++ b/cfg/lxc.cfg @@ -0,0 +1,31 @@ +# SPDX-License-Identifier: MIT +# Misc configs +CONFIG_CGROUP_DEVICE=y +CONFIG_CPUSETS=y +CONFIG_PROC_PID_CPUSET=y +CONFIG_MEMCG=y +CONFIG_CGROUP_SCHED=y +CONFIG_FAIR_GROUP_SCHED=y +CONFIG_CHECKPOINT_RESTORE=y +CONFIG_NAMESPACES=y +CONFIG_UTS_NS=y +CONFIG_IPC_NS=y +CONFIG_USER_NS=y +CONFIG_PID_NS=y +CONFIG_NET_NS=y + +CONFIG_NET_CLS_CGROUP=m +CONFIG_BLK_CGROUP=y +CONFIG_CGROUP_NET_PRIO=y + +# Base support for live boot +CONFIG_BLK_DEV_LOOP=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_ISO8859_1=y +CONFIG_VFAT_FS=y +CONFIG_RD_GZIP=y + +# Support for virtual ethernet and LXC +CONFIG_VETH=y +CONFIG_MACVLAN=y +CONFIG_VXLAN=m diff --git a/cfg/lxc.scc b/cfg/lxc.scc new file mode 100644 index 00000000..ee518835 --- /dev/null +++ b/cfg/lxc.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Enable Features needed by LxC, namespaces, cgroups et.c." +define KFEATURE_COMPATIBILITY board + +kconf non-hardware lxc.cfg diff --git a/cfg/mips64.cfg b/cfg/mips64.cfg index 77857ef7..1098090f 100644 --- a/cfg/mips64.cfg +++ b/cfg/mips64.cfg @@ -15,4 +15,4 @@ CONFIG_MIPS32_N32=y # The kernel panics on boot with an unhandled page fault if we # configure the VGA_CONSOLE in. # -# CONFIG_VGA_CONSOLE is not set +CONFIG_VGA_CONSOLE=n diff --git a/cfg/mips64le.cfg b/cfg/mips64le.cfg index 8eaf305a..9ea3fa43 100644 --- a/cfg/mips64le.cfg +++ b/cfg/mips64le.cfg @@ -15,4 +15,4 @@ CONFIG_MIPS32_N32=y # The kernel panics on boot with an unhandled page fault if we # configure the VGA_CONSOLE in. # -# CONFIG_VGA_CONSOLE is not set +CONFIG_VGA_CONSOLE=n diff --git a/cfg/net/bridge.cfg b/cfg/net/bridge.cfg index 629a2892..8d522441 100644 --- a/cfg/net/bridge.cfg +++ b/cfg/net/bridge.cfg @@ -2,6 +2,12 @@ # # Bridge: Netfilter Configuration # + +# note: standard.cfg sets CONFIG_BRIDGE=m, so this can't be +# =y as the final value. We can either change it, or +# we have to set CONFIG_BRIDGE here, trying CONFIG_BRIDGE=y +# here for now +CONFIG_BRIDGE=y CONFIG_BRIDGE_NETFILTER=y CONFIG_BRIDGE_EBT_BROUTE=m CONFIG_BRIDGE_EBT_T_FILTER=m diff --git a/cfg/net/ip6_nf.cfg b/cfg/net/ip6_nf.cfg index cb1db470..3458f9c4 100644 --- a/cfg/net/ip6_nf.cfg +++ b/cfg/net/ip6_nf.cfg @@ -12,3 +12,4 @@ CONFIG_IP6_NF_MATCH_EUI64=m CONFIG_IP6_NF_FILTER=m CONFIG_IP6_NF_MANGLE=m CONFIG_IP6_NF_RAW=m +CONFIG_IP6_NF_NAT=m diff --git a/cfg/net/ip_nf.cfg b/cfg/net/ip_nf.cfg index 406be5bc..14f7cfad 100644 --- a/cfg/net/ip_nf.cfg +++ b/cfg/net/ip_nf.cfg @@ -12,8 +12,8 @@ CONFIG_IP_NF_TARGET_REDIRECT=m CONFIG_IP_NF_TARGET_NETMAP=m CONFIG_IP_NF_MANGLE=m CONFIG_IP_NF_TARGET_ECN=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_RAW=m CONFIG_IP_NF_ARPTABLES=m CONFIG_IP_NF_ARPFILTER=m CONFIG_IP_NF_ARP_MANGLE=m +CONFIG_IP_NF_NAT=m diff --git a/cfg/net/ipsec6.cfg b/cfg/net/ipsec6.cfg index 617cf317..9cb7ec38 100644 --- a/cfg/net/ipsec6.cfg +++ b/cfg/net/ipsec6.cfg @@ -9,7 +9,7 @@ CONFIG_INET6_AH=y CONFIG_INET6_ESP=y CONFIG_INET6_IPCOMP=m # crypto needed by ipsec-self of IPv6 Conformance Test -CONFIG_CRYPTO_SEQIV=m -CONFIG_CRYPTO_CTR=m +CONFIG_CRYPTO_SEQIV=y +CONFIG_CRYPTO_CTR=y CONFIG_CRYPTO_XCBC=m CONFIG_CRYPTO_CAMELLIA=m diff --git a/cfg/net/mdio.cfg b/cfg/net/mdio.cfg new file mode 100644 index 00000000..98a0f3e6 --- /dev/null +++ b/cfg/net/mdio.cfg @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT +CONFIG_MDIO_DEVICE=y +CONFIG_MDIO_BUS=y diff --git a/cfg/net/mdio.scc b/cfg/net/mdio.scc new file mode 100644 index 00000000..4e99fa7d --- /dev/null +++ b/cfg/net/mdio.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable MDIO bus device options" +define KFEATURE_COMPATIBILITY all + +kconf hardware mdio.cfg diff --git a/cfg/net/y_or_m_enabled.cfg b/cfg/net/y_or_m_enabled.cfg new file mode 100644 index 00000000..2be97522 --- /dev/null +++ b/cfg/net/y_or_m_enabled.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_MDIO_BUS diff --git a/cfg/non-hardware.cfg b/cfg/non-hardware.cfg new file mode 100644 index 00000000..6528c0ae --- /dev/null +++ b/cfg/non-hardware.cfg @@ -0,0 +1,2 @@ +CONFIG_SCSI_VIRTIO +CONFIG_SERIAL_OF_PLATFORM diff --git a/cfg/remoteproc.cfg b/cfg/remoteproc.cfg index d02a7947..dacb8505 100644 --- a/cfg/remoteproc.cfg +++ b/cfg/remoteproc.cfg @@ -1,4 +1,3 @@ # SPDX-License-Identifier: MIT -CONFIG_REMOTEPROC=m +CONFIG_REMOTEPROC=y CONFIG_WKUP_M3_RPROC=m -CONFIG_PRUSS_REMOTEPROC=m diff --git a/cfg/sound.cfg b/cfg/sound.cfg index 7c1fb758..3e11e940 100644 --- a/cfg/sound.cfg +++ b/cfg/sound.cfg @@ -1,6 +1,6 @@ # SPDX-License-Identifier: MIT CONFIG_SOUND=m -# CONFIG_SOUND_OSS_CORE is not set +CONFIG_SOUND_OSS_CORE=n CONFIG_SND=m CONFIG_SND_TIMER=m CONFIG_SND_HRTIMER=m @@ -11,10 +11,10 @@ CONFIG_SND_RAWMIDI=m CONFIG_SND_SEQUENCER=m CONFIG_SND_SEQ_MIDI=m CONFIG_SND_SEQ_MIDI_EVENT=m -# CONFIG_SND_MIXER_OSS is not set -# CONFIG_SND_PCM_OSS is not set -# CONFIG_SND_SEQUENCER_OSS is not set -# CONFIG_SND_SUPPORT_OLD_API is not set +CONFIG_SND_MIXER_OSS=n +CONFIG_SND_PCM_OSS=n +CONFIG_SND_SEQUENCER_OSS=n +CONFIG_SND_SUPPORT_OLD_API=n CONFIG_SND_OPL3_LIB_SEQ=m CONFIG_SND_EMU10K1_SEQ=m CONFIG_SND_MPU401_UART=m @@ -45,9 +45,6 @@ CONFIG_SND_SOC_AC97_BUS=y CONFIG_SND_SOC_COMPRESS=y CONFIG_SND_SOC_AMD_ACP=m CONFIG_SND_SST_ATOM_HIFI2_PLATFORM=m -CONFIG_SND_SST_IPC=m -CONFIG_SND_SST_IPC_ACPI=m -CONFIG_SND_SOC_INTEL_SST_FIRMWARE=m CONFIG_SND_SOC_INTEL_HASWELL=m CONFIG_SND_SOC_INTEL_HASWELL_MACH=m CONFIG_SND_SOC_INTEL_BXT_DA7219_MAX98357A_MACH=m diff --git a/cfg/timer/hz_100.cfg b/cfg/timer/hz_100.cfg index fffd96f2..452784d8 100644 --- a/cfg/timer/hz_100.cfg +++ b/cfg/timer/hz_100.cfg @@ -1,6 +1,6 @@ # SPDX-License-Identifier: MIT CONFIG_HZ_100=y -# CONFIG_HZ_250 is not set -# CONFIG_HZ_300 is not set -# CONFIG_HZ_1000 is not set +CONFIG_HZ_250=n +CONFIG_HZ_300=n +CONFIG_HZ_1000=n CONFIG_HZ=100 diff --git a/cfg/timer/hz_1000.cfg b/cfg/timer/hz_1000.cfg index 13351152..c6024f73 100644 --- a/cfg/timer/hz_1000.cfg +++ b/cfg/timer/hz_1000.cfg @@ -1,6 +1,6 @@ # SPDX-License-Identifier: MIT CONFIG_HZ_1000=y -# CONFIG_HZ_100 is not set -# CONFIG_HZ_250 is not set -# CONFIG_HZ_300 is not set +CONFIG_HZ_100=n +CONFIG_HZ_250=n +CONFIG_HZ_300=n CONFIG_HZ=1000 diff --git a/cfg/timer/hz_250.cfg b/cfg/timer/hz_250.cfg index f9251bbe..42f2a1b7 100644 --- a/cfg/timer/hz_250.cfg +++ b/cfg/timer/hz_250.cfg @@ -1,6 +1,6 @@ # SPDX-License-Identifier: MIT CONFIG_HZ_250=y -# CONFIG_HZ_100 is not set -# CONFIG_HZ_300 is not set -# CONFIG_HZ_1000 is not set +CONFIG_HZ_100=n +CONFIG_HZ_300=n +CONFIG_HZ_1000=n CONFIG_HZ=250 diff --git a/cfg/timer/no_hz.cfg b/cfg/timer/no_hz.cfg index a2275795..e17bec01 100644 --- a/cfg/timer/no_hz.cfg +++ b/cfg/timer/no_hz.cfg @@ -1,2 +1,2 @@ # SPDX-License-Identifier: MIT -CONFIG_NO_HZ=y +CONFIG_NO_HZ_IDLE=y diff --git a/cfg/vesafb.cfg b/cfg/vesafb.cfg index 203ba039..f39eefa7 100644 --- a/cfg/vesafb.cfg +++ b/cfg/vesafb.cfg @@ -1,7 +1,7 @@ # SPDX-License-Identifier: MIT CONFIG_FB=y CONFIG_FB_VESA=y -CONFIG_FB_BOOT_VESA_SUPPORT=y +CONFIG_BOOT_VESA_SUPPORT=y CONFIG_FB_MODE_HELPERS=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y diff --git a/cfg/virtio.cfg b/cfg/virtio.cfg index 3b3ccbc8..0ef99c6b 100644 --- a/cfg/virtio.cfg +++ b/cfg/virtio.cfg @@ -1,14 +1,25 @@ # SPDX-License-Identifier: MIT CONFIG_VIRTIO=y +CONFIG_VIRTIO_MENU=y CONFIG_VIRTIO_PCI=y CONFIG_VIRTIO_BALLOON=y +CONFIG_NET=y CONFIG_VIRTIO_NET=y CONFIG_VIRTIO_BLK=y +CONFIG_BLK_MQ_VIRTIO=y CONFIG_VIRTIO_CONSOLE=y CONFIG_VIRTIO_MMIO=y CONFIG_VIRTIO_INPUT=m CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_VIRTIO=y +CONFIG_SCSI=y +CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_VIRTIO=y +CONFIG_CRYPTO=y CONFIG_CRYPTO_DEV_VIRTIO=y +CONFIG_DRM=y CONFIG_DRM_VIRTIO_GPU=y +CONFIG_VSOCKETS=y +CONFIG_VSOCKETS_DIAG=y +CONFIG_VIRTIO_VSOCKETS=y +CONFIG_VIRTIO_VSOCKETS_COMMON=y diff --git a/cfg/vmware-guest.cfg b/cfg/vmware-guest.cfg index 00b1131d..499a02b9 100644 --- a/cfg/vmware-guest.cfg +++ b/cfg/vmware-guest.cfg @@ -15,9 +15,9 @@ CONFIG_FUSION_MAX_SGE=128 CONFIG_FUSION_CTL=y CONFIG_FUSION_LAN=y CONFIG_FUSION_LOGGING=y +CONFIG_NET_FC=y +CONFIG_SCSI_FC_ATTRS=y CONFIG_SCSI_MPT2SAS=y CONFIG_SCSI_MPT2SAS_MAX_SGE=128 -CONFIG_SCSI_MPT2SAS_LOGGING=y CONFIG_SCSI_MPT3SAS=y CONFIG_SCSI_MPT3SAS_MAX_SGE=128 -CONFIG_SCSI_MPT3SAS_LOGGING=y diff --git a/cfg/vswitch.cfg b/cfg/vswitch.cfg new file mode 100644 index 00000000..b1fefc0c --- /dev/null +++ b/cfg/vswitch.cfg @@ -0,0 +1,3 @@ +CONFIG_OPENVSWITCH=m +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_ACT_POLICE=m diff --git a/cfg/vswitch.scc b/cfg/vswitch.scc new file mode 100644 index 00000000..2790b4fe --- /dev/null +++ b/cfg/vswitch.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Enable in kernel OpenvSwitch module" +define KFEATURE_COMPATIBILITY board + +kconf non-hardware vswitch.cfg diff --git a/cfg/x32.cfg b/cfg/x32.cfg index 98fd8b2d..307695dd 100644 --- a/cfg/x32.cfg +++ b/cfg/x32.cfg @@ -1,5 +1,5 @@ # SPDX-License-Identifier: MIT -CONFIG_X86_X32=y +CONFIG_X86_X32_ABI=y # Support running 32 bit binaries CONFIG_COMPAT=y diff --git a/cfg/x86_64.cfg b/cfg/x86_64.cfg index 1f6a2a81..c2c3193c 100644 --- a/cfg/x86_64.cfg +++ b/cfg/x86_64.cfg @@ -6,5 +6,5 @@ CONFIG_64BIT=y CONFIG_IA32_EMULATION=y CONFIG_COMPAT=y -# CONFIG_UNWINDER_ORC is not set +CONFIG_UNWINDER_ORC=n CONFIG_UNWINDER_FRAME_POINTER=y diff --git a/cfg/x86_base.cfg b/cfg/x86_base.cfg index 9dedfd09..b3cd09cd 100644 --- a/cfg/x86_base.cfg +++ b/cfg/x86_base.cfg @@ -4,5 +4,7 @@ CONFIG_X86_MSR=y CONFIG_X86_CPUID=y CONFIG_MTRR=y +CONFIG_ACPI=y + CONFIG_X86_CHECK_BIOS_CORRUPTION=y CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y diff --git a/cfg/xen.cfg b/cfg/xen.cfg new file mode 100644 index 00000000..af821d2f --- /dev/null +++ b/cfg/xen.cfg @@ -0,0 +1,49 @@ +CONFIG_HYPERVISOR_GUEST=y +CONFIG_PARAVIRT=y +CONFIG_XEN=y +CONFIG_XEN_DOM0=y +CONFIG_XEN_PVHVM=y +CONFIG_XEN_SAVE_RESTORE=y +# CONFIG_XEN_DEBUG_FS is not set +CONFIG_XEN_PVH=y +CONFIG_MMU_NOTIFIER=y +CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_PCI_XEN=y +CONFIG_XEN_PCIDEV_FRONTEND=y +CONFIG_SYS_HYPERVISOR=y +CONFIG_XEN_BLKDEV_FRONTEND=y +CONFIG_XEN_BLKDEV_BACKEND=m +CONFIG_XEN_SCSI_FRONTEND=m +CONFIG_XEN_NETDEV_FRONTEND=y +CONFIG_XEN_NETDEV_BACKEND=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y +CONFIG_HVC_IRQ=y +CONFIG_HVC_XEN=y +CONFIG_HVC_XEN_FRONTEND=y +CONFIG_XEN_WDT=m +CONFIG_FB_SYS_FILLRECT=y +CONFIG_FB_SYS_COPYAREA=y +CONFIG_FB_SYS_IMAGEBLIT=y +CONFIG_FB_SYS_FOPS=y +CONFIG_FB_DEFERRED_IO=y +CONFIG_XEN_FBDEV_FRONTEND=y +CONFIG_XEN_BALLOON=y +CONFIG_XEN_SCRUB_PAGES_DEFAULT=y +CONFIG_XEN_DEV_EVTCHN=y +CONFIG_XEN_BACKEND=y +CONFIG_XENFS=y +CONFIG_XEN_COMPAT_XENFS=y +CONFIG_XEN_SYS_HYPERVISOR=y +CONFIG_XEN_XENBUS_FRONTEND=y +CONFIG_XEN_GNTDEV=m +CONFIG_XEN_GRANT_DEV_ALLOC=m +CONFIG_SWIOTLB_XEN=y +CONFIG_XEN_PCIDEV_BACKEND=m +CONFIG_XEN_PRIVCMD=y +CONFIG_XEN_ACPI_PROCESSOR=m +CONFIG_XEN_MCE_LOG=y +CONFIG_XEN_HAVE_PVMMU=y +CONFIG_XEN_EFI=y +CONFIG_XEN_AUTO_XLATE=y +CONFIG_XEN_ACPI=y diff --git a/cfg/xen.scc b/cfg/xen.scc new file mode 100644 index 00000000..b588e5df --- /dev/null +++ b/cfg/xen.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Xen Kernel Support" +define KFEATURE_COMPATIBILITY arch + +kconf non-hardware xen.cfg diff --git a/cfg/xt-checksum.cfg b/cfg/xt-checksum.cfg new file mode 100644 index 00000000..58afbff6 --- /dev/null +++ b/cfg/xt-checksum.cfg @@ -0,0 +1 @@ +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m diff --git a/cfg/xt-checksum.scc b/cfg/xt-checksum.scc new file mode 100644 index 00000000..d3804f0c --- /dev/null +++ b/cfg/xt-checksum.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Add extra iptables modules" +define KFEATURE_COMPATIBILITY board + +kconf non-hardware xt-checksum.cfg diff --git a/cgl/cfg/net/l2tp.cfg b/cgl/cfg/net/l2tp.cfg index daeb044b..cbdb2e36 100644 --- a/cgl/cfg/net/l2tp.cfg +++ b/cgl/cfg/net/l2tp.cfg @@ -13,4 +13,4 @@ #......................................................................... CONFIG_L2TP=y -CONFIG_PPPOL2TP=y +CONFIG_PPPOL2TP=m diff --git a/cgl/features/audit/audit.cfg b/cgl/features/audit/audit.cfg index e9db3a50..ec3678c5 100644 --- a/cgl/features/audit/audit.cfg +++ b/cgl/features/audit/audit.cfg @@ -1,5 +1,5 @@ # SPDX-License-Identifier: MIT CONFIG_AUDIT=y CONFIG_AUDITSYSCALL=y -# CONFIG_NETFILTER_XT_TARGET_AUDIT is not set +CONFIG_NETFILTER_XT_TARGET_AUDIT=n CONFIG_AUDIT_GENERIC=y diff --git a/cgl/features/selinux/selinux.cfg b/cgl/features/selinux/selinux.cfg index 91efe977..a73ad995 100644 --- a/cgl/features/selinux/selinux.cfg +++ b/cgl/features/selinux/selinux.cfg @@ -7,6 +7,4 @@ CONFIG_JFS_SECURITY=y CONFIG_JFFS2_FS_SECURITY=y CONFIG_SECURITY_NETWORK=y CONFIG_SECURITY_SELINUX=y -CONFIG_SECURITY_SELINUX_DISABLE=y CONFIG_SECURITY_SELINUX_AVC_STATS=y -CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 diff --git a/features/apparmor/apparmor.cfg b/features/apparmor/apparmor.cfg index 1a656fb0..0fe87377 100644 --- a/features/apparmor/apparmor.cfg +++ b/features/apparmor/apparmor.cfg @@ -5,4 +5,3 @@ CONFIG_SECURITY_PATH=y CONFIG_SECURITY_APPARMOR=y CONFIG_SECURITY_APPARMOR_HASH=y CONFIG_SECURITY_APPARMOR_HASH_DEFAULT=y -CONFIG_DEFAULT_SECURITY_APPARMOR=y diff --git a/features/apparmor/apparmor.scc b/features/apparmor/apparmor.scc index 235551ce..39548733 100644 --- a/features/apparmor/apparmor.scc +++ b/features/apparmor/apparmor.scc @@ -3,4 +3,3 @@ define KFEATURE_DESCRIPTION "Enable/disable configurations for apparmor security define KFEATURE_COMPATIBILITY all kconf non-hardware apparmor.cfg -kconf non-hardware apparmor_on_boot.cfg diff --git a/features/apparmor/apparmor_on_boot.cfg b/features/apparmor/apparmor_on_boot.cfg deleted file mode 100644 index 1b496516..00000000 --- a/features/apparmor/apparmor_on_boot.cfg +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: MIT -CONFIG_SECURITY_APPARMOR_BOOTPARAM_VALUE=1 diff --git a/features/aufs/aufs-adjust-for-v6.9.patch b/features/aufs/aufs-adjust-for-v6.9.patch new file mode 100644 index 00000000..82e5bfd0 --- /dev/null +++ b/features/aufs/aufs-adjust-for-v6.9.patch @@ -0,0 +1,48 @@ +From 252dbed4c82524c20b3564f560422633aa6cb369 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Wed, 3 Apr 2024 10:15:47 -0400 +Subject: [PATCH] aufs: adjust for v6.9+ + +The following commit drops SLAB_MEM_SPREAD, so we remove it +from aufs. + +commit cdeeaaba174886aa6c1ff4c0c5449c5066dbe82f +Author: Vlastimil Babka <vbabka@suse.cz> +Date: Fri Feb 23 19:27:17 2024 +0100 + + mm, slab: deprecate SLAB_MEM_SPREAD flag + + The SLAB_MEM_SPREAD flag used to be implemented in SLAB, which was + removed. SLUB instead relies on the page allocator's NUMA policies. + Change the flag's value to 0 to free up the value it had, and mark it + for full removal once all users are gone. + + Reported-by: Steven Rostedt <rostedt@goodmis.org> + Closes: https://lore.kernel.org/all/20240131172027.10f64405@gandalf.local.home/ + Reviewed-and-tested-by: Xiongwei Song <xiongwei.song@windriver.com> + Reviewed-by: Chengming Zhou <chengming.zhou@linux.dev> + Reviewed-by: Roman Gushchin <roman.gushchin@linux.dev> + Acked-by: David Rientjes <rientjes@google.com> + Signed-off-by: Vlastimil Babka <vbabka@suse.cz> + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/aufs/module.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/aufs/module.h b/fs/aufs/module.h +index a9d21d3e5414..784c830d084d 100644 +--- a/fs/aufs/module.h ++++ b/fs/aufs/module.h +@@ -129,7 +129,7 @@ enum { + + extern struct kmem_cache *au_cache[AuCache_Last]; + +-#define AuCacheFlags (SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD) ++#define AuCacheFlags (SLAB_RECLAIM_ACCOUNT) + #define AuCache(type) KMEM_CACHE(type, AuCacheFlags) + #define AuCacheCtor(type, ctor) \ + kmem_cache_create(#type, sizeof(struct type), \ +-- +2.39.2 + diff --git a/features/aufs/aufs-disable.cfg b/features/aufs/aufs-disable.cfg index e276863f..b58d21a8 100644 --- a/features/aufs/aufs-disable.cfg +++ b/features/aufs/aufs-disable.cfg @@ -1,5 +1,5 @@ # SPDX-License-Identifier: MIT -# CONFIG_AUFS_FS is not set -# CONFIG_AUFS_BRANCH_MAX_127 is not set -# CONFIG_AUFS_SBILIST is not set -# CONFIG_AUFS_BDEV_LOOP is not set +CONFIG_AUFS_FS=n +CONFIG_AUFS_BRANCH_MAX_127=n +CONFIG_AUFS_SBILIST=n +CONFIG_AUFS_BDEV_LOOP=n diff --git a/features/aufs/aufs-fix-v6.7-kernel-build-compilation.patch b/features/aufs/aufs-fix-v6.7-kernel-build-compilation.patch new file mode 100644 index 00000000..0ab046db --- /dev/null +++ b/features/aufs/aufs-fix-v6.7-kernel-build-compilation.patch @@ -0,0 +1,144 @@ +From 35340163fed594434a42002cc041bd29941fb985 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Wed, 22 Nov 2023 12:06:29 -0500 +Subject: [PATCH] aufs: fix v6.7 kernel build compilation + +Adapting aufs to the following upstream commits: + + commit 12cd44023651666bd44baa36a5c999698890debb + Author: Jeff Layton <jlayton@kernel.org> + Date: Fri Sep 29 09:05:52 2023 -0400 + + fs: rename inode i_atime and i_mtime fields + + Rename these two fields to discourage direct access (and to help ensure + that we mop up any leftover direct accesses). + + Signed-off-by: Jeff Layton <jlayton@kernel.org> + Signed-off-by: Christian Brauner <brauner@kernel.org> + + commit 3e15dcf77b23b8e9b9b7f3c0d4def8fe9c12c534 + Author: Amir Goldstein <amir73il@gmail.com> + Date: Fri Sep 8 16:28:59 2023 +0300 + + fs: rename __mnt_{want,drop}_write*() helpers + + Before exporting these helpers to modules, make their names more + meaningful. + + The names mnt_{get,put)_write_access*() were chosen, because they rhyme + with the inode {get,put)_write_access() helpers, which have a very close + meaning for the inode object. + + Suggested-by: Christian Brauner <brauner@kernel.org> + Link: https://lore.kernel.org/r/20230817-anfechtbar-ruhelosigkeit-8c6cca8443fc@brauner/ + Signed-off-by: Amir Goldstein <amir73il@gmail.com> + Message-Id: <20230908132900.2983519-2-amir73il@gmail.com> + Signed-off-by: Christian Brauner <brauner@kernel.org> + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/aufs/branch.c | 2 +- + fs/aufs/cpup.c | 8 ++++---- + fs/aufs/dir.c | 2 +- + fs/aufs/i_op.c | 4 ++-- + fs/aufs/vfsub.h | 2 +- + fs/namespace.c | 2 +- + 6 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/fs/aufs/branch.c b/fs/aufs/branch.c +index 2a85d744d2b5..3ecc05573cc0 100644 +--- a/fs/aufs/branch.c ++++ b/fs/aufs/branch.c +@@ -1293,7 +1293,7 @@ static int au_br_mod_files_ro(struct super_block *sb, aufs_bindex_t bindex) + if (hf->f_mode & FMODE_READ) + i_readcount_inc(h_inode); + put_write_access(h_inode); +- __mnt_drop_write(hf->f_path.mnt); ++ mnt_put_write_access(hf->f_path.mnt); + } + } + +diff --git a/fs/aufs/cpup.c b/fs/aufs/cpup.c +index 8c8bd5f7b28d..3f09876a3bd5 100644 +--- a/fs/aufs/cpup.c ++++ b/fs/aufs/cpup.c +@@ -133,8 +133,8 @@ void au_dtime_store(struct au_dtime *dt, struct dentry *dentry, + dt->dt_dentry = dentry; + dt->dt_h_path = *h_path; + h_inode = d_inode(h_path->dentry); +- dt->dt_atime = h_inode->i_atime; +- dt->dt_mtime = h_inode->i_mtime; ++ dt->dt_atime = h_inode->__i_atime; ++ dt->dt_mtime = h_inode->__i_mtime; + /* smp_mb(); */ + } + +@@ -200,8 +200,8 @@ int cpup_iattr(struct dentry *dst, aufs_bindex_t bindex, struct path *h_src, + } else { + ia.ia_uid = h_isrc->i_uid; + ia.ia_gid = h_isrc->i_gid; +- ia.ia_atime = h_isrc->i_atime; +- ia.ia_mtime = h_isrc->i_mtime; ++ ia.ia_atime = h_isrc->__i_atime; ++ ia.ia_mtime = h_isrc->__i_mtime; + if (h_idst->i_mode != h_isrc->i_mode + && !S_ISLNK(h_idst->i_mode)) { + ia.ia_valid |= ATTR_MODE; +diff --git a/fs/aufs/dir.c b/fs/aufs/dir.c +index ee900ea3264b..e986deffef5e 100644 +--- a/fs/aufs/dir.c ++++ b/fs/aufs/dir.c +@@ -145,7 +145,7 @@ static void au_do_dir_ts(void *arg) + au_hn_inode_lock_nested(hdir, AuLsc_I_PARENT); + h_dir = au_h_iptr(dir, btop); + if (h_dir->i_nlink +- && timespec64_compare(&h_dir->i_mtime, &dt.dt_mtime) < 0) { ++ && timespec64_compare(&h_dir->__i_mtime, &dt.dt_mtime) < 0) { + dt.dt_h_path = h_path; + au_dtime_revert(&dt); + } +diff --git a/fs/aufs/i_op.c b/fs/aufs/i_op.c +index 993d57633393..8700b9e46b44 100644 +--- a/fs/aufs/i_op.c ++++ b/fs/aufs/i_op.c +@@ -1167,8 +1167,8 @@ static void au_refresh_iattr(struct inode *inode, struct kstat *st, + /* don't i_[ug]id_write() here */ + inode->i_uid = st->uid; + inode->i_gid = st->gid; +- inode->i_atime = st->atime; +- inode->i_mtime = st->mtime; ++ inode->__i_atime = st->atime; ++ inode->__i_mtime = st->mtime; + inode_set_ctime_to_ts( inode, st->ctime ); + + au_cpup_attr_nlink(inode, /*force*/0); +diff --git a/fs/aufs/vfsub.h b/fs/aufs/vfsub.h +index ed218d95770d..b45603c2d651 100644 +--- a/fs/aufs/vfsub.h ++++ b/fs/aufs/vfsub.h +@@ -33,7 +33,7 @@ + + /* copied from linux/fs/internal.h */ + /* todo: BAD approach!! */ +-extern void __mnt_drop_write(struct vfsmount *); ++extern void mnt_put_write_access(struct vfsmount *); + extern struct file *alloc_empty_file(int, const struct cred *); + + /* ---------------------------------------------------------------------- */ +diff --git a/fs/namespace.c b/fs/namespace.c +index 1b942a6b72fa..e5d02ed749c4 100644 +--- a/fs/namespace.c ++++ b/fs/namespace.c +@@ -489,7 +489,7 @@ void mnt_put_write_access_file(struct file *file) + if (!(file->f_mode & FMODE_WRITER)) + mnt_put_write_access(file->f_path.mnt); + } +-EXPORT_SYMBOL_GPL(__mnt_drop_write); ++EXPORT_SYMBOL_GPL(mnt_put_write_access_file); + + void mnt_drop_write_file(struct file *file) + { +-- +2.34.1 + diff --git a/features/aufs/aufs-i_op-Add-handling-for-au_pin_hdir_set_owner-wit.patch b/features/aufs/aufs-i_op-Add-handling-for-au_pin_hdir_set_owner-wit.patch new file mode 100644 index 00000000..3cd55ace --- /dev/null +++ b/features/aufs/aufs-i_op-Add-handling-for-au_pin_hdir_set_owner-wit.patch @@ -0,0 +1,39 @@ +From 10db7ee919edbf7b6f65124e475d89864de7bb1b Mon Sep 17 00:00:00 2001 +From: He Zhe <zhe.he@windriver.com> +Date: Fri, 5 Jan 2024 18:57:18 +0800 +Subject: [PATCH] aufs: i_op: Add handling for au_pin_hdir_set_owner with RT + kernel + +In RT kernel rw_semaphore uses rt_mutex whose owner should be set to the +task. Add a condition to handle both cases to avoid the following build error +for PREEMPT_RT kernel. + +fs/aufs/i_op.c: In function 'au_pin_hdir_set_owner': +fs/aufs/i_op.c:639:52: error: 'struct rw_semaphore' has no member named 'owner' +639 | atomic_long_set(&p->hdir->hi_inode->i_rwsem.owner, (long)task); + +Signed-off-by: He Zhe <zhe.he@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/aufs/i_op.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/fs/aufs/i_op.c b/fs/aufs/i_op.c +index 993d57633393..a1e0d0c54d23 100644 +--- a/fs/aufs/i_op.c ++++ b/fs/aufs/i_op.c +@@ -638,7 +638,11 @@ int au_pin_hdir_relock(struct au_pin *p) + + static void au_pin_hdir_set_owner(struct au_pin *p, struct task_struct *task) + { ++#if IS_ENABLED(CONFIG_PREEMPT_RT) ++ p->hdir->hi_inode->i_rwsem.rwbase.rtmutex.owner = task; ++#else + atomic_long_set(&p->hdir->hi_inode->i_rwsem.owner, (long)task); ++#endif + } + + void au_pin_hdir_acquire_nest(struct au_pin *p) +-- +2.39.2 + diff --git a/features/aufs/aufs-update-remove_page-to-remove_folio.patch b/features/aufs/aufs-update-remove_page-to-remove_folio.patch new file mode 100644 index 00000000..d874e550 --- /dev/null +++ b/features/aufs/aufs-update-remove_page-to-remove_folio.patch @@ -0,0 +1,56 @@ +From e9e335352a0815018d7db98c165d3669c3d8804f Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Tue, 23 Jan 2024 09:56:24 -0500 +Subject: [PATCH] aufs: update remove_page to remove_folio + +Commit af7628d6ec19 [fs: convert error_remove_page to +error_remove_folio] +switches remove_page to the folio equivalent. We switch +the aufs definitions to match. + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/aufs/dynop.c | 2 +- + fs/aufs/file.c | 6 +++--- + 2 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/fs/aufs/dynop.c b/fs/aufs/dynop.c +index 54fd16ecb6d3..f62b3b56291d 100644 +--- a/fs/aufs/dynop.c ++++ b/fs/aufs/dynop.c +@@ -192,7 +192,7 @@ static void dy_aop(struct au_dykey *key, const void *h_op, + DySetAop(launder_folio); + DySetAop(is_partially_uptodate); + DySetAop(is_dirty_writeback); +- DySetAop(error_remove_page); ++ DySetAop(error_remove_folio); + DySetAop(swap_activate); + DySetAop(swap_deactivate); + DySetAop(swap_rw); +diff --git a/fs/aufs/file.c b/fs/aufs/file.c +index 76ad444328db..2e3bdac4699a 100644 +--- a/fs/aufs/file.c ++++ b/fs/aufs/file.c +@@ -827,8 +827,8 @@ static bool aufs_is_partially_uptodate(struct folio *folio, size_t from, + static void aufs_is_dirty_writeback(struct folio *folio, bool *dirty, + bool *writeback) + { AuUnsupport(); } +-static int aufs_error_remove_page(struct address_space *mapping, +- struct page *page) ++static int aufs_error_remove_folio(struct address_space *mapping, ++ struct folio *folio) + { AuUnsupport(); return 0; } + static int aufs_swap_activate(struct swap_info_struct *sis, struct file *file, + sector_t *span) +@@ -857,7 +857,7 @@ const struct address_space_operations aufs_aop = { + .launder_folio = aufs_launder_folio, + .is_partially_uptodate = aufs_is_partially_uptodate, + .is_dirty_writeback = aufs_is_dirty_writeback, +- .error_remove_page = aufs_error_remove_page, ++ .error_remove_folio = aufs_error_remove_folio, + .swap_activate = aufs_swap_activate, + .swap_deactivate = aufs_swap_deactivate, + .swap_rw = aufs_swap_rw +-- +2.39.2 + diff --git a/features/aufs/aufs.scc b/features/aufs/aufs.scc index e084ec60..ebb980f4 100644 --- a/features/aufs/aufs.scc +++ b/features/aufs/aufs.scc @@ -1,2 +1,16 @@ # SPDX-License-Identifier: MIT # + +patch aufs6-kbuild.patch +patch aufs6-base.patch +patch aufs6-mmap.patch +patch aufs6-standalone.patch +patch aufs6-core.patch +patch aufs6-adapt-to-v6.6.patch +patch aufs6-fix-magic.mk-include-path.patch +patch aufs6-adapt-to-v6.6-i_op-ctime-changes.patch +patch aufs-fix-v6.7-kernel-build-compilation.patch +patch aufs-i_op-Add-handling-for-au_pin_hdir_set_owner-wit.patch +patch aufs-update-remove_page-to-remove_folio.patch +patch aufs6-correct-do_splice_from-prototype.patch +patch aufs-adjust-for-v6.9.patch diff --git a/features/aufs/aufs6-adapt-to-v6.6-i_op-ctime-changes.patch b/features/aufs/aufs6-adapt-to-v6.6-i_op-ctime-changes.patch new file mode 100644 index 00000000..cb727220 --- /dev/null +++ b/features/aufs/aufs6-adapt-to-v6.6-i_op-ctime-changes.patch @@ -0,0 +1,146 @@ +From 8eeb547a388fee17c1c168bbb33d95e0c19e2cb4 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Thu, 21 Sep 2023 22:18:30 -0400 +Subject: [PATCH 8/8] aufs6: adapt to v6.6 i_op->ctime changes + +The following commits in 6.6+ change the way i_nodes and ctime are +handled. We adapt the code to match: + + 541d4c798a598854fcce7326d947cbcbd35701d6 [fs: drop the timespec64 arg from generic_update_time] + 3e3271549670783be20e233a2b78a87a0b04c715 [vfs: get rid of old '->iterate' directory operation] + 0d72b92883c651a11059d93335f33d65c6eb653b [fs: pass the request_mask to generic_fillattr] + 913e99287b98fd051ac1976140a2764a8ef9dfbf [fs: drop the timespec64 argument from update_time] + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/aufs/i_op.c | 9 ++++----- + fs/aufs/i_op_add.c | 2 +- + fs/aufs/i_op_del.c | 9 ++++++--- + fs/aufs/i_op_ren.c | 6 ++++-- + fs/aufs/vfsub.h | 5 ++--- + 5 files changed, 17 insertions(+), 14 deletions(-) + +diff --git a/fs/aufs/i_op.c b/fs/aufs/i_op.c +index 141620c2e0bd..993d57633393 100644 +--- a/fs/aufs/i_op.c ++++ b/fs/aufs/i_op.c +@@ -1169,7 +1169,7 @@ static void au_refresh_iattr(struct inode *inode, struct kstat *st, + inode->i_gid = st->gid; + inode->i_atime = st->atime; + inode->i_mtime = st->mtime; +- inode->i_ctime = st->ctime; ++ inode_set_ctime_to_ts( inode, st->ctime ); + + au_cpup_attr_nlink(inode, /*force*/0); + if (S_ISDIR(inode->i_mode)) { +@@ -1306,7 +1306,7 @@ static int aufs_getattr(struct mnt_idmap *idmap, const struct path *path, + goto out_di; + + out_fill: +- generic_fillattr(idmap, inode, st); ++ generic_fillattr(idmap, request, inode, st); + out_di: + di_read_unlock(dentry, AuLock_IR); + out_si: +@@ -1388,8 +1388,7 @@ static int au_is_special(struct inode *inode) + return (inode->i_mode & (S_IFBLK | S_IFCHR | S_IFIFO | S_IFSOCK)); + } + +-static int aufs_update_time(struct inode *inode, struct timespec64 *ts, +- int flags) ++static int aufs_update_time(struct inode *inode, int flags) + { + int err; + aufs_bindex_t bindex; +@@ -1413,7 +1412,7 @@ static int aufs_update_time(struct inode *inode, struct timespec64 *ts, + h_mnt = au_sbr_mnt(sb, bindex); + err = vfsub_mnt_want_write(h_mnt); + if (!err) { +- err = vfsub_update_time(h_inode, ts, flags); ++ err = vfsub_update_time(h_inode, flags); + vfsub_mnt_drop_write(h_mnt); + } + } else if (au_is_special(h_inode)) { +diff --git a/fs/aufs/i_op_add.c b/fs/aufs/i_op_add.c +index 2adf97d4488d..1ce4d45c8f7b 100644 +--- a/fs/aufs/i_op_add.c ++++ b/fs/aufs/i_op_add.c +@@ -824,7 +824,7 @@ int aufs_link(struct dentry *src_dentry, struct inode *dir, + au_dir_ts(dir, a->bdst); + inode_inc_iversion(dir); + inc_nlink(inode); +- inode->i_ctime = dir->i_ctime; ++ inode_set_ctime_to_ts( inode, inode_get_ctime(dir)); + d_instantiate(dentry, au_igrab(inode)); + if (d_unhashed(a->h_path.dentry)) + /* some filesystem calls d_drop() */ +diff --git a/fs/aufs/i_op_del.c b/fs/aufs/i_op_del.c +index d85f47cef29f..fbbda9626f6f 100644 +--- a/fs/aufs/i_op_del.c ++++ b/fs/aufs/i_op_del.c +@@ -277,7 +277,8 @@ static void epilog(struct inode *dir, struct dentry *dentry, + + inode = d_inode(dentry); + d_drop(dentry); +- inode->i_ctime = dir->i_ctime; ++ //inode->i_ctime = dir->i_ctime; ++ inode_set_ctime_to_ts(inode, inode_get_ctime(dir)); + + au_dir_ts(dir, bindex); + inode_inc_iversion(dir); +@@ -379,10 +380,12 @@ int aufs_unlink(struct inode *dir, struct dentry *dentry) + if (bindex == btop) { + vfsub_update_h_iattr(&a->h_path, /*did*/NULL); + /*ignore*/ +- inode->i_ctime = d_inode(a->h_path.dentry)->i_ctime; ++ //inode->i_ctime = d_inode(a->h_path.dentry)->i_ctime; ++ inode_set_ctime_to_ts(inode, inode_get_ctime(d_inode(a->h_path.dentry)) ); + } else + /* todo: this timestamp may be reverted later */ +- inode->i_ctime = h_dir->i_ctime; ++ //inode->i_ctime = h_dir->i_ctime; ++ inode_set_ctime_to_ts(inode,inode_get_ctime(h_dir) ); + goto out_unpin; /* success */ + } + +diff --git a/fs/aufs/i_op_ren.c b/fs/aufs/i_op_ren.c +index ab69a6ac9a42..f3f9d9efe6fa 100644 +--- a/fs/aufs/i_op_ren.c ++++ b/fs/aufs/i_op_ren.c +@@ -443,12 +443,14 @@ static int do_rename(struct au_ren_args *a) + AuDebugOn(au_dbtop(a->dst_dentry) != a->btgt); + a->h_path.dentry = au_h_dptr(a->dst_dentry, a->btgt); + vfsub_update_h_iattr(&a->h_path, /*did*/NULL); /*ignore*/ +- a->dst_inode->i_ctime = d_inode(a->h_path.dentry)->i_ctime; ++ //a->dst_inode->i_ctime = d_inode(a->h_path.dentry)->i_ctime; ++ inode_set_ctime_to_ts( a->dst_inode, inode_get_ctime(d_inode(a->h_path.dentry)) ); + } + AuDebugOn(au_dbtop(a->src_dentry) != a->btgt); + a->h_path.dentry = au_h_dptr(a->src_dentry, a->btgt); + vfsub_update_h_iattr(&a->h_path, /*did*/NULL); /*ignore*/ +- a->src_inode->i_ctime = d_inode(a->h_path.dentry)->i_ctime; ++ //a->src_inode->i_ctime = d_inode(a->h_path.dentry)->i_ctime; ++ inode_set_ctime_to_ts( a->src_inode, inode_get_ctime(d_inode(a->h_path.dentry)) ); + + if (!a->exchange) { + /* remove whiteout for dentry */ +diff --git a/fs/aufs/vfsub.h b/fs/aufs/vfsub.h +index 928c463620c1..ed218d95770d 100644 +--- a/fs/aufs/vfsub.h ++++ b/fs/aufs/vfsub.h +@@ -240,10 +240,9 @@ static inline void vfsub_touch_atime(struct vfsmount *h_mnt, + } + #endif + +-static inline int vfsub_update_time(struct inode *h_inode, +- struct timespec64 *ts, int flags) ++static inline int vfsub_update_time(struct inode *h_inode, int flags) + { +- return inode_update_time(h_inode, ts, flags); ++ return inode_update_time(h_inode, flags); + /* no vfsub_update_h_iattr() since we don't have struct path */ + } + +-- +2.34.1 + diff --git a/features/aufs/aufs6-adapt-to-v6.6.patch b/features/aufs/aufs6-adapt-to-v6.6.patch new file mode 100644 index 00000000..e91fec7a --- /dev/null +++ b/features/aufs/aufs6-adapt-to-v6.6.patch @@ -0,0 +1,40 @@ +From 5d75cb88038136d82ae6bb62da3fa8f70785e662 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Thu, 21 Sep 2023 18:20:40 -0400 +Subject: [PATCH 6/8] aufs6: adapt to v6.6 + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/fcntl.c | 2 +- + mm/mmap.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/fs/fcntl.c b/fs/fcntl.c +index fdd334fc02fb..ec0562996478 100644 +--- a/fs/fcntl.c ++++ b/fs/fcntl.c +@@ -34,7 +34,7 @@ + + #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME) + +-int setfl(int fd, struct file *filp, unsigned int arg) ++int setfl(int fd, struct file *filp, long unsigned int arg) + { + struct inode * inode = file_inode(filp); + int error = 0; +diff --git a/mm/mmap.c b/mm/mmap.c +index 0a0f3d5f558d..0bb0c5a0ad0e 100644 +--- a/mm/mmap.c ++++ b/mm/mmap.c +@@ -3004,7 +3004,7 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, + file = vma->vm_file; + prfile = vma->vm_prfile; + ret = do_mmap(vma->vm_file, start, size, +- prot, flags, pgoff, &populate, NULL); ++ prot, flags, 0, pgoff, &populate, NULL); + if (!IS_ERR_VALUE(ret) && file && prfile) { + struct vm_area_struct *new_vma; + +-- +2.34.1 + diff --git a/features/aufs/aufs6-base.patch b/features/aufs/aufs6-base.patch new file mode 100644 index 00000000..186a7cee --- /dev/null +++ b/features/aufs/aufs6-base.patch @@ -0,0 +1,230 @@ +From 884f46eed2730a238e0bf9c9a885f777a612e3ab Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Thu, 21 Sep 2023 17:48:58 -0400 +Subject: [PATCH] aufs6: base + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + MAINTAINERS | 13 +++++++++++++ + drivers/block/loop.c | 18 ++++++++++++++++++ + fs/dcache.c | 2 +- + fs/fcntl.c | 4 +++- + fs/namespace.c | 6 ++++++ + fs/splice.c | 2 +- + include/linux/fs.h | 2 ++ + include/linux/lockdep.h | 2 ++ + include/linux/mnt_namespace.h | 3 +++ + include/linux/splice.h | 6 ++++++ + kernel/locking/lockdep.c | 3 ++- + 11 files changed, 57 insertions(+), 4 deletions(-) + +diff --git a/MAINTAINERS b/MAINTAINERS +index 8d1052fa6a69..39ec86cca0ff 100644 +--- a/MAINTAINERS ++++ b/MAINTAINERS +@@ -3365,6 +3365,19 @@ F: kernel/audit* + F: lib/*audit.c + K: \baudit_[a-z_0-9]\+\b + ++AUFS (advanced multi layered unification filesystem) FILESYSTEM ++M: "J. R. Okajima" <hooanon05g@gmail.com> ++L: aufs-users@lists.sourceforge.net (members only) ++L: linux-unionfs@vger.kernel.org ++S: Supported ++W: http://aufs.sourceforge.net ++T: git://github.com/sfjro/aufs4-linux.git ++F: Documentation/ABI/testing/debugfs-aufs ++F: Documentation/ABI/testing/sysfs-aufs ++F: Documentation/filesystems/aufs/ ++F: fs/aufs/ ++F: include/uapi/linux/aufs_type.h ++ + AUXILIARY BUS DRIVER + M: Greg Kroah-Hartman <gregkh@linuxfoundation.org> + R: Dave Ertman <david.m.ertman@intel.com> +diff --git a/drivers/block/loop.c b/drivers/block/loop.c +index f8145499da38..333b3915fe86 100644 +--- a/drivers/block/loop.c ++++ b/drivers/block/loop.c +@@ -641,6 +641,24 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, + goto done; + } + ++/* ++ * for AUFS ++ * no get/put for file. ++ */ ++struct file *loop_backing_file(struct super_block *sb) ++{ ++ struct file *ret; ++ struct loop_device *l; ++ ++ ret = NULL; ++ if (MAJOR(sb->s_dev) == LOOP_MAJOR) { ++ l = sb->s_bdev->bd_disk->private_data; ++ ret = l->lo_backing_file; ++ } ++ return ret; ++} ++EXPORT_SYMBOL_GPL(loop_backing_file); ++ + /* loop sysfs attributes */ + + static ssize_t loop_attr_show(struct device *dev, char *page, +diff --git a/fs/dcache.c b/fs/dcache.c +index b813528fb147..78e322b59b8d 100644 +--- a/fs/dcache.c ++++ b/fs/dcache.c +@@ -1219,7 +1219,7 @@ enum d_walk_ret { + * + * The @enter() callbacks are called with d_lock held. + */ +-static void d_walk(struct dentry *parent, void *data, ++void d_walk(struct dentry *parent, void *data, + enum d_walk_ret (*enter)(void *, struct dentry *)) + { + struct dentry *this_parent, *dentry; +diff --git a/fs/fcntl.c b/fs/fcntl.c +index c80a6acad742..d64817808e40 100644 +--- a/fs/fcntl.c ++++ b/fs/fcntl.c +@@ -34,7 +34,7 @@ + + #define SETFL_MASK (O_APPEND | O_NONBLOCK | O_NDELAY | O_DIRECT | O_NOATIME) + +-static int setfl(int fd, struct file * filp, unsigned int arg) ++int setfl(int fd, struct file *filp, unsigned int arg) + { + struct inode * inode = file_inode(filp); + int error = 0; +@@ -64,6 +64,8 @@ static int setfl(int fd, struct file * filp, unsigned int arg) + + if (filp->f_op->check_flags) + error = filp->f_op->check_flags(arg); ++ if (!error && filp->f_op->setfl) ++ error = filp->f_op->setfl(filp, arg); + if (error) + return error; + +diff --git a/fs/namespace.c b/fs/namespace.c +index 437f60e96d40..4c5eb92d2bef 100644 +--- a/fs/namespace.c ++++ b/fs/namespace.c +@@ -860,6 +860,12 @@ static inline int check_mnt(struct mount *mnt) + return mnt->mnt_ns == current->nsproxy->mnt_ns; + } + ++/* for aufs, CONFIG_AUFS_BR_FUSE */ ++int is_current_mnt_ns(struct vfsmount *mnt) ++{ ++ return check_mnt(real_mount(mnt)); ++} ++ + /* + * vfsmount lock must be held for write + */ +diff --git a/fs/splice.c b/fs/splice.c +index 218e24b1ac40..7210ddc5aa81 100644 +--- a/fs/splice.c ++++ b/fs/splice.c +@@ -933,7 +933,7 @@ static int warn_unsupported(struct file *file, const char *op) + /* + * Attempt to initiate a splice from pipe to file. + */ +-static ssize_t do_splice_from(struct pipe_inode_info *pipe, struct file *out, ++ssize_t do_splice_from(struct pipe_inode_info *pipe, struct file *out, + loff_t *ppos, size_t len, unsigned int flags) + { + if (unlikely(!out->f_op->splice_write)) +diff --git a/include/linux/fs.h b/include/linux/fs.h +index ed5966a70495..2f2919192af6 100644 +--- a/include/linux/fs.h ++++ b/include/linux/fs.h +@@ -1104,6 +1104,7 @@ extern void fasync_free(struct fasync_struct *); + /* can be called from interrupts */ + extern void kill_fasync(struct fasync_struct **, int, int); + ++extern int setfl(int fd, struct file *filp, unsigned long arg); + extern void __f_setown(struct file *filp, struct pid *, enum pid_type, int force); + extern int f_setown(struct file *filp, int who, int force); + extern void f_delown(struct file *filp); +@@ -2001,6 +2002,7 @@ struct file_operations { + int (*lock) (struct file *, int, struct file_lock *); + unsigned long (*get_unmapped_area)(struct file *, unsigned long, unsigned long, unsigned long, unsigned long); + int (*check_flags)(int); ++ int (*setfl)(struct file *, unsigned long); + int (*flock) (struct file *, int, struct file_lock *); + ssize_t (*splice_write)(struct pipe_inode_info *, struct file *, loff_t *, size_t, unsigned int); + ssize_t (*splice_read)(struct file *, loff_t *, struct pipe_inode_info *, size_t, unsigned int); +diff --git a/include/linux/lockdep.h b/include/linux/lockdep.h +index 08b0d1d9d78b..009f69c4e09d 100644 +--- a/include/linux/lockdep.h ++++ b/include/linux/lockdep.h +@@ -192,6 +192,8 @@ static inline int lockdep_match_key(struct lockdep_map *lock, + return lock->key == key; + } + ++struct lock_class *lockdep_hlock_class(struct held_lock *hlock); ++ + /* + * Acquire a lock. + * +diff --git a/include/linux/mnt_namespace.h b/include/linux/mnt_namespace.h +index 8f882f5881e8..6b9808f09843 100644 +--- a/include/linux/mnt_namespace.h ++++ b/include/linux/mnt_namespace.h +@@ -7,12 +7,15 @@ struct mnt_namespace; + struct fs_struct; + struct user_namespace; + struct ns_common; ++struct vfsmount; + + extern struct mnt_namespace *copy_mnt_ns(unsigned long, struct mnt_namespace *, + struct user_namespace *, struct fs_struct *); + extern void put_mnt_ns(struct mnt_namespace *ns); + extern struct ns_common *from_mnt_ns(struct mnt_namespace *); + ++extern int is_current_mnt_ns(struct vfsmount *mnt); ++ + extern const struct file_operations proc_mounts_operations; + extern const struct file_operations proc_mountinfo_operations; + extern const struct file_operations proc_mountstats_operations; +diff --git a/include/linux/splice.h b/include/linux/splice.h +index 9dec4861d09f..8024911403e9 100644 +--- a/include/linux/splice.h ++++ b/include/linux/splice.h +@@ -108,4 +108,10 @@ extern void splice_shrink_spd(struct splice_pipe_desc *); + + extern const struct pipe_buf_operations page_cache_pipe_buf_ops; + extern const struct pipe_buf_operations default_pipe_buf_ops; ++ ++extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, ++ loff_t *ppos, size_t len, unsigned int flags); ++extern long do_splice_to(struct file *in, loff_t *ppos, ++ struct pipe_inode_info *pipe, size_t len, ++ unsigned int flags); + #endif +diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c +index 151bd3de5936..2223ee909c10 100644 +--- a/kernel/locking/lockdep.c ++++ b/kernel/locking/lockdep.c +@@ -218,7 +218,7 @@ unsigned long max_lock_class_idx; + struct lock_class lock_classes[MAX_LOCKDEP_KEYS]; + DECLARE_BITMAP(lock_classes_in_use, MAX_LOCKDEP_KEYS); + +-static inline struct lock_class *hlock_class(struct held_lock *hlock) ++inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock) + { + unsigned int class_idx = hlock->class_idx; + +@@ -239,6 +239,7 @@ static inline struct lock_class *hlock_class(struct held_lock *hlock) + */ + return lock_classes + class_idx; + } ++#define hlock_class(hlock) lockdep_hlock_class(hlock) + + #ifdef CONFIG_LOCK_STAT + static DEFINE_PER_CPU(struct lock_class_stats[MAX_LOCKDEP_KEYS], cpu_lock_stats); +-- +2.39.2 + diff --git a/features/aufs/aufs6-core.patch b/features/aufs/aufs6-core.patch new file mode 100644 index 00000000..d9585572 --- /dev/null +++ b/features/aufs/aufs6-core.patch @@ -0,0 +1,38974 @@ +From 88604e3862245a999b3cdc6d96e888a3edf0b0c7 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Thu, 21 Sep 2023 17:51:24 -0400 +Subject: [PATCH 5/8] aufs6: core + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + Documentation/ABI/testing/debugfs-aufs | 55 + + Documentation/ABI/testing/sysfs-aufs | 31 + + Documentation/filesystems/aufs/README | 409 ++++ + .../filesystems/aufs/design/01intro.txt | 171 ++ + .../filesystems/aufs/design/02struct.txt | 258 +++ + .../filesystems/aufs/design/03atomic_open.txt | 85 + + .../filesystems/aufs/design/03lookup.txt | 113 + + .../filesystems/aufs/design/04branch.txt | 74 + + .../filesystems/aufs/design/05wbr_policy.txt | 64 + + .../filesystems/aufs/design/06dirren.dot | 44 + + .../filesystems/aufs/design/06dirren.txt | 102 + + .../filesystems/aufs/design/06fhsm.txt | 118 + + .../filesystems/aufs/design/06mmap.txt | 72 + + .../filesystems/aufs/design/06xattr.txt | 94 + + .../filesystems/aufs/design/07export.txt | 58 + + .../filesystems/aufs/design/08shwh.txt | 52 + + .../filesystems/aufs/design/10dynop.txt | 47 + + fs/aufs/Kconfig | 199 ++ + fs/aufs/Makefile | 46 + + fs/aufs/aufs.h | 62 + + fs/aufs/branch.c | 1427 ++++++++++++ + fs/aufs/branch.h | 375 ++++ + fs/aufs/conf.mk | 40 + + fs/aufs/cpup.c | 1459 +++++++++++++ + fs/aufs/cpup.h | 100 + + fs/aufs/dbgaufs.c | 526 +++++ + fs/aufs/dbgaufs.h | 53 + + fs/aufs/dcsub.c | 225 ++ + fs/aufs/dcsub.h | 137 ++ + fs/aufs/debug.c | 446 ++++ + fs/aufs/debug.h | 226 ++ + fs/aufs/dentry.c | 1168 ++++++++++ + fs/aufs/dentry.h | 270 +++ + fs/aufs/dinfo.c | 555 +++++ + fs/aufs/dir.c | 765 +++++++ + fs/aufs/dir.h | 134 ++ + fs/aufs/dirren.c | 1315 +++++++++++ + fs/aufs/dirren.h | 140 ++ + fs/aufs/dynop.c | 366 ++++ + fs/aufs/dynop.h | 77 + + fs/aufs/export.c | 830 +++++++ + fs/aufs/f_op.c | 771 +++++++ + fs/aufs/fhsm.c | 426 ++++ + fs/aufs/file.c | 865 ++++++++ + fs/aufs/file.h | 342 +++ + fs/aufs/finfo.c | 149 ++ + fs/aufs/fsctx.c | 1242 +++++++++++ + fs/aufs/fstype.h | 401 ++++ + fs/aufs/hbl.h | 65 + + fs/aufs/hfsnotify.c | 290 +++ + fs/aufs/hfsplus.c | 60 + + fs/aufs/hnotify.c | 715 ++++++ + fs/aufs/i_op.c | 1517 +++++++++++++ + fs/aufs/i_op_add.c | 972 +++++++++ + fs/aufs/i_op_del.c | 522 +++++ + fs/aufs/i_op_ren.c | 1257 +++++++++++ + fs/aufs/iinfo.c | 286 +++ + fs/aufs/inode.c | 531 +++++ + fs/aufs/inode.h | 707 ++++++ + fs/aufs/ioctl.c | 220 ++ + fs/aufs/lcnt.h | 186 ++ + fs/aufs/loop.c | 148 ++ + fs/aufs/loop.h | 55 + + fs/aufs/magic.mk | 31 + + fs/aufs/module.c | 273 +++ + fs/aufs/module.h | 180 ++ + fs/aufs/mvdown.c | 706 ++++++ + fs/aufs/opts.c | 1032 +++++++++ + fs/aufs/opts.h | 263 +++ + fs/aufs/plink.c | 516 +++++ + fs/aufs/poll.c | 51 + + fs/aufs/posix_acl.c | 108 + + fs/aufs/procfs.c | 170 ++ + fs/aufs/rdu.c | 384 ++++ + fs/aufs/rwsem.h | 85 + + fs/aufs/sbinfo.c | 316 +++ + fs/aufs/super.c | 871 ++++++++ + fs/aufs/super.h | 592 +++++ + fs/aufs/sysaufs.c | 94 + + fs/aufs/sysaufs.h | 102 + + fs/aufs/sysfs.c | 374 ++++ + fs/aufs/sysrq.c | 149 ++ + fs/aufs/vdir.c | 896 ++++++++ + fs/aufs/vfsub.c | 918 ++++++++ + fs/aufs/vfsub.h | 404 ++++ + fs/aufs/wbr_policy.c | 830 +++++++ + fs/aufs/whout.c | 1072 +++++++++ + fs/aufs/whout.h | 87 + + fs/aufs/wkq.c | 372 ++++ + fs/aufs/wkq.h | 89 + + fs/aufs/xattr.c | 360 +++ + fs/aufs/xino.c | 1926 +++++++++++++++++ + include/uapi/linux/aufs_type.h | 452 ++++ + 93 files changed, 38218 insertions(+) + create mode 100644 Documentation/ABI/testing/debugfs-aufs + create mode 100644 Documentation/ABI/testing/sysfs-aufs + create mode 100644 Documentation/filesystems/aufs/README + create mode 100644 Documentation/filesystems/aufs/design/01intro.txt + create mode 100644 Documentation/filesystems/aufs/design/02struct.txt + create mode 100644 Documentation/filesystems/aufs/design/03atomic_open.txt + create mode 100644 Documentation/filesystems/aufs/design/03lookup.txt + create mode 100644 Documentation/filesystems/aufs/design/04branch.txt + create mode 100644 Documentation/filesystems/aufs/design/05wbr_policy.txt + create mode 100644 Documentation/filesystems/aufs/design/06dirren.dot + create mode 100644 Documentation/filesystems/aufs/design/06dirren.txt + create mode 100644 Documentation/filesystems/aufs/design/06fhsm.txt + create mode 100644 Documentation/filesystems/aufs/design/06mmap.txt + create mode 100644 Documentation/filesystems/aufs/design/06xattr.txt + create mode 100644 Documentation/filesystems/aufs/design/07export.txt + create mode 100644 Documentation/filesystems/aufs/design/08shwh.txt + create mode 100644 Documentation/filesystems/aufs/design/10dynop.txt + create mode 100644 fs/aufs/Kconfig + create mode 100644 fs/aufs/Makefile + create mode 100644 fs/aufs/aufs.h + create mode 100644 fs/aufs/branch.c + create mode 100644 fs/aufs/branch.h + create mode 100644 fs/aufs/conf.mk + create mode 100644 fs/aufs/cpup.c + create mode 100644 fs/aufs/cpup.h + create mode 100644 fs/aufs/dbgaufs.c + create mode 100644 fs/aufs/dbgaufs.h + create mode 100644 fs/aufs/dcsub.c + create mode 100644 fs/aufs/dcsub.h + create mode 100644 fs/aufs/debug.c + create mode 100644 fs/aufs/debug.h + create mode 100644 fs/aufs/dentry.c + create mode 100644 fs/aufs/dentry.h + create mode 100644 fs/aufs/dinfo.c + create mode 100644 fs/aufs/dir.c + create mode 100644 fs/aufs/dir.h + create mode 100644 fs/aufs/dirren.c + create mode 100644 fs/aufs/dirren.h + create mode 100644 fs/aufs/dynop.c + create mode 100644 fs/aufs/dynop.h + create mode 100644 fs/aufs/export.c + create mode 100644 fs/aufs/f_op.c + create mode 100644 fs/aufs/fhsm.c + create mode 100644 fs/aufs/file.c + create mode 100644 fs/aufs/file.h + create mode 100644 fs/aufs/finfo.c + create mode 100644 fs/aufs/fsctx.c + create mode 100644 fs/aufs/fstype.h + create mode 100644 fs/aufs/hbl.h + create mode 100644 fs/aufs/hfsnotify.c + create mode 100644 fs/aufs/hfsplus.c + create mode 100644 fs/aufs/hnotify.c + create mode 100644 fs/aufs/i_op.c + create mode 100644 fs/aufs/i_op_add.c + create mode 100644 fs/aufs/i_op_del.c + create mode 100644 fs/aufs/i_op_ren.c + create mode 100644 fs/aufs/iinfo.c + create mode 100644 fs/aufs/inode.c + create mode 100644 fs/aufs/inode.h + create mode 100644 fs/aufs/ioctl.c + create mode 100644 fs/aufs/lcnt.h + create mode 100644 fs/aufs/loop.c + create mode 100644 fs/aufs/loop.h + create mode 100644 fs/aufs/magic.mk + create mode 100644 fs/aufs/module.c + create mode 100644 fs/aufs/module.h + create mode 100644 fs/aufs/mvdown.c + create mode 100644 fs/aufs/opts.c + create mode 100644 fs/aufs/opts.h + create mode 100644 fs/aufs/plink.c + create mode 100644 fs/aufs/poll.c + create mode 100644 fs/aufs/posix_acl.c + create mode 100644 fs/aufs/procfs.c + create mode 100644 fs/aufs/rdu.c + create mode 100644 fs/aufs/rwsem.h + create mode 100644 fs/aufs/sbinfo.c + create mode 100644 fs/aufs/super.c + create mode 100644 fs/aufs/super.h + create mode 100644 fs/aufs/sysaufs.c + create mode 100644 fs/aufs/sysaufs.h + create mode 100644 fs/aufs/sysfs.c + create mode 100644 fs/aufs/sysrq.c + create mode 100644 fs/aufs/vdir.c + create mode 100644 fs/aufs/vfsub.c + create mode 100644 fs/aufs/vfsub.h + create mode 100644 fs/aufs/wbr_policy.c + create mode 100644 fs/aufs/whout.c + create mode 100644 fs/aufs/whout.h + create mode 100644 fs/aufs/wkq.c + create mode 100644 fs/aufs/wkq.h + create mode 100644 fs/aufs/xattr.c + create mode 100644 fs/aufs/xino.c + create mode 100644 include/uapi/linux/aufs_type.h + +diff --git a/Documentation/ABI/testing/debugfs-aufs b/Documentation/ABI/testing/debugfs-aufs +new file mode 100644 +index 000000000000..45b739879d76 +--- /dev/null ++++ b/Documentation/ABI/testing/debugfs-aufs +@@ -0,0 +1,55 @@ ++What: /debug/aufs/si_<id>/ ++Date: March 2009 ++Contact: J. R. Okajima <hooanon05g@gmail.com> ++Description: ++ Under /debug/aufs, a directory named si_<id> is created ++ per aufs mount, where <id> is a unique id generated ++ internally. ++ ++What: /debug/aufs/si_<id>/plink ++Date: Apr 2013 ++Contact: J. R. Okajima <hooanon05g@gmail.com> ++Description: ++ It has three lines and shows the information about the ++ pseudo-link. The first line is a single number ++ representing a number of buckets. The second line is a ++ number of pseudo-links per buckets (separated by a ++ blank). The last line is a single number representing a ++ total number of psedo-links. ++ When the aufs mount option 'noplink' is specified, it ++ will show "1\n0\n0\n". ++ ++What: /debug/aufs/si_<id>/xib ++Date: March 2009 ++Contact: J. R. Okajima <hooanon05g@gmail.com> ++Description: ++ It shows the consumed blocks by xib (External Inode Number ++ Bitmap), its block size and file size. ++ When the aufs mount option 'noxino' is specified, it ++ will be empty. About XINO files, see the aufs manual. ++ ++What: /debug/aufs/si_<id>/xi<branch-index> ++Date: March 2009 ++Contact: J. R. Okajima <hooanon05g@gmail.com> ++Description: ++ It shows the consumed blocks by xino (External Inode Number ++ Translation Table), its link count, block size and file ++ size. ++ Due to the file size limit, there may exist multiple ++ xino files per branch. In this case, "-N" is added to ++ the filename and it corresponds to the index of the ++ internal xino array. "-0" is omitted. ++ When the aufs mount option 'noxino' is specified, Those ++ entries won't exist. About XINO files, see the aufs ++ manual. ++ ++What: /debug/aufs/si_<id>/xigen ++Date: March 2009 ++Contact: J. R. Okajima <hooanon05g@gmail.com> ++Description: ++ It shows the consumed blocks by xigen (External Inode ++ Generation Table), its block size and file size. ++ If CONFIG_AUFS_EXPORT is disabled, this entry will not ++ be created. ++ When the aufs mount option 'noxino' is specified, it ++ will be empty. About XINO files, see the aufs manual. +diff --git a/Documentation/ABI/testing/sysfs-aufs b/Documentation/ABI/testing/sysfs-aufs +new file mode 100644 +index 000000000000..48500c0569e6 +--- /dev/null ++++ b/Documentation/ABI/testing/sysfs-aufs +@@ -0,0 +1,31 @@ ++What: /sys/fs/aufs/si_<id>/ ++Date: March 2009 ++Contact: J. R. Okajima <hooanon05g@gmail.com> ++Description: ++ Under /sys/fs/aufs, a directory named si_<id> is created ++ per aufs mount, where <id> is a unique id generated ++ internally. ++ ++What: /sys/fs/aufs/si_<id>/br<idx> ++Date: March 2009 ++Contact: J. R. Okajima <hooanon05g@gmail.com> ++Description: ++ It shows the abolute path of a member directory (which ++ is called branch) in aufs, and its permission. ++ ++What: /sys/fs/aufs/si_<id>/brid<idx> ++Date: July 2013 ++Contact: J. R. Okajima <hooanon05g@gmail.com> ++Description: ++ It shows the id of a member directory (which is called ++ branch) in aufs. ++ ++What: /sys/fs/aufs/si_<id>/xi_path ++Date: March 2009 ++Contact: J. R. Okajima <hooanon05g@gmail.com> ++Description: ++ It shows the abolute path of XINO (External Inode Number ++ Bitmap, Translation Table and Generation Table) file ++ even if it is the default path. ++ When the aufs mount option 'noxino' is specified, it ++ will be empty. About XINO files, see the aufs manual. +diff --git a/Documentation/filesystems/aufs/README b/Documentation/filesystems/aufs/README +new file mode 100644 +index 000000000000..04a4d069bb52 +--- /dev/null ++++ b/Documentation/filesystems/aufs/README +@@ -0,0 +1,409 @@ ++ ++Aufs6 -- advanced multi layered unification filesystem version 6.x ++http://aufs.sf.net ++Junjiro R. Okajima ++ ++ ++0. Introduction ++---------------------------------------- ++In the early days, aufs was entirely re-designed and re-implemented ++Unionfs Version 1.x series. Adding many original ideas, approaches, ++improvements and implementations, it became totally different from ++Unionfs while keeping the basic features. ++Later, Unionfs Version 2.x series began taking some of the same ++approaches to aufs1's. ++Unionfs was being developed by Professor Erez Zadok at Stony Brook ++University and his team. ++ ++Aufs6 supports linux-v6.0 and later, try aufs6.0 branch in ++aufs-linux.git or aufs-standalone.git. ++If you want older kernel version support, ++- for linux-v5.x series, try aufs-linux.git or aufs-standalone.git ++- for linux-v4.x series, try aufs4-linux.git or aufs4-standalone.git ++- for linux-v3.x series, try aufs3-linux.git or aufs3-standalone.git ++- for linux-v2.6.16 and later, try aufs2-2.6.git, aufs2-standalone.git ++ or aufs1 from CVS on SourceForge. ++ ++Note: the name of aufs5-linux.git and aufs5-standalone.git on github ++ were changed. Now they are aufs-linux.git and ++ aufs-standalone.git and they contain aufs5 and later branches. ++ ++Note: it becomes clear that "Aufs was rejected. Let's give it up." ++ According to Christoph Hellwig, linux rejects all union-type ++ filesystems but UnionMount. ++<http://marc.info/?l=linux-kernel&m=123938533724484&w=2> ++ ++PS. Al Viro seems have a plan to merge aufs as well as overlayfs and ++ UnionMount, and he pointed out an issue around a directory mutex ++ lock and aufs addressed it. But it is still unsure whether aufs will ++ be merged (or any other union solution). ++<http://marc.info/?l=linux-kernel&m=136312705029295&w=1> ++ ++ ++1. Features ++---------------------------------------- ++- unite several directories into a single virtual filesystem. The member ++ directory is called as a branch. ++- you can specify the permission flags to the branch, which are 'readonly', ++ 'readwrite' and 'whiteout-able.' ++- by upper writable branch, internal copyup and whiteout, files/dirs on ++ readonly branch are modifiable logically. ++- dynamic branch manipulation, add, del. ++- etc... ++ ++Also there are many enhancements in aufs, such as: ++- test only the highest one for the directory permission (dirperm1) ++- copyup on open (coo=) ++- 'move' policy for copy-up between two writable branches, after ++ checking free space. ++- xattr, acl ++- readdir(3) in userspace. ++- keep inode number by external inode number table ++- keep the timestamps of file/dir in internal copyup operation ++- seekable directory, supporting NFS readdir. ++- whiteout is hardlinked in order to reduce the consumption of inodes ++ on branch ++- do not copyup, nor create a whiteout when it is unnecessary ++- revert a single systemcall when an error occurs in aufs ++- remount interface instead of ioctl ++- maintain /etc/mtab by an external command, /sbin/mount.aufs. ++- loopback mounted filesystem as a branch ++- kernel thread for removing the dir who has a plenty of whiteouts ++- support copyup sparse file (a file which has a 'hole' in it) ++- default permission flags for branches ++- selectable permission flags for ro branch, whether whiteout can ++ exist or not ++- export via NFS. ++- support <sysfs>/fs/aufs and <debugfs>/aufs. ++- support multiple writable branches, some policies to select one ++ among multiple writable branches. ++- a new semantics for link(2) and rename(2) to support multiple ++ writable branches. ++- no glibc changes are required. ++- pseudo hardlink (hardlink over branches) ++- allow a direct access manually to a file on branch, e.g. bypassing aufs. ++ including NFS or remote filesystem branch. ++- userspace wrapper for pathconf(3)/fpathconf(3) with _PC_LINK_MAX. ++- and more... ++ ++Currently these features are dropped temporary from aufs6. ++See design/08plan.txt in detail. ++- nested mount, i.e. aufs as readonly no-whiteout branch of another aufs ++ (robr) ++- statistics of aufs thread (/sys/fs/aufs/stat) ++ ++Features or just an idea in the future (see also design/*.txt), ++- reorder the branch index without del/re-add. ++- permanent xino files for NFSD ++- an option for refreshing the opened files after add/del branches ++- light version, without branch manipulation. (unnecessary?) ++- copyup in userspace ++- inotify in userspace ++- readv/writev ++ ++ ++2. Download ++---------------------------------------- ++There are three GIT trees for aufs6, aufs-linux.git, ++aufs-standalone.git, and aufs-util.git. ++While the aufs-util is always necessary, you need either of aufs-linux ++or aufs-standalone. ++ ++The aufs-linux tree includes the whole linux mainline GIT tree, ++git://git.kernel.org/.../torvalds/linux.git. ++And you cannot select CONFIG_AUFS_FS=m for this version, eg. you cannot ++build aufs6 as an external kernel module. ++Several extra patches are not included in this tree. Only ++aufs-standalone tree contains them. They are described in the later ++section "Configuration and Compilation." ++ ++On the other hand, the aufs-standalone tree has only aufs source files ++and necessary patches, and you can select CONFIG_AUFS_FS=m. ++But you need to apply all aufs patches manually. ++ ++You will find GIT branches whose name is in form of "aufs6.x" where "x" ++represents the linux kernel version, "linux-6.x". For instance, ++"aufs6.0" is for linux-6.0. For latest "linux-6.x-rcN", use ++"aufs6.x-rcN" branch. ++ ++o aufs-linux tree ++$ git clone --reference /your/linux/git/tree \ ++ git://github.com/sfjro/aufs-linux.git aufs-linux.git ++- if you don't have linux GIT tree, then remove "--reference ..." ++$ cd aufs-linux.git ++$ git checkout origin/aufs6.0 ++ ++Or You may want to directly git-pull aufs into your linux GIT tree, and ++leave the patch-work to GIT. ++$ cd /your/linux/git/tree ++$ git remote add aufs git://github.com/sfjro/aufs-linux.git ++$ git fetch aufs ++$ git checkout -b my6.0 v6.0 ++$ (add your local change...) ++$ git pull aufs aufs6.0 ++- now you have v6.0 + your_changes + aufs6.0 in you my6.0 branch. ++- you may need to solve some conflicts between your_changes and ++ aufs6.0. in this case, git-rerere is recommended so that you can ++ solve the similar conflicts automatically when you upgrade to 6.1 or ++ later in the future. ++ ++o aufs-standalone tree ++$ git clone git://github.com/sfjro/aufs-standalone.git aufs-standalone.git ++$ cd aufs-standalone.git ++$ git checkout origin/aufs6.0 ++ ++o aufs-util tree ++$ git clone git://git.code.sf.net/p/aufs/aufs-util aufs-util.git ++- note that the public aufs-util.git is on SourceForge instead of ++ GitHUB. ++$ cd aufs-util.git ++$ git checkout origin/aufs6.0 ++ ++Note: The 6.x-rcN branch is to be used with `rc' kernel versions ONLY. ++The minor version number, 'x' in '6.x', of aufs may not always ++follow the minor version number of the kernel. ++Because changes in the kernel that cause the use of a new ++minor version number do not always require changes to aufs-util. ++ ++Since aufs-util has its own minor version number, you may not be ++able to find a GIT branch in aufs-util for your kernel's ++exact minor version number. ++In this case, you should git-checkout the branch for the ++nearest lower number. ++ ++For (an unreleased) example: ++If you are using "linux-6.10" and the "aufs6.10" branch ++does not exist in aufs-util repository, then "aufs6.9", "aufs6.8" ++or something numerically smaller is the branch for your kernel. ++ ++Also you can view all branches by ++ $ git branch -a ++ ++ ++3. Configuration and Compilation ++---------------------------------------- ++Make sure you have git-checkout'ed the correct branch. ++ ++For aufs-linux tree, ++- enable CONFIG_AUFS_FS. ++- set other aufs configurations if necessary. ++- for aufs5.13 and later ++ Because aufs is not only an ordinary filesystem (callee of VFS), but ++ also a caller of VFS functions for branch filesystems, subclassing of ++ the internal locks for LOCKDEP is necessary. LOCKDEP is a debugging ++ feature of linux kernel. If you enable CONFIG_LOCKDEP, then you will ++ need to customize some LOCKDEP numbers. Here are what I use on my ++ test environment. ++ CONFIG_LOCKDEP_BITS=21 ++ CONFIG_LOCKDEP_CHAINS_BITS=21 ++ CONFIG_LOCKDEP_STACK_TRACE_BITS=24 ++ Also you will need to expand some constant values in LOCKDEP. Refer ++ to lockdep-debug.patch in aufs-standalone.git. ++ ++For aufs-standalone tree, ++There are several ways to build. ++ ++1. ++- apply ./aufs6-kbuild.patch to your kernel source files. ++- apply ./aufs6-base.patch too. ++- apply ./aufs6-mmap.patch too. ++- apply ./aufs6-standalone.patch too, if you have a plan to set ++ CONFIG_AUFS_FS=m. otherwise you don't need ./aufs-standalone.patch. ++- copy ./{Documentation,fs,include/uapi/linux/aufs_type.h} files to your ++ kernel source tree. Never copy $PWD/include/uapi/linux/Kbuild. ++- enable CONFIG_AUFS_FS, you can select either ++ =m or =y. ++- and build your kernel as usual. ++- install the built kernel. ++- install the header files too by "make headers_install" to the ++ directory where you specify. By default, it is $PWD/usr. ++ "make help" shows a brief note for headers_install. ++- and reboot your system. ++ ++2. ++- module only (CONFIG_AUFS_FS=m). ++- apply ./aufs6-base.patch to your kernel source files. ++- apply ./aufs6-mmap.patch too. ++- apply ./aufs6-standalone.patch too. ++- build your kernel, don't forget "make headers_install", and reboot. ++- edit ./config.mk and set other aufs configurations if necessary. ++ Note: You should read $PWD/fs/aufs/Kconfig carefully which describes ++ every aufs configurations. ++- build the module by simple "make". ++- you can specify ${KDIR} make variable which points to your kernel ++ source tree. ++- install the files ++ + run "make install" to install the aufs module, or copy the built ++ $PWD/aufs.ko to /lib/modules/... and run depmod -a (or reboot simply). ++ + run "make install_headers" (instead of headers_install) to install ++ the modified aufs header file (you can specify DESTDIR which is ++ available in aufs standalone version's Makefile only), or copy ++ $PWD/usr/include/linux/aufs_type.h to /usr/include/linux or wherever ++ you like manually. By default, the target directory is $PWD/usr. ++- no need to apply aufs6-kbuild.patch, nor copying source files to your ++ kernel source tree. ++ ++Note: The header file aufs_type.h is necessary to build aufs-util ++ as well as "make headers_install" in the kernel source tree. ++ headers_install is subject to be forgotten, but it is essentially ++ necessary, not only for building aufs-util. ++ You may not meet problems without headers_install in some older ++ version though. ++ ++And then, ++- read README in aufs-util, build and install it ++- note that your distribution may contain an obsoleted version of ++ aufs_type.h in /usr/include/linux or something. When you build aufs ++ utilities, make sure that your compiler refers the correct aufs header ++ file which is built by "make headers_install." ++- if you want to use readdir(3) in userspace or pathconf(3) wrapper, ++ then run "make install_ulib" too. And refer to the aufs manual in ++ detail. ++ ++There several other patches in aufs-standalone.git. They are all ++optional. When you meet some problems, they will help you. ++- aufs6-loopback.patch ++ Supports a nested loopback mount in a branch-fs. This patch is ++ unnecessary until aufs produces a message like "you may want to try ++ another patch for loopback file". ++- vfs-ino.patch ++ Modifies a system global kernel internal function get_next_ino() in ++ order to stop assigning 0 for an inode-number. Not directly related to ++ aufs, but recommended generally. ++- tmpfs-idr.patch ++ Keeps the tmpfs inode number as the lowest value. Effective to reduce ++ the size of aufs XINO files for tmpfs branch. Also it prevents the ++ duplication of inode number, which is important for backup tools and ++ other utilities. When you find aufs XINO files for tmpfs branch ++ growing too much, try this patch. ++- lockdep-debug.patch ++ Similar to some kernel configurations for LOCKDEP (see the top of ++ this section), you will need expand some constants in LOCKDEP for ++ aufs if you enable CONFIG_LOCKDEP. ++ ++ ++4. Usage ++---------------------------------------- ++At first, make sure aufs-util are installed, and please read the aufs ++manual, aufs.5 in aufs-util.git tree. ++$ man -l aufs.5 ++ ++And then, ++$ mkdir /tmp/rw /tmp/aufs ++# mount -t aufs -o br=/tmp/rw:${HOME} none /tmp/aufs ++ ++Here is another example. The result is equivalent. ++# mount -t aufs -o br=/tmp/rw=rw:${HOME}=ro none /tmp/aufs ++ Or ++# mount -t aufs -o br:/tmp/rw none /tmp/aufs ++# mount -o remount,append:${HOME} /tmp/aufs ++ ++Then, you can see whole tree of your home dir through /tmp/aufs. If ++you modify a file under /tmp/aufs, the one on your home directory is ++not affected, instead the same named file will be newly created under ++/tmp/rw. And all of your modification to a file will be applied to ++the one under /tmp/rw. This is called the file based Copy on Write ++(COW) method. ++Aufs mount options are described in aufs.5. ++If you run chroot or something and make your aufs as a root directory, ++then you need to customize the shutdown script. See the aufs manual in ++detail. ++ ++Additionally, there are some sample usages of aufs which are a ++diskless system with network booting, and LiveCD over NFS. ++See sample dir in CVS tree on SourceForge. ++ ++ ++5. Contact ++---------------------------------------- ++When you have any problems or strange behaviour in aufs, please let me ++know with: ++- /proc/mounts (instead of the output of mount(8)) ++- /sys/module/aufs/* ++- /sys/fs/aufs/* (if you have them) ++- /debug/aufs/* (if you have them) ++- linux kernel version ++ if your kernel is not plain, for example modified by distributor, ++ the url where i can download its source is necessary too. ++- aufs version which was printed at loading the module or booting the ++ system, instead of the date you downloaded. ++- configuration (define/undefine CONFIG_AUFS_xxx) ++- kernel configuration or /proc/config.gz (if you have it) ++- LSM (linux security module, if you are using) ++- behaviour which you think to be incorrect ++- actual operation, reproducible one is better ++- mailto: aufs-users at lists.sourceforge.net ++ ++Usually, I don't watch the Public Areas(Bugs, Support Requests, Patches, ++and Feature Requests) on SourceForge. Please join and write to ++aufs-users ML. ++ ++ ++6. Acknowledgements ++---------------------------------------- ++Thanks to everyone who have tried and are using aufs, whoever ++have reported a bug or any feedback. ++ ++Especially donators: ++Tomas Matejicek(slax.org) made a donation (much more than once). ++ Since Apr 2010, Tomas M (the author of Slax and Linux Live ++ scripts) is making "doubling" donations. ++ Unfortunately I cannot list all of the donators, but I really ++ appreciate. ++ It ends Aug 2010, but the ordinary donation URL is still available. ++ <http://sourceforge.net/donate/index.php?group_id=167503> ++Dai Itasaka made a donation (2007/8). ++Chuck Smith made a donation (2008/4, 10 and 12). ++Henk Schoneveld made a donation (2008/9). ++Chih-Wei Huang, ASUS, CTC donated Eee PC 4G (2008/10). ++Francois Dupoux made a donation (2008/11). ++Bruno Cesar Ribas and Luis Carlos Erpen de Bona, C3SL serves public ++ aufs2 GIT tree (2009/2). ++William Grant made a donation (2009/3). ++Patrick Lane made a donation (2009/4). ++The Mail Archive (mail-archive.com) made donations (2009/5). ++Nippy Networks (Ed Wildgoose) made a donation (2009/7). ++New Dream Network, LLC (www.dreamhost.com) made a donation (2009/11). ++Pavel Pronskiy made a donation (2011/2). ++Iridium and Inmarsat satellite phone retailer (www.mailasail.com), Nippy ++ Networks (Ed Wildgoose) made a donation for hardware (2011/3). ++Max Lekomcev (DOM-TV project) made a donation (2011/7, 12, 2012/3, 6 and ++11). ++Sam Liddicott made a donation (2011/9). ++Era Scarecrow made a donation (2013/4). ++Bor Ratajc made a donation (2013/4). ++Alessandro Gorreta made a donation (2013/4). ++POIRETTE Marc made a donation (2013/4). ++Alessandro Gorreta made a donation (2013/4). ++lauri kasvandik made a donation (2013/5). ++"pemasu from Finland" made a donation (2013/7). ++The Parted Magic Project made a donation (2013/9 and 11). ++Pavel Barta made a donation (2013/10). ++Nikolay Pertsev made a donation (2014/5). ++James B made a donation (2014/7, 2015/7, and 2021/12). ++Stefano Di Biase made a donation (2014/8). ++Daniel Epellei made a donation (2015/1). ++OmegaPhil made a donation (2016/1, 2018/4). ++Tomasz Szewczyk made a donation (2016/4). ++James Burry made a donation (2016/12). ++Carsten Rose made a donation (2018/9). ++Porteus Kiosk made a donation (2018/10). ++huronOS team: Enya Quetzalli made donations (2022/5, 2023/5 and 8). ++Vasily Mikhaylichenko made a donation (2023/5). ++ ++Thank you very much. ++Donations are always, including future donations, very important and ++helpful for me to keep on developing aufs. ++ ++ ++7. ++---------------------------------------- ++If you are an experienced user, no explanation is needed. Aufs is ++just a linux filesystem. ++ ++ ++Enjoy! ++ ++# Local variables: ; ++# mode: text; ++# End: ; +diff --git a/Documentation/filesystems/aufs/design/01intro.txt b/Documentation/filesystems/aufs/design/01intro.txt +new file mode 100644 +index 000000000000..4c468b3264b5 +--- /dev/null ++++ b/Documentation/filesystems/aufs/design/01intro.txt +@@ -0,0 +1,171 @@ ++ ++# Copyright (C) 2005-2022 Junjiro R. Okajima ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see <http://www.gnu.org/licenses/>. ++ ++Introduction ++---------------------------------------- ++ ++aufs [ei ju: ef es] | /ey-yoo-ef-es/ | [a u f s] ++1. abbrev. for "advanced multi-layered unification filesystem". ++2. abbrev. for "another unionfs". ++3. abbrev. for "auf das" in German which means "on the" in English. ++ Ex. "Butter aufs Brot"(G) means "butter onto bread"(E). ++ But "Filesystem aufs Filesystem" is hard to understand. ++4. abbrev. for "African Urban Fashion Show". ++ ++AUFS is a filesystem with features: ++- multi layered stackable unification filesystem, the member directory ++ is called as a branch. ++- branch permission and attribute, 'readonly', 'real-readonly', ++ 'readwrite', 'whiteout-able', 'link-able whiteout', etc. and their ++ combination. ++- internal "file copy-on-write". ++- logical deletion, whiteout. ++- dynamic branch manipulation, adding, deleting and changing permission. ++- allow bypassing aufs, user's direct branch access. ++- external inode number translation table and bitmap which maintains the ++ persistent aufs inode number. ++- seekable directory, including NFS readdir. ++- file mapping, mmap and sharing pages. ++- pseudo-link, hardlink over branches. ++- loopback mounted filesystem as a branch. ++- several policies to select one among multiple writable branches. ++- revert a single systemcall when an error occurs in aufs. ++- and more... ++ ++ ++Multi Layered Stackable Unification Filesystem ++---------------------------------------------------------------------- ++Most people already knows what it is. ++It is a filesystem which unifies several directories and provides a ++merged single directory. When users access a file, the access will be ++passed/re-directed/converted (sorry, I am not sure which English word is ++correct) to the real file on the member filesystem. The member ++filesystem is called 'lower filesystem' or 'branch' and has a mode ++'readonly' and 'readwrite.' And the deletion for a file on the lower ++readonly branch is handled by creating 'whiteout' on the upper writable ++branch. ++ ++On LKML, there have been discussions about UnionMount (Jan Blunck, ++Bharata B Rao and Valerie Aurora) and Unionfs (Erez Zadok). They took ++different approaches to implement the merged-view. ++The former tries putting it into VFS, and the latter implements as a ++separate filesystem. ++(If I misunderstand about these implementations, please let me know and ++I shall correct it. Because it is a long time ago when I read their ++source files last time). ++ ++UnionMount's approach will be able to small, but may be hard to share ++branches between several UnionMount since the whiteout in it is ++implemented in the inode on branch filesystem and always ++shared. According to Bharata's post, readdir does not seems to be ++finished yet. ++There are several missing features known in this implementations such as ++- for users, the inode number may change silently. eg. copy-up. ++- link(2) may break by copy-up. ++- read(2) may get an obsoleted filedata (fstat(2) too). ++- fcntl(F_SETLK) may be broken by copy-up. ++- unnecessary copy-up may happen, for example mmap(MAP_PRIVATE) after ++ open(O_RDWR). ++ ++In linux-3.18, "overlay" filesystem (formerly known as "overlayfs") was ++merged into mainline. This is another implementation of UnionMount as a ++separated filesystem. All the limitations and known problems which ++UnionMount are equally inherited to "overlay" filesystem. ++ ++Unionfs has a longer history. When I started implementing a stackable ++filesystem (Aug 2005), it already existed. It has virtual super_block, ++inode, dentry and file objects and they have an array pointing lower ++same kind objects. After contributing many patches for Unionfs, I ++re-started my project AUFS (Jun 2006). ++ ++In AUFS, the structure of filesystem resembles to Unionfs, but I ++implemented my own ideas, approaches and enhancements and it became ++totally different one. ++ ++Comparing DM snapshot and fs based implementation ++- the number of bytes to be copied between devices is much smaller. ++- the type of filesystem must be one and only. ++- the fs must be writable, no readonly fs, even for the lower original ++ device. so the compression fs will not be usable. but if we use ++ loopback mount, we may address this issue. ++ for instance, ++ mount /cdrom/squashfs.img /sq ++ losetup /sq/ext2.img ++ losetup /somewhere/cow ++ dmsetup "snapshot /dev/loop0 /dev/loop1 ..." ++- it will be difficult (or needs more operations) to extract the ++ difference between the original device and COW. ++- DM snapshot-merge may help a lot when users try merging. in the ++ fs-layer union, users will use rsync(1). ++ ++You may want to read my old paper "Filesystems in LiveCD" ++(http://aufs.sourceforge.net/aufs2/report/sq/sq.pdf). ++ ++ ++Several characters/aspects/persona of aufs ++---------------------------------------------------------------------- ++ ++Aufs has several characters, aspects or persona. ++1. a filesystem, callee of VFS helper ++2. sub-VFS, caller of VFS helper for branches ++3. a virtual filesystem which maintains persistent inode number ++4. reader/writer of files on branches such like an application ++ ++1. Callee of VFS Helper ++As an ordinary linux filesystem, aufs is a callee of VFS. For instance, ++unlink(2) from an application reaches sys_unlink() kernel function and ++then vfs_unlink() is called. vfs_unlink() is one of VFS helper and it ++calls filesystem specific unlink operation. Actually aufs implements the ++unlink operation but it behaves like a redirector. ++ ++2. Caller of VFS Helper for Branches ++aufs_unlink() passes the unlink request to the branch filesystem as if ++it were called from VFS. So the called unlink operation of the branch ++filesystem acts as usual. As a caller of VFS helper, aufs should handle ++every necessary pre/post operation for the branch filesystem. ++- acquire the lock for the parent dir on a branch ++- lookup in a branch ++- revalidate dentry on a branch ++- mnt_want_write() for a branch ++- vfs_unlink() for a branch ++- mnt_drop_write() for a branch ++- release the lock on a branch ++ ++3. Persistent Inode Number ++One of the most important issue for a filesystem is to maintain inode ++numbers. This is particularly important to support exporting a ++filesystem via NFS. Aufs is a virtual filesystem which doesn't have a ++backend block device for its own. But some storage is necessary to ++keep and maintain the inode numbers. It may be a large space and may not ++suit to keep in memory. Aufs rents some space from its first writable ++branch filesystem (by default) and creates file(s) on it. These files ++are created by aufs internally and removed soon (currently) keeping ++opened. ++Note: Because these files are removed, they are totally gone after ++ unmounting aufs. It means the inode numbers are not persistent ++ across unmount or reboot. I have a plan to make them really ++ persistent which will be important for aufs on NFS server. ++ ++4. Read/Write Files Internally (copy-on-write) ++Because a branch can be readonly, when you write a file on it, aufs will ++"copy-up" it to the upper writable branch internally. And then write the ++originally requested thing to the file. Generally kernel doesn't ++open/read/write file actively. In aufs, even a single write may cause a ++internal "file copy". This behaviour is very similar to cp(1) command. ++ ++Some people may think it is better to pass such work to user space ++helper, instead of doing in kernel space. Actually I am still thinking ++about it. But currently I have implemented it in kernel space. +diff --git a/Documentation/filesystems/aufs/design/02struct.txt b/Documentation/filesystems/aufs/design/02struct.txt +new file mode 100644 +index 000000000000..83be46121ae2 +--- /dev/null ++++ b/Documentation/filesystems/aufs/design/02struct.txt +@@ -0,0 +1,258 @@ ++ ++# Copyright (C) 2005-2022 Junjiro R. Okajima ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see <http://www.gnu.org/licenses/>. ++ ++Basic Aufs Internal Structure ++ ++Superblock/Inode/Dentry/File Objects ++---------------------------------------------------------------------- ++As like an ordinary filesystem, aufs has its own ++superblock/inode/dentry/file objects. All these objects have a ++dynamically allocated array and store the same kind of pointers to the ++lower filesystem, branch. ++For example, when you build a union with one readwrite branch and one ++readonly, mounted /au, /rw and /ro respectively. ++- /au = /rw + /ro ++- /ro/fileA exists but /rw/fileA ++ ++Aufs lookup operation finds /ro/fileA and gets dentry for that. These ++pointers are stored in a aufs dentry. The array in aufs dentry will be, ++- [0] = NULL (because /rw/fileA doesn't exist) ++- [1] = /ro/fileA ++ ++This style of an array is essentially same to the aufs ++superblock/inode/dentry/file objects. ++ ++Because aufs supports manipulating branches, ie. add/delete/change ++branches dynamically, these objects has its own generation. When ++branches are changed, the generation in aufs superblock is ++incremented. And a generation in other object are compared when it is ++accessed. When a generation in other objects are obsoleted, aufs ++refreshes the internal array. ++ ++ ++Superblock ++---------------------------------------------------------------------- ++Additionally aufs superblock has some data for policies to select one ++among multiple writable branches, XIB files, pseudo-links and kobject. ++See below in detail. ++About the policies which supports copy-down a directory, see ++wbr_policy.txt too. ++ ++ ++Branch and XINO(External Inode Number Translation Table) ++---------------------------------------------------------------------- ++Every branch has its own xino (external inode number translation table) ++file. The xino file is created and unlinked by aufs internally. When two ++members of a union exist on the same filesystem, they share the single ++xino file. ++The struct of a xino file is simple, just a sequence of aufs inode ++numbers which is indexed by the lower inode number. ++In the above sample, assume the inode number of /ro/fileA is i111 and ++aufs assigns the inode number i999 for fileA. Then aufs writes 999 as ++4(8) bytes at 111 * 4(8) bytes offset in the xino file. ++ ++When the inode numbers are not contiguous, the xino file will be sparse ++which has a hole in it and doesn't consume as much disk space as it ++might appear. If your branch filesystem consumes disk space for such ++holes, then you should specify 'xino=' option at mounting aufs. ++ ++Aufs has a mount option to free the disk blocks for such holes in XINO ++files on tmpfs or ramdisk. But it is not so effective actually. If you ++meet a problem of disk shortage due to XINO files, then you should try ++"tmpfs-ino.patch" (and "vfs-ino.patch" too) in aufs4-standalone.git. ++The patch localizes the assignment inumbers per tmpfs-mount and avoid ++the holes in XINO files. ++ ++Also a writable branch has three kinds of "whiteout bases". All these ++are existed when the branch is joined to aufs, and their names are ++whiteout-ed doubly, so that users will never see their names in aufs ++hierarchy. ++1. a regular file which will be hardlinked to all whiteouts. ++2. a directory to store a pseudo-link. ++3. a directory to store an "orphan"-ed file temporary. ++ ++1. Whiteout Base ++ When you remove a file on a readonly branch, aufs handles it as a ++ logical deletion and creates a whiteout on the upper writable branch ++ as a hardlink of this file in order not to consume inode on the ++ writable branch. ++2. Pseudo-link Dir ++ See below, Pseudo-link. ++3. Step-Parent Dir ++ When "fileC" exists on the lower readonly branch only and it is ++ opened and removed with its parent dir, and then user writes ++ something into it, then aufs copies-up fileC to this ++ directory. Because there is no other dir to store fileC. After ++ creating a file under this dir, the file is unlinked. ++ ++Because aufs supports manipulating branches, ie. add/delete/change ++dynamically, a branch has its own id. When the branch order changes, ++aufs finds the new index by searching the branch id. ++ ++ ++Pseudo-link ++---------------------------------------------------------------------- ++Assume "fileA" exists on the lower readonly branch only and it is ++hardlinked to "fileB" on the branch. When you write something to fileA, ++aufs copies-up it to the upper writable branch. Additionally aufs ++creates a hardlink under the Pseudo-link Directory of the writable ++branch. The inode of a pseudo-link is kept in aufs super_block as a ++simple list. If fileB is read after unlinking fileA, aufs returns ++filedata from the pseudo-link instead of the lower readonly ++branch. Because the pseudo-link is based upon the inode, to keep the ++inode number by xino (see above) is essentially necessary. ++ ++All the hardlinks under the Pseudo-link Directory of the writable branch ++should be restored in a proper location later. Aufs provides a utility ++to do this. The userspace helpers executed at remounting and unmounting ++aufs by default. ++During this utility is running, it puts aufs into the pseudo-link ++maintenance mode. In this mode, only the process which began the ++maintenance mode (and its child processes) is allowed to operate in ++aufs. Some other processes which are not related to the pseudo-link will ++be allowed to run too, but the rest have to return an error or wait ++until the maintenance mode ends. If a process already acquires an inode ++mutex (in VFS), it has to return an error. ++ ++ ++XIB(external inode number bitmap) ++---------------------------------------------------------------------- ++Addition to the xino file per a branch, aufs has an external inode number ++bitmap in a superblock object. It is also an internal file such like a ++xino file. ++It is a simple bitmap to mark whether the aufs inode number is in-use or ++not. ++To reduce the file I/O, aufs prepares a single memory page to cache xib. ++ ++As well as XINO files, aufs has a feature to truncate/refresh XIB to ++reduce the number of consumed disk blocks for these files. ++ ++ ++Virtual or Vertical Dir, and Readdir in Userspace ++---------------------------------------------------------------------- ++In order to support multiple layers (branches), aufs readdir operation ++constructs a virtual dir block on memory. For readdir, aufs calls ++vfs_readdir() internally for each dir on branches, merges their entries ++with eliminating the whiteout-ed ones, and sets it to file (dir) ++object. So the file object has its entry list until it is closed. The ++entry list will be updated when the file position is zero and becomes ++obsoleted. This decision is made in aufs automatically. ++ ++The dynamically allocated memory block for the name of entries has a ++unit of 512 bytes (by default) and stores the names contiguously (no ++padding). Another block for each entry is handled by kmem_cache too. ++During building dir blocks, aufs creates hash list and judging whether ++the entry is whiteouted by its upper branch or already listed. ++The merged result is cached in the corresponding inode object and ++maintained by a customizable life-time option. ++ ++Some people may call it can be a security hole or invite DoS attack ++since the opened and once readdir-ed dir (file object) holds its entry ++list and becomes a pressure for system memory. But I'd say it is similar ++to files under /proc or /sys. The virtual files in them also holds a ++memory page (generally) while they are opened. When an idea to reduce ++memory for them is introduced, it will be applied to aufs too. ++For those who really hate this situation, I've developed readdir(3) ++library which operates this merging in userspace. You just need to set ++LD_PRELOAD environment variable, and aufs will not consume no memory in ++kernel space for readdir(3). ++ ++ ++Workqueue ++---------------------------------------------------------------------- ++Aufs sometimes requires privilege access to a branch. For instance, ++in copy-up/down operation. When a user process is going to make changes ++to a file which exists in the lower readonly branch only, and the mode ++of one of ancestor directories may not be writable by a user ++process. Here aufs copy-up the file with its ancestors and they may ++require privilege to set its owner/group/mode/etc. ++This is a typical case of a application character of aufs (see ++Introduction). ++ ++Aufs uses workqueue synchronously for this case. It creates its own ++workqueue. The workqueue is a kernel thread and has privilege. Aufs ++passes the request to call mkdir or write (for example), and wait for ++its completion. This approach solves a problem of a signal handler ++simply. ++If aufs didn't adopt the workqueue and changed the privilege of the ++process, then the process may receive the unexpected SIGXFSZ or other ++signals. ++ ++Also aufs uses the system global workqueue ("events" kernel thread) too ++for asynchronous tasks, such like handling inotify/fsnotify, re-creating a ++whiteout base and etc. This is unrelated to a privilege. ++Most of aufs operation tries acquiring a rw_semaphore for aufs ++superblock at the beginning, at the same time waits for the completion ++of all queued asynchronous tasks. ++ ++ ++Whiteout ++---------------------------------------------------------------------- ++The whiteout in aufs is very similar to Unionfs's. That is represented ++by its filename. UnionMount takes an approach of a file mode, but I am ++afraid several utilities (find(1) or something) will have to support it. ++ ++Basically the whiteout represents "logical deletion" which stops aufs to ++lookup further, but also it represents "dir is opaque" which also stop ++further lookup. ++ ++In aufs, rmdir(2) and rename(2) for dir uses whiteout alternatively. ++In order to make several functions in a single systemcall to be ++revertible, aufs adopts an approach to rename a directory to a temporary ++unique whiteouted name. ++For example, in rename(2) dir where the target dir already existed, aufs ++renames the target dir to a temporary unique whiteouted name before the ++actual rename on a branch, and then handles other actions (make it opaque, ++update the attributes, etc). If an error happens in these actions, aufs ++simply renames the whiteouted name back and returns an error. If all are ++succeeded, aufs registers a function to remove the whiteouted unique ++temporary name completely and asynchronously to the system global ++workqueue. ++ ++ ++Copy-up ++---------------------------------------------------------------------- ++It is a well-known feature or concept. ++When user modifies a file on a readonly branch, aufs operate "copy-up" ++internally and makes change to the new file on the upper writable branch. ++When the trigger systemcall does not update the timestamps of the parent ++dir, aufs reverts it after copy-up. ++ ++ ++Move-down (aufs3.9 and later) ++---------------------------------------------------------------------- ++"Copy-up" is one of the essential feature in aufs. It copies a file from ++the lower readonly branch to the upper writable branch when a user ++changes something about the file. ++"Move-down" is an opposite action of copy-up. Basically this action is ++ran manually instead of automatically and internally. ++For desgin and implementation, aufs has to consider these issues. ++- whiteout for the file may exist on the lower branch. ++- ancestor directories may not exist on the lower branch. ++- diropq for the ancestor directories may exist on the upper branch. ++- free space on the lower branch will reduce. ++- another access to the file may happen during moving-down, including ++ UDBA (see "Revalidate Dentry and UDBA"). ++- the file should not be hard-linked nor pseudo-linked. they should be ++ handled by auplink utility later. ++ ++Sometimes users want to move-down a file from the upper writable branch ++to the lower readonly or writable branch. For instance, ++- the free space of the upper writable branch is going to run out. ++- create a new intermediate branch between the upper and lower branch. ++- etc. ++ ++For this purpose, use "aumvdown" command in aufs-util.git. +diff --git a/Documentation/filesystems/aufs/design/03atomic_open.txt b/Documentation/filesystems/aufs/design/03atomic_open.txt +new file mode 100644 +index 000000000000..4811f2432465 +--- /dev/null ++++ b/Documentation/filesystems/aufs/design/03atomic_open.txt +@@ -0,0 +1,85 @@ ++ ++# Copyright (C) 2015-2022 Junjiro R. Okajima ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see <http://www.gnu.org/licenses/>. ++ ++Support for a branch who has its ->atomic_open() ++---------------------------------------------------------------------- ++The filesystems who implement its ->atomic_open() are not majority. For ++example NFSv4 does, and aufs should call NFSv4 ->atomic_open, ++particularly for open(O_CREAT|O_EXCL, 0400) case. Other than ++->atomic_open(), NFSv4 returns an error for this open(2). While I am not ++sure whether all filesystems who have ->atomic_open() behave like this, ++but NFSv4 surely returns the error. ++ ++In order to support ->atomic_open() for aufs, there are a few ++approaches. ++ ++A. Introduce aufs_atomic_open() ++ - calls one of VFS:do_last(), lookup_open() or atomic_open() for ++ branch fs. ++B. Introduce aufs_atomic_open() calling create, open and chmod. this is ++ an aufs user Pip Cet's approach ++ - calls aufs_create(), VFS finish_open() and notify_change(). ++ - pass fake-mode to finish_open(), and then correct the mode by ++ notify_change(). ++C. Extend aufs_open() to call branch fs's ->atomic_open() ++ - no aufs_atomic_open(). ++ - aufs_lookup() registers the TID to an aufs internal object. ++ - aufs_create() does nothing when the matching TID is registered, but ++ registers the mode. ++ - aufs_open() calls branch fs's ->atomic_open() when the matching ++ TID is registered. ++D. Extend aufs_open() to re-try branch fs's ->open() with superuser's ++ credential ++ - no aufs_atomic_open(). ++ - aufs_create() registers the TID to an internal object. this info ++ represents "this process created this file just now." ++ - when aufs gets EACCES from branch fs's ->open(), then confirm the ++ registered TID and re-try open() with superuser's credential. ++ ++Pros and cons for each approach. ++ ++A. ++ - straightforward but highly depends upon VFS internal. ++ - the atomic behavaiour is kept. ++ - some of parameters such as nameidata are hard to reproduce for ++ branch fs. ++ - large overhead. ++B. ++ - easy to implement. ++ - the atomic behavaiour is lost. ++C. ++ - the atomic behavaiour is kept. ++ - dirty and tricky. ++ - VFS checks whether the file is created correctly after calling ++ ->create(), which means this approach doesn't work. ++D. ++ - easy to implement. ++ - the atomic behavaiour is lost. ++ - to open a file with superuser's credential and give it to a user ++ process is a bad idea, since the file object keeps the credential ++ in it. It may affect LSM or something. This approach doesn't work ++ either. ++ ++The approach A is ideal, but it hard to implement. So here is a ++variation of A, which is to be implemented. ++ ++A-1. Introduce aufs_atomic_open() ++ - calls branch fs ->atomic_open() if exists. otherwise calls ++ vfs_create() and finish_open(). ++ - the demerit is that the several checks after branch fs ++ ->atomic_open() are lost. in the ordinary case, the checks are ++ done by VFS:do_last(), lookup_open() and atomic_open(). some can ++ be implemented in aufs, but not all I am afraid. +diff --git a/Documentation/filesystems/aufs/design/03lookup.txt b/Documentation/filesystems/aufs/design/03lookup.txt +new file mode 100644 +index 000000000000..766a28be0263 +--- /dev/null ++++ b/Documentation/filesystems/aufs/design/03lookup.txt +@@ -0,0 +1,113 @@ ++ ++# Copyright (C) 2005-2022 Junjiro R. Okajima ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see <http://www.gnu.org/licenses/>. ++ ++Lookup in a Branch ++---------------------------------------------------------------------- ++Since aufs has a character of sub-VFS (see Introduction), it operates ++lookup for branches as VFS does. It may be a heavy work. But almost all ++lookup operation in aufs is the simplest case, ie. lookup only an entry ++directly connected to its parent. Digging down the directory hierarchy ++is unnecessary. VFS has a function lookup_one_len() for that use, and ++aufs calls it. ++ ++When a branch is a remote filesystem, aufs basically relies upon its ++->d_revalidate(), also aufs forces the hardest revalidate tests for ++them. ++For d_revalidate, aufs implements three levels of revalidate tests. See ++"Revalidate Dentry and UDBA" in detail. ++ ++ ++Test Only the Highest One for the Directory Permission (dirperm1 option) ++---------------------------------------------------------------------- ++Let's try case study. ++- aufs has two branches, upper readwrite and lower readonly. ++ /au = /rw + /ro ++- "dirA" exists under /ro, but /rw. and its mode is 0700. ++- user invoked "chmod a+rx /au/dirA" ++- the internal copy-up is activated and "/rw/dirA" is created and its ++ permission bits are set to world readable. ++- then "/au/dirA" becomes world readable? ++ ++In this case, /ro/dirA is still 0700 since it exists in readonly branch, ++or it may be a natively readonly filesystem. If aufs respects the lower ++branch, it should not respond readdir request from other users. But user ++allowed it by chmod. Should really aufs rejects showing the entries ++under /ro/dirA? ++ ++To be honest, I don't have a good solution for this case. So aufs ++implements 'dirperm1' and 'nodirperm1' mount options, and leave it to ++users. ++When dirperm1 is specified, aufs checks only the highest one for the ++directory permission, and shows the entries. Otherwise, as usual, checks ++every dir existing on all branches and rejects the request. ++ ++As a side effect, dirperm1 option improves the performance of aufs ++because the number of permission check is reduced when the number of ++branch is many. ++ ++ ++Revalidate Dentry and UDBA (User's Direct Branch Access) ++---------------------------------------------------------------------- ++Generally VFS helpers re-validate a dentry as a part of lookup. ++0. digging down the directory hierarchy. ++1. lock the parent dir by its i_mutex. ++2. lookup the final (child) entry. ++3. revalidate it. ++4. call the actual operation (create, unlink, etc.) ++5. unlock the parent dir ++ ++If the filesystem implements its ->d_revalidate() (step 3), then it is ++called. Actually aufs implements it and checks the dentry on a branch is ++still valid. ++But it is not enough. Because aufs has to release the lock for the ++parent dir on a branch at the end of ->lookup() (step 2) and ++->d_revalidate() (step 3) while the i_mutex of the aufs dir is still ++held by VFS. ++If the file on a branch is changed directly, eg. bypassing aufs, after ++aufs released the lock, then the subsequent operation may cause ++something unpleasant result. ++ ++This situation is a result of VFS architecture, ->lookup() and ++->d_revalidate() is separated. But I never say it is wrong. It is a good ++design from VFS's point of view. It is just not suitable for sub-VFS ++character in aufs. ++ ++Aufs supports such case by three level of revalidation which is ++selectable by user. ++1. Simple Revalidate ++ Addition to the native flow in VFS's, confirm the child-parent ++ relationship on the branch just after locking the parent dir on the ++ branch in the "actual operation" (step 4). When this validation ++ fails, aufs returns EBUSY. ->d_revalidate() (step 3) in aufs still ++ checks the validation of the dentry on branches. ++2. Monitor Changes Internally by Inotify/Fsnotify ++ Addition to above, in the "actual operation" (step 4) aufs re-lookup ++ the dentry on the branch, and returns EBUSY if it finds different ++ dentry. ++ Additionally, aufs sets the inotify/fsnotify watch for every dir on branches ++ during it is in cache. When the event is notified, aufs registers a ++ function to kernel 'events' thread by schedule_work(). And the ++ function sets some special status to the cached aufs dentry and inode ++ private data. If they are not cached, then aufs has nothing to ++ do. When the same file is accessed through aufs (step 0-3) later, ++ aufs will detect the status and refresh all necessary data. ++ In this mode, aufs has to ignore the event which is fired by aufs ++ itself. ++3. No Extra Validation ++ This is the simplest test and doesn't add any additional revalidation ++ test, and skip the revalidation in step 4. It is useful and improves ++ aufs performance when system surely hide the aufs branches from user, ++ by over-mounting something (or another method). +diff --git a/Documentation/filesystems/aufs/design/04branch.txt b/Documentation/filesystems/aufs/design/04branch.txt +new file mode 100644 +index 000000000000..ffeb97dcaff3 +--- /dev/null ++++ b/Documentation/filesystems/aufs/design/04branch.txt +@@ -0,0 +1,74 @@ ++ ++# Copyright (C) 2005-2022 Junjiro R. Okajima ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see <http://www.gnu.org/licenses/>. ++ ++Branch Manipulation ++ ++Since aufs supports dynamic branch manipulation, ie. add/remove a branch ++and changing its permission/attribute, there are a lot of works to do. ++ ++ ++Add a Branch ++---------------------------------------------------------------------- ++o Confirm the adding dir exists outside of aufs, including loopback ++ mount, and its various attributes. ++o Initialize the xino file and whiteout bases if necessary. ++ See struct.txt. ++ ++o Check the owner/group/mode of the directory ++ When the owner/group/mode of the adding directory differs from the ++ existing branch, aufs issues a warning because it may impose a ++ security risk. ++ For example, when a upper writable branch has a world writable empty ++ top directory, a malicious user can create any files on the writable ++ branch directly, like copy-up and modify manually. If something like ++ /etc/{passwd,shadow} exists on the lower readonly branch but the upper ++ writable branch, and the writable branch is world-writable, then a ++ malicious guy may create /etc/passwd on the writable branch directly ++ and the infected file will be valid in aufs. ++ I am afraid it can be a security issue, but aufs can do nothing except ++ producing a warning. ++ ++ ++Delete a Branch ++---------------------------------------------------------------------- ++o Confirm the deleting branch is not busy ++ To be general, there is one merit to adopt "remount" interface to ++ manipulate branches. It is to discard caches. At deleting a branch, ++ aufs checks the still cached (and connected) dentries and inodes. If ++ there are any, then they are all in-use. An inode without its ++ corresponding dentry can be alive alone (for example, inotify/fsnotify case). ++ ++ For the cached one, aufs checks whether the same named entry exists on ++ other branches. ++ If the cached one is a directory, because aufs provides a merged view ++ to users, as long as one dir is left on any branch aufs can show the ++ dir to users. In this case, the branch can be removed from aufs. ++ Otherwise aufs rejects deleting the branch. ++ ++ If any file on the deleting branch is opened by aufs, then aufs ++ rejects deleting. ++ ++ ++Modify the Permission of a Branch ++---------------------------------------------------------------------- ++o Re-initialize or remove the xino file and whiteout bases if necessary. ++ See struct.txt. ++ ++o rw --> ro: Confirm the modifying branch is not busy ++ Aufs rejects the request if any of these conditions are true. ++ - a file on the branch is mmap-ed. ++ - a regular file on the branch is opened for write and there is no ++ same named entry on the upper branch. +diff --git a/Documentation/filesystems/aufs/design/05wbr_policy.txt b/Documentation/filesystems/aufs/design/05wbr_policy.txt +new file mode 100644 +index 000000000000..a2143bfe6efc +--- /dev/null ++++ b/Documentation/filesystems/aufs/design/05wbr_policy.txt +@@ -0,0 +1,64 @@ ++ ++# Copyright (C) 2005-2022 Junjiro R. Okajima ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see <http://www.gnu.org/licenses/>. ++ ++Policies to Select One among Multiple Writable Branches ++---------------------------------------------------------------------- ++When the number of writable branch is more than one, aufs has to decide ++the target branch for file creation or copy-up. By default, the highest ++writable branch which has the parent (or ancestor) dir of the target ++file is chosen (top-down-parent policy). ++By user's request, aufs implements some other policies to select the ++writable branch, for file creation several policies, round-robin, ++most-free-space, and other policies. For copy-up, top-down-parent, ++bottom-up-parent, bottom-up and others. ++ ++As expected, the round-robin policy selects the branch in circular. When ++you have two writable branches and creates 10 new files, 5 files will be ++created for each branch. mkdir(2) systemcall is an exception. When you ++create 10 new directories, all will be created on the same branch. ++And the most-free-space policy selects the one which has most free ++space among the writable branches. The amount of free space will be ++checked by aufs internally, and users can specify its time interval. ++ ++The policies for copy-up is more simple, ++top-down-parent is equivalent to the same named on in create policy, ++bottom-up-parent selects the writable branch where the parent dir ++exists and the nearest upper one from the copyup-source, ++bottom-up selects the nearest upper writable branch from the ++copyup-source, regardless the existence of the parent dir. ++ ++There are some rules or exceptions to apply these policies. ++- If there is a readonly branch above the policy-selected branch and ++ the parent dir is marked as opaque (a variation of whiteout), or the ++ target (creating) file is whiteout-ed on the upper readonly branch, ++ then the result of the policy is ignored and the target file will be ++ created on the nearest upper writable branch than the readonly branch. ++- If there is a writable branch above the policy-selected branch and ++ the parent dir is marked as opaque or the target file is whiteouted ++ on the branch, then the result of the policy is ignored and the target ++ file will be created on the highest one among the upper writable ++ branches who has diropq or whiteout. In case of whiteout, aufs removes ++ it as usual. ++- link(2) and rename(2) systemcalls are exceptions in every policy. ++ They try selecting the branch where the source exists as possible ++ since copyup a large file will take long time. If it can't be, ++ ie. the branch where the source exists is readonly, then they will ++ follow the copyup policy. ++- There is an exception for rename(2) when the target exists. ++ If the rename target exists, aufs compares the index of the branches ++ where the source and the target exists and selects the higher ++ one. If the selected branch is readonly, then aufs follows the ++ copyup policy. +diff --git a/Documentation/filesystems/aufs/design/06dirren.dot b/Documentation/filesystems/aufs/design/06dirren.dot +new file mode 100644 +index 000000000000..4e6c7e7c20ef +--- /dev/null ++++ b/Documentation/filesystems/aufs/design/06dirren.dot +@@ -0,0 +1,44 @@ ++ ++// to view this graph, run dot(1) command in GRAPHVIZ. ++// ++// This program is free software; you can redistribute it and/or modify ++// it under the terms of the GNU General Public License as published by ++// the Free Software Foundation; either version 2 of the License, or ++// (at your option) any later version. ++// ++// This program is distributed in the hope that it will be useful, ++// but WITHOUT ANY WARRANTY; without even the implied warranty of ++// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++// GNU General Public License for more details. ++// ++// You should have received a copy of the GNU General Public License ++// along with this program. If not, see <http://www.gnu.org/licenses/>. ++ ++digraph G { ++node [shape=box]; ++whinfo [label="detailed info file\n(lower_brid_root-hinum, h_inum, namelen, old name)"]; ++ ++node [shape=oval]; ++ ++aufs_rename -> whinfo [label="store/remove"]; ++ ++node [shape=oval]; ++inode_list [label="h_inum list in branch\ncache"]; ++ ++node [shape=box]; ++whinode [label="h_inum list file"]; ++ ++node [shape=oval]; ++brmgmt [label="br_add/del/mod/umount"]; ++ ++brmgmt -> inode_list [label="create/remove"]; ++brmgmt -> whinode [label="load/store"]; ++ ++inode_list -> whinode [style=dashed,dir=both]; ++ ++aufs_rename -> inode_list [label="add/del"]; ++ ++aufs_lookup -> inode_list [label="search"]; ++ ++aufs_lookup -> whinfo [label="load/remove"]; ++} +diff --git a/Documentation/filesystems/aufs/design/06dirren.txt b/Documentation/filesystems/aufs/design/06dirren.txt +new file mode 100644 +index 000000000000..58ec5e22fe3d +--- /dev/null ++++ b/Documentation/filesystems/aufs/design/06dirren.txt +@@ -0,0 +1,102 @@ ++ ++# Copyright (C) 2017-2022 Junjiro R. Okajima ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see <http://www.gnu.org/licenses/>. ++ ++Special handling for renaming a directory (DIRREN) ++---------------------------------------------------------------------- ++First, let's assume we have a simple usecase. ++ ++- /u = /rw + /ro ++- /rw/dirA exists ++- /ro/dirA and /ro/dirA/file exist too ++- there is no dirB on both branches ++- a user issues rename("dirA", "dirB") ++ ++Now, what should aufs behave against this rename(2)? ++There are a few possible cases. ++ ++A. returns EROFS. ++ since dirA exists on a readonly branch which cannot be renamed. ++B. returns EXDEV. ++ it is possible to copy-up dirA (only the dir itself), but the child ++ entries ("file" in this case) should not be. it must be a bad ++ approach to copy-up recursively. ++C. returns a success. ++ even the branch /ro is readonly, aufs tries renaming it. Obviously it ++ is a violation of aufs' policy. ++D. construct an extra information which indicates that /ro/dirA should ++ be handled as the name of dirB. ++ overlayfs has a similar feature called REDIRECT. ++ ++Until now, aufs implements the case B only which returns EXDEV, and ++expects the userspace application behaves like mv(1) which tries ++issueing rename(2) recursively. ++ ++A new aufs feature called DIRREN is introduced which implements the case ++D. There are several "extra information" added. ++ ++1. detailed info per renamed directory ++ path: /rw/dirB/$AUFS_WH_DR_INFO_PFX.<lower branch-id> ++2. the inode-number list of directories on a branch ++ path: /rw/dirB/$AUFS_WH_DR_BRHINO ++ ++The filename of "detailed info per directory" represents the lower ++branch, and its format is ++- a type of the branch id ++ one of these. ++ + uuid (not implemented yet) ++ + fsid ++ + dev ++- the inode-number of the branch root dir ++ ++And it contains these info in a single regular file. ++- magic number ++- branch's inode-number of the logically renamed dir ++- the name of the before-renamed dir ++ ++The "detailed info per directory" file is created in aufs rename(2), and ++loaded in any lookup. ++The info is considered in lookup for the matching case only. Here ++"matching" means that the root of branch (in the info filename) is same ++to the current looking-up branch. After looking-up the before-renamed ++name, the inode-number is compared. And the matched dentry is used. ++ ++The "inode-number list of directories" is a regular file which contains ++simply the inode-numbers on the branch. The file is created or updated ++in removing the branch, and loaded in adding the branch. Its lifetime is ++equal to the branch. ++The list is referred in lookup, and when the current target inode is ++found in the list, the aufs tries loading the "detailed info per ++directory" and get the changed and valid name of the dir. ++ ++Theoretically these "extra informaiton" may be able to be put into XATTR ++in the dir inode. But aufs doesn't choose this way because ++1. XATTR may not be supported by the branch (or its configuration) ++2. XATTR may have its size limit. ++3. XATTR may be less easy to convert than a regular file, when the ++ format of the info is changed in the future. ++At the same time, I agree that the regular file approach is much slower ++than XATTR approach. So, in the future, aufs may take the XATTR or other ++better approach. ++ ++This DIRREN feature is enabled by aufs configuration, and is activated ++by a new mount option. ++ ++For the more complicated case, there is a work with UDBA option, which ++is to dected the direct access to the branches (by-passing aufs) and to ++maintain the cashes in aufs. Since a single cached aufs dentry may ++contains two names, before- and after-rename, the name comparision in ++UDBA handler may not work correctly. In this case, the behaviour will be ++equivalen to udba=reval case. +diff --git a/Documentation/filesystems/aufs/design/06fhsm.txt b/Documentation/filesystems/aufs/design/06fhsm.txt +new file mode 100644 +index 000000000000..d3b56325ff87 +--- /dev/null ++++ b/Documentation/filesystems/aufs/design/06fhsm.txt +@@ -0,0 +1,118 @@ ++ ++# Copyright (C) 2011-2022 Junjiro R. Okajima ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see <http://www.gnu.org/licenses/>. ++ ++File-based Hierarchical Storage Management (FHSM) ++---------------------------------------------------------------------- ++Hierarchical Storage Management (or HSM) is a well-known feature in the ++storage world. Aufs provides this feature as file-based with multiple ++writable branches, based upon the principle of "Colder, the Lower". ++Here the word "colder" means that the less used files, and "lower" means ++that the position in the order of the stacked branches vertically. ++These multiple writable branches are prioritized, ie. the topmost one ++should be the fastest drive and be used heavily. ++ ++o Characters in aufs FHSM story ++- aufs itself and a new branch attribute. ++- a new ioctl interface to move-down and to establish a connection with ++ the daemon ("move-down" is a converse of "copy-up"). ++- userspace tool and daemon. ++ ++The userspace daemon establishes a connection with aufs and waits for ++the notification. The notified information is very similar to struct ++statfs containing the number of consumed blocks and inodes. ++When the consumed blocks/inodes of a branch exceeds the user-specified ++upper watermark, the daemon activates its move-down process until the ++consumed blocks/inodes reaches the user-specified lower watermark. ++ ++The actual move-down is done by aufs based upon the request from ++user-space since we need to maintain the inode number and the internal ++pointer arrays in aufs. ++ ++Currently aufs FHSM handles the regular files only. Additionally they ++must not be hard-linked nor pseudo-linked. ++ ++ ++o Cowork of aufs and the user-space daemon ++ During the userspace daemon established the connection, aufs sends a ++ small notification to it whenever aufs writes something into the ++ writable branch. But it may cost high since aufs issues statfs(2) ++ internally. So user can specify a new option to cache the ++ info. Actually the notification is controlled by these factors. ++ + the specified cache time. ++ + classified as "force" by aufs internally. ++ Until the specified time expires, aufs doesn't send the info ++ except the forced cases. When aufs decide forcing, the info is always ++ notified to userspace. ++ For example, the number of free inodes is generally large enough and ++ the shortage of it happens rarely. So aufs doesn't force the ++ notification when creating a new file, directory and others. This is ++ the typical case which aufs doesn't force. ++ When aufs writes the actual filedata and the files consumes any of new ++ blocks, the aufs forces notifying. ++ ++ ++o Interfaces in aufs ++- New branch attribute. ++ + fhsm ++ Specifies that the branch is managed by FHSM feature. In other word, ++ participant in the FHSM. ++ When nofhsm is set to the branch, it will not be the source/target ++ branch of the move-down operation. This attribute is set ++ independently from coo and moo attributes, and if you want full ++ FHSM, you should specify them as well. ++- New mount option. ++ + fhsm_sec ++ Specifies a second to suppress many less important info to be ++ notified. ++- New ioctl. ++ + AUFS_CTL_FHSM_FD ++ create a new file descriptor which userspace can read the notification ++ (a subset of struct statfs) from aufs. ++- Module parameter 'brs' ++ It has to be set to 1. Otherwise the new mount option 'fhsm' will not ++ be set. ++- mount helpers /sbin/mount.aufs and /sbin/umount.aufs ++ When there are two or more branches with fhsm attributes, ++ /sbin/mount.aufs invokes the user-space daemon and /sbin/umount.aufs ++ terminates it. As a result of remounting and branch-manipulation, the ++ number of branches with fhsm attribute can be one. In this case, ++ /sbin/mount.aufs will terminate the user-space daemon. ++ ++ ++Finally the operation is done as these steps in kernel-space. ++- make sure that, ++ + no one else is using the file. ++ + the file is not hard-linked. ++ + the file is not pseudo-linked. ++ + the file is a regular file. ++ + the parent dir is not opaqued. ++- find the target writable branch. ++- make sure the file is not whiteout-ed by the upper (than the target) ++ branch. ++- make the parent dir on the target branch. ++- mutex lock the inode on the branch. ++- unlink the whiteout on the target branch (if exists). ++- lookup and create the whiteout-ed temporary name on the target branch. ++- copy the file as the whiteout-ed temporary name on the target branch. ++- rename the whiteout-ed temporary name to the original name. ++- unlink the file on the source branch. ++- maintain the internal pointer array and the external inode number ++ table (XINO). ++- maintain the timestamps and other attributes of the parent dir and the ++ file. ++ ++And of course, in every step, an error may happen. So the operation ++should restore the original file state after an error happens. +diff --git a/Documentation/filesystems/aufs/design/06mmap.txt b/Documentation/filesystems/aufs/design/06mmap.txt +new file mode 100644 +index 000000000000..ddc65ce97fa3 +--- /dev/null ++++ b/Documentation/filesystems/aufs/design/06mmap.txt +@@ -0,0 +1,72 @@ ++ ++# Copyright (C) 2005-2022 Junjiro R. Okajima ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see <http://www.gnu.org/licenses/>. ++ ++mmap(2) -- File Memory Mapping ++---------------------------------------------------------------------- ++In aufs, the file-mapped pages are handled by a branch fs directly, no ++interaction with aufs. It means aufs_mmap() calls the branch fs's ++->mmap(). ++This approach is simple and good, but there is one problem. ++Under /proc, several entries show the mmapped files by its path (with ++device and inode number), and the printed path will be the path on the ++branch fs's instead of virtual aufs's. ++This is not a problem in most cases, but some utilities lsof(1) (and its ++user) may expect the path on aufs. ++ ++To address this issue, aufs adds a new member called vm_prfile in struct ++vm_area_struct (and struct vm_region). The original vm_file points to ++the file on the branch fs in order to handle everything correctly as ++usual. The new vm_prfile points to a virtual file in aufs, and the ++show-functions in procfs refers to vm_prfile if it is set. ++Also we need to maintain several other places where touching vm_file ++such like ++- fork()/clone() copies vma and the reference count of vm_file is ++ incremented. ++- merging vma maintains the ref count too. ++ ++This is not a good approach. It just fakes the printed path. But it ++leaves all behaviour around f_mapping unchanged. This is surely an ++advantage. ++Actually aufs had adopted another complicated approach which calls ++generic_file_mmap() and handles struct vm_operations_struct. In this ++approach, aufs met a hard problem and I could not solve it without ++switching the approach. ++ ++There may be one more another approach which is ++- bind-mount the branch-root onto the aufs-root internally ++- grab the new vfsmount (ie. struct mount) ++- lazy-umount the branch-root internally ++- in open(2) the aufs-file, open the branch-file with the hidden ++ vfsmount (instead of the original branch's vfsmount) ++- ideally this "bind-mount and lazy-umount" should be done atomically, ++ but it may be possible from userspace by the mount helper. ++ ++Adding the internal hidden vfsmount and using it in opening a file, the ++file path under /proc will be printed correctly. This approach looks ++smarter, but is not possible I am afraid. ++- aufs-root may be bind-mount later. when it happens, another hidden ++ vfsmount will be required. ++- it is hard to get the chance to bind-mount and lazy-umount ++ + in kernel-space, FS can have vfsmount in open(2) via ++ file->f_path, and aufs can know its vfsmount. But several locks are ++ already acquired, and if aufs tries to bind-mount and lazy-umount ++ here, then it may cause a deadlock. ++ + in user-space, bind-mount doesn't invoke the mount helper. ++- since /proc shows dev and ino, aufs has to give vma these info. it ++ means a new member vm_prinode will be necessary. this is essentially ++ equivalent to vm_prfile described above. ++ ++I have to give up this "looks-smater" approach. +diff --git a/Documentation/filesystems/aufs/design/06xattr.txt b/Documentation/filesystems/aufs/design/06xattr.txt +new file mode 100644 +index 000000000000..4e5ead3ad741 +--- /dev/null ++++ b/Documentation/filesystems/aufs/design/06xattr.txt +@@ -0,0 +1,94 @@ ++ ++# Copyright (C) 2014-2022 Junjiro R. Okajima ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see <http://www.gnu.org/licenses/>. ++ ++Listing XATTR/EA and getting the value ++---------------------------------------------------------------------- ++For the inode standard attributes (owner, group, timestamps, etc.), aufs ++shows the values from the topmost existing file. This behaviour is good ++for the non-dir entries since the bahaviour exactly matches the shown ++information. But for the directories, aufs considers all the same named ++entries on the lower branches. Which means, if one of the lower entry ++rejects readdir call, then aufs returns an error even if the topmost ++entry allows it. This behaviour is necessary to respect the branch fs's ++security, but can make users confused since the user-visible standard ++attributes don't match the behaviour. ++To address this issue, aufs has a mount option called dirperm1 which ++checks the permission for the topmost entry only, and ignores the lower ++entry's permission. ++ ++A similar issue can happen around XATTR. ++getxattr(2) and listxattr(2) families behave as if dirperm1 option is ++always set. Otherwise these very unpleasant situation would happen. ++- listxattr(2) may return the duplicated entries. ++- users may not be able to remove or reset the XATTR forever, ++ ++ ++XATTR/EA support in the internal (copy,move)-(up,down) ++---------------------------------------------------------------------- ++Generally the extended attributes of inode are categorized as these. ++- "security" for LSM and capability. ++- "system" for posix ACL, 'acl' mount option is required for the branch ++ fs generally. ++- "trusted" for userspace, CAP_SYS_ADMIN is required. ++- "user" for userspace, 'user_xattr' mount option is required for the ++ branch fs generally. ++ ++Moreover there are some other categories. Aufs handles these rather ++unpopular categories as the ordinary ones, ie. there is no special ++condition nor exception. ++ ++In copy-up, the support for XATTR on the dst branch may differ from the ++src branch. In this case, the copy-up operation will get an error and ++the original user operation which triggered the copy-up will fail. It ++can happen that even all copy-up will fail. ++When both of src and dst branches support XATTR and if an error occurs ++during copying XATTR, then the copy-up should fail obviously. That is a ++good reason and aufs should return an error to userspace. But when only ++the src branch support that XATTR, aufs should not return an error. ++For example, the src branch supports ACL but the dst branch doesn't ++because the dst branch may natively un-support it or temporary ++un-support it due to "noacl" mount option. Of course, the dst branch fs ++may NOT return an error even if the XATTR is not supported. It is ++totally up to the branch fs. ++ ++Anyway when the aufs internal copy-up gets an error from the dst branch ++fs, then aufs tries removing the just copied entry and returns the error ++to the userspace. The worst case of this situation will be all copy-up ++will fail. ++ ++For the copy-up operation, there two basic approaches. ++- copy the specified XATTR only (by category above), and return the ++ error unconditionally if it happens. ++- copy all XATTR, and ignore the error on the specified category only. ++ ++In order to support XATTR and to implement the correct behaviour, aufs ++chooses the latter approach and introduces some new branch attributes, ++"icexsec", "icexsys", "icextr", "icexusr", and "icexoth". ++They correspond to the XATTR namespaces (see above). Additionally, to be ++convenient, "icex" is also provided which means all "icex*" attributes ++are set (here the word "icex" stands for "ignore copy-error on XATTR"). ++ ++The meaning of these attributes is to ignore the error from setting ++XATTR on that branch. ++Note that aufs tries copying all XATTR unconditionally, and ignores the ++error from the dst branch according to the specified attributes. ++ ++Some XATTR may have its default value. The default value may come from ++the parent dir or the environment. If the default value is set at the ++file creating-time, it will be overwritten by copy-up. ++Some contradiction may happen I am afraid. ++Do we need another attribute to stop copying XATTR? I am unsure. For ++now, aufs implements the branch attributes to ignore the error. +diff --git a/Documentation/filesystems/aufs/design/07export.txt b/Documentation/filesystems/aufs/design/07export.txt +new file mode 100644 +index 000000000000..40b2f1f12049 +--- /dev/null ++++ b/Documentation/filesystems/aufs/design/07export.txt +@@ -0,0 +1,58 @@ ++ ++# Copyright (C) 2005-2022 Junjiro R. Okajima ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see <http://www.gnu.org/licenses/>. ++ ++Export Aufs via NFS ++---------------------------------------------------------------------- ++Here is an approach. ++- like xino/xib, add a new file 'xigen' which stores aufs inode ++ generation. ++- iget_locked(): initialize aufs inode generation for a new inode, and ++ store it in xigen file. ++- destroy_inode(): increment aufs inode generation and store it in xigen ++ file. it is necessary even if it is not unlinked, because any data of ++ inode may be changed by UDBA. ++- encode_fh(): for a root dir, simply return FILEID_ROOT. otherwise ++ build file handle by ++ + branch id (4 bytes) ++ + superblock generation (4 bytes) ++ + inode number (4 or 8 bytes) ++ + parent dir inode number (4 or 8 bytes) ++ + inode generation (4 bytes)) ++ + return value of exportfs_encode_fh() for the parent on a branch (4 ++ bytes) ++ + file handle for a branch (by exportfs_encode_fh()) ++- fh_to_dentry(): ++ + find the index of a branch from its id in handle, and check it is ++ still exist in aufs. ++ + 1st level: get the inode number from handle and search it in cache. ++ + 2nd level: if not found in cache, get the parent inode number from ++ the handle and search it in cache. and then open the found parent ++ dir, find the matching inode number by vfs_readdir() and get its ++ name, and call lookup_one_len() for the target dentry. ++ + 3rd level: if the parent dir is not cached, call ++ exportfs_decode_fh() for a branch and get the parent on a branch, ++ build a pathname of it, convert it a pathname in aufs, call ++ path_lookup(). now aufs gets a parent dir dentry, then handle it as ++ the 2nd level. ++ + to open the dir, aufs needs struct vfsmount. aufs keeps vfsmount ++ for every branch, but not itself. to get this, (currently) aufs ++ searches in current->nsproxy->mnt_ns list. it may not be a good ++ idea, but I didn't get other approach. ++ + test the generation of the gotten inode. ++- every inode operation: they may get EBUSY due to UDBA. in this case, ++ convert it into ESTALE for NFSD. ++- readdir(): call lockdep_on/off() because filldir in NFSD calls ++ lookup_one_len(), vfs_getattr(), encode_fh() and others. +diff --git a/Documentation/filesystems/aufs/design/08shwh.txt b/Documentation/filesystems/aufs/design/08shwh.txt +new file mode 100644 +index 000000000000..67245e98e6b4 +--- /dev/null ++++ b/Documentation/filesystems/aufs/design/08shwh.txt +@@ -0,0 +1,52 @@ ++ ++# Copyright (C) 2005-2022 Junjiro R. Okajima ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see <http://www.gnu.org/licenses/>. ++ ++Show Whiteout Mode (shwh) ++---------------------------------------------------------------------- ++Generally aufs hides the name of whiteouts. But in some cases, to show ++them is very useful for users. For instance, creating a new middle layer ++(branch) by merging existing layers. ++ ++(borrowing aufs1 HOW-TO from a user, Michael Towers) ++When you have three branches, ++- Bottom: 'system', squashfs (underlying base system), read-only ++- Middle: 'mods', squashfs, read-only ++- Top: 'overlay', ram (tmpfs), read-write ++ ++The top layer is loaded at boot time and saved at shutdown, to preserve ++the changes made to the system during the session. ++When larger changes have been made, or smaller changes have accumulated, ++the size of the saved top layer data grows. At this point, it would be ++nice to be able to merge the two overlay branches ('mods' and 'overlay') ++and rewrite the 'mods' squashfs, clearing the top layer and thus ++restoring save and load speed. ++ ++This merging is simplified by the use of another aufs mount, of just the ++two overlay branches using the 'shwh' option. ++# mount -t aufs -o ro,shwh,br:/livesys/overlay=ro+wh:/livesys/mods=rr+wh \ ++ aufs /livesys/merge_union ++ ++A merged view of these two branches is then available at ++/livesys/merge_union, and the new feature is that the whiteouts are ++visible! ++Note that in 'shwh' mode the aufs mount must be 'ro', which will disable ++writing to all branches. Also the default mode for all branches is 'ro'. ++It is now possible to save the combined contents of the two overlay ++branches to a new squashfs, e.g.: ++# mksquashfs /livesys/merge_union /path/to/newmods.squash ++ ++This new squashfs archive can be stored on the boot device and the ++initramfs will use it to replace the old one at the next boot. +diff --git a/Documentation/filesystems/aufs/design/10dynop.txt b/Documentation/filesystems/aufs/design/10dynop.txt +new file mode 100644 +index 000000000000..da382ec2dc05 +--- /dev/null ++++ b/Documentation/filesystems/aufs/design/10dynop.txt +@@ -0,0 +1,47 @@ ++ ++# Copyright (C) 2010-2022 Junjiro R. Okajima ++# ++# This program is free software; you can redistribute it and/or modify ++# it under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++# ++# This program is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with this program. If not, see <http://www.gnu.org/licenses/>. ++ ++Dynamically customizable FS operations ++---------------------------------------------------------------------- ++Generally FS operations (struct inode_operations, struct ++address_space_operations, struct file_operations, etc.) are defined as ++"static const", but it never means that FS have only one set of ++operation. Some FS have multiple sets of them. For instance, ext2 has ++three sets, one for XIP, for NOBH, and for normal. ++Since aufs overrides and redirects these operations, sometimes aufs has ++to change its behaviour according to the branch FS type. More importantly ++VFS acts differently if a function (member in the struct) is set or ++not. It means aufs should have several sets of operations and select one ++among them according to the branch FS definition. ++ ++In order to solve this problem and not to affect the behaviour of VFS, ++aufs defines these operations dynamically. For instance, aufs defines ++dummy direct_IO function for struct address_space_operations, but it may ++not be set to the address_space_operations actually. When the branch FS ++doesn't have it, aufs doesn't set it to its address_space_operations ++while the function definition itself is still alive. So the behaviour ++itself will not change, and it will return an error when direct_IO is ++not set. ++ ++The lifetime of these dynamically generated operation object is ++maintained by aufs branch object. When the branch is removed from aufs, ++the reference counter of the object is decremented. When it reaches ++zero, the dynamically generated operation object will be freed. ++ ++This approach is designed to support AIO (io_submit), Direct I/O and ++XIP (DAX) mainly. ++Currently this approach is applied to address_space_operations for ++regular files only. +diff --git a/fs/aufs/Kconfig b/fs/aufs/Kconfig +new file mode 100644 +index 000000000000..a5008b87a55f +--- /dev/null ++++ b/fs/aufs/Kconfig +@@ -0,0 +1,199 @@ ++# SPDX-License-Identifier: GPL-2.0 ++config AUFS_FS ++ tristate "Aufs (Advanced multi layered unification filesystem) support" ++ help ++ Aufs is a stackable unification filesystem such as Unionfs, ++ which unifies several directories and provides a merged single ++ directory. ++ In the early days, aufs was entirely re-designed and ++ re-implemented Unionfs Version 1.x series. Introducing many ++ original ideas, approaches and improvements, it becomes totally ++ different from Unionfs while keeping the basic features. ++ ++if AUFS_FS ++choice ++ prompt "Maximum number of branches" ++ default AUFS_BRANCH_MAX_127 ++ help ++ Specifies the maximum number of branches (or member directories) ++ in a single aufs. The larger value consumes more system ++ resources and has a minor impact to performance. ++config AUFS_BRANCH_MAX_127 ++ bool "127" ++ help ++ Specifies the maximum number of branches (or member directories) ++ in a single aufs. The larger value consumes more system ++ resources and has a minor impact to performance. ++config AUFS_BRANCH_MAX_511 ++ bool "511" ++ help ++ Specifies the maximum number of branches (or member directories) ++ in a single aufs. The larger value consumes more system ++ resources and has a minor impact to performance. ++config AUFS_BRANCH_MAX_1023 ++ bool "1023" ++ help ++ Specifies the maximum number of branches (or member directories) ++ in a single aufs. The larger value consumes more system ++ resources and has a minor impact to performance. ++config AUFS_BRANCH_MAX_32767 ++ bool "32767" ++ help ++ Specifies the maximum number of branches (or member directories) ++ in a single aufs. The larger value consumes more system ++ resources and has a minor impact to performance. ++endchoice ++ ++config AUFS_SBILIST ++ bool ++ depends on AUFS_MAGIC_SYSRQ || PROC_FS ++ default y ++ help ++ Automatic configuration for internal use. ++ When aufs supports Magic SysRq or /proc, enabled automatically. ++ ++config AUFS_HNOTIFY ++ bool "Detect direct branch access (bypassing aufs)" ++ help ++ If you want to modify files on branches directly, eg. bypassing aufs, ++ and want aufs to detect the changes of them fully, then enable this ++ option and use 'udba=notify' mount option. ++ Currently there is only one available configuration, "fsnotify". ++ It will have a negative impact to the performance. ++ See detail in aufs.5. ++ ++choice ++ prompt "method" if AUFS_HNOTIFY ++ default AUFS_HFSNOTIFY ++config AUFS_HFSNOTIFY ++ bool "fsnotify" ++ select FSNOTIFY ++endchoice ++ ++config AUFS_EXPORT ++ bool "NFS-exportable aufs" ++ depends on EXPORTFS ++ help ++ If you want to export your mounted aufs via NFS, then enable this ++ option. There are several requirements for this configuration. ++ See detail in aufs.5. ++ ++config AUFS_INO_T_64 ++ bool ++ depends on AUFS_EXPORT ++ depends on 64BIT && !(ALPHA || S390) ++ default y ++ help ++ Automatic configuration for internal use. ++ /* typedef unsigned long/int __kernel_ino_t */ ++ /* alpha and s390x are int */ ++ ++config AUFS_XATTR ++ bool "support for XATTR/EA (including Security Labels)" ++ help ++ If your branch fs supports XATTR/EA and you want to make them ++ available in aufs too, then enable this opsion and specify the ++ branch attributes for EA. ++ See detail in aufs.5. ++ ++config AUFS_FHSM ++ bool "File-based Hierarchical Storage Management" ++ help ++ Hierarchical Storage Management (or HSM) is a well-known feature ++ in the storage world. Aufs provides this feature as file-based. ++ with multiple branches. ++ These multiple branches are prioritized, ie. the topmost one ++ should be the fastest drive and be used heavily. ++ ++config AUFS_RDU ++ bool "Readdir in userspace" ++ help ++ Aufs has two methods to provide a merged view for a directory, ++ by a user-space library and by kernel-space natively. The latter ++ is always enabled but sometimes large and slow. ++ If you enable this option, install the library in aufs2-util ++ package, and set some environment variables for your readdir(3), ++ then the work will be handled in user-space which generally ++ shows better performance in most cases. ++ See detail in aufs.5. ++ ++config AUFS_DIRREN ++ bool "Workaround for rename(2)-ing a directory" ++ help ++ By default, aufs returns EXDEV error in renameing a dir who has ++ his child on the lower branch, since it is a bad idea to issue ++ rename(2) internally for every lower branch. But user may not ++ accept this behaviour. So here is a workaround to allow such ++ rename(2) and store some extra information on the writable ++ branch. Obviously this costs high (and I don't like it). ++ To use this feature, you need to enable this configuration AND ++ to specify the mount option `dirren.' ++ See details in aufs.5 and the design documents. ++ ++config AUFS_SHWH ++ bool "Show whiteouts" ++ help ++ If you want to make the whiteouts in aufs visible, then enable ++ this option and specify 'shwh' mount option. Although it may ++ sounds like philosophy or something, but in technically it ++ simply shows the name of whiteout with keeping its behaviour. ++ ++config AUFS_BR_RAMFS ++ bool "Ramfs (initramfs/rootfs) as an aufs branch" ++ help ++ If you want to use ramfs as an aufs branch fs, then enable this ++ option. Generally tmpfs is recommended. ++ Aufs prohibited them to be a branch fs by default, because ++ initramfs becomes unusable after switch_root or something ++ generally. If you sets initramfs as an aufs branch and boot your ++ system by switch_root, you will meet a problem easily since the ++ files in initramfs may be inaccessible. ++ Unless you are going to use ramfs as an aufs branch fs without ++ switch_root or something, leave it N. ++ ++config AUFS_BR_FUSE ++ bool "Fuse fs as an aufs branch" ++ depends on FUSE_FS ++ select AUFS_POLL ++ help ++ If you want to use fuse-based userspace filesystem as an aufs ++ branch fs, then enable this option. ++ It implements the internal poll(2) operation which is ++ implemented by fuse only (curretnly). ++ ++config AUFS_POLL ++ bool ++ help ++ Automatic configuration for internal use. ++ ++config AUFS_BR_HFSPLUS ++ bool "Hfsplus as an aufs branch" ++ depends on HFSPLUS_FS ++ default y ++ help ++ If you want to use hfsplus fs as an aufs branch fs, then enable ++ this option. This option introduces a small overhead at ++ copying-up a file on hfsplus. ++ ++config AUFS_BDEV_LOOP ++ bool ++ depends on BLK_DEV_LOOP ++ default y ++ help ++ Automatic configuration for internal use. ++ Convert =[ym] into =y. ++ ++config AUFS_DEBUG ++ bool "Debug aufs" ++ help ++ Enable this to compile aufs internal debug code. ++ It will have a negative impact to the performance. ++ ++config AUFS_MAGIC_SYSRQ ++ bool ++ depends on AUFS_DEBUG && MAGIC_SYSRQ ++ default y ++ help ++ Automatic configuration for internal use. ++ When aufs supports Magic SysRq, enabled automatically. ++endif +diff --git a/fs/aufs/Makefile b/fs/aufs/Makefile +new file mode 100644 +index 000000000000..4af8ecde3e3f +--- /dev/null ++++ b/fs/aufs/Makefile +@@ -0,0 +1,46 @@ ++# SPDX-License-Identifier: GPL-2.0 ++ ++include ${src}/magic.mk ++ifeq (${CONFIG_AUFS_FS},m) ++include ${src}/conf.mk ++endif ++-include ${src}/priv_def.mk ++ ++# cf. include/linux/kernel.h ++# enable pr_debug ++ccflags-y += -DDEBUG ++# sparse requires the full pathname ++ifdef M ++ccflags-y += -include ${M}/../../include/uapi/linux/aufs_type.h ++else ++ccflags-y += -include ${srctree}/include/uapi/linux/aufs_type.h ++endif ++ ++obj-$(CONFIG_AUFS_FS) += aufs.o ++aufs-y := module.o sbinfo.o super.o branch.o xino.o sysaufs.o opts.o fsctx.o \ ++ wkq.o vfsub.o dcsub.o \ ++ cpup.o whout.o wbr_policy.o \ ++ dinfo.o dentry.o \ ++ dynop.o \ ++ finfo.o file.o f_op.o \ ++ dir.o vdir.o \ ++ iinfo.o inode.o i_op.o i_op_add.o i_op_del.o i_op_ren.o \ ++ mvdown.o ioctl.o ++ ++# all are boolean ++aufs-$(CONFIG_PROC_FS) += procfs.o plink.o ++aufs-$(CONFIG_SYSFS) += sysfs.o ++aufs-$(CONFIG_DEBUG_FS) += dbgaufs.o ++aufs-$(CONFIG_AUFS_BDEV_LOOP) += loop.o ++aufs-$(CONFIG_AUFS_HNOTIFY) += hnotify.o ++aufs-$(CONFIG_AUFS_HFSNOTIFY) += hfsnotify.o ++aufs-$(CONFIG_AUFS_EXPORT) += export.o ++aufs-$(CONFIG_AUFS_XATTR) += xattr.o ++aufs-$(CONFIG_FS_POSIX_ACL) += posix_acl.o ++aufs-$(CONFIG_AUFS_DIRREN) += dirren.o ++aufs-$(CONFIG_AUFS_FHSM) += fhsm.o ++aufs-$(CONFIG_AUFS_POLL) += poll.o ++aufs-$(CONFIG_AUFS_RDU) += rdu.o ++aufs-$(CONFIG_AUFS_BR_HFSPLUS) += hfsplus.o ++aufs-$(CONFIG_AUFS_DEBUG) += debug.o ++aufs-$(CONFIG_AUFS_MAGIC_SYSRQ) += sysrq.o +diff --git a/fs/aufs/aufs.h b/fs/aufs/aufs.h +new file mode 100644 +index 000000000000..20430cf79042 +--- /dev/null ++++ b/fs/aufs/aufs.h +@@ -0,0 +1,62 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * all header files ++ */ ++ ++#ifndef __AUFS_H__ ++#define __AUFS_H__ ++ ++#ifdef __KERNEL__ ++ ++#define AuStub(type, name, body, ...) \ ++ static inline type name(__VA_ARGS__) { body; } ++ ++#define AuStubVoid(name, ...) \ ++ AuStub(void, name, , __VA_ARGS__) ++#define AuStubInt0(name, ...) \ ++ AuStub(int, name, return 0, __VA_ARGS__) ++ ++#include "debug.h" ++ ++#include "branch.h" ++#include "cpup.h" ++#include "dcsub.h" ++#include "dbgaufs.h" ++#include "dentry.h" ++#include "dir.h" ++#include "dirren.h" ++#include "dynop.h" ++#include "file.h" ++#include "fstype.h" ++#include "hbl.h" ++#include "inode.h" ++#include "lcnt.h" ++#include "loop.h" ++#include "module.h" ++#include "opts.h" ++#include "rwsem.h" ++#include "super.h" ++#include "sysaufs.h" ++#include "vfsub.h" ++#include "whout.h" ++#include "wkq.h" ++ ++#endif /* __KERNEL__ */ ++#endif /* __AUFS_H__ */ +diff --git a/fs/aufs/branch.c b/fs/aufs/branch.c +new file mode 100644 +index 000000000000..2a85d744d2b5 +--- /dev/null ++++ b/fs/aufs/branch.c +@@ -0,0 +1,1427 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * branch management ++ */ ++ ++#include <linux/compat.h> ++#include <linux/statfs.h> ++#include "aufs.h" ++ ++/* ++ * free a single branch ++ */ ++static void au_br_do_free(struct au_branch *br) ++{ ++ int i; ++ struct au_wbr *wbr; ++ struct au_dykey **key; ++ ++ au_hnotify_fin_br(br); ++ /* always, regardless the mount option */ ++ au_dr_hino_free(&br->br_dirren); ++ au_xino_put(br); ++ ++ AuLCntZero(au_lcnt_read(&br->br_nfiles, /*do_rev*/0)); ++ au_lcnt_fin(&br->br_nfiles, /*do_sync*/0); ++ AuLCntZero(au_lcnt_read(&br->br_count, /*do_rev*/0)); ++ au_lcnt_fin(&br->br_count, /*do_sync*/0); ++ ++ wbr = br->br_wbr; ++ if (wbr) { ++ for (i = 0; i < AuBrWh_Last; i++) ++ dput(wbr->wbr_wh[i]); ++ AuDebugOn(atomic_read(&wbr->wbr_wh_running)); ++ AuRwDestroy(&wbr->wbr_wh_rwsem); ++ } ++ ++ if (br->br_fhsm) { ++ au_br_fhsm_fin(br->br_fhsm); ++ au_kfree_try_rcu(br->br_fhsm); ++ } ++ ++ key = br->br_dykey; ++ for (i = 0; i < AuBrDynOp; i++, key++) ++ if (*key) ++ au_dy_put(*key); ++ else ++ break; ++ ++ /* recursive lock, s_umount of branch's */ ++ /* synchronize_rcu(); */ /* why? */ ++ lockdep_off(); ++ path_put(&br->br_path); ++ lockdep_on(); ++ au_kfree_rcu(wbr); ++ au_lcnt_wait_for_fin(&br->br_nfiles); ++ au_lcnt_wait_for_fin(&br->br_count); ++ /* I don't know why, but percpu_refcount requires this */ ++ /* synchronize_rcu(); */ ++ au_kfree_rcu(br); ++} ++ ++/* ++ * frees all branches ++ */ ++void au_br_free(struct au_sbinfo *sbinfo) ++{ ++ aufs_bindex_t bmax; ++ struct au_branch **br; ++ ++ AuRwMustWriteLock(&sbinfo->si_rwsem); ++ ++ bmax = sbinfo->si_bbot + 1; ++ br = sbinfo->si_branch; ++ while (bmax--) ++ au_br_do_free(*br++); ++} ++ ++/* ++ * find the index of a branch which is specified by @br_id. ++ */ ++int au_br_index(struct super_block *sb, aufs_bindex_t br_id) ++{ ++ aufs_bindex_t bindex, bbot; ++ ++ bbot = au_sbbot(sb); ++ for (bindex = 0; bindex <= bbot; bindex++) ++ if (au_sbr_id(sb, bindex) == br_id) ++ return bindex; ++ return -1; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * add a branch ++ */ ++ ++static int test_overlap(struct super_block *sb, struct dentry *h_adding, ++ struct dentry *h_root) ++{ ++ if (unlikely(h_adding == h_root ++ || au_test_loopback_overlap(sb, h_adding))) ++ return 1; ++ if (h_adding->d_sb != h_root->d_sb) ++ return 0; ++ return au_test_subdir(h_adding, h_root) ++ || au_test_subdir(h_root, h_adding); ++} ++ ++/* ++ * returns a newly allocated branch. @new_nbranch is a number of branches ++ * after adding a branch. ++ */ ++static struct au_branch *au_br_alloc(struct super_block *sb, int new_nbranch, ++ int perm) ++{ ++ struct au_branch *add_branch; ++ struct dentry *root; ++ struct inode *inode; ++ int err; ++ ++ err = -ENOMEM; ++ add_branch = kzalloc(sizeof(*add_branch), GFP_NOFS); ++ if (unlikely(!add_branch)) ++ goto out; ++ add_branch->br_xino = au_xino_alloc(/*nfile*/1); ++ if (unlikely(!add_branch->br_xino)) ++ goto out_br; ++ err = au_hnotify_init_br(add_branch, perm); ++ if (unlikely(err)) ++ goto out_xino; ++ ++ if (au_br_writable(perm)) { ++ /* may be freed separately at changing the branch permission */ ++ add_branch->br_wbr = kzalloc(sizeof(*add_branch->br_wbr), ++ GFP_NOFS); ++ if (unlikely(!add_branch->br_wbr)) ++ goto out_hnotify; ++ } ++ ++ if (au_br_fhsm(perm)) { ++ err = au_fhsm_br_alloc(add_branch); ++ if (unlikely(err)) ++ goto out_wbr; ++ } ++ ++ root = sb->s_root; ++ err = au_sbr_realloc(au_sbi(sb), new_nbranch, /*may_shrink*/0); ++ if (!err) ++ err = au_di_realloc(au_di(root), new_nbranch, /*may_shrink*/0); ++ if (!err) { ++ inode = d_inode(root); ++ err = au_hinode_realloc(au_ii(inode), new_nbranch, ++ /*may_shrink*/0); ++ } ++ if (!err) ++ return add_branch; /* success */ ++ ++out_wbr: ++ au_kfree_rcu(add_branch->br_wbr); ++out_hnotify: ++ au_hnotify_fin_br(add_branch); ++out_xino: ++ au_xino_put(add_branch); ++out_br: ++ au_kfree_rcu(add_branch); ++out: ++ return ERR_PTR(err); ++} ++ ++/* ++ * test if the branch permission is legal or not. ++ */ ++static int test_br(struct inode *inode, int brperm, char *path) ++{ ++ int err; ++ ++ err = (au_br_writable(brperm) && IS_RDONLY(inode)); ++ if (!err) ++ goto out; ++ ++ err = -EINVAL; ++ pr_err("write permission for readonly mount or inode, %s\n", path); ++ ++out: ++ return err; ++} ++ ++/* ++ * returns: ++ * 0: success, the caller will add it ++ * plus: success, it is already unified, the caller should ignore it ++ * minus: error ++ */ ++static int test_add(struct super_block *sb, struct au_opt_add *add, int remount) ++{ ++ int err; ++ aufs_bindex_t bbot, bindex; ++ struct dentry *root, *h_dentry; ++ struct inode *inode, *h_inode; ++ ++ root = sb->s_root; ++ bbot = au_sbbot(sb); ++ if (unlikely(bbot >= 0 ++ && au_find_dbindex(root, add->path.dentry) >= 0)) { ++ err = 1; ++ if (!remount) { ++ err = -EINVAL; ++ pr_err("%s duplicated\n", add->pathname); ++ } ++ goto out; ++ } ++ ++ err = -ENOSPC; /* -E2BIG; */ ++ if (unlikely(AUFS_BRANCH_MAX <= add->bindex ++ || AUFS_BRANCH_MAX - 1 <= bbot)) { ++ pr_err("number of branches exceeded %s\n", add->pathname); ++ goto out; ++ } ++ ++ err = -EDOM; ++ if (unlikely(add->bindex < 0 || bbot + 1 < add->bindex)) { ++ pr_err("bad index %d\n", add->bindex); ++ goto out; ++ } ++ ++ inode = d_inode(add->path.dentry); ++ err = -ENOENT; ++ if (unlikely(!inode->i_nlink)) { ++ pr_err("no existence %s\n", add->pathname); ++ goto out; ++ } ++ ++ err = -EINVAL; ++ if (unlikely(inode->i_sb == sb)) { ++ pr_err("%s must be outside\n", add->pathname); ++ goto out; ++ } ++ ++ if (unlikely(au_test_fs_unsuppoted(inode->i_sb))) { ++ pr_err("unsupported filesystem, %s (%s)\n", ++ add->pathname, au_sbtype(inode->i_sb)); ++ goto out; ++ } ++ ++ if (unlikely(inode->i_sb->s_stack_depth)) { ++ pr_err("already stacked, %s (%s)\n", ++ add->pathname, au_sbtype(inode->i_sb)); ++ goto out; ++ } ++ ++ err = test_br(d_inode(add->path.dentry), add->perm, add->pathname); ++ if (unlikely(err)) ++ goto out; ++ ++ if (bbot < 0) ++ return 0; /* success */ ++ ++ err = -EINVAL; ++ for (bindex = 0; bindex <= bbot; bindex++) ++ if (unlikely(test_overlap(sb, add->path.dentry, ++ au_h_dptr(root, bindex)))) { ++ pr_err("%s is overlapped\n", add->pathname); ++ goto out; ++ } ++ ++ err = 0; ++ if (au_opt_test(au_mntflags(sb), WARN_PERM)) { ++ h_dentry = au_h_dptr(root, 0); ++ h_inode = d_inode(h_dentry); ++ if ((h_inode->i_mode & S_IALLUGO) != (inode->i_mode & S_IALLUGO) ++ || !uid_eq(h_inode->i_uid, inode->i_uid) ++ || !gid_eq(h_inode->i_gid, inode->i_gid)) ++ pr_warn("uid/gid/perm %s %u/%u/0%o, %u/%u/0%o\n", ++ add->pathname, ++ i_uid_read(inode), i_gid_read(inode), ++ (inode->i_mode & S_IALLUGO), ++ i_uid_read(h_inode), i_gid_read(h_inode), ++ (h_inode->i_mode & S_IALLUGO)); ++ } ++ ++out: ++ return err; ++} ++ ++/* ++ * initialize or clean the whiteouts for an adding branch ++ */ ++static int au_br_init_wh(struct super_block *sb, struct au_branch *br, ++ int new_perm) ++{ ++ int err, old_perm; ++ aufs_bindex_t bindex; ++ struct inode *h_inode; ++ struct au_wbr *wbr; ++ struct au_hinode *hdir; ++ struct dentry *h_dentry; ++ ++ err = vfsub_mnt_want_write(au_br_mnt(br)); ++ if (unlikely(err)) ++ goto out; ++ ++ wbr = br->br_wbr; ++ old_perm = br->br_perm; ++ br->br_perm = new_perm; ++ hdir = NULL; ++ h_inode = NULL; ++ bindex = au_br_index(sb, br->br_id); ++ if (0 <= bindex) { ++ hdir = au_hi(d_inode(sb->s_root), bindex); ++ au_hn_inode_lock_nested(hdir, AuLsc_I_PARENT); ++ } else { ++ h_dentry = au_br_dentry(br); ++ h_inode = d_inode(h_dentry); ++ inode_lock_nested(h_inode, AuLsc_I_PARENT); ++ } ++ if (!wbr) ++ err = au_wh_init(br, sb); ++ else { ++ wbr_wh_write_lock(wbr); ++ err = au_wh_init(br, sb); ++ wbr_wh_write_unlock(wbr); ++ } ++ if (hdir) ++ au_hn_inode_unlock(hdir); ++ else ++ inode_unlock(h_inode); ++ vfsub_mnt_drop_write(au_br_mnt(br)); ++ br->br_perm = old_perm; ++ ++ if (!err && wbr && !au_br_writable(new_perm)) { ++ au_kfree_rcu(wbr); ++ br->br_wbr = NULL; ++ } ++ ++out: ++ return err; ++} ++ ++static int au_wbr_init(struct au_branch *br, struct super_block *sb, ++ int perm) ++{ ++ int err; ++ struct kstatfs kst; ++ struct au_wbr *wbr; ++ ++ wbr = br->br_wbr; ++ au_rw_init(&wbr->wbr_wh_rwsem); ++ atomic_set(&wbr->wbr_wh_running, 0); ++ ++ /* ++ * a limit for rmdir/rename a dir ++ * cf. AUFS_MAX_NAMELEN in include/uapi/linux/aufs_type.h ++ */ ++ err = vfs_statfs(&br->br_path, &kst); ++ if (unlikely(err)) ++ goto out; ++ err = -EINVAL; ++ if (kst.f_namelen >= NAME_MAX) ++ err = au_br_init_wh(sb, br, perm); ++ else ++ pr_err("%pd(%s), unsupported namelen %ld\n", ++ au_br_dentry(br), ++ au_sbtype(au_br_dentry(br)->d_sb), kst.f_namelen); ++ ++out: ++ return err; ++} ++ ++/* initialize a new branch */ ++static int au_br_init(struct au_branch *br, struct super_block *sb, ++ struct au_opt_add *add) ++{ ++ int err; ++ struct au_branch *brbase; ++ struct file *xf; ++ struct inode *h_inode; ++ ++ err = 0; ++ br->br_perm = add->perm; ++ br->br_path = add->path; /* set first, path_get() later */ ++ spin_lock_init(&br->br_dykey_lock); ++ au_lcnt_init(&br->br_nfiles, /*release*/NULL); ++ au_lcnt_init(&br->br_count, /*release*/NULL); ++ br->br_id = au_new_br_id(sb); ++ AuDebugOn(br->br_id < 0); ++ ++ /* always, regardless the given option */ ++ err = au_dr_br_init(sb, br, &add->path); ++ if (unlikely(err)) ++ goto out_err; ++ ++ if (au_br_writable(add->perm)) { ++ err = au_wbr_init(br, sb, add->perm); ++ if (unlikely(err)) ++ goto out_err; ++ } ++ ++ if (au_opt_test(au_mntflags(sb), XINO)) { ++ brbase = au_sbr(sb, 0); ++ xf = au_xino_file(brbase->br_xino, /*idx*/-1); ++ AuDebugOn(!xf); ++ h_inode = d_inode(add->path.dentry); ++ err = au_xino_init_br(sb, br, h_inode->i_ino, &xf->f_path); ++ if (unlikely(err)) { ++ AuDebugOn(au_xino_file(br->br_xino, /*idx*/-1)); ++ goto out_err; ++ } ++ } ++ ++ sysaufs_br_init(br); ++ path_get(&br->br_path); ++ goto out; /* success */ ++ ++out_err: ++ memset(&br->br_path, 0, sizeof(br->br_path)); ++out: ++ return err; ++} ++ ++static void au_br_do_add_brp(struct au_sbinfo *sbinfo, aufs_bindex_t bindex, ++ struct au_branch *br, aufs_bindex_t bbot, ++ aufs_bindex_t amount) ++{ ++ struct au_branch **brp; ++ ++ AuRwMustWriteLock(&sbinfo->si_rwsem); ++ ++ brp = sbinfo->si_branch + bindex; ++ memmove(brp + 1, brp, sizeof(*brp) * amount); ++ *brp = br; ++ sbinfo->si_bbot++; ++ if (unlikely(bbot < 0)) ++ sbinfo->si_bbot = 0; ++} ++ ++static void au_br_do_add_hdp(struct au_dinfo *dinfo, aufs_bindex_t bindex, ++ aufs_bindex_t bbot, aufs_bindex_t amount) ++{ ++ struct au_hdentry *hdp; ++ ++ AuRwMustWriteLock(&dinfo->di_rwsem); ++ ++ hdp = au_hdentry(dinfo, bindex); ++ memmove(hdp + 1, hdp, sizeof(*hdp) * amount); ++ au_h_dentry_init(hdp); ++ dinfo->di_bbot++; ++ if (unlikely(bbot < 0)) ++ dinfo->di_btop = 0; ++} ++ ++static void au_br_do_add_hip(struct au_iinfo *iinfo, aufs_bindex_t bindex, ++ aufs_bindex_t bbot, aufs_bindex_t amount) ++{ ++ struct au_hinode *hip; ++ ++ AuRwMustWriteLock(&iinfo->ii_rwsem); ++ ++ hip = au_hinode(iinfo, bindex); ++ memmove(hip + 1, hip, sizeof(*hip) * amount); ++ au_hinode_init(hip); ++ iinfo->ii_bbot++; ++ if (unlikely(bbot < 0)) ++ iinfo->ii_btop = 0; ++} ++ ++static void au_br_do_add(struct super_block *sb, struct au_branch *br, ++ aufs_bindex_t bindex) ++{ ++ struct dentry *root, *h_dentry; ++ struct inode *root_inode, *h_inode; ++ aufs_bindex_t bbot, amount; ++ ++ root = sb->s_root; ++ root_inode = d_inode(root); ++ bbot = au_sbbot(sb); ++ amount = bbot + 1 - bindex; ++ h_dentry = au_br_dentry(br); ++ au_sbilist_lock(); ++ au_br_do_add_brp(au_sbi(sb), bindex, br, bbot, amount); ++ au_br_do_add_hdp(au_di(root), bindex, bbot, amount); ++ au_br_do_add_hip(au_ii(root_inode), bindex, bbot, amount); ++ au_set_h_dptr(root, bindex, dget(h_dentry)); ++ h_inode = d_inode(h_dentry); ++ au_set_h_iptr(root_inode, bindex, au_igrab(h_inode), /*flags*/0); ++ au_sbilist_unlock(); ++} ++ ++int au_br_add(struct super_block *sb, struct au_opt_add *add, int remount) ++{ ++ int err; ++ aufs_bindex_t bbot, add_bindex; ++ struct dentry *root, *h_dentry; ++ struct inode *root_inode; ++ struct au_branch *add_branch; ++ ++ root = sb->s_root; ++ root_inode = d_inode(root); ++ IMustLock(root_inode); ++ IiMustWriteLock(root_inode); ++ err = test_add(sb, add, remount); ++ if (unlikely(err < 0)) ++ goto out; ++ if (err) { ++ err = 0; ++ goto out; /* success */ ++ } ++ ++ bbot = au_sbbot(sb); ++ add_branch = au_br_alloc(sb, bbot + 2, add->perm); ++ err = PTR_ERR(add_branch); ++ if (IS_ERR(add_branch)) ++ goto out; ++ ++ err = au_br_init(add_branch, sb, add); ++ if (unlikely(err)) { ++ au_br_do_free(add_branch); ++ goto out; ++ } ++ ++ add_bindex = add->bindex; ++ sysaufs_brs_del(sb, add_bindex); /* remove successors */ ++ au_br_do_add(sb, add_branch, add_bindex); ++ sysaufs_brs_add(sb, add_bindex); /* append successors */ ++ dbgaufs_brs_add(sb, add_bindex, /*topdown*/0); /* rename successors */ ++ ++ h_dentry = add->path.dentry; ++ if (!add_bindex) { ++ au_cpup_attr_all(root_inode, /*force*/1); ++ sb->s_maxbytes = h_dentry->d_sb->s_maxbytes; ++ } else ++ au_add_nlink(root_inode, d_inode(h_dentry)); ++ ++out: ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static unsigned long long au_farray_cb(struct super_block *sb, void *a, ++ unsigned long long max __maybe_unused, ++ void *arg) ++{ ++ unsigned long long n; ++ struct file **p, *f; ++ struct hlist_bl_head *files; ++ struct hlist_bl_node *pos; ++ struct au_finfo *finfo; ++ ++ n = 0; ++ p = a; ++ files = &au_sbi(sb)->si_files; ++ hlist_bl_lock(files); ++ hlist_bl_for_each_entry(finfo, pos, files, fi_hlist) { ++ f = finfo->fi_file; ++ if (file_count(f) ++ && !special_file(file_inode(f)->i_mode)) { ++ get_file(f); ++ *p++ = f; ++ n++; ++ AuDebugOn(n > max); ++ } ++ } ++ hlist_bl_unlock(files); ++ ++ return n; ++} ++ ++static struct file **au_farray_alloc(struct super_block *sb, ++ unsigned long long *max) ++{ ++ struct au_sbinfo *sbi; ++ ++ sbi = au_sbi(sb); ++ *max = au_lcnt_read(&sbi->si_nfiles, /*do_rev*/1); ++ return au_array_alloc(max, au_farray_cb, sb, /*arg*/NULL); ++} ++ ++static void au_farray_free(struct file **a, unsigned long long max) ++{ ++ unsigned long long ull; ++ ++ for (ull = 0; ull < max; ull++) ++ if (a[ull]) ++ fput(a[ull]); ++ kvfree(a); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * delete a branch ++ */ ++ ++/* to show the line number, do not make it inlined function */ ++#define AuVerbose(do_info, fmt, ...) do { \ ++ if (do_info) \ ++ pr_info(fmt, ##__VA_ARGS__); \ ++} while (0) ++ ++static int au_test_ibusy(struct inode *inode, aufs_bindex_t btop, ++ aufs_bindex_t bbot) ++{ ++ return (inode && !S_ISDIR(inode->i_mode)) || btop == bbot; ++} ++ ++static int au_test_dbusy(struct dentry *dentry, aufs_bindex_t btop, ++ aufs_bindex_t bbot) ++{ ++ return au_test_ibusy(d_inode(dentry), btop, bbot); ++} ++ ++/* ++ * test if the branch is deletable or not. ++ */ ++static int test_dentry_busy(struct dentry *root, aufs_bindex_t bindex, ++ unsigned int sigen, const unsigned int verbose) ++{ ++ int err, i, j, ndentry; ++ aufs_bindex_t btop, bbot; ++ struct au_dcsub_pages dpages; ++ struct au_dpage *dpage; ++ struct dentry *d; ++ ++ err = au_dpages_init(&dpages, GFP_NOFS); ++ if (unlikely(err)) ++ goto out; ++ err = au_dcsub_pages(&dpages, root, NULL, NULL); ++ if (unlikely(err)) ++ goto out_dpages; ++ ++ for (i = 0; !err && i < dpages.ndpage; i++) { ++ dpage = dpages.dpages + i; ++ ndentry = dpage->ndentry; ++ for (j = 0; !err && j < ndentry; j++) { ++ d = dpage->dentries[j]; ++ AuDebugOn(au_dcount(d) <= 0); ++ if (!au_digen_test(d, sigen)) { ++ di_read_lock_child(d, AuLock_IR); ++ if (unlikely(au_dbrange_test(d))) { ++ di_read_unlock(d, AuLock_IR); ++ continue; ++ } ++ } else { ++ di_write_lock_child(d); ++ if (unlikely(au_dbrange_test(d))) { ++ di_write_unlock(d); ++ continue; ++ } ++ err = au_reval_dpath(d, sigen); ++ if (!err) ++ di_downgrade_lock(d, AuLock_IR); ++ else { ++ di_write_unlock(d); ++ break; ++ } ++ } ++ ++ /* AuDbgDentry(d); */ ++ btop = au_dbtop(d); ++ bbot = au_dbbot(d); ++ if (btop <= bindex ++ && bindex <= bbot ++ && au_h_dptr(d, bindex) ++ && au_test_dbusy(d, btop, bbot)) { ++ err = -EBUSY; ++ AuVerbose(verbose, "busy %pd\n", d); ++ AuDbgDentry(d); ++ } ++ di_read_unlock(d, AuLock_IR); ++ } ++ } ++ ++out_dpages: ++ au_dpages_free(&dpages); ++out: ++ return err; ++} ++ ++static int test_inode_busy(struct super_block *sb, aufs_bindex_t bindex, ++ unsigned int sigen, const unsigned int verbose) ++{ ++ int err; ++ unsigned long long max, ull; ++ struct inode *i, **array; ++ aufs_bindex_t btop, bbot; ++ ++ array = au_iarray_alloc(sb, &max); ++ err = PTR_ERR(array); ++ if (IS_ERR(array)) ++ goto out; ++ ++ err = 0; ++ AuDbg("b%d\n", bindex); ++ for (ull = 0; !err && ull < max; ull++) { ++ i = array[ull]; ++ if (unlikely(!i)) ++ break; ++ if (i->i_ino == AUFS_ROOT_INO) ++ continue; ++ ++ /* AuDbgInode(i); */ ++ if (au_iigen(i, NULL) == sigen) ++ ii_read_lock_child(i); ++ else { ++ ii_write_lock_child(i); ++ err = au_refresh_hinode_self(i); ++ au_iigen_dec(i); ++ if (!err) ++ ii_downgrade_lock(i); ++ else { ++ ii_write_unlock(i); ++ break; ++ } ++ } ++ ++ btop = au_ibtop(i); ++ bbot = au_ibbot(i); ++ if (btop <= bindex ++ && bindex <= bbot ++ && au_h_iptr(i, bindex) ++ && au_test_ibusy(i, btop, bbot)) { ++ err = -EBUSY; ++ AuVerbose(verbose, "busy i%lu\n", i->i_ino); ++ AuDbgInode(i); ++ } ++ ii_read_unlock(i); ++ } ++ au_iarray_free(array, max); ++ ++out: ++ return err; ++} ++ ++static int test_children_busy(struct dentry *root, aufs_bindex_t bindex, ++ const unsigned int verbose) ++{ ++ int err; ++ unsigned int sigen; ++ ++ sigen = au_sigen(root->d_sb); ++ DiMustNoWaiters(root); ++ IiMustNoWaiters(d_inode(root)); ++ di_write_unlock(root); ++ err = test_dentry_busy(root, bindex, sigen, verbose); ++ if (!err) ++ err = test_inode_busy(root->d_sb, bindex, sigen, verbose); ++ di_write_lock_child(root); /* aufs_write_lock() calls ..._child() */ ++ ++ return err; ++} ++ ++static int test_dir_busy(struct file *file, aufs_bindex_t br_id, ++ struct file **to_free, int *idx) ++{ ++ int err; ++ unsigned char matched, root; ++ aufs_bindex_t bindex, bbot; ++ struct au_fidir *fidir; ++ struct au_hfile *hfile; ++ ++ err = 0; ++ root = IS_ROOT(file->f_path.dentry); ++ if (root) { ++ get_file(file); ++ to_free[*idx] = file; ++ (*idx)++; ++ goto out; ++ } ++ ++ matched = 0; ++ fidir = au_fi(file)->fi_hdir; ++ AuDebugOn(!fidir); ++ bbot = au_fbbot_dir(file); ++ for (bindex = au_fbtop(file); bindex <= bbot; bindex++) { ++ hfile = fidir->fd_hfile + bindex; ++ if (!hfile->hf_file) ++ continue; ++ ++ if (hfile->hf_br->br_id == br_id) { ++ matched = 1; ++ break; ++ } ++ } ++ if (matched) ++ err = -EBUSY; ++ ++out: ++ return err; ++} ++ ++static int test_file_busy(struct super_block *sb, aufs_bindex_t br_id, ++ struct file **to_free, int opened) ++{ ++ int err, idx; ++ unsigned long long ull, max; ++ aufs_bindex_t btop; ++ struct file *file, **array; ++ struct dentry *root; ++ struct au_hfile *hfile; ++ ++ array = au_farray_alloc(sb, &max); ++ err = PTR_ERR(array); ++ if (IS_ERR(array)) ++ goto out; ++ ++ err = 0; ++ idx = 0; ++ root = sb->s_root; ++ di_write_unlock(root); ++ for (ull = 0; ull < max; ull++) { ++ file = array[ull]; ++ if (unlikely(!file)) ++ break; ++ ++ /* AuDbg("%pD\n", file); */ ++ fi_read_lock(file); ++ btop = au_fbtop(file); ++ if (!d_is_dir(file->f_path.dentry)) { ++ hfile = &au_fi(file)->fi_htop; ++ if (hfile->hf_br->br_id == br_id) ++ err = -EBUSY; ++ } else ++ err = test_dir_busy(file, br_id, to_free, &idx); ++ fi_read_unlock(file); ++ if (unlikely(err)) ++ break; ++ } ++ di_write_lock_child(root); ++ au_farray_free(array, max); ++ AuDebugOn(idx > opened); ++ ++out: ++ return err; ++} ++ ++static void br_del_file(struct file **to_free, unsigned long long opened, ++ aufs_bindex_t br_id) ++{ ++ unsigned long long ull; ++ aufs_bindex_t bindex, btop, bbot, bfound; ++ struct file *file; ++ struct au_fidir *fidir; ++ struct au_hfile *hfile; ++ ++ for (ull = 0; ull < opened; ull++) { ++ file = to_free[ull]; ++ if (unlikely(!file)) ++ break; ++ ++ /* AuDbg("%pD\n", file); */ ++ AuDebugOn(!d_is_dir(file->f_path.dentry)); ++ bfound = -1; ++ fidir = au_fi(file)->fi_hdir; ++ AuDebugOn(!fidir); ++ fi_write_lock(file); ++ btop = au_fbtop(file); ++ bbot = au_fbbot_dir(file); ++ for (bindex = btop; bindex <= bbot; bindex++) { ++ hfile = fidir->fd_hfile + bindex; ++ if (!hfile->hf_file) ++ continue; ++ ++ if (hfile->hf_br->br_id == br_id) { ++ bfound = bindex; ++ break; ++ } ++ } ++ AuDebugOn(bfound < 0); ++ au_set_h_fptr(file, bfound, NULL); ++ if (bfound == btop) { ++ for (btop++; btop <= bbot; btop++) ++ if (au_hf_dir(file, btop)) { ++ au_set_fbtop(file, btop); ++ break; ++ } ++ } ++ fi_write_unlock(file); ++ } ++} ++ ++static void au_br_do_del_brp(struct au_sbinfo *sbinfo, ++ const aufs_bindex_t bindex, ++ const aufs_bindex_t bbot) ++{ ++ struct au_branch **brp, **p; ++ ++ AuRwMustWriteLock(&sbinfo->si_rwsem); ++ ++ brp = sbinfo->si_branch + bindex; ++ if (bindex < bbot) ++ memmove(brp, brp + 1, sizeof(*brp) * (bbot - bindex)); ++ sbinfo->si_branch[0 + bbot] = NULL; ++ sbinfo->si_bbot--; ++ ++ p = au_krealloc(sbinfo->si_branch, sizeof(*p) * bbot, AuGFP_SBILIST, ++ /*may_shrink*/1); ++ if (p) ++ sbinfo->si_branch = p; ++ /* harmless error */ ++} ++ ++static void au_br_do_del_hdp(struct au_dinfo *dinfo, const aufs_bindex_t bindex, ++ const aufs_bindex_t bbot) ++{ ++ struct au_hdentry *hdp, *p; ++ ++ AuRwMustWriteLock(&dinfo->di_rwsem); ++ ++ hdp = au_hdentry(dinfo, bindex); ++ if (bindex < bbot) ++ memmove(hdp, hdp + 1, sizeof(*hdp) * (bbot - bindex)); ++ /* au_h_dentry_init(au_hdentry(dinfo, bbot); */ ++ dinfo->di_bbot--; ++ ++ p = au_krealloc(dinfo->di_hdentry, sizeof(*p) * bbot, AuGFP_SBILIST, ++ /*may_shrink*/1); ++ if (p) ++ dinfo->di_hdentry = p; ++ /* harmless error */ ++} ++ ++static void au_br_do_del_hip(struct au_iinfo *iinfo, const aufs_bindex_t bindex, ++ const aufs_bindex_t bbot) ++{ ++ struct au_hinode *hip, *p; ++ ++ AuRwMustWriteLock(&iinfo->ii_rwsem); ++ ++ hip = au_hinode(iinfo, bindex); ++ if (bindex < bbot) ++ memmove(hip, hip + 1, sizeof(*hip) * (bbot - bindex)); ++ /* au_hinode_init(au_hinode(iinfo, bbot)); */ ++ iinfo->ii_bbot--; ++ ++ p = au_krealloc(iinfo->ii_hinode, sizeof(*p) * bbot, AuGFP_SBILIST, ++ /*may_shrink*/1); ++ if (p) ++ iinfo->ii_hinode = p; ++ /* harmless error */ ++} ++ ++static void au_br_do_del(struct super_block *sb, aufs_bindex_t bindex, ++ struct au_branch *br) ++{ ++ aufs_bindex_t bbot; ++ struct au_sbinfo *sbinfo; ++ struct dentry *root, *h_root; ++ struct inode *inode, *h_inode; ++ struct au_hinode *hinode; ++ ++ SiMustWriteLock(sb); ++ ++ root = sb->s_root; ++ inode = d_inode(root); ++ sbinfo = au_sbi(sb); ++ bbot = sbinfo->si_bbot; ++ ++ h_root = au_h_dptr(root, bindex); ++ hinode = au_hi(inode, bindex); ++ h_inode = au_igrab(hinode->hi_inode); ++ au_hiput(hinode); ++ ++ au_sbilist_lock(); ++ au_br_do_del_brp(sbinfo, bindex, bbot); ++ au_br_do_del_hdp(au_di(root), bindex, bbot); ++ au_br_do_del_hip(au_ii(inode), bindex, bbot); ++ au_sbilist_unlock(); ++ ++ /* ignore an error */ ++ au_dr_br_fin(sb, br); /* always, regardless the mount option */ ++ ++ dput(h_root); ++ iput(h_inode); ++ au_br_do_free(br); ++} ++ ++static unsigned long long empty_cb(struct super_block *sb, void *array, ++ unsigned long long max, void *arg) ++{ ++ return max; ++} ++ ++int au_br_del(struct super_block *sb, struct au_opt_del *del, int remount) ++{ ++ int err, rerr, i; ++ unsigned long long opened; ++ unsigned int mnt_flags; ++ aufs_bindex_t bindex, bbot, br_id; ++ unsigned char do_wh, verbose; ++ struct au_branch *br; ++ struct au_wbr *wbr; ++ struct dentry *root; ++ struct file **to_free; ++ ++ err = 0; ++ opened = 0; ++ to_free = NULL; ++ root = sb->s_root; ++ bindex = au_find_dbindex(root, del->h_path.dentry); ++ if (bindex < 0) { ++ if (remount) ++ goto out; /* success */ ++ err = -ENOENT; ++ pr_err("%s no such branch\n", del->pathname); ++ goto out; ++ } ++ AuDbg("bindex b%d\n", bindex); ++ ++ err = -EBUSY; ++ mnt_flags = au_mntflags(sb); ++ verbose = !!au_opt_test(mnt_flags, VERBOSE); ++ bbot = au_sbbot(sb); ++ if (unlikely(!bbot)) { ++ AuVerbose(verbose, "no more branches left\n"); ++ goto out; ++ } ++ ++ br = au_sbr(sb, bindex); ++ AuDebugOn(!path_equal(&br->br_path, &del->h_path)); ++ if (unlikely(au_lcnt_read(&br->br_count, /*do_rev*/1))) { ++ AuVerbose(verbose, "br %pd2 is busy now\n", del->h_path.dentry); ++ goto out; ++ } ++ ++ br_id = br->br_id; ++ opened = au_lcnt_read(&br->br_nfiles, /*do_rev*/1); ++ if (unlikely(opened)) { ++ to_free = au_array_alloc(&opened, empty_cb, sb, NULL); ++ err = PTR_ERR(to_free); ++ if (IS_ERR(to_free)) ++ goto out; ++ ++ err = test_file_busy(sb, br_id, to_free, opened); ++ if (unlikely(err)) { ++ AuVerbose(verbose, "%llu file(s) opened\n", opened); ++ goto out; ++ } ++ } ++ ++ wbr = br->br_wbr; ++ do_wh = wbr && (wbr->wbr_whbase || wbr->wbr_plink || wbr->wbr_orph); ++ if (do_wh) { ++ /* instead of WbrWhMustWriteLock(wbr) */ ++ SiMustWriteLock(sb); ++ for (i = 0; i < AuBrWh_Last; i++) { ++ dput(wbr->wbr_wh[i]); ++ wbr->wbr_wh[i] = NULL; ++ } ++ } ++ ++ err = test_children_busy(root, bindex, verbose); ++ if (unlikely(err)) { ++ if (do_wh) ++ goto out_wh; ++ goto out; ++ } ++ ++ err = 0; ++ if (to_free) { ++ /* ++ * now we confirmed the branch is deletable. ++ * let's free the remaining opened dirs on the branch. ++ */ ++ di_write_unlock(root); ++ br_del_file(to_free, opened, br_id); ++ di_write_lock_child(root); ++ } ++ ++ sysaufs_brs_del(sb, bindex); /* remove successors */ ++ dbgaufs_xino_del(br); /* remove one */ ++ au_br_do_del(sb, bindex, br); ++ sysaufs_brs_add(sb, bindex); /* append successors */ ++ dbgaufs_brs_add(sb, bindex, /*topdown*/1); /* rename successors */ ++ ++ if (!bindex) { ++ au_cpup_attr_all(d_inode(root), /*force*/1); ++ sb->s_maxbytes = au_sbr_sb(sb, 0)->s_maxbytes; ++ } else ++ au_sub_nlink(d_inode(root), d_inode(del->h_path.dentry)); ++ if (au_opt_test(mnt_flags, PLINK)) ++ au_plink_half_refresh(sb, br_id); ++ ++ goto out; /* success */ ++ ++out_wh: ++ /* revert */ ++ rerr = au_br_init_wh(sb, br, br->br_perm); ++ if (rerr) ++ pr_warn("failed re-creating base whiteout, %s. (%d)\n", ++ del->pathname, rerr); ++out: ++ if (to_free) ++ au_farray_free(to_free, opened); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int au_ibusy(struct super_block *sb, struct aufs_ibusy __user *arg) ++{ ++ int err; ++ aufs_bindex_t btop, bbot; ++ struct aufs_ibusy ibusy; ++ struct inode *inode, *h_inode; ++ ++ err = -EPERM; ++ if (unlikely(!capable(CAP_SYS_ADMIN))) ++ goto out; ++ ++ err = copy_from_user(&ibusy, arg, sizeof(ibusy)); ++ if (!err) ++ /* VERIFY_WRITE */ ++ err = !access_ok(&arg->h_ino, sizeof(arg->h_ino)); ++ if (unlikely(err)) { ++ err = -EFAULT; ++ AuTraceErr(err); ++ goto out; ++ } ++ ++ err = -EINVAL; ++ si_read_lock(sb, AuLock_FLUSH); ++ if (unlikely(ibusy.bindex < 0 || ibusy.bindex > au_sbbot(sb))) ++ goto out_unlock; ++ ++ err = 0; ++ ibusy.h_ino = 0; /* invalid */ ++ inode = ilookup(sb, ibusy.ino); ++ if (!inode ++ || inode->i_ino == AUFS_ROOT_INO ++ || au_is_bad_inode(inode)) ++ goto out_unlock; ++ ++ ii_read_lock_child(inode); ++ btop = au_ibtop(inode); ++ bbot = au_ibbot(inode); ++ if (btop <= ibusy.bindex && ibusy.bindex <= bbot) { ++ h_inode = au_h_iptr(inode, ibusy.bindex); ++ if (h_inode && au_test_ibusy(inode, btop, bbot)) ++ ibusy.h_ino = h_inode->i_ino; ++ } ++ ii_read_unlock(inode); ++ iput(inode); ++ ++out_unlock: ++ si_read_unlock(sb); ++ if (!err) { ++ err = __put_user(ibusy.h_ino, &arg->h_ino); ++ if (unlikely(err)) { ++ err = -EFAULT; ++ AuTraceErr(err); ++ } ++ } ++out: ++ return err; ++} ++ ++long au_ibusy_ioctl(struct file *file, unsigned long arg) ++{ ++ return au_ibusy(file->f_path.dentry->d_sb, (void __user *)arg); ++} ++ ++#ifdef CONFIG_COMPAT ++long au_ibusy_compat_ioctl(struct file *file, unsigned long arg) ++{ ++ return au_ibusy(file->f_path.dentry->d_sb, compat_ptr(arg)); ++} ++#endif ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * change a branch permission ++ */ ++ ++static void au_warn_ima(void) ++{ ++#ifdef CONFIG_IMA ++ /* since it doesn't support mark_files_ro() */ ++ AuWarn1("RW -> RO makes IMA to produce wrong message\n"); ++#endif ++} ++ ++static int do_need_sigen_inc(int a, int b) ++{ ++ return au_br_whable(a) && !au_br_whable(b); ++} ++ ++static int need_sigen_inc(int old, int new) ++{ ++ return do_need_sigen_inc(old, new) ++ || do_need_sigen_inc(new, old); ++} ++ ++static int au_br_mod_files_ro(struct super_block *sb, aufs_bindex_t bindex) ++{ ++ int err, do_warn; ++ unsigned int mnt_flags; ++ unsigned long long ull, max; ++ aufs_bindex_t br_id; ++ unsigned char verbose, writer; ++ struct file *file, *hf, **array; ++ struct au_hfile *hfile; ++ struct inode *h_inode; ++ ++ mnt_flags = au_mntflags(sb); ++ verbose = !!au_opt_test(mnt_flags, VERBOSE); ++ ++ array = au_farray_alloc(sb, &max); ++ err = PTR_ERR(array); ++ if (IS_ERR(array)) ++ goto out; ++ ++ do_warn = 0; ++ br_id = au_sbr_id(sb, bindex); ++ for (ull = 0; ull < max; ull++) { ++ file = array[ull]; ++ if (unlikely(!file)) ++ break; ++ ++ /* AuDbg("%pD\n", file); */ ++ fi_read_lock(file); ++ if (unlikely(au_test_mmapped(file))) { ++ err = -EBUSY; ++ AuVerbose(verbose, "mmapped %pD\n", file); ++ AuDbgFile(file); ++ FiMustNoWaiters(file); ++ fi_read_unlock(file); ++ goto out_array; ++ } ++ ++ hfile = &au_fi(file)->fi_htop; ++ hf = hfile->hf_file; ++ if (!d_is_reg(file->f_path.dentry) ++ || !(file->f_mode & FMODE_WRITE) ++ || hfile->hf_br->br_id != br_id ++ || !(hf->f_mode & FMODE_WRITE)) ++ array[ull] = NULL; ++ else { ++ do_warn = 1; ++ get_file(file); ++ } ++ ++ FiMustNoWaiters(file); ++ fi_read_unlock(file); ++ fput(file); ++ } ++ ++ err = 0; ++ if (do_warn) ++ au_warn_ima(); ++ ++ for (ull = 0; ull < max; ull++) { ++ file = array[ull]; ++ if (!file) ++ continue; ++ ++ /* todo: already flushed? */ ++ /* ++ * fs/super.c:mark_files_ro() is gone, but aufs keeps its ++ * approach which resets f_mode and calls mnt_drop_write() and ++ * file_release_write() for each file, because the branch ++ * attribute in aufs world is totally different from the native ++ * fs rw/ro mode. ++ */ ++ /* fi_read_lock(file); */ ++ hfile = &au_fi(file)->fi_htop; ++ hf = hfile->hf_file; ++ /* fi_read_unlock(file); */ ++ spin_lock(&hf->f_lock); ++ writer = !!(hf->f_mode & FMODE_WRITER); ++ hf->f_mode &= ~(FMODE_WRITE | FMODE_WRITER); ++ spin_unlock(&hf->f_lock); ++ if (writer) { ++ h_inode = file_inode(hf); ++ if (hf->f_mode & FMODE_READ) ++ i_readcount_inc(h_inode); ++ put_write_access(h_inode); ++ __mnt_drop_write(hf->f_path.mnt); ++ } ++ } ++ ++out_array: ++ au_farray_free(array, max); ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++int au_br_mod(struct super_block *sb, struct au_opt_mod *mod, int remount, ++ int *do_refresh) ++{ ++ int err, rerr; ++ aufs_bindex_t bindex; ++ struct dentry *root; ++ struct au_branch *br; ++ struct au_br_fhsm *bf; ++ ++ root = sb->s_root; ++ bindex = au_find_dbindex(root, mod->h_root); ++ if (bindex < 0) { ++ if (remount) ++ return 0; /* success */ ++ err = -ENOENT; ++ pr_err("%s no such branch\n", mod->path); ++ goto out; ++ } ++ AuDbg("bindex b%d\n", bindex); ++ ++ err = test_br(d_inode(mod->h_root), mod->perm, mod->path); ++ if (unlikely(err)) ++ goto out; ++ ++ br = au_sbr(sb, bindex); ++ AuDebugOn(mod->h_root != au_br_dentry(br)); ++ if (br->br_perm == mod->perm) ++ return 0; /* success */ ++ ++ /* pre-allocate for non-fhsm --> fhsm */ ++ bf = NULL; ++ if (!au_br_fhsm(br->br_perm) && au_br_fhsm(mod->perm)) { ++ err = au_fhsm_br_alloc(br); ++ if (unlikely(err)) ++ goto out; ++ bf = br->br_fhsm; ++ br->br_fhsm = NULL; ++ } ++ ++ if (au_br_writable(br->br_perm)) { ++ /* remove whiteout base */ ++ err = au_br_init_wh(sb, br, mod->perm); ++ if (unlikely(err)) ++ goto out_bf; ++ ++ if (!au_br_writable(mod->perm)) { ++ /* rw --> ro, file might be mmapped */ ++ DiMustNoWaiters(root); ++ IiMustNoWaiters(d_inode(root)); ++ di_write_unlock(root); ++ err = au_br_mod_files_ro(sb, bindex); ++ /* aufs_write_lock() calls ..._child() */ ++ di_write_lock_child(root); ++ ++ if (unlikely(err)) { ++ rerr = -ENOMEM; ++ br->br_wbr = kzalloc(sizeof(*br->br_wbr), ++ GFP_NOFS); ++ if (br->br_wbr) ++ rerr = au_wbr_init(br, sb, br->br_perm); ++ if (unlikely(rerr)) { ++ AuIOErr("nested error %d (%d)\n", ++ rerr, err); ++ br->br_perm = mod->perm; ++ } ++ } ++ } ++ } else if (au_br_writable(mod->perm)) { ++ /* ro --> rw */ ++ err = -ENOMEM; ++ br->br_wbr = kzalloc(sizeof(*br->br_wbr), GFP_NOFS); ++ if (br->br_wbr) { ++ err = au_wbr_init(br, sb, mod->perm); ++ if (unlikely(err)) { ++ au_kfree_rcu(br->br_wbr); ++ br->br_wbr = NULL; ++ } ++ } ++ } ++ if (unlikely(err)) ++ goto out_bf; ++ ++ if (au_br_fhsm(br->br_perm)) { ++ if (!au_br_fhsm(mod->perm)) { ++ /* fhsm --> non-fhsm */ ++ au_br_fhsm_fin(br->br_fhsm); ++ au_kfree_rcu(br->br_fhsm); ++ br->br_fhsm = NULL; ++ } ++ } else if (au_br_fhsm(mod->perm)) ++ /* non-fhsm --> fhsm */ ++ br->br_fhsm = bf; ++ ++ *do_refresh |= need_sigen_inc(br->br_perm, mod->perm); ++ br->br_perm = mod->perm; ++ goto out; /* success */ ++ ++out_bf: ++ au_kfree_try_rcu(bf); ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++int au_br_stfs(struct au_branch *br, struct aufs_stfs *stfs) ++{ ++ int err; ++ struct kstatfs kstfs; ++ ++ err = vfs_statfs(&br->br_path, &kstfs); ++ if (!err) { ++ stfs->f_blocks = kstfs.f_blocks; ++ stfs->f_bavail = kstfs.f_bavail; ++ stfs->f_files = kstfs.f_files; ++ stfs->f_ffree = kstfs.f_ffree; ++ } ++ ++ return err; ++} +diff --git a/fs/aufs/branch.h b/fs/aufs/branch.h +new file mode 100644 +index 000000000000..6818ba8df8a2 +--- /dev/null ++++ b/fs/aufs/branch.h +@@ -0,0 +1,375 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * branch filesystems and xino for them ++ */ ++ ++#ifndef __AUFS_BRANCH_H__ ++#define __AUFS_BRANCH_H__ ++ ++#ifdef __KERNEL__ ++ ++#include <linux/mount.h> ++#include "dirren.h" ++#include "dynop.h" ++#include "lcnt.h" ++#include "rwsem.h" ++#include "super.h" ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* a xino file */ ++struct au_xino { ++ struct file **xi_file; ++ unsigned int xi_nfile; ++ ++ struct { ++ spinlock_t spin; ++ ino_t *array; ++ int total; ++ /* reserved for future use */ ++ /* unsigned long *bitmap; */ ++ wait_queue_head_t wqh; ++ } xi_nondir; ++ ++ struct mutex xi_mtx; /* protects xi_file array */ ++ struct hlist_bl_head xi_writing; ++ ++ atomic_t xi_truncating; ++ ++ struct kref xi_kref; ++}; ++ ++/* File-based Hierarchical Storage Management */ ++struct au_br_fhsm { ++#ifdef CONFIG_AUFS_FHSM ++ struct mutex bf_lock; ++ unsigned long bf_jiffy; ++ struct aufs_stfs bf_stfs; ++ int bf_readable; ++#endif ++}; ++ ++/* members for writable branch only */ ++enum {AuBrWh_BASE, AuBrWh_PLINK, AuBrWh_ORPH, AuBrWh_Last}; ++struct au_wbr { ++ struct au_rwsem wbr_wh_rwsem; ++ struct dentry *wbr_wh[AuBrWh_Last]; ++ atomic_t wbr_wh_running; ++#define wbr_whbase wbr_wh[AuBrWh_BASE] /* whiteout base */ ++#define wbr_plink wbr_wh[AuBrWh_PLINK] /* pseudo-link dir */ ++#define wbr_orph wbr_wh[AuBrWh_ORPH] /* dir for orphans */ ++ ++ /* mfs mode */ ++ unsigned long long wbr_bytes; ++}; ++ ++/* ext2 has 3 types of operations at least, ext3 has 4 */ ++#define AuBrDynOp (AuDyLast * 4) ++ ++#ifdef CONFIG_AUFS_HFSNOTIFY ++/* support for asynchronous destruction */ ++struct au_br_hfsnotify { ++ struct fsnotify_group *hfsn_group; ++}; ++#endif ++ ++/* sysfs entries */ ++struct au_brsysfs { ++ char name[16]; ++ struct attribute attr; ++}; ++ ++enum { ++ AuBrSysfs_BR, ++ AuBrSysfs_BRID, ++ AuBrSysfs_Last ++}; ++ ++/* protected by superblock rwsem */ ++struct au_branch { ++ struct au_xino *br_xino; ++ ++ aufs_bindex_t br_id; ++ ++ int br_perm; ++ struct path br_path; ++ spinlock_t br_dykey_lock; ++ struct au_dykey *br_dykey[AuBrDynOp]; ++ au_lcnt_t br_nfiles; /* opened files */ ++ au_lcnt_t br_count; /* in-use for other */ ++ ++ struct au_wbr *br_wbr; ++ struct au_br_fhsm *br_fhsm; ++ ++#ifdef CONFIG_AUFS_HFSNOTIFY ++ struct au_br_hfsnotify *br_hfsn; ++#endif ++ ++#ifdef CONFIG_SYSFS ++ /* entries under sysfs per mount-point */ ++ struct au_brsysfs br_sysfs[AuBrSysfs_Last]; ++#endif ++ ++#ifdef CONFIG_DEBUG_FS ++ struct dentry *br_dbgaufs; /* xino */ ++#endif ++ ++ struct au_dr_br br_dirren; ++}; ++ ++/* ---------------------------------------------------------------------- */ ++ ++static inline struct vfsmount *au_br_mnt(struct au_branch *br) ++{ ++ return br->br_path.mnt; ++} ++ ++static inline struct dentry *au_br_dentry(struct au_branch *br) ++{ ++ return br->br_path.dentry; ++} ++ ++static inline struct mnt_idmap *au_br_idmap(struct au_branch *br) ++{ ++ return mnt_idmap(br->br_path.mnt); ++} ++ ++static inline struct super_block *au_br_sb(struct au_branch *br) ++{ ++ return au_br_mnt(br)->mnt_sb; ++} ++ ++static inline int au_br_rdonly(struct au_branch *br) ++{ ++ return (sb_rdonly(au_br_sb(br)) ++ || !au_br_writable(br->br_perm)) ++ ? -EROFS : 0; ++} ++ ++static inline int au_br_hnotifyable(int brperm __maybe_unused) ++{ ++#ifdef CONFIG_AUFS_HNOTIFY ++ return !(brperm & AuBrPerm_RR); ++#else ++ return 0; ++#endif ++} ++ ++static inline int au_br_test_oflag(int oflag, struct au_branch *br) ++{ ++ int err, exec_flag; ++ ++ err = 0; ++ exec_flag = oflag & __FMODE_EXEC; ++ if (unlikely(exec_flag && path_noexec(&br->br_path))) ++ err = -EACCES; ++ ++ return err; ++} ++ ++static inline void au_xino_get(struct au_branch *br) ++{ ++ struct au_xino *xi; ++ ++ xi = br->br_xino; ++ if (xi) ++ kref_get(&xi->xi_kref); ++} ++ ++static inline int au_xino_count(struct au_branch *br) ++{ ++ int v; ++ struct au_xino *xi; ++ ++ v = 0; ++ xi = br->br_xino; ++ if (xi) ++ v = kref_read(&xi->xi_kref); ++ ++ return v; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* branch.c */ ++struct au_sbinfo; ++void au_br_free(struct au_sbinfo *sinfo); ++int au_br_index(struct super_block *sb, aufs_bindex_t br_id); ++struct au_opt_add; ++int au_br_add(struct super_block *sb, struct au_opt_add *add, int remount); ++struct au_opt_del; ++int au_br_del(struct super_block *sb, struct au_opt_del *del, int remount); ++long au_ibusy_ioctl(struct file *file, unsigned long arg); ++#ifdef CONFIG_COMPAT ++long au_ibusy_compat_ioctl(struct file *file, unsigned long arg); ++#endif ++struct au_opt_mod; ++int au_br_mod(struct super_block *sb, struct au_opt_mod *mod, int remount, ++ int *do_refresh); ++struct aufs_stfs; ++int au_br_stfs(struct au_branch *br, struct aufs_stfs *stfs); ++ ++/* xino.c */ ++static const loff_t au_loff_max = LLONG_MAX; ++ ++aufs_bindex_t au_xi_root(struct super_block *sb, struct dentry *dentry); ++struct file *au_xino_create(struct super_block *sb, char *fpath, int silent, ++ int wbrtop); ++struct file *au_xino_create2(struct super_block *sb, struct path *base, ++ struct file *copy_src); ++struct au_xi_new { ++ struct au_xino *xi; /* switch between xino and xigen */ ++ int idx; ++ struct path *base; ++ struct file *copy_src; ++}; ++struct file *au_xi_new(struct super_block *sb, struct au_xi_new *xinew); ++ ++int au_xino_read(struct super_block *sb, aufs_bindex_t bindex, ino_t h_ino, ++ ino_t *ino); ++int au_xino_write(struct super_block *sb, aufs_bindex_t bindex, ino_t h_ino, ++ ino_t ino); ++ssize_t xino_fread(struct file *file, void *buf, size_t size, loff_t *pos); ++ssize_t xino_fwrite(struct file *file, void *buf, size_t size, loff_t *pos); ++ ++int au_xib_trunc(struct super_block *sb); ++int au_xino_trunc(struct super_block *sb, aufs_bindex_t bindex, int idx_begin); ++ ++struct au_xino *au_xino_alloc(unsigned int nfile); ++int au_xino_put(struct au_branch *br); ++struct file *au_xino_file1(struct au_xino *xi); ++ ++struct au_opt_xino; ++void au_xino_clr(struct super_block *sb); ++int au_xino_set(struct super_block *sb, struct au_opt_xino *xiopt, int remount); ++struct file *au_xino_def(struct super_block *sb); ++int au_xino_init_br(struct super_block *sb, struct au_branch *br, ino_t hino, ++ struct path *base); ++ ++ino_t au_xino_new_ino(struct super_block *sb); ++void au_xino_delete_inode(struct inode *inode, const int unlinked); ++ ++void au_xinondir_leave(struct super_block *sb, aufs_bindex_t bindex, ++ ino_t h_ino, int idx); ++int au_xinondir_enter(struct super_block *sb, aufs_bindex_t bindex, ino_t h_ino, ++ int *idx); ++ ++int au_xino_path(struct seq_file *seq, struct file *file); ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* @idx is signed to accept -1 meaning the first file */ ++static inline struct file *au_xino_file(struct au_xino *xi, int idx) ++{ ++ struct file *file; ++ ++ file = NULL; ++ if (!xi) ++ goto out; ++ ++ if (idx >= 0) { ++ if (idx < xi->xi_nfile) ++ file = xi->xi_file[idx]; ++ } else ++ file = au_xino_file1(xi); ++ ++out: ++ return file; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* Superblock to branch */ ++static inline ++aufs_bindex_t au_sbr_id(struct super_block *sb, aufs_bindex_t bindex) ++{ ++ return au_sbr(sb, bindex)->br_id; ++} ++ ++static inline ++struct vfsmount *au_sbr_mnt(struct super_block *sb, aufs_bindex_t bindex) ++{ ++ return au_br_mnt(au_sbr(sb, bindex)); ++} ++ ++static inline ++struct mnt_idmap *au_sbr_idmap(struct super_block *sb, aufs_bindex_t bindex) ++{ ++ return au_br_idmap(au_sbr(sb, bindex)); ++} ++ ++static inline ++struct super_block *au_sbr_sb(struct super_block *sb, aufs_bindex_t bindex) ++{ ++ return au_br_sb(au_sbr(sb, bindex)); ++} ++ ++static inline int au_sbr_perm(struct super_block *sb, aufs_bindex_t bindex) ++{ ++ return au_sbr(sb, bindex)->br_perm; ++} ++ ++static inline int au_sbr_whable(struct super_block *sb, aufs_bindex_t bindex) ++{ ++ return au_br_whable(au_sbr_perm(sb, bindex)); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++#define wbr_wh_read_lock(wbr) au_rw_read_lock(&(wbr)->wbr_wh_rwsem) ++#define wbr_wh_write_lock(wbr) au_rw_write_lock(&(wbr)->wbr_wh_rwsem) ++#define wbr_wh_read_trylock(wbr) au_rw_read_trylock(&(wbr)->wbr_wh_rwsem) ++#define wbr_wh_write_trylock(wbr) au_rw_write_trylock(&(wbr)->wbr_wh_rwsem) ++/* ++#define wbr_wh_read_trylock_nested(wbr) \ ++ au_rw_read_trylock_nested(&(wbr)->wbr_wh_rwsem) ++#define wbr_wh_write_trylock_nested(wbr) \ ++ au_rw_write_trylock_nested(&(wbr)->wbr_wh_rwsem) ++*/ ++ ++#define wbr_wh_read_unlock(wbr) au_rw_read_unlock(&(wbr)->wbr_wh_rwsem) ++#define wbr_wh_write_unlock(wbr) au_rw_write_unlock(&(wbr)->wbr_wh_rwsem) ++#define wbr_wh_downgrade_lock(wbr) au_rw_dgrade_lock(&(wbr)->wbr_wh_rwsem) ++ ++#define WbrWhMustNoWaiters(wbr) AuRwMustNoWaiters(&(wbr)->wbr_wh_rwsem) ++#define WbrWhMustAnyLock(wbr) AuRwMustAnyLock(&(wbr)->wbr_wh_rwsem) ++#define WbrWhMustWriteLock(wbr) AuRwMustWriteLock(&(wbr)->wbr_wh_rwsem) ++ ++/* ---------------------------------------------------------------------- */ ++ ++#ifdef CONFIG_AUFS_FHSM ++static inline void au_br_fhsm_init(struct au_br_fhsm *brfhsm) ++{ ++ mutex_init(&brfhsm->bf_lock); ++ brfhsm->bf_jiffy = 0; ++ brfhsm->bf_readable = 0; ++} ++ ++static inline void au_br_fhsm_fin(struct au_br_fhsm *brfhsm) ++{ ++ mutex_destroy(&brfhsm->bf_lock); ++} ++#else ++AuStubVoid(au_br_fhsm_init, struct au_br_fhsm *brfhsm) ++AuStubVoid(au_br_fhsm_fin, struct au_br_fhsm *brfhsm) ++#endif ++ ++#endif /* __KERNEL__ */ ++#endif /* __AUFS_BRANCH_H__ */ +diff --git a/fs/aufs/conf.mk b/fs/aufs/conf.mk +new file mode 100644 +index 000000000000..12782f8e0f38 +--- /dev/null ++++ b/fs/aufs/conf.mk +@@ -0,0 +1,40 @@ ++# SPDX-License-Identifier: GPL-2.0 ++ ++AuConfStr = CONFIG_AUFS_FS=${CONFIG_AUFS_FS} ++ ++define AuConf ++ifdef ${1} ++AuConfStr += ${1}=${${1}} ++endif ++endef ++ ++AuConfAll = BRANCH_MAX_127 BRANCH_MAX_511 BRANCH_MAX_1023 BRANCH_MAX_32767 \ ++ SBILIST \ ++ HNOTIFY HFSNOTIFY \ ++ EXPORT INO_T_64 \ ++ XATTR \ ++ FHSM \ ++ RDU \ ++ DIRREN \ ++ SHWH \ ++ BR_RAMFS \ ++ BR_FUSE POLL \ ++ BR_HFSPLUS \ ++ BDEV_LOOP \ ++ DEBUG MAGIC_SYSRQ ++$(foreach i, ${AuConfAll}, \ ++ $(eval $(call AuConf,CONFIG_AUFS_${i}))) ++ ++AuConfName = ${obj}/conf.str ++${AuConfName}.tmp: FORCE ++ @echo ${AuConfStr} | tr ' ' '\n' | sed -e 's/^/"/' -e 's/$$/\\n"/' > $@ ++${AuConfName}: ${AuConfName}.tmp ++ @diff -q $< $@ > /dev/null 2>&1 || { \ ++ echo ' GEN ' $@; \ ++ cp -p $< $@; \ ++ } ++FORCE: ++clean-files += ${AuConfName} ${AuConfName}.tmp ++${obj}/sysfs.o: ${AuConfName} ++ ++-include ${srctree}/${src}/conf_priv.mk +diff --git a/fs/aufs/cpup.c b/fs/aufs/cpup.c +new file mode 100644 +index 000000000000..8c8bd5f7b28d +--- /dev/null ++++ b/fs/aufs/cpup.c +@@ -0,0 +1,1459 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * copy-up functions, see wbr_policy.c for copy-down ++ */ ++ ++#include <linux/fs_stack.h> ++#include <linux/mm.h> ++#include <linux/task_work.h> ++#include "aufs.h" ++ ++void au_cpup_attr_flags(struct inode *dst, unsigned int iflags) ++{ ++ const unsigned int mask = S_DEAD | S_SWAPFILE | S_PRIVATE ++ | S_NOATIME | S_NOCMTIME | S_AUTOMOUNT; ++ ++ BUILD_BUG_ON(sizeof(iflags) != sizeof(dst->i_flags)); ++ ++ dst->i_flags |= iflags & ~mask; ++ if (au_test_fs_notime(dst->i_sb)) ++ dst->i_flags |= S_NOATIME | S_NOCMTIME; ++} ++ ++void au_cpup_attr_timesizes(struct inode *inode) ++{ ++ struct inode *h_inode; ++ ++ h_inode = au_h_iptr(inode, au_ibtop(inode)); ++ fsstack_copy_attr_times(inode, h_inode); ++ fsstack_copy_inode_size(inode, h_inode); ++} ++ ++void au_cpup_attr_nlink(struct inode *inode, int force) ++{ ++ struct inode *h_inode; ++ struct super_block *sb; ++ aufs_bindex_t bindex, bbot; ++ ++ sb = inode->i_sb; ++ bindex = au_ibtop(inode); ++ h_inode = au_h_iptr(inode, bindex); ++ if (!force ++ && !S_ISDIR(h_inode->i_mode) ++ && au_opt_test(au_mntflags(sb), PLINK) ++ && au_plink_test(inode)) ++ return; ++ ++ /* ++ * 0 can happen in revalidating. ++ * h_inode->i_mutex may not be held here, but it is harmless since once ++ * i_nlink reaches 0, it will never become positive except O_TMPFILE ++ * case. ++ * todo: O_TMPFILE+linkat(AT_SYMLINK_FOLLOW) bypassing aufs may cause ++ * the incorrect link count. ++ */ ++ set_nlink(inode, h_inode->i_nlink); ++ ++ /* ++ * fewer nlink makes find(1) noisy, but larger nlink doesn't. ++ * it may includes whplink directory. ++ */ ++ if (S_ISDIR(h_inode->i_mode)) { ++ bbot = au_ibbot(inode); ++ for (bindex++; bindex <= bbot; bindex++) { ++ h_inode = au_h_iptr(inode, bindex); ++ if (h_inode) ++ au_add_nlink(inode, h_inode); ++ } ++ } ++} ++ ++void au_cpup_attr_changeable(struct inode *inode) ++{ ++ struct inode *h_inode; ++ ++ h_inode = au_h_iptr(inode, au_ibtop(inode)); ++ inode->i_mode = h_inode->i_mode; ++ inode->i_uid = h_inode->i_uid; ++ inode->i_gid = h_inode->i_gid; ++ au_cpup_attr_timesizes(inode); ++ au_cpup_attr_flags(inode, h_inode->i_flags); ++} ++ ++void au_cpup_igen(struct inode *inode, struct inode *h_inode) ++{ ++ struct au_iinfo *iinfo = au_ii(inode); ++ ++ IiMustWriteLock(inode); ++ ++ iinfo->ii_higen = h_inode->i_generation; ++ iinfo->ii_hsb1 = h_inode->i_sb; ++} ++ ++void au_cpup_attr_all(struct inode *inode, int force) ++{ ++ struct inode *h_inode; ++ ++ h_inode = au_h_iptr(inode, au_ibtop(inode)); ++ au_cpup_attr_changeable(inode); ++ if (inode->i_nlink > 0) ++ au_cpup_attr_nlink(inode, force); ++ inode->i_rdev = h_inode->i_rdev; ++ inode->i_blkbits = h_inode->i_blkbits; ++ au_cpup_igen(inode, h_inode); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* Note: dt_dentry and dt_h_dentry are not dget/dput-ed */ ++ ++/* keep the timestamps of the parent dir when cpup */ ++void au_dtime_store(struct au_dtime *dt, struct dentry *dentry, ++ struct path *h_path) ++{ ++ struct inode *h_inode; ++ ++ dt->dt_dentry = dentry; ++ dt->dt_h_path = *h_path; ++ h_inode = d_inode(h_path->dentry); ++ dt->dt_atime = h_inode->i_atime; ++ dt->dt_mtime = h_inode->i_mtime; ++ /* smp_mb(); */ ++} ++ ++void au_dtime_revert(struct au_dtime *dt) ++{ ++ struct iattr attr; ++ int err; ++ ++ attr.ia_atime = dt->dt_atime; ++ attr.ia_mtime = dt->dt_mtime; ++ attr.ia_valid = ATTR_FORCE | ATTR_MTIME | ATTR_MTIME_SET ++ | ATTR_ATIME | ATTR_ATIME_SET; ++ ++ /* no delegation since this is a directory */ ++ err = vfsub_notify_change(&dt->dt_h_path, &attr, /*delegated*/NULL); ++ if (unlikely(err)) ++ pr_warn("restoring timestamps failed(%d). ignored\n", err); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* internal use only */ ++struct au_cpup_reg_attr { ++ int valid; ++ struct kstat st; ++ unsigned int iflags; /* inode->i_flags */ ++}; ++ ++static noinline_for_stack ++int cpup_iattr(struct dentry *dst, aufs_bindex_t bindex, struct path *h_src, ++ struct au_cpup_reg_attr *h_src_attr) ++{ ++ int err, sbits, icex; ++ unsigned int mnt_flags; ++ unsigned char verbose; ++ struct iattr ia; ++ struct path h_path; ++ struct inode *h_isrc, *h_idst; ++ struct kstat *h_st; ++ struct au_branch *br; ++ ++ br = au_sbr(dst->d_sb, bindex); ++ h_path.mnt = au_br_mnt(br); ++ h_path.dentry = au_h_dptr(dst, bindex); ++ h_idst = d_inode(h_path.dentry); ++ h_isrc = d_inode(h_src->dentry); ++ ia.ia_valid = ATTR_FORCE | ATTR_UID | ATTR_GID ++ | ATTR_ATIME | ATTR_MTIME ++ | ATTR_ATIME_SET | ATTR_MTIME_SET; ++ if (h_src_attr && h_src_attr->valid) { ++ h_st = &h_src_attr->st; ++ ia.ia_uid = h_st->uid; ++ ia.ia_gid = h_st->gid; ++ ia.ia_atime = h_st->atime; ++ ia.ia_mtime = h_st->mtime; ++ if (h_idst->i_mode != h_st->mode ++ && !S_ISLNK(h_idst->i_mode)) { ++ ia.ia_valid |= ATTR_MODE; ++ ia.ia_mode = h_st->mode; ++ } ++ sbits = !!(h_st->mode & (S_ISUID | S_ISGID)); ++ au_cpup_attr_flags(h_idst, h_src_attr->iflags); ++ } else { ++ ia.ia_uid = h_isrc->i_uid; ++ ia.ia_gid = h_isrc->i_gid; ++ ia.ia_atime = h_isrc->i_atime; ++ ia.ia_mtime = h_isrc->i_mtime; ++ if (h_idst->i_mode != h_isrc->i_mode ++ && !S_ISLNK(h_idst->i_mode)) { ++ ia.ia_valid |= ATTR_MODE; ++ ia.ia_mode = h_isrc->i_mode; ++ } ++ sbits = !!(h_isrc->i_mode & (S_ISUID | S_ISGID)); ++ au_cpup_attr_flags(h_idst, h_isrc->i_flags); ++ } ++ /* no delegation since it is just created */ ++ err = vfsub_notify_change(&h_path, &ia, /*delegated*/NULL); ++ ++ /* is this nfs only? */ ++ if (!err && sbits && au_test_nfs(h_path.dentry->d_sb)) { ++ ia.ia_valid = ATTR_FORCE | ATTR_MODE; ++ ia.ia_mode = h_isrc->i_mode; ++ err = vfsub_notify_change(&h_path, &ia, /*delegated*/NULL); ++ } ++ ++ icex = br->br_perm & AuBrAttr_ICEX; ++ if (!err) { ++ mnt_flags = au_mntflags(dst->d_sb); ++ verbose = !!au_opt_test(mnt_flags, VERBOSE); ++ err = au_cpup_xattr(&h_path, h_src, icex, verbose); ++ } ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int au_do_copy_file(struct file *dst, struct file *src, loff_t len, ++ char *buf, unsigned long blksize) ++{ ++ int err; ++ size_t sz, rbytes, wbytes; ++ unsigned char all_zero; ++ char *p, *zp; ++ struct inode *h_inode; ++ /* reduce stack usage */ ++ struct iattr *ia; ++ ++ zp = page_address(ZERO_PAGE(0)); ++ if (unlikely(!zp)) ++ return -ENOMEM; /* possible? */ ++ ++ err = 0; ++ all_zero = 0; ++ while (len) { ++ AuDbg("len %lld\n", len); ++ sz = blksize; ++ if (len < blksize) ++ sz = len; ++ ++ rbytes = 0; ++ /* todo: signal_pending? */ ++ while (!rbytes || err == -EAGAIN || err == -EINTR) { ++ rbytes = vfsub_read_k(src, buf, sz, &src->f_pos); ++ err = rbytes; ++ } ++ if (unlikely(err < 0)) ++ break; ++ ++ all_zero = 0; ++ if (len >= rbytes && rbytes == blksize) ++ all_zero = !memcmp(buf, zp, rbytes); ++ if (!all_zero) { ++ wbytes = rbytes; ++ p = buf; ++ while (wbytes) { ++ size_t b; ++ ++ b = vfsub_write_k(dst, p, wbytes, &dst->f_pos); ++ err = b; ++ /* todo: signal_pending? */ ++ if (unlikely(err == -EAGAIN || err == -EINTR)) ++ continue; ++ if (unlikely(err < 0)) ++ break; ++ wbytes -= b; ++ p += b; ++ } ++ if (unlikely(err < 0)) ++ break; ++ } else { ++ loff_t res; ++ ++ AuLabel(hole); ++ res = vfsub_llseek(dst, rbytes, SEEK_CUR); ++ err = res; ++ if (unlikely(res < 0)) ++ break; ++ } ++ len -= rbytes; ++ err = 0; ++ } ++ ++ /* the last block may be a hole */ ++ if (!err && all_zero) { ++ AuLabel(last hole); ++ ++ err = 1; ++ if (au_test_nfs(dst->f_path.dentry->d_sb)) { ++ /* nfs requires this step to make last hole */ ++ /* is this only nfs? */ ++ do { ++ /* todo: signal_pending? */ ++ err = vfsub_write_k(dst, "\0", 1, &dst->f_pos); ++ } while (err == -EAGAIN || err == -EINTR); ++ if (err == 1) ++ dst->f_pos--; ++ } ++ ++ if (err == 1) { ++ ia = (void *)buf; ++ ia->ia_size = dst->f_pos; ++ ia->ia_valid = ATTR_SIZE | ATTR_FILE; ++ ia->ia_file = dst; ++ h_inode = file_inode(dst); ++ inode_lock_nested(h_inode, AuLsc_I_CHILD2); ++ /* no delegation since it is just created */ ++ err = vfsub_notify_change(&dst->f_path, ia, ++ /*delegated*/NULL); ++ inode_unlock(h_inode); ++ } ++ } ++ ++ return err; ++} ++ ++int au_copy_file(struct file *dst, struct file *src, loff_t len) ++{ ++ int err; ++ unsigned long blksize; ++ unsigned char do_kfree; ++ char *buf; ++ struct super_block *h_sb; ++ ++ err = -ENOMEM; ++ h_sb = file_inode(dst)->i_sb; ++ blksize = h_sb->s_blocksize; ++ if (!blksize || PAGE_SIZE < blksize) ++ blksize = PAGE_SIZE; ++ AuDbg("blksize %lu\n", blksize); ++ do_kfree = (blksize != PAGE_SIZE && blksize >= sizeof(struct iattr *)); ++ if (do_kfree) ++ buf = kmalloc(blksize, GFP_NOFS); ++ else ++ buf = (void *)__get_free_page(GFP_NOFS); ++ if (unlikely(!buf)) ++ goto out; ++ ++ if (len > (1 << 22)) ++ AuDbg("copying a large file %lld\n", (long long)len); ++ ++ src->f_pos = 0; ++ dst->f_pos = 0; ++ err = au_do_copy_file(dst, src, len, buf, blksize); ++ if (do_kfree) { ++ AuDebugOn(!au_kfree_do_sz_test(blksize)); ++ au_kfree_do_rcu(buf); ++ } else ++ free_page((unsigned long)buf); ++ ++out: ++ return err; ++} ++ ++static int au_do_copy(struct file *dst, struct file *src, loff_t len) ++{ ++ int err; ++ struct super_block *h_src_sb; ++ struct inode *h_src_inode; ++ ++ h_src_inode = file_inode(src); ++ h_src_sb = h_src_inode->i_sb; ++ ++ /* XFS acquires inode_lock */ ++ if (!au_test_xfs(h_src_sb)) ++ err = au_copy_file(dst, src, len); ++ else { ++ inode_unlock_shared(h_src_inode); ++ err = au_copy_file(dst, src, len); ++ inode_lock_shared_nested(h_src_inode, AuLsc_I_CHILD); ++ } ++ ++ return err; ++} ++ ++static int au_clone_or_copy(struct file *dst, struct file *src, loff_t len) ++{ ++ int err; ++ loff_t lo; ++ struct super_block *h_src_sb; ++ struct inode *h_src_inode; ++ ++ h_src_inode = file_inode(src); ++ h_src_sb = h_src_inode->i_sb; ++ if (h_src_sb != file_inode(dst)->i_sb ++ || !dst->f_op->remap_file_range) { ++ err = au_do_copy(dst, src, len); ++ goto out; ++ } ++ ++ if (!au_test_nfs(h_src_sb)) { ++ inode_unlock_shared(h_src_inode); ++ lo = vfsub_clone_file_range(src, dst, len); ++ inode_lock_shared_nested(h_src_inode, AuLsc_I_CHILD); ++ } else ++ lo = vfsub_clone_file_range(src, dst, len); ++ if (lo == len) { ++ err = 0; ++ goto out; /* success */ ++ } else if (lo >= 0) ++ /* todo: possible? */ ++ /* paritially succeeded */ ++ AuDbg("lo %lld, len %lld. Retrying.\n", lo, len); ++ else if (lo != -EOPNOTSUPP) { ++ /* older XFS has a condition in cloning */ ++ err = lo; ++ goto out; ++ } ++ ++ /* the backend fs on NFS may not support cloning */ ++ err = au_do_copy(dst, src, len); ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++/* ++ * to support a sparse file which is opened with O_APPEND, ++ * we need to close the file. ++ */ ++static int au_cp_regular(struct au_cp_generic *cpg) ++{ ++ int err, i; ++ enum { SRC, DST }; ++ struct { ++ aufs_bindex_t bindex; ++ unsigned int flags; ++ struct dentry *dentry; ++ int force_wr; ++ struct file *file; ++ } *f, file[] = { ++ { ++ .bindex = cpg->bsrc, ++ .flags = O_RDONLY | O_NOATIME | O_LARGEFILE, ++ }, ++ { ++ .bindex = cpg->bdst, ++ .flags = O_WRONLY | O_NOATIME | O_LARGEFILE, ++ .force_wr = !!au_ftest_cpup(cpg->flags, RWDST), ++ } ++ }; ++ struct au_branch *br; ++ struct super_block *sb, *h_src_sb; ++ struct inode *h_src_inode; ++ struct task_struct *tsk = current; ++ ++ /* bsrc branch can be ro/rw. */ ++ sb = cpg->dentry->d_sb; ++ f = file; ++ for (i = 0; i < 2; i++, f++) { ++ f->dentry = au_h_dptr(cpg->dentry, f->bindex); ++ f->file = au_h_open(cpg->dentry, f->bindex, f->flags, ++ /*file*/NULL, f->force_wr); ++ if (IS_ERR(f->file)) { ++ err = PTR_ERR(f->file); ++ if (i == SRC) ++ goto out; ++ else ++ goto out_src; ++ } ++ } ++ ++ /* try stopping to update while we copyup */ ++ h_src_inode = d_inode(file[SRC].dentry); ++ h_src_sb = h_src_inode->i_sb; ++ if (!au_test_nfs(h_src_sb)) ++ IMustLock(h_src_inode); ++ err = au_clone_or_copy(file[DST].file, file[SRC].file, cpg->len); ++ ++ /* i wonder if we had O_NO_DELAY_FPUT flag */ ++ if (tsk->flags & PF_KTHREAD) ++ __fput_sync(file[DST].file); ++ else { ++ /* it happened actually */ ++ fput(file[DST].file); ++ /* ++ * too bad. ++ * we have to call both since we don't know which place the file ++ * was added to. ++ */ ++ task_work_run(); ++ flush_delayed_fput(); ++ } ++ br = au_sbr(sb, file[DST].bindex); ++ au_lcnt_dec(&br->br_nfiles); ++ ++out_src: ++ fput(file[SRC].file); ++ br = au_sbr(sb, file[SRC].bindex); ++ au_lcnt_dec(&br->br_nfiles); ++out: ++ return err; ++} ++ ++static int au_do_cpup_regular(struct au_cp_generic *cpg, ++ struct au_cpup_reg_attr *h_src_attr) ++{ ++ int err, rerr; ++ loff_t l; ++ struct path h_path; ++ struct inode *h_src_inode, *h_dst_inode; ++ ++ err = 0; ++ h_src_inode = au_h_iptr(d_inode(cpg->dentry), cpg->bsrc); ++ l = i_size_read(h_src_inode); ++ if (cpg->len == -1 || l < cpg->len) ++ cpg->len = l; ++ if (cpg->len) { ++ /* try stopping to update while we are referencing */ ++ inode_lock_shared_nested(h_src_inode, AuLsc_I_CHILD); ++ au_pin_hdir_unlock(cpg->pin); ++ ++ h_path.dentry = au_h_dptr(cpg->dentry, cpg->bsrc); ++ h_path.mnt = au_sbr_mnt(cpg->dentry->d_sb, cpg->bsrc); ++ h_src_attr->iflags = h_src_inode->i_flags; ++ if (!au_test_nfs(h_src_inode->i_sb)) ++ err = vfsub_getattr(&h_path, &h_src_attr->st); ++ else { ++ inode_unlock_shared(h_src_inode); ++ err = vfsub_getattr(&h_path, &h_src_attr->st); ++ inode_lock_shared_nested(h_src_inode, AuLsc_I_CHILD); ++ } ++ if (unlikely(err)) { ++ inode_unlock_shared(h_src_inode); ++ goto out; ++ } ++ h_src_attr->valid = 1; ++ if (!au_test_nfs(h_src_inode->i_sb)) { ++ err = au_cp_regular(cpg); ++ inode_unlock_shared(h_src_inode); ++ } else { ++ inode_unlock_shared(h_src_inode); ++ err = au_cp_regular(cpg); ++ } ++ rerr = au_pin_hdir_relock(cpg->pin); ++ if (!err && rerr) ++ err = rerr; ++ } ++ if (!err && (h_src_inode->i_state & I_LINKABLE)) { ++ h_path.dentry = au_h_dptr(cpg->dentry, cpg->bdst); ++ h_dst_inode = d_inode(h_path.dentry); ++ spin_lock(&h_dst_inode->i_lock); ++ h_dst_inode->i_state |= I_LINKABLE; ++ spin_unlock(&h_dst_inode->i_lock); ++ } ++ ++out: ++ return err; ++} ++ ++static int au_do_cpup_symlink(struct path *h_path, struct dentry *h_src, ++ struct inode *h_dir) ++{ ++ int err; ++ DEFINE_DELAYED_CALL(done); ++ const char *sym; ++ ++ sym = vfs_get_link(h_src, &done); ++ err = PTR_ERR(sym); ++ if (IS_ERR(sym)) ++ goto out; ++ ++ err = vfsub_symlink(h_dir, h_path, sym); ++ ++out: ++ do_delayed_call(&done); ++ return err; ++} ++ ++/* ++ * regardless 'acl' option, reset all ACL. ++ * All ACL will be copied up later from the original entry on the lower branch. ++ */ ++static int au_reset_acl(struct path *h_path, umode_t mode) ++{ ++ int err; ++ struct dentry *h_dentry; ++ /* struct inode *h_inode; */ ++ struct mnt_idmap *h_idmap; ++ ++ h_idmap = mnt_idmap(h_path->mnt); ++ h_dentry = h_path->dentry; ++ /* h_inode = d_inode(h_dentry); */ ++ /* forget_all_cached_acls(h_inode)); */ ++ err = vfsub_remove_acl(h_idmap, h_dentry, XATTR_NAME_POSIX_ACL_ACCESS); ++ AuTraceErr(err); ++ if (err == -EOPNOTSUPP) ++ err = 0; ++ if (!err) ++ err = vfsub_acl_chmod(h_idmap, h_dentry, mode); ++ ++ AuTraceErr(err); ++ return err; ++} ++ ++static int au_do_cpup_dir(struct au_cp_generic *cpg, struct dentry *dst_parent, ++ struct inode *h_dir, struct path *h_path) ++{ ++ int err; ++ struct inode *dir, *inode; ++ struct mnt_idmap *h_idmap; ++ ++ h_idmap = mnt_idmap(h_path->mnt); ++ err = vfsub_remove_acl(h_idmap, h_path->dentry, ++ XATTR_NAME_POSIX_ACL_DEFAULT); ++ AuTraceErr(err); ++ if (err == -EOPNOTSUPP) ++ err = 0; ++ if (unlikely(err)) ++ goto out; ++ ++ /* ++ * strange behaviour from the users view, ++ * particularly setattr case ++ */ ++ dir = d_inode(dst_parent); ++ if (au_ibtop(dir) == cpg->bdst) ++ au_cpup_attr_nlink(dir, /*force*/1); ++ inode = d_inode(cpg->dentry); ++ au_cpup_attr_nlink(inode, /*force*/1); ++ ++out: ++ return err; ++} ++ ++static noinline_for_stack ++int cpup_entry(struct au_cp_generic *cpg, struct dentry *dst_parent, ++ struct au_cpup_reg_attr *h_src_attr) ++{ ++ int err; ++ umode_t mode; ++ unsigned int mnt_flags; ++ unsigned char isdir, isreg, force; ++ const unsigned char do_dt = !!au_ftest_cpup(cpg->flags, DTIME); ++ struct au_dtime dt; ++ struct path h_path; ++ struct dentry *h_src, *h_dst, *h_parent; ++ struct inode *h_inode, *h_dir; ++ struct super_block *sb; ++ ++ /* bsrc branch can be ro/rw. */ ++ h_src = au_h_dptr(cpg->dentry, cpg->bsrc); ++ h_inode = d_inode(h_src); ++ AuDebugOn(h_inode != au_h_iptr(d_inode(cpg->dentry), cpg->bsrc)); ++ ++ /* try stopping to be referenced while we are creating */ ++ h_dst = au_h_dptr(cpg->dentry, cpg->bdst); ++ if (au_ftest_cpup(cpg->flags, RENAME)) ++ AuDebugOn(strncmp(h_dst->d_name.name, AUFS_WH_PFX, ++ AUFS_WH_PFX_LEN)); ++ h_parent = h_dst->d_parent; /* dir inode is locked */ ++ h_dir = d_inode(h_parent); ++ IMustLock(h_dir); ++ AuDebugOn(h_parent != h_dst->d_parent); ++ ++ sb = cpg->dentry->d_sb; ++ h_path.mnt = au_sbr_mnt(sb, cpg->bdst); ++ if (do_dt) { ++ h_path.dentry = h_parent; ++ au_dtime_store(&dt, dst_parent, &h_path); ++ } ++ h_path.dentry = h_dst; ++ ++ isreg = 0; ++ isdir = 0; ++ mode = h_inode->i_mode; ++ switch (mode & S_IFMT) { ++ case S_IFREG: ++ isreg = 1; ++ err = vfsub_create(h_dir, &h_path, 0600, /*want_excl*/true); ++ if (!err) ++ err = au_do_cpup_regular(cpg, h_src_attr); ++ break; ++ case S_IFDIR: ++ isdir = 1; ++ err = vfsub_mkdir(h_dir, &h_path, mode); ++ if (!err) ++ err = au_do_cpup_dir(cpg, dst_parent, h_dir, &h_path); ++ break; ++ case S_IFLNK: ++ err = au_do_cpup_symlink(&h_path, h_src, h_dir); ++ break; ++ case S_IFCHR: ++ case S_IFBLK: ++ AuDebugOn(!capable(CAP_MKNOD)); ++ fallthrough; ++ case S_IFIFO: ++ case S_IFSOCK: ++ err = vfsub_mknod(h_dir, &h_path, mode, h_inode->i_rdev); ++ break; ++ default: ++ AuIOErr("Unknown inode type 0%o\n", mode); ++ err = -EIO; ++ } ++ if (!err) ++ err = au_reset_acl(&h_path, mode); ++ ++ mnt_flags = au_mntflags(sb); ++ if (!au_opt_test(mnt_flags, UDBA_NONE) ++ && !isdir ++ && au_opt_test(mnt_flags, XINO) ++ && (h_inode->i_nlink == 1 ++ || (h_inode->i_state & I_LINKABLE)) ++ /* todo: unnecessary? */ ++ /* && d_inode(cpg->dentry)->i_nlink == 1 */ ++ && cpg->bdst < cpg->bsrc ++ && !au_ftest_cpup(cpg->flags, KEEPLINO)) ++ au_xino_write(sb, cpg->bsrc, h_inode->i_ino, /*ino*/0); ++ /* ignore this error */ ++ ++ if (!err) { ++ force = 0; ++ if (isreg) { ++ force = !!cpg->len; ++ if (cpg->len == -1) ++ force = !!i_size_read(h_inode); ++ } ++ au_fhsm_wrote(sb, cpg->bdst, force); ++ } ++ ++ if (do_dt) ++ au_dtime_revert(&dt); ++ return err; ++} ++ ++static int au_do_ren_after_cpup(struct au_cp_generic *cpg, struct path *h_path) ++{ ++ int err; ++ struct dentry *dentry, *h_dentry, *h_parent, *parent; ++ struct path h_ppath; ++ struct inode *h_dir; ++ aufs_bindex_t bdst; ++ ++ dentry = cpg->dentry; ++ bdst = cpg->bdst; ++ h_ppath.mnt = au_sbr_mnt(dentry->d_sb, bdst); ++ h_dentry = au_h_dptr(dentry, bdst); ++ if (!au_ftest_cpup(cpg->flags, OVERWRITE)) { ++ dget(h_dentry); ++ au_set_h_dptr(dentry, bdst, NULL); ++ err = au_lkup_neg(dentry, bdst, /*wh*/0); ++ if (!err) ++ h_path->dentry = dget(au_h_dptr(dentry, bdst)); ++ au_set_h_dptr(dentry, bdst, h_dentry); ++ } else { ++ err = 0; ++ parent = dget_parent(dentry); ++ h_ppath.dentry = au_h_dptr(parent, bdst); ++ dput(parent); ++ h_path->dentry = vfsub_lkup_one(&dentry->d_name, &h_ppath); ++ if (IS_ERR(h_path->dentry)) ++ err = PTR_ERR(h_path->dentry); ++ } ++ if (unlikely(err)) ++ goto out; ++ ++ h_parent = h_dentry->d_parent; /* dir inode is locked */ ++ h_dir = d_inode(h_parent); ++ IMustLock(h_dir); ++ AuDbg("%pd %pd\n", h_dentry, h_path->dentry); ++ /* no delegation since it is just created */ ++ err = vfsub_rename(h_dir, h_dentry, h_dir, h_path, /*delegated*/NULL, ++ /*flags*/0); ++ dput(h_path->dentry); ++ ++out: ++ return err; ++} ++ ++/* ++ * copyup the @dentry from @bsrc to @bdst. ++ * the caller must set the both of lower dentries. ++ * @len is for truncating when it is -1 copyup the entire file. ++ * in link/rename cases, @dst_parent may be different from the real one. ++ * basic->bsrc can be larger than basic->bdst. ++ * aufs doesn't touch the credential so ++ * security_inode_copy_up{,_xattr}() are unnecessary. ++ */ ++static int au_cpup_single(struct au_cp_generic *cpg, struct dentry *dst_parent) ++{ ++ int err, rerr; ++ aufs_bindex_t old_ibtop; ++ unsigned char isdir, plink; ++ struct dentry *h_src, *h_dst, *h_parent; ++ struct inode *dst_inode, *h_dir, *inode, *delegated, *src_inode; ++ struct super_block *sb; ++ struct au_branch *br; ++ struct path h_src_path; ++ /* to reduce stack size */ ++ struct { ++ struct au_dtime dt; ++ struct path h_path; ++ struct au_cpup_reg_attr h_src_attr; ++ } *a; ++ ++ err = -ENOMEM; ++ a = kmalloc(sizeof(*a), GFP_NOFS); ++ if (unlikely(!a)) ++ goto out; ++ a->h_src_attr.valid = 0; ++ ++ sb = cpg->dentry->d_sb; ++ br = au_sbr(sb, cpg->bdst); ++ a->h_path.mnt = au_br_mnt(br); ++ h_dst = au_h_dptr(cpg->dentry, cpg->bdst); ++ h_parent = h_dst->d_parent; /* dir inode is locked */ ++ h_dir = d_inode(h_parent); ++ IMustLock(h_dir); ++ ++ h_src = au_h_dptr(cpg->dentry, cpg->bsrc); ++ inode = d_inode(cpg->dentry); ++ ++ if (!dst_parent) ++ dst_parent = dget_parent(cpg->dentry); ++ else ++ dget(dst_parent); ++ ++ plink = !!au_opt_test(au_mntflags(sb), PLINK); ++ dst_inode = au_h_iptr(inode, cpg->bdst); ++ if (dst_inode) { ++ if (unlikely(!plink)) { ++ err = -EIO; ++ AuIOErr("hi%lu(i%lu) exists on b%d " ++ "but plink is disabled\n", ++ dst_inode->i_ino, inode->i_ino, cpg->bdst); ++ goto out_parent; ++ } ++ ++ if (dst_inode->i_nlink) { ++ const int do_dt = au_ftest_cpup(cpg->flags, DTIME); ++ ++ h_src = au_plink_lkup(inode, cpg->bdst); ++ err = PTR_ERR(h_src); ++ if (IS_ERR(h_src)) ++ goto out_parent; ++ if (unlikely(d_is_negative(h_src))) { ++ err = -EIO; ++ AuIOErr("i%lu exists on b%d " ++ "but not pseudo-linked\n", ++ inode->i_ino, cpg->bdst); ++ dput(h_src); ++ goto out_parent; ++ } ++ ++ if (do_dt) { ++ a->h_path.dentry = h_parent; ++ au_dtime_store(&a->dt, dst_parent, &a->h_path); ++ } ++ ++ a->h_path.dentry = h_dst; ++ delegated = NULL; ++ err = vfsub_link(h_src, h_dir, &a->h_path, &delegated); ++ if (!err && au_ftest_cpup(cpg->flags, RENAME)) ++ err = au_do_ren_after_cpup(cpg, &a->h_path); ++ if (do_dt) ++ au_dtime_revert(&a->dt); ++ if (unlikely(err == -EWOULDBLOCK)) { ++ pr_warn("cannot retry for NFSv4 delegation" ++ " for an internal link\n"); ++ iput(delegated); ++ } ++ dput(h_src); ++ goto out_parent; ++ } else ++ /* todo: cpup_wh_file? */ ++ /* udba work */ ++ au_update_ibrange(inode, /*do_put_zero*/1); ++ } ++ ++ isdir = S_ISDIR(inode->i_mode); ++ old_ibtop = au_ibtop(inode); ++ err = cpup_entry(cpg, dst_parent, &a->h_src_attr); ++ if (unlikely(err)) ++ goto out_rev; ++ dst_inode = d_inode(h_dst); ++ inode_lock_nested(dst_inode, AuLsc_I_CHILD2); ++ /* todo: necessary? */ ++ /* au_pin_hdir_unlock(cpg->pin); */ ++ ++ h_src_path.dentry = h_src; ++ h_src_path.mnt = au_sbr_mnt(sb, cpg->bsrc); ++ err = cpup_iattr(cpg->dentry, cpg->bdst, &h_src_path, &a->h_src_attr); ++ if (unlikely(err)) { ++ /* todo: necessary? */ ++ /* au_pin_hdir_relock(cpg->pin); */ /* ignore an error */ ++ inode_unlock(dst_inode); ++ goto out_rev; ++ } ++ ++ if (cpg->bdst < old_ibtop) { ++ if (S_ISREG(inode->i_mode)) { ++ err = au_dy_iaop(inode, cpg->bdst, dst_inode); ++ if (unlikely(err)) { ++ /* ignore an error */ ++ /* au_pin_hdir_relock(cpg->pin); */ ++ inode_unlock(dst_inode); ++ goto out_rev; ++ } ++ } ++ au_set_ibtop(inode, cpg->bdst); ++ } else ++ au_set_ibbot(inode, cpg->bdst); ++ au_set_h_iptr(inode, cpg->bdst, au_igrab(dst_inode), ++ au_hi_flags(inode, isdir)); ++ ++ /* todo: necessary? */ ++ /* err = au_pin_hdir_relock(cpg->pin); */ ++ inode_unlock(dst_inode); ++ if (unlikely(err)) ++ goto out_rev; ++ ++ src_inode = d_inode(h_src); ++ if (!isdir ++ && (src_inode->i_nlink > 1 ++ || src_inode->i_state & I_LINKABLE) ++ && plink) ++ au_plink_append(inode, cpg->bdst, h_dst); ++ ++ if (au_ftest_cpup(cpg->flags, RENAME)) { ++ a->h_path.dentry = h_dst; ++ err = au_do_ren_after_cpup(cpg, &a->h_path); ++ } ++ if (!err) ++ goto out_parent; /* success */ ++ ++ /* revert */ ++out_rev: ++ a->h_path.dentry = h_parent; ++ au_dtime_store(&a->dt, dst_parent, &a->h_path); ++ a->h_path.dentry = h_dst; ++ rerr = 0; ++ if (d_is_positive(h_dst)) { ++ if (!isdir) { ++ /* no delegation since it is just created */ ++ rerr = vfsub_unlink(h_dir, &a->h_path, ++ /*delegated*/NULL, /*force*/0); ++ } else ++ rerr = vfsub_rmdir(h_dir, &a->h_path); ++ } ++ au_dtime_revert(&a->dt); ++ if (rerr) { ++ AuIOErr("failed removing broken entry(%d, %d)\n", err, rerr); ++ err = -EIO; ++ } ++out_parent: ++ dput(dst_parent); ++ au_kfree_rcu(a); ++out: ++ return err; ++} ++ ++#if 0 /* reserved */ ++struct au_cpup_single_args { ++ int *errp; ++ struct au_cp_generic *cpg; ++ struct dentry *dst_parent; ++}; ++ ++static void au_call_cpup_single(void *args) ++{ ++ struct au_cpup_single_args *a = args; ++ ++ au_pin_hdir_acquire_nest(a->cpg->pin); ++ *a->errp = au_cpup_single(a->cpg, a->dst_parent); ++ au_pin_hdir_release(a->cpg->pin); ++} ++#endif ++ ++/* ++ * prevent SIGXFSZ in copy-up. ++ * testing CAP_MKNOD is for generic fs, ++ * but CAP_FSETID is for xfs only, currently. ++ */ ++static int au_cpup_sio_test(struct au_pin *pin, umode_t mode) ++{ ++ int do_sio; ++ struct super_block *sb; ++ struct inode *h_dir; ++ ++ do_sio = 0; ++ sb = au_pinned_parent(pin)->d_sb; ++ if (!au_wkq_test() ++ && (!au_sbi(sb)->si_plink_maint_pid ++ || au_plink_maint(sb, AuLock_NOPLM))) { ++ switch (mode & S_IFMT) { ++ case S_IFREG: ++ /* no condition about RLIMIT_FSIZE and the file size */ ++ do_sio = 1; ++ break; ++ case S_IFCHR: ++ case S_IFBLK: ++ do_sio = !capable(CAP_MKNOD); ++ break; ++ } ++ if (!do_sio) ++ do_sio = ((mode & (S_ISUID | S_ISGID)) ++ && !capable(CAP_FSETID)); ++ /* this workaround may be removed in the future */ ++ if (!do_sio) { ++ h_dir = au_pinned_h_dir(pin); ++ do_sio = h_dir->i_mode & S_ISVTX; ++ } ++ } ++ ++ return do_sio; ++} ++ ++#if 0 /* reserved */ ++int au_sio_cpup_single(struct au_cp_generic *cpg, struct dentry *dst_parent) ++{ ++ int err, wkq_err; ++ struct dentry *h_dentry; ++ ++ h_dentry = au_h_dptr(cpg->dentry, cpg->bsrc); ++ if (!au_cpup_sio_test(pin, d_inode(h_dentry)->i_mode)) ++ err = au_cpup_single(cpg, dst_parent); ++ else { ++ struct au_cpup_single_args args = { ++ .errp = &err, ++ .cpg = cpg, ++ .dst_parent = dst_parent ++ }; ++ wkq_err = au_wkq_wait(au_call_cpup_single, &args); ++ if (unlikely(wkq_err)) ++ err = wkq_err; ++ } ++ ++ return err; ++} ++#endif ++ ++/* ++ * copyup the @dentry from the first active lower branch to @bdst, ++ * using au_cpup_single(). ++ */ ++static int au_cpup_simple(struct au_cp_generic *cpg) ++{ ++ int err; ++ unsigned int flags_orig; ++ struct dentry *dentry; ++ ++ AuDebugOn(cpg->bsrc < 0); ++ ++ dentry = cpg->dentry; ++ DiMustWriteLock(dentry); ++ ++ err = au_lkup_neg(dentry, cpg->bdst, /*wh*/1); ++ if (!err) { ++ flags_orig = cpg->flags; ++ au_fset_cpup(cpg->flags, RENAME); ++ err = au_cpup_single(cpg, NULL); ++ cpg->flags = flags_orig; ++ if (!err) ++ return 0; /* success */ ++ ++ /* revert */ ++ au_set_h_dptr(dentry, cpg->bdst, NULL); ++ au_set_dbtop(dentry, cpg->bsrc); ++ } ++ ++ return err; ++} ++ ++struct au_cpup_simple_args { ++ int *errp; ++ struct au_cp_generic *cpg; ++}; ++ ++static void au_call_cpup_simple(void *args) ++{ ++ struct au_cpup_simple_args *a = args; ++ ++ au_pin_hdir_acquire_nest(a->cpg->pin); ++ *a->errp = au_cpup_simple(a->cpg); ++ au_pin_hdir_release(a->cpg->pin); ++} ++ ++static int au_do_sio_cpup_simple(struct au_cp_generic *cpg) ++{ ++ int err, wkq_err; ++ struct dentry *dentry, *parent; ++ struct file *h_file; ++ struct inode *h_dir; ++ struct mnt_idmap *h_idmap; ++ ++ dentry = cpg->dentry; ++ h_file = NULL; ++ if (au_ftest_cpup(cpg->flags, HOPEN)) { ++ AuDebugOn(cpg->bsrc < 0); ++ h_file = au_h_open_pre(dentry, cpg->bsrc, /*force_wr*/0); ++ err = PTR_ERR(h_file); ++ if (IS_ERR(h_file)) ++ goto out; ++ } ++ ++ parent = dget_parent(dentry); ++ h_dir = au_h_iptr(d_inode(parent), cpg->bdst); ++ h_idmap = au_sbr_idmap(dentry->d_sb, cpg->bdst); ++ if (!au_test_h_perm_sio(h_idmap, h_dir, MAY_EXEC | MAY_WRITE) ++ && !au_cpup_sio_test(cpg->pin, d_inode(dentry)->i_mode)) ++ err = au_cpup_simple(cpg); ++ else { ++ struct au_cpup_simple_args args = { ++ .errp = &err, ++ .cpg = cpg ++ }; ++ wkq_err = au_wkq_wait(au_call_cpup_simple, &args); ++ if (unlikely(wkq_err)) ++ err = wkq_err; ++ } ++ ++ dput(parent); ++ if (h_file) ++ au_h_open_post(dentry, cpg->bsrc, h_file); ++ ++out: ++ return err; ++} ++ ++int au_sio_cpup_simple(struct au_cp_generic *cpg) ++{ ++ aufs_bindex_t bsrc, bbot; ++ struct dentry *dentry, *h_dentry; ++ ++ if (cpg->bsrc < 0) { ++ dentry = cpg->dentry; ++ bbot = au_dbbot(dentry); ++ for (bsrc = cpg->bdst + 1; bsrc <= bbot; bsrc++) { ++ h_dentry = au_h_dptr(dentry, bsrc); ++ if (h_dentry) { ++ AuDebugOn(d_is_negative(h_dentry)); ++ break; ++ } ++ } ++ AuDebugOn(bsrc > bbot); ++ cpg->bsrc = bsrc; ++ } ++ AuDebugOn(cpg->bsrc <= cpg->bdst); ++ return au_do_sio_cpup_simple(cpg); ++} ++ ++int au_sio_cpdown_simple(struct au_cp_generic *cpg) ++{ ++ AuDebugOn(cpg->bdst <= cpg->bsrc); ++ return au_do_sio_cpup_simple(cpg); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * copyup the deleted file for writing. ++ */ ++static int au_do_cpup_wh(struct au_cp_generic *cpg, struct dentry *wh_dentry, ++ struct file *file) ++{ ++ int err; ++ unsigned int flags_orig; ++ aufs_bindex_t bsrc_orig; ++ struct au_dinfo *dinfo; ++ struct { ++ struct au_hdentry *hd; ++ struct dentry *h_dentry; ++ } hdst, hsrc; ++ ++ dinfo = au_di(cpg->dentry); ++ AuRwMustWriteLock(&dinfo->di_rwsem); ++ ++ bsrc_orig = cpg->bsrc; ++ cpg->bsrc = dinfo->di_btop; ++ hdst.hd = au_hdentry(dinfo, cpg->bdst); ++ hdst.h_dentry = hdst.hd->hd_dentry; ++ hdst.hd->hd_dentry = wh_dentry; ++ dinfo->di_btop = cpg->bdst; ++ ++ hsrc.h_dentry = NULL; ++ if (file) { ++ hsrc.hd = au_hdentry(dinfo, cpg->bsrc); ++ hsrc.h_dentry = hsrc.hd->hd_dentry; ++ hsrc.hd->hd_dentry = au_hf_top(file)->f_path.dentry; ++ } ++ flags_orig = cpg->flags; ++ cpg->flags = !AuCpup_DTIME; ++ err = au_cpup_single(cpg, /*h_parent*/NULL); ++ cpg->flags = flags_orig; ++ if (file) { ++ if (!err) ++ err = au_reopen_nondir(file); ++ hsrc.hd->hd_dentry = hsrc.h_dentry; ++ } ++ hdst.hd->hd_dentry = hdst.h_dentry; ++ dinfo->di_btop = cpg->bsrc; ++ cpg->bsrc = bsrc_orig; ++ ++ return err; ++} ++ ++static int au_cpup_wh(struct au_cp_generic *cpg, struct file *file) ++{ ++ int err; ++ aufs_bindex_t bdst; ++ struct au_dtime dt; ++ struct dentry *dentry, *parent, *h_parent, *wh_dentry; ++ struct au_branch *br; ++ struct path h_path; ++ ++ dentry = cpg->dentry; ++ bdst = cpg->bdst; ++ br = au_sbr(dentry->d_sb, bdst); ++ parent = dget_parent(dentry); ++ h_parent = au_h_dptr(parent, bdst); ++ wh_dentry = au_whtmp_lkup(h_parent, br, &dentry->d_name); ++ err = PTR_ERR(wh_dentry); ++ if (IS_ERR(wh_dentry)) ++ goto out; ++ ++ h_path.dentry = h_parent; ++ h_path.mnt = au_br_mnt(br); ++ au_dtime_store(&dt, parent, &h_path); ++ err = au_do_cpup_wh(cpg, wh_dentry, file); ++ if (unlikely(err)) ++ goto out_wh; ++ ++ dget(wh_dentry); ++ h_path.dentry = wh_dentry; ++ if (!d_is_dir(wh_dentry)) { ++ /* no delegation since it is just created */ ++ err = vfsub_unlink(d_inode(h_parent), &h_path, ++ /*delegated*/NULL, /*force*/0); ++ } else ++ err = vfsub_rmdir(d_inode(h_parent), &h_path); ++ if (unlikely(err)) { ++ AuIOErr("failed remove copied-up tmp file %pd(%d)\n", ++ wh_dentry, err); ++ err = -EIO; ++ } ++ au_dtime_revert(&dt); ++ au_set_hi_wh(d_inode(dentry), bdst, wh_dentry); ++ ++out_wh: ++ dput(wh_dentry); ++out: ++ dput(parent); ++ return err; ++} ++ ++struct au_cpup_wh_args { ++ int *errp; ++ struct au_cp_generic *cpg; ++ struct file *file; ++}; ++ ++static void au_call_cpup_wh(void *args) ++{ ++ struct au_cpup_wh_args *a = args; ++ ++ au_pin_hdir_acquire_nest(a->cpg->pin); ++ *a->errp = au_cpup_wh(a->cpg, a->file); ++ au_pin_hdir_release(a->cpg->pin); ++} ++ ++int au_sio_cpup_wh(struct au_cp_generic *cpg, struct file *file) ++{ ++ int err, wkq_err; ++ aufs_bindex_t bdst; ++ struct dentry *dentry, *parent, *h_orph, *h_parent; ++ struct inode *dir, *h_dir, *h_tmpdir; ++ struct au_wbr *wbr; ++ struct au_pin wh_pin, *pin_orig; ++ struct mnt_idmap *h_idmap; ++ ++ dentry = cpg->dentry; ++ bdst = cpg->bdst; ++ parent = dget_parent(dentry); ++ dir = d_inode(parent); ++ h_orph = NULL; ++ h_parent = NULL; ++ h_dir = au_igrab(au_h_iptr(dir, bdst)); ++ h_tmpdir = h_dir; ++ pin_orig = NULL; ++ if (!h_dir->i_nlink) { ++ wbr = au_sbr(dentry->d_sb, bdst)->br_wbr; ++ h_orph = wbr->wbr_orph; ++ ++ h_parent = dget(au_h_dptr(parent, bdst)); ++ au_set_h_dptr(parent, bdst, dget(h_orph)); ++ h_tmpdir = d_inode(h_orph); ++ au_set_h_iptr(dir, bdst, au_igrab(h_tmpdir), /*flags*/0); ++ ++ inode_lock_nested(h_tmpdir, AuLsc_I_PARENT3); ++ /* todo: au_h_open_pre()? */ ++ ++ pin_orig = cpg->pin; ++ au_pin_init(&wh_pin, dentry, bdst, AuLsc_DI_PARENT, ++ AuLsc_I_PARENT3, cpg->pin->udba, AuPin_DI_LOCKED); ++ cpg->pin = &wh_pin; ++ } ++ ++ h_idmap = au_sbr_idmap(dentry->d_sb, bdst); ++ if (!au_test_h_perm_sio(h_idmap, h_tmpdir, MAY_EXEC | MAY_WRITE) ++ && !au_cpup_sio_test(cpg->pin, d_inode(dentry)->i_mode)) ++ err = au_cpup_wh(cpg, file); ++ else { ++ struct au_cpup_wh_args args = { ++ .errp = &err, ++ .cpg = cpg, ++ .file = file ++ }; ++ wkq_err = au_wkq_wait(au_call_cpup_wh, &args); ++ if (unlikely(wkq_err)) ++ err = wkq_err; ++ } ++ ++ if (h_orph) { ++ inode_unlock(h_tmpdir); ++ /* todo: au_h_open_post()? */ ++ au_set_h_iptr(dir, bdst, au_igrab(h_dir), /*flags*/0); ++ au_set_h_dptr(parent, bdst, h_parent); ++ AuDebugOn(!pin_orig); ++ cpg->pin = pin_orig; ++ } ++ iput(h_dir); ++ dput(parent); ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * generic routine for both of copy-up and copy-down. ++ */ ++/* cf. revalidate function in file.c */ ++int au_cp_dirs(struct dentry *dentry, aufs_bindex_t bdst, ++ int (*cp)(struct dentry *dentry, aufs_bindex_t bdst, ++ struct au_pin *pin, ++ struct dentry *h_parent, void *arg), ++ void *arg) ++{ ++ int err; ++ struct au_pin pin; ++ struct dentry *d, *parent, *h_parent, *real_parent, *h_dentry; ++ ++ err = 0; ++ parent = dget_parent(dentry); ++ if (IS_ROOT(parent)) ++ goto out; ++ ++ au_pin_init(&pin, dentry, bdst, AuLsc_DI_PARENT2, AuLsc_I_PARENT2, ++ au_opt_udba(dentry->d_sb), AuPin_MNT_WRITE); ++ ++ /* do not use au_dpage */ ++ real_parent = parent; ++ while (1) { ++ dput(parent); ++ parent = dget_parent(dentry); ++ h_parent = au_h_dptr(parent, bdst); ++ if (h_parent) ++ goto out; /* success */ ++ ++ /* find top dir which is necessary to cpup */ ++ do { ++ d = parent; ++ dput(parent); ++ parent = dget_parent(d); ++ di_read_lock_parent3(parent, !AuLock_IR); ++ h_parent = au_h_dptr(parent, bdst); ++ di_read_unlock(parent, !AuLock_IR); ++ } while (!h_parent); ++ ++ if (d != real_parent) ++ di_write_lock_child3(d); ++ ++ /* somebody else might create while we were sleeping */ ++ h_dentry = au_h_dptr(d, bdst); ++ if (!h_dentry || d_is_negative(h_dentry)) { ++ if (h_dentry) ++ au_update_dbtop(d); ++ ++ au_pin_set_dentry(&pin, d); ++ err = au_do_pin(&pin); ++ if (!err) { ++ err = cp(d, bdst, &pin, h_parent, arg); ++ au_unpin(&pin); ++ } ++ } ++ ++ if (d != real_parent) ++ di_write_unlock(d); ++ if (unlikely(err)) ++ break; ++ } ++ ++out: ++ dput(parent); ++ return err; ++} ++ ++static int au_cpup_dir(struct dentry *dentry, aufs_bindex_t bdst, ++ struct au_pin *pin, ++ struct dentry *h_parent __maybe_unused, ++ void *arg __maybe_unused) ++{ ++ struct au_cp_generic cpg = { ++ .dentry = dentry, ++ .bdst = bdst, ++ .bsrc = -1, ++ .len = 0, ++ .pin = pin, ++ .flags = AuCpup_DTIME ++ }; ++ return au_sio_cpup_simple(&cpg); ++} ++ ++int au_cpup_dirs(struct dentry *dentry, aufs_bindex_t bdst) ++{ ++ return au_cp_dirs(dentry, bdst, au_cpup_dir, NULL); ++} ++ ++int au_test_and_cpup_dirs(struct dentry *dentry, aufs_bindex_t bdst) ++{ ++ int err; ++ struct dentry *parent; ++ struct inode *dir; ++ ++ parent = dget_parent(dentry); ++ dir = d_inode(parent); ++ err = 0; ++ if (au_h_iptr(dir, bdst)) ++ goto out; ++ ++ di_read_unlock(parent, AuLock_IR); ++ di_write_lock_parent(parent); ++ /* someone else might change our inode while we were sleeping */ ++ if (!au_h_iptr(dir, bdst)) ++ err = au_cpup_dirs(dentry, bdst); ++ di_downgrade_lock(parent, AuLock_IR); ++ ++out: ++ dput(parent); ++ return err; ++} +diff --git a/fs/aufs/cpup.h b/fs/aufs/cpup.h +new file mode 100644 +index 000000000000..decd8f01425a +--- /dev/null ++++ b/fs/aufs/cpup.h +@@ -0,0 +1,100 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * copy-up/down functions ++ */ ++ ++#ifndef __AUFS_CPUP_H__ ++#define __AUFS_CPUP_H__ ++ ++#ifdef __KERNEL__ ++ ++#include <linux/path.h> ++ ++struct inode; ++struct file; ++struct au_pin; ++ ++void au_cpup_attr_flags(struct inode *dst, unsigned int iflags); ++void au_cpup_attr_timesizes(struct inode *inode); ++void au_cpup_attr_nlink(struct inode *inode, int force); ++void au_cpup_attr_changeable(struct inode *inode); ++void au_cpup_igen(struct inode *inode, struct inode *h_inode); ++void au_cpup_attr_all(struct inode *inode, int force); ++ ++/* ---------------------------------------------------------------------- */ ++ ++struct au_cp_generic { ++ struct dentry *dentry; ++ aufs_bindex_t bdst, bsrc; ++ loff_t len; ++ struct au_pin *pin; ++ unsigned int flags; ++}; ++ ++/* cpup flags */ ++#define AuCpup_DTIME 1 /* do dtime_store/revert */ ++#define AuCpup_KEEPLINO (1 << 1) /* do not clear the lower xino, ++ for link(2) */ ++#define AuCpup_RENAME (1 << 2) /* rename after cpup */ ++#define AuCpup_HOPEN (1 << 3) /* call h_open_pre/post() in ++ cpup */ ++#define AuCpup_OVERWRITE (1 << 4) /* allow overwriting the ++ existing entry */ ++#define AuCpup_RWDST (1 << 5) /* force write target even if ++ the branch is marked as RO */ ++ ++#ifndef CONFIG_AUFS_BR_HFSPLUS ++#undef AuCpup_HOPEN ++#define AuCpup_HOPEN 0 ++#endif ++ ++#define au_ftest_cpup(flags, name) ((flags) & AuCpup_##name) ++#define au_fset_cpup(flags, name) \ ++ do { (flags) |= AuCpup_##name; } while (0) ++#define au_fclr_cpup(flags, name) \ ++ do { (flags) &= ~AuCpup_##name; } while (0) ++ ++int au_copy_file(struct file *dst, struct file *src, loff_t len); ++int au_sio_cpup_simple(struct au_cp_generic *cpg); ++int au_sio_cpdown_simple(struct au_cp_generic *cpg); ++int au_sio_cpup_wh(struct au_cp_generic *cpg, struct file *file); ++ ++int au_cp_dirs(struct dentry *dentry, aufs_bindex_t bdst, ++ int (*cp)(struct dentry *dentry, aufs_bindex_t bdst, ++ struct au_pin *pin, ++ struct dentry *h_parent, void *arg), ++ void *arg); ++int au_cpup_dirs(struct dentry *dentry, aufs_bindex_t bdst); ++int au_test_and_cpup_dirs(struct dentry *dentry, aufs_bindex_t bdst); ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* keep timestamps when copyup */ ++struct au_dtime { ++ struct dentry *dt_dentry; ++ struct path dt_h_path; ++ struct timespec64 dt_atime, dt_mtime; ++}; ++void au_dtime_store(struct au_dtime *dt, struct dentry *dentry, ++ struct path *h_path); ++void au_dtime_revert(struct au_dtime *dt); ++ ++#endif /* __KERNEL__ */ ++#endif /* __AUFS_CPUP_H__ */ +diff --git a/fs/aufs/dbgaufs.c b/fs/aufs/dbgaufs.c +new file mode 100644 +index 000000000000..d5811df890b5 +--- /dev/null ++++ b/fs/aufs/dbgaufs.c +@@ -0,0 +1,526 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * debugfs interface ++ */ ++ ++#include <linux/debugfs.h> ++#include "aufs.h" ++ ++#ifndef CONFIG_SYSFS ++#error DEBUG_FS depends upon SYSFS ++#endif ++ ++static struct dentry *dbgaufs; ++static const mode_t dbgaufs_mode = 0444; ++ ++/* 20 is max digits length of ulong 64 */ ++struct dbgaufs_arg { ++ int n; ++ char a[20 * 4]; ++}; ++ ++/* ++ * common function for all XINO files ++ */ ++static int dbgaufs_xi_release(struct inode *inode __maybe_unused, ++ struct file *file) ++{ ++ void *p; ++ ++ p = file->private_data; ++ if (p) { ++ /* this is struct dbgaufs_arg */ ++ AuDebugOn(!au_kfree_sz_test(p)); ++ au_kfree_do_rcu(p); ++ } ++ return 0; ++} ++ ++static int dbgaufs_xi_open(struct file *xf, struct file *file, int do_fcnt, ++ int cnt) ++{ ++ int err; ++ struct kstat st; ++ struct dbgaufs_arg *p; ++ ++ err = -ENOMEM; ++ p = kmalloc(sizeof(*p), GFP_NOFS); ++ if (unlikely(!p)) ++ goto out; ++ ++ err = 0; ++ p->n = 0; ++ file->private_data = p; ++ if (!xf) ++ goto out; ++ ++ err = vfsub_getattr(&xf->f_path, &st); ++ if (!err) { ++ if (do_fcnt) ++ p->n = snprintf ++ (p->a, sizeof(p->a), "%d, %llux%u %lld\n", ++ cnt, st.blocks, st.blksize, ++ (long long)st.size); ++ else ++ p->n = snprintf(p->a, sizeof(p->a), "%llux%u %lld\n", ++ st.blocks, st.blksize, ++ (long long)st.size); ++ AuDebugOn(p->n >= sizeof(p->a)); ++ } else { ++ p->n = snprintf(p->a, sizeof(p->a), "err %d\n", err); ++ err = 0; ++ } ++ ++out: ++ return err; ++} ++ ++static ssize_t dbgaufs_xi_read(struct file *file, char __user *buf, ++ size_t count, loff_t *ppos) ++{ ++ struct dbgaufs_arg *p; ++ ++ p = file->private_data; ++ return simple_read_from_buffer(buf, count, ppos, p->a, p->n); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++struct dbgaufs_plink_arg { ++ int n; ++ char a[]; ++}; ++ ++static int dbgaufs_plink_release(struct inode *inode __maybe_unused, ++ struct file *file) ++{ ++ free_page((unsigned long)file->private_data); ++ return 0; ++} ++ ++static int dbgaufs_plink_open(struct inode *inode, struct file *file) ++{ ++ int err, i, limit; ++ unsigned long n, sum; ++ struct dbgaufs_plink_arg *p; ++ struct au_sbinfo *sbinfo; ++ struct super_block *sb; ++ struct hlist_bl_head *hbl; ++ ++ err = -ENOMEM; ++ p = (void *)get_zeroed_page(GFP_NOFS); ++ if (unlikely(!p)) ++ goto out; ++ ++ err = -EFBIG; ++ sbinfo = inode->i_private; ++ sb = sbinfo->si_sb; ++ si_noflush_read_lock(sb); ++ if (au_opt_test(au_mntflags(sb), PLINK)) { ++ limit = PAGE_SIZE - sizeof(p->n); ++ ++ /* the number of buckets */ ++ n = snprintf(p->a + p->n, limit, "%d\n", AuPlink_NHASH); ++ p->n += n; ++ limit -= n; ++ ++ sum = 0; ++ for (i = 0, hbl = sbinfo->si_plink; i < AuPlink_NHASH; ++ i++, hbl++) { ++ n = au_hbl_count(hbl); ++ sum += n; ++ ++ n = snprintf(p->a + p->n, limit, "%lu ", n); ++ p->n += n; ++ limit -= n; ++ if (unlikely(limit <= 0)) ++ goto out_free; ++ } ++ p->a[p->n - 1] = '\n'; ++ ++ /* the sum of plinks */ ++ n = snprintf(p->a + p->n, limit, "%lu\n", sum); ++ p->n += n; ++ limit -= n; ++ if (unlikely(limit <= 0)) ++ goto out_free; ++ } else { ++#define str "1\n0\n0\n" ++ p->n = sizeof(str) - 1; ++ strscpy(p->a, str, sizeof(str)); ++#undef str ++ } ++ si_read_unlock(sb); ++ ++ err = 0; ++ file->private_data = p; ++ goto out; /* success */ ++ ++out_free: ++ free_page((unsigned long)p); ++out: ++ return err; ++} ++ ++static ssize_t dbgaufs_plink_read(struct file *file, char __user *buf, ++ size_t count, loff_t *ppos) ++{ ++ struct dbgaufs_plink_arg *p; ++ ++ p = file->private_data; ++ return simple_read_from_buffer(buf, count, ppos, p->a, p->n); ++} ++ ++static const struct file_operations dbgaufs_plink_fop = { ++ .owner = THIS_MODULE, ++ .open = dbgaufs_plink_open, ++ .release = dbgaufs_plink_release, ++ .read = dbgaufs_plink_read ++}; ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int dbgaufs_xib_open(struct inode *inode, struct file *file) ++{ ++ int err; ++ struct au_sbinfo *sbinfo; ++ struct super_block *sb; ++ ++ sbinfo = inode->i_private; ++ sb = sbinfo->si_sb; ++ si_noflush_read_lock(sb); ++ err = dbgaufs_xi_open(sbinfo->si_xib, file, /*do_fcnt*/0, /*cnt*/0); ++ si_read_unlock(sb); ++ return err; ++} ++ ++static const struct file_operations dbgaufs_xib_fop = { ++ .owner = THIS_MODULE, ++ .open = dbgaufs_xib_open, ++ .release = dbgaufs_xi_release, ++ .read = dbgaufs_xi_read ++}; ++ ++/* ---------------------------------------------------------------------- */ ++ ++#define DbgaufsXi_PREFIX "xi" ++ ++static int dbgaufs_xino_open(struct inode *inode, struct file *file) ++{ ++ int err, idx; ++ long l; ++ aufs_bindex_t bindex; ++ char *p, a[sizeof(DbgaufsXi_PREFIX) + 8]; ++ struct au_sbinfo *sbinfo; ++ struct super_block *sb; ++ struct au_xino *xi; ++ struct file *xf; ++ struct qstr *name; ++ struct au_branch *br; ++ ++ err = -ENOENT; ++ name = &file->f_path.dentry->d_name; ++ if (unlikely(name->len < sizeof(DbgaufsXi_PREFIX) ++ || memcmp(name->name, DbgaufsXi_PREFIX, ++ sizeof(DbgaufsXi_PREFIX) - 1))) ++ goto out; ++ ++ AuDebugOn(name->len >= sizeof(a)); ++ memcpy(a, name->name, name->len); ++ a[name->len] = '\0'; ++ p = strchr(a, '-'); ++ if (p) ++ *p = '\0'; ++ err = kstrtol(a + sizeof(DbgaufsXi_PREFIX) - 1, 10, &l); ++ if (unlikely(err)) ++ goto out; ++ bindex = l; ++ idx = 0; ++ if (p) { ++ err = kstrtol(p + 1, 10, &l); ++ if (unlikely(err)) ++ goto out; ++ idx = l; ++ } ++ ++ err = -ENOENT; ++ sbinfo = inode->i_private; ++ sb = sbinfo->si_sb; ++ si_noflush_read_lock(sb); ++ if (unlikely(bindex < 0 || bindex > au_sbbot(sb))) ++ goto out_si; ++ br = au_sbr(sb, bindex); ++ xi = br->br_xino; ++ if (unlikely(idx >= xi->xi_nfile)) ++ goto out_si; ++ xf = au_xino_file(xi, idx); ++ if (xf) ++ err = dbgaufs_xi_open(xf, file, /*do_fcnt*/1, ++ au_xino_count(br)); ++ ++out_si: ++ si_read_unlock(sb); ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++static const struct file_operations dbgaufs_xino_fop = { ++ .owner = THIS_MODULE, ++ .open = dbgaufs_xino_open, ++ .release = dbgaufs_xi_release, ++ .read = dbgaufs_xi_read ++}; ++ ++void dbgaufs_xino_del(struct au_branch *br) ++{ ++ struct dentry *dbgaufs; ++ ++ dbgaufs = br->br_dbgaufs; ++ if (!dbgaufs) ++ return; ++ ++ br->br_dbgaufs = NULL; ++ /* debugfs acquires the parent i_mutex */ ++ lockdep_off(); ++ debugfs_remove(dbgaufs); ++ lockdep_on(); ++} ++ ++void dbgaufs_brs_del(struct super_block *sb, aufs_bindex_t bindex) ++{ ++ aufs_bindex_t bbot; ++ struct au_branch *br; ++ ++ if (!au_sbi(sb)->si_dbgaufs) ++ return; ++ ++ bbot = au_sbbot(sb); ++ for (; bindex <= bbot; bindex++) { ++ br = au_sbr(sb, bindex); ++ dbgaufs_xino_del(br); ++ } ++} ++ ++static void dbgaufs_br_do_add(struct super_block *sb, aufs_bindex_t bindex, ++ unsigned int idx, struct dentry *parent, ++ struct au_sbinfo *sbinfo) ++{ ++ struct au_branch *br; ++ struct dentry *d; ++ /* "xi" bindex(5) "-" idx(2) NULL */ ++ char name[sizeof(DbgaufsXi_PREFIX) + 8]; ++ ++ if (!idx) ++ snprintf(name, sizeof(name), DbgaufsXi_PREFIX "%d", bindex); ++ else ++ snprintf(name, sizeof(name), DbgaufsXi_PREFIX "%d-%u", ++ bindex, idx); ++ br = au_sbr(sb, bindex); ++ if (br->br_dbgaufs) { ++ struct qstr qstr = QSTR_INIT(name, strlen(name)); ++ ++ if (!au_qstreq(&br->br_dbgaufs->d_name, &qstr)) { ++ /* debugfs acquires the parent i_mutex */ ++ lockdep_off(); ++ d = debugfs_rename(parent, br->br_dbgaufs, parent, ++ name); ++ lockdep_on(); ++ if (unlikely(!d)) ++ pr_warn("failed renaming %pd/%s, ignored.\n", ++ parent, name); ++ } ++ } else { ++ lockdep_off(); ++ br->br_dbgaufs = debugfs_create_file(name, dbgaufs_mode, parent, ++ sbinfo, &dbgaufs_xino_fop); ++ lockdep_on(); ++ if (unlikely(!br->br_dbgaufs)) ++ pr_warn("failed creating %pd/%s, ignored.\n", ++ parent, name); ++ } ++} ++ ++static void dbgaufs_br_add(struct super_block *sb, aufs_bindex_t bindex, ++ struct dentry *parent, struct au_sbinfo *sbinfo) ++{ ++ struct au_branch *br; ++ struct au_xino *xi; ++ unsigned int u; ++ ++ br = au_sbr(sb, bindex); ++ xi = br->br_xino; ++ for (u = 0; u < xi->xi_nfile; u++) ++ dbgaufs_br_do_add(sb, bindex, u, parent, sbinfo); ++} ++ ++void dbgaufs_brs_add(struct super_block *sb, aufs_bindex_t bindex, int topdown) ++{ ++ struct au_sbinfo *sbinfo; ++ struct dentry *parent; ++ aufs_bindex_t bbot; ++ ++ if (!au_opt_test(au_mntflags(sb), XINO)) ++ return; ++ ++ sbinfo = au_sbi(sb); ++ parent = sbinfo->si_dbgaufs; ++ if (!parent) ++ return; ++ ++ bbot = au_sbbot(sb); ++ if (topdown) ++ for (; bindex <= bbot; bindex++) ++ dbgaufs_br_add(sb, bindex, parent, sbinfo); ++ else ++ for (; bbot >= bindex; bbot--) ++ dbgaufs_br_add(sb, bbot, parent, sbinfo); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++#ifdef CONFIG_AUFS_EXPORT ++static int dbgaufs_xigen_open(struct inode *inode, struct file *file) ++{ ++ int err; ++ struct au_sbinfo *sbinfo; ++ struct super_block *sb; ++ ++ sbinfo = inode->i_private; ++ sb = sbinfo->si_sb; ++ si_noflush_read_lock(sb); ++ err = dbgaufs_xi_open(sbinfo->si_xigen, file, /*do_fcnt*/0, /*cnt*/0); ++ si_read_unlock(sb); ++ return err; ++} ++ ++static const struct file_operations dbgaufs_xigen_fop = { ++ .owner = THIS_MODULE, ++ .open = dbgaufs_xigen_open, ++ .release = dbgaufs_xi_release, ++ .read = dbgaufs_xi_read ++}; ++ ++static int dbgaufs_xigen_init(struct au_sbinfo *sbinfo) ++{ ++ int err; ++ ++ /* ++ * This function is a dynamic '__init' function actually, ++ * so the tiny check for si_rwsem is unnecessary. ++ */ ++ /* AuRwMustWriteLock(&sbinfo->si_rwsem); */ ++ ++ err = -EIO; ++ sbinfo->si_dbgaufs_xigen = debugfs_create_file ++ ("xigen", dbgaufs_mode, sbinfo->si_dbgaufs, sbinfo, ++ &dbgaufs_xigen_fop); ++ if (sbinfo->si_dbgaufs_xigen) ++ err = 0; ++ ++ return err; ++} ++#else ++static int dbgaufs_xigen_init(struct au_sbinfo *sbinfo) ++{ ++ return 0; ++} ++#endif /* CONFIG_AUFS_EXPORT */ ++ ++/* ---------------------------------------------------------------------- */ ++ ++void dbgaufs_si_fin(struct au_sbinfo *sbinfo) ++{ ++ /* ++ * This function is a dynamic '__fin' function actually, ++ * so the tiny check for si_rwsem is unnecessary. ++ */ ++ /* AuRwMustWriteLock(&sbinfo->si_rwsem); */ ++ ++ debugfs_remove_recursive(sbinfo->si_dbgaufs); ++ sbinfo->si_dbgaufs = NULL; ++} ++ ++int dbgaufs_si_init(struct au_sbinfo *sbinfo) ++{ ++ int err; ++ char name[SysaufsSiNameLen]; ++ ++ /* ++ * This function is a dynamic '__init' function actually, ++ * so the tiny check for si_rwsem is unnecessary. ++ */ ++ /* AuRwMustWriteLock(&sbinfo->si_rwsem); */ ++ ++ err = -ENOENT; ++ if (!dbgaufs) { ++ AuErr1("/debug/aufs is uninitialized\n"); ++ goto out; ++ } ++ ++ err = -EIO; ++ sysaufs_name(sbinfo, name); ++ sbinfo->si_dbgaufs = debugfs_create_dir(name, dbgaufs); ++ if (unlikely(!sbinfo->si_dbgaufs)) ++ goto out; ++ ++ /* regardless plink/noplink option */ ++ sbinfo->si_dbgaufs_plink = debugfs_create_file ++ ("plink", dbgaufs_mode, sbinfo->si_dbgaufs, sbinfo, ++ &dbgaufs_plink_fop); ++ if (unlikely(!sbinfo->si_dbgaufs_plink)) ++ goto out_dir; ++ ++ /* regardless xino/noxino option */ ++ sbinfo->si_dbgaufs_xib = debugfs_create_file ++ ("xib", dbgaufs_mode, sbinfo->si_dbgaufs, sbinfo, ++ &dbgaufs_xib_fop); ++ if (unlikely(!sbinfo->si_dbgaufs_xib)) ++ goto out_dir; ++ ++ err = dbgaufs_xigen_init(sbinfo); ++ if (!err) ++ goto out; /* success */ ++ ++out_dir: ++ dbgaufs_si_fin(sbinfo); ++out: ++ if (unlikely(err)) ++ pr_err("debugfs/aufs failed\n"); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++void dbgaufs_fin(void) ++{ ++ debugfs_remove(dbgaufs); ++} ++ ++int __init dbgaufs_init(void) ++{ ++ int err; ++ ++ err = -EIO; ++ dbgaufs = debugfs_create_dir(AUFS_NAME, NULL); ++ if (dbgaufs) ++ err = 0; ++ return err; ++} +diff --git a/fs/aufs/dbgaufs.h b/fs/aufs/dbgaufs.h +new file mode 100644 +index 000000000000..30f1694224e0 +--- /dev/null ++++ b/fs/aufs/dbgaufs.h +@@ -0,0 +1,53 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * debugfs interface ++ */ ++ ++#ifndef __DBGAUFS_H__ ++#define __DBGAUFS_H__ ++ ++#ifdef __KERNEL__ ++ ++struct super_block; ++struct au_sbinfo; ++struct au_branch; ++ ++#ifdef CONFIG_DEBUG_FS ++/* dbgaufs.c */ ++void dbgaufs_xino_del(struct au_branch *br); ++void dbgaufs_brs_del(struct super_block *sb, aufs_bindex_t bindex); ++void dbgaufs_brs_add(struct super_block *sb, aufs_bindex_t bindex, int topdown); ++void dbgaufs_si_fin(struct au_sbinfo *sbinfo); ++int dbgaufs_si_init(struct au_sbinfo *sbinfo); ++void dbgaufs_fin(void); ++int __init dbgaufs_init(void); ++#else ++AuStubVoid(dbgaufs_xino_del, struct au_branch *br) ++AuStubVoid(dbgaufs_brs_del, struct super_block *sb, aufs_bindex_t bindex) ++AuStubVoid(dbgaufs_brs_add, struct super_block *sb, aufs_bindex_t bindex, ++ int topdown) ++AuStubVoid(dbgaufs_si_fin, struct au_sbinfo *sbinfo) ++AuStubInt0(dbgaufs_si_init, struct au_sbinfo *sbinfo) ++AuStubVoid(dbgaufs_fin, void) ++AuStubInt0(__init dbgaufs_init, void) ++#endif /* CONFIG_DEBUG_FS */ ++ ++#endif /* __KERNEL__ */ ++#endif /* __DBGAUFS_H__ */ +diff --git a/fs/aufs/dcsub.c b/fs/aufs/dcsub.c +new file mode 100644 +index 000000000000..fa2a9ad2b49b +--- /dev/null ++++ b/fs/aufs/dcsub.c +@@ -0,0 +1,225 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * sub-routines for dentry cache ++ */ ++ ++#include "aufs.h" ++ ++static void au_dpage_free(struct au_dpage *dpage) ++{ ++ int i; ++ struct dentry **p; ++ ++ p = dpage->dentries; ++ for (i = 0; i < dpage->ndentry; i++) ++ dput(*p++); ++ free_page((unsigned long)dpage->dentries); ++} ++ ++int au_dpages_init(struct au_dcsub_pages *dpages, gfp_t gfp) ++{ ++ int err; ++ void *p; ++ ++ err = -ENOMEM; ++ dpages->dpages = kmalloc(sizeof(*dpages->dpages), gfp); ++ if (unlikely(!dpages->dpages)) ++ goto out; ++ ++ p = (void *)__get_free_page(gfp); ++ if (unlikely(!p)) ++ goto out_dpages; ++ ++ dpages->dpages[0].ndentry = 0; ++ dpages->dpages[0].dentries = p; ++ dpages->ndpage = 1; ++ return 0; /* success */ ++ ++out_dpages: ++ au_kfree_try_rcu(dpages->dpages); ++out: ++ return err; ++} ++ ++void au_dpages_free(struct au_dcsub_pages *dpages) ++{ ++ int i; ++ struct au_dpage *p; ++ ++ p = dpages->dpages; ++ for (i = 0; i < dpages->ndpage; i++) ++ au_dpage_free(p++); ++ au_kfree_try_rcu(dpages->dpages); ++} ++ ++static int au_dpages_append(struct au_dcsub_pages *dpages, ++ struct dentry *dentry, gfp_t gfp) ++{ ++ int err, sz; ++ struct au_dpage *dpage; ++ void *p; ++ ++ dpage = dpages->dpages + dpages->ndpage - 1; ++ sz = PAGE_SIZE / sizeof(dentry); ++ if (unlikely(dpage->ndentry >= sz)) { ++ AuLabel(new dpage); ++ err = -ENOMEM; ++ sz = dpages->ndpage * sizeof(*dpages->dpages); ++ p = au_kzrealloc(dpages->dpages, sz, ++ sz + sizeof(*dpages->dpages), gfp, ++ /*may_shrink*/0); ++ if (unlikely(!p)) ++ goto out; ++ ++ dpages->dpages = p; ++ dpage = dpages->dpages + dpages->ndpage; ++ p = (void *)__get_free_page(gfp); ++ if (unlikely(!p)) ++ goto out; ++ ++ dpage->ndentry = 0; ++ dpage->dentries = p; ++ dpages->ndpage++; ++ } ++ ++ AuDebugOn(au_dcount(dentry) <= 0); ++ dpage->dentries[dpage->ndentry++] = dget_dlock(dentry); ++ return 0; /* success */ ++ ++out: ++ return err; ++} ++ ++/* todo: BAD approach */ ++/* copied from linux/fs/dcache.c */ ++enum d_walk_ret { ++ D_WALK_CONTINUE, ++ D_WALK_QUIT, ++ D_WALK_NORETRY, ++ D_WALK_SKIP, ++}; ++ ++extern void d_walk(struct dentry *parent, void *data, ++ enum d_walk_ret (*enter)(void *, struct dentry *)); ++ ++struct ac_dpages_arg { ++ int err; ++ struct au_dcsub_pages *dpages; ++ struct super_block *sb; ++ au_dpages_test test; ++ void *arg; ++}; ++ ++static enum d_walk_ret au_call_dpages_append(void *_arg, struct dentry *dentry) ++{ ++ enum d_walk_ret ret; ++ struct ac_dpages_arg *arg = _arg; ++ ++ ret = D_WALK_CONTINUE; ++ if (dentry->d_sb == arg->sb ++ && !IS_ROOT(dentry) ++ && au_dcount(dentry) > 0 ++ && au_di(dentry) ++ && (!arg->test || arg->test(dentry, arg->arg))) { ++ arg->err = au_dpages_append(arg->dpages, dentry, GFP_ATOMIC); ++ if (unlikely(arg->err)) ++ ret = D_WALK_QUIT; ++ } ++ ++ return ret; ++} ++ ++int au_dcsub_pages(struct au_dcsub_pages *dpages, struct dentry *root, ++ au_dpages_test test, void *arg) ++{ ++ struct ac_dpages_arg args = { ++ .err = 0, ++ .dpages = dpages, ++ .sb = root->d_sb, ++ .test = test, ++ .arg = arg ++ }; ++ ++ d_walk(root, &args, au_call_dpages_append); ++ ++ return args.err; ++} ++ ++int au_dcsub_pages_rev(struct au_dcsub_pages *dpages, struct dentry *dentry, ++ int do_include, au_dpages_test test, void *arg) ++{ ++ int err; ++ ++ err = 0; ++ write_seqlock(&rename_lock); ++ spin_lock(&dentry->d_lock); ++ if (do_include ++ && au_dcount(dentry) > 0 ++ && (!test || test(dentry, arg))) ++ err = au_dpages_append(dpages, dentry, GFP_ATOMIC); ++ spin_unlock(&dentry->d_lock); ++ if (unlikely(err)) ++ goto out; ++ ++ /* ++ * RCU for vfsmount is unnecessary since this is a traverse in a single ++ * mount ++ */ ++ while (!IS_ROOT(dentry)) { ++ dentry = dentry->d_parent; /* rename_lock is locked */ ++ spin_lock(&dentry->d_lock); ++ if (au_dcount(dentry) > 0 ++ && (!test || test(dentry, arg))) ++ err = au_dpages_append(dpages, dentry, GFP_ATOMIC); ++ spin_unlock(&dentry->d_lock); ++ if (unlikely(err)) ++ break; ++ } ++ ++out: ++ write_sequnlock(&rename_lock); ++ return err; ++} ++ ++static inline int au_dcsub_dpages_aufs(struct dentry *dentry, void *arg) ++{ ++ return au_di(dentry) && dentry->d_sb == arg; ++} ++ ++int au_dcsub_pages_rev_aufs(struct au_dcsub_pages *dpages, ++ struct dentry *dentry, int do_include) ++{ ++ return au_dcsub_pages_rev(dpages, dentry, do_include, ++ au_dcsub_dpages_aufs, dentry->d_sb); ++} ++ ++int au_test_subdir(struct dentry *d1, struct dentry *d2) ++{ ++ struct path path[2] = { ++ { ++ .dentry = d1 ++ }, ++ { ++ .dentry = d2 ++ } ++ }; ++ ++ return path_is_under(path + 0, path + 1); ++} +diff --git a/fs/aufs/dcsub.h b/fs/aufs/dcsub.h +new file mode 100644 +index 000000000000..7e4f4eba0343 +--- /dev/null ++++ b/fs/aufs/dcsub.h +@@ -0,0 +1,137 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * sub-routines for dentry cache ++ */ ++ ++#ifndef __AUFS_DCSUB_H__ ++#define __AUFS_DCSUB_H__ ++ ++#ifdef __KERNEL__ ++ ++#include <linux/dcache.h> ++#include <linux/fs.h> ++ ++struct au_dpage { ++ int ndentry; ++ struct dentry **dentries; ++}; ++ ++struct au_dcsub_pages { ++ int ndpage; ++ struct au_dpage *dpages; ++}; ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* dcsub.c */ ++int au_dpages_init(struct au_dcsub_pages *dpages, gfp_t gfp); ++void au_dpages_free(struct au_dcsub_pages *dpages); ++typedef int (*au_dpages_test)(struct dentry *dentry, void *arg); ++int au_dcsub_pages(struct au_dcsub_pages *dpages, struct dentry *root, ++ au_dpages_test test, void *arg); ++int au_dcsub_pages_rev(struct au_dcsub_pages *dpages, struct dentry *dentry, ++ int do_include, au_dpages_test test, void *arg); ++int au_dcsub_pages_rev_aufs(struct au_dcsub_pages *dpages, ++ struct dentry *dentry, int do_include); ++int au_test_subdir(struct dentry *d1, struct dentry *d2); ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * todo: in linux-3.13, several similar (but faster) helpers are added to ++ * include/linux/dcache.h. Try them (in the future). ++ */ ++ ++static inline int au_d_hashed_positive(struct dentry *d) ++{ ++ int err; ++ struct inode *inode = d_inode(d); ++ ++ err = 0; ++ if (unlikely(d_unhashed(d) ++ || d_is_negative(d) ++ || !inode->i_nlink)) ++ err = -ENOENT; ++ return err; ++} ++ ++static inline int au_d_linkable(struct dentry *d) ++{ ++ int err; ++ struct inode *inode = d_inode(d); ++ ++ err = au_d_hashed_positive(d); ++ if (err ++ && d_is_positive(d) ++ && (inode->i_state & I_LINKABLE)) ++ err = 0; ++ return err; ++} ++ ++static inline int au_d_alive(struct dentry *d) ++{ ++ int err; ++ struct inode *inode; ++ ++ err = 0; ++ if (!IS_ROOT(d)) ++ err = au_d_hashed_positive(d); ++ else { ++ inode = d_inode(d); ++ if (unlikely(d_unlinked(d) ++ || d_is_negative(d) ++ || !inode->i_nlink)) ++ err = -ENOENT; ++ } ++ return err; ++} ++ ++static inline int au_alive_dir(struct dentry *d) ++{ ++ int err; ++ ++ err = au_d_alive(d); ++ if (unlikely(err || IS_DEADDIR(d_inode(d)))) ++ err = -ENOENT; ++ return err; ++} ++ ++static inline int au_qstreq(struct qstr *a, struct qstr *b) ++{ ++ return a->len == b->len ++ && !memcmp(a->name, b->name, a->len); ++} ++ ++/* ++ * by the commit ++ * 360f547 2015-01-25 dcache: let the dentry count go down to zero without ++ * taking d_lock ++ * the type of d_lockref.count became int, but the inlined function d_count() ++ * still returns unsigned int. ++ * I don't know why. Maybe it is for every d_count() users? ++ * Anyway au_dcount() lives on. ++ */ ++static inline int au_dcount(struct dentry *d) ++{ ++ return (int)d_count(d); ++} ++ ++#endif /* __KERNEL__ */ ++#endif /* __AUFS_DCSUB_H__ */ +diff --git a/fs/aufs/debug.c b/fs/aufs/debug.c +new file mode 100644 +index 000000000000..e14075c4bccc +--- /dev/null ++++ b/fs/aufs/debug.c +@@ -0,0 +1,446 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * debug print functions ++ */ ++ ++#include <linux/iversion.h> ++#include "aufs.h" ++ ++/* Returns 0, or -errno. arg is in kp->arg. */ ++static int param_atomic_t_set(const char *val, const struct kernel_param *kp) ++{ ++ int err, n; ++ ++ err = kstrtoint(val, 0, &n); ++ if (!err) { ++ if (n > 0) ++ au_debug_on(); ++ else ++ au_debug_off(); ++ } ++ return err; ++} ++ ++/* Returns length written or -errno. Buffer is 4k (ie. be short!) */ ++static int param_atomic_t_get(char *buffer, const struct kernel_param *kp) ++{ ++ atomic_t *a; ++ ++ a = kp->arg; ++ return sprintf(buffer, "%d", atomic_read(a)); ++} ++ ++static const struct kernel_param_ops param_ops_atomic_t = { ++ .set = param_atomic_t_set, ++ .get = param_atomic_t_get ++ /* void (*free)(void *arg) */ ++}; ++ ++atomic_t aufs_debug = ATOMIC_INIT(0); ++MODULE_PARM_DESC(debug, "debug print"); ++module_param_named(debug, aufs_debug, atomic_t, 0664); ++ ++DEFINE_MUTEX(au_dbg_mtx); /* just to serialize the dbg msgs */ ++char *au_plevel = KERN_DEBUG; ++#define dpri(fmt, ...) do { \ ++ if ((au_plevel \ ++ && strcmp(au_plevel, KERN_DEBUG)) \ ++ || au_debug_test()) \ ++ printk("%s" fmt, au_plevel, ##__VA_ARGS__); \ ++} while (0) ++ ++/* ---------------------------------------------------------------------- */ ++ ++void au_dpri_whlist(struct au_nhash *whlist) ++{ ++ unsigned long ul, n; ++ struct hlist_head *head; ++ struct au_vdir_wh *pos; ++ ++ n = whlist->nh_num; ++ head = whlist->nh_head; ++ for (ul = 0; ul < n; ul++) { ++ hlist_for_each_entry(pos, head, wh_hash) ++ dpri("b%d, %.*s, %d\n", ++ pos->wh_bindex, ++ pos->wh_str.len, pos->wh_str.name, ++ pos->wh_str.len); ++ head++; ++ } ++} ++ ++void au_dpri_vdir(struct au_vdir *vdir) ++{ ++ unsigned long ul; ++ union au_vdir_deblk_p p; ++ unsigned char *o; ++ ++ if (!vdir || IS_ERR(vdir)) { ++ dpri("err %ld\n", PTR_ERR(vdir)); ++ return; ++ } ++ ++ dpri("deblk %u, nblk %lu, deblk %p, last{%lu, %p}, ver %llu\n", ++ vdir->vd_deblk_sz, vdir->vd_nblk, vdir->vd_deblk, ++ vdir->vd_last.ul, vdir->vd_last.p.deblk, vdir->vd_version); ++ for (ul = 0; ul < vdir->vd_nblk; ul++) { ++ p.deblk = vdir->vd_deblk[ul]; ++ o = p.deblk; ++ dpri("[%lu]: %p\n", ul, o); ++ } ++} ++ ++static int do_pri_inode(aufs_bindex_t bindex, struct inode *inode, int hn, ++ struct dentry *wh) ++{ ++ char *n = NULL; ++ int l = 0; ++ ++ if (!inode || IS_ERR(inode)) { ++ dpri("i%d: err %ld\n", bindex, PTR_ERR(inode)); ++ return -1; ++ } ++ ++ /* the type of i_blocks depends upon CONFIG_LBDAF */ ++ BUILD_BUG_ON(sizeof(inode->i_blocks) != sizeof(unsigned long) ++ && sizeof(inode->i_blocks) != sizeof(u64)); ++ if (wh) { ++ n = (void *)wh->d_name.name; ++ l = wh->d_name.len; ++ } ++ ++ dpri("i%d: %p, i%lu, %s, cnt %d, nl %u, 0%o, sz %llu, blk %llu," ++ " acl %p, def_acl %p," ++ " hn %d, ct %lld, np %lu, st 0x%lx, f 0x%x, v %llu, g %x%s%.*s\n", ++ bindex, inode, ++ inode->i_ino, inode->i_sb ? au_sbtype(inode->i_sb) : "??", ++ atomic_read(&inode->i_count), inode->i_nlink, inode->i_mode, ++ i_size_read(inode), (unsigned long long)inode->i_blocks, ++ inode->i_acl, inode->i_default_acl, ++ hn, (long long)timespec64_to_ns(&inode->i_ctime) & 0x0ffff, ++ inode->i_mapping ? inode->i_mapping->nrpages : 0, ++ inode->i_state, inode->i_flags, inode_peek_iversion(inode), ++ inode->i_generation, ++ l ? ", wh " : "", l, n); ++ return 0; ++} ++ ++void au_dpri_inode(struct inode *inode) ++{ ++ struct au_iinfo *iinfo; ++ struct au_hinode *hi; ++ aufs_bindex_t bindex; ++ int err, hn; ++ ++ err = do_pri_inode(-1, inode, -1, NULL); ++ if (err || !au_test_aufs(inode->i_sb) || au_is_bad_inode(inode)) ++ return; ++ ++ iinfo = au_ii(inode); ++ dpri("i-1: btop %d, bbot %d, gen %d\n", ++ iinfo->ii_btop, iinfo->ii_bbot, au_iigen(inode, NULL)); ++ if (iinfo->ii_btop < 0) ++ return; ++ hn = 0; ++ for (bindex = iinfo->ii_btop; bindex <= iinfo->ii_bbot; bindex++) { ++ hi = au_hinode(iinfo, bindex); ++ hn = !!au_hn(hi); ++ do_pri_inode(bindex, hi->hi_inode, hn, hi->hi_whdentry); ++ } ++} ++ ++void au_dpri_dalias(struct inode *inode) ++{ ++ struct dentry *d; ++ ++ spin_lock(&inode->i_lock); ++ hlist_for_each_entry(d, &inode->i_dentry, d_u.d_alias) ++ au_dpri_dentry(d); ++ spin_unlock(&inode->i_lock); ++} ++ ++static int do_pri_dentry(aufs_bindex_t bindex, struct dentry *dentry) ++{ ++ struct dentry *wh = NULL; ++ int hn; ++ struct inode *inode; ++ struct au_iinfo *iinfo; ++ struct au_hinode *hi; ++ ++ if (!dentry || IS_ERR(dentry)) { ++ dpri("d%d: err %ld\n", bindex, PTR_ERR(dentry)); ++ return -1; ++ } ++ /* do not call dget_parent() here */ ++ /* note: access d_xxx without d_lock */ ++ dpri("d%d: %p, %pd2?, %s, cnt %d, flags 0x%x, %shashed\n", ++ bindex, dentry, dentry, ++ dentry->d_sb ? au_sbtype(dentry->d_sb) : "??", ++ au_dcount(dentry), dentry->d_flags, ++ d_unhashed(dentry) ? "un" : ""); ++ hn = -1; ++ inode = NULL; ++ if (d_is_positive(dentry)) ++ inode = d_inode(dentry); ++ if (inode ++ && au_test_aufs(dentry->d_sb) ++ && bindex >= 0 ++ && !au_is_bad_inode(inode)) { ++ iinfo = au_ii(inode); ++ hi = au_hinode(iinfo, bindex); ++ hn = !!au_hn(hi); ++ wh = hi->hi_whdentry; ++ } ++ do_pri_inode(bindex, inode, hn, wh); ++ return 0; ++} ++ ++void au_dpri_dentry(struct dentry *dentry) ++{ ++ struct au_dinfo *dinfo; ++ aufs_bindex_t bindex; ++ int err; ++ ++ err = do_pri_dentry(-1, dentry); ++ if (err || !au_test_aufs(dentry->d_sb)) ++ return; ++ ++ dinfo = au_di(dentry); ++ if (!dinfo) ++ return; ++ dpri("d-1: btop %d, bbot %d, bwh %d, bdiropq %d, gen %d, tmp %d\n", ++ dinfo->di_btop, dinfo->di_bbot, ++ dinfo->di_bwh, dinfo->di_bdiropq, au_digen(dentry), ++ dinfo->di_tmpfile); ++ if (dinfo->di_btop < 0) ++ return; ++ for (bindex = dinfo->di_btop; bindex <= dinfo->di_bbot; bindex++) ++ do_pri_dentry(bindex, au_hdentry(dinfo, bindex)->hd_dentry); ++} ++ ++static int do_pri_file(aufs_bindex_t bindex, struct file *file) ++{ ++ char a[32]; ++ ++ if (!file || IS_ERR(file)) { ++ dpri("f%d: err %ld\n", bindex, PTR_ERR(file)); ++ return -1; ++ } ++ a[0] = 0; ++ if (bindex < 0 ++ && !IS_ERR_OR_NULL(file->f_path.dentry) ++ && au_test_aufs(file->f_path.dentry->d_sb) ++ && au_fi(file)) ++ snprintf(a, sizeof(a), ", gen %d, mmapped %d", ++ au_figen(file), atomic_read(&au_fi(file)->fi_mmapped)); ++ dpri("f%d: mode 0x%x, flags 0%o, cnt %ld, v %llu, pos %llu%s\n", ++ bindex, file->f_mode, file->f_flags, (long)file_count(file), ++ file->f_version, file->f_pos, a); ++ if (!IS_ERR_OR_NULL(file->f_path.dentry)) ++ do_pri_dentry(bindex, file->f_path.dentry); ++ return 0; ++} ++ ++void au_dpri_file(struct file *file) ++{ ++ struct au_finfo *finfo; ++ struct au_fidir *fidir; ++ struct au_hfile *hfile; ++ aufs_bindex_t bindex; ++ int err; ++ ++ err = do_pri_file(-1, file); ++ if (err ++ || IS_ERR_OR_NULL(file->f_path.dentry) ++ || !au_test_aufs(file->f_path.dentry->d_sb)) ++ return; ++ ++ finfo = au_fi(file); ++ if (!finfo) ++ return; ++ if (finfo->fi_btop < 0) ++ return; ++ fidir = finfo->fi_hdir; ++ if (!fidir) ++ do_pri_file(finfo->fi_btop, finfo->fi_htop.hf_file); ++ else ++ for (bindex = finfo->fi_btop; ++ bindex >= 0 && bindex <= fidir->fd_bbot; ++ bindex++) { ++ hfile = fidir->fd_hfile + bindex; ++ do_pri_file(bindex, hfile ? hfile->hf_file : NULL); ++ } ++} ++ ++static int do_pri_br(aufs_bindex_t bindex, struct au_branch *br) ++{ ++ struct vfsmount *mnt; ++ struct super_block *sb; ++ ++ if (!br || IS_ERR(br)) ++ goto out; ++ mnt = au_br_mnt(br); ++ if (!mnt || IS_ERR(mnt)) ++ goto out; ++ sb = mnt->mnt_sb; ++ if (!sb || IS_ERR(sb)) ++ goto out; ++ ++ dpri("s%d: {perm 0x%x, id %d, wbr %p}, " ++ "%s, dev 0x%02x%02x, flags 0x%lx, cnt %d, active %d, " ++ "xino %d\n", ++ bindex, br->br_perm, br->br_id, br->br_wbr, ++ au_sbtype(sb), MAJOR(sb->s_dev), MINOR(sb->s_dev), ++ sb->s_flags, sb->s_count, ++ atomic_read(&sb->s_active), ++ !!au_xino_file(br->br_xino, /*idx*/-1)); ++ return 0; ++ ++out: ++ dpri("s%d: err %ld\n", bindex, PTR_ERR(br)); ++ return -1; ++} ++ ++void au_dpri_sb(struct super_block *sb) ++{ ++ struct au_sbinfo *sbinfo; ++ aufs_bindex_t bindex; ++ int err; ++ /* to reduce stack size */ ++ struct { ++ struct vfsmount mnt; ++ struct au_branch fake; ++ } *a; ++ ++ /* this function can be called from magic sysrq */ ++ a = kzalloc(sizeof(*a), GFP_ATOMIC); ++ if (unlikely(!a)) { ++ dpri("no memory\n"); ++ return; ++ } ++ ++ a->mnt.mnt_sb = sb; ++ a->fake.br_path.mnt = &a->mnt; ++ err = do_pri_br(-1, &a->fake); ++ au_kfree_rcu(a); ++ dpri("dev 0x%x\n", sb->s_dev); ++ if (err || !au_test_aufs(sb)) ++ return; ++ ++ sbinfo = au_sbi(sb); ++ if (!sbinfo) ++ return; ++ dpri("nw %d, gen %u, kobj %d\n", ++ atomic_read(&sbinfo->si_nowait.nw_len), sbinfo->si_generation, ++ kref_read(&sbinfo->si_kobj.kref)); ++ for (bindex = 0; bindex <= sbinfo->si_bbot; bindex++) ++ do_pri_br(bindex, sbinfo->si_branch[0 + bindex]); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++void __au_dbg_verify_dinode(struct dentry *dentry, const char *func, int line) ++{ ++ struct inode *h_inode, *inode = d_inode(dentry); ++ struct dentry *h_dentry; ++ aufs_bindex_t bindex, bbot, bi; ++ ++ if (!inode /* || au_di(dentry)->di_lsc == AuLsc_DI_TMP */) ++ return; ++ ++ bbot = au_dbbot(dentry); ++ bi = au_ibbot(inode); ++ if (bi < bbot) ++ bbot = bi; ++ bindex = au_dbtop(dentry); ++ bi = au_ibtop(inode); ++ if (bi > bindex) ++ bindex = bi; ++ ++ for (; bindex <= bbot; bindex++) { ++ h_dentry = au_h_dptr(dentry, bindex); ++ if (!h_dentry) ++ continue; ++ h_inode = au_h_iptr(inode, bindex); ++ if (unlikely(h_inode != d_inode(h_dentry))) { ++ au_debug_on(); ++ AuDbg("b%d, %s:%d\n", bindex, func, line); ++ AuDbgDentry(dentry); ++ AuDbgInode(inode); ++ au_debug_off(); ++ if (au_test_fuse(h_inode->i_sb)) ++ WARN_ON_ONCE(1); ++ else ++ BUG(); ++ } ++ } ++} ++ ++void au_dbg_verify_gen(struct dentry *parent, unsigned int sigen) ++{ ++ int err, i, j; ++ struct au_dcsub_pages dpages; ++ struct au_dpage *dpage; ++ struct dentry **dentries; ++ ++ err = au_dpages_init(&dpages, GFP_NOFS); ++ AuDebugOn(err); ++ err = au_dcsub_pages_rev_aufs(&dpages, parent, /*do_include*/1); ++ AuDebugOn(err); ++ for (i = dpages.ndpage - 1; !err && i >= 0; i--) { ++ dpage = dpages.dpages + i; ++ dentries = dpage->dentries; ++ for (j = dpage->ndentry - 1; !err && j >= 0; j--) ++ AuDebugOn(au_digen_test(dentries[j], sigen)); ++ } ++ au_dpages_free(&dpages); ++} ++ ++void au_dbg_verify_kthread(void) ++{ ++ if (au_wkq_test()) { ++ au_dbg_blocked(); ++ /* ++ * It may be recursive, but udba=notify between two aufs mounts, ++ * where a single ro branch is shared, is not a problem. ++ */ ++ /* WARN_ON(1); */ ++ } ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++int __init au_debug_init(void) ++{ ++ aufs_bindex_t bindex; ++ struct au_vdir_destr destr; ++ ++ bindex = -1; ++ AuDebugOn(bindex >= 0); ++ ++ destr.len = -1; ++ AuDebugOn(destr.len < NAME_MAX); ++ ++#ifdef CONFIG_4KSTACKS ++ pr_warn("CONFIG_4KSTACKS is defined.\n"); ++#endif ++ ++ return 0; ++} +diff --git a/fs/aufs/debug.h b/fs/aufs/debug.h +new file mode 100644 +index 000000000000..f757588e5000 +--- /dev/null ++++ b/fs/aufs/debug.h +@@ -0,0 +1,226 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * debug print functions ++ */ ++ ++#ifndef __AUFS_DEBUG_H__ ++#define __AUFS_DEBUG_H__ ++ ++#ifdef __KERNEL__ ++ ++#include <linux/atomic.h> ++#include <linux/module.h> ++#include <linux/kallsyms.h> ++#include <linux/sysrq.h> ++ ++#ifdef CONFIG_AUFS_DEBUG ++#define AuDebugOn(a) BUG_ON(a) ++ ++/* module parameter */ ++extern atomic_t aufs_debug; ++static inline void au_debug_on(void) ++{ ++ atomic_inc(&aufs_debug); ++} ++static inline void au_debug_off(void) ++{ ++ atomic_dec_if_positive(&aufs_debug); ++} ++ ++static inline int au_debug_test(void) ++{ ++ return atomic_read(&aufs_debug) > 0; ++} ++#else ++#define AuDebugOn(a) do {} while (0) ++AuStubVoid(au_debug_on, void) ++AuStubVoid(au_debug_off, void) ++AuStubInt0(au_debug_test, void) ++#endif /* CONFIG_AUFS_DEBUG */ ++ ++#define param_check_atomic_t(name, p) __param_check(name, p, atomic_t) ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* debug print */ ++ ++#define AuDbg(fmt, ...) do { \ ++ if (au_debug_test()) \ ++ pr_debug("DEBUG: " fmt, ##__VA_ARGS__); \ ++} while (0) ++#define AuLabel(l) AuDbg(#l "\n") ++#define AuIOErr(fmt, ...) pr_err("I/O Error, " fmt, ##__VA_ARGS__) ++#define AuWarn1(fmt, ...) do { \ ++ static unsigned char _c; \ ++ if (!_c++) \ ++ pr_warn(fmt, ##__VA_ARGS__); \ ++} while (0) ++ ++#define AuErr1(fmt, ...) do { \ ++ static unsigned char _c; \ ++ if (!_c++) \ ++ pr_err(fmt, ##__VA_ARGS__); \ ++} while (0) ++ ++#define AuIOErr1(fmt, ...) do { \ ++ static unsigned char _c; \ ++ if (!_c++) \ ++ AuIOErr(fmt, ##__VA_ARGS__); \ ++} while (0) ++ ++#define AuUnsupportMsg "This operation is not supported." \ ++ " Please report this application to aufs-users ML." ++#define AuUnsupport(fmt, ...) do { \ ++ pr_err(AuUnsupportMsg "\n" fmt, ##__VA_ARGS__); \ ++ dump_stack(); \ ++} while (0) ++ ++#define AuTraceErr(e) do { \ ++ if (unlikely((e) < 0)) \ ++ AuDbg("err %d\n", (int)(e)); \ ++} while (0) ++ ++#define AuTraceErrPtr(p) do { \ ++ if (IS_ERR(p)) \ ++ AuDbg("err %ld\n", PTR_ERR(p)); \ ++} while (0) ++ ++/* dirty macros for debug print, use with "%.*s" and caution */ ++#define AuLNPair(qstr) (qstr)->len, (qstr)->name ++ ++/* ---------------------------------------------------------------------- */ ++ ++struct dentry; ++#ifdef CONFIG_AUFS_DEBUG ++extern struct mutex au_dbg_mtx; ++extern char *au_plevel; ++struct au_nhash; ++void au_dpri_whlist(struct au_nhash *whlist); ++struct au_vdir; ++void au_dpri_vdir(struct au_vdir *vdir); ++struct inode; ++void au_dpri_inode(struct inode *inode); ++void au_dpri_dalias(struct inode *inode); ++void au_dpri_dentry(struct dentry *dentry); ++struct file; ++void au_dpri_file(struct file *filp); ++struct super_block; ++void au_dpri_sb(struct super_block *sb); ++ ++#define au_dbg_verify_dinode(d) __au_dbg_verify_dinode(d, __func__, __LINE__) ++void __au_dbg_verify_dinode(struct dentry *dentry, const char *func, int line); ++void au_dbg_verify_gen(struct dentry *parent, unsigned int sigen); ++void au_dbg_verify_kthread(void); ++ ++int __init au_debug_init(void); ++ ++#define AuDbgWhlist(w) do { \ ++ mutex_lock(&au_dbg_mtx); \ ++ AuDbg(#w "\n"); \ ++ au_dpri_whlist(w); \ ++ mutex_unlock(&au_dbg_mtx); \ ++} while (0) ++ ++#define AuDbgVdir(v) do { \ ++ mutex_lock(&au_dbg_mtx); \ ++ AuDbg(#v "\n"); \ ++ au_dpri_vdir(v); \ ++ mutex_unlock(&au_dbg_mtx); \ ++} while (0) ++ ++#define AuDbgInode(i) do { \ ++ mutex_lock(&au_dbg_mtx); \ ++ AuDbg(#i "\n"); \ ++ au_dpri_inode(i); \ ++ mutex_unlock(&au_dbg_mtx); \ ++} while (0) ++ ++#define AuDbgDAlias(i) do { \ ++ mutex_lock(&au_dbg_mtx); \ ++ AuDbg(#i "\n"); \ ++ au_dpri_dalias(i); \ ++ mutex_unlock(&au_dbg_mtx); \ ++} while (0) ++ ++#define AuDbgDentry(d) do { \ ++ mutex_lock(&au_dbg_mtx); \ ++ AuDbg(#d "\n"); \ ++ au_dpri_dentry(d); \ ++ mutex_unlock(&au_dbg_mtx); \ ++} while (0) ++ ++#define AuDbgFile(f) do { \ ++ mutex_lock(&au_dbg_mtx); \ ++ AuDbg(#f "\n"); \ ++ au_dpri_file(f); \ ++ mutex_unlock(&au_dbg_mtx); \ ++} while (0) ++ ++#define AuDbgSb(sb) do { \ ++ mutex_lock(&au_dbg_mtx); \ ++ AuDbg(#sb "\n"); \ ++ au_dpri_sb(sb); \ ++ mutex_unlock(&au_dbg_mtx); \ ++} while (0) ++ ++#define AuDbgSym(addr) do { \ ++ char sym[KSYM_SYMBOL_LEN]; \ ++ sprint_symbol(sym, (unsigned long)addr); \ ++ AuDbg("%s\n", sym); \ ++} while (0) ++#else ++AuStubVoid(au_dbg_verify_dinode, struct dentry *dentry) ++AuStubVoid(au_dbg_verify_gen, struct dentry *parent, unsigned int sigen) ++AuStubVoid(au_dbg_verify_kthread, void) ++AuStubInt0(__init au_debug_init, void) ++ ++#define AuDbgWhlist(w) do {} while (0) ++#define AuDbgVdir(v) do {} while (0) ++#define AuDbgInode(i) do {} while (0) ++#define AuDbgDAlias(i) do {} while (0) ++#define AuDbgDentry(d) do {} while (0) ++#define AuDbgFile(f) do {} while (0) ++#define AuDbgSb(sb) do {} while (0) ++#define AuDbgSym(addr) do {} while (0) ++#endif /* CONFIG_AUFS_DEBUG */ ++ ++/* ---------------------------------------------------------------------- */ ++ ++#ifdef CONFIG_AUFS_MAGIC_SYSRQ ++int __init au_sysrq_init(void); ++void au_sysrq_fin(void); ++ ++#ifdef CONFIG_HW_CONSOLE ++#define au_dbg_blocked() do { \ ++ WARN_ON(1); \ ++ handle_sysrq('w'); \ ++} while (0) ++#else ++AuStubVoid(au_dbg_blocked, void) ++#endif ++ ++#else ++AuStubInt0(__init au_sysrq_init, void) ++AuStubVoid(au_sysrq_fin, void) ++AuStubVoid(au_dbg_blocked, void) ++#endif /* CONFIG_AUFS_MAGIC_SYSRQ */ ++ ++#endif /* __KERNEL__ */ ++#endif /* __AUFS_DEBUG_H__ */ +diff --git a/fs/aufs/dentry.c b/fs/aufs/dentry.c +new file mode 100644 +index 000000000000..ed7ce8f6d1a1 +--- /dev/null ++++ b/fs/aufs/dentry.c +@@ -0,0 +1,1168 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * lookup and dentry operations ++ */ ++ ++#include <linux/iversion.h> ++#include "aufs.h" ++ ++/* ++ * returns positive/negative dentry, NULL or an error. ++ * NULL means whiteout-ed or not-found. ++ */ ++static struct dentry* ++au_do_lookup(struct dentry *h_parent, struct dentry *dentry, ++ aufs_bindex_t bindex, struct au_do_lookup_args *args) ++{ ++ struct dentry *h_dentry; ++ struct inode *h_inode; ++ struct au_branch *br; ++ struct mnt_idmap *h_idmap; ++ struct path h_path; ++ int wh_found, opq; ++ unsigned char wh_able; ++ const unsigned char allow_neg = !!au_ftest_lkup(args->flags, ALLOW_NEG); ++ const unsigned char ignore_perm = !!au_ftest_lkup(args->flags, ++ IGNORE_PERM); ++ ++ wh_found = 0; ++ br = au_sbr(dentry->d_sb, bindex); ++ h_path.dentry = h_parent; ++ h_path.mnt = au_br_mnt(br); ++ h_idmap = au_br_idmap(br); ++ wh_able = !!au_br_whable(br->br_perm); ++ if (wh_able) ++ wh_found = au_wh_test(h_idmap, &h_path, &args->whname, ++ ignore_perm); ++ h_dentry = ERR_PTR(wh_found); ++ if (!wh_found) ++ goto real_lookup; ++ if (unlikely(wh_found < 0)) ++ goto out; ++ ++ /* We found a whiteout */ ++ /* au_set_dbbot(dentry, bindex); */ ++ au_set_dbwh(dentry, bindex); ++ if (!allow_neg) ++ return NULL; /* success */ ++ ++real_lookup: ++ if (!ignore_perm) ++ h_dentry = vfsub_lkup_one(args->name, &h_path); ++ else ++ h_dentry = au_sio_lkup_one(h_idmap, args->name, &h_path); ++ if (IS_ERR(h_dentry)) { ++ if (PTR_ERR(h_dentry) == -ENAMETOOLONG ++ && !allow_neg) ++ h_dentry = NULL; ++ goto out; ++ } ++ ++ h_inode = d_inode(h_dentry); ++ if (d_is_negative(h_dentry)) { ++ if (!allow_neg) ++ goto out_neg; ++ } else if (wh_found ++ || (args->type && args->type != (h_inode->i_mode & S_IFMT))) ++ goto out_neg; ++ else if (au_ftest_lkup(args->flags, DIRREN) ++ /* && h_inode */ ++ && !au_dr_lkup_h_ino(args, bindex, h_inode->i_ino)) { ++ AuDbg("b%d %pd ignored hi%llu\n", bindex, h_dentry, ++ (unsigned long long)h_inode->i_ino); ++ goto out_neg; ++ } ++ ++ if (au_dbbot(dentry) <= bindex) ++ au_set_dbbot(dentry, bindex); ++ if (au_dbtop(dentry) < 0 || bindex < au_dbtop(dentry)) ++ au_set_dbtop(dentry, bindex); ++ au_set_h_dptr(dentry, bindex, h_dentry); ++ ++ if (!d_is_dir(h_dentry) ++ || !wh_able ++ || (d_really_is_positive(dentry) && !d_is_dir(dentry))) ++ goto out; /* success */ ++ ++ h_path.dentry = h_dentry; ++ inode_lock_shared_nested(h_inode, AuLsc_I_CHILD); ++ opq = au_diropq_test(h_idmap, &h_path); ++ inode_unlock_shared(h_inode); ++ if (opq > 0) ++ au_set_dbdiropq(dentry, bindex); ++ else if (unlikely(opq < 0)) { ++ au_set_h_dptr(dentry, bindex, NULL); ++ h_dentry = ERR_PTR(opq); ++ } ++ goto out; ++ ++out_neg: ++ dput(h_dentry); ++ h_dentry = NULL; ++out: ++ return h_dentry; ++} ++ ++static int au_test_shwh(struct super_block *sb, const struct qstr *name) ++{ ++ if (unlikely(!au_opt_test(au_mntflags(sb), SHWH) ++ && !strncmp(name->name, AUFS_WH_PFX, AUFS_WH_PFX_LEN))) ++ return -EPERM; ++ return 0; ++} ++ ++/* ++ * returns the number of lower positive dentries, ++ * otherwise an error. ++ * can be called at unlinking with @type is zero. ++ */ ++int au_lkup_dentry(struct dentry *dentry, aufs_bindex_t btop, ++ unsigned int flags) ++{ ++ int npositive, err; ++ aufs_bindex_t bindex, btail, bdiropq; ++ unsigned char isdir, dirperm1, dirren; ++ struct au_do_lookup_args args = { ++ .flags = flags, ++ .name = &dentry->d_name ++ }; ++ struct dentry *parent; ++ struct super_block *sb; ++ ++ sb = dentry->d_sb; ++ err = au_test_shwh(sb, args.name); ++ if (unlikely(err)) ++ goto out; ++ ++ err = au_wh_name_alloc(&args.whname, args.name); ++ if (unlikely(err)) ++ goto out; ++ ++ isdir = !!d_is_dir(dentry); ++ dirperm1 = !!au_opt_test(au_mntflags(sb), DIRPERM1); ++ dirren = !!au_opt_test(au_mntflags(sb), DIRREN); ++ if (dirren) ++ au_fset_lkup(args.flags, DIRREN); ++ ++ npositive = 0; ++ parent = dget_parent(dentry); ++ btail = au_dbtaildir(parent); ++ for (bindex = btop; bindex <= btail; bindex++) { ++ struct dentry *h_parent, *h_dentry; ++ struct inode *h_inode, *h_dir; ++ struct au_branch *br; ++ ++ h_dentry = au_h_dptr(dentry, bindex); ++ if (h_dentry) { ++ if (d_is_positive(h_dentry)) ++ npositive++; ++ break; ++ } ++ h_parent = au_h_dptr(parent, bindex); ++ if (!h_parent || !d_is_dir(h_parent)) ++ continue; ++ ++ if (dirren) { ++ /* if the inum matches, then use the prepared name */ ++ err = au_dr_lkup_name(&args, bindex); ++ if (unlikely(err)) ++ goto out_parent; ++ } ++ ++ h_dir = d_inode(h_parent); ++ inode_lock_shared_nested(h_dir, AuLsc_I_PARENT); ++ h_dentry = au_do_lookup(h_parent, dentry, bindex, &args); ++ inode_unlock_shared(h_dir); ++ err = PTR_ERR(h_dentry); ++ if (IS_ERR(h_dentry)) ++ goto out_parent; ++ if (h_dentry) ++ au_fclr_lkup(args.flags, ALLOW_NEG); ++ if (dirperm1) ++ au_fset_lkup(args.flags, IGNORE_PERM); ++ ++ if (au_dbwh(dentry) == bindex) ++ break; ++ if (!h_dentry) ++ continue; ++ if (d_is_negative(h_dentry)) ++ continue; ++ h_inode = d_inode(h_dentry); ++ npositive++; ++ if (!args.type) ++ args.type = h_inode->i_mode & S_IFMT; ++ if (args.type != S_IFDIR) ++ break; ++ else if (isdir) { ++ /* the type of lower may be different */ ++ bdiropq = au_dbdiropq(dentry); ++ if (bdiropq >= 0 && bdiropq <= bindex) ++ break; ++ } ++ br = au_sbr(sb, bindex); ++ if (dirren ++ && au_dr_hino_test_add(&br->br_dirren, h_inode->i_ino, ++ /*add_ent*/NULL)) { ++ /* prepare next name to lookup */ ++ err = au_dr_lkup(&args, dentry, bindex); ++ if (unlikely(err)) ++ goto out_parent; ++ } ++ } ++ ++ if (npositive) { ++ AuLabel(positive); ++ au_update_dbtop(dentry); ++ } ++ err = npositive; ++ if (unlikely(!au_opt_test(au_mntflags(sb), UDBA_NONE) ++ && au_dbtop(dentry) < 0)) { ++ err = -EIO; ++ AuIOErr("both of real entry and whiteout found, %pd, err %d\n", ++ dentry, err); ++ } ++ ++out_parent: ++ dput(parent); ++ au_kfree_try_rcu(args.whname.name); ++ if (dirren) ++ au_dr_lkup_fin(&args); ++out: ++ return err; ++} ++ ++struct dentry *au_sio_lkup_one(struct mnt_idmap *idmap, struct qstr *name, ++ struct path *ppath) ++{ ++ struct dentry *dentry; ++ int wkq_err; ++ ++ if (!au_test_h_perm_sio(idmap, d_inode(ppath->dentry), MAY_EXEC)) ++ dentry = vfsub_lkup_one(name, ppath); ++ else { ++ struct vfsub_lkup_one_args args = { ++ .errp = &dentry, ++ .name = name, ++ .ppath = ppath ++ }; ++ ++ wkq_err = au_wkq_wait(vfsub_call_lkup_one, &args); ++ if (unlikely(wkq_err)) ++ dentry = ERR_PTR(wkq_err); ++ } ++ ++ return dentry; ++} ++ ++/* ++ * lookup @dentry on @bindex which should be negative. ++ */ ++int au_lkup_neg(struct dentry *dentry, aufs_bindex_t bindex, int wh) ++{ ++ int err; ++ struct dentry *parent, *h_dentry; ++ struct au_branch *br; ++ struct mnt_idmap *h_idmap; ++ struct path h_ppath; ++ ++ parent = dget_parent(dentry); ++ br = au_sbr(dentry->d_sb, bindex); ++ h_ppath.dentry = au_h_dptr(parent, bindex); ++ h_ppath.mnt = au_br_mnt(br); ++ h_idmap = au_br_idmap(br); ++ if (wh) ++ h_dentry = au_whtmp_lkup(h_ppath.dentry, br, &dentry->d_name); ++ else ++ h_dentry = au_sio_lkup_one(h_idmap, &dentry->d_name, &h_ppath); ++ err = PTR_ERR(h_dentry); ++ if (IS_ERR(h_dentry)) ++ goto out; ++ if (unlikely(d_is_positive(h_dentry))) { ++ err = -EIO; ++ AuIOErr("%pd should be negative on b%d.\n", h_dentry, bindex); ++ dput(h_dentry); ++ goto out; ++ } ++ ++ err = 0; ++ if (bindex < au_dbtop(dentry)) ++ au_set_dbtop(dentry, bindex); ++ if (au_dbbot(dentry) < bindex) ++ au_set_dbbot(dentry, bindex); ++ au_set_h_dptr(dentry, bindex, h_dentry); ++ ++out: ++ dput(parent); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* subset of struct inode */ ++struct au_iattr { ++ unsigned long i_ino; ++ /* unsigned int i_nlink; */ ++ kuid_t i_uid; ++ kgid_t i_gid; ++ u64 i_version; ++/* ++ loff_t i_size; ++ blkcnt_t i_blocks; ++*/ ++ umode_t i_mode; ++}; ++ ++static void au_iattr_save(struct au_iattr *ia, struct inode *h_inode) ++{ ++ ia->i_ino = h_inode->i_ino; ++ /* ia->i_nlink = h_inode->i_nlink; */ ++ ia->i_uid = h_inode->i_uid; ++ ia->i_gid = h_inode->i_gid; ++ ia->i_version = inode_query_iversion(h_inode); ++/* ++ ia->i_size = h_inode->i_size; ++ ia->i_blocks = h_inode->i_blocks; ++*/ ++ ia->i_mode = (h_inode->i_mode & S_IFMT); ++} ++ ++static int au_iattr_test(struct au_iattr *ia, struct inode *h_inode) ++{ ++ return ia->i_ino != h_inode->i_ino ++ /* || ia->i_nlink != h_inode->i_nlink */ ++ || !uid_eq(ia->i_uid, h_inode->i_uid) ++ || !gid_eq(ia->i_gid, h_inode->i_gid) ++ || !inode_eq_iversion(h_inode, ia->i_version) ++/* ++ || ia->i_size != h_inode->i_size ++ || ia->i_blocks != h_inode->i_blocks ++*/ ++ || ia->i_mode != (h_inode->i_mode & S_IFMT); ++} ++ ++static int au_h_verify_dentry(struct dentry *h_dentry, struct dentry *h_parent, ++ struct au_branch *br) ++{ ++ int err; ++ struct au_iattr ia; ++ struct inode *h_inode; ++ struct dentry *h_d; ++ struct super_block *h_sb; ++ struct path h_ppath; ++ ++ err = 0; ++ memset(&ia, -1, sizeof(ia)); ++ h_sb = h_dentry->d_sb; ++ h_inode = NULL; ++ if (d_is_positive(h_dentry)) { ++ h_inode = d_inode(h_dentry); ++ au_iattr_save(&ia, h_inode); ++ } else if (au_test_nfs(h_sb) || au_test_fuse(h_sb)) ++ /* nfs d_revalidate may return 0 for negative dentry */ ++ /* fuse d_revalidate always return 0 for negative dentry */ ++ goto out; ++ ++ /* main purpose is namei.c:cached_lookup() and d_revalidate */ ++ h_ppath.dentry = h_parent; ++ h_ppath.mnt = au_br_mnt(br); ++ h_d = vfsub_lkup_one(&h_dentry->d_name, &h_ppath); ++ err = PTR_ERR(h_d); ++ if (IS_ERR(h_d)) ++ goto out; ++ ++ err = 0; ++ if (unlikely(h_d != h_dentry ++ || d_inode(h_d) != h_inode ++ || (h_inode && au_iattr_test(&ia, h_inode)))) ++ err = au_busy_or_stale(); ++ dput(h_d); ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++int au_h_verify(struct dentry *h_dentry, unsigned int udba, struct inode *h_dir, ++ struct dentry *h_parent, struct au_branch *br) ++{ ++ int err; ++ ++ err = 0; ++ if (udba == AuOpt_UDBA_REVAL ++ && !au_test_fs_remote(h_dentry->d_sb)) { ++ IMustLock(h_dir); ++ err = (d_inode(h_dentry->d_parent) != h_dir); ++ } else if (udba != AuOpt_UDBA_NONE) ++ err = au_h_verify_dentry(h_dentry, h_parent, br); ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int au_do_refresh_hdentry(struct dentry *dentry, struct dentry *parent) ++{ ++ int err; ++ aufs_bindex_t new_bindex, bindex, bbot, bwh, bdiropq; ++ struct au_hdentry tmp, *p, *q; ++ struct au_dinfo *dinfo; ++ struct super_block *sb; ++ ++ DiMustWriteLock(dentry); ++ ++ sb = dentry->d_sb; ++ dinfo = au_di(dentry); ++ bbot = dinfo->di_bbot; ++ bwh = dinfo->di_bwh; ++ bdiropq = dinfo->di_bdiropq; ++ bindex = dinfo->di_btop; ++ p = au_hdentry(dinfo, bindex); ++ for (; bindex <= bbot; bindex++, p++) { ++ if (!p->hd_dentry) ++ continue; ++ ++ new_bindex = au_br_index(sb, p->hd_id); ++ if (new_bindex == bindex) ++ continue; ++ ++ if (dinfo->di_bwh == bindex) ++ bwh = new_bindex; ++ if (dinfo->di_bdiropq == bindex) ++ bdiropq = new_bindex; ++ if (new_bindex < 0) { ++ au_hdput(p); ++ p->hd_dentry = NULL; ++ continue; ++ } ++ ++ /* swap two lower dentries, and loop again */ ++ q = au_hdentry(dinfo, new_bindex); ++ tmp = *q; ++ *q = *p; ++ *p = tmp; ++ if (tmp.hd_dentry) { ++ bindex--; ++ p--; ++ } ++ } ++ ++ dinfo->di_bwh = -1; ++ if (bwh >= 0 && bwh <= au_sbbot(sb) && au_sbr_whable(sb, bwh)) ++ dinfo->di_bwh = bwh; ++ ++ dinfo->di_bdiropq = -1; ++ if (bdiropq >= 0 ++ && bdiropq <= au_sbbot(sb) ++ && au_sbr_whable(sb, bdiropq)) ++ dinfo->di_bdiropq = bdiropq; ++ ++ err = -EIO; ++ dinfo->di_btop = -1; ++ dinfo->di_bbot = -1; ++ bbot = au_dbbot(parent); ++ bindex = 0; ++ p = au_hdentry(dinfo, bindex); ++ for (; bindex <= bbot; bindex++, p++) ++ if (p->hd_dentry) { ++ dinfo->di_btop = bindex; ++ break; ++ } ++ ++ if (dinfo->di_btop >= 0) { ++ bindex = bbot; ++ p = au_hdentry(dinfo, bindex); ++ for (; bindex >= 0; bindex--, p--) ++ if (p->hd_dentry) { ++ dinfo->di_bbot = bindex; ++ err = 0; ++ break; ++ } ++ } ++ ++ return err; ++} ++ ++static void au_do_hide(struct dentry *dentry) ++{ ++ struct inode *inode; ++ ++ if (d_really_is_positive(dentry)) { ++ inode = d_inode(dentry); ++ if (!d_is_dir(dentry)) { ++ if (inode->i_nlink && !d_unhashed(dentry)) ++ drop_nlink(inode); ++ } else { ++ clear_nlink(inode); ++ /* stop next lookup */ ++ inode->i_flags |= S_DEAD; ++ } ++ smp_mb(); /* necessary? */ ++ } ++ d_drop(dentry); ++} ++ ++static int au_hide_children(struct dentry *parent) ++{ ++ int err, i, j, ndentry; ++ struct au_dcsub_pages dpages; ++ struct au_dpage *dpage; ++ struct dentry *dentry; ++ ++ err = au_dpages_init(&dpages, GFP_NOFS); ++ if (unlikely(err)) ++ goto out; ++ err = au_dcsub_pages(&dpages, parent, NULL, NULL); ++ if (unlikely(err)) ++ goto out_dpages; ++ ++ /* in reverse order */ ++ for (i = dpages.ndpage - 1; i >= 0; i--) { ++ dpage = dpages.dpages + i; ++ ndentry = dpage->ndentry; ++ for (j = ndentry - 1; j >= 0; j--) { ++ dentry = dpage->dentries[j]; ++ if (dentry != parent) ++ au_do_hide(dentry); ++ } ++ } ++ ++out_dpages: ++ au_dpages_free(&dpages); ++out: ++ return err; ++} ++ ++static void au_hide(struct dentry *dentry) ++{ ++ int err; ++ ++ AuDbgDentry(dentry); ++ if (d_is_dir(dentry)) { ++ /* shrink_dcache_parent(dentry); */ ++ err = au_hide_children(dentry); ++ if (unlikely(err)) ++ AuIOErr("%pd, failed hiding children, ignored %d\n", ++ dentry, err); ++ } ++ au_do_hide(dentry); ++} ++ ++/* ++ * By adding a dirty branch, a cached dentry may be affected in various ways. ++ * ++ * a dirty branch is added ++ * - on the top of layers ++ * - in the middle of layers ++ * - to the bottom of layers ++ * ++ * on the added branch there exists ++ * - a whiteout ++ * - a diropq ++ * - a same named entry ++ * + exist ++ * * negative --> positive ++ * * positive --> positive ++ * - type is unchanged ++ * - type is changed ++ * + doesn't exist ++ * * negative --> negative ++ * * positive --> negative (rejected by au_br_del() for non-dir case) ++ * - none ++ */ ++static int au_refresh_by_dinfo(struct dentry *dentry, struct au_dinfo *dinfo, ++ struct au_dinfo *tmp) ++{ ++ int err; ++ aufs_bindex_t bindex, bbot; ++ struct { ++ struct dentry *dentry; ++ struct inode *inode; ++ mode_t mode; ++ } orig_h, tmp_h = { ++ .dentry = NULL ++ }; ++ struct au_hdentry *hd; ++ struct inode *inode, *h_inode; ++ struct dentry *h_dentry; ++ ++ err = 0; ++ AuDebugOn(dinfo->di_btop < 0); ++ orig_h.mode = 0; ++ orig_h.dentry = au_hdentry(dinfo, dinfo->di_btop)->hd_dentry; ++ orig_h.inode = NULL; ++ if (d_is_positive(orig_h.dentry)) { ++ orig_h.inode = d_inode(orig_h.dentry); ++ orig_h.mode = orig_h.inode->i_mode & S_IFMT; ++ } ++ if (tmp->di_btop >= 0) { ++ tmp_h.dentry = au_hdentry(tmp, tmp->di_btop)->hd_dentry; ++ if (d_is_positive(tmp_h.dentry)) { ++ tmp_h.inode = d_inode(tmp_h.dentry); ++ tmp_h.mode = tmp_h.inode->i_mode & S_IFMT; ++ } ++ } ++ ++ inode = NULL; ++ if (d_really_is_positive(dentry)) ++ inode = d_inode(dentry); ++ if (!orig_h.inode) { ++ AuDbg("negative originally\n"); ++ if (inode) { ++ au_hide(dentry); ++ goto out; ++ } ++ AuDebugOn(inode); ++ AuDebugOn(dinfo->di_btop != dinfo->di_bbot); ++ AuDebugOn(dinfo->di_bdiropq != -1); ++ ++ if (!tmp_h.inode) { ++ AuDbg("negative --> negative\n"); ++ /* should have only one negative lower */ ++ if (tmp->di_btop >= 0 ++ && tmp->di_btop < dinfo->di_btop) { ++ AuDebugOn(tmp->di_btop != tmp->di_bbot); ++ AuDebugOn(dinfo->di_btop != dinfo->di_bbot); ++ au_set_h_dptr(dentry, dinfo->di_btop, NULL); ++ au_di_cp(dinfo, tmp); ++ hd = au_hdentry(tmp, tmp->di_btop); ++ au_set_h_dptr(dentry, tmp->di_btop, ++ dget(hd->hd_dentry)); ++ } ++ au_dbg_verify_dinode(dentry); ++ } else { ++ AuDbg("negative --> positive\n"); ++ /* ++ * similar to the behaviour of creating with bypassing ++ * aufs. ++ * unhash it in order to force an error in the ++ * succeeding create operation. ++ * we should not set S_DEAD here. ++ */ ++ d_drop(dentry); ++ /* au_di_swap(tmp, dinfo); */ ++ au_dbg_verify_dinode(dentry); ++ } ++ } else { ++ AuDbg("positive originally\n"); ++ /* inode may be NULL */ ++ AuDebugOn(inode && (inode->i_mode & S_IFMT) != orig_h.mode); ++ if (!tmp_h.inode) { ++ AuDbg("positive --> negative\n"); ++ /* or bypassing aufs */ ++ au_hide(dentry); ++ if (tmp->di_bwh >= 0 && tmp->di_bwh <= dinfo->di_btop) ++ dinfo->di_bwh = tmp->di_bwh; ++ if (inode) ++ err = au_refresh_hinode_self(inode); ++ au_dbg_verify_dinode(dentry); ++ } else if (orig_h.mode == tmp_h.mode) { ++ AuDbg("positive --> positive, same type\n"); ++ if (!S_ISDIR(orig_h.mode) ++ && dinfo->di_btop > tmp->di_btop) { ++ /* ++ * similar to the behaviour of removing and ++ * creating. ++ */ ++ au_hide(dentry); ++ if (inode) ++ err = au_refresh_hinode_self(inode); ++ au_dbg_verify_dinode(dentry); ++ } else { ++ /* fill empty slots */ ++ if (dinfo->di_btop > tmp->di_btop) ++ dinfo->di_btop = tmp->di_btop; ++ if (dinfo->di_bbot < tmp->di_bbot) ++ dinfo->di_bbot = tmp->di_bbot; ++ dinfo->di_bwh = tmp->di_bwh; ++ dinfo->di_bdiropq = tmp->di_bdiropq; ++ bbot = dinfo->di_bbot; ++ bindex = tmp->di_btop; ++ hd = au_hdentry(tmp, bindex); ++ for (; bindex <= bbot; bindex++, hd++) { ++ if (au_h_dptr(dentry, bindex)) ++ continue; ++ h_dentry = hd->hd_dentry; ++ if (!h_dentry) ++ continue; ++ AuDebugOn(d_is_negative(h_dentry)); ++ h_inode = d_inode(h_dentry); ++ AuDebugOn(orig_h.mode ++ != (h_inode->i_mode ++ & S_IFMT)); ++ au_set_h_dptr(dentry, bindex, ++ dget(h_dentry)); ++ } ++ if (inode) ++ err = au_refresh_hinode(inode, dentry); ++ au_dbg_verify_dinode(dentry); ++ } ++ } else { ++ AuDbg("positive --> positive, different type\n"); ++ /* similar to the behaviour of removing and creating */ ++ au_hide(dentry); ++ if (inode) ++ err = au_refresh_hinode_self(inode); ++ au_dbg_verify_dinode(dentry); ++ } ++ } ++ ++out: ++ return err; ++} ++ ++void au_refresh_dop(struct dentry *dentry, int force_reval) ++{ ++ const struct dentry_operations *dop ++ = force_reval ? &aufs_dop : dentry->d_sb->s_d_op; ++ static const unsigned int mask ++ = DCACHE_OP_REVALIDATE | DCACHE_OP_WEAK_REVALIDATE; ++ ++ BUILD_BUG_ON(sizeof(mask) != sizeof(dentry->d_flags)); ++ ++ if (dentry->d_op == dop) ++ return; ++ ++ AuDbg("%pd\n", dentry); ++ spin_lock(&dentry->d_lock); ++ if (dop == &aufs_dop) ++ dentry->d_flags |= mask; ++ else ++ dentry->d_flags &= ~mask; ++ dentry->d_op = dop; ++ spin_unlock(&dentry->d_lock); ++} ++ ++int au_refresh_dentry(struct dentry *dentry, struct dentry *parent) ++{ ++ int err, ebrange, nbr; ++ unsigned int sigen; ++ struct au_dinfo *dinfo, *tmp; ++ struct super_block *sb; ++ struct inode *inode; ++ ++ DiMustWriteLock(dentry); ++ AuDebugOn(IS_ROOT(dentry)); ++ AuDebugOn(d_really_is_negative(parent)); ++ ++ sb = dentry->d_sb; ++ sigen = au_sigen(sb); ++ err = au_digen_test(parent, sigen); ++ if (unlikely(err)) ++ goto out; ++ ++ nbr = au_sbbot(sb) + 1; ++ dinfo = au_di(dentry); ++ err = au_di_realloc(dinfo, nbr, /*may_shrink*/0); ++ if (unlikely(err)) ++ goto out; ++ ebrange = au_dbrange_test(dentry); ++ if (!ebrange) ++ ebrange = au_do_refresh_hdentry(dentry, parent); ++ ++ if (d_unhashed(dentry) || ebrange /* || dinfo->di_tmpfile */) { ++ AuDebugOn(au_dbtop(dentry) < 0 && au_dbbot(dentry) >= 0); ++ if (d_really_is_positive(dentry)) { ++ inode = d_inode(dentry); ++ err = au_refresh_hinode_self(inode); ++ } ++ au_dbg_verify_dinode(dentry); ++ if (!err) ++ goto out_dgen; /* success */ ++ goto out; ++ } ++ ++ /* temporary dinfo */ ++ AuDbgDentry(dentry); ++ err = -ENOMEM; ++ tmp = au_di_alloc(sb, AuLsc_DI_TMP); ++ if (unlikely(!tmp)) ++ goto out; ++ au_di_swap(tmp, dinfo); ++ /* returns the number of positive dentries */ ++ /* ++ * if current working dir is removed, it returns an error. ++ * but the dentry is legal. ++ */ ++ err = au_lkup_dentry(dentry, /*btop*/0, AuLkup_ALLOW_NEG); ++ AuDbgDentry(dentry); ++ au_di_swap(tmp, dinfo); ++ if (err == -ENOENT) ++ err = 0; ++ if (err >= 0) { ++ /* compare/refresh by dinfo */ ++ AuDbgDentry(dentry); ++ err = au_refresh_by_dinfo(dentry, dinfo, tmp); ++ au_dbg_verify_dinode(dentry); ++ AuTraceErr(err); ++ } ++ au_di_realloc(dinfo, nbr, /*may_shrink*/1); /* harmless if err */ ++ au_rw_write_unlock(&tmp->di_rwsem); ++ au_di_free(tmp); ++ if (unlikely(err)) ++ goto out; ++ ++out_dgen: ++ au_update_digen(dentry); ++out: ++ if (unlikely(err && !(dentry->d_flags & DCACHE_NFSFS_RENAMED))) { ++ AuIOErr("failed refreshing %pd, %d\n", dentry, err); ++ AuDbgDentry(dentry); ++ } ++ AuTraceErr(err); ++ return err; ++} ++ ++static int au_do_h_d_reval(struct dentry *h_dentry, unsigned int flags, ++ struct dentry *dentry, aufs_bindex_t bindex) ++{ ++ int err, valid; ++ ++ err = 0; ++ if (!(h_dentry->d_flags & DCACHE_OP_REVALIDATE)) ++ goto out; ++ ++ AuDbg("b%d\n", bindex); ++ /* ++ * gave up supporting LOOKUP_CREATE/OPEN for lower fs, ++ * due to whiteout and branch permission. ++ */ ++ flags &= ~(/*LOOKUP_PARENT |*/ LOOKUP_OPEN | LOOKUP_CREATE ++ | LOOKUP_FOLLOW | LOOKUP_EXCL); ++ /* it may return tri-state */ ++ valid = h_dentry->d_op->d_revalidate(h_dentry, flags); ++ ++ if (unlikely(valid < 0)) ++ err = valid; ++ else if (!valid) ++ err = -EINVAL; ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++/* todo: remove this */ ++static int h_d_revalidate(struct dentry *dentry, struct inode *inode, ++ unsigned int flags, int do_udba, int dirren) ++{ ++ int err; ++ umode_t mode, h_mode; ++ aufs_bindex_t bindex, btail, btop, ibs, ibe; ++ unsigned char plus, unhashed, is_root, h_plus, h_nfs, tmpfile; ++ struct inode *h_inode, *h_cached_inode; ++ struct dentry *h_dentry; ++ struct qstr *name, *h_name; ++ ++ err = 0; ++ plus = 0; ++ mode = 0; ++ ibs = -1; ++ ibe = -1; ++ unhashed = !!d_unhashed(dentry); ++ is_root = !!IS_ROOT(dentry); ++ name = &dentry->d_name; ++ tmpfile = au_di(dentry)->di_tmpfile; ++ ++ /* ++ * Theoretically, REVAL test should be unnecessary in case of ++ * {FS,I}NOTIFY. ++ * But {fs,i}notify doesn't fire some necessary events, ++ * IN_ATTRIB for atime/nlink/pageio ++ * Let's do REVAL test too. ++ */ ++ if (do_udba && inode) { ++ mode = (inode->i_mode & S_IFMT); ++ plus = (inode->i_nlink > 0); ++ ibs = au_ibtop(inode); ++ ibe = au_ibbot(inode); ++ } ++ ++ btop = au_dbtop(dentry); ++ btail = btop; ++ if (inode && S_ISDIR(inode->i_mode)) ++ btail = au_dbtaildir(dentry); ++ for (bindex = btop; bindex <= btail; bindex++) { ++ h_dentry = au_h_dptr(dentry, bindex); ++ if (!h_dentry) ++ continue; ++ ++ AuDbg("b%d, %pd\n", bindex, h_dentry); ++ h_nfs = !!au_test_nfs(h_dentry->d_sb); ++ spin_lock(&h_dentry->d_lock); ++ h_name = &h_dentry->d_name; ++ if (unlikely(do_udba ++ && !is_root ++ && ((!h_nfs ++ && (unhashed != !!d_unhashed(h_dentry) ++ || (!tmpfile && !dirren ++ && !au_qstreq(name, h_name)) ++ )) ++ || (h_nfs ++ && !(flags & LOOKUP_OPEN) ++ && (h_dentry->d_flags ++ & DCACHE_NFSFS_RENAMED))) ++ )) { ++ int h_unhashed; ++ ++ h_unhashed = d_unhashed(h_dentry); ++ spin_unlock(&h_dentry->d_lock); ++ AuDbg("unhash 0x%x 0x%x, %pd %pd\n", ++ unhashed, h_unhashed, dentry, h_dentry); ++ goto err; ++ } ++ spin_unlock(&h_dentry->d_lock); ++ ++ err = au_do_h_d_reval(h_dentry, flags, dentry, bindex); ++ if (unlikely(err)) ++ /* do not goto err, to keep the errno */ ++ break; ++ ++ /* todo: plink too? */ ++ if (!do_udba) ++ continue; ++ ++ /* UDBA tests */ ++ if (unlikely(!!inode != d_is_positive(h_dentry))) ++ goto err; ++ ++ h_inode = NULL; ++ if (d_is_positive(h_dentry)) ++ h_inode = d_inode(h_dentry); ++ h_plus = plus; ++ h_mode = mode; ++ h_cached_inode = h_inode; ++ if (h_inode) { ++ h_mode = (h_inode->i_mode & S_IFMT); ++ h_plus = (h_inode->i_nlink > 0); ++ } ++ if (inode && ibs <= bindex && bindex <= ibe) ++ h_cached_inode = au_h_iptr(inode, bindex); ++ ++ if (!h_nfs) { ++ if (unlikely(plus != h_plus && !tmpfile)) ++ goto err; ++ } else { ++ if (unlikely(!(h_dentry->d_flags & DCACHE_NFSFS_RENAMED) ++ && !is_root ++ && !IS_ROOT(h_dentry) ++ && unhashed != d_unhashed(h_dentry))) ++ goto err; ++ } ++ if (unlikely(mode != h_mode ++ || h_cached_inode != h_inode)) ++ goto err; ++ continue; ++ ++err: ++ err = -EINVAL; ++ break; ++ } ++ ++ AuTraceErr(err); ++ return err; ++} ++ ++/* todo: consolidate with do_refresh() and au_reval_for_attr() */ ++static int simple_reval_dpath(struct dentry *dentry, unsigned int sigen) ++{ ++ int err; ++ struct dentry *parent; ++ ++ if (!au_digen_test(dentry, sigen)) ++ return 0; ++ ++ parent = dget_parent(dentry); ++ di_read_lock_parent(parent, AuLock_IR); ++ AuDebugOn(au_digen_test(parent, sigen)); ++ au_dbg_verify_gen(parent, sigen); ++ err = au_refresh_dentry(dentry, parent); ++ di_read_unlock(parent, AuLock_IR); ++ dput(parent); ++ AuTraceErr(err); ++ return err; ++} ++ ++int au_reval_dpath(struct dentry *dentry, unsigned int sigen) ++{ ++ int err; ++ struct dentry *d, *parent; ++ ++ if (!au_ftest_si(au_sbi(dentry->d_sb), FAILED_REFRESH_DIR)) ++ return simple_reval_dpath(dentry, sigen); ++ ++ /* slow loop, keep it simple and stupid */ ++ /* cf: au_cpup_dirs() */ ++ err = 0; ++ parent = NULL; ++ while (au_digen_test(dentry, sigen)) { ++ d = dentry; ++ while (1) { ++ dput(parent); ++ parent = dget_parent(d); ++ if (!au_digen_test(parent, sigen)) ++ break; ++ d = parent; ++ } ++ ++ if (d != dentry) ++ di_write_lock_child2(d); ++ ++ /* someone might update our dentry while we were sleeping */ ++ if (au_digen_test(d, sigen)) { ++ /* ++ * todo: consolidate with simple_reval_dpath(), ++ * do_refresh() and au_reval_for_attr(). ++ */ ++ di_read_lock_parent(parent, AuLock_IR); ++ err = au_refresh_dentry(d, parent); ++ di_read_unlock(parent, AuLock_IR); ++ } ++ ++ if (d != dentry) ++ di_write_unlock(d); ++ dput(parent); ++ if (unlikely(err)) ++ break; ++ } ++ ++ return err; ++} ++ ++/* ++ * if valid returns 1, otherwise 0. ++ */ ++static int aufs_d_revalidate(struct dentry *dentry, unsigned int flags) ++{ ++ int valid, err; ++ unsigned int sigen; ++ unsigned char do_udba, dirren; ++ struct super_block *sb; ++ struct inode *inode; ++ ++ /* todo: support rcu-walk? */ ++ if (flags & LOOKUP_RCU) ++ return -ECHILD; ++ ++ valid = 0; ++ if (unlikely(!au_di(dentry))) ++ goto out; ++ ++ valid = 1; ++ sb = dentry->d_sb; ++ /* ++ * todo: very ugly ++ * i_mutex of parent dir may be held, ++ * but we should not return 'invalid' due to busy. ++ */ ++ err = aufs_read_lock(dentry, AuLock_FLUSH | AuLock_DW | AuLock_NOPLM); ++ if (unlikely(err)) { ++ valid = err; ++ AuTraceErr(err); ++ goto out; ++ } ++ inode = NULL; ++ if (d_really_is_positive(dentry)) ++ inode = d_inode(dentry); ++ if (unlikely(inode && au_is_bad_inode(inode))) { ++ err = -EINVAL; ++ AuTraceErr(err); ++ goto out_dgrade; ++ } ++ if (unlikely(au_dbrange_test(dentry))) { ++ err = -EINVAL; ++ AuTraceErr(err); ++ goto out_dgrade; ++ } ++ ++ sigen = au_sigen(sb); ++ if (au_digen_test(dentry, sigen)) { ++ AuDebugOn(IS_ROOT(dentry)); ++ err = au_reval_dpath(dentry, sigen); ++ if (unlikely(err)) { ++ AuTraceErr(err); ++ goto out_dgrade; ++ } ++ } ++ di_downgrade_lock(dentry, AuLock_IR); ++ ++ err = -EINVAL; ++ if (!(flags & (LOOKUP_OPEN | LOOKUP_EMPTY)) ++ && inode ++ && !(inode->i_state && I_LINKABLE) ++ && (IS_DEADDIR(inode) || !inode->i_nlink)) { ++ AuTraceErr(err); ++ goto out_inval; ++ } ++ ++ do_udba = !au_opt_test(au_mntflags(sb), UDBA_NONE); ++ if (do_udba && inode) { ++ aufs_bindex_t btop = au_ibtop(inode); ++ struct inode *h_inode; ++ ++ if (btop >= 0) { ++ h_inode = au_h_iptr(inode, btop); ++ if (h_inode && au_test_higen(inode, h_inode)) { ++ AuTraceErr(err); ++ goto out_inval; ++ } ++ } ++ } ++ ++ dirren = !!au_opt_test(au_mntflags(sb), DIRREN); ++ err = h_d_revalidate(dentry, inode, flags, do_udba, dirren); ++ if (unlikely(!err && do_udba && au_dbtop(dentry) < 0)) { ++ err = -EIO; ++ AuDbg("both of real entry and whiteout found, %p, err %d\n", ++ dentry, err); ++ } ++ goto out_inval; ++ ++out_dgrade: ++ di_downgrade_lock(dentry, AuLock_IR); ++out_inval: ++ aufs_read_unlock(dentry, AuLock_IR); ++ AuTraceErr(err); ++ valid = !err; ++out: ++ if (!valid) { ++ AuDbg("%pd invalid, %d\n", dentry, valid); ++ d_drop(dentry); ++ } ++ return valid; ++} ++ ++static void aufs_d_release(struct dentry *dentry) ++{ ++ if (au_di(dentry)) { ++ au_di_fin(dentry); ++ au_hn_di_reinit(dentry); ++ } ++} ++ ++const struct dentry_operations aufs_dop = { ++ .d_revalidate = aufs_d_revalidate, ++ .d_weak_revalidate = aufs_d_revalidate, ++ .d_release = aufs_d_release ++}; ++ ++/* aufs_dop without d_revalidate */ ++const struct dentry_operations aufs_dop_noreval = { ++ .d_release = aufs_d_release ++}; +diff --git a/fs/aufs/dentry.h b/fs/aufs/dentry.h +new file mode 100644 +index 000000000000..da4c9063d7e1 +--- /dev/null ++++ b/fs/aufs/dentry.h +@@ -0,0 +1,270 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * lookup and dentry operations ++ */ ++ ++#ifndef __AUFS_DENTRY_H__ ++#define __AUFS_DENTRY_H__ ++ ++#ifdef __KERNEL__ ++ ++#include <linux/dcache.h> ++#include "dirren.h" ++#include "rwsem.h" ++ ++struct au_hdentry { ++ struct dentry *hd_dentry; ++ aufs_bindex_t hd_id; ++}; ++ ++struct au_dinfo { ++ atomic_t di_generation; ++ ++ struct au_rwsem di_rwsem; ++ aufs_bindex_t di_btop, di_bbot, di_bwh, di_bdiropq; ++ unsigned char di_tmpfile; /* to allow the different name */ ++ struct au_hdentry *di_hdentry; ++ struct file *di_htmpfile; ++ struct rcu_head rcu; ++} ____cacheline_aligned_in_smp; ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* flags for au_lkup_dentry() */ ++#define AuLkup_ALLOW_NEG 1 ++#define AuLkup_IGNORE_PERM (1 << 1) ++#define AuLkup_DIRREN (1 << 2) ++#define au_ftest_lkup(flags, name) ((flags) & AuLkup_##name) ++#define au_fset_lkup(flags, name) \ ++ do { (flags) |= AuLkup_##name; } while (0) ++#define au_fclr_lkup(flags, name) \ ++ do { (flags) &= ~AuLkup_##name; } while (0) ++ ++#ifndef CONFIG_AUFS_DIRREN ++#undef AuLkup_DIRREN ++#define AuLkup_DIRREN 0 ++#endif ++ ++struct au_do_lookup_args { ++ unsigned int flags; ++ mode_t type; ++ struct qstr whname, *name; ++ struct au_dr_lookup dirren; ++}; ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* dentry.c */ ++extern const struct dentry_operations aufs_dop, aufs_dop_noreval; ++struct au_branch; ++struct dentry *au_sio_lkup_one(struct mnt_idmap *idmap, struct qstr *name, ++ struct path *ppath); ++int au_h_verify(struct dentry *h_dentry, unsigned int udba, struct inode *h_dir, ++ struct dentry *h_parent, struct au_branch *br); ++ ++int au_lkup_dentry(struct dentry *dentry, aufs_bindex_t btop, ++ unsigned int flags); ++int au_lkup_neg(struct dentry *dentry, aufs_bindex_t bindex, int wh); ++int au_refresh_dentry(struct dentry *dentry, struct dentry *parent); ++int au_reval_dpath(struct dentry *dentry, unsigned int sigen); ++void au_refresh_dop(struct dentry *dentry, int force_reval); ++ ++/* dinfo.c */ ++void au_di_init_once(void *_di); ++struct au_dinfo *au_di_alloc(struct super_block *sb, unsigned int lsc); ++void au_di_free(struct au_dinfo *dinfo); ++void au_di_swap(struct au_dinfo *a, struct au_dinfo *b); ++void au_di_cp(struct au_dinfo *dst, struct au_dinfo *src); ++int au_di_init(struct dentry *dentry); ++void au_di_fin(struct dentry *dentry); ++int au_di_realloc(struct au_dinfo *dinfo, int nbr, int may_shrink); ++ ++void di_read_lock(struct dentry *d, int flags, unsigned int lsc); ++void di_read_unlock(struct dentry *d, int flags); ++void di_downgrade_lock(struct dentry *d, int flags); ++void di_write_lock(struct dentry *d, unsigned int lsc); ++void di_write_unlock(struct dentry *d); ++void di_write_lock2_child(struct dentry *d1, struct dentry *d2, int isdir); ++void di_write_lock2_parent(struct dentry *d1, struct dentry *d2, int isdir); ++void di_write_unlock2(struct dentry *d1, struct dentry *d2); ++ ++struct dentry *au_h_dptr(struct dentry *dentry, aufs_bindex_t bindex); ++struct dentry *au_h_d_alias(struct dentry *dentry, aufs_bindex_t bindex); ++aufs_bindex_t au_dbtail(struct dentry *dentry); ++aufs_bindex_t au_dbtaildir(struct dentry *dentry); ++ ++void au_set_h_dptr(struct dentry *dentry, aufs_bindex_t bindex, ++ struct dentry *h_dentry); ++int au_digen_test(struct dentry *dentry, unsigned int sigen); ++int au_dbrange_test(struct dentry *dentry); ++void au_update_digen(struct dentry *dentry); ++void au_update_dbrange(struct dentry *dentry, int do_put_zero); ++void au_update_dbtop(struct dentry *dentry); ++void au_update_dbbot(struct dentry *dentry); ++int au_find_dbindex(struct dentry *dentry, struct dentry *h_dentry); ++ ++/* ---------------------------------------------------------------------- */ ++ ++static inline struct au_dinfo *au_di(struct dentry *dentry) ++{ ++ return dentry->d_fsdata; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* lock subclass for dinfo */ ++enum { ++ AuLsc_DI_CHILD, /* child first */ ++ AuLsc_DI_CHILD2, /* rename(2), link(2), and cpup at hnotify */ ++ AuLsc_DI_CHILD3, /* copyup dirs */ ++ AuLsc_DI_PARENT, ++ AuLsc_DI_PARENT2, ++ AuLsc_DI_PARENT3, ++ AuLsc_DI_TMP /* temp for replacing dinfo */ ++}; ++ ++/* ++ * di_read_lock_child, di_write_lock_child, ++ * di_read_lock_child2, di_write_lock_child2, ++ * di_read_lock_child3, di_write_lock_child3, ++ * di_read_lock_parent, di_write_lock_parent, ++ * di_read_lock_parent2, di_write_lock_parent2, ++ * di_read_lock_parent3, di_write_lock_parent3, ++ */ ++#define AuReadLockFunc(name, lsc) \ ++static inline void di_read_lock_##name(struct dentry *d, int flags) \ ++{ di_read_lock(d, flags, AuLsc_DI_##lsc); } ++ ++#define AuWriteLockFunc(name, lsc) \ ++static inline void di_write_lock_##name(struct dentry *d) \ ++{ di_write_lock(d, AuLsc_DI_##lsc); } ++ ++#define AuRWLockFuncs(name, lsc) \ ++ AuReadLockFunc(name, lsc) \ ++ AuWriteLockFunc(name, lsc) ++ ++AuRWLockFuncs(child, CHILD); ++AuRWLockFuncs(child2, CHILD2); ++AuRWLockFuncs(child3, CHILD3); ++AuRWLockFuncs(parent, PARENT); ++AuRWLockFuncs(parent2, PARENT2); ++AuRWLockFuncs(parent3, PARENT3); ++ ++#undef AuReadLockFunc ++#undef AuWriteLockFunc ++#undef AuRWLockFuncs ++ ++#define DiMustNoWaiters(d) AuRwMustNoWaiters(&au_di(d)->di_rwsem) ++#define DiMustAnyLock(d) AuRwMustAnyLock(&au_di(d)->di_rwsem) ++#define DiMustWriteLock(d) AuRwMustWriteLock(&au_di(d)->di_rwsem) ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* todo: memory barrier? */ ++static inline unsigned int au_digen(struct dentry *d) ++{ ++ return atomic_read(&au_di(d)->di_generation); ++} ++ ++static inline void au_h_dentry_init(struct au_hdentry *hdentry) ++{ ++ hdentry->hd_dentry = NULL; ++} ++ ++static inline struct au_hdentry *au_hdentry(struct au_dinfo *di, ++ aufs_bindex_t bindex) ++{ ++ return di->di_hdentry + bindex; ++} ++ ++static inline void au_hdput(struct au_hdentry *hd) ++{ ++ if (hd) ++ dput(hd->hd_dentry); ++} ++ ++static inline aufs_bindex_t au_dbtop(struct dentry *dentry) ++{ ++ DiMustAnyLock(dentry); ++ return au_di(dentry)->di_btop; ++} ++ ++static inline aufs_bindex_t au_dbbot(struct dentry *dentry) ++{ ++ DiMustAnyLock(dentry); ++ return au_di(dentry)->di_bbot; ++} ++ ++static inline aufs_bindex_t au_dbwh(struct dentry *dentry) ++{ ++ DiMustAnyLock(dentry); ++ return au_di(dentry)->di_bwh; ++} ++ ++static inline aufs_bindex_t au_dbdiropq(struct dentry *dentry) ++{ ++ DiMustAnyLock(dentry); ++ return au_di(dentry)->di_bdiropq; ++} ++ ++/* todo: hard/soft set? */ ++static inline void au_set_dbtop(struct dentry *dentry, aufs_bindex_t bindex) ++{ ++ DiMustWriteLock(dentry); ++ au_di(dentry)->di_btop = bindex; ++} ++ ++static inline void au_set_dbbot(struct dentry *dentry, aufs_bindex_t bindex) ++{ ++ DiMustWriteLock(dentry); ++ au_di(dentry)->di_bbot = bindex; ++} ++ ++static inline void au_set_dbwh(struct dentry *dentry, aufs_bindex_t bindex) ++{ ++ DiMustWriteLock(dentry); ++ /* dbwh can be outside of btop - bbot range */ ++ au_di(dentry)->di_bwh = bindex; ++} ++ ++static inline void au_set_dbdiropq(struct dentry *dentry, aufs_bindex_t bindex) ++{ ++ DiMustWriteLock(dentry); ++ au_di(dentry)->di_bdiropq = bindex; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++#ifdef CONFIG_AUFS_HNOTIFY ++static inline void au_digen_dec(struct dentry *d) ++{ ++ atomic_dec(&au_di(d)->di_generation); ++} ++ ++static inline void au_hn_di_reinit(struct dentry *dentry) ++{ ++ dentry->d_fsdata = NULL; ++} ++#else ++AuStubVoid(au_hn_di_reinit, struct dentry *dentry __maybe_unused) ++#endif /* CONFIG_AUFS_HNOTIFY */ ++ ++#endif /* __KERNEL__ */ ++#endif /* __AUFS_DENTRY_H__ */ +diff --git a/fs/aufs/dinfo.c b/fs/aufs/dinfo.c +new file mode 100644 +index 000000000000..bf4a94414309 +--- /dev/null ++++ b/fs/aufs/dinfo.c +@@ -0,0 +1,555 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * dentry private data ++ */ ++ ++#include "aufs.h" ++ ++void au_di_init_once(void *_dinfo) ++{ ++ struct au_dinfo *dinfo = _dinfo; ++ ++ au_rw_init(&dinfo->di_rwsem); ++} ++ ++struct au_dinfo *au_di_alloc(struct super_block *sb, unsigned int lsc) ++{ ++ struct au_dinfo *dinfo; ++ int nbr, i; ++ ++ dinfo = au_cache_alloc_dinfo(); ++ if (unlikely(!dinfo)) ++ goto out; ++ ++ nbr = au_sbbot(sb) + 1; ++ if (nbr <= 0) ++ nbr = 1; ++ dinfo->di_hdentry = kcalloc(nbr, sizeof(*dinfo->di_hdentry), GFP_NOFS); ++ if (dinfo->di_hdentry) { ++ au_rw_write_lock_nested(&dinfo->di_rwsem, lsc); ++ dinfo->di_btop = -1; ++ dinfo->di_bbot = -1; ++ dinfo->di_bwh = -1; ++ dinfo->di_bdiropq = -1; ++ dinfo->di_tmpfile = 0; ++ for (i = 0; i < nbr; i++) ++ dinfo->di_hdentry[i].hd_id = -1; ++ dinfo->di_htmpfile = NULL; ++ goto out; ++ } ++ ++ au_cache_free_dinfo(dinfo); ++ dinfo = NULL; ++ ++out: ++ return dinfo; ++} ++ ++void au_di_free(struct au_dinfo *dinfo) ++{ ++ struct au_hdentry *p; ++ aufs_bindex_t bbot, bindex; ++ ++ /* dentry may not be revalidated */ ++ bindex = dinfo->di_btop; ++ if (bindex >= 0) { ++ bbot = dinfo->di_bbot; ++ p = au_hdentry(dinfo, bindex); ++ while (bindex++ <= bbot) ++ au_hdput(p++); ++ } ++ au_kfree_try_rcu(dinfo->di_hdentry); ++ au_cache_free_dinfo(dinfo); ++} ++ ++void au_di_swap(struct au_dinfo *a, struct au_dinfo *b) ++{ ++ struct au_hdentry *p; ++ aufs_bindex_t bi; ++ ++ AuRwMustWriteLock(&a->di_rwsem); ++ AuRwMustWriteLock(&b->di_rwsem); ++ ++#define DiSwap(v, name) \ ++ do { \ ++ v = a->di_##name; \ ++ a->di_##name = b->di_##name; \ ++ b->di_##name = v; \ ++ } while (0) ++ ++ DiSwap(p, hdentry); ++ DiSwap(bi, btop); ++ DiSwap(bi, bbot); ++ DiSwap(bi, bwh); ++ DiSwap(bi, bdiropq); ++ /* smp_mb(); */ ++ ++#undef DiSwap ++} ++ ++void au_di_cp(struct au_dinfo *dst, struct au_dinfo *src) ++{ ++ AuRwMustWriteLock(&dst->di_rwsem); ++ AuRwMustWriteLock(&src->di_rwsem); ++ ++ dst->di_btop = src->di_btop; ++ dst->di_bbot = src->di_bbot; ++ dst->di_bwh = src->di_bwh; ++ dst->di_bdiropq = src->di_bdiropq; ++ /* smp_mb(); */ ++} ++ ++int au_di_init(struct dentry *dentry) ++{ ++ int err; ++ struct super_block *sb; ++ struct au_dinfo *dinfo; ++ ++ err = 0; ++ sb = dentry->d_sb; ++ dinfo = au_di_alloc(sb, AuLsc_DI_CHILD); ++ if (dinfo) { ++ atomic_set(&dinfo->di_generation, au_sigen(sb)); ++ /* smp_mb(); */ /* atomic_set */ ++ dentry->d_fsdata = dinfo; ++ } else ++ err = -ENOMEM; ++ ++ return err; ++} ++ ++void au_di_fin(struct dentry *dentry) ++{ ++ struct au_dinfo *dinfo; ++ ++ dinfo = au_di(dentry); ++ AuRwDestroy(&dinfo->di_rwsem); ++ au_di_free(dinfo); ++} ++ ++int au_di_realloc(struct au_dinfo *dinfo, int nbr, int may_shrink) ++{ ++ int err, sz; ++ struct au_hdentry *hdp; ++ ++ AuRwMustWriteLock(&dinfo->di_rwsem); ++ ++ err = -ENOMEM; ++ sz = sizeof(*hdp) * (dinfo->di_bbot + 1); ++ if (!sz) ++ sz = sizeof(*hdp); ++ hdp = au_kzrealloc(dinfo->di_hdentry, sz, sizeof(*hdp) * nbr, GFP_NOFS, ++ may_shrink); ++ if (hdp) { ++ dinfo->di_hdentry = hdp; ++ err = 0; ++ } ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static void do_ii_write_lock(struct inode *inode, unsigned int lsc) ++{ ++ switch (lsc) { ++ case AuLsc_DI_CHILD: ++ ii_write_lock_child(inode); ++ break; ++ case AuLsc_DI_CHILD2: ++ ii_write_lock_child2(inode); ++ break; ++ case AuLsc_DI_CHILD3: ++ ii_write_lock_child3(inode); ++ break; ++ case AuLsc_DI_PARENT: ++ ii_write_lock_parent(inode); ++ break; ++ case AuLsc_DI_PARENT2: ++ ii_write_lock_parent2(inode); ++ break; ++ case AuLsc_DI_PARENT3: ++ ii_write_lock_parent3(inode); ++ break; ++ default: ++ BUG(); ++ } ++} ++ ++static void do_ii_read_lock(struct inode *inode, unsigned int lsc) ++{ ++ switch (lsc) { ++ case AuLsc_DI_CHILD: ++ ii_read_lock_child(inode); ++ break; ++ case AuLsc_DI_CHILD2: ++ ii_read_lock_child2(inode); ++ break; ++ case AuLsc_DI_CHILD3: ++ ii_read_lock_child3(inode); ++ break; ++ case AuLsc_DI_PARENT: ++ ii_read_lock_parent(inode); ++ break; ++ case AuLsc_DI_PARENT2: ++ ii_read_lock_parent2(inode); ++ break; ++ case AuLsc_DI_PARENT3: ++ ii_read_lock_parent3(inode); ++ break; ++ default: ++ BUG(); ++ } ++} ++ ++void di_read_lock(struct dentry *d, int flags, unsigned int lsc) ++{ ++ struct inode *inode; ++ ++ au_rw_read_lock_nested(&au_di(d)->di_rwsem, lsc); ++ if (d_really_is_positive(d)) { ++ inode = d_inode(d); ++ if (au_ftest_lock(flags, IW)) ++ do_ii_write_lock(inode, lsc); ++ else if (au_ftest_lock(flags, IR)) ++ do_ii_read_lock(inode, lsc); ++ } ++} ++ ++void di_read_unlock(struct dentry *d, int flags) ++{ ++ struct inode *inode; ++ ++ if (d_really_is_positive(d)) { ++ inode = d_inode(d); ++ if (au_ftest_lock(flags, IW)) { ++ au_dbg_verify_dinode(d); ++ ii_write_unlock(inode); ++ } else if (au_ftest_lock(flags, IR)) { ++ au_dbg_verify_dinode(d); ++ ii_read_unlock(inode); ++ } ++ } ++ au_rw_read_unlock(&au_di(d)->di_rwsem); ++} ++ ++void di_downgrade_lock(struct dentry *d, int flags) ++{ ++ if (d_really_is_positive(d) && au_ftest_lock(flags, IR)) ++ ii_downgrade_lock(d_inode(d)); ++ au_rw_dgrade_lock(&au_di(d)->di_rwsem); ++} ++ ++void di_write_lock(struct dentry *d, unsigned int lsc) ++{ ++ au_rw_write_lock_nested(&au_di(d)->di_rwsem, lsc); ++ if (d_really_is_positive(d)) ++ do_ii_write_lock(d_inode(d), lsc); ++} ++ ++void di_write_unlock(struct dentry *d) ++{ ++ au_dbg_verify_dinode(d); ++ if (d_really_is_positive(d)) ++ ii_write_unlock(d_inode(d)); ++ au_rw_write_unlock(&au_di(d)->di_rwsem); ++} ++ ++void di_write_lock2_child(struct dentry *d1, struct dentry *d2, int isdir) ++{ ++ AuDebugOn(d1 == d2 ++ || d_inode(d1) == d_inode(d2) ++ || d1->d_sb != d2->d_sb); ++ ++ if ((isdir && au_test_subdir(d1, d2)) ++ || d1 < d2) { ++ di_write_lock_child(d1); ++ di_write_lock_child2(d2); ++ } else { ++ di_write_lock_child(d2); ++ di_write_lock_child2(d1); ++ } ++} ++ ++void di_write_lock2_parent(struct dentry *d1, struct dentry *d2, int isdir) ++{ ++ AuDebugOn(d1 == d2 ++ || d_inode(d1) == d_inode(d2) ++ || d1->d_sb != d2->d_sb); ++ ++ if ((isdir && au_test_subdir(d1, d2)) ++ || d1 < d2) { ++ di_write_lock_parent(d1); ++ di_write_lock_parent2(d2); ++ } else { ++ di_write_lock_parent(d2); ++ di_write_lock_parent2(d1); ++ } ++} ++ ++void di_write_unlock2(struct dentry *d1, struct dentry *d2) ++{ ++ di_write_unlock(d1); ++ if (d_inode(d1) == d_inode(d2)) ++ au_rw_write_unlock(&au_di(d2)->di_rwsem); ++ else ++ di_write_unlock(d2); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++struct dentry *au_h_dptr(struct dentry *dentry, aufs_bindex_t bindex) ++{ ++ struct dentry *d; ++ ++ DiMustAnyLock(dentry); ++ ++ if (au_dbtop(dentry) < 0 || bindex < au_dbtop(dentry)) ++ return NULL; ++ AuDebugOn(bindex < 0); ++ d = au_hdentry(au_di(dentry), bindex)->hd_dentry; ++ AuDebugOn(d && au_dcount(d) <= 0); ++ return d; ++} ++ ++/* ++ * extended version of au_h_dptr(). ++ * returns a hashed and positive (or linkable) h_dentry in bindex, NULL, or ++ * error. ++ */ ++struct dentry *au_h_d_alias(struct dentry *dentry, aufs_bindex_t bindex) ++{ ++ struct dentry *h_dentry; ++ struct inode *inode, *h_inode; ++ ++ AuDebugOn(d_really_is_negative(dentry)); ++ ++ h_dentry = NULL; ++ if (au_dbtop(dentry) <= bindex ++ && bindex <= au_dbbot(dentry)) ++ h_dentry = au_h_dptr(dentry, bindex); ++ if (h_dentry && !au_d_linkable(h_dentry)) { ++ dget(h_dentry); ++ goto out; /* success */ ++ } ++ ++ inode = d_inode(dentry); ++ AuDebugOn(bindex < au_ibtop(inode)); ++ AuDebugOn(au_ibbot(inode) < bindex); ++ h_inode = au_h_iptr(inode, bindex); ++ h_dentry = d_find_alias(h_inode); ++ if (h_dentry) { ++ if (!IS_ERR(h_dentry)) { ++ if (!au_d_linkable(h_dentry)) ++ goto out; /* success */ ++ dput(h_dentry); ++ } else ++ goto out; ++ } ++ ++ if (au_opt_test(au_mntflags(dentry->d_sb), PLINK)) { ++ h_dentry = au_plink_lkup(inode, bindex); ++ AuDebugOn(!h_dentry); ++ if (!IS_ERR(h_dentry)) { ++ if (!au_d_hashed_positive(h_dentry)) ++ goto out; /* success */ ++ dput(h_dentry); ++ h_dentry = NULL; ++ } ++ } ++ ++out: ++ AuDbgDentry(h_dentry); ++ return h_dentry; ++} ++ ++aufs_bindex_t au_dbtail(struct dentry *dentry) ++{ ++ aufs_bindex_t bbot, bwh; ++ ++ bbot = au_dbbot(dentry); ++ if (0 <= bbot) { ++ bwh = au_dbwh(dentry); ++ if (!bwh) ++ return bwh; ++ if (0 < bwh && bwh < bbot) ++ return bwh - 1; ++ } ++ return bbot; ++} ++ ++aufs_bindex_t au_dbtaildir(struct dentry *dentry) ++{ ++ aufs_bindex_t bbot, bopq; ++ ++ bbot = au_dbtail(dentry); ++ if (0 <= bbot) { ++ bopq = au_dbdiropq(dentry); ++ if (0 <= bopq && bopq < bbot) ++ bbot = bopq; ++ } ++ return bbot; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++void au_set_h_dptr(struct dentry *dentry, aufs_bindex_t bindex, ++ struct dentry *h_dentry) ++{ ++ struct au_dinfo *dinfo; ++ struct au_hdentry *hd; ++ struct au_branch *br; ++ ++ DiMustWriteLock(dentry); ++ ++ dinfo = au_di(dentry); ++ hd = au_hdentry(dinfo, bindex); ++ au_hdput(hd); ++ hd->hd_dentry = h_dentry; ++ if (h_dentry) { ++ br = au_sbr(dentry->d_sb, bindex); ++ hd->hd_id = br->br_id; ++ } ++} ++ ++int au_dbrange_test(struct dentry *dentry) ++{ ++ int err; ++ aufs_bindex_t btop, bbot; ++ ++ err = 0; ++ btop = au_dbtop(dentry); ++ bbot = au_dbbot(dentry); ++ if (btop >= 0) ++ AuDebugOn(bbot < 0 && btop > bbot); ++ else { ++ err = -EIO; ++ AuDebugOn(bbot >= 0); ++ } ++ ++ return err; ++} ++ ++int au_digen_test(struct dentry *dentry, unsigned int sigen) ++{ ++ int err; ++ ++ err = 0; ++ if (unlikely(au_digen(dentry) != sigen ++ || au_iigen_test(d_inode(dentry), sigen))) ++ err = -EIO; ++ ++ return err; ++} ++ ++void au_update_digen(struct dentry *dentry) ++{ ++ atomic_set(&au_di(dentry)->di_generation, au_sigen(dentry->d_sb)); ++ /* smp_mb(); */ /* atomic_set */ ++} ++ ++void au_update_dbrange(struct dentry *dentry, int do_put_zero) ++{ ++ struct au_dinfo *dinfo; ++ struct dentry *h_d; ++ struct au_hdentry *hdp; ++ aufs_bindex_t bindex, bbot; ++ ++ DiMustWriteLock(dentry); ++ ++ dinfo = au_di(dentry); ++ if (!dinfo || dinfo->di_btop < 0) ++ return; ++ ++ if (do_put_zero) { ++ bbot = dinfo->di_bbot; ++ bindex = dinfo->di_btop; ++ hdp = au_hdentry(dinfo, bindex); ++ for (; bindex <= bbot; bindex++, hdp++) { ++ h_d = hdp->hd_dentry; ++ if (h_d && d_is_negative(h_d)) ++ au_set_h_dptr(dentry, bindex, NULL); ++ } ++ } ++ ++ dinfo->di_btop = 0; ++ hdp = au_hdentry(dinfo, dinfo->di_btop); ++ for (; dinfo->di_btop <= dinfo->di_bbot; dinfo->di_btop++, hdp++) ++ if (hdp->hd_dentry) ++ break; ++ if (dinfo->di_btop > dinfo->di_bbot) { ++ dinfo->di_btop = -1; ++ dinfo->di_bbot = -1; ++ return; ++ } ++ ++ hdp = au_hdentry(dinfo, dinfo->di_bbot); ++ for (; dinfo->di_bbot >= 0; dinfo->di_bbot--, hdp--) ++ if (hdp->hd_dentry) ++ break; ++ AuDebugOn(dinfo->di_btop > dinfo->di_bbot || dinfo->di_bbot < 0); ++} ++ ++void au_update_dbtop(struct dentry *dentry) ++{ ++ aufs_bindex_t bindex, bbot; ++ struct dentry *h_dentry; ++ ++ bbot = au_dbbot(dentry); ++ for (bindex = au_dbtop(dentry); bindex <= bbot; bindex++) { ++ h_dentry = au_h_dptr(dentry, bindex); ++ if (!h_dentry) ++ continue; ++ if (d_is_positive(h_dentry)) { ++ au_set_dbtop(dentry, bindex); ++ return; ++ } ++ au_set_h_dptr(dentry, bindex, NULL); ++ } ++} ++ ++void au_update_dbbot(struct dentry *dentry) ++{ ++ aufs_bindex_t bindex, btop; ++ struct dentry *h_dentry; ++ ++ btop = au_dbtop(dentry); ++ for (bindex = au_dbbot(dentry); bindex >= btop; bindex--) { ++ h_dentry = au_h_dptr(dentry, bindex); ++ if (!h_dentry) ++ continue; ++ if (d_is_positive(h_dentry)) { ++ au_set_dbbot(dentry, bindex); ++ return; ++ } ++ au_set_h_dptr(dentry, bindex, NULL); ++ } ++} ++ ++int au_find_dbindex(struct dentry *dentry, struct dentry *h_dentry) ++{ ++ aufs_bindex_t bindex, bbot; ++ ++ bbot = au_dbbot(dentry); ++ for (bindex = au_dbtop(dentry); bindex <= bbot; bindex++) ++ if (au_h_dptr(dentry, bindex) == h_dentry) ++ return bindex; ++ return -1; ++} +diff --git a/fs/aufs/dir.c b/fs/aufs/dir.c +new file mode 100644 +index 000000000000..ee900ea3264b +--- /dev/null ++++ b/fs/aufs/dir.c +@@ -0,0 +1,765 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * directory operations ++ */ ++ ++#include <linux/fs_stack.h> ++#include <linux/iversion.h> ++#include "aufs.h" ++ ++void au_add_nlink(struct inode *dir, struct inode *h_dir) ++{ ++ unsigned int nlink; ++ ++ AuDebugOn(!S_ISDIR(dir->i_mode) || !S_ISDIR(h_dir->i_mode)); ++ ++ nlink = dir->i_nlink; ++ nlink += h_dir->i_nlink - 2; ++ if (h_dir->i_nlink < 2) ++ nlink += 2; ++ smp_mb(); /* for i_nlink */ ++ /* 0 can happen in revaliding */ ++ set_nlink(dir, nlink); ++} ++ ++void au_sub_nlink(struct inode *dir, struct inode *h_dir) ++{ ++ unsigned int nlink; ++ ++ AuDebugOn(!S_ISDIR(dir->i_mode) || !S_ISDIR(h_dir->i_mode)); ++ ++ nlink = dir->i_nlink; ++ nlink -= h_dir->i_nlink - 2; ++ if (h_dir->i_nlink < 2) ++ nlink -= 2; ++ smp_mb(); /* for i_nlink */ ++ /* nlink == 0 means the branch-fs is broken */ ++ set_nlink(dir, nlink); ++} ++ ++loff_t au_dir_size(struct file *file, struct dentry *dentry) ++{ ++ loff_t sz; ++ aufs_bindex_t bindex, bbot; ++ struct file *h_file; ++ struct dentry *h_dentry; ++ ++ sz = 0; ++ if (file) { ++ AuDebugOn(!d_is_dir(file->f_path.dentry)); ++ ++ bbot = au_fbbot_dir(file); ++ for (bindex = au_fbtop(file); ++ bindex <= bbot && sz < KMALLOC_MAX_SIZE; ++ bindex++) { ++ h_file = au_hf_dir(file, bindex); ++ if (h_file && file_inode(h_file)) ++ sz += vfsub_f_size_read(h_file); ++ } ++ } else { ++ AuDebugOn(!dentry); ++ AuDebugOn(!d_is_dir(dentry)); ++ ++ bbot = au_dbtaildir(dentry); ++ for (bindex = au_dbtop(dentry); ++ bindex <= bbot && sz < KMALLOC_MAX_SIZE; ++ bindex++) { ++ h_dentry = au_h_dptr(dentry, bindex); ++ if (h_dentry && d_is_positive(h_dentry)) ++ sz += i_size_read(d_inode(h_dentry)); ++ } ++ } ++ if (sz < KMALLOC_MAX_SIZE) ++ sz = roundup_pow_of_two(sz); ++ if (sz > KMALLOC_MAX_SIZE) ++ sz = KMALLOC_MAX_SIZE; ++ else if (sz < NAME_MAX) { ++ BUILD_BUG_ON(AUFS_RDBLK_DEF < NAME_MAX); ++ sz = AUFS_RDBLK_DEF; ++ } ++ return sz; ++} ++ ++struct au_dir_ts_arg { ++ struct dentry *dentry; ++ aufs_bindex_t brid; ++}; ++ ++static void au_do_dir_ts(void *arg) ++{ ++ struct au_dir_ts_arg *a = arg; ++ struct au_dtime dt; ++ struct path h_path; ++ struct inode *dir, *h_dir; ++ struct super_block *sb; ++ struct au_branch *br; ++ struct au_hinode *hdir; ++ int err; ++ aufs_bindex_t btop, bindex; ++ ++ sb = a->dentry->d_sb; ++ if (d_really_is_negative(a->dentry)) ++ goto out; ++ /* no dir->i_mutex lock */ ++ aufs_read_lock(a->dentry, AuLock_DW); /* noflush */ ++ ++ dir = d_inode(a->dentry); ++ btop = au_ibtop(dir); ++ bindex = au_br_index(sb, a->brid); ++ if (bindex < btop) ++ goto out_unlock; ++ ++ br = au_sbr(sb, bindex); ++ h_path.dentry = au_h_dptr(a->dentry, bindex); ++ if (!h_path.dentry) ++ goto out_unlock; ++ h_path.mnt = au_br_mnt(br); ++ au_dtime_store(&dt, a->dentry, &h_path); ++ ++ br = au_sbr(sb, btop); ++ if (!au_br_writable(br->br_perm)) ++ goto out_unlock; ++ h_path.dentry = au_h_dptr(a->dentry, btop); ++ h_path.mnt = au_br_mnt(br); ++ err = vfsub_mnt_want_write(h_path.mnt); ++ if (err) ++ goto out_unlock; ++ hdir = au_hi(dir, btop); ++ au_hn_inode_lock_nested(hdir, AuLsc_I_PARENT); ++ h_dir = au_h_iptr(dir, btop); ++ if (h_dir->i_nlink ++ && timespec64_compare(&h_dir->i_mtime, &dt.dt_mtime) < 0) { ++ dt.dt_h_path = h_path; ++ au_dtime_revert(&dt); ++ } ++ au_hn_inode_unlock(hdir); ++ vfsub_mnt_drop_write(h_path.mnt); ++ au_cpup_attr_timesizes(dir); ++ ++out_unlock: ++ aufs_read_unlock(a->dentry, AuLock_DW); ++out: ++ dput(a->dentry); ++ au_nwt_done(&au_sbi(sb)->si_nowait); ++ au_kfree_try_rcu(arg); ++} ++ ++void au_dir_ts(struct inode *dir, aufs_bindex_t bindex) ++{ ++ int perm, wkq_err; ++ aufs_bindex_t btop; ++ struct au_dir_ts_arg *arg; ++ struct dentry *dentry; ++ struct super_block *sb; ++ ++ IMustLock(dir); ++ ++ dentry = d_find_any_alias(dir); ++ AuDebugOn(!dentry); ++ sb = dentry->d_sb; ++ btop = au_ibtop(dir); ++ if (btop == bindex) { ++ au_cpup_attr_timesizes(dir); ++ goto out; ++ } ++ ++ perm = au_sbr_perm(sb, btop); ++ if (!au_br_writable(perm)) ++ goto out; ++ ++ arg = kmalloc(sizeof(*arg), GFP_NOFS); ++ if (!arg) ++ goto out; ++ ++ arg->dentry = dget(dentry); /* will be dput-ted by au_do_dir_ts() */ ++ arg->brid = au_sbr_id(sb, bindex); ++ wkq_err = au_wkq_nowait(au_do_dir_ts, arg, sb, /*flags*/0); ++ if (unlikely(wkq_err)) { ++ pr_err("wkq %d\n", wkq_err); ++ dput(dentry); ++ au_kfree_try_rcu(arg); ++ } ++ ++out: ++ dput(dentry); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int reopen_dir(struct file *file) ++{ ++ int err; ++ unsigned int flags; ++ aufs_bindex_t bindex, btail, btop; ++ struct dentry *dentry, *h_dentry; ++ struct file *h_file; ++ ++ /* open all lower dirs */ ++ dentry = file->f_path.dentry; ++ btop = au_dbtop(dentry); ++ for (bindex = au_fbtop(file); bindex < btop; bindex++) ++ au_set_h_fptr(file, bindex, NULL); ++ au_set_fbtop(file, btop); ++ ++ btail = au_dbtaildir(dentry); ++ for (bindex = au_fbbot_dir(file); btail < bindex; bindex--) ++ au_set_h_fptr(file, bindex, NULL); ++ au_set_fbbot_dir(file, btail); ++ ++ flags = vfsub_file_flags(file); ++ for (bindex = btop; bindex <= btail; bindex++) { ++ h_dentry = au_h_dptr(dentry, bindex); ++ if (!h_dentry) ++ continue; ++ h_file = au_hf_dir(file, bindex); ++ if (h_file) ++ continue; ++ ++ h_file = au_h_open(dentry, bindex, flags, file, /*force_wr*/0); ++ err = PTR_ERR(h_file); ++ if (IS_ERR(h_file)) ++ goto out; /* close all? */ ++ au_set_h_fptr(file, bindex, h_file); ++ } ++ au_update_figen(file); ++ /* todo: necessary? */ ++ /* file->f_ra = h_file->f_ra; */ ++ err = 0; ++ ++out: ++ return err; ++} ++ ++static int do_open_dir(struct file *file, int flags, struct file *h_file) ++{ ++ int err; ++ aufs_bindex_t bindex, btail; ++ struct dentry *dentry, *h_dentry; ++ struct vfsmount *mnt; ++ ++ FiMustWriteLock(file); ++ AuDebugOn(h_file); ++ ++ err = 0; ++ mnt = file->f_path.mnt; ++ dentry = file->f_path.dentry; ++ file->f_version = inode_query_iversion(d_inode(dentry)); ++ bindex = au_dbtop(dentry); ++ au_set_fbtop(file, bindex); ++ btail = au_dbtaildir(dentry); ++ au_set_fbbot_dir(file, btail); ++ for (; !err && bindex <= btail; bindex++) { ++ h_dentry = au_h_dptr(dentry, bindex); ++ if (!h_dentry) ++ continue; ++ ++ err = vfsub_test_mntns(mnt, h_dentry->d_sb); ++ if (unlikely(err)) ++ break; ++ h_file = au_h_open(dentry, bindex, flags, file, /*force_wr*/0); ++ if (IS_ERR(h_file)) { ++ err = PTR_ERR(h_file); ++ break; ++ } ++ au_set_h_fptr(file, bindex, h_file); ++ } ++ au_update_figen(file); ++ /* todo: necessary? */ ++ /* file->f_ra = h_file->f_ra; */ ++ if (!err) ++ return 0; /* success */ ++ ++ /* close all */ ++ for (bindex = au_fbtop(file); bindex <= btail; bindex++) ++ au_set_h_fptr(file, bindex, NULL); ++ au_set_fbtop(file, -1); ++ au_set_fbbot_dir(file, -1); ++ ++ return err; ++} ++ ++static int aufs_open_dir(struct inode *inode __maybe_unused, ++ struct file *file) ++{ ++ int err; ++ struct super_block *sb; ++ struct au_fidir *fidir; ++ ++ err = -ENOMEM; ++ sb = file->f_path.dentry->d_sb; ++ si_read_lock(sb, AuLock_FLUSH); ++ fidir = au_fidir_alloc(sb); ++ if (fidir) { ++ struct au_do_open_args args = { ++ .open = do_open_dir, ++ .fidir = fidir ++ }; ++ err = au_do_open(file, &args); ++ if (unlikely(err)) ++ au_kfree_rcu(fidir); ++ } ++ si_read_unlock(sb); ++ return err; ++} ++ ++static int aufs_release_dir(struct inode *inode __maybe_unused, ++ struct file *file) ++{ ++ struct au_vdir *vdir_cache; ++ struct au_finfo *finfo; ++ struct au_fidir *fidir; ++ struct au_hfile *hf; ++ aufs_bindex_t bindex, bbot; ++ ++ finfo = au_fi(file); ++ fidir = finfo->fi_hdir; ++ if (fidir) { ++ au_hbl_del(&finfo->fi_hlist, ++ &au_sbi(file->f_path.dentry->d_sb)->si_files); ++ vdir_cache = fidir->fd_vdir_cache; /* lock-free */ ++ if (vdir_cache) ++ au_vdir_free(vdir_cache); ++ ++ bindex = finfo->fi_btop; ++ if (bindex >= 0) { ++ hf = fidir->fd_hfile + bindex; ++ /* ++ * calls fput() instead of filp_close(), ++ * since no dnotify or lock for the lower file. ++ */ ++ bbot = fidir->fd_bbot; ++ for (; bindex <= bbot; bindex++, hf++) ++ if (hf->hf_file) ++ au_hfput(hf, /*execed*/0); ++ } ++ au_kfree_rcu(fidir); ++ finfo->fi_hdir = NULL; ++ } ++ au_finfo_fin(file); ++ return 0; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int au_do_flush_dir(struct file *file, fl_owner_t id) ++{ ++ int err; ++ aufs_bindex_t bindex, bbot; ++ struct file *h_file; ++ ++ err = 0; ++ bbot = au_fbbot_dir(file); ++ for (bindex = au_fbtop(file); !err && bindex <= bbot; bindex++) { ++ h_file = au_hf_dir(file, bindex); ++ if (h_file) ++ err = vfsub_flush(h_file, id); ++ } ++ return err; ++} ++ ++static int aufs_flush_dir(struct file *file, fl_owner_t id) ++{ ++ return au_do_flush(file, id, au_do_flush_dir); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int au_do_fsync_dir_no_file(struct dentry *dentry, int datasync) ++{ ++ int err; ++ aufs_bindex_t bbot, bindex; ++ struct inode *inode; ++ struct super_block *sb; ++ ++ err = 0; ++ sb = dentry->d_sb; ++ inode = d_inode(dentry); ++ IMustLock(inode); ++ bbot = au_dbbot(dentry); ++ for (bindex = au_dbtop(dentry); !err && bindex <= bbot; bindex++) { ++ struct path h_path; ++ ++ if (au_test_ro(sb, bindex, inode)) ++ continue; ++ h_path.dentry = au_h_dptr(dentry, bindex); ++ if (!h_path.dentry) ++ continue; ++ ++ h_path.mnt = au_sbr_mnt(sb, bindex); ++ err = vfsub_fsync(NULL, &h_path, datasync); ++ } ++ ++ return err; ++} ++ ++static int au_do_fsync_dir(struct file *file, int datasync) ++{ ++ int err; ++ aufs_bindex_t bbot, bindex; ++ struct file *h_file; ++ struct super_block *sb; ++ struct inode *inode; ++ ++ err = au_reval_and_lock_fdi(file, reopen_dir, /*wlock*/1, /*fi_lsc*/0); ++ if (unlikely(err)) ++ goto out; ++ ++ inode = file_inode(file); ++ sb = inode->i_sb; ++ bbot = au_fbbot_dir(file); ++ for (bindex = au_fbtop(file); !err && bindex <= bbot; bindex++) { ++ h_file = au_hf_dir(file, bindex); ++ if (!h_file || au_test_ro(sb, bindex, inode)) ++ continue; ++ ++ err = vfsub_fsync(h_file, &h_file->f_path, datasync); ++ } ++ ++out: ++ return err; ++} ++ ++/* ++ * @file may be NULL ++ */ ++static int aufs_fsync_dir(struct file *file, loff_t start, loff_t end, ++ int datasync) ++{ ++ int err; ++ struct dentry *dentry; ++ struct inode *inode; ++ struct super_block *sb; ++ ++ err = 0; ++ dentry = file->f_path.dentry; ++ inode = d_inode(dentry); ++ inode_lock(inode); ++ sb = dentry->d_sb; ++ si_noflush_read_lock(sb); ++ if (file) ++ err = au_do_fsync_dir(file, datasync); ++ else { ++ di_write_lock_child(dentry); ++ err = au_do_fsync_dir_no_file(dentry, datasync); ++ } ++ au_cpup_attr_timesizes(inode); ++ di_write_unlock(dentry); ++ if (file) ++ fi_write_unlock(file); ++ ++ si_read_unlock(sb); ++ inode_unlock(inode); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int aufs_iterate_shared(struct file *file, struct dir_context *ctx) ++{ ++ int err; ++ struct dentry *dentry; ++ struct inode *inode, *h_inode; ++ struct super_block *sb; ++ ++ AuDbg("%pD, ctx{%ps, %llu}\n", file, ctx->actor, ctx->pos); ++ ++ dentry = file->f_path.dentry; ++ inode = d_inode(dentry); ++ IMustLock(inode); ++ ++ sb = dentry->d_sb; ++ si_read_lock(sb, AuLock_FLUSH); ++ err = au_reval_and_lock_fdi(file, reopen_dir, /*wlock*/1, /*fi_lsc*/0); ++ if (unlikely(err)) ++ goto out; ++ err = au_alive_dir(dentry); ++ if (!err) ++ err = au_vdir_init(file); ++ di_downgrade_lock(dentry, AuLock_IR); ++ if (unlikely(err)) ++ goto out_unlock; ++ ++ h_inode = au_h_iptr(inode, au_ibtop(inode)); ++ if (!au_test_nfsd()) { ++ err = au_vdir_fill_de(file, ctx); ++ fsstack_copy_attr_atime(inode, h_inode); ++ } else { ++ /* ++ * nfsd filldir may call lookup_one_len(), vfs_getattr(), ++ * encode_fh() and others. ++ */ ++ atomic_inc(&h_inode->i_count); ++ di_read_unlock(dentry, AuLock_IR); ++ si_read_unlock(sb); ++ err = au_vdir_fill_de(file, ctx); ++ fsstack_copy_attr_atime(inode, h_inode); ++ fi_write_unlock(file); ++ iput(h_inode); ++ ++ AuTraceErr(err); ++ return err; ++ } ++ ++out_unlock: ++ di_read_unlock(dentry, AuLock_IR); ++ fi_write_unlock(file); ++out: ++ si_read_unlock(sb); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++#define AuTestEmpty_WHONLY 1 ++#define AuTestEmpty_CALLED (1 << 1) ++#define AuTestEmpty_SHWH (1 << 2) ++#define au_ftest_testempty(flags, name) ((flags) & AuTestEmpty_##name) ++#define au_fset_testempty(flags, name) \ ++ do { (flags) |= AuTestEmpty_##name; } while (0) ++#define au_fclr_testempty(flags, name) \ ++ do { (flags) &= ~AuTestEmpty_##name; } while (0) ++ ++#ifndef CONFIG_AUFS_SHWH ++#undef AuTestEmpty_SHWH ++#define AuTestEmpty_SHWH 0 ++#endif ++ ++struct test_empty_arg { ++ struct dir_context ctx; ++ struct au_nhash *whlist; ++ unsigned int flags; ++ int err; ++ aufs_bindex_t bindex; ++}; ++ ++static bool test_empty_cb(struct dir_context *ctx, const char *__name, ++ int namelen, loff_t offset __maybe_unused, u64 ino, ++ unsigned int d_type) ++{ ++ struct test_empty_arg *arg = container_of(ctx, struct test_empty_arg, ++ ctx); ++ char *name = (void *)__name; ++ ++ arg->err = 0; ++ au_fset_testempty(arg->flags, CALLED); ++ /* smp_mb(); */ ++ if (name[0] == '.' ++ && (namelen == 1 || (name[1] == '.' && namelen == 2))) ++ goto out; /* success */ ++ ++ if (namelen <= AUFS_WH_PFX_LEN ++ || memcmp(name, AUFS_WH_PFX, AUFS_WH_PFX_LEN)) { ++ if (au_ftest_testempty(arg->flags, WHONLY) ++ && !au_nhash_test_known_wh(arg->whlist, name, namelen)) ++ arg->err = -ENOTEMPTY; ++ goto out; ++ } ++ ++ name += AUFS_WH_PFX_LEN; ++ namelen -= AUFS_WH_PFX_LEN; ++ if (!au_nhash_test_known_wh(arg->whlist, name, namelen)) ++ arg->err = au_nhash_append_wh ++ (arg->whlist, name, namelen, ino, d_type, arg->bindex, ++ au_ftest_testempty(arg->flags, SHWH)); ++ ++out: ++ /* smp_mb(); */ ++ AuTraceErr(arg->err); ++ return !arg->err; ++} ++ ++static int do_test_empty(struct dentry *dentry, struct test_empty_arg *arg) ++{ ++ int err; ++ struct file *h_file; ++ struct au_branch *br; ++ ++ h_file = au_h_open(dentry, arg->bindex, ++ O_RDONLY | O_NONBLOCK | O_DIRECTORY | O_LARGEFILE, ++ /*file*/NULL, /*force_wr*/0); ++ err = PTR_ERR(h_file); ++ if (IS_ERR(h_file)) ++ goto out; ++ ++ err = 0; ++ if (!au_opt_test(au_mntflags(dentry->d_sb), UDBA_NONE) ++ && !file_inode(h_file)->i_nlink) ++ goto out_put; ++ ++ do { ++ arg->err = 0; ++ au_fclr_testempty(arg->flags, CALLED); ++ /* smp_mb(); */ ++ err = vfsub_iterate_dir(h_file, &arg->ctx); ++ if (err >= 0) ++ err = arg->err; ++ } while (!err && au_ftest_testempty(arg->flags, CALLED)); ++ ++out_put: ++ fput(h_file); ++ br = au_sbr(dentry->d_sb, arg->bindex); ++ au_lcnt_dec(&br->br_nfiles); ++out: ++ return err; ++} ++ ++struct do_test_empty_args { ++ int *errp; ++ struct dentry *dentry; ++ struct test_empty_arg *arg; ++}; ++ ++static void call_do_test_empty(void *args) ++{ ++ struct do_test_empty_args *a = args; ++ *a->errp = do_test_empty(a->dentry, a->arg); ++} ++ ++static int sio_test_empty(struct dentry *dentry, struct test_empty_arg *arg) ++{ ++ int err, wkq_err; ++ struct dentry *h_dentry; ++ struct inode *h_inode; ++ struct mnt_idmap *h_idmap; ++ ++ h_idmap = au_sbr_idmap(dentry->d_sb, arg->bindex); ++ h_dentry = au_h_dptr(dentry, arg->bindex); ++ h_inode = d_inode(h_dentry); ++ /* todo: i_mode changes anytime? */ ++ inode_lock_shared_nested(h_inode, AuLsc_I_CHILD); ++ err = au_test_h_perm_sio(h_idmap, h_inode, MAY_EXEC | MAY_READ); ++ inode_unlock_shared(h_inode); ++ if (!err) ++ err = do_test_empty(dentry, arg); ++ else { ++ struct do_test_empty_args args = { ++ .errp = &err, ++ .dentry = dentry, ++ .arg = arg ++ }; ++ unsigned int flags = arg->flags; ++ ++ wkq_err = au_wkq_wait(call_do_test_empty, &args); ++ if (unlikely(wkq_err)) ++ err = wkq_err; ++ arg->flags = flags; ++ } ++ ++ return err; ++} ++ ++int au_test_empty_lower(struct dentry *dentry) ++{ ++ int err; ++ unsigned int rdhash; ++ aufs_bindex_t bindex, btop, btail; ++ struct au_nhash whlist; ++ struct test_empty_arg arg = { ++ .ctx = { ++ .actor = test_empty_cb ++ } ++ }; ++ int (*test_empty)(struct dentry *dentry, struct test_empty_arg *arg); ++ ++ SiMustAnyLock(dentry->d_sb); ++ ++ rdhash = au_sbi(dentry->d_sb)->si_rdhash; ++ if (!rdhash) ++ rdhash = au_rdhash_est(au_dir_size(/*file*/NULL, dentry)); ++ err = au_nhash_alloc(&whlist, rdhash, GFP_NOFS); ++ if (unlikely(err)) ++ goto out; ++ ++ arg.flags = 0; ++ arg.whlist = &whlist; ++ btop = au_dbtop(dentry); ++ if (au_opt_test(au_mntflags(dentry->d_sb), SHWH)) ++ au_fset_testempty(arg.flags, SHWH); ++ test_empty = do_test_empty; ++ if (au_opt_test(au_mntflags(dentry->d_sb), DIRPERM1)) ++ test_empty = sio_test_empty; ++ arg.bindex = btop; ++ err = test_empty(dentry, &arg); ++ if (unlikely(err)) ++ goto out_whlist; ++ ++ au_fset_testempty(arg.flags, WHONLY); ++ btail = au_dbtaildir(dentry); ++ for (bindex = btop + 1; !err && bindex <= btail; bindex++) { ++ struct dentry *h_dentry; ++ ++ h_dentry = au_h_dptr(dentry, bindex); ++ if (h_dentry && d_is_positive(h_dentry)) { ++ arg.bindex = bindex; ++ err = test_empty(dentry, &arg); ++ } ++ } ++ ++out_whlist: ++ au_nhash_wh_free(&whlist); ++out: ++ return err; ++} ++ ++int au_test_empty(struct dentry *dentry, struct au_nhash *whlist) ++{ ++ int err; ++ struct test_empty_arg arg = { ++ .ctx = { ++ .actor = test_empty_cb ++ } ++ }; ++ aufs_bindex_t bindex, btail; ++ ++ err = 0; ++ arg.whlist = whlist; ++ arg.flags = AuTestEmpty_WHONLY; ++ if (au_opt_test(au_mntflags(dentry->d_sb), SHWH)) ++ au_fset_testempty(arg.flags, SHWH); ++ btail = au_dbtaildir(dentry); ++ for (bindex = au_dbtop(dentry); !err && bindex <= btail; bindex++) { ++ struct dentry *h_dentry; ++ ++ h_dentry = au_h_dptr(dentry, bindex); ++ if (h_dentry && d_is_positive(h_dentry)) { ++ arg.bindex = bindex; ++ err = sio_test_empty(dentry, &arg); ++ } ++ } ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++const struct file_operations aufs_dir_fop = { ++ .owner = THIS_MODULE, ++ .llseek = default_llseek, ++ .read = generic_read_dir, ++ .iterate_shared = aufs_iterate_shared, ++ .unlocked_ioctl = aufs_ioctl_dir, ++#ifdef CONFIG_COMPAT ++ .compat_ioctl = aufs_compat_ioctl_dir, ++#endif ++ .open = aufs_open_dir, ++ .release = aufs_release_dir, ++ .flush = aufs_flush_dir, ++ .fsync = aufs_fsync_dir ++}; +diff --git a/fs/aufs/dir.h b/fs/aufs/dir.h +new file mode 100644 +index 000000000000..382342bd6ecf +--- /dev/null ++++ b/fs/aufs/dir.h +@@ -0,0 +1,134 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * directory operations ++ */ ++ ++#ifndef __AUFS_DIR_H__ ++#define __AUFS_DIR_H__ ++ ++#ifdef __KERNEL__ ++ ++#include <linux/fs.h> ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* need to be faster and smaller */ ++ ++struct au_nhash { ++ unsigned int nh_num; ++ struct hlist_head *nh_head; ++}; ++ ++struct au_vdir_destr { ++ unsigned char len; ++ unsigned char name[]; ++} __packed; ++ ++struct au_vdir_dehstr { ++ struct hlist_node hash; ++ struct au_vdir_destr *str; ++ struct rcu_head rcu; ++} ____cacheline_aligned_in_smp; ++ ++struct au_vdir_de { ++ ino_t de_ino; ++ unsigned char de_type; ++ /* caution: packed */ ++ struct au_vdir_destr de_str; ++} __packed; ++ ++struct au_vdir_wh { ++ struct hlist_node wh_hash; ++#ifdef CONFIG_AUFS_SHWH ++ ino_t wh_ino; ++ aufs_bindex_t wh_bindex; ++ unsigned char wh_type; ++#else ++ aufs_bindex_t wh_bindex; ++#endif ++ /* caution: packed */ ++ struct au_vdir_destr wh_str; ++} __packed; ++ ++union au_vdir_deblk_p { ++ unsigned char *deblk; ++ struct au_vdir_de *de; ++}; ++ ++struct au_vdir { ++ unsigned char **vd_deblk; ++ unsigned long vd_nblk; ++ struct { ++ unsigned long ul; ++ union au_vdir_deblk_p p; ++ } vd_last; ++ ++ u64 vd_version; ++ unsigned int vd_deblk_sz; ++ unsigned long vd_jiffy; ++ struct rcu_head rcu; ++} ____cacheline_aligned_in_smp; ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* dir.c */ ++extern const struct file_operations aufs_dir_fop; ++void au_add_nlink(struct inode *dir, struct inode *h_dir); ++void au_sub_nlink(struct inode *dir, struct inode *h_dir); ++loff_t au_dir_size(struct file *file, struct dentry *dentry); ++void au_dir_ts(struct inode *dir, aufs_bindex_t bsrc); ++int au_test_empty_lower(struct dentry *dentry); ++int au_test_empty(struct dentry *dentry, struct au_nhash *whlist); ++ ++/* vdir.c */ ++unsigned int au_rdhash_est(loff_t sz); ++int au_nhash_alloc(struct au_nhash *nhash, unsigned int num_hash, gfp_t gfp); ++void au_nhash_wh_free(struct au_nhash *whlist); ++int au_nhash_test_longer_wh(struct au_nhash *whlist, aufs_bindex_t btgt, ++ int limit); ++int au_nhash_test_known_wh(struct au_nhash *whlist, char *name, int nlen); ++int au_nhash_append_wh(struct au_nhash *whlist, char *name, int nlen, ino_t ino, ++ unsigned int d_type, aufs_bindex_t bindex, ++ unsigned char shwh); ++void au_vdir_free(struct au_vdir *vdir); ++int au_vdir_init(struct file *file); ++int au_vdir_fill_de(struct file *file, struct dir_context *ctx); ++ ++/* ioctl.c */ ++long aufs_ioctl_dir(struct file *file, unsigned int cmd, unsigned long arg); ++ ++#ifdef CONFIG_AUFS_RDU ++/* rdu.c */ ++long au_rdu_ioctl(struct file *file, unsigned int cmd, unsigned long arg); ++#ifdef CONFIG_COMPAT ++long au_rdu_compat_ioctl(struct file *file, unsigned int cmd, ++ unsigned long arg); ++#endif ++#else ++AuStub(long, au_rdu_ioctl, return -EINVAL, struct file *file, ++ unsigned int cmd, unsigned long arg) ++#ifdef CONFIG_COMPAT ++AuStub(long, au_rdu_compat_ioctl, return -EINVAL, struct file *file, ++ unsigned int cmd, unsigned long arg) ++#endif ++#endif ++ ++#endif /* __KERNEL__ */ ++#endif /* __AUFS_DIR_H__ */ +diff --git a/fs/aufs/dirren.c b/fs/aufs/dirren.c +new file mode 100644 +index 000000000000..2a6295ab6576 +--- /dev/null ++++ b/fs/aufs/dirren.c +@@ -0,0 +1,1315 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2017-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * special handling in renaming a directory ++ * in order to support looking-up the before-renamed name on the lower readonly ++ * branches ++ */ ++ ++#include <linux/byteorder/generic.h> ++#include "aufs.h" ++ ++static void au_dr_hino_del(struct au_dr_br *dr, struct au_dr_hino *ent) ++{ ++ int idx; ++ ++ idx = au_dr_ihash(ent->dr_h_ino); ++ au_hbl_del(&ent->dr_hnode, dr->dr_h_ino + idx); ++} ++ ++static int au_dr_hino_test_empty(struct au_dr_br *dr) ++{ ++ int ret, i; ++ struct hlist_bl_head *hbl; ++ ++ ret = 1; ++ for (i = 0; ret && i < AuDirren_NHASH; i++) { ++ hbl = dr->dr_h_ino + i; ++ hlist_bl_lock(hbl); ++ ret &= hlist_bl_empty(hbl); ++ hlist_bl_unlock(hbl); ++ } ++ ++ return ret; ++} ++ ++static struct au_dr_hino *au_dr_hino_find(struct au_dr_br *dr, ino_t ino) ++{ ++ struct au_dr_hino *found, *ent; ++ struct hlist_bl_head *hbl; ++ struct hlist_bl_node *pos; ++ int idx; ++ ++ found = NULL; ++ idx = au_dr_ihash(ino); ++ hbl = dr->dr_h_ino + idx; ++ hlist_bl_lock(hbl); ++ hlist_bl_for_each_entry(ent, pos, hbl, dr_hnode) ++ if (ent->dr_h_ino == ino) { ++ found = ent; ++ break; ++ } ++ hlist_bl_unlock(hbl); ++ ++ return found; ++} ++ ++int au_dr_hino_test_add(struct au_dr_br *dr, ino_t ino, ++ struct au_dr_hino *add_ent) ++{ ++ int found, idx; ++ struct hlist_bl_head *hbl; ++ struct hlist_bl_node *pos; ++ struct au_dr_hino *ent; ++ ++ found = 0; ++ idx = au_dr_ihash(ino); ++ hbl = dr->dr_h_ino + idx; ++#if 0 /* debug print */ ++ { ++ struct hlist_bl_node *tmp; ++ ++ hlist_bl_for_each_entry_safe(ent, pos, tmp, hbl, dr_hnode) ++ AuDbg("hi%llu\n", (unsigned long long)ent->dr_h_ino); ++ } ++#endif ++ hlist_bl_lock(hbl); ++ hlist_bl_for_each_entry(ent, pos, hbl, dr_hnode) ++ if (ent->dr_h_ino == ino) { ++ found = 1; ++ break; ++ } ++ if (!found && add_ent) ++ hlist_bl_add_head(&add_ent->dr_hnode, hbl); ++ hlist_bl_unlock(hbl); ++ ++ if (!found && add_ent) ++ AuDbg("i%llu added\n", (unsigned long long)add_ent->dr_h_ino); ++ ++ return found; ++} ++ ++void au_dr_hino_free(struct au_dr_br *dr) ++{ ++ int i; ++ struct hlist_bl_head *hbl; ++ struct hlist_bl_node *pos, *tmp; ++ struct au_dr_hino *ent; ++ ++ /* SiMustWriteLock(sb); */ ++ ++ for (i = 0; i < AuDirren_NHASH; i++) { ++ hbl = dr->dr_h_ino + i; ++ /* no spinlock since sbinfo must be write-locked */ ++ hlist_bl_for_each_entry_safe(ent, pos, tmp, hbl, dr_hnode) ++ au_kfree_rcu(ent); ++ INIT_HLIST_BL_HEAD(hbl); ++ } ++} ++ ++/* returns the number of inodes or an error */ ++static int au_dr_hino_store(struct super_block *sb, struct au_branch *br, ++ struct file *hinofile) ++{ ++ int err, i; ++ ssize_t ssz; ++ loff_t pos, oldsize; ++ __be64 u64; ++ struct inode *hinoinode; ++ struct hlist_bl_head *hbl; ++ struct hlist_bl_node *n1, *n2; ++ struct au_dr_hino *ent; ++ ++ SiMustWriteLock(sb); ++ AuDebugOn(!au_br_writable(br->br_perm)); ++ ++ hinoinode = file_inode(hinofile); ++ oldsize = i_size_read(hinoinode); ++ ++ err = 0; ++ pos = 0; ++ hbl = br->br_dirren.dr_h_ino; ++ for (i = 0; !err && i < AuDirren_NHASH; i++, hbl++) { ++ /* no bit-lock since sbinfo must be write-locked */ ++ hlist_bl_for_each_entry_safe(ent, n1, n2, hbl, dr_hnode) { ++ AuDbg("hi%llu, %pD2\n", ++ (unsigned long long)ent->dr_h_ino, hinofile); ++ u64 = cpu_to_be64(ent->dr_h_ino); ++ ssz = vfsub_write_k(hinofile, &u64, sizeof(u64), &pos); ++ if (ssz == sizeof(u64)) ++ continue; ++ ++ /* write error */ ++ pr_err("ssz %zd, %pD2\n", ssz, hinofile); ++ err = -ENOSPC; ++ if (ssz < 0) ++ err = ssz; ++ break; ++ } ++ } ++ /* regardless the error */ ++ if (pos < oldsize) { ++ err = vfsub_trunc(&hinofile->f_path, pos, /*attr*/0, hinofile); ++ AuTraceErr(err); ++ } ++ ++ AuTraceErr(err); ++ return err; ++} ++ ++static int au_dr_hino_load(struct au_dr_br *dr, struct file *hinofile) ++{ ++ int err, hidx; ++ ssize_t ssz; ++ size_t sz, n; ++ loff_t pos; ++ uint64_t u64; ++ struct au_dr_hino *ent; ++ struct inode *hinoinode; ++ struct hlist_bl_head *hbl; ++ ++ err = 0; ++ pos = 0; ++ hbl = dr->dr_h_ino; ++ hinoinode = file_inode(hinofile); ++ sz = i_size_read(hinoinode); ++ AuDebugOn(sz % sizeof(u64)); ++ n = sz / sizeof(u64); ++ while (n--) { ++ ssz = vfsub_read_k(hinofile, &u64, sizeof(u64), &pos); ++ if (unlikely(ssz != sizeof(u64))) { ++ pr_err("ssz %zd, %pD2\n", ssz, hinofile); ++ err = -EINVAL; ++ if (ssz < 0) ++ err = ssz; ++ goto out_free; ++ } ++ ++ ent = kmalloc(sizeof(*ent), GFP_NOFS); ++ if (!ent) { ++ err = -ENOMEM; ++ AuTraceErr(err); ++ goto out_free; ++ } ++ ent->dr_h_ino = be64_to_cpu((__force __be64)u64); ++ AuDbg("hi%llu, %pD2\n", ++ (unsigned long long)ent->dr_h_ino, hinofile); ++ hidx = au_dr_ihash(ent->dr_h_ino); ++ au_hbl_add(&ent->dr_hnode, hbl + hidx); ++ } ++ goto out; /* success */ ++ ++out_free: ++ au_dr_hino_free(dr); ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++/* ++ * @bindex/@br is a switch to distinguish whether suspending hnotify or not. ++ * @path is a switch to distinguish load and store. ++ */ ++static int au_dr_hino(struct super_block *sb, aufs_bindex_t bindex, ++ struct au_branch *br, const struct path *path) ++{ ++ int err, flags; ++ unsigned char load, suspend; ++ struct file *hinofile; ++ struct au_hinode *hdir; ++ struct inode *dir, *delegated; ++ struct path hinopath; ++ struct qstr hinoname = QSTR_INIT(AUFS_WH_DR_BRHINO, ++ sizeof(AUFS_WH_DR_BRHINO) - 1); ++ ++ AuDebugOn(bindex < 0 && !br); ++ AuDebugOn(bindex >= 0 && br); ++ ++ err = -EINVAL; ++ suspend = !br; ++ if (suspend) ++ br = au_sbr(sb, bindex); ++ load = !!path; ++ if (!load) { ++ path = &br->br_path; ++ AuDebugOn(!au_br_writable(br->br_perm)); ++ if (unlikely(!au_br_writable(br->br_perm))) ++ goto out; ++ } ++ ++ hdir = NULL; ++ if (suspend) { ++ dir = d_inode(sb->s_root); ++ hdir = au_hinode(au_ii(dir), bindex); ++ dir = hdir->hi_inode; ++ au_hn_inode_lock_nested(hdir, AuLsc_I_CHILD); ++ } else { ++ dir = d_inode(path->dentry); ++ inode_lock_nested(dir, AuLsc_I_CHILD); ++ } ++ hinopath.mnt = path->mnt; ++ hinopath.dentry = vfsub_lkup_one(&hinoname, (struct path *)path); ++ err = PTR_ERR(hinopath.dentry); ++ if (IS_ERR(hinopath.dentry)) ++ goto out_unlock; ++ ++ err = 0; ++ flags = O_RDONLY; ++ if (load) { ++ if (d_is_negative(hinopath.dentry)) ++ goto out_dput; /* success */ ++ } else { ++ if (au_dr_hino_test_empty(&br->br_dirren)) { ++ if (d_is_positive(hinopath.dentry)) { ++ delegated = NULL; ++ err = vfsub_unlink(dir, &hinopath, &delegated, ++ /*force*/0); ++ AuTraceErr(err); ++ if (unlikely(err)) ++ pr_err("ignored err %d, %pd2\n", ++ err, hinopath.dentry); ++ if (unlikely(err == -EWOULDBLOCK)) ++ iput(delegated); ++ err = 0; ++ } ++ goto out_dput; ++ } else if (!d_is_positive(hinopath.dentry)) { ++ err = vfsub_create(dir, &hinopath, 0600, ++ /*want_excl*/false); ++ AuTraceErr(err); ++ if (unlikely(err)) ++ goto out_dput; ++ } ++ flags = O_WRONLY; ++ } ++ hinofile = vfsub_dentry_open(&hinopath, flags); ++ if (suspend) ++ au_hn_inode_unlock(hdir); ++ else ++ inode_unlock(dir); ++ dput(hinopath.dentry); ++ AuTraceErrPtr(hinofile); ++ if (IS_ERR(hinofile)) { ++ err = PTR_ERR(hinofile); ++ goto out; ++ } ++ ++ if (load) ++ err = au_dr_hino_load(&br->br_dirren, hinofile); ++ else ++ err = au_dr_hino_store(sb, br, hinofile); ++ fput(hinofile); ++ goto out; ++ ++out_dput: ++ dput(hinopath.dentry); ++out_unlock: ++ if (suspend) ++ au_hn_inode_unlock(hdir); ++ else ++ inode_unlock(dir); ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int au_dr_brid_init(struct au_dr_brid *brid, const struct path *path) ++{ ++ int err; ++ struct kstatfs kstfs; ++ dev_t dev; ++ struct dentry *dentry; ++ struct super_block *sb; ++ ++ err = vfs_statfs((void *)path, &kstfs); ++ AuTraceErr(err); ++ if (unlikely(err)) ++ goto out; ++ ++ /* todo: support for UUID */ ++ ++ if (kstfs.f_fsid.val[0] || kstfs.f_fsid.val[1]) { ++ brid->type = AuBrid_FSID; ++ brid->fsid = kstfs.f_fsid; ++ } else { ++ dentry = path->dentry; ++ sb = dentry->d_sb; ++ dev = sb->s_dev; ++ if (dev) { ++ brid->type = AuBrid_DEV; ++ brid->dev = dev; ++ } ++ } ++ ++out: ++ return err; ++} ++ ++int au_dr_br_init(struct super_block *sb, struct au_branch *br, ++ const struct path *path) ++{ ++ int err, i; ++ struct au_dr_br *dr; ++ struct hlist_bl_head *hbl; ++ ++ dr = &br->br_dirren; ++ hbl = dr->dr_h_ino; ++ for (i = 0; i < AuDirren_NHASH; i++, hbl++) ++ INIT_HLIST_BL_HEAD(hbl); ++ ++ err = au_dr_brid_init(&dr->dr_brid, path); ++ if (unlikely(err)) ++ goto out; ++ ++ if (au_opt_test(au_mntflags(sb), DIRREN)) ++ err = au_dr_hino(sb, /*bindex*/-1, br, path); ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++int au_dr_br_fin(struct super_block *sb, struct au_branch *br) ++{ ++ int err; ++ ++ err = 0; ++ if (au_br_writable(br->br_perm)) ++ err = au_dr_hino(sb, /*bindex*/-1, br, /*path*/NULL); ++ if (!err) ++ au_dr_hino_free(&br->br_dirren); ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int au_brid_str(struct au_dr_brid *brid, struct inode *h_inode, ++ char *buf, size_t sz) ++{ ++ int err; ++ unsigned int major, minor; ++ char *p; ++ ++ p = buf; ++ err = snprintf(p, sz, "%d_", brid->type); ++ AuDebugOn(err > sz); ++ p += err; ++ sz -= err; ++ switch (brid->type) { ++ case AuBrid_Unset: ++ return -EINVAL; ++ case AuBrid_UUID: ++ err = snprintf(p, sz, "%pU", brid->uuid.b); ++ break; ++ case AuBrid_FSID: ++ err = snprintf(p, sz, "%08x-%08x", ++ brid->fsid.val[0], brid->fsid.val[1]); ++ break; ++ case AuBrid_DEV: ++ major = MAJOR(brid->dev); ++ minor = MINOR(brid->dev); ++ if (major <= 0xff && minor <= 0xff) ++ err = snprintf(p, sz, "%02x%02x", major, minor); ++ else ++ err = snprintf(p, sz, "%03x:%05x", major, minor); ++ break; ++ } ++ AuDebugOn(err > sz); ++ p += err; ++ sz -= err; ++ err = snprintf(p, sz, "_%llu", (unsigned long long)h_inode->i_ino); ++ AuDebugOn(err > sz); ++ p += err; ++ sz -= err; ++ ++ return p - buf; ++} ++ ++static int au_drinfo_name(struct au_branch *br, char *name, int len) ++{ ++ int rlen; ++ struct dentry *br_dentry; ++ struct inode *br_inode; ++ ++ br_dentry = au_br_dentry(br); ++ br_inode = d_inode(br_dentry); ++ rlen = au_brid_str(&br->br_dirren.dr_brid, br_inode, name, len); ++ AuDebugOn(rlen >= AUFS_DIRREN_ENV_VAL_SZ); ++ AuDebugOn(rlen > len); ++ ++ return rlen; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * from the given @h_dentry, construct drinfo at @*fdata. ++ * when the size of @*fdata is not enough, reallocate and return new @fdata and ++ * @allocated. ++ */ ++static int au_drinfo_construct(struct au_drinfo_fdata **fdata, ++ struct dentry *h_dentry, ++ unsigned char *allocated) ++{ ++ int err, v; ++ struct au_drinfo_fdata *f, *p; ++ struct au_drinfo *drinfo; ++ struct inode *h_inode; ++ struct qstr *qname; ++ ++ err = 0; ++ f = *fdata; ++ h_inode = d_inode(h_dentry); ++ qname = &h_dentry->d_name; ++ drinfo = &f->drinfo; ++ drinfo->ino = (__force uint64_t)cpu_to_be64(h_inode->i_ino); ++ drinfo->oldnamelen = qname->len; ++ if (*allocated < sizeof(*f) + qname->len) { ++ v = roundup_pow_of_two(*allocated + qname->len); ++ p = au_krealloc(f, v, GFP_NOFS, /*may_shrink*/0); ++ if (unlikely(!p)) { ++ err = -ENOMEM; ++ AuTraceErr(err); ++ goto out; ++ } ++ f = p; ++ *fdata = f; ++ *allocated = v; ++ drinfo = &f->drinfo; ++ } ++ memcpy(drinfo->oldname, qname->name, qname->len); ++ AuDbg("i%llu, %.*s\n", ++ be64_to_cpu((__force __be64)drinfo->ino), drinfo->oldnamelen, ++ drinfo->oldname); ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++/* callers have to free the return value */ ++static struct au_drinfo *au_drinfo_read_k(struct file *file, ino_t h_ino) ++{ ++ struct au_drinfo *ret, *drinfo; ++ struct au_drinfo_fdata fdata; ++ int len; ++ loff_t pos; ++ ssize_t ssz; ++ ++ ret = ERR_PTR(-EIO); ++ pos = 0; ++ ssz = vfsub_read_k(file, &fdata, sizeof(fdata), &pos); ++ if (unlikely(ssz != sizeof(fdata))) { ++ AuIOErr("ssz %zd, %u, %pD2\n", ++ ssz, (unsigned int)sizeof(fdata), file); ++ goto out; ++ } ++ ++ fdata.magic = ntohl((__force __be32)fdata.magic); ++ switch (fdata.magic) { ++ case AUFS_DRINFO_MAGIC_V1: ++ break; ++ default: ++ AuIOErr("magic-num 0x%x, 0x%x, %pD2\n", ++ fdata.magic, AUFS_DRINFO_MAGIC_V1, file); ++ goto out; ++ } ++ ++ drinfo = &fdata.drinfo; ++ len = drinfo->oldnamelen; ++ if (!len) { ++ AuIOErr("broken drinfo %pD2\n", file); ++ goto out; ++ } ++ ++ ret = NULL; ++ drinfo->ino = be64_to_cpu((__force __be64)drinfo->ino); ++ if (unlikely(h_ino && drinfo->ino != h_ino)) { ++ AuDbg("ignored i%llu, i%llu, %pD2\n", ++ (unsigned long long)drinfo->ino, ++ (unsigned long long)h_ino, file); ++ goto out; /* success */ ++ } ++ ++ ret = kmalloc(sizeof(*ret) + len, GFP_NOFS); ++ if (unlikely(!ret)) { ++ ret = ERR_PTR(-ENOMEM); ++ AuTraceErrPtr(ret); ++ goto out; ++ } ++ ++ *ret = *drinfo; ++ ssz = vfsub_read_k(file, (void *)ret->oldname, len, &pos); ++ if (unlikely(ssz != len)) { ++ au_kfree_rcu(ret); ++ ret = ERR_PTR(-EIO); ++ AuIOErr("ssz %zd, %u, %pD2\n", ssz, len, file); ++ goto out; ++ } ++ ++ AuDbg("oldname %.*s\n", ret->oldnamelen, ret->oldname); ++ ++out: ++ return ret; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* in order to be revertible */ ++struct au_drinfo_rev_elm { ++ int created; ++ struct dentry *info_dentry; ++ struct au_drinfo *info_last; ++}; ++ ++struct au_drinfo_rev { ++ unsigned char already; ++ aufs_bindex_t nelm; ++ struct au_drinfo_rev_elm elm[]; ++}; ++ ++/* todo: isn't it too large? */ ++struct au_drinfo_store { ++ struct path h_ppath; ++ struct dentry *h_dentry; ++ struct au_drinfo_fdata *fdata; ++ char *infoname; /* inside of whname, just after PFX */ ++ char whname[sizeof(AUFS_WH_DR_INFO_PFX) + AUFS_DIRREN_ENV_VAL_SZ]; ++ aufs_bindex_t btgt, btail; ++ unsigned char no_sio, ++ allocated, /* current size of *fdata */ ++ infonamelen, /* room size for p */ ++ whnamelen, /* length of the generated name */ ++ renameback; /* renamed back */ ++}; ++ ++/* on rename(2) error, the caller should revert it using @elm */ ++static int au_drinfo_do_store(struct au_drinfo_store *w, ++ struct au_drinfo_rev_elm *elm) ++{ ++ int err, len; ++ ssize_t ssz; ++ loff_t pos; ++ struct path infopath = { ++ .mnt = w->h_ppath.mnt ++ }; ++ struct inode *h_dir, *h_inode, *delegated; ++ struct file *infofile; ++ struct qstr *qname; ++ ++ AuDebugOn(elm ++ && memcmp(elm, page_address(ZERO_PAGE(0)), sizeof(*elm))); ++ ++ infopath.dentry = vfsub_lookup_one_len(w->whname, &w->h_ppath, ++ w->whnamelen); ++ AuTraceErrPtr(infopath.dentry); ++ if (IS_ERR(infopath.dentry)) { ++ err = PTR_ERR(infopath.dentry); ++ goto out; ++ } ++ ++ err = 0; ++ h_dir = d_inode(w->h_ppath.dentry); ++ if (elm && d_is_negative(infopath.dentry)) { ++ err = vfsub_create(h_dir, &infopath, 0600, /*want_excl*/true); ++ AuTraceErr(err); ++ if (unlikely(err)) ++ goto out_dput; ++ elm->created = 1; ++ elm->info_dentry = dget(infopath.dentry); ++ } ++ ++ infofile = vfsub_dentry_open(&infopath, O_RDWR); ++ AuTraceErrPtr(infofile); ++ if (IS_ERR(infofile)) { ++ err = PTR_ERR(infofile); ++ goto out_dput; ++ } ++ ++ h_inode = d_inode(infopath.dentry); ++ if (elm && i_size_read(h_inode)) { ++ h_inode = d_inode(w->h_dentry); ++ elm->info_last = au_drinfo_read_k(infofile, h_inode->i_ino); ++ AuTraceErrPtr(elm->info_last); ++ if (IS_ERR(elm->info_last)) { ++ err = PTR_ERR(elm->info_last); ++ elm->info_last = NULL; ++ AuDebugOn(elm->info_dentry); ++ goto out_fput; ++ } ++ } ++ ++ if (elm && w->renameback) { ++ delegated = NULL; ++ err = vfsub_unlink(h_dir, &infopath, &delegated, /*force*/0); ++ AuTraceErr(err); ++ if (unlikely(err == -EWOULDBLOCK)) ++ iput(delegated); ++ goto out_fput; ++ } ++ ++ pos = 0; ++ qname = &w->h_dentry->d_name; ++ len = sizeof(*w->fdata) + qname->len; ++ if (!elm) ++ len = sizeof(*w->fdata) + w->fdata->drinfo.oldnamelen; ++ ssz = vfsub_write_k(infofile, w->fdata, len, &pos); ++ if (ssz == len) { ++ AuDbg("hi%llu, %.*s\n", w->fdata->drinfo.ino, ++ w->fdata->drinfo.oldnamelen, w->fdata->drinfo.oldname); ++ goto out_fput; /* success */ ++ } else { ++ err = -EIO; ++ if (ssz < 0) ++ err = ssz; ++ /* the caller should revert it using @elm */ ++ } ++ ++out_fput: ++ fput(infofile); ++out_dput: ++ dput(infopath.dentry); ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++struct au_call_drinfo_do_store_args { ++ int *errp; ++ struct au_drinfo_store *w; ++ struct au_drinfo_rev_elm *elm; ++}; ++ ++static void au_call_drinfo_do_store(void *args) ++{ ++ struct au_call_drinfo_do_store_args *a = args; ++ ++ *a->errp = au_drinfo_do_store(a->w, a->elm); ++} ++ ++static int au_drinfo_store_sio(struct au_drinfo_store *w, ++ struct au_drinfo_rev_elm *elm) ++{ ++ int err, wkq_err; ++ ++ if (w->no_sio) ++ err = au_drinfo_do_store(w, elm); ++ else { ++ struct au_call_drinfo_do_store_args a = { ++ .errp = &err, ++ .w = w, ++ .elm = elm ++ }; ++ wkq_err = au_wkq_wait(au_call_drinfo_do_store, &a); ++ if (unlikely(wkq_err)) ++ err = wkq_err; ++ } ++ AuTraceErr(err); ++ ++ return err; ++} ++ ++static int au_drinfo_store_work_init(struct au_drinfo_store *w, ++ aufs_bindex_t btgt) ++{ ++ int err; ++ ++ memset(w, 0, sizeof(*w)); ++ w->allocated = roundup_pow_of_two(sizeof(*w->fdata) + 40); ++ strscpy(w->whname, AUFS_WH_DR_INFO_PFX, sizeof(AUFS_WH_DR_INFO_PFX)); ++ w->infoname = w->whname + sizeof(AUFS_WH_DR_INFO_PFX) - 1; ++ w->infonamelen = sizeof(w->whname) - sizeof(AUFS_WH_DR_INFO_PFX); ++ w->btgt = btgt; ++ w->no_sio = !!uid_eq(current_fsuid(), GLOBAL_ROOT_UID); ++ ++ err = -ENOMEM; ++ w->fdata = kcalloc(1, w->allocated, GFP_NOFS); ++ if (unlikely(!w->fdata)) { ++ AuTraceErr(err); ++ goto out; ++ } ++ w->fdata->magic = (__force uint32_t)htonl(AUFS_DRINFO_MAGIC_V1); ++ err = 0; ++ ++out: ++ return err; ++} ++ ++static void au_drinfo_store_work_fin(struct au_drinfo_store *w) ++{ ++ au_kfree_rcu(w->fdata); ++} ++ ++static void au_drinfo_store_rev(struct au_drinfo_rev *rev, ++ struct au_drinfo_store *w) ++{ ++ struct au_drinfo_rev_elm *elm; ++ struct inode *h_dir, *delegated; ++ int err, nelm; ++ struct path infopath = { ++ .mnt = w->h_ppath.mnt ++ }; ++ ++ h_dir = d_inode(w->h_ppath.dentry); ++ IMustLock(h_dir); ++ ++ err = 0; ++ elm = rev->elm; ++ for (nelm = rev->nelm; nelm > 0; nelm--, elm++) { ++ AuDebugOn(elm->created && elm->info_last); ++ if (elm->created) { ++ AuDbg("here\n"); ++ delegated = NULL; ++ infopath.dentry = elm->info_dentry; ++ err = vfsub_unlink(h_dir, &infopath, &delegated, ++ !w->no_sio); ++ AuTraceErr(err); ++ if (unlikely(err == -EWOULDBLOCK)) ++ iput(delegated); ++ dput(elm->info_dentry); ++ } else if (elm->info_last) { ++ AuDbg("here\n"); ++ w->fdata->drinfo = *elm->info_last; ++ memcpy(w->fdata->drinfo.oldname, ++ elm->info_last->oldname, ++ elm->info_last->oldnamelen); ++ err = au_drinfo_store_sio(w, /*elm*/NULL); ++ au_kfree_rcu(elm->info_last); ++ } ++ if (unlikely(err)) ++ AuIOErr("%d, %s\n", err, w->whname); ++ /* go on even if err */ ++ } ++} ++ ++/* caller has to call au_dr_rename_fin() later */ ++static int au_drinfo_store(struct dentry *dentry, aufs_bindex_t btgt, ++ struct qstr *dst_name, void *_rev) ++{ ++ int err, sz, nelm; ++ aufs_bindex_t bindex, btail; ++ struct au_drinfo_store work; ++ struct au_drinfo_rev *rev, **p; ++ struct au_drinfo_rev_elm *elm; ++ struct super_block *sb; ++ struct au_branch *br; ++ struct au_hinode *hdir; ++ ++ err = au_drinfo_store_work_init(&work, btgt); ++ AuTraceErr(err); ++ if (unlikely(err)) ++ goto out; ++ ++ err = -ENOMEM; ++ btail = au_dbtaildir(dentry); ++ nelm = btail - btgt; ++ sz = sizeof(*rev) + sizeof(*elm) * nelm; ++ rev = kcalloc(1, sz, GFP_NOFS); ++ if (unlikely(!rev)) { ++ AuTraceErr(err); ++ goto out_args; ++ } ++ rev->nelm = nelm; ++ elm = rev->elm; ++ p = _rev; ++ *p = rev; ++ ++ err = 0; ++ sb = dentry->d_sb; ++ work.h_ppath.dentry = au_h_dptr(dentry, btgt); ++ work.h_ppath.mnt = au_sbr_mnt(sb, btgt); ++ hdir = au_hi(d_inode(dentry), btgt); ++ au_hn_inode_lock_nested(hdir, AuLsc_I_CHILD); ++ for (bindex = btgt + 1; bindex <= btail; bindex++, elm++) { ++ work.h_dentry = au_h_dptr(dentry, bindex); ++ if (!work.h_dentry) ++ continue; ++ ++ err = au_drinfo_construct(&work.fdata, work.h_dentry, ++ &work.allocated); ++ AuTraceErr(err); ++ if (unlikely(err)) ++ break; ++ ++ work.renameback = au_qstreq(&work.h_dentry->d_name, dst_name); ++ br = au_sbr(sb, bindex); ++ work.whnamelen = sizeof(AUFS_WH_DR_INFO_PFX) - 1; ++ work.whnamelen += au_drinfo_name(br, work.infoname, ++ work.infonamelen); ++ AuDbg("whname %.*s, i%llu, %.*s\n", ++ work.whnamelen, work.whname, ++ be64_to_cpu((__force __be64)work.fdata->drinfo.ino), ++ work.fdata->drinfo.oldnamelen, ++ work.fdata->drinfo.oldname); ++ ++ err = au_drinfo_store_sio(&work, elm); ++ AuTraceErr(err); ++ if (unlikely(err)) ++ break; ++ } ++ if (unlikely(err)) { ++ /* revert all drinfo */ ++ au_drinfo_store_rev(rev, &work); ++ au_kfree_try_rcu(rev); ++ *p = NULL; ++ } ++ au_hn_inode_unlock(hdir); ++ ++out_args: ++ au_drinfo_store_work_fin(&work); ++out: ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++int au_dr_rename(struct dentry *src, aufs_bindex_t bindex, ++ struct qstr *dst_name, void *_rev) ++{ ++ int err, already; ++ ino_t ino; ++ struct super_block *sb; ++ struct au_branch *br; ++ struct au_dr_br *dr; ++ struct dentry *h_dentry; ++ struct inode *h_inode; ++ struct au_dr_hino *ent; ++ struct au_drinfo_rev *rev, **p; ++ ++ AuDbg("bindex %d\n", bindex); ++ ++ err = -ENOMEM; ++ ent = kmalloc(sizeof(*ent), GFP_NOFS); ++ if (unlikely(!ent)) ++ goto out; ++ ++ sb = src->d_sb; ++ br = au_sbr(sb, bindex); ++ dr = &br->br_dirren; ++ h_dentry = au_h_dptr(src, bindex); ++ h_inode = d_inode(h_dentry); ++ ino = h_inode->i_ino; ++ ent->dr_h_ino = ino; ++ already = au_dr_hino_test_add(dr, ino, ent); ++ AuDbg("b%d, hi%llu, already %d\n", ++ bindex, (unsigned long long)ino, already); ++ ++ err = au_drinfo_store(src, bindex, dst_name, _rev); ++ AuTraceErr(err); ++ if (!err) { ++ p = _rev; ++ rev = *p; ++ rev->already = already; ++ goto out; /* success */ ++ } ++ ++ /* revert */ ++ if (!already) ++ au_dr_hino_del(dr, ent); ++ au_kfree_rcu(ent); ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++void au_dr_rename_fin(struct dentry *src, aufs_bindex_t btgt, void *_rev) ++{ ++ struct au_drinfo_rev *rev; ++ struct au_drinfo_rev_elm *elm; ++ int nelm; ++ ++ rev = _rev; ++ elm = rev->elm; ++ for (nelm = rev->nelm; nelm > 0; nelm--, elm++) { ++ dput(elm->info_dentry); ++ au_kfree_rcu(elm->info_last); ++ } ++ au_kfree_try_rcu(rev); ++} ++ ++void au_dr_rename_rev(struct dentry *src, aufs_bindex_t btgt, void *_rev) ++{ ++ int err; ++ struct au_drinfo_store work; ++ struct au_drinfo_rev *rev = _rev; ++ struct super_block *sb; ++ struct au_branch *br; ++ struct inode *h_inode; ++ struct au_dr_br *dr; ++ struct au_dr_hino *ent; ++ ++ err = au_drinfo_store_work_init(&work, btgt); ++ if (unlikely(err)) ++ goto out; ++ ++ sb = src->d_sb; ++ br = au_sbr(sb, btgt); ++ work.h_ppath.dentry = au_h_dptr(src, btgt); ++ work.h_ppath.mnt = au_br_mnt(br); ++ au_drinfo_store_rev(rev, &work); ++ au_drinfo_store_work_fin(&work); ++ if (rev->already) ++ goto out; ++ ++ dr = &br->br_dirren; ++ h_inode = d_inode(work.h_ppath.dentry); ++ ent = au_dr_hino_find(dr, h_inode->i_ino); ++ BUG_ON(!ent); ++ au_dr_hino_del(dr, ent); ++ au_kfree_rcu(ent); ++ ++out: ++ au_kfree_try_rcu(rev); ++ if (unlikely(err)) ++ pr_err("failed to remove dirren info\n"); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static struct au_drinfo *au_drinfo_do_load(struct path *h_ppath, ++ char *whname, int whnamelen, ++ struct dentry **info_dentry) ++{ ++ struct au_drinfo *drinfo; ++ struct file *f; ++ struct inode *h_dir; ++ struct path infopath; ++ int unlocked; ++ ++ AuDbg("%pd/%.*s\n", h_ppath->dentry, whnamelen, whname); ++ ++ *info_dentry = NULL; ++ drinfo = NULL; ++ unlocked = 0; ++ h_dir = d_inode(h_ppath->dentry); ++ inode_lock_shared_nested(h_dir, AuLsc_I_PARENT); ++ infopath.dentry = vfsub_lookup_one_len(whname, h_ppath, whnamelen); ++ if (IS_ERR(infopath.dentry)) { ++ drinfo = (void *)infopath.dentry; ++ goto out; ++ } ++ ++ if (d_is_negative(infopath.dentry)) ++ goto out_dput; /* success */ ++ ++ infopath.mnt = h_ppath->mnt; ++ f = vfsub_dentry_open(&infopath, O_RDONLY); ++ inode_unlock_shared(h_dir); ++ unlocked = 1; ++ if (IS_ERR(f)) { ++ drinfo = (void *)f; ++ goto out_dput; ++ } ++ ++ drinfo = au_drinfo_read_k(f, /*h_ino*/0); ++ if (IS_ERR_OR_NULL(drinfo)) ++ goto out_fput; ++ ++ AuDbg("oldname %.*s\n", drinfo->oldnamelen, drinfo->oldname); ++ *info_dentry = dget(infopath.dentry); /* keep it alive */ ++ ++out_fput: ++ fput(f); ++out_dput: ++ dput(infopath.dentry); ++out: ++ if (!unlocked) ++ inode_unlock_shared(h_dir); ++ AuTraceErrPtr(drinfo); ++ return drinfo; ++} ++ ++struct au_drinfo_do_load_args { ++ struct au_drinfo **drinfop; ++ struct path *h_ppath; ++ char *whname; ++ int whnamelen; ++ struct dentry **info_dentry; ++}; ++ ++static void au_call_drinfo_do_load(void *args) ++{ ++ struct au_drinfo_do_load_args *a = args; ++ ++ *a->drinfop = au_drinfo_do_load(a->h_ppath, a->whname, a->whnamelen, ++ a->info_dentry); ++} ++ ++struct au_drinfo_load { ++ struct path h_ppath; ++ struct qstr *qname; ++ unsigned char no_sio; ++ ++ aufs_bindex_t ninfo; ++ struct au_drinfo **drinfo; ++}; ++ ++static int au_drinfo_load(struct au_drinfo_load *w, aufs_bindex_t bindex, ++ struct au_branch *br) ++{ ++ int err, wkq_err, whnamelen, e; ++ char whname[sizeof(AUFS_WH_DR_INFO_PFX) + AUFS_DIRREN_ENV_VAL_SZ] ++ = AUFS_WH_DR_INFO_PFX; ++ struct au_drinfo *drinfo; ++ struct qstr oldname; ++ struct inode *h_dir, *delegated; ++ struct dentry *info_dentry; ++ struct path infopath; ++ ++ whnamelen = sizeof(AUFS_WH_DR_INFO_PFX) - 1; ++ whnamelen += au_drinfo_name(br, whname + whnamelen, ++ sizeof(whname) - whnamelen); ++ if (w->no_sio) ++ drinfo = au_drinfo_do_load(&w->h_ppath, whname, whnamelen, ++ &info_dentry); ++ else { ++ struct au_drinfo_do_load_args args = { ++ .drinfop = &drinfo, ++ .h_ppath = &w->h_ppath, ++ .whname = whname, ++ .whnamelen = whnamelen, ++ .info_dentry = &info_dentry ++ }; ++ wkq_err = au_wkq_wait(au_call_drinfo_do_load, &args); ++ if (unlikely(wkq_err)) ++ drinfo = ERR_PTR(wkq_err); ++ } ++ err = PTR_ERR(drinfo); ++ if (IS_ERR_OR_NULL(drinfo)) ++ goto out; ++ ++ err = 0; ++ oldname.len = drinfo->oldnamelen; ++ oldname.name = drinfo->oldname; ++ if (au_qstreq(w->qname, &oldname)) { ++ /* the name is renamed back */ ++ au_kfree_rcu(drinfo); ++ drinfo = NULL; ++ ++ infopath.dentry = info_dentry; ++ infopath.mnt = w->h_ppath.mnt; ++ h_dir = d_inode(w->h_ppath.dentry); ++ delegated = NULL; ++ inode_lock_nested(h_dir, AuLsc_I_PARENT); ++ e = vfsub_unlink(h_dir, &infopath, &delegated, !w->no_sio); ++ inode_unlock(h_dir); ++ if (unlikely(e)) ++ AuIOErr("ignored %d, %pd2\n", e, &infopath.dentry); ++ if (unlikely(e == -EWOULDBLOCK)) ++ iput(delegated); ++ } ++ au_kfree_rcu(w->drinfo[bindex]); ++ w->drinfo[bindex] = drinfo; ++ dput(info_dentry); ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static void au_dr_lkup_free(struct au_drinfo **drinfo, int n) ++{ ++ struct au_drinfo **p = drinfo; ++ ++ while (n-- > 0) ++ au_kfree_rcu(*drinfo++); ++ au_kfree_try_rcu(p); ++} ++ ++int au_dr_lkup(struct au_do_lookup_args *lkup, struct dentry *dentry, ++ aufs_bindex_t btgt) ++{ ++ int err, ninfo; ++ struct au_drinfo_load w; ++ aufs_bindex_t bindex, bbot; ++ struct au_branch *br; ++ struct inode *h_dir; ++ struct au_dr_hino *ent; ++ struct super_block *sb; ++ ++ AuDbg("%.*s, name %.*s, whname %.*s, b%d\n", ++ AuLNPair(&dentry->d_name), AuLNPair(&lkup->dirren.dr_name), ++ AuLNPair(&lkup->whname), btgt); ++ ++ sb = dentry->d_sb; ++ bbot = au_sbbot(sb); ++ w.ninfo = bbot + 1; ++ if (!lkup->dirren.drinfo) { ++ lkup->dirren.drinfo = kcalloc(w.ninfo, ++ sizeof(*lkup->dirren.drinfo), ++ GFP_NOFS); ++ if (unlikely(!lkup->dirren.drinfo)) { ++ err = -ENOMEM; ++ goto out; ++ } ++ lkup->dirren.ninfo = w.ninfo; ++ } ++ w.drinfo = lkup->dirren.drinfo; ++ w.no_sio = !!uid_eq(current_fsuid(), GLOBAL_ROOT_UID); ++ w.h_ppath.dentry = au_h_dptr(dentry, btgt); ++ AuDebugOn(!w.h_ppath.dentry); ++ w.h_ppath.mnt = au_sbr_mnt(sb, btgt); ++ w.qname = &dentry->d_name; ++ ++ ninfo = 0; ++ for (bindex = btgt + 1; bindex <= bbot; bindex++) { ++ br = au_sbr(sb, bindex); ++ err = au_drinfo_load(&w, bindex, br); ++ if (unlikely(err)) ++ goto out_free; ++ if (w.drinfo[bindex]) ++ ninfo++; ++ } ++ if (!ninfo) { ++ br = au_sbr(sb, btgt); ++ h_dir = d_inode(w.h_ppath.dentry); ++ ent = au_dr_hino_find(&br->br_dirren, h_dir->i_ino); ++ AuDebugOn(!ent); ++ au_dr_hino_del(&br->br_dirren, ent); ++ au_kfree_rcu(ent); ++ } ++ goto out; /* success */ ++ ++out_free: ++ au_dr_lkup_free(lkup->dirren.drinfo, lkup->dirren.ninfo); ++ lkup->dirren.ninfo = 0; ++ lkup->dirren.drinfo = NULL; ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++void au_dr_lkup_fin(struct au_do_lookup_args *lkup) ++{ ++ au_dr_lkup_free(lkup->dirren.drinfo, lkup->dirren.ninfo); ++} ++ ++int au_dr_lkup_name(struct au_do_lookup_args *lkup, aufs_bindex_t btgt) ++{ ++ int err; ++ struct au_drinfo *drinfo; ++ ++ err = 0; ++ if (!lkup->dirren.drinfo) ++ goto out; ++ AuDebugOn(lkup->dirren.ninfo <= btgt); ++ drinfo = lkup->dirren.drinfo[btgt]; ++ if (!drinfo) ++ goto out; ++ ++ au_kfree_try_rcu(lkup->whname.name); ++ lkup->whname.name = NULL; ++ lkup->dirren.dr_name.len = drinfo->oldnamelen; ++ lkup->dirren.dr_name.name = drinfo->oldname; ++ lkup->name = &lkup->dirren.dr_name; ++ err = au_wh_name_alloc(&lkup->whname, lkup->name); ++ if (!err) ++ AuDbg("name %.*s, whname %.*s, b%d\n", ++ AuLNPair(lkup->name), AuLNPair(&lkup->whname), ++ btgt); ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++int au_dr_lkup_h_ino(struct au_do_lookup_args *lkup, aufs_bindex_t bindex, ++ ino_t h_ino) ++{ ++ int match; ++ struct au_drinfo *drinfo; ++ ++ match = 1; ++ if (!lkup->dirren.drinfo) ++ goto out; ++ AuDebugOn(lkup->dirren.ninfo <= bindex); ++ drinfo = lkup->dirren.drinfo[bindex]; ++ if (!drinfo) ++ goto out; ++ ++ match = (drinfo->ino == h_ino); ++ AuDbg("match %d\n", match); ++ ++out: ++ return match; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++int au_dr_opt_set(struct super_block *sb) ++{ ++ int err; ++ aufs_bindex_t bindex, bbot; ++ struct au_branch *br; ++ ++ err = 0; ++ bbot = au_sbbot(sb); ++ for (bindex = 0; !err && bindex <= bbot; bindex++) { ++ br = au_sbr(sb, bindex); ++ err = au_dr_hino(sb, bindex, /*br*/NULL, &br->br_path); ++ } ++ ++ return err; ++} ++ ++int au_dr_opt_flush(struct super_block *sb) ++{ ++ int err; ++ aufs_bindex_t bindex, bbot; ++ struct au_branch *br; ++ ++ err = 0; ++ bbot = au_sbbot(sb); ++ for (bindex = 0; !err && bindex <= bbot; bindex++) { ++ br = au_sbr(sb, bindex); ++ if (au_br_writable(br->br_perm)) ++ err = au_dr_hino(sb, bindex, /*br*/NULL, /*path*/NULL); ++ } ++ ++ return err; ++} ++ ++int au_dr_opt_clr(struct super_block *sb, int no_flush) ++{ ++ int err; ++ aufs_bindex_t bindex, bbot; ++ struct au_branch *br; ++ ++ err = 0; ++ if (!no_flush) { ++ err = au_dr_opt_flush(sb); ++ if (unlikely(err)) ++ goto out; ++ } ++ ++ bbot = au_sbbot(sb); ++ for (bindex = 0; bindex <= bbot; bindex++) { ++ br = au_sbr(sb, bindex); ++ au_dr_hino_free(&br->br_dirren); ++ } ++ ++out: ++ return err; ++} +diff --git a/fs/aufs/dirren.h b/fs/aufs/dirren.h +new file mode 100644 +index 000000000000..d2d57d95a77e +--- /dev/null ++++ b/fs/aufs/dirren.h +@@ -0,0 +1,140 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2017-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * renamed dir info ++ */ ++ ++#ifndef __AUFS_DIRREN_H__ ++#define __AUFS_DIRREN_H__ ++ ++#ifdef __KERNEL__ ++ ++#include <linux/dcache.h> ++#include <linux/statfs.h> ++#include <linux/uuid.h> ++#include "hbl.h" ++ ++#define AuDirren_NHASH 100 ++ ++#ifdef CONFIG_AUFS_DIRREN ++enum au_brid_type { ++ AuBrid_Unset, ++ AuBrid_UUID, ++ AuBrid_FSID, ++ AuBrid_DEV ++}; ++ ++struct au_dr_brid { ++ enum au_brid_type type; ++ union { ++ uuid_t uuid; /* unimplemented yet */ ++ fsid_t fsid; ++ dev_t dev; ++ }; ++}; ++ ++/* 20 is the max digits length of ulong 64 */ ++/* brid-type "_" uuid "_" inum */ ++#define AUFS_DIRREN_FNAME_SZ (1 + 1 + UUID_STRING_LEN + 20) ++#define AUFS_DIRREN_ENV_VAL_SZ (AUFS_DIRREN_FNAME_SZ + 1 + 20) ++ ++struct au_dr_hino { ++ struct hlist_bl_node dr_hnode; ++ ino_t dr_h_ino; ++}; ++ ++struct au_dr_br { ++ struct hlist_bl_head dr_h_ino[AuDirren_NHASH]; ++ struct au_dr_brid dr_brid; ++}; ++ ++struct au_dr_lookup { ++ /* dr_name is pointed by struct au_do_lookup_args.name */ ++ struct qstr dr_name; /* subset of dr_info */ ++ aufs_bindex_t ninfo; ++ struct au_drinfo **drinfo; ++}; ++#else ++struct au_dr_hino; ++/* empty */ ++struct au_dr_br { }; ++struct au_dr_lookup { }; ++#endif ++ ++/* ---------------------------------------------------------------------- */ ++ ++struct au_branch; ++struct au_do_lookup_args; ++struct au_hinode; ++#ifdef CONFIG_AUFS_DIRREN ++int au_dr_hino_test_add(struct au_dr_br *dr, ino_t h_ino, ++ struct au_dr_hino *add_ent); ++void au_dr_hino_free(struct au_dr_br *dr); ++int au_dr_br_init(struct super_block *sb, struct au_branch *br, ++ const struct path *path); ++int au_dr_br_fin(struct super_block *sb, struct au_branch *br); ++int au_dr_rename(struct dentry *src, aufs_bindex_t bindex, ++ struct qstr *dst_name, void *_rev); ++void au_dr_rename_fin(struct dentry *src, aufs_bindex_t btgt, void *rev); ++void au_dr_rename_rev(struct dentry *src, aufs_bindex_t bindex, void *rev); ++int au_dr_lkup(struct au_do_lookup_args *lkup, struct dentry *dentry, ++ aufs_bindex_t bindex); ++int au_dr_lkup_name(struct au_do_lookup_args *lkup, aufs_bindex_t btgt); ++int au_dr_lkup_h_ino(struct au_do_lookup_args *lkup, aufs_bindex_t bindex, ++ ino_t h_ino); ++void au_dr_lkup_fin(struct au_do_lookup_args *lkup); ++int au_dr_opt_set(struct super_block *sb); ++int au_dr_opt_flush(struct super_block *sb); ++int au_dr_opt_clr(struct super_block *sb, int no_flush); ++#else ++AuStubInt0(au_dr_hino_test_add, struct au_dr_br *dr, ino_t h_ino, ++ struct au_dr_hino *add_ent); ++AuStubVoid(au_dr_hino_free, struct au_dr_br *dr); ++AuStubInt0(au_dr_br_init, struct super_block *sb, struct au_branch *br, ++ const struct path *path); ++AuStubInt0(au_dr_br_fin, struct super_block *sb, struct au_branch *br); ++AuStubInt0(au_dr_rename, struct dentry *src, aufs_bindex_t bindex, ++ struct qstr *dst_name, void *_rev); ++AuStubVoid(au_dr_rename_fin, struct dentry *src, aufs_bindex_t btgt, void *rev); ++AuStubVoid(au_dr_rename_rev, struct dentry *src, aufs_bindex_t bindex, ++ void *rev); ++AuStubInt0(au_dr_lkup, struct au_do_lookup_args *lkup, struct dentry *dentry, ++ aufs_bindex_t bindex); ++AuStubInt0(au_dr_lkup_name, struct au_do_lookup_args *lkup, aufs_bindex_t btgt); ++AuStubInt0(au_dr_lkup_h_ino, struct au_do_lookup_args *lkup, ++ aufs_bindex_t bindex, ino_t h_ino); ++AuStubVoid(au_dr_lkup_fin, struct au_do_lookup_args *lkup); ++AuStubInt0(au_dr_opt_set, struct super_block *sb); ++AuStubInt0(au_dr_opt_flush, struct super_block *sb); ++AuStubInt0(au_dr_opt_clr, struct super_block *sb, int no_flush); ++#endif ++ ++/* ---------------------------------------------------------------------- */ ++ ++#ifdef CONFIG_AUFS_DIRREN ++static inline int au_dr_ihash(ino_t h_ino) ++{ ++ return h_ino % AuDirren_NHASH; ++} ++#else ++AuStubInt0(au_dr_ihash, ino_t h_ino); ++#endif ++ ++#endif /* __KERNEL__ */ ++#endif /* __AUFS_DIRREN_H__ */ +diff --git a/fs/aufs/dynop.c b/fs/aufs/dynop.c +new file mode 100644 +index 000000000000..54fd16ecb6d3 +--- /dev/null ++++ b/fs/aufs/dynop.c +@@ -0,0 +1,366 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2010-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * dynamically customizable operations for regular files ++ */ ++ ++#include "aufs.h" ++ ++#define DyPrSym(key) AuDbgSym(key->dk_op.dy_hop) ++ ++/* ++ * How large will these lists be? ++ * Usually just a few elements, 20-30 at most for each, I guess. ++ */ ++static struct hlist_bl_head dynop[AuDyLast]; ++ ++static struct au_dykey *dy_gfind_get(struct hlist_bl_head *hbl, ++ const void *h_op) ++{ ++ struct au_dykey *key, *tmp; ++ struct hlist_bl_node *pos; ++ ++ key = NULL; ++ hlist_bl_lock(hbl); ++ hlist_bl_for_each_entry(tmp, pos, hbl, dk_hnode) ++ if (tmp->dk_op.dy_hop == h_op) { ++ if (kref_get_unless_zero(&tmp->dk_kref)) ++ key = tmp; ++ break; ++ } ++ hlist_bl_unlock(hbl); ++ ++ return key; ++} ++ ++static struct au_dykey *dy_bradd(struct au_branch *br, struct au_dykey *key) ++{ ++ struct au_dykey **k, *found; ++ const void *h_op = key->dk_op.dy_hop; ++ int i; ++ ++ found = NULL; ++ k = br->br_dykey; ++ for (i = 0; i < AuBrDynOp; i++) ++ if (k[i]) { ++ if (k[i]->dk_op.dy_hop == h_op) { ++ found = k[i]; ++ break; ++ } ++ } else ++ break; ++ if (!found) { ++ spin_lock(&br->br_dykey_lock); ++ for (; i < AuBrDynOp; i++) ++ if (k[i]) { ++ if (k[i]->dk_op.dy_hop == h_op) { ++ found = k[i]; ++ break; ++ } ++ } else { ++ k[i] = key; ++ break; ++ } ++ spin_unlock(&br->br_dykey_lock); ++ BUG_ON(i == AuBrDynOp); /* expand the array */ ++ } ++ ++ return found; ++} ++ ++/* kref_get() if @key is already added */ ++static struct au_dykey *dy_gadd(struct hlist_bl_head *hbl, struct au_dykey *key) ++{ ++ struct au_dykey *tmp, *found; ++ struct hlist_bl_node *pos; ++ const void *h_op = key->dk_op.dy_hop; ++ ++ found = NULL; ++ hlist_bl_lock(hbl); ++ hlist_bl_for_each_entry(tmp, pos, hbl, dk_hnode) ++ if (tmp->dk_op.dy_hop == h_op) { ++ if (kref_get_unless_zero(&tmp->dk_kref)) ++ found = tmp; ++ break; ++ } ++ if (!found) ++ hlist_bl_add_head(&key->dk_hnode, hbl); ++ hlist_bl_unlock(hbl); ++ ++ if (!found) ++ DyPrSym(key); ++ return found; ++} ++ ++static void dy_free_rcu(struct rcu_head *rcu) ++{ ++ struct au_dykey *key; ++ ++ key = container_of(rcu, struct au_dykey, dk_rcu); ++ DyPrSym(key); ++ kfree(key); ++} ++ ++static void dy_free(struct kref *kref) ++{ ++ struct au_dykey *key; ++ struct hlist_bl_head *hbl; ++ ++ key = container_of(kref, struct au_dykey, dk_kref); ++ hbl = dynop + key->dk_op.dy_type; ++ au_hbl_del(&key->dk_hnode, hbl); ++ call_rcu(&key->dk_rcu, dy_free_rcu); ++} ++ ++void au_dy_put(struct au_dykey *key) ++{ ++ kref_put(&key->dk_kref, dy_free); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++#define DyDbgSize(cnt, op) AuDebugOn(cnt != sizeof(op)/sizeof(void *)) ++ ++#ifdef CONFIG_AUFS_DEBUG ++#define DyDbgDeclare(cnt) unsigned int cnt = 0 ++#define DyDbgInc(cnt) do { cnt++; } while (0) ++#else ++#define DyDbgDeclare(cnt) do {} while (0) ++#define DyDbgInc(cnt) do {} while (0) ++#endif ++ ++#define DySet(func, dst, src, h_op, h_sb) do { \ ++ DyDbgInc(cnt); \ ++ if (h_op->func) { \ ++ if (src.func) \ ++ dst.func = src.func; \ ++ else \ ++ AuDbg("%s %s\n", au_sbtype(h_sb), #func); \ ++ } \ ++} while (0) ++ ++#define DySetForce(func, dst, src) do { \ ++ AuDebugOn(!src.func); \ ++ DyDbgInc(cnt); \ ++ dst.func = src.func; \ ++} while (0) ++ ++#define DySetAop(func) \ ++ DySet(func, dyaop->da_op, aufs_aop, h_aop, h_sb) ++#define DySetAopForce(func) \ ++ DySetForce(func, dyaop->da_op, aufs_aop) ++ ++static void dy_aop(struct au_dykey *key, const void *h_op, ++ struct super_block *h_sb __maybe_unused) ++{ ++ struct au_dyaop *dyaop = (void *)key; ++ const struct address_space_operations *h_aop = h_op; ++ DyDbgDeclare(cnt); ++ ++ AuDbg("%s\n", au_sbtype(h_sb)); ++ ++ DySetAop(writepage); ++ DySetAopForce(read_folio); /* force */ ++ DySetAop(writepages); ++ DySetAop(dirty_folio); ++ DySetAop(invalidate_folio); ++ DySetAop(readahead); ++ DySetAop(write_begin); ++ DySetAop(write_end); ++ DySetAop(bmap); ++ DySetAop(release_folio); ++ DySetAop(free_folio); ++ /* this one will be changed according to an aufs mount option */ ++ DySetAop(direct_IO); ++ DySetAop(migrate_folio); ++ DySetAop(launder_folio); ++ DySetAop(is_partially_uptodate); ++ DySetAop(is_dirty_writeback); ++ DySetAop(error_remove_page); ++ DySetAop(swap_activate); ++ DySetAop(swap_deactivate); ++ DySetAop(swap_rw); ++ ++ DyDbgSize(cnt, *h_aop); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static void dy_bug(struct kref *kref) ++{ ++ BUG(); ++} ++ ++static struct au_dykey *dy_get(struct au_dynop *op, struct au_branch *br) ++{ ++ struct au_dykey *key, *old; ++ struct hlist_bl_head *hbl; ++ struct op { ++ unsigned int sz; ++ void (*set)(struct au_dykey *key, const void *h_op, ++ struct super_block *h_sb __maybe_unused); ++ }; ++ static const struct op a[] = { ++ [AuDy_AOP] = { ++ .sz = sizeof(struct au_dyaop), ++ .set = dy_aop ++ } ++ }; ++ const struct op *p; ++ ++ hbl = dynop + op->dy_type; ++ key = dy_gfind_get(hbl, op->dy_hop); ++ if (key) ++ goto out_add; /* success */ ++ ++ p = a + op->dy_type; ++ key = kzalloc(p->sz, GFP_NOFS); ++ if (unlikely(!key)) { ++ key = ERR_PTR(-ENOMEM); ++ goto out; ++ } ++ ++ key->dk_op.dy_hop = op->dy_hop; ++ kref_init(&key->dk_kref); ++ p->set(key, op->dy_hop, au_br_sb(br)); ++ old = dy_gadd(hbl, key); ++ if (old) { ++ au_kfree_rcu(key); ++ key = old; ++ } ++ ++out_add: ++ old = dy_bradd(br, key); ++ if (old) ++ /* its ref-count should never be zero here */ ++ kref_put(&key->dk_kref, dy_bug); ++out: ++ return key; ++} ++ ++/* ---------------------------------------------------------------------- */ ++/* ++ * Aufs prohibits O_DIRECT by default even if the branch supports it. ++ * This behaviour is necessary to return an error from open(O_DIRECT) instead ++ * of the succeeding I/O. The dio mount option enables O_DIRECT and makes ++ * open(O_DIRECT) always succeed, but the succeeding I/O may return an error. ++ * See the aufs manual in detail. ++ */ ++static void dy_adx(struct au_dyaop *dyaop, int do_dx) ++{ ++ if (!do_dx) ++ dyaop->da_op.direct_IO = NULL; ++ else ++ dyaop->da_op.direct_IO = aufs_aop.direct_IO; ++} ++ ++static struct au_dyaop *dy_aget(struct au_branch *br, ++ const struct address_space_operations *h_aop, ++ int do_dx) ++{ ++ struct au_dyaop *dyaop; ++ struct au_dynop op; ++ ++ op.dy_type = AuDy_AOP; ++ op.dy_haop = h_aop; ++ dyaop = (void *)dy_get(&op, br); ++ if (IS_ERR(dyaop)) ++ goto out; ++ dy_adx(dyaop, do_dx); ++ ++out: ++ return dyaop; ++} ++ ++int au_dy_iaop(struct inode *inode, aufs_bindex_t bindex, ++ struct inode *h_inode) ++{ ++ int err, do_dx; ++ struct super_block *sb; ++ struct au_branch *br; ++ struct au_dyaop *dyaop; ++ ++ AuDebugOn(!S_ISREG(h_inode->i_mode)); ++ IiMustWriteLock(inode); ++ ++ sb = inode->i_sb; ++ br = au_sbr(sb, bindex); ++ do_dx = !!au_opt_test(au_mntflags(sb), DIO); ++ dyaop = dy_aget(br, h_inode->i_mapping->a_ops, do_dx); ++ err = PTR_ERR(dyaop); ++ if (IS_ERR(dyaop)) ++ /* unnecessary to call dy_fput() */ ++ goto out; ++ ++ err = 0; ++ inode->i_mapping->a_ops = &dyaop->da_op; ++ ++out: ++ return err; ++} ++ ++/* ++ * Is it safe to replace a_ops during the inode/file is in operation? ++ * Yes, I hope so. ++ */ ++int au_dy_irefresh(struct inode *inode) ++{ ++ int err; ++ aufs_bindex_t btop; ++ struct inode *h_inode; ++ ++ err = 0; ++ if (S_ISREG(inode->i_mode)) { ++ btop = au_ibtop(inode); ++ h_inode = au_h_iptr(inode, btop); ++ err = au_dy_iaop(inode, btop, h_inode); ++ } ++ return err; ++} ++ ++void au_dy_arefresh(int do_dx) ++{ ++ struct hlist_bl_head *hbl; ++ struct hlist_bl_node *pos; ++ struct au_dykey *key; ++ ++ hbl = dynop + AuDy_AOP; ++ hlist_bl_lock(hbl); ++ hlist_bl_for_each_entry(key, pos, hbl, dk_hnode) ++ dy_adx((void *)key, do_dx); ++ hlist_bl_unlock(hbl); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++void __init au_dy_init(void) ++{ ++ int i; ++ ++ for (i = 0; i < AuDyLast; i++) ++ INIT_HLIST_BL_HEAD(dynop + i); ++} ++ ++void au_dy_fin(void) ++{ ++ int i; ++ ++ for (i = 0; i < AuDyLast; i++) ++ WARN_ON(!hlist_bl_empty(dynop + i)); ++} +diff --git a/fs/aufs/dynop.h b/fs/aufs/dynop.h +new file mode 100644 +index 000000000000..60d89364b676 +--- /dev/null ++++ b/fs/aufs/dynop.h +@@ -0,0 +1,77 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2010-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * dynamically customizable operations (for regular files only) ++ */ ++ ++#ifndef __AUFS_DYNOP_H__ ++#define __AUFS_DYNOP_H__ ++ ++#ifdef __KERNEL__ ++ ++#include <linux/fs.h> ++#include <linux/kref.h> ++ ++enum {AuDy_AOP, AuDyLast}; ++ ++struct au_dynop { ++ int dy_type; ++ union { ++ const void *dy_hop; ++ const struct address_space_operations *dy_haop; ++ }; ++}; ++ ++struct au_dykey { ++ union { ++ struct hlist_bl_node dk_hnode; ++ struct rcu_head dk_rcu; ++ }; ++ struct au_dynop dk_op; ++ ++ /* ++ * during I am in the branch local array, kref is gotten. when the ++ * branch is removed, kref is put. ++ */ ++ struct kref dk_kref; ++}; ++ ++/* stop unioning since their sizes are very different from each other */ ++struct au_dyaop { ++ struct au_dykey da_key; ++ struct address_space_operations da_op; /* not const */ ++}; ++/* make sure that 'struct au_dykey *' can be any type */ ++static_assert(!offsetof(struct au_dyaop, da_key)); ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* dynop.c */ ++struct au_branch; ++void au_dy_put(struct au_dykey *key); ++int au_dy_iaop(struct inode *inode, aufs_bindex_t bindex, ++ struct inode *h_inode); ++int au_dy_irefresh(struct inode *inode); ++void au_dy_arefresh(int do_dio); ++ ++void __init au_dy_init(void); ++void au_dy_fin(void); ++ ++#endif /* __KERNEL__ */ ++#endif /* __AUFS_DYNOP_H__ */ +diff --git a/fs/aufs/export.c b/fs/aufs/export.c +new file mode 100644 +index 000000000000..4c639e5d40f6 +--- /dev/null ++++ b/fs/aufs/export.c +@@ -0,0 +1,830 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * export via nfs ++ */ ++ ++#include <linux/exportfs.h> ++#include <linux/fs_struct.h> ++#include <linux/nsproxy.h> ++#include <linux/random.h> ++#include <linux/writeback.h> ++#include "aufs.h" ++ ++union conv { ++#ifdef CONFIG_AUFS_INO_T_64 ++ __u32 a[2]; ++#else ++ __u32 a[1]; ++#endif ++ ino_t ino; ++}; ++ ++static ino_t decode_ino(__u32 *a) ++{ ++ union conv u; ++ ++ BUILD_BUG_ON(sizeof(u.ino) != sizeof(u.a)); ++ u.a[0] = a[0]; ++#ifdef CONFIG_AUFS_INO_T_64 ++ u.a[1] = a[1]; ++#endif ++ return u.ino; ++} ++ ++static void encode_ino(__u32 *a, ino_t ino) ++{ ++ union conv u; ++ ++ u.ino = ino; ++ a[0] = u.a[0]; ++#ifdef CONFIG_AUFS_INO_T_64 ++ a[1] = u.a[1]; ++#endif ++} ++ ++/* NFS file handle */ ++enum { ++ Fh_br_id, ++ Fh_sigen, ++#ifdef CONFIG_AUFS_INO_T_64 ++ /* support 64bit inode number */ ++ Fh_ino1, ++ Fh_ino2, ++ Fh_dir_ino1, ++ Fh_dir_ino2, ++#else ++ Fh_ino1, ++ Fh_dir_ino1, ++#endif ++ Fh_igen, ++ Fh_h_type, ++ Fh_tail, ++ ++ Fh_ino = Fh_ino1, ++ Fh_dir_ino = Fh_dir_ino1 ++}; ++ ++static int au_test_anon(struct dentry *dentry) ++{ ++ /* note: read d_flags without d_lock */ ++ return !!(dentry->d_flags & DCACHE_DISCONNECTED); ++} ++ ++int au_test_nfsd(void) ++{ ++ int ret; ++ struct task_struct *tsk = current; ++ char comm[sizeof(tsk->comm)]; ++ ++ ret = 0; ++ if (tsk->flags & PF_KTHREAD) { ++ get_task_comm(comm, tsk); ++ ret = !strcmp(comm, "nfsd"); ++ } ++ ++ return ret; ++} ++ ++/* ---------------------------------------------------------------------- */ ++/* inode generation external table */ ++ ++void au_xigen_inc(struct inode *inode) ++{ ++ loff_t pos; ++ ssize_t sz; ++ __u32 igen; ++ struct super_block *sb; ++ struct au_sbinfo *sbinfo; ++ ++ sb = inode->i_sb; ++ AuDebugOn(!au_opt_test(au_mntflags(sb), XINO)); ++ ++ sbinfo = au_sbi(sb); ++ pos = inode->i_ino; ++ pos *= sizeof(igen); ++ igen = inode->i_generation + 1; ++ sz = xino_fwrite(sbinfo->si_xigen, &igen, sizeof(igen), &pos); ++ if (sz == sizeof(igen)) ++ return; /* success */ ++ ++ if (unlikely(sz >= 0)) ++ AuIOErr("xigen error (%zd)\n", sz); ++} ++ ++int au_xigen_new(struct inode *inode) ++{ ++ int err; ++ loff_t pos; ++ ssize_t sz; ++ struct super_block *sb; ++ struct au_sbinfo *sbinfo; ++ struct file *file; ++ ++ err = 0; ++ /* todo: dirty, at mount time */ ++ if (inode->i_ino == AUFS_ROOT_INO) ++ goto out; ++ sb = inode->i_sb; ++ SiMustAnyLock(sb); ++ if (unlikely(!au_opt_test(au_mntflags(sb), XINO))) ++ goto out; ++ ++ err = -EFBIG; ++ pos = inode->i_ino; ++ if (unlikely(au_loff_max / sizeof(inode->i_generation) - 1 < pos)) { ++ AuIOErr1("too large i%lld\n", pos); ++ goto out; ++ } ++ pos *= sizeof(inode->i_generation); ++ ++ err = 0; ++ sbinfo = au_sbi(sb); ++ file = sbinfo->si_xigen; ++ BUG_ON(!file); ++ ++ if (vfsub_f_size_read(file) ++ < pos + sizeof(inode->i_generation)) { ++ inode->i_generation = atomic_inc_return(&sbinfo->si_xigen_next); ++ sz = xino_fwrite(file, &inode->i_generation, ++ sizeof(inode->i_generation), &pos); ++ } else ++ sz = xino_fread(file, &inode->i_generation, ++ sizeof(inode->i_generation), &pos); ++ if (sz == sizeof(inode->i_generation)) ++ goto out; /* success */ ++ ++ err = sz; ++ if (unlikely(sz >= 0)) { ++ err = -EIO; ++ AuIOErr("xigen error (%zd)\n", sz); ++ } ++ ++out: ++ return err; ++} ++ ++int au_xigen_set(struct super_block *sb, struct path *path) ++{ ++ int err; ++ struct au_sbinfo *sbinfo; ++ struct file *file; ++ ++ SiMustWriteLock(sb); ++ ++ sbinfo = au_sbi(sb); ++ file = au_xino_create2(sb, path, sbinfo->si_xigen); ++ err = PTR_ERR(file); ++ if (IS_ERR(file)) ++ goto out; ++ err = 0; ++ if (sbinfo->si_xigen) ++ fput(sbinfo->si_xigen); ++ sbinfo->si_xigen = file; ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++void au_xigen_clr(struct super_block *sb) ++{ ++ struct au_sbinfo *sbinfo; ++ ++ SiMustWriteLock(sb); ++ ++ sbinfo = au_sbi(sb); ++ if (sbinfo->si_xigen) { ++ fput(sbinfo->si_xigen); ++ sbinfo->si_xigen = NULL; ++ } ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static struct dentry *decode_by_ino(struct super_block *sb, ino_t ino, ++ ino_t dir_ino) ++{ ++ struct dentry *dentry, *d; ++ struct inode *inode; ++ unsigned int sigen; ++ ++ dentry = NULL; ++ inode = ilookup(sb, ino); ++ if (!inode) ++ goto out; ++ ++ dentry = ERR_PTR(-ESTALE); ++ sigen = au_sigen(sb); ++ if (unlikely(au_is_bad_inode(inode) ++ || IS_DEADDIR(inode) ++ || sigen != au_iigen(inode, NULL))) ++ goto out_iput; ++ ++ dentry = NULL; ++ if (!dir_ino || S_ISDIR(inode->i_mode)) ++ dentry = d_find_alias(inode); ++ else { ++ spin_lock(&inode->i_lock); ++ hlist_for_each_entry(d, &inode->i_dentry, d_u.d_alias) { ++ spin_lock(&d->d_lock); ++ if (!au_test_anon(d) ++ && d_inode(d->d_parent)->i_ino == dir_ino) { ++ dentry = dget_dlock(d); ++ spin_unlock(&d->d_lock); ++ break; ++ } ++ spin_unlock(&d->d_lock); ++ } ++ spin_unlock(&inode->i_lock); ++ } ++ if (unlikely(dentry && au_digen_test(dentry, sigen))) { ++ /* need to refresh */ ++ dput(dentry); ++ dentry = NULL; ++ } ++ ++out_iput: ++ iput(inode); ++out: ++ AuTraceErrPtr(dentry); ++ return dentry; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* todo: dirty? */ ++/* if exportfs_decode_fh() passed vfsmount*, we could be happy */ ++ ++struct au_compare_mnt_args { ++ /* input */ ++ struct super_block *sb; ++ ++ /* output */ ++ struct vfsmount *mnt; ++}; ++ ++static int au_compare_mnt(struct vfsmount *mnt, void *arg) ++{ ++ struct au_compare_mnt_args *a = arg; ++ ++ if (mnt->mnt_sb != a->sb) ++ return 0; ++ a->mnt = mntget(mnt); ++ return 1; ++} ++ ++static struct vfsmount *au_mnt_get(struct super_block *sb) ++{ ++ int err; ++ struct path root; ++ struct au_compare_mnt_args args = { ++ .sb = sb ++ }; ++ ++ get_fs_root(current->fs, &root); ++ rcu_read_lock(); ++ err = iterate_mounts(au_compare_mnt, &args, root.mnt); ++ rcu_read_unlock(); ++ path_put(&root); ++ AuDebugOn(!err); ++ AuDebugOn(!args.mnt); ++ return args.mnt; ++} ++ ++struct au_nfsd_si_lock { ++ unsigned int sigen; ++ aufs_bindex_t bindex, br_id; ++ unsigned char force_lock; ++}; ++ ++static int si_nfsd_read_lock(struct super_block *sb, ++ struct au_nfsd_si_lock *nsi_lock) ++{ ++ int err; ++ aufs_bindex_t bindex; ++ ++ si_read_lock(sb, AuLock_FLUSH); ++ ++ /* branch id may be wrapped around */ ++ err = 0; ++ bindex = au_br_index(sb, nsi_lock->br_id); ++ if (bindex >= 0 && nsi_lock->sigen + AUFS_BRANCH_MAX > au_sigen(sb)) ++ goto out; /* success */ ++ ++ err = -ESTALE; ++ bindex = -1; ++ if (!nsi_lock->force_lock) ++ si_read_unlock(sb); ++ ++out: ++ nsi_lock->bindex = bindex; ++ return err; ++} ++ ++struct find_name_by_ino { ++ struct dir_context ctx; ++ int called, found; ++ ino_t ino; ++ char *name; ++ int namelen; ++}; ++ ++static bool ++find_name_by_ino(struct dir_context *ctx, const char *name, int namelen, ++ loff_t offset, u64 ino, unsigned int d_type) ++{ ++ struct find_name_by_ino *a = container_of(ctx, struct find_name_by_ino, ++ ctx); ++ ++ a->called++; ++ if (a->ino != ino) ++ return true; ++ ++ memcpy(a->name, name, namelen); ++ a->namelen = namelen; ++ a->found = 1; ++ return false; ++} ++ ++static struct dentry *au_lkup_by_ino(struct path *path, ino_t ino, ++ struct au_nfsd_si_lock *nsi_lock) ++{ ++ struct dentry *dentry, *parent; ++ struct file *file; ++ struct inode *dir; ++ struct find_name_by_ino arg = { ++ .ctx = { ++ .actor = find_name_by_ino ++ } ++ }; ++ int err; ++ ++ parent = path->dentry; ++ if (nsi_lock) ++ si_read_unlock(parent->d_sb); ++ file = vfsub_dentry_open(path, au_dir_roflags); ++ dentry = (void *)file; ++ if (IS_ERR(file)) ++ goto out; ++ ++ dentry = ERR_PTR(-ENOMEM); ++ arg.name = (void *)__get_free_page(GFP_NOFS); ++ if (unlikely(!arg.name)) ++ goto out_file; ++ arg.ino = ino; ++ arg.found = 0; ++ do { ++ arg.called = 0; ++ /* smp_mb(); */ ++ err = vfsub_iterate_dir(file, &arg.ctx); ++ } while (!err && !arg.found && arg.called); ++ dentry = ERR_PTR(err); ++ if (unlikely(err)) ++ goto out_name; ++ /* instead of ENOENT */ ++ dentry = ERR_PTR(-ESTALE); ++ if (!arg.found) ++ goto out_name; ++ ++ /* do not call vfsub_lkup_one() */ ++ dir = d_inode(parent); ++ dentry = vfsub_lookup_one_len_unlocked(arg.name, path, arg.namelen); ++ AuTraceErrPtr(dentry); ++ if (IS_ERR(dentry)) ++ goto out_name; ++ AuDebugOn(au_test_anon(dentry)); ++ if (unlikely(d_really_is_negative(dentry))) { ++ dput(dentry); ++ dentry = ERR_PTR(-ENOENT); ++ } ++ ++out_name: ++ free_page((unsigned long)arg.name); ++out_file: ++ fput(file); ++out: ++ if (unlikely(nsi_lock ++ && si_nfsd_read_lock(parent->d_sb, nsi_lock) < 0)) ++ if (!IS_ERR(dentry)) { ++ dput(dentry); ++ dentry = ERR_PTR(-ESTALE); ++ } ++ AuTraceErrPtr(dentry); ++ return dentry; ++} ++ ++static struct dentry *decode_by_dir_ino(struct super_block *sb, ino_t ino, ++ ino_t dir_ino, ++ struct au_nfsd_si_lock *nsi_lock) ++{ ++ struct dentry *dentry; ++ struct path path; ++ ++ if (dir_ino != AUFS_ROOT_INO) { ++ path.dentry = decode_by_ino(sb, dir_ino, 0); ++ dentry = path.dentry; ++ if (!path.dentry || IS_ERR(path.dentry)) ++ goto out; ++ AuDebugOn(au_test_anon(path.dentry)); ++ } else ++ path.dentry = dget(sb->s_root); ++ ++ path.mnt = au_mnt_get(sb); ++ dentry = au_lkup_by_ino(&path, ino, nsi_lock); ++ path_put(&path); ++ ++out: ++ AuTraceErrPtr(dentry); ++ return dentry; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int h_acceptable(void *expv, struct dentry *dentry) ++{ ++ return 1; ++} ++ ++static char *au_build_path(struct dentry *h_parent, struct path *h_rootpath, ++ char *buf, int len, struct super_block *sb) ++{ ++ char *p; ++ int n; ++ struct path path; ++ ++ p = d_path(h_rootpath, buf, len); ++ if (IS_ERR(p)) ++ goto out; ++ n = strlen(p); ++ ++ path.mnt = h_rootpath->mnt; ++ path.dentry = h_parent; ++ p = d_path(&path, buf, len); ++ if (IS_ERR(p)) ++ goto out; ++ if (n != 1) ++ p += n; ++ ++ path.mnt = au_mnt_get(sb); ++ path.dentry = sb->s_root; ++ p = d_path(&path, buf, len - strlen(p)); ++ mntput(path.mnt); ++ if (IS_ERR(p)) ++ goto out; ++ if (n != 1) ++ p[strlen(p)] = '/'; ++ ++out: ++ AuTraceErrPtr(p); ++ return p; ++} ++ ++static ++struct dentry *decode_by_path(struct super_block *sb, ino_t ino, __u32 *fh, ++ int fh_len, struct au_nfsd_si_lock *nsi_lock) ++{ ++ struct dentry *dentry, *h_parent, *root; ++ struct super_block *h_sb; ++ char *pathname, *p; ++ struct vfsmount *h_mnt; ++ struct au_branch *br; ++ int err; ++ struct path path; ++ ++ br = au_sbr(sb, nsi_lock->bindex); ++ h_mnt = au_br_mnt(br); ++ h_sb = h_mnt->mnt_sb; ++ /* todo: call lower fh_to_dentry()? fh_to_parent()? */ ++ lockdep_off(); ++ h_parent = exportfs_decode_fh(h_mnt, (void *)(fh + Fh_tail), ++ fh_len - Fh_tail, fh[Fh_h_type], ++ h_acceptable, /*context*/NULL); ++ lockdep_on(); ++ dentry = h_parent; ++ if (unlikely(!h_parent || IS_ERR(h_parent))) { ++ AuWarn1("%s decode_fh failed, %ld\n", ++ au_sbtype(h_sb), PTR_ERR(h_parent)); ++ goto out; ++ } ++ dentry = NULL; ++ if (unlikely(au_test_anon(h_parent))) { ++ AuWarn1("%s decode_fh returned a disconnected dentry\n", ++ au_sbtype(h_sb)); ++ goto out_h_parent; ++ } ++ ++ dentry = ERR_PTR(-ENOMEM); ++ pathname = (void *)__get_free_page(GFP_NOFS); ++ if (unlikely(!pathname)) ++ goto out_h_parent; ++ ++ root = sb->s_root; ++ path.mnt = h_mnt; ++ di_read_lock_parent(root, !AuLock_IR); ++ path.dentry = au_h_dptr(root, nsi_lock->bindex); ++ di_read_unlock(root, !AuLock_IR); ++ p = au_build_path(h_parent, &path, pathname, PAGE_SIZE, sb); ++ dentry = (void *)p; ++ if (IS_ERR(p)) ++ goto out_pathname; ++ ++ si_read_unlock(sb); ++ err = vfsub_kern_path(p, LOOKUP_FOLLOW | LOOKUP_DIRECTORY, &path); ++ dentry = ERR_PTR(err); ++ if (unlikely(err)) ++ goto out_relock; ++ ++ dentry = ERR_PTR(-ENOENT); ++ AuDebugOn(au_test_anon(path.dentry)); ++ if (unlikely(d_really_is_negative(path.dentry))) ++ goto out_path; ++ ++ if (ino != d_inode(path.dentry)->i_ino) ++ dentry = au_lkup_by_ino(&path, ino, /*nsi_lock*/NULL); ++ else ++ dentry = dget(path.dentry); ++ ++out_path: ++ path_put(&path); ++out_relock: ++ if (unlikely(si_nfsd_read_lock(sb, nsi_lock) < 0)) ++ if (!IS_ERR(dentry)) { ++ dput(dentry); ++ dentry = ERR_PTR(-ESTALE); ++ } ++out_pathname: ++ free_page((unsigned long)pathname); ++out_h_parent: ++ dput(h_parent); ++out: ++ AuTraceErrPtr(dentry); ++ return dentry; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static struct dentry * ++aufs_fh_to_dentry(struct super_block *sb, struct fid *fid, int fh_len, ++ int fh_type) ++{ ++ struct dentry *dentry; ++ __u32 *fh = fid->raw; ++ struct au_branch *br; ++ ino_t ino, dir_ino; ++ struct au_nfsd_si_lock nsi_lock = { ++ .force_lock = 0 ++ }; ++ ++ dentry = ERR_PTR(-ESTALE); ++ /* it should never happen, but the file handle is unreliable */ ++ if (unlikely(fh_len < Fh_tail)) ++ goto out; ++ nsi_lock.sigen = fh[Fh_sigen]; ++ nsi_lock.br_id = fh[Fh_br_id]; ++ ++ /* branch id may be wrapped around */ ++ br = NULL; ++ if (unlikely(si_nfsd_read_lock(sb, &nsi_lock))) ++ goto out; ++ nsi_lock.force_lock = 1; ++ ++ /* is this inode still cached? */ ++ ino = decode_ino(fh + Fh_ino); ++ /* it should never happen */ ++ if (unlikely(ino == AUFS_ROOT_INO)) ++ goto out_unlock; ++ ++ dir_ino = decode_ino(fh + Fh_dir_ino); ++ dentry = decode_by_ino(sb, ino, dir_ino); ++ if (IS_ERR(dentry)) ++ goto out_unlock; ++ if (dentry) ++ goto accept; ++ ++ /* is the parent dir cached? */ ++ br = au_sbr(sb, nsi_lock.bindex); ++ au_lcnt_inc(&br->br_nfiles); ++ dentry = decode_by_dir_ino(sb, ino, dir_ino, &nsi_lock); ++ if (IS_ERR(dentry)) ++ goto out_unlock; ++ if (dentry) ++ goto accept; ++ ++ /* lookup path */ ++ dentry = decode_by_path(sb, ino, fh, fh_len, &nsi_lock); ++ if (IS_ERR(dentry)) ++ goto out_unlock; ++ if (unlikely(!dentry)) ++ /* todo?: make it ESTALE */ ++ goto out_unlock; ++ ++accept: ++ if (!au_digen_test(dentry, au_sigen(sb)) ++ && d_inode(dentry)->i_generation == fh[Fh_igen]) ++ goto out_unlock; /* success */ ++ ++ dput(dentry); ++ dentry = ERR_PTR(-ESTALE); ++out_unlock: ++ if (br) ++ au_lcnt_dec(&br->br_nfiles); ++ si_read_unlock(sb); ++out: ++ AuTraceErrPtr(dentry); ++ return dentry; ++} ++ ++#if 0 /* reserved for future use */ ++/* support subtreecheck option */ ++static struct dentry *aufs_fh_to_parent(struct super_block *sb, struct fid *fid, ++ int fh_len, int fh_type) ++{ ++ struct dentry *parent; ++ __u32 *fh = fid->raw; ++ ino_t dir_ino; ++ ++ dir_ino = decode_ino(fh + Fh_dir_ino); ++ parent = decode_by_ino(sb, dir_ino, 0); ++ if (IS_ERR(parent)) ++ goto out; ++ if (!parent) ++ parent = decode_by_path(sb, au_br_index(sb, fh[Fh_br_id]), ++ dir_ino, fh, fh_len); ++ ++out: ++ AuTraceErrPtr(parent); ++ return parent; ++} ++#endif ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int aufs_encode_fh(struct inode *inode, __u32 *fh, int *max_len, ++ struct inode *dir) ++{ ++ int err; ++ aufs_bindex_t bindex; ++ struct super_block *sb, *h_sb; ++ struct dentry *dentry, *parent, *h_parent; ++ struct inode *h_dir; ++ struct au_branch *br; ++ ++ err = -ENOSPC; ++ if (unlikely(*max_len <= Fh_tail)) { ++ AuWarn1("NFSv2 client (max_len %d)?\n", *max_len); ++ goto out; ++ } ++ ++ err = FILEID_ROOT; ++ if (inode->i_ino == AUFS_ROOT_INO) { ++ AuDebugOn(inode->i_ino != AUFS_ROOT_INO); ++ goto out; ++ } ++ ++ h_parent = NULL; ++ sb = inode->i_sb; ++ err = si_read_lock(sb, AuLock_FLUSH); ++ if (unlikely(err)) ++ goto out; ++ ++#ifdef CONFIG_AUFS_DEBUG ++ if (unlikely(!au_opt_test(au_mntflags(sb), XINO))) ++ AuWarn1("NFS-exporting requires xino\n"); ++#endif ++ err = -EIO; ++ parent = NULL; ++ ii_read_lock_child(inode); ++ bindex = au_ibtop(inode); ++ if (!dir) { ++ dentry = d_find_any_alias(inode); ++ if (unlikely(!dentry)) ++ goto out_unlock; ++ AuDebugOn(au_test_anon(dentry)); ++ parent = dget_parent(dentry); ++ dput(dentry); ++ if (unlikely(!parent)) ++ goto out_unlock; ++ if (d_really_is_positive(parent)) ++ dir = d_inode(parent); ++ } ++ ++ ii_read_lock_parent(dir); ++ h_dir = au_h_iptr(dir, bindex); ++ ii_read_unlock(dir); ++ if (unlikely(!h_dir)) ++ goto out_parent; ++ h_parent = d_find_any_alias(h_dir); ++ if (unlikely(!h_parent)) ++ goto out_hparent; ++ ++ err = -EPERM; ++ br = au_sbr(sb, bindex); ++ h_sb = au_br_sb(br); ++ if (unlikely(!h_sb->s_export_op)) { ++ AuErr1("%s branch is not exportable\n", au_sbtype(h_sb)); ++ goto out_hparent; ++ } ++ ++ fh[Fh_br_id] = br->br_id; ++ fh[Fh_sigen] = au_sigen(sb); ++ encode_ino(fh + Fh_ino, inode->i_ino); ++ encode_ino(fh + Fh_dir_ino, dir->i_ino); ++ fh[Fh_igen] = inode->i_generation; ++ ++ *max_len -= Fh_tail; ++ fh[Fh_h_type] = exportfs_encode_fh(h_parent, (void *)(fh + Fh_tail), ++ max_len, ++ /*connectable or subtreecheck*/0); ++ err = fh[Fh_h_type]; ++ *max_len += Fh_tail; ++ /* todo: macros? */ ++ if (err != FILEID_INVALID) ++ err = 99; ++ else ++ AuWarn1("%s encode_fh failed\n", au_sbtype(h_sb)); ++ ++out_hparent: ++ dput(h_parent); ++out_parent: ++ dput(parent); ++out_unlock: ++ ii_read_unlock(inode); ++ si_read_unlock(sb); ++out: ++ if (unlikely(err < 0)) ++ err = FILEID_INVALID; ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int aufs_commit_metadata(struct inode *inode) ++{ ++ int err; ++ aufs_bindex_t bindex; ++ struct super_block *sb; ++ struct inode *h_inode; ++ int (*f)(struct inode *inode); ++ ++ sb = inode->i_sb; ++ si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW); ++ ii_write_lock_child(inode); ++ bindex = au_ibtop(inode); ++ AuDebugOn(bindex < 0); ++ h_inode = au_h_iptr(inode, bindex); ++ ++ f = h_inode->i_sb->s_export_op->commit_metadata; ++ if (f) ++ err = f(h_inode); ++ else ++ err = sync_inode_metadata(h_inode, /*wait*/1); ++ ++ au_cpup_attr_timesizes(inode); ++ ii_write_unlock(inode); ++ si_read_unlock(sb); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static struct export_operations aufs_export_op = { ++ .fh_to_dentry = aufs_fh_to_dentry, ++ /* .fh_to_parent = aufs_fh_to_parent, */ ++ .encode_fh = aufs_encode_fh, ++ .commit_metadata = aufs_commit_metadata ++}; ++ ++void au_export_init(struct super_block *sb) ++{ ++ struct au_sbinfo *sbinfo; ++ __u32 u; ++ ++ BUILD_BUG_ON_MSG(IS_BUILTIN(CONFIG_AUFS_FS) ++ && IS_MODULE(CONFIG_EXPORTFS), ++ AUFS_NAME ": unsupported configuration " ++ "CONFIG_EXPORTFS=m and CONFIG_AUFS_FS=y"); ++ ++ sb->s_export_op = &aufs_export_op; ++ sbinfo = au_sbi(sb); ++ sbinfo->si_xigen = NULL; ++ get_random_bytes(&u, sizeof(u)); ++ BUILD_BUG_ON(sizeof(u) != sizeof(int)); ++ atomic_set(&sbinfo->si_xigen_next, u); ++} +diff --git a/fs/aufs/f_op.c b/fs/aufs/f_op.c +new file mode 100644 +index 000000000000..320ad8a9334d +--- /dev/null ++++ b/fs/aufs/f_op.c +@@ -0,0 +1,771 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * file and vm operations ++ */ ++ ++#include <linux/aio.h> ++#include <linux/fs_stack.h> ++#include <linux/mman.h> ++#include <linux/security.h> ++#include "aufs.h" ++ ++int au_do_open_nondir(struct file *file, int flags, struct file *h_file) ++{ ++ int err; ++ aufs_bindex_t bindex; ++ struct dentry *dentry, *h_dentry; ++ struct au_finfo *finfo; ++ struct inode *h_inode; ++ ++ FiMustWriteLock(file); ++ ++ err = 0; ++ dentry = file->f_path.dentry; ++ AuDebugOn(IS_ERR_OR_NULL(dentry)); ++ finfo = au_fi(file); ++ memset(&finfo->fi_htop, 0, sizeof(finfo->fi_htop)); ++ atomic_set(&finfo->fi_mmapped, 0); ++ bindex = au_dbtop(dentry); ++ if (!h_file) { ++ h_dentry = au_h_dptr(dentry, bindex); ++ err = vfsub_test_mntns(file->f_path.mnt, h_dentry->d_sb); ++ if (unlikely(err)) ++ goto out; ++ h_file = au_h_open(dentry, bindex, flags, file, /*force_wr*/0); ++ if (IS_ERR(h_file)) { ++ err = PTR_ERR(h_file); ++ goto out; ++ } ++ } else { ++ h_dentry = h_file->f_path.dentry; ++ err = vfsub_test_mntns(file->f_path.mnt, h_dentry->d_sb); ++ if (unlikely(err)) ++ goto out; ++ /* br ref is already inc-ed */ ++ } ++ ++ if (flags & __O_TMPFILE) { ++ AuDebugOn(!h_file); ++ AuDebugOn(h_file != au_di(dentry)->di_htmpfile); ++ au_di(dentry)->di_htmpfile = NULL; ++ ++ if (!(flags & O_EXCL)) { ++ h_inode = file_inode(h_file); ++ spin_lock(&h_inode->i_lock); ++ h_inode->i_state |= I_LINKABLE; ++ spin_unlock(&h_inode->i_lock); ++ } ++ } ++ au_set_fbtop(file, bindex); ++ au_set_h_fptr(file, bindex, h_file); ++ au_update_figen(file); ++ /* todo: necessary? */ ++ /* file->f_ra = h_file->f_ra; */ ++ ++out: ++ return err; ++} ++ ++static int aufs_open_nondir(struct inode *inode __maybe_unused, ++ struct file *file) ++{ ++ int err; ++ struct super_block *sb; ++ struct au_do_open_args args = { ++ .open = au_do_open_nondir ++ }; ++ ++ AuDbg("%pD, f_flags 0x%x, f_mode 0x%x\n", ++ file, vfsub_file_flags(file), file->f_mode); ++ ++ sb = file->f_path.dentry->d_sb; ++ si_read_lock(sb, AuLock_FLUSH); ++ err = au_do_open(file, &args); ++ si_read_unlock(sb); ++ return err; ++} ++ ++int aufs_release_nondir(struct inode *inode __maybe_unused, struct file *file) ++{ ++ struct au_finfo *finfo; ++ aufs_bindex_t bindex; ++ ++ finfo = au_fi(file); ++ au_hbl_del(&finfo->fi_hlist, ++ &au_sbi(file->f_path.dentry->d_sb)->si_files); ++ bindex = finfo->fi_btop; ++ if (bindex >= 0) ++ au_set_h_fptr(file, bindex, NULL); ++ ++ au_finfo_fin(file); ++ return 0; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int au_do_flush_nondir(struct file *file, fl_owner_t id) ++{ ++ int err; ++ struct file *h_file; ++ ++ err = 0; ++ h_file = au_hf_top(file); ++ if (h_file) ++ err = vfsub_flush(h_file, id); ++ return err; ++} ++ ++static int aufs_flush_nondir(struct file *file, fl_owner_t id) ++{ ++ return au_do_flush(file, id, au_do_flush_nondir); ++} ++ ++/* ---------------------------------------------------------------------- */ ++/* ++ * read and write functions acquire [fdi]_rwsem once, but release before ++ * mmap_sem. This is because to stop a race condition between mmap(2). ++ * Releasing these aufs-rwsem should be safe, no branch-management (by keeping ++ * si_rwsem), no harmful copy-up should happen. Actually copy-up may happen in ++ * read functions after [fdi]_rwsem are released, but it should be harmless. ++ */ ++ ++/* Callers should call au_read_post() or fput() in the end */ ++struct file *au_read_pre(struct file *file, int keep_fi, unsigned int lsc) ++{ ++ struct file *h_file; ++ int err; ++ ++ err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/0, lsc); ++ if (!err) { ++ di_read_unlock(file->f_path.dentry, AuLock_IR); ++ h_file = au_hf_top(file); ++ get_file(h_file); ++ if (!keep_fi) ++ fi_read_unlock(file); ++ } else ++ h_file = ERR_PTR(err); ++ ++ return h_file; ++} ++ ++static void au_read_post(struct inode *inode, struct file *h_file) ++{ ++ /* update without lock, I don't think it a problem */ ++ fsstack_copy_attr_atime(inode, file_inode(h_file)); ++ fput(h_file); ++} ++ ++struct au_write_pre { ++ /* input */ ++ unsigned int lsc; ++ ++ /* output */ ++ blkcnt_t blks; ++ aufs_bindex_t btop; ++}; ++ ++/* ++ * return with iinfo is write-locked ++ * callers should call au_write_post() or iinfo_write_unlock() + fput() in the ++ * end ++ */ ++static struct file *au_write_pre(struct file *file, int do_ready, ++ struct au_write_pre *wpre) ++{ ++ struct file *h_file; ++ struct dentry *dentry; ++ int err; ++ unsigned int lsc; ++ struct au_pin pin; ++ ++ lsc = 0; ++ if (wpre) ++ lsc = wpre->lsc; ++ err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/1, lsc); ++ h_file = ERR_PTR(err); ++ if (unlikely(err)) ++ goto out; ++ ++ dentry = file->f_path.dentry; ++ if (do_ready) { ++ err = au_ready_to_write(file, -1, &pin); ++ if (unlikely(err)) { ++ h_file = ERR_PTR(err); ++ di_write_unlock(dentry); ++ goto out_fi; ++ } ++ } ++ ++ di_downgrade_lock(dentry, /*flags*/0); ++ if (wpre) ++ wpre->btop = au_fbtop(file); ++ h_file = au_hf_top(file); ++ get_file(h_file); ++ if (wpre) ++ wpre->blks = file_inode(h_file)->i_blocks; ++ if (do_ready) ++ au_unpin(&pin); ++ di_read_unlock(dentry, /*flags*/0); ++ vfsub_file_start_write(h_file); ++ ++out_fi: ++ fi_write_unlock(file); ++out: ++ return h_file; ++} ++ ++static void au_write_post(struct inode *inode, struct file *h_file, ++ struct au_write_pre *wpre, ssize_t written) ++{ ++ struct inode *h_inode; ++ ++ vfsub_file_end_write(h_file); ++ au_cpup_attr_timesizes(inode); ++ AuDebugOn(au_ibtop(inode) != wpre->btop); ++ h_inode = file_inode(h_file); ++ inode->i_mode = h_inode->i_mode; ++ ii_write_unlock(inode); ++ /* AuDbg("blks %llu, %llu\n", (u64)blks, (u64)h_inode->i_blocks); */ ++ if (written > 0) ++ au_fhsm_wrote(inode->i_sb, wpre->btop, ++ /*force*/h_inode->i_blocks > wpre->blks); ++ fput(h_file); ++} ++ ++/* ++ * todo: very ugly ++ * it locks both of i_mutex and si_rwsem for read in safe. ++ * if the plink maintenance mode continues forever (that is the problem), ++ * may loop forever. ++ */ ++static void au_mtx_and_read_lock(struct inode *inode) ++{ ++ int err; ++ struct super_block *sb = inode->i_sb; ++ ++ while (1) { ++ inode_lock(inode); ++ err = si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLM); ++ if (!err) ++ break; ++ inode_unlock(inode); ++ si_read_lock(sb, AuLock_NOPLMW); ++ si_read_unlock(sb); ++ } ++} ++ ++static ssize_t au_do_iter(struct file *h_file, int rw, struct kiocb *kio, ++ struct iov_iter *iov_iter) ++{ ++ ssize_t err; ++ struct file *file; ++ ssize_t (*iter)(struct kiocb *, struct iov_iter *); ++ ++ err = security_file_permission(h_file, rw); ++ if (unlikely(err)) ++ goto out; ++ ++ err = -ENOSYS; /* the branch doesn't have its ->(read|write)_iter() */ ++ iter = NULL; ++ if (rw == MAY_READ) ++ iter = h_file->f_op->read_iter; ++ else if (rw == MAY_WRITE) ++ iter = h_file->f_op->write_iter; ++ ++ file = kio->ki_filp; ++ kio->ki_filp = h_file; ++ if (iter) { ++ lockdep_off(); ++ err = iter(kio, iov_iter); ++ lockdep_on(); ++ } else ++ /* currently there is no such fs */ ++ WARN_ON_ONCE(1); ++ kio->ki_filp = file; ++ ++out: ++ return err; ++} ++ ++static ssize_t aufs_read_iter(struct kiocb *kio, struct iov_iter *iov_iter) ++{ ++ ssize_t err; ++ struct file *file, *h_file; ++ struct inode *inode; ++ struct super_block *sb; ++ ++ file = kio->ki_filp; ++ inode = file_inode(file); ++ sb = inode->i_sb; ++ si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW); ++ ++ h_file = au_read_pre(file, /*keep_fi*/1, /*lsc*/0); ++ err = PTR_ERR(h_file); ++ if (IS_ERR(h_file)) ++ goto out; ++ ++ if (au_test_loopback_kthread()) { ++ au_warn_loopback(h_file->f_path.dentry->d_sb); ++ if (file->f_mapping != h_file->f_mapping) { ++ file->f_mapping = h_file->f_mapping; ++ smp_mb(); /* unnecessary? */ ++ } ++ } ++ fi_read_unlock(file); ++ ++ err = au_do_iter(h_file, MAY_READ, kio, iov_iter); ++ /* todo: necessary? */ ++ /* file->f_ra = h_file->f_ra; */ ++ au_read_post(inode, h_file); ++ ++out: ++ si_read_unlock(sb); ++ return err; ++} ++ ++static ssize_t aufs_write_iter(struct kiocb *kio, struct iov_iter *iov_iter) ++{ ++ ssize_t err; ++ struct au_write_pre wpre; ++ struct inode *inode; ++ struct file *file, *h_file; ++ ++ file = kio->ki_filp; ++ inode = file_inode(file); ++ au_mtx_and_read_lock(inode); ++ ++ wpre.lsc = 0; ++ h_file = au_write_pre(file, /*do_ready*/1, &wpre); ++ err = PTR_ERR(h_file); ++ if (IS_ERR(h_file)) ++ goto out; ++ ++ err = au_do_iter(h_file, MAY_WRITE, kio, iov_iter); ++ au_write_post(inode, h_file, &wpre, err); ++ ++out: ++ si_read_unlock(inode->i_sb); ++ inode_unlock(inode); ++ return err; ++} ++ ++/* ++ * We may be able to remove aufs_splice_{read,write}() since almost all FSes ++ * don't have their own .splice_{read,write} implimentations, and they use ++ * generic_file_splice_read() and iter_file_splice_write() who can act like the ++ * simple converters to f_op->iter_read() and ->iter_write(). ++ * But we keep our own implementations because some non-mainlined FSes may have ++ * their own .splice_{read,write} implimentations and aufs doesn't want to take ++ * away an opportunity to co-work with aufs from them. ++ */ ++static ssize_t aufs_splice_read(struct file *file, loff_t *ppos, ++ struct pipe_inode_info *pipe, size_t len, ++ unsigned int flags) ++{ ++ ssize_t err; ++ struct file *h_file; ++ struct inode *inode; ++ struct super_block *sb; ++ ++ inode = file_inode(file); ++ sb = inode->i_sb; ++ si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW); ++ ++ h_file = au_read_pre(file, /*keep_fi*/0, /*lsc*/0); ++ err = PTR_ERR(h_file); ++ if (IS_ERR(h_file)) ++ goto out; ++ ++ err = vfsub_splice_read(h_file, ppos, pipe, len, flags); ++ /* todo: necessary? */ ++ /* file->f_ra = h_file->f_ra; */ ++ au_read_post(inode, h_file); ++ ++out: ++ si_read_unlock(sb); ++ return err; ++} ++ ++static ssize_t ++aufs_splice_write(struct pipe_inode_info *pipe, struct file *file, loff_t *ppos, ++ size_t len, unsigned int flags) ++{ ++ ssize_t err; ++ struct au_write_pre wpre; ++ struct inode *inode; ++ struct file *h_file; ++ ++ inode = file_inode(file); ++ au_mtx_and_read_lock(inode); ++ ++ wpre.lsc = 0; ++ h_file = au_write_pre(file, /*do_ready*/1, &wpre); ++ err = PTR_ERR(h_file); ++ if (IS_ERR(h_file)) ++ goto out; ++ ++ err = vfsub_splice_from(pipe, h_file, ppos, len, flags); ++ au_write_post(inode, h_file, &wpre, err); ++ ++out: ++ si_read_unlock(inode->i_sb); ++ inode_unlock(inode); ++ return err; ++} ++ ++static long aufs_fallocate(struct file *file, int mode, loff_t offset, ++ loff_t len) ++{ ++ long err; ++ struct au_write_pre wpre; ++ struct inode *inode; ++ struct file *h_file; ++ ++ inode = file_inode(file); ++ au_mtx_and_read_lock(inode); ++ ++ wpre.lsc = 0; ++ h_file = au_write_pre(file, /*do_ready*/1, &wpre); ++ err = PTR_ERR(h_file); ++ if (IS_ERR(h_file)) ++ goto out; ++ ++ lockdep_off(); ++ err = vfs_fallocate(h_file, mode, offset, len); ++ lockdep_on(); ++ /* ++ * we don't need to call file_modifed() here since au_write_post() ++ * is equivalent and copies-up all timestamps and permission bits. ++ */ ++ au_write_post(inode, h_file, &wpre, /*written*/1); ++ ++out: ++ si_read_unlock(inode->i_sb); ++ inode_unlock(inode); ++ return err; ++} ++ ++static ssize_t aufs_copy_file_range(struct file *src, loff_t src_pos, ++ struct file *dst, loff_t dst_pos, ++ size_t len, unsigned int flags) ++{ ++ ssize_t err; ++ struct au_write_pre wpre; ++ enum { SRC, DST }; ++ struct { ++ struct inode *inode; ++ struct file *h_file; ++ struct super_block *h_sb; ++ } a[2]; ++#define a_src a[SRC] ++#define a_dst a[DST] ++ ++ err = -EINVAL; ++ a_src.inode = file_inode(src); ++ if (unlikely(!S_ISREG(a_src.inode->i_mode))) ++ goto out; ++ a_dst.inode = file_inode(dst); ++ if (unlikely(!S_ISREG(a_dst.inode->i_mode))) ++ goto out; ++ ++ au_mtx_and_read_lock(a_dst.inode); ++ /* ++ * in order to match the order in di_write_lock2_{child,parent}(), ++ * use f_path.dentry for this comparison. ++ */ ++ if (src->f_path.dentry < dst->f_path.dentry) { ++ a_src.h_file = au_read_pre(src, /*keep_fi*/1, AuLsc_FI_1); ++ err = PTR_ERR(a_src.h_file); ++ if (IS_ERR(a_src.h_file)) ++ goto out_si; ++ ++ wpre.lsc = AuLsc_FI_2; ++ a_dst.h_file = au_write_pre(dst, /*do_ready*/1, &wpre); ++ err = PTR_ERR(a_dst.h_file); ++ if (IS_ERR(a_dst.h_file)) { ++ au_read_post(a_src.inode, a_src.h_file); ++ goto out_si; ++ } ++ } else { ++ wpre.lsc = AuLsc_FI_1; ++ a_dst.h_file = au_write_pre(dst, /*do_ready*/1, &wpre); ++ err = PTR_ERR(a_dst.h_file); ++ if (IS_ERR(a_dst.h_file)) ++ goto out_si; ++ ++ a_src.h_file = au_read_pre(src, /*keep_fi*/1, AuLsc_FI_2); ++ err = PTR_ERR(a_src.h_file); ++ if (IS_ERR(a_src.h_file)) { ++ au_write_post(a_dst.inode, a_dst.h_file, &wpre, ++ /*written*/0); ++ goto out_si; ++ } ++ } ++ ++ err = -EXDEV; ++ a_src.h_sb = file_inode(a_src.h_file)->i_sb; ++ a_dst.h_sb = file_inode(a_dst.h_file)->i_sb; ++ if (unlikely(a_src.h_sb != a_dst.h_sb)) { ++ AuDbgFile(src); ++ AuDbgFile(dst); ++ goto out_file; ++ } ++ ++ err = vfsub_copy_file_range(a_src.h_file, src_pos, a_dst.h_file, ++ dst_pos, len, flags); ++ ++out_file: ++ au_write_post(a_dst.inode, a_dst.h_file, &wpre, err); ++ fi_read_unlock(src); ++ au_read_post(a_src.inode, a_src.h_file); ++out_si: ++ si_read_unlock(a_dst.inode->i_sb); ++ inode_unlock(a_dst.inode); ++out: ++ return err; ++#undef a_src ++#undef a_dst ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * The locking order around current->mmap_sem. ++ * - in most and regular cases ++ * file I/O syscall -- aufs_read() or something ++ * -- si_rwsem for read -- mmap_sem ++ * (Note that [fdi]i_rwsem are released before mmap_sem). ++ * - in mmap case ++ * mmap(2) -- mmap_sem -- aufs_mmap() -- si_rwsem for read -- [fdi]i_rwsem ++ * This AB-BA order is definitely bad, but is not a problem since "si_rwsem for ++ * read" allows multiple processes to acquire it and [fdi]i_rwsem are not held ++ * in file I/O. Aufs needs to stop lockdep in aufs_mmap() though. ++ * It means that when aufs acquires si_rwsem for write, the process should never ++ * acquire mmap_sem. ++ * ++ * Actually aufs_iterate() holds [fdi]i_rwsem before mmap_sem, but this is not a ++ * problem either since any directory is not able to be mmap-ed. ++ * The similar scenario is applied to aufs_readlink() too. ++ */ ++ ++#if 0 /* stop calling security_file_mmap() */ ++/* cf. linux/include/linux/mman.h: calc_vm_prot_bits() */ ++#define AuConv_VM_PROT(f, b) _calc_vm_trans(f, VM_##b, PROT_##b) ++ ++static unsigned long au_arch_prot_conv(unsigned long flags) ++{ ++ /* currently ppc64 only */ ++#ifdef CONFIG_PPC64 ++ /* cf. linux/arch/powerpc/include/asm/mman.h */ ++ AuDebugOn(arch_calc_vm_prot_bits(-1) != VM_SAO); ++ return AuConv_VM_PROT(flags, SAO); ++#else ++ AuDebugOn(arch_calc_vm_prot_bits(-1)); ++ return 0; ++#endif ++} ++ ++static unsigned long au_prot_conv(unsigned long flags) ++{ ++ return AuConv_VM_PROT(flags, READ) ++ | AuConv_VM_PROT(flags, WRITE) ++ | AuConv_VM_PROT(flags, EXEC) ++ | au_arch_prot_conv(flags); ++} ++ ++/* cf. linux/include/linux/mman.h: calc_vm_flag_bits() */ ++#define AuConv_VM_MAP(f, b) _calc_vm_trans(f, VM_##b, MAP_##b) ++ ++static unsigned long au_flag_conv(unsigned long flags) ++{ ++ return AuConv_VM_MAP(flags, GROWSDOWN) ++ | AuConv_VM_MAP(flags, DENYWRITE) ++ | AuConv_VM_MAP(flags, LOCKED); ++} ++#endif ++ ++static int aufs_mmap(struct file *file, struct vm_area_struct *vma) ++{ ++ int err; ++ const unsigned char wlock ++ = (file->f_mode & FMODE_WRITE) && (vma->vm_flags & VM_SHARED); ++ struct super_block *sb; ++ struct file *h_file; ++ struct inode *inode; ++ ++ AuDbgVmRegion(file, vma); ++ ++ inode = file_inode(file); ++ sb = inode->i_sb; ++ lockdep_off(); ++ si_read_lock(sb, AuLock_NOPLMW); ++ ++ h_file = au_write_pre(file, wlock, /*wpre*/NULL); ++ lockdep_on(); ++ err = PTR_ERR(h_file); ++ if (IS_ERR(h_file)) ++ goto out; ++ ++ err = 0; ++ au_set_mmapped(file); ++ au_vm_file_reset(vma, h_file); ++ /* ++ * we cannot call security_mmap_file() here since it may acquire ++ * mmap_sem or i_mutex. ++ * ++ * err = security_mmap_file(h_file, au_prot_conv(vma->vm_flags), ++ * au_flag_conv(vma->vm_flags)); ++ */ ++ if (!err) ++ err = call_mmap(h_file, vma); ++ if (!err) { ++ au_vm_prfile_set(vma, file); ++ fsstack_copy_attr_atime(inode, file_inode(h_file)); ++ goto out_fput; /* success */ ++ } ++ au_unset_mmapped(file); ++ au_vm_file_reset(vma, file); ++ ++out_fput: ++ lockdep_off(); ++ ii_write_unlock(inode); ++ lockdep_on(); ++ fput(h_file); ++out: ++ lockdep_off(); ++ si_read_unlock(sb); ++ lockdep_on(); ++ AuTraceErr(err); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int aufs_fsync_nondir(struct file *file, loff_t start, loff_t end, ++ int datasync) ++{ ++ int err; ++ struct au_write_pre wpre; ++ struct inode *inode; ++ struct file *h_file; ++ ++ err = 0; /* -EBADF; */ /* posix? */ ++ if (unlikely(!(file->f_mode & FMODE_WRITE))) ++ goto out; ++ ++ inode = file_inode(file); ++ au_mtx_and_read_lock(inode); ++ ++ wpre.lsc = 0; ++ h_file = au_write_pre(file, /*do_ready*/1, &wpre); ++ err = PTR_ERR(h_file); ++ if (IS_ERR(h_file)) ++ goto out_unlock; ++ ++ err = vfsub_fsync(h_file, &h_file->f_path, datasync); ++ au_write_post(inode, h_file, &wpre, /*written*/0); ++ ++out_unlock: ++ si_read_unlock(inode->i_sb); ++ inode_unlock(inode); ++out: ++ return err; ++} ++ ++static int aufs_fasync(int fd, struct file *file, int flag) ++{ ++ int err; ++ struct file *h_file; ++ struct super_block *sb; ++ ++ sb = file->f_path.dentry->d_sb; ++ si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW); ++ ++ h_file = au_read_pre(file, /*keep_fi*/0, /*lsc*/0); ++ err = PTR_ERR(h_file); ++ if (IS_ERR(h_file)) ++ goto out; ++ ++ if (h_file->f_op->fasync) ++ err = h_file->f_op->fasync(fd, h_file, flag); ++ fput(h_file); /* instead of au_read_post() */ ++ ++out: ++ si_read_unlock(sb); ++ return err; ++} ++ ++static int aufs_setfl(struct file *file, unsigned long arg) ++{ ++ int err; ++ struct file *h_file; ++ struct super_block *sb; ++ ++ sb = file->f_path.dentry->d_sb; ++ si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW); ++ ++ h_file = au_read_pre(file, /*keep_fi*/0, /*lsc*/0); ++ err = PTR_ERR(h_file); ++ if (IS_ERR(h_file)) ++ goto out; ++ ++ /* stop calling h_file->fasync */ ++ arg |= vfsub_file_flags(file) & FASYNC; ++ err = setfl(/*unused fd*/-1, h_file, arg); ++ fput(h_file); /* instead of au_read_post() */ ++ ++out: ++ si_read_unlock(sb); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++const struct file_operations aufs_file_fop = { ++ .owner = THIS_MODULE, ++ ++ .llseek = default_llseek, ++ ++ .read_iter = aufs_read_iter, ++ .write_iter = aufs_write_iter, ++ ++#ifdef CONFIG_AUFS_POLL ++ .poll = aufs_poll, ++#endif ++ .unlocked_ioctl = aufs_ioctl_nondir, ++#ifdef CONFIG_COMPAT ++ .compat_ioctl = aufs_compat_ioctl_nondir, ++#endif ++ .mmap = aufs_mmap, ++ .open = aufs_open_nondir, ++ .flush = aufs_flush_nondir, ++ .release = aufs_release_nondir, ++ .fsync = aufs_fsync_nondir, ++ .fasync = aufs_fasync, ++ .setfl = aufs_setfl, ++ .splice_write = aufs_splice_write, ++ .splice_read = aufs_splice_read, ++#if 0 /* reserved for future use */ ++ .aio_splice_write = aufs_aio_splice_write, ++ .aio_splice_read = aufs_aio_splice_read, ++#endif ++ .fallocate = aufs_fallocate, ++ .copy_file_range = aufs_copy_file_range ++}; +diff --git a/fs/aufs/fhsm.c b/fs/aufs/fhsm.c +new file mode 100644 +index 000000000000..91262fbbbfae +--- /dev/null ++++ b/fs/aufs/fhsm.c +@@ -0,0 +1,426 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2011-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * File-based Hierarchy Storage Management ++ */ ++ ++#include <linux/anon_inodes.h> ++#include <linux/poll.h> ++#include <linux/seq_file.h> ++#include <linux/statfs.h> ++#include "aufs.h" ++ ++static aufs_bindex_t au_fhsm_bottom(struct super_block *sb) ++{ ++ struct au_sbinfo *sbinfo; ++ struct au_fhsm *fhsm; ++ ++ SiMustAnyLock(sb); ++ ++ sbinfo = au_sbi(sb); ++ fhsm = &sbinfo->si_fhsm; ++ AuDebugOn(!fhsm); ++ return fhsm->fhsm_bottom; ++} ++ ++void au_fhsm_set_bottom(struct super_block *sb, aufs_bindex_t bindex) ++{ ++ struct au_sbinfo *sbinfo; ++ struct au_fhsm *fhsm; ++ ++ SiMustWriteLock(sb); ++ ++ sbinfo = au_sbi(sb); ++ fhsm = &sbinfo->si_fhsm; ++ AuDebugOn(!fhsm); ++ fhsm->fhsm_bottom = bindex; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int au_fhsm_test_jiffy(struct au_sbinfo *sbinfo, struct au_branch *br) ++{ ++ struct au_br_fhsm *bf; ++ ++ bf = br->br_fhsm; ++ MtxMustLock(&bf->bf_lock); ++ ++ return !bf->bf_readable ++ || time_after(jiffies, ++ bf->bf_jiffy + sbinfo->si_fhsm.fhsm_expire); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static void au_fhsm_notify(struct super_block *sb, int val) ++{ ++ struct au_sbinfo *sbinfo; ++ struct au_fhsm *fhsm; ++ ++ SiMustAnyLock(sb); ++ ++ sbinfo = au_sbi(sb); ++ fhsm = &sbinfo->si_fhsm; ++ if (au_fhsm_pid(fhsm) ++ && atomic_read(&fhsm->fhsm_readable) != -1) { ++ atomic_set(&fhsm->fhsm_readable, val); ++ if (val) ++ wake_up(&fhsm->fhsm_wqh); ++ } ++} ++ ++static int au_fhsm_stfs(struct super_block *sb, aufs_bindex_t bindex, ++ struct aufs_stfs *rstfs, int do_lock, int do_notify) ++{ ++ int err; ++ struct au_branch *br; ++ struct au_br_fhsm *bf; ++ ++ br = au_sbr(sb, bindex); ++ AuDebugOn(au_br_rdonly(br)); ++ bf = br->br_fhsm; ++ AuDebugOn(!bf); ++ ++ if (do_lock) ++ mutex_lock(&bf->bf_lock); ++ else ++ MtxMustLock(&bf->bf_lock); ++ ++ /* sb->s_root for NFS is unreliable */ ++ err = au_br_stfs(br, &bf->bf_stfs); ++ if (unlikely(err)) { ++ AuErr1("FHSM failed (%d), b%d, ignored.\n", bindex, err); ++ goto out; ++ } ++ ++ bf->bf_jiffy = jiffies; ++ bf->bf_readable = 1; ++ if (do_notify) ++ au_fhsm_notify(sb, /*val*/1); ++ if (rstfs) ++ *rstfs = bf->bf_stfs; ++ ++out: ++ if (do_lock) ++ mutex_unlock(&bf->bf_lock); ++ au_fhsm_notify(sb, /*val*/1); ++ ++ return err; ++} ++ ++void au_fhsm_wrote(struct super_block *sb, aufs_bindex_t bindex, int force) ++{ ++ int err; ++ struct au_sbinfo *sbinfo; ++ struct au_fhsm *fhsm; ++ struct au_branch *br; ++ struct au_br_fhsm *bf; ++ ++ AuDbg("b%d, force %d\n", bindex, force); ++ SiMustAnyLock(sb); ++ ++ sbinfo = au_sbi(sb); ++ fhsm = &sbinfo->si_fhsm; ++ if (!au_ftest_si(sbinfo, FHSM) ++ || fhsm->fhsm_bottom == bindex) ++ return; ++ ++ br = au_sbr(sb, bindex); ++ bf = br->br_fhsm; ++ AuDebugOn(!bf); ++ mutex_lock(&bf->bf_lock); ++ if (force ++ || au_fhsm_pid(fhsm) ++ || au_fhsm_test_jiffy(sbinfo, br)) ++ err = au_fhsm_stfs(sb, bindex, /*rstfs*/NULL, /*do_lock*/0, ++ /*do_notify*/1); ++ mutex_unlock(&bf->bf_lock); ++} ++ ++void au_fhsm_wrote_all(struct super_block *sb, int force) ++{ ++ aufs_bindex_t bindex, bbot; ++ struct au_branch *br; ++ ++ /* exclude the bottom */ ++ bbot = au_fhsm_bottom(sb); ++ for (bindex = 0; bindex < bbot; bindex++) { ++ br = au_sbr(sb, bindex); ++ if (au_br_fhsm(br->br_perm)) ++ au_fhsm_wrote(sb, bindex, force); ++ } ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static __poll_t au_fhsm_poll(struct file *file, struct poll_table_struct *wait) ++{ ++ __poll_t mask; ++ struct au_sbinfo *sbinfo; ++ struct au_fhsm *fhsm; ++ ++ mask = 0; ++ sbinfo = file->private_data; ++ fhsm = &sbinfo->si_fhsm; ++ poll_wait(file, &fhsm->fhsm_wqh, wait); ++ if (atomic_read(&fhsm->fhsm_readable)) ++ mask = EPOLLIN /* | EPOLLRDNORM */; ++ ++ if (!mask) ++ AuDbg("mask 0x%x\n", mask); ++ return mask; ++} ++ ++static int au_fhsm_do_read_one(struct aufs_stbr __user *stbr, ++ struct aufs_stfs *stfs, __s16 brid) ++{ ++ int err; ++ ++ err = copy_to_user(&stbr->stfs, stfs, sizeof(*stfs)); ++ if (!err) ++ err = __put_user(brid, &stbr->brid); ++ if (unlikely(err)) ++ err = -EFAULT; ++ ++ return err; ++} ++ ++static ssize_t au_fhsm_do_read(struct super_block *sb, ++ struct aufs_stbr __user *stbr, size_t count) ++{ ++ ssize_t err; ++ int nstbr; ++ aufs_bindex_t bindex, bbot; ++ struct au_branch *br; ++ struct au_br_fhsm *bf; ++ ++ /* except the bottom branch */ ++ err = 0; ++ nstbr = 0; ++ bbot = au_fhsm_bottom(sb); ++ for (bindex = 0; !err && bindex < bbot; bindex++) { ++ br = au_sbr(sb, bindex); ++ if (!au_br_fhsm(br->br_perm)) ++ continue; ++ ++ bf = br->br_fhsm; ++ mutex_lock(&bf->bf_lock); ++ if (bf->bf_readable) { ++ err = -EFAULT; ++ if (count >= sizeof(*stbr)) ++ err = au_fhsm_do_read_one(stbr++, &bf->bf_stfs, ++ br->br_id); ++ if (!err) { ++ bf->bf_readable = 0; ++ count -= sizeof(*stbr); ++ nstbr++; ++ } ++ } ++ mutex_unlock(&bf->bf_lock); ++ } ++ if (!err) ++ err = sizeof(*stbr) * nstbr; ++ ++ return err; ++} ++ ++static ssize_t au_fhsm_read(struct file *file, char __user *buf, size_t count, ++ loff_t *pos) ++{ ++ ssize_t err; ++ int readable; ++ aufs_bindex_t nfhsm, bindex, bbot; ++ struct au_sbinfo *sbinfo; ++ struct au_fhsm *fhsm; ++ struct au_branch *br; ++ struct super_block *sb; ++ ++ err = 0; ++ sbinfo = file->private_data; ++ fhsm = &sbinfo->si_fhsm; ++need_data: ++ spin_lock_irq(&fhsm->fhsm_wqh.lock); ++ if (!atomic_read(&fhsm->fhsm_readable)) { ++ if (vfsub_file_flags(file) & O_NONBLOCK) ++ err = -EAGAIN; ++ else ++ err = wait_event_interruptible_locked_irq ++ (fhsm->fhsm_wqh, ++ atomic_read(&fhsm->fhsm_readable)); ++ } ++ spin_unlock_irq(&fhsm->fhsm_wqh.lock); ++ if (unlikely(err)) ++ goto out; ++ ++ /* sb may already be dead */ ++ au_rw_read_lock(&sbinfo->si_rwsem); ++ readable = atomic_read(&fhsm->fhsm_readable); ++ if (readable > 0) { ++ sb = sbinfo->si_sb; ++ AuDebugOn(!sb); ++ /* exclude the bottom branch */ ++ nfhsm = 0; ++ bbot = au_fhsm_bottom(sb); ++ for (bindex = 0; bindex < bbot; bindex++) { ++ br = au_sbr(sb, bindex); ++ if (au_br_fhsm(br->br_perm)) ++ nfhsm++; ++ } ++ err = -EMSGSIZE; ++ if (nfhsm * sizeof(struct aufs_stbr) <= count) { ++ atomic_set(&fhsm->fhsm_readable, 0); ++ err = au_fhsm_do_read(sbinfo->si_sb, (void __user *)buf, ++ count); ++ } ++ } ++ au_rw_read_unlock(&sbinfo->si_rwsem); ++ if (!readable) ++ goto need_data; ++ ++out: ++ return err; ++} ++ ++static int au_fhsm_release(struct inode *inode, struct file *file) ++{ ++ struct au_sbinfo *sbinfo; ++ struct au_fhsm *fhsm; ++ ++ /* sb may already be dead */ ++ sbinfo = file->private_data; ++ fhsm = &sbinfo->si_fhsm; ++ spin_lock(&fhsm->fhsm_spin); ++ fhsm->fhsm_pid = 0; ++ spin_unlock(&fhsm->fhsm_spin); ++ kobject_put(&sbinfo->si_kobj); ++ ++ return 0; ++} ++ ++static const struct file_operations au_fhsm_fops = { ++ .owner = THIS_MODULE, ++ .llseek = noop_llseek, ++ .read = au_fhsm_read, ++ .poll = au_fhsm_poll, ++ .release = au_fhsm_release ++}; ++ ++int au_fhsm_fd(struct super_block *sb, int oflags) ++{ ++ int err, fd; ++ struct au_sbinfo *sbinfo; ++ struct au_fhsm *fhsm; ++ ++ err = -EPERM; ++ if (unlikely(!capable(CAP_SYS_ADMIN))) ++ goto out; ++ ++ err = -EINVAL; ++ if (unlikely(oflags & ~(O_CLOEXEC | O_NONBLOCK))) ++ goto out; ++ ++ err = 0; ++ sbinfo = au_sbi(sb); ++ fhsm = &sbinfo->si_fhsm; ++ spin_lock(&fhsm->fhsm_spin); ++ if (!fhsm->fhsm_pid) ++ fhsm->fhsm_pid = current->pid; ++ else ++ err = -EBUSY; ++ spin_unlock(&fhsm->fhsm_spin); ++ if (unlikely(err)) ++ goto out; ++ ++ oflags |= O_RDONLY; ++ /* oflags |= FMODE_NONOTIFY; */ ++ fd = anon_inode_getfd("[aufs_fhsm]", &au_fhsm_fops, sbinfo, oflags); ++ err = fd; ++ if (unlikely(fd < 0)) ++ goto out_pid; ++ ++ /* succeed regardless 'fhsm' status */ ++ kobject_get(&sbinfo->si_kobj); ++ si_noflush_read_lock(sb); ++ if (au_ftest_si(sbinfo, FHSM)) ++ au_fhsm_wrote_all(sb, /*force*/0); ++ si_read_unlock(sb); ++ goto out; /* success */ ++ ++out_pid: ++ spin_lock(&fhsm->fhsm_spin); ++ fhsm->fhsm_pid = 0; ++ spin_unlock(&fhsm->fhsm_spin); ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++int au_fhsm_br_alloc(struct au_branch *br) ++{ ++ int err; ++ ++ err = 0; ++ br->br_fhsm = kmalloc(sizeof(*br->br_fhsm), GFP_NOFS); ++ if (br->br_fhsm) ++ au_br_fhsm_init(br->br_fhsm); ++ else ++ err = -ENOMEM; ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++void au_fhsm_fin(struct super_block *sb) ++{ ++ au_fhsm_notify(sb, /*val*/-1); ++} ++ ++void au_fhsm_init(struct au_sbinfo *sbinfo) ++{ ++ struct au_fhsm *fhsm; ++ ++ fhsm = &sbinfo->si_fhsm; ++ spin_lock_init(&fhsm->fhsm_spin); ++ init_waitqueue_head(&fhsm->fhsm_wqh); ++ atomic_set(&fhsm->fhsm_readable, 0); ++ fhsm->fhsm_expire ++ = msecs_to_jiffies(AUFS_FHSM_CACHE_DEF_SEC * MSEC_PER_SEC); ++ fhsm->fhsm_bottom = -1; ++} ++ ++void au_fhsm_set(struct au_sbinfo *sbinfo, unsigned int sec) ++{ ++ sbinfo->si_fhsm.fhsm_expire ++ = msecs_to_jiffies(sec * MSEC_PER_SEC); ++} ++ ++void au_fhsm_show(struct seq_file *seq, struct au_sbinfo *sbinfo) ++{ ++ unsigned int u; ++ ++ if (!au_ftest_si(sbinfo, FHSM)) ++ return; ++ ++ u = jiffies_to_msecs(sbinfo->si_fhsm.fhsm_expire) / MSEC_PER_SEC; ++ if (u != AUFS_FHSM_CACHE_DEF_SEC) ++ seq_printf(seq, ",fhsm_sec=%u", u); ++} +diff --git a/fs/aufs/file.c b/fs/aufs/file.c +new file mode 100644 +index 000000000000..76ad444328db +--- /dev/null ++++ b/fs/aufs/file.c +@@ -0,0 +1,865 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * handling file/dir, and address_space operation ++ */ ++ ++#ifdef CONFIG_AUFS_DEBUG ++#include <linux/migrate.h> ++#endif ++#include <linux/pagemap.h> ++#include "aufs.h" ++ ++/* drop flags for writing */ ++unsigned int au_file_roflags(unsigned int flags) ++{ ++ flags &= ~(O_WRONLY | O_RDWR | O_APPEND | O_CREAT | O_TRUNC); ++ flags |= O_RDONLY | O_NOATIME; ++ return flags; ++} ++ ++/* common functions to regular file and dir */ ++struct file *au_h_open(struct dentry *dentry, aufs_bindex_t bindex, int flags, ++ struct file *file, int force_wr) ++{ ++ struct file *h_file; ++ struct dentry *h_dentry; ++ struct inode *h_inode; ++ struct super_block *sb; ++ struct au_branch *br; ++ struct path h_path; ++ int err; ++ ++ /* a race condition can happen between open and unlink/rmdir */ ++ h_file = ERR_PTR(-ENOENT); ++ h_dentry = au_h_dptr(dentry, bindex); ++ if (au_test_nfsd() && (!h_dentry || d_is_negative(h_dentry))) ++ goto out; ++ h_inode = d_inode(h_dentry); ++ spin_lock(&h_dentry->d_lock); ++ err = (!d_unhashed(dentry) && d_unlinked(h_dentry)) ++ /* || !d_inode(dentry)->i_nlink */ ++ ; ++ spin_unlock(&h_dentry->d_lock); ++ if (unlikely(err)) ++ goto out; ++ ++ sb = dentry->d_sb; ++ br = au_sbr(sb, bindex); ++ err = au_br_test_oflag(flags, br); ++ h_file = ERR_PTR(err); ++ if (unlikely(err)) ++ goto out; ++ ++ /* drop flags for writing */ ++ if (au_test_ro(sb, bindex, d_inode(dentry))) { ++ if (force_wr && !(flags & O_WRONLY)) ++ force_wr = 0; ++ flags = au_file_roflags(flags); ++ if (force_wr) { ++ h_file = ERR_PTR(-EROFS); ++ flags = au_file_roflags(flags); ++ if (unlikely(vfsub_native_ro(h_inode) ++ || IS_APPEND(h_inode))) ++ goto out; ++ flags &= ~O_ACCMODE; ++ flags |= O_WRONLY; ++ } ++ } ++ flags &= ~O_CREAT; ++ au_lcnt_inc(&br->br_nfiles); ++ h_path.dentry = h_dentry; ++ h_path.mnt = au_br_mnt(br); ++ /* ++ * vfs::backing_file_open() looks promising since it can get rid of ++ * mm::vm_prfile approach from my mind. ++ * but I keep current approach for a while. ++ */ ++ h_file = vfsub_dentry_open(&h_path, flags); ++ if (IS_ERR(h_file)) ++ goto out_br; ++ ++ if (flags & __FMODE_EXEC) { ++ err = deny_write_access(h_file); ++ if (unlikely(err)) { ++ fput(h_file); ++ h_file = ERR_PTR(err); ++ goto out_br; ++ } ++ } ++ fsnotify_open(h_file); ++ goto out; /* success */ ++ ++out_br: ++ au_lcnt_dec(&br->br_nfiles); ++out: ++ return h_file; ++} ++ ++static int au_cmoo(struct dentry *dentry) ++{ ++ int err, cmoo, matched; ++ unsigned int udba; ++ struct path h_path; ++ struct au_pin pin; ++ struct au_cp_generic cpg = { ++ .dentry = dentry, ++ .bdst = -1, ++ .bsrc = -1, ++ .len = -1, ++ .pin = &pin, ++ .flags = AuCpup_DTIME | AuCpup_HOPEN ++ }; ++ struct inode *delegated; ++ struct super_block *sb; ++ struct au_sbinfo *sbinfo; ++ struct au_fhsm *fhsm; ++ pid_t pid; ++ struct au_branch *br; ++ struct dentry *parent; ++ struct au_hinode *hdir; ++ ++ DiMustWriteLock(dentry); ++ IiMustWriteLock(d_inode(dentry)); ++ ++ err = 0; ++ if (IS_ROOT(dentry)) ++ goto out; ++ cpg.bsrc = au_dbtop(dentry); ++ if (!cpg.bsrc) ++ goto out; ++ ++ sb = dentry->d_sb; ++ sbinfo = au_sbi(sb); ++ fhsm = &sbinfo->si_fhsm; ++ pid = au_fhsm_pid(fhsm); ++ rcu_read_lock(); ++ matched = (pid ++ && (current->pid == pid ++ || rcu_dereference(current->real_parent)->pid == pid)); ++ rcu_read_unlock(); ++ if (matched) ++ goto out; ++ ++ br = au_sbr(sb, cpg.bsrc); ++ cmoo = au_br_cmoo(br->br_perm); ++ if (!cmoo) ++ goto out; ++ if (!d_is_reg(dentry)) ++ cmoo &= AuBrAttr_COO_ALL; ++ if (!cmoo) ++ goto out; ++ ++ parent = dget_parent(dentry); ++ di_write_lock_parent(parent); ++ err = au_wbr_do_copyup_bu(dentry, cpg.bsrc - 1); ++ cpg.bdst = err; ++ if (unlikely(err < 0)) { ++ err = 0; /* there is no upper writable branch */ ++ goto out_dgrade; ++ } ++ AuDbg("bsrc %d, bdst %d\n", cpg.bsrc, cpg.bdst); ++ ++ /* do not respect the coo attrib for the target branch */ ++ err = au_cpup_dirs(dentry, cpg.bdst); ++ if (unlikely(err)) ++ goto out_dgrade; ++ ++ di_downgrade_lock(parent, AuLock_IR); ++ udba = au_opt_udba(sb); ++ err = au_pin(&pin, dentry, cpg.bdst, udba, ++ AuPin_DI_LOCKED | AuPin_MNT_WRITE); ++ if (unlikely(err)) ++ goto out_parent; ++ ++ err = au_sio_cpup_simple(&cpg); ++ au_unpin(&pin); ++ if (unlikely(err)) ++ goto out_parent; ++ if (!(cmoo & AuBrWAttr_MOO)) ++ goto out_parent; /* success */ ++ ++ err = au_pin(&pin, dentry, cpg.bsrc, udba, ++ AuPin_DI_LOCKED | AuPin_MNT_WRITE); ++ if (unlikely(err)) ++ goto out_parent; ++ ++ h_path.mnt = au_br_mnt(br); ++ h_path.dentry = au_h_dptr(dentry, cpg.bsrc); ++ hdir = au_hi(d_inode(parent), cpg.bsrc); ++ delegated = NULL; ++ err = vfsub_unlink(hdir->hi_inode, &h_path, &delegated, /*force*/1); ++ au_unpin(&pin); ++ /* todo: keep h_dentry or not? */ ++ if (unlikely(err == -EWOULDBLOCK)) { ++ pr_warn("cannot retry for NFSv4 delegation" ++ " for an internal unlink\n"); ++ iput(delegated); ++ } ++ if (unlikely(err)) { ++ pr_err("unlink %pd after coo failed (%d), ignored\n", ++ dentry, err); ++ err = 0; ++ } ++ goto out_parent; /* success */ ++ ++out_dgrade: ++ di_downgrade_lock(parent, AuLock_IR); ++out_parent: ++ di_read_unlock(parent, AuLock_IR); ++ dput(parent); ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++int au_do_open(struct file *file, struct au_do_open_args *args) ++{ ++ int err, aopen = args->aopen; ++ struct dentry *dentry; ++ struct au_finfo *finfo; ++ ++ if (!aopen) ++ err = au_finfo_init(file, args->fidir); ++ else { ++ lockdep_off(); ++ err = au_finfo_init(file, args->fidir); ++ lockdep_on(); ++ } ++ if (unlikely(err)) ++ goto out; ++ ++ dentry = file->f_path.dentry; ++ AuDebugOn(IS_ERR_OR_NULL(dentry)); ++ di_write_lock_child(dentry); ++ err = au_cmoo(dentry); ++ if (!err) { ++ if (!aopen) { ++ err = args->open(file, vfsub_file_flags(file), ++ au_di(dentry)->di_htmpfile); ++ di_write_unlock(dentry); ++ } else { ++ di_downgrade_lock(dentry, AuLock_IR); ++ lockdep_off(); ++ err = args->open(file, vfsub_file_flags(file), ++ args->h_file); ++ lockdep_on(); ++ di_read_unlock(dentry, AuLock_IR); ++ } ++ } ++ ++ finfo = au_fi(file); ++ if (!err) { ++ finfo->fi_file = file; ++ au_hbl_add(&finfo->fi_hlist, ++ &au_sbi(file->f_path.dentry->d_sb)->si_files); ++ } ++ if (!aopen) ++ fi_write_unlock(file); ++ else { ++ lockdep_off(); ++ fi_write_unlock(file); ++ lockdep_on(); ++ } ++ if (unlikely(err)) { ++ finfo->fi_hdir = NULL; ++ au_finfo_fin(file); ++ } ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++int au_reopen_nondir(struct file *file) ++{ ++ int err; ++ aufs_bindex_t btop; ++ struct dentry *dentry; ++ struct au_branch *br; ++ struct file *h_file, *h_file_tmp; ++ ++ dentry = file->f_path.dentry; ++ btop = au_dbtop(dentry); ++ br = au_sbr(dentry->d_sb, btop); ++ h_file_tmp = NULL; ++ if (au_fbtop(file) == btop) { ++ h_file = au_hf_top(file); ++ if (file->f_mode == h_file->f_mode) ++ return 0; /* success */ ++ h_file_tmp = h_file; ++ get_file(h_file_tmp); ++ au_lcnt_inc(&br->br_nfiles); ++ au_set_h_fptr(file, btop, NULL); ++ } ++ AuDebugOn(au_fi(file)->fi_hdir); ++ /* ++ * it can happen ++ * file exists on both of rw and ro ++ * open --> dbtop and fbtop are both 0 ++ * prepend a branch as rw, "rw" become ro ++ * remove rw/file ++ * delete the top branch, "rw" becomes rw again ++ * --> dbtop is 1, fbtop is still 0 ++ * write --> fbtop is 0 but dbtop is 1 ++ */ ++ /* AuDebugOn(au_fbtop(file) < btop); */ ++ ++ h_file = au_h_open(dentry, btop, vfsub_file_flags(file) & ~O_TRUNC, ++ file, /*force_wr*/0); ++ err = PTR_ERR(h_file); ++ if (IS_ERR(h_file)) { ++ if (h_file_tmp) { ++ /* revert */ ++ au_set_h_fptr(file, btop, h_file_tmp); ++ h_file_tmp = NULL; ++ } ++ goto out; /* todo: close all? */ ++ } ++ ++ err = 0; ++ au_set_fbtop(file, btop); ++ au_set_h_fptr(file, btop, h_file); ++ au_update_figen(file); ++ /* todo: necessary? */ ++ /* file->f_ra = h_file->f_ra; */ ++ ++out: ++ if (h_file_tmp) { ++ fput(h_file_tmp); ++ au_lcnt_dec(&br->br_nfiles); ++ } ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int au_reopen_wh(struct file *file, aufs_bindex_t btgt, ++ struct dentry *hi_wh) ++{ ++ int err; ++ aufs_bindex_t btop; ++ struct au_dinfo *dinfo; ++ struct dentry *h_dentry; ++ struct au_hdentry *hdp; ++ ++ dinfo = au_di(file->f_path.dentry); ++ AuRwMustWriteLock(&dinfo->di_rwsem); ++ ++ btop = dinfo->di_btop; ++ dinfo->di_btop = btgt; ++ hdp = au_hdentry(dinfo, btgt); ++ h_dentry = hdp->hd_dentry; ++ hdp->hd_dentry = hi_wh; ++ err = au_reopen_nondir(file); ++ hdp->hd_dentry = h_dentry; ++ dinfo->di_btop = btop; ++ ++ return err; ++} ++ ++static int au_ready_to_write_wh(struct file *file, loff_t len, ++ aufs_bindex_t bcpup, struct au_pin *pin) ++{ ++ int err; ++ struct inode *inode, *h_inode; ++ struct dentry *h_dentry, *hi_wh; ++ struct au_cp_generic cpg = { ++ .dentry = file->f_path.dentry, ++ .bdst = bcpup, ++ .bsrc = -1, ++ .len = len, ++ .pin = pin ++ }; ++ ++ au_update_dbtop(cpg.dentry); ++ inode = d_inode(cpg.dentry); ++ h_inode = NULL; ++ if (au_dbtop(cpg.dentry) <= bcpup ++ && au_dbbot(cpg.dentry) >= bcpup) { ++ h_dentry = au_h_dptr(cpg.dentry, bcpup); ++ if (h_dentry && d_is_positive(h_dentry)) ++ h_inode = d_inode(h_dentry); ++ } ++ hi_wh = au_hi_wh(inode, bcpup); ++ if (!hi_wh && !h_inode) ++ err = au_sio_cpup_wh(&cpg, file); ++ else ++ /* already copied-up after unlink */ ++ err = au_reopen_wh(file, bcpup, hi_wh); ++ ++ if (!err ++ && (inode->i_nlink > 1 ++ || (inode->i_state & I_LINKABLE)) ++ && au_opt_test(au_mntflags(cpg.dentry->d_sb), PLINK)) ++ au_plink_append(inode, bcpup, au_h_dptr(cpg.dentry, bcpup)); ++ ++ return err; ++} ++ ++/* ++ * prepare the @file for writing. ++ */ ++int au_ready_to_write(struct file *file, loff_t len, struct au_pin *pin) ++{ ++ int err; ++ aufs_bindex_t dbtop; ++ struct dentry *parent; ++ struct inode *inode; ++ struct super_block *sb; ++ struct file *h_file; ++ struct au_cp_generic cpg = { ++ .dentry = file->f_path.dentry, ++ .bdst = -1, ++ .bsrc = -1, ++ .len = len, ++ .pin = pin, ++ .flags = AuCpup_DTIME ++ }; ++ ++ sb = cpg.dentry->d_sb; ++ inode = d_inode(cpg.dentry); ++ cpg.bsrc = au_fbtop(file); ++ err = au_test_ro(sb, cpg.bsrc, inode); ++ if (!err && (au_hf_top(file)->f_mode & FMODE_WRITE)) { ++ err = au_pin(pin, cpg.dentry, cpg.bsrc, AuOpt_UDBA_NONE, ++ /*flags*/0); ++ goto out; ++ } ++ ++ /* need to cpup or reopen */ ++ parent = dget_parent(cpg.dentry); ++ di_write_lock_parent(parent); ++ err = AuWbrCopyup(au_sbi(sb), cpg.dentry); ++ cpg.bdst = err; ++ if (unlikely(err < 0)) ++ goto out_dgrade; ++ err = 0; ++ ++ if (!d_unhashed(cpg.dentry) && !au_h_dptr(parent, cpg.bdst)) { ++ err = au_cpup_dirs(cpg.dentry, cpg.bdst); ++ if (unlikely(err)) ++ goto out_dgrade; ++ } ++ ++ err = au_pin(pin, cpg.dentry, cpg.bdst, AuOpt_UDBA_NONE, ++ AuPin_DI_LOCKED | AuPin_MNT_WRITE); ++ if (unlikely(err)) ++ goto out_dgrade; ++ ++ dbtop = au_dbtop(cpg.dentry); ++ if (dbtop <= cpg.bdst) ++ cpg.bsrc = cpg.bdst; ++ ++ if (dbtop <= cpg.bdst /* just reopen */ ++ || !d_unhashed(cpg.dentry) /* copyup and reopen */ ++ ) { ++ h_file = au_h_open_pre(cpg.dentry, cpg.bsrc, /*force_wr*/0); ++ if (IS_ERR(h_file)) ++ err = PTR_ERR(h_file); ++ else { ++ di_downgrade_lock(parent, AuLock_IR); ++ if (dbtop > cpg.bdst) ++ err = au_sio_cpup_simple(&cpg); ++ if (!err) ++ err = au_reopen_nondir(file); ++ au_h_open_post(cpg.dentry, cpg.bsrc, h_file); ++ } ++ } else { /* copyup as wh and reopen */ ++ /* ++ * since writable hfsplus branch is not supported, ++ * h_open_pre/post() are unnecessary. ++ */ ++ err = au_ready_to_write_wh(file, len, cpg.bdst, pin); ++ di_downgrade_lock(parent, AuLock_IR); ++ } ++ ++ if (!err) { ++ au_pin_set_parent_lflag(pin, /*lflag*/0); ++ goto out_dput; /* success */ ++ } ++ au_unpin(pin); ++ goto out_unlock; ++ ++out_dgrade: ++ di_downgrade_lock(parent, AuLock_IR); ++out_unlock: ++ di_read_unlock(parent, AuLock_IR); ++out_dput: ++ dput(parent); ++out: ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++int au_do_flush(struct file *file, fl_owner_t id, ++ int (*flush)(struct file *file, fl_owner_t id)) ++{ ++ int err; ++ struct super_block *sb; ++ struct inode *inode; ++ ++ inode = file_inode(file); ++ sb = inode->i_sb; ++ si_noflush_read_lock(sb); ++ fi_read_lock(file); ++ ii_read_lock_child(inode); ++ ++ err = flush(file, id); ++ au_cpup_attr_timesizes(inode); ++ ++ ii_read_unlock(inode); ++ fi_read_unlock(file); ++ si_read_unlock(sb); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int au_file_refresh_by_inode(struct file *file, int *need_reopen) ++{ ++ int err; ++ struct au_pin pin; ++ struct au_finfo *finfo; ++ struct dentry *parent, *hi_wh; ++ struct inode *inode; ++ struct super_block *sb; ++ struct au_cp_generic cpg = { ++ .dentry = file->f_path.dentry, ++ .bdst = -1, ++ .bsrc = -1, ++ .len = -1, ++ .pin = &pin, ++ .flags = AuCpup_DTIME ++ }; ++ ++ FiMustWriteLock(file); ++ ++ err = 0; ++ finfo = au_fi(file); ++ sb = cpg.dentry->d_sb; ++ inode = d_inode(cpg.dentry); ++ cpg.bdst = au_ibtop(inode); ++ if (cpg.bdst == finfo->fi_btop || IS_ROOT(cpg.dentry)) ++ goto out; ++ ++ parent = dget_parent(cpg.dentry); ++ if (au_test_ro(sb, cpg.bdst, inode)) { ++ di_read_lock_parent(parent, !AuLock_IR); ++ err = AuWbrCopyup(au_sbi(sb), cpg.dentry); ++ cpg.bdst = err; ++ di_read_unlock(parent, !AuLock_IR); ++ if (unlikely(err < 0)) ++ goto out_parent; ++ err = 0; ++ } ++ ++ di_read_lock_parent(parent, AuLock_IR); ++ hi_wh = au_hi_wh(inode, cpg.bdst); ++ if (!S_ISDIR(inode->i_mode) ++ && au_opt_test(au_mntflags(sb), PLINK) ++ && au_plink_test(inode) ++ && !d_unhashed(cpg.dentry) ++ && cpg.bdst < au_dbtop(cpg.dentry)) { ++ err = au_test_and_cpup_dirs(cpg.dentry, cpg.bdst); ++ if (unlikely(err)) ++ goto out_unlock; ++ ++ /* always superio. */ ++ err = au_pin(&pin, cpg.dentry, cpg.bdst, AuOpt_UDBA_NONE, ++ AuPin_DI_LOCKED | AuPin_MNT_WRITE); ++ if (!err) { ++ err = au_sio_cpup_simple(&cpg); ++ au_unpin(&pin); ++ } ++ } else if (hi_wh) { ++ /* already copied-up after unlink */ ++ err = au_reopen_wh(file, cpg.bdst, hi_wh); ++ *need_reopen = 0; ++ } ++ ++out_unlock: ++ di_read_unlock(parent, AuLock_IR); ++out_parent: ++ dput(parent); ++out: ++ return err; ++} ++ ++static void au_do_refresh_dir(struct file *file) ++{ ++ aufs_bindex_t bindex, bbot, new_bindex, brid; ++ struct au_hfile *p, tmp, *q; ++ struct au_finfo *finfo; ++ struct super_block *sb; ++ struct au_fidir *fidir; ++ ++ FiMustWriteLock(file); ++ ++ sb = file->f_path.dentry->d_sb; ++ finfo = au_fi(file); ++ fidir = finfo->fi_hdir; ++ AuDebugOn(!fidir); ++ p = fidir->fd_hfile + finfo->fi_btop; ++ brid = p->hf_br->br_id; ++ bbot = fidir->fd_bbot; ++ for (bindex = finfo->fi_btop; bindex <= bbot; bindex++, p++) { ++ if (!p->hf_file) ++ continue; ++ ++ new_bindex = au_br_index(sb, p->hf_br->br_id); ++ if (new_bindex == bindex) ++ continue; ++ if (new_bindex < 0) { ++ au_set_h_fptr(file, bindex, NULL); ++ continue; ++ } ++ ++ /* swap two lower inode, and loop again */ ++ q = fidir->fd_hfile + new_bindex; ++ tmp = *q; ++ *q = *p; ++ *p = tmp; ++ if (tmp.hf_file) { ++ bindex--; ++ p--; ++ } ++ } ++ ++ p = fidir->fd_hfile; ++ if (!au_test_mmapped(file) && !d_unlinked(file->f_path.dentry)) { ++ bbot = au_sbbot(sb); ++ for (finfo->fi_btop = 0; finfo->fi_btop <= bbot; ++ finfo->fi_btop++, p++) ++ if (p->hf_file) { ++ if (file_inode(p->hf_file)) ++ break; ++ au_hfput(p, /*execed*/0); ++ } ++ } else { ++ bbot = au_br_index(sb, brid); ++ for (finfo->fi_btop = 0; finfo->fi_btop < bbot; ++ finfo->fi_btop++, p++) ++ if (p->hf_file) ++ au_hfput(p, /*execed*/0); ++ bbot = au_sbbot(sb); ++ } ++ ++ p = fidir->fd_hfile + bbot; ++ for (fidir->fd_bbot = bbot; fidir->fd_bbot >= finfo->fi_btop; ++ fidir->fd_bbot--, p--) ++ if (p->hf_file) { ++ if (file_inode(p->hf_file)) ++ break; ++ au_hfput(p, /*execed*/0); ++ } ++ AuDebugOn(fidir->fd_bbot < finfo->fi_btop); ++} ++ ++/* ++ * after branch manipulating, refresh the file. ++ */ ++static int refresh_file(struct file *file, int (*reopen)(struct file *file)) ++{ ++ int err, need_reopen, nbr; ++ aufs_bindex_t bbot, bindex; ++ struct dentry *dentry; ++ struct super_block *sb; ++ struct au_finfo *finfo; ++ struct au_hfile *hfile; ++ ++ dentry = file->f_path.dentry; ++ sb = dentry->d_sb; ++ nbr = au_sbbot(sb) + 1; ++ finfo = au_fi(file); ++ if (!finfo->fi_hdir) { ++ hfile = &finfo->fi_htop; ++ AuDebugOn(!hfile->hf_file); ++ bindex = au_br_index(sb, hfile->hf_br->br_id); ++ AuDebugOn(bindex < 0); ++ if (bindex != finfo->fi_btop) ++ au_set_fbtop(file, bindex); ++ } else { ++ err = au_fidir_realloc(finfo, nbr, /*may_shrink*/0); ++ if (unlikely(err)) ++ goto out; ++ au_do_refresh_dir(file); ++ } ++ ++ err = 0; ++ need_reopen = 1; ++ if (!au_test_mmapped(file)) ++ err = au_file_refresh_by_inode(file, &need_reopen); ++ if (finfo->fi_hdir) ++ /* harmless if err */ ++ au_fidir_realloc(finfo, nbr, /*may_shrink*/1); ++ if (!err && need_reopen && !d_unlinked(dentry)) ++ err = reopen(file); ++ if (!err) { ++ au_update_figen(file); ++ goto out; /* success */ ++ } ++ ++ /* error, close all lower files */ ++ if (finfo->fi_hdir) { ++ bbot = au_fbbot_dir(file); ++ for (bindex = au_fbtop(file); bindex <= bbot; bindex++) ++ au_set_h_fptr(file, bindex, NULL); ++ } ++ ++out: ++ return err; ++} ++ ++/* common function to regular file and dir */ ++int au_reval_and_lock_fdi(struct file *file, int (*reopen)(struct file *file), ++ int wlock, unsigned int fi_lsc) ++{ ++ int err; ++ unsigned int sigen, figen; ++ aufs_bindex_t btop; ++ unsigned char pseudo_link; ++ struct dentry *dentry; ++ struct inode *inode; ++ ++ err = 0; ++ dentry = file->f_path.dentry; ++ inode = d_inode(dentry); ++ sigen = au_sigen(dentry->d_sb); ++ fi_write_lock_nested(file, fi_lsc); ++ figen = au_figen(file); ++ if (!fi_lsc) ++ di_write_lock_child(dentry); ++ else ++ di_write_lock_child2(dentry); ++ btop = au_dbtop(dentry); ++ pseudo_link = (btop != au_ibtop(inode)); ++ if (sigen == figen && !pseudo_link && au_fbtop(file) == btop) { ++ if (!wlock) { ++ di_downgrade_lock(dentry, AuLock_IR); ++ fi_downgrade_lock(file); ++ } ++ goto out; /* success */ ++ } ++ ++ AuDbg("sigen %d, figen %d\n", sigen, figen); ++ if (au_digen_test(dentry, sigen)) { ++ err = au_reval_dpath(dentry, sigen); ++ AuDebugOn(!err && au_digen_test(dentry, sigen)); ++ } ++ ++ if (!err) ++ err = refresh_file(file, reopen); ++ if (!err) { ++ if (!wlock) { ++ di_downgrade_lock(dentry, AuLock_IR); ++ fi_downgrade_lock(file); ++ } ++ } else { ++ di_write_unlock(dentry); ++ fi_write_unlock(file); ++ } ++ ++out: ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* cf. aufs_nopage() */ ++/* for madvise(2) */ ++static int aufs_read_folio(struct file *file __maybe_unused, struct folio *folio) ++{ ++ folio_unlock(folio); ++ return 0; ++} ++ ++/* it will never be called, but necessary to support O_DIRECT */ ++static ssize_t aufs_direct_IO(struct kiocb *iocb, struct iov_iter *iter) ++{ BUG(); return 0; } ++ ++/* they will never be called. */ ++#ifdef CONFIG_AUFS_DEBUG ++static int aufs_write_begin(struct file *file, struct address_space *mapping, ++ loff_t pos, unsigned len, ++ struct page **pagep, void **fsdata) ++{ AuUnsupport(); return 0; } ++static int aufs_write_end(struct file *file, struct address_space *mapping, ++ loff_t pos, unsigned len, unsigned copied, ++ struct page *page, void *fsdata) ++{ AuUnsupport(); return 0; } ++static int aufs_writepage(struct page *page, struct writeback_control *wbc) ++{ AuUnsupport(); return 0; } ++ ++static bool aufs_dirty_folio(struct address_space *mapping, struct folio *folio) ++{ AuUnsupport(); return true; } ++static void aufs_invalidate_folio(struct folio *folio, size_t offset, size_t len) ++{ AuUnsupport(); } ++static bool aufs_release_folio(struct folio *folio, gfp_t gfp) ++{ AuUnsupport(); return true; } ++#if 0 /* called by memory compaction regardless file */ ++static int aufs_migrate_folio(struct address_space *mapping, struct folio *dst, ++ struct folio *src, enum migrate_mode mode) ++{ AuUnsupport(); return 0; } ++#endif ++static int aufs_launder_folio(struct folio *folio) ++{ AuUnsupport(); return 0; } ++static bool aufs_is_partially_uptodate(struct folio *folio, size_t from, ++ size_t count) ++{ AuUnsupport(); return true; } ++static void aufs_is_dirty_writeback(struct folio *folio, bool *dirty, ++ bool *writeback) ++{ AuUnsupport(); } ++static int aufs_error_remove_page(struct address_space *mapping, ++ struct page *page) ++{ AuUnsupport(); return 0; } ++static int aufs_swap_activate(struct swap_info_struct *sis, struct file *file, ++ sector_t *span) ++{ AuUnsupport(); return 0; } ++static void aufs_swap_deactivate(struct file *file) ++{ AuUnsupport(); } ++static int aufs_swap_rw(struct kiocb *iocb, struct iov_iter *iter) ++{ AuUnsupport(); return 0; } ++#endif /* CONFIG_AUFS_DEBUG */ ++ ++const struct address_space_operations aufs_aop = { ++ .read_folio = aufs_read_folio, ++ .direct_IO = aufs_direct_IO, ++#ifdef CONFIG_AUFS_DEBUG ++ .writepage = aufs_writepage, ++ /* no writepages, because of writepage */ ++ .dirty_folio = aufs_dirty_folio, ++ /* no readpages, because of readpage */ ++ .write_begin = aufs_write_begin, ++ .write_end = aufs_write_end, ++ /* no bmap, no block device */ ++ .invalidate_folio = aufs_invalidate_folio, ++ .release_folio = aufs_release_folio, ++ /* is fallback_migrate_page ok? */ ++ /* .migrate_folio = aufs_migrate_folio, */ ++ .launder_folio = aufs_launder_folio, ++ .is_partially_uptodate = aufs_is_partially_uptodate, ++ .is_dirty_writeback = aufs_is_dirty_writeback, ++ .error_remove_page = aufs_error_remove_page, ++ .swap_activate = aufs_swap_activate, ++ .swap_deactivate = aufs_swap_deactivate, ++ .swap_rw = aufs_swap_rw ++#endif /* CONFIG_AUFS_DEBUG */ ++}; +diff --git a/fs/aufs/file.h b/fs/aufs/file.h +new file mode 100644 +index 000000000000..b16f31e364a8 +--- /dev/null ++++ b/fs/aufs/file.h +@@ -0,0 +1,342 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * file operations ++ */ ++ ++#ifndef __AUFS_FILE_H__ ++#define __AUFS_FILE_H__ ++ ++#ifdef __KERNEL__ ++ ++#include <linux/file.h> ++#include <linux/fs.h> ++#include <linux/mm_types.h> ++#include <linux/poll.h> ++#include "rwsem.h" ++ ++struct au_branch; ++struct au_hfile { ++ struct file *hf_file; ++ struct au_branch *hf_br; ++}; ++ ++struct au_vdir; ++struct au_fidir { ++ aufs_bindex_t fd_bbot; ++ aufs_bindex_t fd_nent; ++ struct au_vdir *fd_vdir_cache; ++ struct au_hfile fd_hfile[]; ++}; ++ ++static inline int au_fidir_sz(int nent) ++{ ++ AuDebugOn(nent < 0); ++ return sizeof(struct au_fidir) + sizeof(struct au_hfile) * nent; ++} ++ ++struct au_finfo { ++ atomic_t fi_generation; ++ ++ struct au_rwsem fi_rwsem; ++ aufs_bindex_t fi_btop; ++ ++ /* do not union them */ ++ struct { /* for non-dir */ ++ struct au_hfile fi_htop; ++ atomic_t fi_mmapped; ++ }; ++ struct au_fidir *fi_hdir; /* for dir only */ ++ ++ struct hlist_bl_node fi_hlist; ++ struct file *fi_file; /* very ugly */ ++ struct rcu_head rcu; ++} ____cacheline_aligned_in_smp; ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* file.c */ ++extern const struct address_space_operations aufs_aop; ++unsigned int au_file_roflags(unsigned int flags); ++struct file *au_h_open(struct dentry *dentry, aufs_bindex_t bindex, int flags, ++ struct file *file, int force_wr); ++struct au_do_open_args { ++ int aopen; ++ int (*open)(struct file *file, int flags, ++ struct file *h_file); ++ struct au_fidir *fidir; ++ struct file *h_file; ++}; ++int au_do_open(struct file *file, struct au_do_open_args *args); ++int au_reopen_nondir(struct file *file); ++struct au_pin; ++int au_ready_to_write(struct file *file, loff_t len, struct au_pin *pin); ++int au_reval_and_lock_fdi(struct file *file, int (*reopen)(struct file *file), ++ int wlock, unsigned int fi_lsc); ++int au_do_flush(struct file *file, fl_owner_t id, ++ int (*flush)(struct file *file, fl_owner_t id)); ++ ++/* poll.c */ ++#ifdef CONFIG_AUFS_POLL ++__poll_t aufs_poll(struct file *file, struct poll_table_struct *pt); ++#endif ++ ++#ifdef CONFIG_AUFS_BR_HFSPLUS ++/* hfsplus.c */ ++struct file *au_h_open_pre(struct dentry *dentry, aufs_bindex_t bindex, ++ int force_wr); ++void au_h_open_post(struct dentry *dentry, aufs_bindex_t bindex, ++ struct file *h_file); ++#else ++AuStub(struct file *, au_h_open_pre, return NULL, struct dentry *dentry, ++ aufs_bindex_t bindex, int force_wr) ++AuStubVoid(au_h_open_post, struct dentry *dentry, aufs_bindex_t bindex, ++ struct file *h_file); ++#endif ++ ++/* f_op.c */ ++extern const struct file_operations aufs_file_fop; ++int au_do_open_nondir(struct file *file, int flags, struct file *h_file); ++int aufs_release_nondir(struct inode *inode __maybe_unused, struct file *file); ++struct file *au_read_pre(struct file *file, int keep_fi, unsigned int lsc); ++ ++/* finfo.c */ ++void au_hfput(struct au_hfile *hf, int execed); ++void au_set_h_fptr(struct file *file, aufs_bindex_t bindex, ++ struct file *h_file); ++ ++void au_update_figen(struct file *file); ++struct au_fidir *au_fidir_alloc(struct super_block *sb); ++int au_fidir_realloc(struct au_finfo *finfo, int nbr, int may_shrink); ++ ++void au_fi_init_once(void *_fi); ++void au_finfo_fin(struct file *file); ++int au_finfo_init(struct file *file, struct au_fidir *fidir); ++ ++/* ioctl.c */ ++long aufs_ioctl_nondir(struct file *file, unsigned int cmd, unsigned long arg); ++#ifdef CONFIG_COMPAT ++long aufs_compat_ioctl_dir(struct file *file, unsigned int cmd, ++ unsigned long arg); ++long aufs_compat_ioctl_nondir(struct file *file, unsigned int cmd, ++ unsigned long arg); ++#endif ++ ++/* ---------------------------------------------------------------------- */ ++ ++static inline struct au_finfo *au_fi(struct file *file) ++{ ++ return file->private_data; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++#define fi_read_lock(f) au_rw_read_lock(&au_fi(f)->fi_rwsem) ++#define fi_write_lock(f) au_rw_write_lock(&au_fi(f)->fi_rwsem) ++#define fi_read_trylock(f) au_rw_read_trylock(&au_fi(f)->fi_rwsem) ++#define fi_write_trylock(f) au_rw_write_trylock(&au_fi(f)->fi_rwsem) ++/* ++#define fi_read_trylock_nested(f) \ ++ au_rw_read_trylock_nested(&au_fi(f)->fi_rwsem) ++#define fi_write_trylock_nested(f) \ ++ au_rw_write_trylock_nested(&au_fi(f)->fi_rwsem) ++*/ ++ ++#define fi_read_unlock(f) au_rw_read_unlock(&au_fi(f)->fi_rwsem) ++#define fi_write_unlock(f) au_rw_write_unlock(&au_fi(f)->fi_rwsem) ++#define fi_downgrade_lock(f) au_rw_dgrade_lock(&au_fi(f)->fi_rwsem) ++ ++/* lock subclass for finfo */ ++enum { ++ AuLsc_FI_1, ++ AuLsc_FI_2 ++}; ++ ++static inline void fi_read_lock_nested(struct file *f, unsigned int lsc) ++{ ++ au_rw_read_lock_nested(&au_fi(f)->fi_rwsem, lsc); ++} ++ ++static inline void fi_write_lock_nested(struct file *f, unsigned int lsc) ++{ ++ au_rw_write_lock_nested(&au_fi(f)->fi_rwsem, lsc); ++} ++ ++/* ++ * fi_read_lock_1, fi_write_lock_1, ++ * fi_read_lock_2, fi_write_lock_2 ++ */ ++#define AuReadLockFunc(name) \ ++static inline void fi_read_lock_##name(struct file *f) \ ++{ fi_read_lock_nested(f, AuLsc_FI_##name); } ++ ++#define AuWriteLockFunc(name) \ ++static inline void fi_write_lock_##name(struct file *f) \ ++{ fi_write_lock_nested(f, AuLsc_FI_##name); } ++ ++#define AuRWLockFuncs(name) \ ++ AuReadLockFunc(name) \ ++ AuWriteLockFunc(name) ++ ++AuRWLockFuncs(1); ++AuRWLockFuncs(2); ++ ++#undef AuReadLockFunc ++#undef AuWriteLockFunc ++#undef AuRWLockFuncs ++ ++#define FiMustNoWaiters(f) AuRwMustNoWaiters(&au_fi(f)->fi_rwsem) ++#define FiMustAnyLock(f) AuRwMustAnyLock(&au_fi(f)->fi_rwsem) ++#define FiMustWriteLock(f) AuRwMustWriteLock(&au_fi(f)->fi_rwsem) ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* todo: hard/soft set? */ ++static inline aufs_bindex_t au_fbtop(struct file *file) ++{ ++ FiMustAnyLock(file); ++ return au_fi(file)->fi_btop; ++} ++ ++static inline aufs_bindex_t au_fbbot_dir(struct file *file) ++{ ++ FiMustAnyLock(file); ++ AuDebugOn(!au_fi(file)->fi_hdir); ++ return au_fi(file)->fi_hdir->fd_bbot; ++} ++ ++static inline struct au_vdir *au_fvdir_cache(struct file *file) ++{ ++ FiMustAnyLock(file); ++ AuDebugOn(!au_fi(file)->fi_hdir); ++ return au_fi(file)->fi_hdir->fd_vdir_cache; ++} ++ ++static inline void au_set_fbtop(struct file *file, aufs_bindex_t bindex) ++{ ++ FiMustWriteLock(file); ++ au_fi(file)->fi_btop = bindex; ++} ++ ++static inline void au_set_fbbot_dir(struct file *file, aufs_bindex_t bindex) ++{ ++ FiMustWriteLock(file); ++ AuDebugOn(!au_fi(file)->fi_hdir); ++ au_fi(file)->fi_hdir->fd_bbot = bindex; ++} ++ ++static inline void au_set_fvdir_cache(struct file *file, ++ struct au_vdir *vdir_cache) ++{ ++ FiMustWriteLock(file); ++ AuDebugOn(!au_fi(file)->fi_hdir); ++ au_fi(file)->fi_hdir->fd_vdir_cache = vdir_cache; ++} ++ ++static inline struct file *au_hf_top(struct file *file) ++{ ++ FiMustAnyLock(file); ++ AuDebugOn(au_fi(file)->fi_hdir); ++ return au_fi(file)->fi_htop.hf_file; ++} ++ ++static inline struct file *au_hf_dir(struct file *file, aufs_bindex_t bindex) ++{ ++ FiMustAnyLock(file); ++ AuDebugOn(!au_fi(file)->fi_hdir); ++ return au_fi(file)->fi_hdir->fd_hfile[0 + bindex].hf_file; ++} ++ ++/* todo: memory barrier? */ ++static inline unsigned int au_figen(struct file *f) ++{ ++ return atomic_read(&au_fi(f)->fi_generation); ++} ++ ++static inline void au_set_mmapped(struct file *f) ++{ ++ if (atomic_inc_return(&au_fi(f)->fi_mmapped)) ++ return; ++ pr_warn("fi_mmapped wrapped around\n"); ++ while (!atomic_inc_return(&au_fi(f)->fi_mmapped)) ++ ; ++} ++ ++static inline void au_unset_mmapped(struct file *f) ++{ ++ atomic_dec(&au_fi(f)->fi_mmapped); ++} ++ ++static inline int au_test_mmapped(struct file *f) ++{ ++ return atomic_read(&au_fi(f)->fi_mmapped); ++} ++ ++/* customize vma->vm_file */ ++ ++static inline void au_do_vm_file_reset(struct vm_area_struct *vma, ++ struct file *file) ++{ ++ struct file *f; ++ ++ f = vma->vm_file; ++ get_file(file); ++ vma->vm_file = file; ++ fput(f); ++} ++ ++#ifdef CONFIG_MMU ++#define AuDbgVmRegion(file, vma) do {} while (0) ++ ++static inline void au_vm_file_reset(struct vm_area_struct *vma, ++ struct file *file) ++{ ++ au_do_vm_file_reset(vma, file); ++} ++#else ++#define AuDbgVmRegion(file, vma) \ ++ AuDebugOn((vma)->vm_region && (vma)->vm_region->vm_file != (file)) ++ ++static inline void au_vm_file_reset(struct vm_area_struct *vma, ++ struct file *file) ++{ ++ struct file *f; ++ ++ au_do_vm_file_reset(vma, file); ++ f = vma->vm_region->vm_file; ++ get_file(file); ++ vma->vm_region->vm_file = file; ++ fput(f); ++} ++#endif /* CONFIG_MMU */ ++ ++/* handle vma->vm_prfile */ ++static inline void au_vm_prfile_set(struct vm_area_struct *vma, ++ struct file *file) ++{ ++ get_file(file); ++ vma->vm_prfile = file; ++#ifndef CONFIG_MMU ++ get_file(file); ++ vma->vm_region->vm_prfile = file; ++#endif ++} ++ ++#endif /* __KERNEL__ */ ++#endif /* __AUFS_FILE_H__ */ +diff --git a/fs/aufs/finfo.c b/fs/aufs/finfo.c +new file mode 100644 +index 000000000000..7da7b286c006 +--- /dev/null ++++ b/fs/aufs/finfo.c +@@ -0,0 +1,149 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * file private data ++ */ ++ ++#include "aufs.h" ++ ++void au_hfput(struct au_hfile *hf, int execed) ++{ ++ if (execed) ++ allow_write_access(hf->hf_file); ++ fput(hf->hf_file); ++ hf->hf_file = NULL; ++ au_lcnt_dec(&hf->hf_br->br_nfiles); ++ hf->hf_br = NULL; ++} ++ ++void au_set_h_fptr(struct file *file, aufs_bindex_t bindex, struct file *val) ++{ ++ struct au_finfo *finfo = au_fi(file); ++ struct au_hfile *hf; ++ struct au_fidir *fidir; ++ ++ fidir = finfo->fi_hdir; ++ if (!fidir) { ++ AuDebugOn(finfo->fi_btop != bindex); ++ hf = &finfo->fi_htop; ++ } else ++ hf = fidir->fd_hfile + bindex; ++ ++ if (hf && hf->hf_file) ++ au_hfput(hf, vfsub_file_execed(file)); ++ if (val) { ++ FiMustWriteLock(file); ++ AuDebugOn(IS_ERR_OR_NULL(file->f_path.dentry)); ++ hf->hf_file = val; ++ hf->hf_br = au_sbr(file->f_path.dentry->d_sb, bindex); ++ } ++} ++ ++void au_update_figen(struct file *file) ++{ ++ atomic_set(&au_fi(file)->fi_generation, au_digen(file->f_path.dentry)); ++ /* smp_mb(); */ /* atomic_set */ ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++struct au_fidir *au_fidir_alloc(struct super_block *sb) ++{ ++ struct au_fidir *fidir; ++ int nbr; ++ ++ nbr = au_sbbot(sb) + 1; ++ if (nbr < 2) ++ nbr = 2; /* initial allocate for 2 branches */ ++ fidir = kzalloc(au_fidir_sz(nbr), GFP_NOFS); ++ if (fidir) { ++ fidir->fd_bbot = -1; ++ fidir->fd_nent = nbr; ++ } ++ ++ return fidir; ++} ++ ++int au_fidir_realloc(struct au_finfo *finfo, int nbr, int may_shrink) ++{ ++ int err; ++ struct au_fidir *fidir, *p; ++ ++ AuRwMustWriteLock(&finfo->fi_rwsem); ++ fidir = finfo->fi_hdir; ++ AuDebugOn(!fidir); ++ ++ err = -ENOMEM; ++ p = au_kzrealloc(fidir, au_fidir_sz(fidir->fd_nent), au_fidir_sz(nbr), ++ GFP_NOFS, may_shrink); ++ if (p) { ++ p->fd_nent = nbr; ++ finfo->fi_hdir = p; ++ err = 0; ++ } ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++void au_finfo_fin(struct file *file) ++{ ++ struct au_finfo *finfo; ++ ++ au_lcnt_dec(&au_sbi(file->f_path.dentry->d_sb)->si_nfiles); ++ ++ finfo = au_fi(file); ++ AuDebugOn(finfo->fi_hdir); ++ AuRwDestroy(&finfo->fi_rwsem); ++ au_cache_free_finfo(finfo); ++} ++ ++void au_fi_init_once(void *_finfo) ++{ ++ struct au_finfo *finfo = _finfo; ++ ++ au_rw_init(&finfo->fi_rwsem); ++} ++ ++int au_finfo_init(struct file *file, struct au_fidir *fidir) ++{ ++ int err; ++ struct au_finfo *finfo; ++ struct dentry *dentry; ++ ++ err = -ENOMEM; ++ dentry = file->f_path.dentry; ++ finfo = au_cache_alloc_finfo(); ++ if (unlikely(!finfo)) ++ goto out; ++ ++ err = 0; ++ au_lcnt_inc(&au_sbi(dentry->d_sb)->si_nfiles); ++ au_rw_write_lock(&finfo->fi_rwsem); ++ finfo->fi_btop = -1; ++ finfo->fi_hdir = fidir; ++ atomic_set(&finfo->fi_generation, au_digen(dentry)); ++ /* smp_mb(); */ /* atomic_set */ ++ ++ file->private_data = finfo; ++ ++out: ++ return err; ++} +diff --git a/fs/aufs/fsctx.c b/fs/aufs/fsctx.c +new file mode 100644 +index 000000000000..e14fe4d381c5 +--- /dev/null ++++ b/fs/aufs/fsctx.c +@@ -0,0 +1,1242 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * fs context, aka new mount api ++ */ ++ ++#include <linux/fs_context.h> ++#include "aufs.h" ++ ++struct au_fsctx_opts { ++ aufs_bindex_t bindex; ++ unsigned char skipped; ++ struct au_opt *opt, *opt_tail; ++ struct super_block *sb; ++ struct au_sbinfo *sbinfo; ++ struct au_opts opts; ++}; ++ ++/* stop extra interpretation of errno in mount(8), and strange error messages */ ++static int cvt_err(int err) ++{ ++ AuTraceErr(err); ++ ++ switch (err) { ++ case -ENOENT: ++ case -ENOTDIR: ++ case -EEXIST: ++ case -EIO: ++ err = -EINVAL; ++ } ++ return err; ++} ++ ++static int au_fsctx_reconfigure(struct fs_context *fc) ++{ ++ int err, do_dx; ++ unsigned int mntflags; ++ struct dentry *root; ++ struct super_block *sb; ++ struct inode *inode; ++ struct au_fsctx_opts *a = fc->fs_private; ++ ++ AuDbg("fc %p\n", fc); ++ ++ root = fc->root; ++ sb = root->d_sb; ++ err = si_write_lock(sb, AuLock_FLUSH | AuLock_NOPLM); ++ if (!err) { ++ di_write_lock_child(root); ++ err = au_opts_verify(sb, fc->sb_flags, /*pending*/0); ++ aufs_write_unlock(root); ++ } ++ ++ inode = d_inode(root); ++ inode_lock(inode); ++ err = si_write_lock(sb, AuLock_FLUSH | AuLock_NOPLM); ++ if (unlikely(err)) ++ goto out; ++ di_write_lock_child(root); ++ ++ /* au_opts_remount() may return an error */ ++ err = au_opts_remount(sb, &a->opts); ++ ++ if (au_ftest_opts(a->opts.flags, REFRESH)) ++ au_remount_refresh(sb, au_ftest_opts(a->opts.flags, ++ REFRESH_IDOP)); ++ ++ if (au_ftest_opts(a->opts.flags, REFRESH_DYAOP)) { ++ mntflags = au_mntflags(sb); ++ do_dx = !!au_opt_test(mntflags, DIO); ++ au_dy_arefresh(do_dx); ++ } ++ ++ au_fhsm_wrote_all(sb, /*force*/1); /* ?? */ ++ aufs_write_unlock(root); ++ ++out: ++ inode_unlock(inode); ++ err = cvt_err(err); ++ AuTraceErr(err); ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int au_fsctx_fill_super(struct super_block *sb, struct fs_context *fc) ++{ ++ int err; ++ struct au_fsctx_opts *a = fc->fs_private; ++ struct au_sbinfo *sbinfo = a->sbinfo; ++ struct dentry *root; ++ struct inode *inode; ++ ++ sbinfo->si_sb = sb; ++ sb->s_fs_info = sbinfo; ++ kobject_get(&sbinfo->si_kobj); ++ ++ __si_write_lock(sb); ++ si_pid_set(sb); ++ au_sbilist_add(sb); ++ ++ /* all timestamps always follow the ones on the branch */ ++ sb->s_flags |= SB_NOATIME | SB_NODIRATIME; ++ sb->s_flags |= SB_I_VERSION; /* do we really need this? */ ++ sb->s_op = &aufs_sop; ++ sb->s_d_op = &aufs_dop; ++ sb->s_magic = AUFS_SUPER_MAGIC; ++ sb->s_maxbytes = 0; ++ sb->s_stack_depth = 1; ++ au_export_init(sb); ++ au_xattr_init(sb); ++ ++ err = au_alloc_root(sb); ++ if (unlikely(err)) { ++ si_write_unlock(sb); ++ goto out; ++ } ++ root = sb->s_root; ++ inode = d_inode(root); ++ ii_write_lock_parent(inode); ++ aufs_write_unlock(root); ++ ++ /* lock vfs_inode first, then aufs. */ ++ inode_lock(inode); ++ aufs_write_lock(root); ++ err = au_opts_mount(sb, &a->opts); ++ AuTraceErr(err); ++ if (!err && au_ftest_si(sbinfo, NO_DREVAL)) { ++ sb->s_d_op = &aufs_dop_noreval; ++ /* infofc(fc, "%ps", sb->s_d_op); */ ++ pr_info("%ps\n", sb->s_d_op); ++ au_refresh_dop(root, /*force_reval*/0); ++ sbinfo->si_iop_array = aufs_iop_nogetattr; ++ au_refresh_iop(inode, /*force_getattr*/0); ++ } ++ aufs_write_unlock(root); ++ inode_unlock(inode); ++ if (!err) ++ goto out; /* success */ ++ ++ dput(root); ++ sb->s_root = NULL; ++ ++out: ++ if (unlikely(err)) ++ kobject_put(&sbinfo->si_kobj); ++ AuTraceErr(err); ++ err = cvt_err(err); ++ AuTraceErr(err); ++ return err; ++} ++ ++static int au_fsctx_get_tree(struct fs_context *fc) ++{ ++ int err; ++ ++ AuDbg("fc %p\n", fc); ++ err = get_tree_nodev(fc, au_fsctx_fill_super); ++ ++ AuTraceErr(err); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static void au_fsctx_dump(struct au_opts *opts) ++{ ++#ifdef CONFIG_AUFS_DEBUG ++ /* reduce stack space */ ++ union { ++ struct au_opt_add *add; ++ struct au_opt_del *del; ++ struct au_opt_mod *mod; ++ struct au_opt_xino *xino; ++ struct au_opt_xino_itrunc *xino_itrunc; ++ struct au_opt_wbr_create *create; ++ } u; ++ struct au_opt *opt; ++ ++ opt = opts->opt; ++ while (opt->type != Opt_tail) { ++ switch (opt->type) { ++ case Opt_add: ++ u.add = &opt->add; ++ AuDbg("add {b%d, %s, 0x%x, %p}\n", ++ u.add->bindex, u.add->pathname, u.add->perm, ++ u.add->path.dentry); ++ break; ++ case Opt_del: ++ fallthrough; ++ case Opt_idel: ++ u.del = &opt->del; ++ AuDbg("del {%s, %p}\n", ++ u.del->pathname, u.del->h_path.dentry); ++ break; ++ case Opt_mod: ++ fallthrough; ++ case Opt_imod: ++ u.mod = &opt->mod; ++ AuDbg("mod {%s, 0x%x, %p}\n", ++ u.mod->path, u.mod->perm, u.mod->h_root); ++ break; ++ case Opt_append: ++ u.add = &opt->add; ++ AuDbg("append {b%d, %s, 0x%x, %p}\n", ++ u.add->bindex, u.add->pathname, u.add->perm, ++ u.add->path.dentry); ++ break; ++ case Opt_prepend: ++ u.add = &opt->add; ++ AuDbg("prepend {b%d, %s, 0x%x, %p}\n", ++ u.add->bindex, u.add->pathname, u.add->perm, ++ u.add->path.dentry); ++ break; ++ ++ case Opt_dirwh: ++ AuDbg("dirwh %d\n", opt->dirwh); ++ break; ++ case Opt_rdcache: ++ AuDbg("rdcache %d\n", opt->rdcache); ++ break; ++ case Opt_rdblk: ++ AuDbg("rdblk %d\n", opt->rdblk); ++ break; ++ case Opt_rdhash: ++ AuDbg("rdhash %u\n", opt->rdhash); ++ break; ++ ++ case Opt_xino: ++ u.xino = &opt->xino; ++ AuDbg("xino {%s %pD}\n", u.xino->path, u.xino->file); ++ break; ++ ++#define au_fsctx_TF(name) \ ++ case Opt_##name: \ ++ if (opt->tf) \ ++ AuLabel(name); \ ++ else \ ++ AuLabel(no##name); \ ++ break; ++ ++ /* simple true/false flag */ ++ au_fsctx_TF(trunc_xino); ++ au_fsctx_TF(trunc_xib); ++ au_fsctx_TF(dirperm1); ++ au_fsctx_TF(plink); ++ au_fsctx_TF(shwh); ++ au_fsctx_TF(dio); ++ au_fsctx_TF(warn_perm); ++ au_fsctx_TF(verbose); ++ au_fsctx_TF(sum); ++ au_fsctx_TF(dirren); ++ au_fsctx_TF(acl); ++#undef au_fsctx_TF ++ ++ case Opt_trunc_xino_path: ++ fallthrough; ++ case Opt_itrunc_xino: ++ u.xino_itrunc = &opt->xino_itrunc; ++ AuDbg("trunc_xino %d\n", u.xino_itrunc->bindex); ++ break; ++ case Opt_noxino: ++ AuLabel(noxino); ++ break; ++ ++ case Opt_list_plink: ++ AuLabel(list_plink); ++ break; ++ case Opt_udba: ++ AuDbg("udba %d, %s\n", ++ opt->udba, au_optstr_udba(opt->udba)); ++ break; ++ case Opt_diropq_a: ++ AuLabel(diropq_a); ++ break; ++ case Opt_diropq_w: ++ AuLabel(diropq_w); ++ break; ++ case Opt_wsum: ++ AuLabel(wsum); ++ break; ++ case Opt_wbr_create: ++ u.create = &opt->wbr_create; ++ AuDbg("create %d, %s\n", u.create->wbr_create, ++ au_optstr_wbr_create(u.create->wbr_create)); ++ switch (u.create->wbr_create) { ++ case AuWbrCreate_MFSV: ++ fallthrough; ++ case AuWbrCreate_PMFSV: ++ AuDbg("%d sec\n", u.create->mfs_second); ++ break; ++ case AuWbrCreate_MFSRR: ++ fallthrough; ++ case AuWbrCreate_TDMFS: ++ AuDbg("%llu watermark\n", ++ u.create->mfsrr_watermark); ++ break; ++ case AuWbrCreate_MFSRRV: ++ fallthrough; ++ case AuWbrCreate_TDMFSV: ++ fallthrough; ++ case AuWbrCreate_PMFSRRV: ++ AuDbg("%llu watermark, %d sec\n", ++ u.create->mfsrr_watermark, ++ u.create->mfs_second); ++ break; ++ } ++ break; ++ case Opt_wbr_copyup: ++ AuDbg("copyup %d, %s\n", opt->wbr_copyup, ++ au_optstr_wbr_copyup(opt->wbr_copyup)); ++ break; ++ case Opt_fhsm_sec: ++ AuDbg("fhsm_sec %u\n", opt->fhsm_second); ++ break; ++ ++ default: ++ AuDbg("type %d\n", opt->type); ++ BUG(); ++ } ++ opt++; ++ } ++#endif ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * For conditionally compiled mount options. ++ * Instead of fsparam_flag_no(), use this macro to distinguish ignore_silent. ++ */ ++#define au_ignore_flag(name, action) \ ++ fsparam_flag(name, action), \ ++ fsparam_flag("no" name, Opt_ignore_silent) ++ ++const struct fs_parameter_spec aufs_fsctx_paramspec[] = { ++ fsparam_string("br", Opt_br), ++ ++ /* "add=%d:%s" or "ins=%d:%s" */ ++ fsparam_string("add", Opt_add), ++ fsparam_string("ins", Opt_add), ++ fsparam_path("append", Opt_append), ++ fsparam_path("prepend", Opt_prepend), ++ ++ fsparam_path("del", Opt_del), ++ /* fsparam_s32("idel", Opt_idel), */ ++ fsparam_path("mod", Opt_mod), ++ /* fsparam_string("imod", Opt_imod), */ ++ ++ fsparam_s32("dirwh", Opt_dirwh), ++ ++ fsparam_path("xino", Opt_xino), ++ fsparam_flag("noxino", Opt_noxino), ++ fsparam_flag_no("trunc_xino", Opt_trunc_xino), ++ /* "trunc_xino_v=%d:%d" */ ++ /* fsparam_string("trunc_xino_v", Opt_trunc_xino_v), */ ++ fsparam_path("trunc_xino", Opt_trunc_xino_path), ++ fsparam_s32("itrunc_xino", Opt_itrunc_xino), ++ /* fsparam_path("zxino", Opt_zxino), */ ++ fsparam_flag_no("trunc_xib", Opt_trunc_xib), ++ ++#ifdef CONFIG_PROC_FS ++ fsparam_flag_no("plink", Opt_plink), ++#else ++ au_ignore_flag("plink", Opt_ignore), ++#endif ++ ++#ifdef CONFIG_AUFS_DEBUG ++ fsparam_flag("list_plink", Opt_list_plink), ++#endif ++ ++ fsparam_string("udba", Opt_udba), ++ ++ fsparam_flag_no("dio", Opt_dio), ++ ++#ifdef CONFIG_AUFS_DIRREN ++ fsparam_flag_no("dirren", Opt_dirren), ++#else ++ au_ignore_flag("dirren", Opt_ignore), ++#endif ++ ++#ifdef CONFIG_AUFS_FHSM ++ fsparam_s32("fhsm_sec", Opt_fhsm_sec), ++#else ++ fsparam_s32("fhsm_sec", Opt_ignore), ++#endif ++ ++ /* always | a | whiteouted | w */ ++ fsparam_string("diropq", Opt_diropq), ++ ++ fsparam_flag_no("warn_perm", Opt_warn_perm), ++ ++#ifdef CONFIG_AUFS_SHWH ++ fsparam_flag_no("shwh", Opt_shwh), ++#else ++ au_ignore_flag("shwh", Opt_err), ++#endif ++ ++ fsparam_flag_no("dirperm1", Opt_dirperm1), ++ ++ fsparam_flag_no("verbose", Opt_verbose), ++ fsparam_flag("v", Opt_verbose), ++ fsparam_flag("quiet", Opt_noverbose), ++ fsparam_flag("q", Opt_noverbose), ++ /* user-space may handle this */ ++ fsparam_flag("silent", Opt_noverbose), ++ ++ fsparam_flag_no("sum", Opt_sum), ++ fsparam_flag("wsum", Opt_wsum), ++ ++ fsparam_s32("rdcache", Opt_rdcache), ++ /* "def" or s32 */ ++ fsparam_string("rdblk", Opt_rdblk), ++ /* "def" or s32 */ ++ fsparam_string("rdhash", Opt_rdhash), ++ ++ fsparam_string("create", Opt_wbr_create), ++ fsparam_string("create_policy", Opt_wbr_create), ++ fsparam_string("cpup", Opt_wbr_copyup), ++ fsparam_string("copyup", Opt_wbr_copyup), ++ fsparam_string("copyup_policy", Opt_wbr_copyup), ++ ++ /* generic VFS flag */ ++#ifdef CONFIG_FS_POSIX_ACL ++ fsparam_flag_no("acl", Opt_acl), ++#else ++ au_ignore_flag("acl", Opt_ignore), ++#endif ++ ++ /* internal use for the scripts */ ++ fsparam_string("si", Opt_ignore_silent), ++ ++ /* obsoleted, keep them temporary */ ++ fsparam_flag("nodlgt", Opt_ignore_silent), ++ fsparam_flag("clean_plink", Opt_ignore), ++ fsparam_string("dirs", Opt_br), ++ fsparam_u32("debug", Opt_ignore), ++ /* "whiteout" or "all" */ ++ fsparam_string("delete", Opt_ignore), ++ fsparam_string("imap", Opt_ignore), ++ ++ /* temporary workaround, due to old mount(8)? */ ++ fsparam_flag("relatime", Opt_ignore_silent), ++ ++ {} ++}; ++ ++static int au_fsctx_parse_do_add(struct fs_context *fc, struct au_opt *opt, ++ char *brspec, size_t speclen, ++ aufs_bindex_t bindex) ++{ ++ int err; ++ char *p; ++ ++ AuDbg("brspec %s\n", brspec); ++ ++ err = -ENOMEM; ++ if (!speclen) ++ speclen = strlen(brspec); ++ /* will be freed by au_fsctx_free() */ ++ p = kmemdup_nul(brspec, speclen, GFP_NOFS); ++ if (unlikely(!p)) { ++ errorfc(fc, "failed in %s", brspec); ++ goto out; ++ } ++ err = au_opt_add(opt, p, fc->sb_flags, bindex); ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++static int au_fsctx_parse_br(struct fs_context *fc, char *brspec) ++{ ++ int err; ++ char *p; ++ struct au_fsctx_opts *a = fc->fs_private; ++ struct au_opt *opt = a->opt; ++ aufs_bindex_t bindex = a->bindex; ++ ++ AuDbg("brspec %s\n", brspec); ++ ++ err = -EINVAL; ++ while ((p = strsep(&brspec, ":")) && *p) { ++ err = au_fsctx_parse_do_add(fc, opt, p, /*len*/0, bindex); ++ AuTraceErr(err); ++ if (unlikely(err)) ++ break; ++ bindex++; ++ opt++; ++ if (unlikely(opt > a->opt_tail)) { ++ err = -E2BIG; ++ bindex--; ++ opt--; ++ break; ++ } ++ opt->type = Opt_tail; ++ a->skipped = 1; ++ } ++ a->bindex = bindex; ++ a->opt = opt; ++ ++ AuTraceErr(err); ++ return err; ++} ++ ++static int au_fsctx_parse_add(struct fs_context *fc, char *addspec) ++{ ++ int err, n; ++ char *p; ++ struct au_fsctx_opts *a = fc->fs_private; ++ struct au_opt *opt = a->opt; ++ ++ err = -EINVAL; ++ p = strchr(addspec, ':'); ++ if (unlikely(!p)) { ++ errorfc(fc, "bad arg in %s", addspec); ++ goto out; ++ } ++ *p++ = '\0'; ++ err = kstrtoint(addspec, 0, &n); ++ if (unlikely(err)) { ++ errorfc(fc, "bad integer in %s", addspec); ++ goto out; ++ } ++ AuDbg("n %d\n", n); ++ err = au_fsctx_parse_do_add(fc, opt, p, /*len*/0, n); ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++static int au_fsctx_parse_del(struct fs_context *fc, struct au_opt_del *del, ++ struct fs_parameter *param) ++{ ++ int err; ++ ++ err = -ENOMEM; ++ /* will be freed by au_fsctx_free() */ ++ del->pathname = kmemdup_nul(param->string, param->size, GFP_NOFS); ++ if (unlikely(!del->pathname)) ++ goto out; ++ AuDbg("del %s\n", del->pathname); ++ err = vfsub_kern_path(del->pathname, AuOpt_LkupDirFlags, &del->h_path); ++ if (unlikely(err)) ++ errorfc(fc, "lookup failed %s (%d)", del->pathname, err); ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++#if 0 /* reserved for future use */ ++static int au_fsctx_parse_idel(struct fs_context *fc, struct au_opt_del *del, ++ aufs_bindex_t bindex) ++{ ++ int err; ++ struct super_block *sb; ++ struct dentry *root; ++ struct au_fsctx_opts *a = fc->fs_private; ++ ++ sb = a->sb; ++ AuDebugOn(!sb); ++ ++ err = -EINVAL; ++ root = sb->s_root; ++ aufs_read_lock(root, AuLock_FLUSH); ++ if (bindex < 0 || au_sbbot(sb) < bindex) { ++ errorfc(fc, "out of bounds, %d", bindex); ++ goto out; ++ } ++ ++ err = 0; ++ del->h_path.dentry = dget(au_h_dptr(root, bindex)); ++ del->h_path.mnt = mntget(au_sbr_mnt(sb, bindex)); ++ ++out: ++ aufs_read_unlock(root, !AuLock_IR); ++ AuTraceErr(err); ++ return err; ++} ++#endif ++ ++static int au_fsctx_parse_mod(struct fs_context *fc, struct au_opt_mod *mod, ++ struct fs_parameter *param) ++{ ++ int err; ++ struct path path; ++ char *p; ++ ++ err = -ENOMEM; ++ /* will be freed by au_fsctx_free() */ ++ mod->path = kmemdup_nul(param->string, param->size, GFP_NOFS); ++ if (unlikely(!mod->path)) ++ goto out; ++ ++ err = -EINVAL; ++ p = strchr(mod->path, '='); ++ if (unlikely(!p)) { ++ errorfc(fc, "no permission %s", mod->path); ++ goto out; ++ } ++ ++ *p++ = 0; ++ err = vfsub_kern_path(mod->path, AuOpt_LkupDirFlags, &path); ++ if (unlikely(err)) { ++ errorfc(fc, "lookup failed %s (%d)", mod->path, err); ++ goto out; ++ } ++ ++ mod->perm = au_br_perm_val(p); ++ AuDbg("mod path %s, perm 0x%x, %s", mod->path, mod->perm, p); ++ mod->h_root = dget(path.dentry); ++ path_put(&path); ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++#if 0 /* reserved for future use */ ++static int au_fsctx_parse_imod(struct fs_context *fc, struct au_opt_mod *mod, ++ char *ibrspec) ++{ ++ int err, n; ++ char *p; ++ struct super_block *sb; ++ struct dentry *root; ++ struct au_fsctx_opts *a = fc->fs_private; ++ ++ sb = a->sb; ++ AuDebugOn(!sb); ++ ++ err = -EINVAL; ++ p = strchr(ibrspec, ':'); ++ if (unlikely(!p)) { ++ errorfc(fc, "no index, %s", ibrspec); ++ goto out; ++ } ++ *p++ = '\0'; ++ err = kstrtoint(ibrspec, 0, &n); ++ if (unlikely(err)) { ++ errorfc(fc, "bad integer in %s", ibrspec); ++ goto out; ++ } ++ AuDbg("n %d\n", n); ++ ++ root = sb->s_root; ++ aufs_read_lock(root, AuLock_FLUSH); ++ if (n < 0 || au_sbbot(sb) < n) { ++ errorfc(fc, "out of bounds, %d", bindex); ++ goto out_root; ++ } ++ ++ err = 0; ++ mod->perm = au_br_perm_val(p); ++ AuDbg("mod path %s, perm 0x%x, %s\n", ++ mod->path, mod->perm, p); ++ mod->h_root = dget(au_h_dptr(root, bindex)); ++ ++out_root: ++ aufs_read_unlock(root, !AuLock_IR); ++out: ++ AuTraceErr(err); ++ return err; ++} ++#endif ++ ++static int au_fsctx_parse_xino(struct fs_context *fc, ++ struct au_opt_xino *xino, ++ struct fs_parameter *param) ++{ ++ int err; ++ struct au_fsctx_opts *a = fc->fs_private; ++ ++ err = -ENOMEM; ++ /* will be freed by au_opts_free() */ ++ xino->path = kmemdup_nul(param->string, param->size, GFP_NOFS); ++ if (unlikely(!xino->path)) ++ goto out; ++ AuDbg("path %s\n", xino->path); ++ ++ xino->file = au_xino_create(a->sb, xino->path, /*silent*/0, ++ /*wbrtop*/0); ++ err = PTR_ERR(xino->file); ++ if (IS_ERR(xino->file)) { ++ xino->file = NULL; ++ goto out; ++ } ++ ++ err = 0; ++ if (unlikely(a->sb && xino->file->f_path.dentry->d_sb == a->sb)) { ++ err = -EINVAL; ++ errorfc(fc, "%s must be outside", xino->path); ++ } ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++static ++int au_fsctx_parse_xino_itrunc_path(struct fs_context *fc, ++ struct au_opt_xino_itrunc *xino_itrunc, ++ char *pathname) ++{ ++ int err; ++ aufs_bindex_t bbot, bindex; ++ struct path path; ++ struct dentry *root; ++ struct au_fsctx_opts *a = fc->fs_private; ++ ++ AuDebugOn(!a->sb); ++ ++ err = vfsub_kern_path(pathname, AuOpt_LkupDirFlags, &path); ++ if (unlikely(err)) { ++ errorfc(fc, "lookup failed %s (%d)", pathname, err); ++ goto out; ++ } ++ ++ xino_itrunc->bindex = -1; ++ root = a->sb->s_root; ++ aufs_read_lock(root, AuLock_FLUSH); ++ bbot = au_sbbot(a->sb); ++ for (bindex = 0; bindex <= bbot; bindex++) { ++ if (au_h_dptr(root, bindex) == path.dentry) { ++ xino_itrunc->bindex = bindex; ++ break; ++ } ++ } ++ aufs_read_unlock(root, !AuLock_IR); ++ path_put(&path); ++ ++ if (unlikely(xino_itrunc->bindex < 0)) { ++ err = -EINVAL; ++ errorfc(fc, "no such branch %s", pathname); ++ } ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++static int au_fsctx_parse_xino_itrunc(struct fs_context *fc, ++ struct au_opt_xino_itrunc *xino_itrunc, ++ unsigned int bindex) ++{ ++ int err; ++ aufs_bindex_t bbot; ++ struct super_block *sb; ++ struct au_fsctx_opts *a = fc->fs_private; ++ ++ sb = a->sb; ++ AuDebugOn(!sb); ++ ++ err = 0; ++ si_noflush_read_lock(sb); ++ bbot = au_sbbot(sb); ++ si_read_unlock(sb); ++ if (bindex <= bbot) ++ xino_itrunc->bindex = bindex; ++ else { ++ err = -EINVAL; ++ errorfc(fc, "out of bounds, %u", bindex); ++ } ++ ++ AuTraceErr(err); ++ return err; ++} ++ ++static int au_fsctx_parse_param(struct fs_context *fc, struct fs_parameter *param) ++{ ++ int err, token; ++ struct fs_parse_result result; ++ struct au_fsctx_opts *a = fc->fs_private; ++ struct au_opt *opt = a->opt; ++ ++ AuDbg("fc %p, param {key %s, string %s}\n", ++ fc, param->key, param->string); ++ err = fs_parse(fc, aufs_fsctx_paramspec, param, &result); ++ if (unlikely(err < 0)) ++ goto out; ++ token = err; ++ AuDbg("token %d, res{negated %d, uint64 %llu}\n", ++ token, result.negated, result.uint_64); ++ ++ err = -EINVAL; ++ a->skipped = 0; ++ switch (token) { ++ case Opt_br: ++ err = au_fsctx_parse_br(fc, param->string); ++ break; ++ case Opt_add: ++ err = au_fsctx_parse_add(fc, param->string); ++ break; ++ case Opt_append: ++ err = au_fsctx_parse_do_add(fc, opt, param->string, param->size, ++ /*dummy bindex*/1); ++ break; ++ case Opt_prepend: ++ err = au_fsctx_parse_do_add(fc, opt, param->string, param->size, ++ /*bindex*/0); ++ break; ++ ++ case Opt_del: ++ err = au_fsctx_parse_del(fc, &opt->del, param); ++ break; ++#if 0 /* reserved for future use */ ++ case Opt_idel: ++ if (!a->sb) { ++ err = 0; ++ a->skipped = 1; ++ break; ++ } ++ del->pathname = "(indexed)"; ++ err = au_opts_parse_idel(fc, &opt->del, result.uint_32); ++ break; ++#endif ++ ++ case Opt_mod: ++ err = au_fsctx_parse_mod(fc, &opt->mod, param); ++ break; ++#ifdef IMOD /* reserved for future use */ ++ case Opt_imod: ++ if (!a->sb) { ++ err = 0; ++ a->skipped = 1; ++ break; ++ } ++ u.mod->path = "(indexed)"; ++ err = au_opts_parse_imod(fc, &opt->mod, param->string); ++ break; ++#endif ++ ++ case Opt_xino: ++ err = au_fsctx_parse_xino(fc, &opt->xino, param); ++ break; ++ case Opt_trunc_xino_path: ++ if (!a->sb) { ++ errorfc(fc, "no such branch %s", param->string); ++ break; ++ } ++ err = au_fsctx_parse_xino_itrunc_path(fc, &opt->xino_itrunc, ++ param->string); ++ break; ++#if 0 ++ case Opt_trunc_xino_v: ++ if (!a->sb) { ++ err = 0; ++ a->skipped = 1; ++ break; ++ } ++ err = au_fsctx_parse_xino_itrunc_path(fc, &opt->xino_itrunc, ++ param->string); ++ break; ++#endif ++ case Opt_itrunc_xino: ++ if (!a->sb) { ++ errorfc(fc, "out of bounds %s", param->string); ++ break; ++ } ++ err = au_fsctx_parse_xino_itrunc(fc, &opt->xino_itrunc, ++ result.int_32); ++ break; ++ ++ case Opt_dirwh: ++ err = 0; ++ opt->dirwh = result.int_32; ++ break; ++ ++ case Opt_rdcache: ++ if (unlikely(result.int_32 > AUFS_RDCACHE_MAX)) { ++ errorfc(fc, "rdcache must be smaller than %d", ++ AUFS_RDCACHE_MAX); ++ break; ++ } ++ err = 0; ++ opt->rdcache = result.int_32; ++ break; ++ ++ case Opt_rdblk: ++ err = 0; ++ opt->rdblk = AUFS_RDBLK_DEF; ++ if (!strcmp(param->string, "def")) ++ break; ++ ++ err = kstrtoint(param->string, 0, &result.int_32); ++ if (unlikely(err)) { ++ errorfc(fc, "bad value in %s", param->key); ++ break; ++ } ++ err = -EINVAL; ++ if (unlikely(result.int_32 < 0 ++ || result.int_32 > KMALLOC_MAX_SIZE)) { ++ errorfc(fc, "bad value in %s", param->key); ++ break; ++ } ++ if (unlikely(result.int_32 && result.int_32 < NAME_MAX)) { ++ errorfc(fc, "rdblk must be larger than %d", NAME_MAX); ++ break; ++ } ++ err = 0; ++ opt->rdblk = result.int_32; ++ break; ++ ++ case Opt_rdhash: ++ err = 0; ++ opt->rdhash = AUFS_RDHASH_DEF; ++ if (!strcmp(param->string, "def")) ++ break; ++ ++ err = kstrtoint(param->string, 0, &result.int_32); ++ if (unlikely(err)) { ++ errorfc(fc, "bad value in %s", param->key); ++ break; ++ } ++ /* how about zero? */ ++ if (result.int_32 < 0 ++ || result.int_32 * sizeof(struct hlist_head) ++ > KMALLOC_MAX_SIZE) { ++ err = -EINVAL; ++ errorfc(fc, "bad integer in %s", param->key); ++ break; ++ } ++ opt->rdhash = result.int_32; ++ break; ++ ++ case Opt_diropq: ++ /* ++ * As other options, fs/aufs/opts.c can handle these strings by ++ * match_token(). But "diropq=" is deprecated now and will ++ * never have other value. So simple strcmp() is enough here. ++ */ ++ if (!strcmp(param->string, "a") || ++ !strcmp(param->string, "always")) { ++ err = 0; ++ opt->type = Opt_diropq_a; ++ } else if (!strcmp(param->string, "w") || ++ !strcmp(param->string, "whiteouted")) { ++ err = 0; ++ opt->type = Opt_diropq_w; ++ } else ++ errorfc(fc, "unknown value %s", param->string); ++ break; ++ ++ case Opt_udba: ++ opt->udba = au_udba_val(param->string); ++ if (opt->udba >= 0) ++ err = 0; ++ else ++ errorf(fc, "wrong value, %s", param->string); ++ break; ++ ++ case Opt_wbr_create: ++ opt->wbr_create.wbr_create ++ = au_wbr_create_val(param->string, &opt->wbr_create); ++ if (opt->wbr_create.wbr_create >= 0) ++ err = 0; ++ else ++ errorf(fc, "wrong value, %s", param->key); ++ break; ++ ++ case Opt_wbr_copyup: ++ opt->wbr_copyup = au_wbr_copyup_val(param->string); ++ if (opt->wbr_copyup >= 0) ++ err = 0; ++ else ++ errorfc(fc, "wrong value, %s", param->key); ++ break; ++ ++ case Opt_fhsm_sec: ++ if (unlikely(result.int_32 < 0)) { ++ errorfc(fc, "bad integer in %s\n", param->key); ++ break; ++ } ++ err = 0; ++ if (sysaufs_brs) ++ opt->fhsm_second = result.int_32; ++ else ++ warnfc(fc, "ignored %s %s", param->key, param->string); ++ break; ++ ++ /* simple true/false flag */ ++#define au_fsctx_TF(name) \ ++ case Opt_##name: \ ++ err = 0; \ ++ opt->tf = !result.negated; \ ++ break ++ au_fsctx_TF(trunc_xino); ++ au_fsctx_TF(trunc_xib); ++ au_fsctx_TF(dirperm1); ++ au_fsctx_TF(plink); ++ au_fsctx_TF(shwh); ++ au_fsctx_TF(dio); ++ au_fsctx_TF(warn_perm); ++ au_fsctx_TF(verbose); ++ au_fsctx_TF(sum); ++ au_fsctx_TF(dirren); ++ au_fsctx_TF(acl); ++#undef au_fsctx_TF ++ ++ case Opt_noverbose: ++ err = 0; ++ opt->type = Opt_verbose; ++ opt->tf = false; ++ break; ++ ++ case Opt_noxino: ++ fallthrough; ++ case Opt_list_plink: ++ fallthrough; ++ case Opt_wsum: ++ err = 0; ++ break; ++ ++ case Opt_ignore: ++ warnfc(fc, "ignored %s", param->key); ++ fallthrough; ++ case Opt_ignore_silent: ++ a->skipped = 1; ++ err = 0; ++ break; ++ default: ++ a->skipped = 1; ++ err = -ENOPARAM; ++ break; ++ } ++ if (unlikely(err)) ++ goto out; ++ if (a->skipped) ++ goto out; ++ ++ switch (token) { ++ case Opt_br: ++ fallthrough; ++ case Opt_noverbose: ++ fallthrough; ++ case Opt_diropq: ++ break; ++ default: ++ opt->type = token; ++ break; ++ } ++ opt++; ++ if (unlikely(opt > a->opt_tail)) { ++ err = -E2BIG; ++ opt--; ++ } ++ opt->type = Opt_tail; ++ a->opt = opt; ++ ++out: ++ return err; ++} ++ ++/* ++ * these options accept both 'name=val' and 'name:val' form. ++ * some accept optional '=' in its value. ++ * eg. br:/br1=rw:/br2=ro and br=/br1=rw:/br2=ro ++ */ ++static inline unsigned int is_colonopt(char *str) ++{ ++#define do_test(name) \ ++ if (!strncmp(str, name ":", sizeof(name))) \ ++ return sizeof(name) - 1 ++ do_test("br"); ++ do_test("add"); ++ do_test("ins"); ++ do_test("append"); ++ do_test("prepend"); ++ do_test("del"); ++ /* do_test("idel"); */ ++ do_test("mod"); ++ /* do_test("imod"); */ ++#undef do_test ++ ++ return 0; ++} ++ ++static int au_fsctx_parse_monolithic(struct fs_context *fc, void *data) ++{ ++ int err; ++ unsigned int u; ++ char *str; ++ struct au_fsctx_opts *a = fc->fs_private; ++ ++ str = data; ++ AuDbg("str %s\n", str); ++ while (str) { ++ u = is_colonopt(str); ++ if (u) ++ str[u] = '='; ++ str = strchr(str, ','); ++ if (!str) ++ break; ++ str++; ++ } ++ str = data; ++ AuDbg("str %s\n", str); ++ ++ err = generic_parse_monolithic(fc, str); ++ AuTraceErr(err); ++ au_fsctx_dump(&a->opts); ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static void au_fsctx_opts_free(struct au_opts *opts) ++{ ++ struct au_opt *opt; ++ ++ opt = opts->opt; ++ while (opt->type != Opt_tail) { ++ switch (opt->type) { ++ case Opt_add: ++ fallthrough; ++ case Opt_append: ++ fallthrough; ++ case Opt_prepend: ++ kfree(opt->add.pathname); ++ path_put(&opt->add.path); ++ break; ++ case Opt_del: ++ kfree(opt->del.pathname); ++ fallthrough; ++ case Opt_idel: ++ path_put(&opt->del.h_path); ++ break; ++ case Opt_mod: ++ kfree(opt->mod.path); ++ fallthrough; ++ case Opt_imod: ++ dput(opt->mod.h_root); ++ break; ++ case Opt_xino: ++ kfree(opt->xino.path); ++ fput(opt->xino.file); ++ break; ++ } ++ opt++; ++ } ++} ++ ++static void au_fsctx_free(struct fs_context *fc) ++{ ++ struct au_fsctx_opts *a = fc->fs_private; ++ ++ /* fs_type=%p, root=%pD */ ++ AuDbg("fc %p{sb_flags 0x%x, sb_flags_mask 0x%x, purpose %u\n", ++ fc, fc->sb_flags, fc->sb_flags_mask, fc->purpose); ++ ++ kobject_put(&a->sbinfo->si_kobj); ++ au_fsctx_opts_free(&a->opts); ++ free_page((unsigned long)a->opts.opt); ++ au_kfree_rcu(a); ++} ++ ++static const struct fs_context_operations au_fsctx_ops = { ++ .free = au_fsctx_free, ++ .parse_param = au_fsctx_parse_param, ++ .parse_monolithic = au_fsctx_parse_monolithic, ++ .get_tree = au_fsctx_get_tree, ++ .reconfigure = au_fsctx_reconfigure ++ /* ++ * nfs4 requires ->dup()? No. ++ * I don't know what is this ->dup() for. ++ */ ++}; ++ ++int aufs_fsctx_init(struct fs_context *fc) ++{ ++ int err; ++ struct au_fsctx_opts *a; ++ ++ /* fs_type=%p, root=%pD */ ++ AuDbg("fc %p{sb_flags 0x%x, sb_flags_mask 0x%x, purpose %u\n", ++ fc, fc->sb_flags, fc->sb_flags_mask, fc->purpose); ++ ++ /* they will be freed by au_fsctx_free() */ ++ err = -ENOMEM; ++ a = kzalloc(sizeof(*a), GFP_NOFS); ++ if (unlikely(!a)) ++ goto out; ++ a->bindex = 0; ++ a->opts.opt = (void *)__get_free_page(GFP_NOFS); ++ if (unlikely(!a->opts.opt)) ++ goto out_a; ++ a->opt = a->opts.opt; ++ a->opt->type = Opt_tail; ++ a->opts.max_opt = PAGE_SIZE / sizeof(*a->opts.opt); ++ a->opt_tail = a->opt + a->opts.max_opt - 1; ++ a->opts.sb_flags = fc->sb_flags; ++ ++ a->sb = NULL; ++ if (fc->root) { ++ AuDebugOn(fc->purpose != FS_CONTEXT_FOR_RECONFIGURE); ++ a->opts.flags = AuOpts_REMOUNT; ++ a->sb = fc->root->d_sb; ++ a->sbinfo = au_sbi(a->sb); ++ kobject_get(&a->sbinfo->si_kobj); ++ } else { ++ a->sbinfo = au_si_alloc(a->sb); ++ AuDebugOn(!a->sbinfo); ++ err = PTR_ERR(a->sbinfo); ++ if (IS_ERR(a->sbinfo)) ++ goto out_opt; ++ au_rw_write_unlock(&a->sbinfo->si_rwsem); ++ } ++ ++ err = 0; ++ fc->fs_private = a; ++ fc->ops = &au_fsctx_ops; ++ goto out; /* success */ ++ ++out_opt: ++ free_page((unsigned long)a->opts.opt); ++out_a: ++ au_kfree_rcu(a); ++out: ++ AuTraceErr(err); ++ return err; ++} +diff --git a/fs/aufs/fstype.h b/fs/aufs/fstype.h +new file mode 100644 +index 000000000000..24ff0d64c219 +--- /dev/null ++++ b/fs/aufs/fstype.h +@@ -0,0 +1,401 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * judging filesystem type ++ */ ++ ++#ifndef __AUFS_FSTYPE_H__ ++#define __AUFS_FSTYPE_H__ ++ ++#ifdef __KERNEL__ ++ ++#include <linux/fs.h> ++#include <linux/magic.h> ++#include <linux/nfs_fs.h> ++#include <linux/romfs_fs.h> ++ ++static inline int au_test_aufs(struct super_block *sb) ++{ ++ return sb->s_magic == AUFS_SUPER_MAGIC; ++} ++ ++static inline const char *au_sbtype(struct super_block *sb) ++{ ++ return sb->s_type->name; ++} ++ ++static inline int au_test_iso9660(struct super_block *sb __maybe_unused) ++{ ++#if IS_ENABLED(CONFIG_ISO9660_FS) ++ return sb->s_magic == ISOFS_SUPER_MAGIC; ++#else ++ return 0; ++#endif ++} ++ ++static inline int au_test_romfs(struct super_block *sb __maybe_unused) ++{ ++#if IS_ENABLED(CONFIG_ROMFS_FS) ++ return sb->s_magic == ROMFS_MAGIC; ++#else ++ return 0; ++#endif ++} ++ ++static inline int au_test_cramfs(struct super_block *sb __maybe_unused) ++{ ++#if IS_ENABLED(CONFIG_CRAMFS) ++ return sb->s_magic == CRAMFS_MAGIC; ++#endif ++ return 0; ++} ++ ++static inline int au_test_nfs(struct super_block *sb __maybe_unused) ++{ ++#if IS_ENABLED(CONFIG_NFS_FS) ++ return sb->s_magic == NFS_SUPER_MAGIC; ++#else ++ return 0; ++#endif ++} ++ ++static inline int au_test_fuse(struct super_block *sb __maybe_unused) ++{ ++#if IS_ENABLED(CONFIG_FUSE_FS) ++ return sb->s_magic == FUSE_SUPER_MAGIC; ++#else ++ return 0; ++#endif ++} ++ ++static inline int au_test_xfs(struct super_block *sb __maybe_unused) ++{ ++#if IS_ENABLED(CONFIG_XFS_FS) ++ return sb->s_magic == XFS_SB_MAGIC; ++#else ++ return 0; ++#endif ++} ++ ++static inline int au_test_tmpfs(struct super_block *sb __maybe_unused) ++{ ++#ifdef CONFIG_TMPFS ++ return sb->s_magic == TMPFS_MAGIC; ++#else ++ return 0; ++#endif ++} ++ ++static inline int au_test_ecryptfs(struct super_block *sb __maybe_unused) ++{ ++#if IS_ENABLED(CONFIG_ECRYPT_FS) ++ return !strcmp(au_sbtype(sb), "ecryptfs"); ++#else ++ return 0; ++#endif ++} ++ ++static inline int au_test_ramfs(struct super_block *sb) ++{ ++ return sb->s_magic == RAMFS_MAGIC; ++} ++ ++static inline int au_test_ubifs(struct super_block *sb __maybe_unused) ++{ ++#if IS_ENABLED(CONFIG_UBIFS_FS) ++ return sb->s_magic == UBIFS_SUPER_MAGIC; ++#else ++ return 0; ++#endif ++} ++ ++static inline int au_test_procfs(struct super_block *sb __maybe_unused) ++{ ++#ifdef CONFIG_PROC_FS ++ return sb->s_magic == PROC_SUPER_MAGIC; ++#else ++ return 0; ++#endif ++} ++ ++static inline int au_test_sysfs(struct super_block *sb __maybe_unused) ++{ ++#ifdef CONFIG_SYSFS ++ return sb->s_magic == SYSFS_MAGIC; ++#else ++ return 0; ++#endif ++} ++ ++static inline int au_test_configfs(struct super_block *sb __maybe_unused) ++{ ++#if IS_ENABLED(CONFIG_CONFIGFS_FS) ++ return sb->s_magic == CONFIGFS_MAGIC; ++#else ++ return 0; ++#endif ++} ++ ++static inline int au_test_minix(struct super_block *sb __maybe_unused) ++{ ++#if IS_ENABLED(CONFIG_MINIX_FS) ++ return sb->s_magic == MINIX3_SUPER_MAGIC ++ || sb->s_magic == MINIX2_SUPER_MAGIC ++ || sb->s_magic == MINIX2_SUPER_MAGIC2 ++ || sb->s_magic == MINIX_SUPER_MAGIC ++ || sb->s_magic == MINIX_SUPER_MAGIC2; ++#else ++ return 0; ++#endif ++} ++ ++static inline int au_test_fat(struct super_block *sb __maybe_unused) ++{ ++#if IS_ENABLED(CONFIG_FAT_FS) ++ return sb->s_magic == MSDOS_SUPER_MAGIC; ++#else ++ return 0; ++#endif ++} ++ ++static inline int au_test_msdos(struct super_block *sb) ++{ ++ return au_test_fat(sb); ++} ++ ++static inline int au_test_vfat(struct super_block *sb) ++{ ++ return au_test_fat(sb); ++} ++ ++static inline int au_test_securityfs(struct super_block *sb __maybe_unused) ++{ ++#ifdef CONFIG_SECURITYFS ++ return sb->s_magic == SECURITYFS_MAGIC; ++#else ++ return 0; ++#endif ++} ++ ++static inline int au_test_squashfs(struct super_block *sb __maybe_unused) ++{ ++#if IS_ENABLED(CONFIG_SQUASHFS) ++ return sb->s_magic == SQUASHFS_MAGIC; ++#else ++ return 0; ++#endif ++} ++ ++static inline int au_test_btrfs(struct super_block *sb __maybe_unused) ++{ ++#if IS_ENABLED(CONFIG_BTRFS_FS) ++ return sb->s_magic == BTRFS_SUPER_MAGIC; ++#else ++ return 0; ++#endif ++} ++ ++static inline int au_test_xenfs(struct super_block *sb __maybe_unused) ++{ ++#if IS_ENABLED(CONFIG_XENFS) ++ return sb->s_magic == XENFS_SUPER_MAGIC; ++#else ++ return 0; ++#endif ++} ++ ++static inline int au_test_debugfs(struct super_block *sb __maybe_unused) ++{ ++#ifdef CONFIG_DEBUG_FS ++ return sb->s_magic == DEBUGFS_MAGIC; ++#else ++ return 0; ++#endif ++} ++ ++static inline int au_test_nilfs(struct super_block *sb __maybe_unused) ++{ ++#if IS_ENABLED(CONFIG_NILFS) ++ return sb->s_magic == NILFS_SUPER_MAGIC; ++#else ++ return 0; ++#endif ++} ++ ++static inline int au_test_hfsplus(struct super_block *sb __maybe_unused) ++{ ++#if IS_ENABLED(CONFIG_HFSPLUS_FS) ++ return sb->s_magic == HFSPLUS_SUPER_MAGIC; ++#else ++ return 0; ++#endif ++} ++ ++/* ---------------------------------------------------------------------- */ ++/* ++ * they can't be an aufs branch. ++ */ ++static inline int au_test_fs_unsuppoted(struct super_block *sb) ++{ ++ return ++#ifndef CONFIG_AUFS_BR_RAMFS ++ au_test_ramfs(sb) || ++#endif ++ au_test_procfs(sb) ++ || au_test_sysfs(sb) ++ || au_test_configfs(sb) ++ || au_test_debugfs(sb) ++ || au_test_securityfs(sb) ++ || au_test_xenfs(sb) ++ || au_test_ecryptfs(sb) ++ /* || !strcmp(au_sbtype(sb), "unionfs") */ ++ || au_test_aufs(sb); /* will be supported in next version */ ++} ++ ++static inline int au_test_fs_remote(struct super_block *sb) ++{ ++ return !au_test_tmpfs(sb) ++#ifdef CONFIG_AUFS_BR_RAMFS ++ && !au_test_ramfs(sb) ++#endif ++ && !(sb->s_type->fs_flags & FS_REQUIRES_DEV); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * Note: these functions (below) are created after reading ->getattr() in all ++ * filesystems under linux/fs. it means we have to do so in every update... ++ */ ++ ++/* ++ * some filesystems require getattr to refresh the inode attributes before ++ * referencing. ++ * in most cases, we can rely on the inode attribute in NFS (or every remote fs) ++ * and leave the work for d_revalidate() ++ */ ++static inline int au_test_fs_refresh_iattr(struct super_block *sb) ++{ ++ return au_test_nfs(sb) ++ || au_test_fuse(sb) ++ /* || au_test_btrfs(sb) */ /* untested */ ++ ; ++} ++ ++/* ++ * filesystems which don't maintain i_size or i_blocks. ++ */ ++static inline int au_test_fs_bad_iattr_size(struct super_block *sb) ++{ ++ return au_test_xfs(sb) ++ || au_test_btrfs(sb) ++ || au_test_ubifs(sb) ++ || au_test_hfsplus(sb) /* maintained, but incorrect */ ++ /* || au_test_minix(sb) */ /* untested */ ++ ; ++} ++ ++/* ++ * filesystems which don't store the correct value in some of their inode ++ * attributes. ++ */ ++static inline int au_test_fs_bad_iattr(struct super_block *sb) ++{ ++ return au_test_fs_bad_iattr_size(sb) ++ || au_test_fat(sb) ++ || au_test_msdos(sb) ++ || au_test_vfat(sb); ++} ++ ++/* they don't check i_nlink in link(2) */ ++static inline int au_test_fs_no_limit_nlink(struct super_block *sb) ++{ ++ return au_test_tmpfs(sb) ++#ifdef CONFIG_AUFS_BR_RAMFS ++ || au_test_ramfs(sb) ++#endif ++ || au_test_ubifs(sb) ++ || au_test_hfsplus(sb); ++} ++ ++/* ++ * filesystems which sets S_NOATIME and S_NOCMTIME. ++ */ ++static inline int au_test_fs_notime(struct super_block *sb) ++{ ++ return au_test_nfs(sb) ++ || au_test_fuse(sb) ++ || au_test_ubifs(sb) ++ ; ++} ++ ++/* temporary support for i#1 in cramfs */ ++static inline int au_test_fs_unique_ino(struct inode *inode) ++{ ++ if (au_test_cramfs(inode->i_sb)) ++ return inode->i_ino != 1; ++ return 1; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * the filesystem where the xino files placed must support i/o after unlink and ++ * maintain i_size and i_blocks. ++ */ ++static inline int au_test_fs_bad_xino(struct super_block *sb) ++{ ++ return au_test_fs_remote(sb) ++ || au_test_fs_bad_iattr_size(sb) ++ /* don't want unnecessary work for xino */ ++ || au_test_aufs(sb) ++ || au_test_ecryptfs(sb) ++ || au_test_nilfs(sb); ++} ++ ++static inline int au_test_fs_trunc_xino(struct super_block *sb) ++{ ++ return au_test_tmpfs(sb) ++ || au_test_ramfs(sb); ++} ++ ++/* ++ * test if the @sb is real-readonly. ++ */ ++static inline int au_test_fs_rr(struct super_block *sb) ++{ ++ return au_test_squashfs(sb) ++ || au_test_iso9660(sb) ++ || au_test_cramfs(sb) ++ || au_test_romfs(sb); ++} ++ ++/* ++ * test if the @inode is nfs with 'noacl' option ++ * NFS always sets SB_POSIXACL regardless its mount option 'noacl.' ++ */ ++static inline int au_test_nfs_noacl(struct inode *inode) ++{ ++ return au_test_nfs(inode->i_sb) ++ /* && IS_POSIXACL(inode) */ ++ && !nfs_server_capable(inode, NFS_CAP_ACLS); ++} ++ ++#endif /* __KERNEL__ */ ++#endif /* __AUFS_FSTYPE_H__ */ +diff --git a/fs/aufs/hbl.h b/fs/aufs/hbl.h +new file mode 100644 +index 000000000000..7e1e66db0264 +--- /dev/null ++++ b/fs/aufs/hbl.h +@@ -0,0 +1,65 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2017-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * helpers for hlist_bl.h ++ */ ++ ++#ifndef __AUFS_HBL_H__ ++#define __AUFS_HBL_H__ ++ ++#ifdef __KERNEL__ ++ ++#include <linux/list_bl.h> ++ ++static inline void au_hbl_add(struct hlist_bl_node *node, ++ struct hlist_bl_head *hbl) ++{ ++ hlist_bl_lock(hbl); ++ hlist_bl_add_head(node, hbl); ++ hlist_bl_unlock(hbl); ++} ++ ++static inline void au_hbl_del(struct hlist_bl_node *node, ++ struct hlist_bl_head *hbl) ++{ ++ hlist_bl_lock(hbl); ++ hlist_bl_del(node); ++ hlist_bl_unlock(hbl); ++} ++ ++#define au_hbl_for_each(pos, head) \ ++ for (pos = hlist_bl_first(head); \ ++ pos; \ ++ pos = pos->next) ++ ++static inline unsigned long au_hbl_count(struct hlist_bl_head *hbl) ++{ ++ unsigned long cnt; ++ struct hlist_bl_node *pos; ++ ++ cnt = 0; ++ hlist_bl_lock(hbl); ++ au_hbl_for_each(pos, hbl) ++ cnt++; ++ hlist_bl_unlock(hbl); ++ return cnt; ++} ++ ++#endif /* __KERNEL__ */ ++#endif /* __AUFS_HBL_H__ */ +diff --git a/fs/aufs/hfsnotify.c b/fs/aufs/hfsnotify.c +new file mode 100644 +index 000000000000..caa900cea3a0 +--- /dev/null ++++ b/fs/aufs/hfsnotify.c +@@ -0,0 +1,290 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * fsnotify for the lower directories ++ */ ++ ++#include "aufs.h" ++ ++/* FS_IN_IGNORED is unnecessary */ ++static const __u32 AuHfsnMask = (FS_MOVED_TO | FS_MOVED_FROM | FS_DELETE ++ | FS_CREATE | FS_EVENT_ON_CHILD); ++static DECLARE_WAIT_QUEUE_HEAD(au_hfsn_wq); ++static __cacheline_aligned_in_smp atomic64_t au_hfsn_ifree = ATOMIC64_INIT(0); ++ ++static void au_hfsn_free_mark(struct fsnotify_mark *mark) ++{ ++ struct au_hnotify *hn = container_of(mark, struct au_hnotify, ++ hn_mark); ++ /* AuDbg("here\n"); */ ++ au_cache_free_hnotify(hn); ++ smp_mb__before_atomic(); /* for atomic64_dec */ ++ if (atomic64_dec_and_test(&au_hfsn_ifree)) ++ wake_up(&au_hfsn_wq); ++} ++ ++static int au_hfsn_alloc(struct au_hinode *hinode) ++{ ++ int err; ++ struct au_hnotify *hn; ++ struct super_block *sb; ++ struct au_branch *br; ++ struct fsnotify_mark *mark; ++ aufs_bindex_t bindex; ++ ++ hn = hinode->hi_notify; ++ sb = hn->hn_aufs_inode->i_sb; ++ bindex = au_br_index(sb, hinode->hi_id); ++ br = au_sbr(sb, bindex); ++ AuDebugOn(!br->br_hfsn); ++ ++ mark = &hn->hn_mark; ++ fsnotify_init_mark(mark, br->br_hfsn->hfsn_group); ++ mark->mask = AuHfsnMask; ++ /* ++ * by udba rename or rmdir, aufs assign a new inode to the known ++ * h_inode, so specify 1 to allow dups. ++ */ ++ lockdep_off(); ++ err = fsnotify_add_inode_mark(mark, hinode->hi_inode, /*allow_dups*/1); ++ lockdep_on(); ++ ++ return err; ++} ++ ++static int au_hfsn_free(struct au_hinode *hinode, struct au_hnotify *hn) ++{ ++ struct fsnotify_mark *mark; ++ unsigned long long ull; ++ struct fsnotify_group *group; ++ ++ ull = atomic64_inc_return(&au_hfsn_ifree); ++ BUG_ON(!ull); ++ ++ mark = &hn->hn_mark; ++ spin_lock(&mark->lock); ++ group = mark->group; ++ fsnotify_get_group(group); ++ spin_unlock(&mark->lock); ++ lockdep_off(); ++ fsnotify_destroy_mark(mark, group); ++ fsnotify_put_mark(mark); ++ fsnotify_put_group(group); ++ lockdep_on(); ++ ++ /* free hn by myself */ ++ return 0; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static void au_hfsn_ctl(struct au_hinode *hinode, int do_set) ++{ ++ struct fsnotify_mark *mark; ++ ++ mark = &hinode->hi_notify->hn_mark; ++ spin_lock(&mark->lock); ++ if (do_set) { ++ AuDebugOn(mark->mask & AuHfsnMask); ++ mark->mask |= AuHfsnMask; ++ } else { ++ AuDebugOn(!(mark->mask & AuHfsnMask)); ++ mark->mask &= ~AuHfsnMask; ++ } ++ spin_unlock(&mark->lock); ++ /* fsnotify_recalc_inode_mask(hinode->hi_inode); */ ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* #define AuDbgHnotify */ ++#ifdef AuDbgHnotify ++static char *au_hfsn_name(u32 mask) ++{ ++#ifdef CONFIG_AUFS_DEBUG ++#define test_ret(flag) \ ++ do { \ ++ if (mask & flag) \ ++ return #flag; \ ++ } while (0) ++ test_ret(FS_ACCESS); ++ test_ret(FS_MODIFY); ++ test_ret(FS_ATTRIB); ++ test_ret(FS_CLOSE_WRITE); ++ test_ret(FS_CLOSE_NOWRITE); ++ test_ret(FS_OPEN); ++ test_ret(FS_MOVED_FROM); ++ test_ret(FS_MOVED_TO); ++ test_ret(FS_CREATE); ++ test_ret(FS_DELETE); ++ test_ret(FS_DELETE_SELF); ++ test_ret(FS_MOVE_SELF); ++ test_ret(FS_UNMOUNT); ++ test_ret(FS_Q_OVERFLOW); ++ test_ret(FS_IN_IGNORED); ++ test_ret(FS_ISDIR); ++ test_ret(FS_IN_ONESHOT); ++ test_ret(FS_EVENT_ON_CHILD); ++ return ""; ++#undef test_ret ++#else ++ return "??"; ++#endif ++} ++#endif ++ ++/* ---------------------------------------------------------------------- */ ++ ++static void au_hfsn_free_group(struct fsnotify_group *group) ++{ ++ struct au_br_hfsnotify *hfsn = group->private; ++ ++ /* AuDbg("here\n"); */ ++ au_kfree_try_rcu(hfsn); ++} ++ ++static int au_hfsn_handle_event(struct fsnotify_group *group, ++ u32 mask, const void *data, int data_type, ++ struct inode *dir, ++ const struct qstr *file_name, u32 cookie, ++ struct fsnotify_iter_info *iter_info) ++{ ++ int err; ++ struct au_hnotify *hnotify; ++ struct inode *h_dir, *h_inode; ++ struct fsnotify_mark *inode_mark; ++ ++ AuDebugOn(!(data_type == FSNOTIFY_EVENT_INODE ++ || data_type == FSNOTIFY_EVENT_DENTRY)); ++ ++ err = 0; ++ /* if FS_UNMOUNT happens, there must be another bug */ ++ AuDebugOn(mask & FS_UNMOUNT); ++ if (mask & (FS_IN_IGNORED | FS_UNMOUNT)) ++ goto out; ++ ++ h_dir = dir; ++ h_inode = NULL; ++#ifdef AuDbgHnotify ++ au_debug_on(); ++ if (1 || file_name.len != sizeof(AUFS_XINO_FNAME) - 1 ++ || strncmp(file_name.name, AUFS_XINO_FNAME, file_name.len)) { ++ AuDbg("i%lu, mask 0x%x %s, hcname %.*s, hi%lu\n", ++ h_dir->i_ino, mask, au_hfsn_name(mask), ++ AuLNPair(file_name), h_inode ? h_inode->i_ino : 0); ++ /* WARN_ON(1); */ ++ } ++ au_debug_off(); ++#endif ++ ++ inode_mark = fsnotify_iter_inode_mark(iter_info); ++ AuDebugOn(!inode_mark); ++ hnotify = container_of(inode_mark, struct au_hnotify, hn_mark); ++ err = au_hnotify(h_dir, hnotify, mask, file_name, h_inode); ++ ++out: ++ return err; ++} ++ ++static struct fsnotify_ops au_hfsn_ops = { ++ .handle_event = au_hfsn_handle_event, ++ .free_group_priv = au_hfsn_free_group, ++ .free_mark = au_hfsn_free_mark ++}; ++ ++/* ---------------------------------------------------------------------- */ ++ ++static void au_hfsn_fin_br(struct au_branch *br) ++{ ++ struct au_br_hfsnotify *hfsn; ++ ++ hfsn = br->br_hfsn; ++ if (hfsn) { ++ lockdep_off(); ++ fsnotify_put_group(hfsn->hfsn_group); ++ lockdep_on(); ++ } ++} ++ ++static int au_hfsn_init_br(struct au_branch *br, int perm) ++{ ++ int err; ++ struct fsnotify_group *group; ++ struct au_br_hfsnotify *hfsn; ++ ++ err = 0; ++ br->br_hfsn = NULL; ++ if (!au_br_hnotifyable(perm)) ++ goto out; ++ ++ err = -ENOMEM; ++ hfsn = kmalloc(sizeof(*hfsn), GFP_NOFS); ++ if (unlikely(!hfsn)) ++ goto out; ++ ++ err = 0; ++ group = fsnotify_alloc_group(&au_hfsn_ops, ++ /*flags - not for userspace*/0); ++ if (IS_ERR(group)) { ++ err = PTR_ERR(group); ++ pr_err("fsnotify_alloc_group() failed, %d\n", err); ++ goto out_hfsn; ++ } ++ ++ group->private = hfsn; ++ hfsn->hfsn_group = group; ++ br->br_hfsn = hfsn; ++ goto out; /* success */ ++ ++out_hfsn: ++ au_kfree_try_rcu(hfsn); ++out: ++ return err; ++} ++ ++static int au_hfsn_reset_br(unsigned int udba, struct au_branch *br, int perm) ++{ ++ int err; ++ ++ err = 0; ++ if (!br->br_hfsn) ++ err = au_hfsn_init_br(br, perm); ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static void au_hfsn_fin(void) ++{ ++ AuDbg("au_hfsn_ifree %lld\n", (long long)atomic64_read(&au_hfsn_ifree)); ++ wait_event(au_hfsn_wq, !atomic64_read(&au_hfsn_ifree)); ++} ++ ++const struct au_hnotify_op au_hnotify_op = { ++ .ctl = au_hfsn_ctl, ++ .alloc = au_hfsn_alloc, ++ .free = au_hfsn_free, ++ ++ .fin = au_hfsn_fin, ++ ++ .reset_br = au_hfsn_reset_br, ++ .fin_br = au_hfsn_fin_br, ++ .init_br = au_hfsn_init_br ++}; +diff --git a/fs/aufs/hfsplus.c b/fs/aufs/hfsplus.c +new file mode 100644 +index 000000000000..c626ff2128c6 +--- /dev/null ++++ b/fs/aufs/hfsplus.c +@@ -0,0 +1,60 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2010-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * special support for filesystems which acquires an inode mutex ++ * at final closing a file, eg, hfsplus. ++ * ++ * This trick is very simple and stupid, just to open the file before really ++ * necessary open to tell hfsplus that this is not the final closing. ++ * The caller should call au_h_open_pre() after acquiring the inode mutex, ++ * and au_h_open_post() after releasing it. ++ */ ++ ++#include "aufs.h" ++ ++struct file *au_h_open_pre(struct dentry *dentry, aufs_bindex_t bindex, ++ int force_wr) ++{ ++ struct file *h_file; ++ struct dentry *h_dentry; ++ ++ h_dentry = au_h_dptr(dentry, bindex); ++ AuDebugOn(!h_dentry); ++ AuDebugOn(d_is_negative(h_dentry)); ++ ++ h_file = NULL; ++ if (au_test_hfsplus(h_dentry->d_sb) ++ && d_is_reg(h_dentry)) ++ h_file = au_h_open(dentry, bindex, ++ O_RDONLY | O_NOATIME | O_LARGEFILE, ++ /*file*/NULL, force_wr); ++ return h_file; ++} ++ ++void au_h_open_post(struct dentry *dentry, aufs_bindex_t bindex, ++ struct file *h_file) ++{ ++ struct au_branch *br; ++ ++ if (h_file) { ++ fput(h_file); ++ br = au_sbr(dentry->d_sb, bindex); ++ au_lcnt_dec(&br->br_nfiles); ++ } ++} +diff --git a/fs/aufs/hnotify.c b/fs/aufs/hnotify.c +new file mode 100644 +index 000000000000..8ca8c98d40a3 +--- /dev/null ++++ b/fs/aufs/hnotify.c +@@ -0,0 +1,715 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * abstraction to notify the direct changes on lower directories ++ */ ++ ++/* #include <linux/iversion.h> */ ++#include "aufs.h" ++ ++int au_hn_alloc(struct au_hinode *hinode, struct inode *inode) ++{ ++ int err; ++ struct au_hnotify *hn; ++ ++ err = -ENOMEM; ++ hn = au_cache_alloc_hnotify(); ++ if (hn) { ++ hn->hn_aufs_inode = inode; ++ hinode->hi_notify = hn; ++ err = au_hnotify_op.alloc(hinode); ++ AuTraceErr(err); ++ if (unlikely(err)) { ++ hinode->hi_notify = NULL; ++ au_cache_free_hnotify(hn); ++ /* ++ * The upper dir was removed by udba, but the same named ++ * dir left. In this case, aufs assigns a new inode ++ * number and set the monitor again. ++ * For the lower dir, the old monitor is still left. ++ */ ++ if (err == -EEXIST) ++ err = 0; ++ } ++ } ++ ++ AuTraceErr(err); ++ return err; ++} ++ ++void au_hn_free(struct au_hinode *hinode) ++{ ++ struct au_hnotify *hn; ++ ++ hn = hinode->hi_notify; ++ if (hn) { ++ hinode->hi_notify = NULL; ++ if (au_hnotify_op.free(hinode, hn)) ++ au_cache_free_hnotify(hn); ++ } ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++void au_hn_ctl(struct au_hinode *hinode, int do_set) ++{ ++ if (hinode->hi_notify) ++ au_hnotify_op.ctl(hinode, do_set); ++} ++ ++void au_hn_reset(struct inode *inode, unsigned int flags) ++{ ++ aufs_bindex_t bindex, bbot; ++ struct inode *hi; ++ struct dentry *iwhdentry; ++ ++ bbot = au_ibbot(inode); ++ for (bindex = au_ibtop(inode); bindex <= bbot; bindex++) { ++ hi = au_h_iptr(inode, bindex); ++ if (!hi) ++ continue; ++ ++ /* inode_lock_nested(hi, AuLsc_I_CHILD); */ ++ iwhdentry = au_hi_wh(inode, bindex); ++ if (iwhdentry) ++ dget(iwhdentry); ++ au_igrab(hi); ++ au_set_h_iptr(inode, bindex, NULL, 0); ++ au_set_h_iptr(inode, bindex, au_igrab(hi), ++ flags & ~AuHi_XINO); ++ iput(hi); ++ dput(iwhdentry); ++ /* inode_unlock(hi); */ ++ } ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int hn_xino(struct inode *inode, struct inode *h_inode) ++{ ++ int err; ++ aufs_bindex_t bindex, bbot, bfound, btop; ++ struct inode *h_i; ++ ++ err = 0; ++ if (unlikely(inode->i_ino == AUFS_ROOT_INO)) { ++ pr_warn("branch root dir was changed\n"); ++ goto out; ++ } ++ ++ bfound = -1; ++ bbot = au_ibbot(inode); ++ btop = au_ibtop(inode); ++#if 0 /* reserved for future use */ ++ if (bindex == bbot) { ++ /* keep this ino in rename case */ ++ goto out; ++ } ++#endif ++ for (bindex = btop; bindex <= bbot; bindex++) ++ if (au_h_iptr(inode, bindex) == h_inode) { ++ bfound = bindex; ++ break; ++ } ++ if (bfound < 0) ++ goto out; ++ ++ for (bindex = btop; bindex <= bbot; bindex++) { ++ h_i = au_h_iptr(inode, bindex); ++ if (!h_i) ++ continue; ++ ++ err = au_xino_write(inode->i_sb, bindex, h_i->i_ino, /*ino*/0); ++ /* ignore this error */ ++ /* bad action? */ ++ } ++ ++ /* children inode number will be broken */ ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++static int hn_gen_tree(struct dentry *dentry) ++{ ++ int err, i, j, ndentry; ++ struct au_dcsub_pages dpages; ++ struct au_dpage *dpage; ++ struct dentry **dentries; ++ ++ err = au_dpages_init(&dpages, GFP_NOFS); ++ if (unlikely(err)) ++ goto out; ++ err = au_dcsub_pages(&dpages, dentry, NULL, NULL); ++ if (unlikely(err)) ++ goto out_dpages; ++ ++ for (i = 0; i < dpages.ndpage; i++) { ++ dpage = dpages.dpages + i; ++ dentries = dpage->dentries; ++ ndentry = dpage->ndentry; ++ for (j = 0; j < ndentry; j++) { ++ struct dentry *d; ++ ++ d = dentries[j]; ++ if (IS_ROOT(d)) ++ continue; ++ ++ au_digen_dec(d); ++ if (d_really_is_positive(d)) ++ /* todo: reset children xino? ++ cached children only? */ ++ au_iigen_dec(d_inode(d)); ++ } ++ } ++ ++out_dpages: ++ au_dpages_free(&dpages); ++out: ++ return err; ++} ++ ++/* ++ * return 0 if processed. ++ */ ++static int hn_gen_by_inode(char *name, unsigned int nlen, struct inode *inode, ++ const unsigned int isdir) ++{ ++ int err; ++ struct dentry *d; ++ struct qstr *dname; ++ ++ err = 1; ++ if (unlikely(inode->i_ino == AUFS_ROOT_INO)) { ++ pr_warn("branch root dir was changed\n"); ++ err = 0; ++ goto out; ++ } ++ ++ if (!isdir) { ++ AuDebugOn(!name); ++ au_iigen_dec(inode); ++ spin_lock(&inode->i_lock); ++ hlist_for_each_entry(d, &inode->i_dentry, d_u.d_alias) { ++ spin_lock(&d->d_lock); ++ dname = &d->d_name; ++ if (dname->len != nlen ++ && memcmp(dname->name, name, nlen)) { ++ spin_unlock(&d->d_lock); ++ continue; ++ } ++ err = 0; ++ au_digen_dec(d); ++ spin_unlock(&d->d_lock); ++ break; ++ } ++ spin_unlock(&inode->i_lock); ++ } else { ++ au_fset_si(au_sbi(inode->i_sb), FAILED_REFRESH_DIR); ++ d = d_find_any_alias(inode); ++ if (!d) { ++ au_iigen_dec(inode); ++ goto out; ++ } ++ ++ spin_lock(&d->d_lock); ++ dname = &d->d_name; ++ if (dname->len == nlen && !memcmp(dname->name, name, nlen)) { ++ spin_unlock(&d->d_lock); ++ err = hn_gen_tree(d); ++ spin_lock(&d->d_lock); ++ } ++ spin_unlock(&d->d_lock); ++ dput(d); ++ } ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++static int hn_gen_by_name(struct dentry *dentry, const unsigned int isdir) ++{ ++ int err; ++ ++ if (IS_ROOT(dentry)) { ++ pr_warn("branch root dir was changed\n"); ++ return 0; ++ } ++ ++ err = 0; ++ if (!isdir) { ++ au_digen_dec(dentry); ++ if (d_really_is_positive(dentry)) ++ au_iigen_dec(d_inode(dentry)); ++ } else { ++ au_fset_si(au_sbi(dentry->d_sb), FAILED_REFRESH_DIR); ++ if (d_really_is_positive(dentry)) ++ err = hn_gen_tree(dentry); ++ } ++ ++ AuTraceErr(err); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* hnotify job flags */ ++#define AuHnJob_XINO0 1 ++#define AuHnJob_GEN (1 << 1) ++#define AuHnJob_DIRENT (1 << 2) ++#define AuHnJob_ISDIR (1 << 3) ++#define AuHnJob_TRYXINO0 (1 << 4) ++#define AuHnJob_MNTPNT (1 << 5) ++#define au_ftest_hnjob(flags, name) ((flags) & AuHnJob_##name) ++#define au_fset_hnjob(flags, name) \ ++ do { (flags) |= AuHnJob_##name; } while (0) ++#define au_fclr_hnjob(flags, name) \ ++ do { (flags) &= ~AuHnJob_##name; } while (0) ++ ++enum { ++ AuHn_CHILD, ++ AuHn_PARENT, ++ AuHnLast ++}; ++ ++struct au_hnotify_args { ++ struct inode *h_dir, *dir, *h_child_inode; ++ u32 mask; ++ unsigned int flags[AuHnLast]; ++ unsigned int h_child_nlen; ++ char h_child_name[]; ++}; ++ ++struct hn_job_args { ++ unsigned int flags; ++ struct inode *inode, *h_inode, *dir, *h_dir; ++ struct dentry *dentry; ++ char *h_name; ++ int h_nlen; ++}; ++ ++static int hn_job(struct hn_job_args *a) ++{ ++ const unsigned int isdir = au_ftest_hnjob(a->flags, ISDIR); ++ int e; ++ ++ /* reset xino */ ++ if (au_ftest_hnjob(a->flags, XINO0) && a->inode) ++ hn_xino(a->inode, a->h_inode); /* ignore this error */ ++ ++ if (au_ftest_hnjob(a->flags, TRYXINO0) ++ && a->inode ++ && a->h_inode) { ++ inode_lock_shared_nested(a->h_inode, AuLsc_I_CHILD); ++ if (!a->h_inode->i_nlink ++ && !(a->h_inode->i_state & I_LINKABLE)) ++ hn_xino(a->inode, a->h_inode); /* ignore this error */ ++ inode_unlock_shared(a->h_inode); ++ } ++ ++ /* make the generation obsolete */ ++ if (au_ftest_hnjob(a->flags, GEN)) { ++ e = -1; ++ if (a->inode) ++ e = hn_gen_by_inode(a->h_name, a->h_nlen, a->inode, ++ isdir); ++ if (e && a->dentry) ++ hn_gen_by_name(a->dentry, isdir); ++ /* ignore this error */ ++ } ++ ++ /* make dir entries obsolete */ ++ if (au_ftest_hnjob(a->flags, DIRENT) && a->inode) { ++ struct au_vdir *vdir; ++ ++ vdir = au_ivdir(a->inode); ++ if (vdir) ++ vdir->vd_jiffy = 0; ++ /* IMustLock(a->inode); */ ++ /* inode_inc_iversion(a->inode); */ ++ } ++ ++ /* can do nothing but warn */ ++ if (au_ftest_hnjob(a->flags, MNTPNT) ++ && a->dentry ++ && d_mountpoint(a->dentry)) ++ pr_warn("mount-point %pd is removed or renamed\n", a->dentry); ++ ++ return 0; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static struct dentry *lookup_wlock_by_name(char *name, unsigned int nlen, ++ struct inode *dir) ++{ ++ struct dentry *dentry, *d, *parent; ++ struct qstr *dname; ++ ++ parent = d_find_any_alias(dir); ++ if (!parent) ++ return NULL; ++ ++ dentry = NULL; ++ spin_lock(&parent->d_lock); ++ list_for_each_entry(d, &parent->d_subdirs, d_child) { ++ /* AuDbg("%pd\n", d); */ ++ spin_lock_nested(&d->d_lock, DENTRY_D_LOCK_NESTED); ++ dname = &d->d_name; ++ if (dname->len != nlen || memcmp(dname->name, name, nlen)) ++ goto cont_unlock; ++ if (au_di(d)) ++ au_digen_dec(d); ++ else ++ goto cont_unlock; ++ if (au_dcount(d) > 0) { ++ dentry = dget_dlock(d); ++ spin_unlock(&d->d_lock); ++ break; ++ } ++ ++cont_unlock: ++ spin_unlock(&d->d_lock); ++ } ++ spin_unlock(&parent->d_lock); ++ dput(parent); ++ ++ if (dentry) ++ di_write_lock_child(dentry); ++ ++ return dentry; ++} ++ ++static struct inode *lookup_wlock_by_ino(struct super_block *sb, ++ aufs_bindex_t bindex, ino_t h_ino) ++{ ++ struct inode *inode; ++ ino_t ino; ++ int err; ++ ++ inode = NULL; ++ err = au_xino_read(sb, bindex, h_ino, &ino); ++ if (!err && ino) ++ inode = ilookup(sb, ino); ++ if (!inode) ++ goto out; ++ ++ if (unlikely(inode->i_ino == AUFS_ROOT_INO)) { ++ pr_warn("wrong root branch\n"); ++ iput(inode); ++ inode = NULL; ++ goto out; ++ } ++ ++ ii_write_lock_child(inode); ++ ++out: ++ return inode; ++} ++ ++static void au_hn_bh(void *_args) ++{ ++ struct au_hnotify_args *a = _args; ++ struct super_block *sb; ++ aufs_bindex_t bindex, bbot, bfound; ++ unsigned char xino, try_iput; ++ int err; ++ struct inode *inode; ++ ino_t h_ino; ++ struct hn_job_args args; ++ struct dentry *dentry; ++ struct au_sbinfo *sbinfo; ++ ++ AuDebugOn(!_args); ++ AuDebugOn(!a->h_dir); ++ AuDebugOn(!a->dir); ++ AuDebugOn(!a->mask); ++ AuDbg("mask 0x%x, i%lu, hi%lu, hci%lu\n", ++ a->mask, a->dir->i_ino, a->h_dir->i_ino, ++ a->h_child_inode ? a->h_child_inode->i_ino : 0); ++ ++ inode = NULL; ++ dentry = NULL; ++ /* ++ * do not lock a->dir->i_mutex here ++ * because of d_revalidate() may cause a deadlock. ++ */ ++ sb = a->dir->i_sb; ++ AuDebugOn(!sb); ++ sbinfo = au_sbi(sb); ++ AuDebugOn(!sbinfo); ++ si_write_lock(sb, AuLock_NOPLMW); ++ ++ if (au_opt_test(sbinfo->si_mntflags, DIRREN)) ++ switch (a->mask & FS_EVENTS_POSS_ON_CHILD) { ++ case FS_MOVED_FROM: ++ case FS_MOVED_TO: ++ AuWarn1("DIRREN with UDBA may not work correctly " ++ "for the direct rename(2)\n"); ++ } ++ ++ ii_read_lock_parent(a->dir); ++ bfound = -1; ++ bbot = au_ibbot(a->dir); ++ for (bindex = au_ibtop(a->dir); bindex <= bbot; bindex++) ++ if (au_h_iptr(a->dir, bindex) == a->h_dir) { ++ bfound = bindex; ++ break; ++ } ++ ii_read_unlock(a->dir); ++ if (unlikely(bfound < 0)) ++ goto out; ++ ++ xino = !!au_opt_test(au_mntflags(sb), XINO); ++ h_ino = 0; ++ if (a->h_child_inode) ++ h_ino = a->h_child_inode->i_ino; ++ ++ if (a->h_child_nlen ++ && (au_ftest_hnjob(a->flags[AuHn_CHILD], GEN) ++ || au_ftest_hnjob(a->flags[AuHn_CHILD], MNTPNT))) ++ dentry = lookup_wlock_by_name(a->h_child_name, a->h_child_nlen, ++ a->dir); ++ try_iput = 0; ++ if (dentry && d_really_is_positive(dentry)) ++ inode = d_inode(dentry); ++ if (xino && !inode && h_ino ++ && (au_ftest_hnjob(a->flags[AuHn_CHILD], XINO0) ++ || au_ftest_hnjob(a->flags[AuHn_CHILD], TRYXINO0) ++ || au_ftest_hnjob(a->flags[AuHn_CHILD], GEN))) { ++ inode = lookup_wlock_by_ino(sb, bfound, h_ino); ++ try_iput = 1; ++ } ++ ++ args.flags = a->flags[AuHn_CHILD]; ++ args.dentry = dentry; ++ args.inode = inode; ++ args.h_inode = a->h_child_inode; ++ args.dir = a->dir; ++ args.h_dir = a->h_dir; ++ args.h_name = a->h_child_name; ++ args.h_nlen = a->h_child_nlen; ++ err = hn_job(&args); ++ if (dentry) { ++ if (au_di(dentry)) ++ di_write_unlock(dentry); ++ dput(dentry); ++ } ++ if (inode && try_iput) { ++ ii_write_unlock(inode); ++ iput(inode); ++ } ++ ++ ii_write_lock_parent(a->dir); ++ args.flags = a->flags[AuHn_PARENT]; ++ args.dentry = NULL; ++ args.inode = a->dir; ++ args.h_inode = a->h_dir; ++ args.dir = NULL; ++ args.h_dir = NULL; ++ args.h_name = NULL; ++ args.h_nlen = 0; ++ err = hn_job(&args); ++ ii_write_unlock(a->dir); ++ ++out: ++ iput(a->h_child_inode); ++ iput(a->h_dir); ++ iput(a->dir); ++ si_write_unlock(sb); ++ au_nwt_done(&sbinfo->si_nowait); ++ au_kfree_rcu(a); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++int au_hnotify(struct inode *h_dir, struct au_hnotify *hnotify, u32 mask, ++ const struct qstr *h_child_qstr, struct inode *h_child_inode) ++{ ++ int err, len; ++ unsigned int flags[AuHnLast], f; ++ unsigned char isdir, isroot, wh; ++ struct inode *dir; ++ struct au_hnotify_args *args; ++ char *p, *h_child_name; ++ ++ err = 0; ++ AuDebugOn(!hnotify || !hnotify->hn_aufs_inode); ++ dir = igrab(hnotify->hn_aufs_inode); ++ if (!dir) ++ goto out; ++ ++ isroot = (dir->i_ino == AUFS_ROOT_INO); ++ wh = 0; ++ h_child_name = (void *)h_child_qstr->name; ++ len = h_child_qstr->len; ++ if (h_child_name) { ++ if (len > AUFS_WH_PFX_LEN ++ && !memcmp(h_child_name, AUFS_WH_PFX, AUFS_WH_PFX_LEN)) { ++ h_child_name += AUFS_WH_PFX_LEN; ++ len -= AUFS_WH_PFX_LEN; ++ wh = 1; ++ } ++ } ++ ++ isdir = 0; ++ if (h_child_inode) ++ isdir = !!S_ISDIR(h_child_inode->i_mode); ++ flags[AuHn_PARENT] = AuHnJob_ISDIR; ++ flags[AuHn_CHILD] = 0; ++ if (isdir) ++ flags[AuHn_CHILD] = AuHnJob_ISDIR; ++ au_fset_hnjob(flags[AuHn_PARENT], DIRENT); ++ au_fset_hnjob(flags[AuHn_CHILD], GEN); ++ switch (mask & ALL_FSNOTIFY_DIRENT_EVENTS) { ++ case FS_MOVED_FROM: ++ case FS_MOVED_TO: ++ au_fset_hnjob(flags[AuHn_CHILD], XINO0); ++ au_fset_hnjob(flags[AuHn_CHILD], MNTPNT); ++ fallthrough; ++ case FS_CREATE: ++ AuDebugOn(!h_child_name); ++ break; ++ ++ case FS_DELETE: ++ /* ++ * aufs never be able to get this child inode. ++ * revalidation should be in d_revalidate() ++ * by checking i_nlink, i_generation or d_unhashed(). ++ */ ++ AuDebugOn(!h_child_name); ++ au_fset_hnjob(flags[AuHn_CHILD], TRYXINO0); ++ au_fset_hnjob(flags[AuHn_CHILD], MNTPNT); ++ break; ++ ++ default: ++ AuDebugOn(1); ++ } ++ ++ if (wh) ++ h_child_inode = NULL; ++ ++ err = -ENOMEM; ++ /* iput() and kfree() will be called in au_hnotify() */ ++ args = kmalloc(sizeof(*args) + len + 1, GFP_NOFS); ++ if (unlikely(!args)) { ++ AuErr1("no memory\n"); ++ iput(dir); ++ goto out; ++ } ++ args->flags[AuHn_PARENT] = flags[AuHn_PARENT]; ++ args->flags[AuHn_CHILD] = flags[AuHn_CHILD]; ++ args->mask = mask; ++ args->dir = dir; ++ args->h_dir = igrab(h_dir); ++ if (h_child_inode) ++ h_child_inode = igrab(h_child_inode); /* can be NULL */ ++ args->h_child_inode = h_child_inode; ++ args->h_child_nlen = len; ++ if (len) { ++ p = (void *)args; ++ p += sizeof(*args); ++ memcpy(p, h_child_name, len); ++ p[len] = 0; ++ } ++ ++ /* NFS fires the event for silly-renamed one from kworker */ ++ f = 0; ++ if (!dir->i_nlink ++ || (au_test_nfs(h_dir->i_sb) && (mask & FS_DELETE))) ++ f = AuWkq_NEST; ++ err = au_wkq_nowait(au_hn_bh, args, dir->i_sb, f); ++ if (unlikely(err)) { ++ pr_err("wkq %d\n", err); ++ iput(args->h_child_inode); ++ iput(args->h_dir); ++ iput(args->dir); ++ au_kfree_rcu(args); ++ } ++ ++out: ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++int au_hnotify_reset_br(unsigned int udba, struct au_branch *br, int perm) ++{ ++ int err; ++ ++ AuDebugOn(!(udba & AuOptMask_UDBA)); ++ ++ err = 0; ++ if (au_hnotify_op.reset_br) ++ err = au_hnotify_op.reset_br(udba, br, perm); ++ ++ return err; ++} ++ ++int au_hnotify_init_br(struct au_branch *br, int perm) ++{ ++ int err; ++ ++ err = 0; ++ if (au_hnotify_op.init_br) ++ err = au_hnotify_op.init_br(br, perm); ++ ++ return err; ++} ++ ++void au_hnotify_fin_br(struct au_branch *br) ++{ ++ if (au_hnotify_op.fin_br) ++ au_hnotify_op.fin_br(br); ++} ++ ++static void au_hn_destroy_cache(void) ++{ ++ kmem_cache_destroy(au_cache[AuCache_HNOTIFY]); ++ au_cache[AuCache_HNOTIFY] = NULL; ++} ++ ++int __init au_hnotify_init(void) ++{ ++ int err; ++ ++ err = -ENOMEM; ++ au_cache[AuCache_HNOTIFY] = AuCache(au_hnotify); ++ if (au_cache[AuCache_HNOTIFY]) { ++ err = 0; ++ if (au_hnotify_op.init) ++ err = au_hnotify_op.init(); ++ if (unlikely(err)) ++ au_hn_destroy_cache(); ++ } ++ AuTraceErr(err); ++ return err; ++} ++ ++void au_hnotify_fin(void) ++{ ++ if (au_hnotify_op.fin) ++ au_hnotify_op.fin(); ++ ++ /* cf. au_cache_fin() */ ++ if (au_cache[AuCache_HNOTIFY]) ++ au_hn_destroy_cache(); ++} +diff --git a/fs/aufs/i_op.c b/fs/aufs/i_op.c +new file mode 100644 +index 000000000000..141620c2e0bd +--- /dev/null ++++ b/fs/aufs/i_op.c +@@ -0,0 +1,1517 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * inode operations (except add/del/rename) ++ */ ++ ++#include <linux/device_cgroup.h> ++#include <linux/filelock.h> ++#include <linux/fs_stack.h> ++#include <linux/iversion.h> ++#include <linux/security.h> ++#include "aufs.h" ++ ++static int h_permission(struct inode *h_inode, int mask, ++ struct path *h_path, int brperm) ++{ ++ int err; ++ const unsigned char write_mask = !!(mask & (MAY_WRITE | MAY_APPEND)); ++ struct mnt_idmap *h_idmap; ++ ++ err = -EPERM; ++ if (write_mask && IS_IMMUTABLE(h_inode)) ++ goto out; ++ ++ err = -EACCES; ++ if (((mask & MAY_EXEC) ++ && S_ISREG(h_inode->i_mode) ++ && (path_noexec(h_path) ++ || !(h_inode->i_mode & 0111)))) ++ goto out; ++ ++ /* ++ * - skip the lower fs test in the case of write to ro branch. ++ * - nfs dir permission write check is optimized, but a policy for ++ * link/rename requires a real check. ++ * - nfs always sets SB_POSIXACL regardless its mount option 'noacl.' ++ * in this case, generic_permission() returns -EOPNOTSUPP. ++ */ ++ h_idmap = mnt_idmap(h_path->mnt); ++ if ((write_mask && !au_br_writable(brperm)) ++ || (au_test_nfs(h_inode->i_sb) && S_ISDIR(h_inode->i_mode) ++ && write_mask && !(mask & MAY_READ)) ++ || !h_inode->i_op->permission) { ++ /* AuLabel(generic_permission); */ ++ /* AuDbg("get_inode_acl %ps\n", ++ h_inode->i_op->get_inode_acl); */ ++ err = generic_permission(h_idmap, h_inode, mask); ++ if (err == -EOPNOTSUPP && au_test_nfs_noacl(h_inode)) ++ err = h_inode->i_op->permission(h_idmap, h_inode, ++ mask); ++ AuTraceErr(err); ++ } else { ++ /* AuLabel(h_inode->permission); */ ++ err = h_inode->i_op->permission(h_idmap, h_inode, mask); ++ AuTraceErr(err); ++ } ++ ++ if (!err) ++ err = devcgroup_inode_permission(h_inode, mask); ++ if (!err) ++ err = security_inode_permission(h_inode, mask); ++ ++out: ++ return err; ++} ++ ++static int aufs_permission(struct mnt_idmap *idmap, struct inode *inode, ++ int mask) ++{ ++ int err; ++ aufs_bindex_t bindex, bbot; ++ const unsigned char isdir = !!S_ISDIR(inode->i_mode), ++ write_mask = !!(mask & (MAY_WRITE | MAY_APPEND)); ++ struct inode *h_inode; ++ struct super_block *sb; ++ struct au_branch *br; ++ ++ /* todo: support rcu-walk? */ ++ if (mask & MAY_NOT_BLOCK) ++ return -ECHILD; ++ ++ sb = inode->i_sb; ++ si_read_lock(sb, AuLock_FLUSH); ++ ii_read_lock_child(inode); ++#if 0 /* reserved for future use */ ++ /* ++ * This test may be rather 'too much' since the test is essentially done ++ * in the aufs_lookup(). Theoretically it is possible that the inode ++ * generation doesn't match to the superblock's here. But it isn't a ++ * big deal I suppose. ++ */ ++ err = au_iigen_test(inode, au_sigen(sb)); ++ if (unlikely(err)) ++ goto out; ++#endif ++ ++ if (!isdir ++ || write_mask ++ || au_opt_test(au_mntflags(sb), DIRPERM1)) { ++ err = au_busy_or_stale(); ++ h_inode = au_h_iptr(inode, au_ibtop(inode)); ++ if (unlikely(!h_inode ++ || (h_inode->i_mode & S_IFMT) ++ != (inode->i_mode & S_IFMT))) ++ goto out; ++ ++ err = 0; ++ bindex = au_ibtop(inode); ++ br = au_sbr(sb, bindex); ++ err = h_permission(h_inode, mask, &br->br_path, br->br_perm); ++ if (write_mask ++ && !err ++ && !special_file(h_inode->i_mode)) { ++ /* test whether the upper writable branch exists */ ++ err = -EROFS; ++ for (; bindex >= 0; bindex--) ++ if (!au_br_rdonly(au_sbr(sb, bindex))) { ++ err = 0; ++ break; ++ } ++ } ++ goto out; ++ } ++ ++ /* non-write to dir */ ++ err = 0; ++ bbot = au_ibbot(inode); ++ for (bindex = au_ibtop(inode); !err && bindex <= bbot; bindex++) { ++ h_inode = au_h_iptr(inode, bindex); ++ if (h_inode) { ++ err = au_busy_or_stale(); ++ if (unlikely(!S_ISDIR(h_inode->i_mode))) ++ break; ++ ++ br = au_sbr(sb, bindex); ++ err = h_permission(h_inode, mask, &br->br_path, ++ br->br_perm); ++ } ++ } ++ ++out: ++ ii_read_unlock(inode); ++ si_read_unlock(sb); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static struct dentry *aufs_lookup(struct inode *dir, struct dentry *dentry, ++ unsigned int flags) ++{ ++ struct dentry *ret, *parent; ++ struct inode *inode; ++ struct super_block *sb; ++ int err, npositive; ++ ++ IMustLock(dir); ++ ++ /* todo: support rcu-walk? */ ++ ret = ERR_PTR(-ECHILD); ++ if (flags & LOOKUP_RCU) ++ goto out; ++ ++ ret = ERR_PTR(-ENAMETOOLONG); ++ if (unlikely(dentry->d_name.len > AUFS_MAX_NAMELEN)) ++ goto out; ++ ++ sb = dir->i_sb; ++ err = si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLM); ++ ret = ERR_PTR(err); ++ if (unlikely(err)) ++ goto out; ++ ++ err = au_di_init(dentry); ++ ret = ERR_PTR(err); ++ if (unlikely(err)) ++ goto out_si; ++ ++ inode = NULL; ++ npositive = 0; /* suppress a warning */ ++ parent = dentry->d_parent; /* dir inode is locked */ ++ di_read_lock_parent(parent, AuLock_IR); ++ err = au_alive_dir(parent); ++ if (!err) ++ err = au_digen_test(parent, au_sigen(sb)); ++ if (!err) { ++ /* regardless LOOKUP_CREATE, always ALLOW_NEG */ ++ npositive = au_lkup_dentry(dentry, au_dbtop(parent), ++ AuLkup_ALLOW_NEG); ++ err = npositive; ++ } ++ di_read_unlock(parent, AuLock_IR); ++ ret = ERR_PTR(err); ++ if (unlikely(err < 0)) ++ goto out_unlock; ++ ++ if (npositive) { ++ inode = au_new_inode(dentry, /*must_new*/0); ++ if (IS_ERR(inode)) { ++ ret = (void *)inode; ++ inode = NULL; ++ goto out_unlock; ++ } ++ } ++ ++ if (inode) ++ atomic_inc(&inode->i_count); ++ ret = d_splice_alias(inode, dentry); ++#if 0 /* reserved for future use */ ++ if (unlikely(d_need_lookup(dentry))) { ++ spin_lock(&dentry->d_lock); ++ dentry->d_flags &= ~DCACHE_NEED_LOOKUP; ++ spin_unlock(&dentry->d_lock); ++ } else ++#endif ++ if (inode) { ++ if (!IS_ERR(ret)) { ++ iput(inode); ++ if (ret && ret != dentry) ++ ii_write_unlock(inode); ++ } else { ++ ii_write_unlock(inode); ++ iput(inode); ++ inode = NULL; ++ } ++ } ++ ++out_unlock: ++ di_write_unlock(dentry); ++out_si: ++ si_read_unlock(sb); ++out: ++ return ret; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * very dirty and complicated aufs ->atomic_open(). ++ * aufs_atomic_open() ++ * + au_aopen_or_create() ++ * + add_simple() ++ * + vfsub_atomic_open() ++ * + branch fs ->atomic_open() ++ * may call the actual 'open' for h_file ++ * + inc br_nfiles only if opened ++ * + au_aopen_no_open() or au_aopen_do_open() ++ * ++ * au_aopen_do_open() ++ * + finish_open() ++ * + au_do_aopen() ++ * + au_do_open() the body of all 'open' ++ * + au_do_open_nondir() ++ * set the passed h_file ++ * ++ * au_aopen_no_open() ++ * + finish_no_open() ++ */ ++ ++struct aopen_node { ++ struct hlist_bl_node hblist; ++ struct file *file, *h_file; ++}; ++ ++static int au_do_aopen(struct inode *inode, struct file *file) ++{ ++ struct hlist_bl_head *aopen; ++ struct hlist_bl_node *pos; ++ struct aopen_node *node; ++ struct au_do_open_args args = { ++ .aopen = 1, ++ .open = au_do_open_nondir ++ }; ++ ++ aopen = &au_sbi(inode->i_sb)->si_aopen; ++ hlist_bl_lock(aopen); ++ hlist_bl_for_each_entry(node, pos, aopen, hblist) ++ if (node->file == file) { ++ args.h_file = node->h_file; ++ break; ++ } ++ hlist_bl_unlock(aopen); ++ /* AuDebugOn(!args.h_file); */ ++ ++ return au_do_open(file, &args); ++} ++ ++static int au_aopen_do_open(struct file *file, struct dentry *dentry, ++ struct aopen_node *aopen_node) ++{ ++ int err; ++ struct hlist_bl_head *aopen; ++ ++ AuLabel(here); ++ aopen = &au_sbi(dentry->d_sb)->si_aopen; ++ au_hbl_add(&aopen_node->hblist, aopen); ++ err = finish_open(file, dentry, au_do_aopen); ++ au_hbl_del(&aopen_node->hblist, aopen); ++ /* AuDbgFile(file); */ ++ AuDbg("%pd%s%s\n", dentry, ++ (file->f_mode & FMODE_CREATED) ? " created" : "", ++ (file->f_mode & FMODE_OPENED) ? " opened" : ""); ++ ++ AuTraceErr(err); ++ return err; ++} ++ ++static int au_aopen_no_open(struct file *file, struct dentry *dentry) ++{ ++ int err; ++ ++ AuLabel(here); ++ dget(dentry); ++ err = finish_no_open(file, dentry); ++ ++ AuTraceErr(err); ++ return err; ++} ++ ++static int aufs_atomic_open(struct inode *dir, struct dentry *dentry, ++ struct file *file, unsigned int open_flag, ++ umode_t create_mode) ++{ ++ int err, did_open; ++ unsigned int lkup_flags; ++ aufs_bindex_t bindex; ++ struct super_block *sb; ++ struct dentry *parent, *d; ++ struct vfsub_aopen_args args = { ++ .open_flag = open_flag, ++ .create_mode = create_mode ++ }; ++ struct aopen_node aopen_node = { ++ .file = file ++ }; ++ ++ IMustLock(dir); ++ AuDbg("open_flag 0%o\n", open_flag); ++ AuDbgDentry(dentry); ++ ++ err = 0; ++ if (!au_di(dentry)) { ++ lkup_flags = LOOKUP_OPEN; ++ if (open_flag & O_CREAT) ++ lkup_flags |= LOOKUP_CREATE; ++ d = aufs_lookup(dir, dentry, lkup_flags); ++ if (IS_ERR(d)) { ++ err = PTR_ERR(d); ++ AuTraceErr(err); ++ goto out; ++ } else if (d) { ++ /* ++ * obsoleted dentry found. ++ * another error will be returned later. ++ */ ++ d_drop(d); ++ AuDbgDentry(d); ++ dput(d); ++ } ++ AuDbgDentry(dentry); ++ } ++ ++ if (d_is_positive(dentry) ++ || d_unhashed(dentry) ++ || d_unlinked(dentry) ++ || !(open_flag & O_CREAT)) { ++ err = au_aopen_no_open(file, dentry); ++ goto out; /* success */ ++ } ++ ++ err = aufs_read_lock(dentry, AuLock_DW | AuLock_FLUSH | AuLock_GEN); ++ if (unlikely(err)) ++ goto out; ++ ++ sb = dentry->d_sb; ++ parent = dentry->d_parent; /* dir is locked */ ++ di_write_lock_parent(parent); ++ err = au_lkup_dentry(dentry, /*btop*/0, AuLkup_ALLOW_NEG); ++ if (unlikely(err < 0)) ++ goto out_parent; ++ ++ AuDbgDentry(dentry); ++ if (d_is_positive(dentry)) { ++ err = au_aopen_no_open(file, dentry); ++ goto out_parent; /* success */ ++ } ++ ++ args.file = alloc_empty_file(file->f_flags, current_cred()); ++ err = PTR_ERR(args.file); ++ if (IS_ERR(args.file)) ++ goto out_parent; ++ ++ bindex = au_dbtop(dentry); ++ err = au_aopen_or_create(dir, dentry, &args); ++ AuTraceErr(err); ++ AuDbgFile(args.file); ++ file->f_mode = args.file->f_mode & ~FMODE_OPENED; ++ did_open = !!(args.file->f_mode & FMODE_OPENED); ++ if (!did_open) { ++ fput(args.file); ++ args.file = NULL; ++ } ++ di_write_unlock(parent); ++ di_write_unlock(dentry); ++ if (unlikely(err < 0)) { ++ if (args.file) ++ fput(args.file); ++ goto out_sb; ++ } ++ ++ if (!did_open) ++ err = au_aopen_no_open(file, dentry); ++ else { ++ aopen_node.h_file = args.file; ++ err = au_aopen_do_open(file, dentry, &aopen_node); ++ } ++ if (unlikely(err < 0)) { ++ if (args.file) ++ fput(args.file); ++ if (did_open) ++ au_lcnt_dec(&args.br->br_nfiles); ++ } ++ goto out_sb; /* success */ ++ ++out_parent: ++ di_write_unlock(parent); ++ di_write_unlock(dentry); ++out_sb: ++ si_read_unlock(sb); ++out: ++ AuTraceErr(err); ++ AuDbgFile(file); ++ return err; ++} ++ ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int au_wr_dir_cpup(struct dentry *dentry, struct dentry *parent, ++ const unsigned char add_entry, aufs_bindex_t bcpup, ++ aufs_bindex_t btop) ++{ ++ int err; ++ struct dentry *h_parent; ++ struct inode *h_dir; ++ ++ if (add_entry) ++ IMustLock(d_inode(parent)); ++ else ++ di_write_lock_parent(parent); ++ ++ err = 0; ++ if (!au_h_dptr(parent, bcpup)) { ++ if (btop > bcpup) ++ err = au_cpup_dirs(dentry, bcpup); ++ else if (btop < bcpup) ++ err = au_cpdown_dirs(dentry, bcpup); ++ else ++ BUG(); ++ } ++ if (!err && add_entry && !au_ftest_wrdir(add_entry, TMPFILE)) { ++ h_parent = au_h_dptr(parent, bcpup); ++ h_dir = d_inode(h_parent); ++ inode_lock_shared_nested(h_dir, AuLsc_I_PARENT); ++ err = au_lkup_neg(dentry, bcpup, /*wh*/0); ++ /* todo: no unlock here */ ++ inode_unlock_shared(h_dir); ++ ++ AuDbg("bcpup %d\n", bcpup); ++ if (!err) { ++ if (d_really_is_negative(dentry)) ++ au_set_h_dptr(dentry, btop, NULL); ++ au_update_dbrange(dentry, /*do_put_zero*/0); ++ } ++ } ++ ++ if (!add_entry) ++ di_write_unlock(parent); ++ if (!err) ++ err = bcpup; /* success */ ++ ++ AuTraceErr(err); ++ return err; ++} ++ ++/* ++ * decide the branch and the parent dir where we will create a new entry. ++ * returns new bindex or an error. ++ * copyup the parent dir if needed. ++ */ ++int au_wr_dir(struct dentry *dentry, struct dentry *src_dentry, ++ struct au_wr_dir_args *args) ++{ ++ int err; ++ unsigned int flags; ++ aufs_bindex_t bcpup, btop, src_btop; ++ const unsigned char add_entry ++ = au_ftest_wrdir(args->flags, ADD_ENTRY) ++ | au_ftest_wrdir(args->flags, TMPFILE); ++ struct super_block *sb; ++ struct dentry *parent; ++ struct au_sbinfo *sbinfo; ++ ++ sb = dentry->d_sb; ++ sbinfo = au_sbi(sb); ++ parent = dget_parent(dentry); ++ btop = au_dbtop(dentry); ++ bcpup = btop; ++ if (args->force_btgt < 0) { ++ if (src_dentry) { ++ src_btop = au_dbtop(src_dentry); ++ if (src_btop < btop) ++ bcpup = src_btop; ++ } else if (add_entry) { ++ flags = 0; ++ if (au_ftest_wrdir(args->flags, ISDIR)) ++ au_fset_wbr(flags, DIR); ++ err = AuWbrCreate(sbinfo, dentry, flags); ++ bcpup = err; ++ } ++ ++ if (bcpup < 0 || au_test_ro(sb, bcpup, d_inode(dentry))) { ++ if (add_entry) ++ err = AuWbrCopyup(sbinfo, dentry); ++ else { ++ if (!IS_ROOT(dentry)) { ++ di_read_lock_parent(parent, !AuLock_IR); ++ err = AuWbrCopyup(sbinfo, dentry); ++ di_read_unlock(parent, !AuLock_IR); ++ } else ++ err = AuWbrCopyup(sbinfo, dentry); ++ } ++ bcpup = err; ++ if (unlikely(err < 0)) ++ goto out; ++ } ++ } else { ++ bcpup = args->force_btgt; ++ AuDebugOn(au_test_ro(sb, bcpup, d_inode(dentry))); ++ } ++ ++ AuDbg("btop %d, bcpup %d\n", btop, bcpup); ++ err = bcpup; ++ if (bcpup == btop) ++ goto out; /* success */ ++ ++ /* copyup the new parent into the branch we process */ ++ err = au_wr_dir_cpup(dentry, parent, add_entry, bcpup, btop); ++ if (err >= 0) { ++ if (d_really_is_negative(dentry)) { ++ au_set_h_dptr(dentry, btop, NULL); ++ au_set_dbtop(dentry, bcpup); ++ au_set_dbbot(dentry, bcpup); ++ } ++ AuDebugOn(add_entry ++ && !au_ftest_wrdir(args->flags, TMPFILE) ++ && !au_h_dptr(dentry, bcpup)); ++ } ++ ++out: ++ dput(parent); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++void au_pin_hdir_unlock(struct au_pin *p) ++{ ++ if (p->hdir) ++ au_hn_inode_unlock(p->hdir); ++} ++ ++int au_pin_hdir_lock(struct au_pin *p) ++{ ++ int err; ++ ++ err = 0; ++ if (!p->hdir) ++ goto out; ++ ++ /* even if an error happens later, keep this lock */ ++ au_hn_inode_lock_nested(p->hdir, p->lsc_hi); ++ ++ err = -EBUSY; ++ if (unlikely(p->hdir->hi_inode != d_inode(p->h_parent))) ++ goto out; ++ ++ err = 0; ++ if (p->h_dentry) ++ err = au_h_verify(p->h_dentry, p->udba, p->hdir->hi_inode, ++ p->h_parent, p->br); ++ ++out: ++ return err; ++} ++ ++int au_pin_hdir_relock(struct au_pin *p) ++{ ++ int err, i; ++ struct inode *h_i; ++ struct dentry *h_d[] = { ++ p->h_dentry, ++ p->h_parent ++ }; ++ ++ err = au_pin_hdir_lock(p); ++ if (unlikely(err)) ++ goto out; ++ ++ for (i = 0; !err && i < sizeof(h_d)/sizeof(*h_d); i++) { ++ if (!h_d[i]) ++ continue; ++ if (d_is_positive(h_d[i])) { ++ h_i = d_inode(h_d[i]); ++ err = !h_i->i_nlink; ++ } ++ } ++ ++out: ++ return err; ++} ++ ++static void au_pin_hdir_set_owner(struct au_pin *p, struct task_struct *task) ++{ ++ atomic_long_set(&p->hdir->hi_inode->i_rwsem.owner, (long)task); ++} ++ ++void au_pin_hdir_acquire_nest(struct au_pin *p) ++{ ++ if (p->hdir) { ++ rwsem_acquire_nest(&p->hdir->hi_inode->i_rwsem.dep_map, ++ p->lsc_hi, 0, NULL, _RET_IP_); ++ au_pin_hdir_set_owner(p, current); ++ } ++} ++ ++void au_pin_hdir_release(struct au_pin *p) ++{ ++ if (p->hdir) { ++ au_pin_hdir_set_owner(p, p->task); ++ rwsem_release(&p->hdir->hi_inode->i_rwsem.dep_map, _RET_IP_); ++ } ++} ++ ++struct dentry *au_pinned_h_parent(struct au_pin *pin) ++{ ++ if (pin && pin->parent) ++ return au_h_dptr(pin->parent, pin->bindex); ++ return NULL; ++} ++ ++void au_unpin(struct au_pin *p) ++{ ++ if (p->hdir) ++ au_pin_hdir_unlock(p); ++ if (p->h_mnt && au_ftest_pin(p->flags, MNT_WRITE)) ++ vfsub_mnt_drop_write(p->h_mnt); ++ if (!p->hdir) ++ return; ++ ++ if (!au_ftest_pin(p->flags, DI_LOCKED)) ++ di_read_unlock(p->parent, AuLock_IR); ++ iput(p->hdir->hi_inode); ++ dput(p->parent); ++ p->parent = NULL; ++ p->hdir = NULL; ++ p->h_mnt = NULL; ++ /* do not clear p->task */ ++} ++ ++int au_do_pin(struct au_pin *p) ++{ ++ int err; ++ struct super_block *sb; ++ struct inode *h_dir; ++ ++ err = 0; ++ sb = p->dentry->d_sb; ++ p->br = au_sbr(sb, p->bindex); ++ if (IS_ROOT(p->dentry)) { ++ if (au_ftest_pin(p->flags, MNT_WRITE)) { ++ p->h_mnt = au_br_mnt(p->br); ++ err = vfsub_mnt_want_write(p->h_mnt); ++ if (unlikely(err)) { ++ au_fclr_pin(p->flags, MNT_WRITE); ++ goto out_err; ++ } ++ } ++ goto out; ++ } ++ ++ p->h_dentry = NULL; ++ if (p->bindex <= au_dbbot(p->dentry)) ++ p->h_dentry = au_h_dptr(p->dentry, p->bindex); ++ ++ p->parent = dget_parent(p->dentry); ++ if (!au_ftest_pin(p->flags, DI_LOCKED)) ++ di_read_lock(p->parent, AuLock_IR, p->lsc_di); ++ ++ h_dir = NULL; ++ p->h_parent = au_h_dptr(p->parent, p->bindex); ++ p->hdir = au_hi(d_inode(p->parent), p->bindex); ++ if (p->hdir) ++ h_dir = p->hdir->hi_inode; ++ ++ /* ++ * udba case, or ++ * if DI_LOCKED is not set, then p->parent may be different ++ * and h_parent can be NULL. ++ */ ++ if (unlikely(!p->hdir || !h_dir || !p->h_parent)) { ++ err = -EBUSY; ++ if (!au_ftest_pin(p->flags, DI_LOCKED)) ++ di_read_unlock(p->parent, AuLock_IR); ++ dput(p->parent); ++ p->parent = NULL; ++ goto out_err; ++ } ++ ++ if (au_ftest_pin(p->flags, MNT_WRITE)) { ++ p->h_mnt = au_br_mnt(p->br); ++ err = vfsub_mnt_want_write(p->h_mnt); ++ if (unlikely(err)) { ++ au_fclr_pin(p->flags, MNT_WRITE); ++ if (!au_ftest_pin(p->flags, DI_LOCKED)) ++ di_read_unlock(p->parent, AuLock_IR); ++ dput(p->parent); ++ p->parent = NULL; ++ goto out_err; ++ } ++ } ++ ++ au_igrab(h_dir); ++ err = au_pin_hdir_lock(p); ++ if (!err) ++ goto out; /* success */ ++ ++ au_unpin(p); ++ ++out_err: ++ pr_err("err %d\n", err); ++ err = au_busy_or_stale(); ++out: ++ return err; ++} ++ ++void au_pin_init(struct au_pin *p, struct dentry *dentry, ++ aufs_bindex_t bindex, int lsc_di, int lsc_hi, ++ unsigned int udba, unsigned char flags) ++{ ++ p->dentry = dentry; ++ p->udba = udba; ++ p->lsc_di = lsc_di; ++ p->lsc_hi = lsc_hi; ++ p->flags = flags; ++ p->bindex = bindex; ++ ++ p->parent = NULL; ++ p->hdir = NULL; ++ p->h_mnt = NULL; ++ ++ p->h_dentry = NULL; ++ p->h_parent = NULL; ++ p->br = NULL; ++ p->task = current; ++} ++ ++int au_pin(struct au_pin *pin, struct dentry *dentry, aufs_bindex_t bindex, ++ unsigned int udba, unsigned char flags) ++{ ++ au_pin_init(pin, dentry, bindex, AuLsc_DI_PARENT, AuLsc_I_PARENT2, ++ udba, flags); ++ return au_do_pin(pin); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * ->setattr() and ->getattr() are called in various cases. ++ * chmod, stat: dentry is revalidated. ++ * fchmod, fstat: file and dentry are not revalidated, additionally they may be ++ * unhashed. ++ * for ->setattr(), ia->ia_file is passed from ftruncate only. ++ */ ++/* todo: consolidate with do_refresh() and simple_reval_dpath() */ ++int au_reval_for_attr(struct dentry *dentry, unsigned int sigen) ++{ ++ int err; ++ struct dentry *parent; ++ ++ err = 0; ++ if (au_digen_test(dentry, sigen)) { ++ parent = dget_parent(dentry); ++ di_read_lock_parent(parent, AuLock_IR); ++ err = au_refresh_dentry(dentry, parent); ++ di_read_unlock(parent, AuLock_IR); ++ dput(parent); ++ } ++ ++ AuTraceErr(err); ++ return err; ++} ++ ++int au_pin_and_icpup(struct dentry *dentry, struct iattr *ia, ++ struct au_icpup_args *a) ++{ ++ int err; ++ loff_t sz; ++ aufs_bindex_t btop, ibtop; ++ struct dentry *hi_wh, *parent; ++ struct inode *inode; ++ struct au_wr_dir_args wr_dir_args = { ++ .force_btgt = -1, ++ .flags = 0 ++ }; ++ ++ if (d_is_dir(dentry)) ++ au_fset_wrdir(wr_dir_args.flags, ISDIR); ++ /* plink or hi_wh() case */ ++ btop = au_dbtop(dentry); ++ inode = d_inode(dentry); ++ ibtop = au_ibtop(inode); ++ if (btop != ibtop && !au_test_ro(inode->i_sb, ibtop, inode)) ++ wr_dir_args.force_btgt = ibtop; ++ err = au_wr_dir(dentry, /*src_dentry*/NULL, &wr_dir_args); ++ if (unlikely(err < 0)) ++ goto out; ++ a->btgt = err; ++ if (err != btop) ++ au_fset_icpup(a->flags, DID_CPUP); ++ ++ err = 0; ++ a->pin_flags = AuPin_MNT_WRITE; ++ parent = NULL; ++ if (!IS_ROOT(dentry)) { ++ au_fset_pin(a->pin_flags, DI_LOCKED); ++ parent = dget_parent(dentry); ++ di_write_lock_parent(parent); ++ } ++ ++ err = au_pin(&a->pin, dentry, a->btgt, a->udba, a->pin_flags); ++ if (unlikely(err)) ++ goto out_parent; ++ ++ sz = -1; ++ a->h_path.dentry = au_h_dptr(dentry, btop); ++ a->h_inode = d_inode(a->h_path.dentry); ++ if (ia && (ia->ia_valid & ATTR_SIZE)) { ++ inode_lock_shared_nested(a->h_inode, AuLsc_I_CHILD); ++ if (ia->ia_size < i_size_read(a->h_inode)) ++ sz = ia->ia_size; ++ inode_unlock_shared(a->h_inode); ++ } ++ ++ hi_wh = NULL; ++ if (au_ftest_icpup(a->flags, DID_CPUP) && d_unlinked(dentry)) { ++ hi_wh = au_hi_wh(inode, a->btgt); ++ if (!hi_wh) { ++ struct au_cp_generic cpg = { ++ .dentry = dentry, ++ .bdst = a->btgt, ++ .bsrc = -1, ++ .len = sz, ++ .pin = &a->pin ++ }; ++ err = au_sio_cpup_wh(&cpg, /*file*/NULL); ++ if (unlikely(err)) ++ goto out_unlock; ++ hi_wh = au_hi_wh(inode, a->btgt); ++ /* todo: revalidate hi_wh? */ ++ } ++ } ++ ++ if (parent) { ++ au_pin_set_parent_lflag(&a->pin, /*lflag*/0); ++ di_downgrade_lock(parent, AuLock_IR); ++ dput(parent); ++ parent = NULL; ++ } ++ if (!au_ftest_icpup(a->flags, DID_CPUP)) ++ goto out; /* success */ ++ ++ if (!d_unhashed(dentry)) { ++ struct au_cp_generic cpg = { ++ .dentry = dentry, ++ .bdst = a->btgt, ++ .bsrc = btop, ++ .len = sz, ++ .pin = &a->pin, ++ .flags = AuCpup_DTIME | AuCpup_HOPEN ++ }; ++ err = au_sio_cpup_simple(&cpg); ++ if (!err) ++ a->h_path.dentry = au_h_dptr(dentry, a->btgt); ++ } else if (!hi_wh) ++ a->h_path.dentry = au_h_dptr(dentry, a->btgt); ++ else ++ a->h_path.dentry = hi_wh; /* do not dget here */ ++ ++out_unlock: ++ a->h_inode = d_inode(a->h_path.dentry); ++ if (!err) ++ goto out; /* success */ ++ au_unpin(&a->pin); ++out_parent: ++ if (parent) { ++ di_write_unlock(parent); ++ dput(parent); ++ } ++out: ++ if (!err) ++ inode_lock_nested(a->h_inode, AuLsc_I_CHILD); ++ return err; ++} ++ ++static int aufs_setattr(struct mnt_idmap *idmap, struct dentry *dentry, ++ struct iattr *ia) ++{ ++ int err; ++ struct inode *inode, *delegated; ++ struct super_block *sb; ++ struct file *file; ++ struct au_icpup_args *a; ++ struct mnt_idmap *h_idmap; ++ ++ inode = d_inode(dentry); ++ IMustLock(inode); ++ ++ err = setattr_prepare(idmap, dentry, ia); ++ if (unlikely(err)) ++ goto out; ++ ++ err = -ENOMEM; ++ a = kzalloc(sizeof(*a), GFP_NOFS); ++ if (unlikely(!a)) ++ goto out; ++ ++ if (ia->ia_valid & (ATTR_KILL_SUID | ATTR_KILL_SGID)) ++ ia->ia_valid &= ~ATTR_MODE; ++ ++ file = NULL; ++ sb = dentry->d_sb; ++ err = si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLM); ++ if (unlikely(err)) ++ goto out_kfree; ++ ++ if (ia->ia_valid & ATTR_FILE) { ++ /* currently ftruncate(2) only */ ++ AuDebugOn(!d_is_reg(dentry)); ++ file = ia->ia_file; ++ err = au_reval_and_lock_fdi(file, au_reopen_nondir, /*wlock*/1, ++ /*fi_lsc*/0); ++ if (unlikely(err)) ++ goto out_si; ++ ia->ia_file = au_hf_top(file); ++ a->udba = AuOpt_UDBA_NONE; ++ } else { ++ /* fchmod() doesn't pass ia_file */ ++ a->udba = au_opt_udba(sb); ++ di_write_lock_child(dentry); ++ /* no d_unlinked(), to set UDBA_NONE for root */ ++ if (d_unhashed(dentry)) ++ a->udba = AuOpt_UDBA_NONE; ++ if (a->udba != AuOpt_UDBA_NONE) { ++ AuDebugOn(IS_ROOT(dentry)); ++ err = au_reval_for_attr(dentry, au_sigen(sb)); ++ if (unlikely(err)) ++ goto out_dentry; ++ } ++ } ++ ++ err = au_pin_and_icpup(dentry, ia, a); ++ if (unlikely(err < 0)) ++ goto out_dentry; ++ if (au_ftest_icpup(a->flags, DID_CPUP)) { ++ ia->ia_file = NULL; ++ ia->ia_valid &= ~ATTR_FILE; ++ } ++ ++ a->h_path.mnt = au_sbr_mnt(sb, a->btgt); ++ if ((ia->ia_valid & (ATTR_MODE | ATTR_CTIME)) ++ == (ATTR_MODE | ATTR_CTIME)) { ++ err = security_path_chmod(&a->h_path, ia->ia_mode); ++ if (unlikely(err)) ++ goto out_unlock; ++ } else if ((ia->ia_valid & (ATTR_UID | ATTR_GID)) ++ && (ia->ia_valid & ATTR_CTIME)) { ++ err = security_path_chown(&a->h_path, ia->ia_uid, ia->ia_gid); ++ if (unlikely(err)) ++ goto out_unlock; ++ } ++ ++ if (ia->ia_valid & ATTR_SIZE) { ++ struct file *f; ++ ++ if (ia->ia_size < i_size_read(inode)) ++ /* unmap only */ ++ truncate_setsize(inode, ia->ia_size); ++ ++ f = NULL; ++ if (ia->ia_valid & ATTR_FILE) ++ f = ia->ia_file; ++ inode_unlock(a->h_inode); ++ err = vfsub_trunc(&a->h_path, ia->ia_size, ia->ia_valid, f); ++ inode_lock_nested(a->h_inode, AuLsc_I_CHILD); ++ } else { ++ delegated = NULL; ++ while (1) { ++ err = vfsub_notify_change(&a->h_path, ia, &delegated); ++ if (delegated) { ++ err = break_deleg_wait(&delegated); ++ if (!err) ++ continue; ++ } ++ break; ++ } ++ } ++ /* ++ * regardless aufs 'acl' option setting. ++ * why don't all acl-aware fs call this func from their ->setattr()? ++ */ ++ if (!err && (ia->ia_valid & ATTR_MODE)) { ++ h_idmap = mnt_idmap(a->h_path.mnt); ++ err = vfsub_acl_chmod(h_idmap, a->h_path.dentry, ia->ia_mode); ++ } ++ if (!err) ++ au_cpup_attr_changeable(inode); ++ ++out_unlock: ++ inode_unlock(a->h_inode); ++ au_unpin(&a->pin); ++ if (unlikely(err)) ++ au_update_dbtop(dentry); ++out_dentry: ++ di_write_unlock(dentry); ++ if (file) { ++ fi_write_unlock(file); ++ ia->ia_file = file; ++ ia->ia_valid |= ATTR_FILE; ++ } ++out_si: ++ si_read_unlock(sb); ++out_kfree: ++ au_kfree_rcu(a); ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++#if IS_ENABLED(CONFIG_AUFS_XATTR) || IS_ENABLED(CONFIG_FS_POSIX_ACL) ++static int au_h_path_to_set_attr(struct dentry *dentry, ++ struct au_icpup_args *a, struct path *h_path) ++{ ++ int err; ++ struct super_block *sb; ++ ++ sb = dentry->d_sb; ++ a->udba = au_opt_udba(sb); ++ /* no d_unlinked(), to set UDBA_NONE for root */ ++ if (d_unhashed(dentry)) ++ a->udba = AuOpt_UDBA_NONE; ++ if (a->udba != AuOpt_UDBA_NONE) { ++ AuDebugOn(IS_ROOT(dentry)); ++ err = au_reval_for_attr(dentry, au_sigen(sb)); ++ if (unlikely(err)) ++ goto out; ++ } ++ err = au_pin_and_icpup(dentry, /*ia*/NULL, a); ++ if (unlikely(err < 0)) ++ goto out; ++ ++ h_path->dentry = a->h_path.dentry; ++ h_path->mnt = au_sbr_mnt(sb, a->btgt); ++ ++out: ++ return err; ++} ++ ++ssize_t au_sxattr(struct dentry *dentry, struct inode *inode, ++ struct au_sxattr *arg) ++{ ++ int err; ++ struct path h_path; ++ struct super_block *sb; ++ struct au_icpup_args *a; ++ struct inode *h_inode; ++ struct mnt_idmap *h_idmap; ++ ++ IMustLock(inode); ++ ++ err = -ENOMEM; ++ a = kzalloc(sizeof(*a), GFP_NOFS); ++ if (unlikely(!a)) ++ goto out; ++ ++ sb = dentry->d_sb; ++ err = si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLM); ++ if (unlikely(err)) ++ goto out_kfree; ++ ++ h_path.dentry = NULL; /* silence gcc */ ++ di_write_lock_child(dentry); ++ err = au_h_path_to_set_attr(dentry, a, &h_path); ++ if (unlikely(err)) ++ goto out_di; ++ h_idmap = mnt_idmap(h_path.mnt); ++ ++ inode_unlock(a->h_inode); ++ switch (arg->type) { ++ case AU_XATTR_SET: ++ AuDebugOn(d_is_negative(h_path.dentry)); ++ err = vfsub_setxattr(h_idmap, h_path.dentry, ++ arg->u.set.name, arg->u.set.value, ++ arg->u.set.size, arg->u.set.flags); ++ break; ++ case AU_ACL_SET: ++ err = -EOPNOTSUPP; ++ h_inode = d_inode(h_path.dentry); ++ if (h_inode->i_op->set_acl) { ++ /* this will call posix_acl_update_mode */ ++ err = h_inode->i_op->set_acl(h_idmap, h_path.dentry, ++ arg->u.acl_set.acl, ++ arg->u.acl_set.type); ++ } ++ break; ++ } ++ if (!err) ++ au_cpup_attr_timesizes(inode); ++ ++ au_unpin(&a->pin); ++ if (unlikely(err)) ++ au_update_dbtop(dentry); ++ ++out_di: ++ di_write_unlock(dentry); ++ si_read_unlock(sb); ++out_kfree: ++ au_kfree_rcu(a); ++out: ++ AuTraceErr(err); ++ return err; ++} ++#endif ++ ++static void au_refresh_iattr(struct inode *inode, struct kstat *st, ++ unsigned int nlink) ++{ ++ unsigned int n; ++ ++ inode->i_mode = st->mode; ++ /* don't i_[ug]id_write() here */ ++ inode->i_uid = st->uid; ++ inode->i_gid = st->gid; ++ inode->i_atime = st->atime; ++ inode->i_mtime = st->mtime; ++ inode->i_ctime = st->ctime; ++ ++ au_cpup_attr_nlink(inode, /*force*/0); ++ if (S_ISDIR(inode->i_mode)) { ++ n = inode->i_nlink; ++ n -= nlink; ++ n += st->nlink; ++ smp_mb(); /* for i_nlink */ ++ /* 0 can happen */ ++ set_nlink(inode, n); ++ } ++ ++ spin_lock(&inode->i_lock); ++ inode->i_blocks = st->blocks; ++ i_size_write(inode, st->size); ++ spin_unlock(&inode->i_lock); ++} ++ ++/* ++ * common routine for aufs_getattr() and au_getxattr(). ++ * returns zero or negative (an error). ++ * @dentry will be read-locked in success. ++ */ ++int au_h_path_getattr(struct dentry *dentry, struct inode *inode, int force, ++ struct path *h_path, int locked) ++{ ++ int err; ++ unsigned int mnt_flags, sigen; ++ unsigned char udba_none; ++ aufs_bindex_t bindex; ++ struct super_block *sb, *h_sb; ++ ++ h_path->mnt = NULL; ++ h_path->dentry = NULL; ++ ++ err = 0; ++ sb = dentry->d_sb; ++ mnt_flags = au_mntflags(sb); ++ udba_none = !!au_opt_test(mnt_flags, UDBA_NONE); ++ ++ if (unlikely(locked)) ++ goto body; /* skip locking dinfo */ ++ ++ /* support fstat(2) */ ++ if (!d_unlinked(dentry) && !udba_none) { ++ sigen = au_sigen(sb); ++ err = au_digen_test(dentry, sigen); ++ if (!err) { ++ di_read_lock_child(dentry, AuLock_IR); ++ err = au_dbrange_test(dentry); ++ if (unlikely(err)) { ++ di_read_unlock(dentry, AuLock_IR); ++ goto out; ++ } ++ } else { ++ AuDebugOn(IS_ROOT(dentry)); ++ di_write_lock_child(dentry); ++ err = au_dbrange_test(dentry); ++ if (!err) ++ err = au_reval_for_attr(dentry, sigen); ++ if (!err) ++ di_downgrade_lock(dentry, AuLock_IR); ++ else { ++ di_write_unlock(dentry); ++ goto out; ++ } ++ } ++ } else ++ di_read_lock_child(dentry, AuLock_IR); ++ ++body: ++ if (!inode) { ++ inode = d_inode(dentry); ++ if (unlikely(!inode)) ++ goto out; ++ } ++ bindex = au_ibtop(inode); ++ h_path->mnt = au_sbr_mnt(sb, bindex); ++ h_sb = h_path->mnt->mnt_sb; ++ if (!force ++ && !au_test_fs_bad_iattr(h_sb) ++ && udba_none) ++ goto out; /* success */ ++ ++ if (au_dbtop(dentry) == bindex) ++ h_path->dentry = au_h_dptr(dentry, bindex); ++ else if (au_opt_test(mnt_flags, PLINK) && au_plink_test(inode)) { ++ h_path->dentry = au_plink_lkup(inode, bindex); ++ if (IS_ERR(h_path->dentry)) ++ /* pretending success */ ++ h_path->dentry = NULL; ++ else ++ dput(h_path->dentry); ++ } ++ ++out: ++ return err; ++} ++ ++static int aufs_getattr(struct mnt_idmap *idmap, const struct path *path, ++ struct kstat *st, u32 request, unsigned int query) ++{ ++ int err; ++ unsigned char positive; ++ struct path h_path; ++ struct dentry *dentry; ++ struct inode *inode; ++ struct super_block *sb; ++ ++ dentry = path->dentry; ++ inode = d_inode(dentry); ++ sb = dentry->d_sb; ++ err = si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLM); ++ if (unlikely(err)) ++ goto out; ++ err = au_h_path_getattr(dentry, /*inode*/NULL, /*force*/0, &h_path, ++ /*locked*/0); ++ if (unlikely(err)) ++ goto out_si; ++ if (unlikely(!h_path.dentry)) ++ /* illegally overlapped or something */ ++ goto out_fill; /* pretending success */ ++ ++ positive = d_is_positive(h_path.dentry); ++ if (positive) ++ /* no vfsub version */ ++ err = vfs_getattr(&h_path, st, request, query); ++ if (!err) { ++ if (positive) ++ au_refresh_iattr(inode, st, ++ d_inode(h_path.dentry)->i_nlink); ++ goto out_fill; /* success */ ++ } ++ AuTraceErr(err); ++ goto out_di; ++ ++out_fill: ++ generic_fillattr(idmap, inode, st); ++out_di: ++ di_read_unlock(dentry, AuLock_IR); ++out_si: ++ si_read_unlock(sb); ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static const char *aufs_get_link(struct dentry *dentry, struct inode *inode, ++ struct delayed_call *done) ++{ ++ const char *ret; ++ struct dentry *h_dentry; ++ struct inode *h_inode; ++ int err; ++ aufs_bindex_t bindex; ++ ++ ret = NULL; /* suppress a warning */ ++ err = -ECHILD; ++ if (!dentry) ++ goto out; ++ ++ err = aufs_read_lock(dentry, AuLock_IR | AuLock_GEN); ++ if (unlikely(err)) ++ goto out; ++ ++ err = au_d_hashed_positive(dentry); ++ if (unlikely(err)) ++ goto out_unlock; ++ ++ err = -EINVAL; ++ inode = d_inode(dentry); ++ bindex = au_ibtop(inode); ++ h_inode = au_h_iptr(inode, bindex); ++ if (unlikely(!h_inode->i_op->get_link)) ++ goto out_unlock; ++ ++ err = -EBUSY; ++ h_dentry = NULL; ++ if (au_dbtop(dentry) <= bindex) { ++ h_dentry = au_h_dptr(dentry, bindex); ++ if (h_dentry) ++ dget(h_dentry); ++ } ++ if (!h_dentry) { ++ h_dentry = d_find_any_alias(h_inode); ++ if (IS_ERR(h_dentry)) { ++ err = PTR_ERR(h_dentry); ++ goto out_unlock; ++ } ++ } ++ if (unlikely(!h_dentry)) ++ goto out_unlock; ++ ++ err = 0; ++ AuDbg("%ps\n", h_inode->i_op->get_link); ++ AuDbgDentry(h_dentry); ++ ret = vfs_get_link(h_dentry, done); ++ dput(h_dentry); ++ if (IS_ERR(ret)) ++ err = PTR_ERR(ret); ++ ++out_unlock: ++ aufs_read_unlock(dentry, AuLock_IR); ++out: ++ if (unlikely(err)) ++ ret = ERR_PTR(err); ++ AuTraceErrPtr(ret); ++ return ret; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int au_is_special(struct inode *inode) ++{ ++ return (inode->i_mode & (S_IFBLK | S_IFCHR | S_IFIFO | S_IFSOCK)); ++} ++ ++static int aufs_update_time(struct inode *inode, struct timespec64 *ts, ++ int flags) ++{ ++ int err; ++ aufs_bindex_t bindex; ++ struct super_block *sb; ++ struct inode *h_inode; ++ struct vfsmount *h_mnt; ++ ++ sb = inode->i_sb; ++ WARN_ONCE((flags & S_ATIME) && !IS_NOATIME(inode), ++ "unexpected s_flags 0x%lx", sb->s_flags); ++ ++ /* mmap_sem might be acquired already, cf. aufs_mmap() */ ++ lockdep_off(); ++ si_read_lock(sb, AuLock_FLUSH); ++ ii_write_lock_child(inode); ++ ++ err = 0; ++ bindex = au_ibtop(inode); ++ h_inode = au_h_iptr(inode, bindex); ++ if (!au_test_ro(sb, bindex, inode)) { ++ h_mnt = au_sbr_mnt(sb, bindex); ++ err = vfsub_mnt_want_write(h_mnt); ++ if (!err) { ++ err = vfsub_update_time(h_inode, ts, flags); ++ vfsub_mnt_drop_write(h_mnt); ++ } ++ } else if (au_is_special(h_inode)) { ++ /* ++ * Never copy-up here. ++ * These special files may already be opened and used for ++ * communicating. If we copied it up, then the communication ++ * would be corrupted. ++ */ ++ AuWarn1("timestamps for i%lu are ignored " ++ "since it is on readonly branch (hi%lu).\n", ++ inode->i_ino, h_inode->i_ino); ++ } else if (flags & ~S_ATIME) { ++ err = -EIO; ++ AuIOErr1("unexpected flags 0x%x\n", flags); ++ AuDebugOn(1); ++ } ++ ++ if (!err) ++ au_cpup_attr_timesizes(inode); ++ ii_write_unlock(inode); ++ si_read_unlock(sb); ++ lockdep_on(); ++ ++ if (!err && (flags & S_VERSION)) ++ inode_inc_iversion(inode); ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* no getattr version will be set by module.c:aufs_init() */ ++struct inode_operations aufs_iop_nogetattr[AuIop_Last], ++ aufs_iop[] = { ++ [AuIop_SYMLINK] = { ++ .permission = aufs_permission, ++#ifdef CONFIG_FS_POSIX_ACL ++ .get_inode_acl = aufs_get_inode_acl, ++ .get_acl = aufs_get_acl, ++ .set_acl = aufs_set_acl, /* unsupport for symlink? */ ++#endif ++ ++ .setattr = aufs_setattr, ++ .getattr = aufs_getattr, ++ ++#ifdef CONFIG_AUFS_XATTR ++ .listxattr = aufs_listxattr, ++#endif ++ ++ .get_link = aufs_get_link ++ ++ /* .update_time = aufs_update_time */ ++ }, ++ [AuIop_DIR] = { ++ .create = aufs_create, ++ .lookup = aufs_lookup, ++ .link = aufs_link, ++ .unlink = aufs_unlink, ++ .symlink = aufs_symlink, ++ .mkdir = aufs_mkdir, ++ .rmdir = aufs_rmdir, ++ .mknod = aufs_mknod, ++ .rename = aufs_rename, ++ ++ .permission = aufs_permission, ++#ifdef CONFIG_FS_POSIX_ACL ++ .get_inode_acl = aufs_get_inode_acl, ++ .get_acl = aufs_get_acl, ++ .set_acl = aufs_set_acl, ++#endif ++ ++ .setattr = aufs_setattr, ++ .getattr = aufs_getattr, ++ ++#ifdef CONFIG_AUFS_XATTR ++ .listxattr = aufs_listxattr, ++#endif ++ ++ .update_time = aufs_update_time, ++ .atomic_open = aufs_atomic_open, ++ .tmpfile = aufs_tmpfile ++ }, ++ [AuIop_OTHER] = { ++ .permission = aufs_permission, ++#ifdef CONFIG_FS_POSIX_ACL ++ .get_inode_acl = aufs_get_inode_acl, ++ .get_acl = aufs_get_acl, ++ .set_acl = aufs_set_acl, ++#endif ++ ++ .setattr = aufs_setattr, ++ .getattr = aufs_getattr, ++ ++#ifdef CONFIG_AUFS_XATTR ++ .listxattr = aufs_listxattr, ++#endif ++ ++ .update_time = aufs_update_time ++ } ++}; +diff --git a/fs/aufs/i_op_add.c b/fs/aufs/i_op_add.c +new file mode 100644 +index 000000000000..2adf97d4488d +--- /dev/null ++++ b/fs/aufs/i_op_add.c +@@ -0,0 +1,972 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * inode operations (add entry) ++ */ ++ ++#include <linux/iversion.h> ++#include "aufs.h" ++ ++/* ++ * final procedure of adding a new entry, except link(2). ++ * remove whiteout, instantiate, copyup the parent dir's times and size ++ * and update version. ++ * if it failed, re-create the removed whiteout. ++ */ ++static int epilog(struct inode *dir, aufs_bindex_t bindex, ++ struct dentry *wh_dentry, struct dentry *dentry) ++{ ++ int err, rerr; ++ aufs_bindex_t bwh; ++ struct path h_path; ++ struct super_block *sb; ++ struct inode *inode, *h_dir; ++ struct dentry *wh; ++ ++ bwh = -1; ++ sb = dir->i_sb; ++ if (wh_dentry) { ++ h_dir = d_inode(wh_dentry->d_parent); /* dir inode is locked */ ++ IMustLock(h_dir); ++ AuDebugOn(au_h_iptr(dir, bindex) != h_dir); ++ bwh = au_dbwh(dentry); ++ h_path.dentry = wh_dentry; ++ h_path.mnt = au_sbr_mnt(sb, bindex); ++ err = au_wh_unlink_dentry(au_h_iptr(dir, bindex), &h_path, ++ dentry); ++ if (unlikely(err)) ++ goto out; ++ } ++ ++ inode = au_new_inode(dentry, /*must_new*/1); ++ if (!IS_ERR(inode)) { ++ d_instantiate(dentry, inode); ++ dir = d_inode(dentry->d_parent); /* dir inode is locked */ ++ IMustLock(dir); ++ au_dir_ts(dir, bindex); ++ inode_inc_iversion(dir); ++ au_fhsm_wrote(sb, bindex, /*force*/0); ++ return 0; /* success */ ++ } ++ ++ err = PTR_ERR(inode); ++ if (!wh_dentry) ++ goto out; ++ ++ /* revert */ ++ /* dir inode is locked */ ++ wh = au_wh_create(dentry, bwh, wh_dentry->d_parent); ++ rerr = PTR_ERR(wh); ++ if (IS_ERR(wh)) { ++ AuIOErr("%pd reverting whiteout failed(%d, %d)\n", ++ dentry, err, rerr); ++ err = -EIO; ++ } else ++ dput(wh); ++ ++out: ++ return err; ++} ++ ++static int au_d_may_add(struct dentry *dentry) ++{ ++ int err; ++ ++ err = 0; ++ if (unlikely(d_unhashed(dentry))) ++ err = -ENOENT; ++ if (unlikely(d_really_is_positive(dentry))) ++ err = -EEXIST; ++ return err; ++} ++ ++/* ++ * simple tests for the adding inode operations. ++ * following the checks in vfs, plus the parent-child relationship. ++ */ ++int au_may_add(struct dentry *dentry, aufs_bindex_t bindex, ++ struct dentry *h_parent, int isdir) ++{ ++ int err; ++ umode_t h_mode; ++ struct dentry *h_dentry; ++ struct inode *h_inode; ++ ++ err = -ENAMETOOLONG; ++ if (unlikely(dentry->d_name.len > AUFS_MAX_NAMELEN)) ++ goto out; ++ ++ h_dentry = au_h_dptr(dentry, bindex); ++ if (d_really_is_negative(dentry)) { ++ err = -EEXIST; ++ if (unlikely(d_is_positive(h_dentry))) ++ goto out; ++ } else { ++ /* rename(2) case */ ++ err = -EIO; ++ if (unlikely(d_is_negative(h_dentry))) ++ goto out; ++ h_inode = d_inode(h_dentry); ++ if (unlikely(!h_inode->i_nlink)) ++ goto out; ++ ++ h_mode = h_inode->i_mode; ++ if (!isdir) { ++ err = -EISDIR; ++ if (unlikely(S_ISDIR(h_mode))) ++ goto out; ++ } else if (unlikely(!S_ISDIR(h_mode))) { ++ err = -ENOTDIR; ++ goto out; ++ } ++ } ++ ++ err = 0; ++ /* expected parent dir is locked */ ++ if (unlikely(h_parent != h_dentry->d_parent)) ++ err = -EIO; ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++/* ++ * initial procedure of adding a new entry. ++ * prepare writable branch and the parent dir, lock it, ++ * and lookup whiteout for the new entry. ++ */ ++static struct dentry* ++lock_hdir_lkup_wh(struct dentry *dentry, struct au_dtime *dt, ++ struct dentry *src_dentry, struct au_pin *pin, ++ struct au_wr_dir_args *wr_dir_args) ++{ ++ struct dentry *wh_dentry, *h_parent; ++ struct super_block *sb; ++ struct au_branch *br; ++ int err; ++ unsigned int udba; ++ aufs_bindex_t bcpup; ++ ++ AuDbg("%pd\n", dentry); ++ ++ err = au_wr_dir(dentry, src_dentry, wr_dir_args); ++ bcpup = err; ++ wh_dentry = ERR_PTR(err); ++ if (unlikely(err < 0)) ++ goto out; ++ ++ sb = dentry->d_sb; ++ udba = au_opt_udba(sb); ++ err = au_pin(pin, dentry, bcpup, udba, ++ AuPin_DI_LOCKED | AuPin_MNT_WRITE); ++ wh_dentry = ERR_PTR(err); ++ if (unlikely(err)) ++ goto out; ++ ++ h_parent = au_pinned_h_parent(pin); ++ if (udba != AuOpt_UDBA_NONE ++ && au_dbtop(dentry) == bcpup) ++ err = au_may_add(dentry, bcpup, h_parent, ++ au_ftest_wrdir(wr_dir_args->flags, ISDIR)); ++ else if (unlikely(dentry->d_name.len > AUFS_MAX_NAMELEN)) ++ err = -ENAMETOOLONG; ++ wh_dentry = ERR_PTR(err); ++ if (unlikely(err)) ++ goto out_unpin; ++ ++ br = au_sbr(sb, bcpup); ++ if (dt) { ++ struct path tmp = { ++ .dentry = h_parent, ++ .mnt = au_br_mnt(br) ++ }; ++ au_dtime_store(dt, au_pinned_parent(pin), &tmp); ++ } ++ ++ wh_dentry = NULL; ++ if (bcpup != au_dbwh(dentry)) ++ goto out; /* success */ ++ ++ /* ++ * ENAMETOOLONG here means that if we allowed create such name, then it ++ * would not be able to removed in the future. So we don't allow such ++ * name here and we don't handle ENAMETOOLONG differently here. ++ */ ++ wh_dentry = au_wh_lkup(h_parent, &dentry->d_name, br); ++ ++out_unpin: ++ if (IS_ERR(wh_dentry)) ++ au_unpin(pin); ++out: ++ return wh_dentry; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++enum { Mknod, Symlink, Creat }; ++struct simple_arg { ++ int type; ++ union { ++ struct { ++ umode_t mode; ++ bool want_excl; ++ bool try_aopen; ++ struct vfsub_aopen_args *aopen; ++ } c; ++ struct { ++ const char *symname; ++ } s; ++ struct { ++ umode_t mode; ++ dev_t dev; ++ } m; ++ } u; ++}; ++ ++static int add_simple(struct inode *dir, struct dentry *dentry, ++ struct simple_arg *arg) ++{ ++ int err, rerr; ++ aufs_bindex_t btop; ++ unsigned char created; ++ const unsigned char try_aopen ++ = (arg->type == Creat && arg->u.c.try_aopen); ++ struct vfsub_aopen_args *aopen = arg->u.c.aopen; ++ struct dentry *wh_dentry, *parent; ++ struct inode *h_dir; ++ struct super_block *sb; ++ struct au_branch *br; ++ /* to reduce stack size */ ++ struct { ++ struct au_dtime dt; ++ struct au_pin pin; ++ struct path h_path; ++ struct au_wr_dir_args wr_dir_args; ++ } *a; ++ ++ AuDbg("%pd\n", dentry); ++ IMustLock(dir); ++ ++ err = -ENOMEM; ++ a = kmalloc(sizeof(*a), GFP_NOFS); ++ if (unlikely(!a)) ++ goto out; ++ a->wr_dir_args.force_btgt = -1; ++ a->wr_dir_args.flags = AuWrDir_ADD_ENTRY; ++ ++ parent = dentry->d_parent; /* dir inode is locked */ ++ if (!try_aopen) { ++ err = aufs_read_lock(dentry, AuLock_DW | AuLock_GEN); ++ if (unlikely(err)) ++ goto out_free; ++ } ++ err = au_d_may_add(dentry); ++ if (unlikely(err)) ++ goto out_unlock; ++ if (!try_aopen) ++ di_write_lock_parent(parent); ++ wh_dentry = lock_hdir_lkup_wh(dentry, &a->dt, /*src_dentry*/NULL, ++ &a->pin, &a->wr_dir_args); ++ err = PTR_ERR(wh_dentry); ++ if (IS_ERR(wh_dentry)) ++ goto out_parent; ++ ++ btop = au_dbtop(dentry); ++ sb = dentry->d_sb; ++ br = au_sbr(sb, btop); ++ a->h_path.dentry = au_h_dptr(dentry, btop); ++ a->h_path.mnt = au_br_mnt(br); ++ h_dir = au_pinned_h_dir(&a->pin); ++ switch (arg->type) { ++ case Creat: ++ if (!try_aopen || !h_dir->i_op->atomic_open) { ++ err = vfsub_create(h_dir, &a->h_path, arg->u.c.mode, ++ arg->u.c.want_excl); ++ created = !err; ++ if (!err && try_aopen) ++ aopen->file->f_mode |= FMODE_CREATED; ++ } else { ++ aopen->br = br; ++ err = vfsub_atomic_open(h_dir, a->h_path.dentry, aopen); ++ AuDbg("err %d\n", err); ++ AuDbgFile(aopen->file); ++ created = err >= 0 ++ && !!(aopen->file->f_mode & FMODE_CREATED); ++ } ++ break; ++ case Symlink: ++ err = vfsub_symlink(h_dir, &a->h_path, arg->u.s.symname); ++ created = !err; ++ break; ++ case Mknod: ++ err = vfsub_mknod(h_dir, &a->h_path, arg->u.m.mode, ++ arg->u.m.dev); ++ created = !err; ++ break; ++ default: ++ BUG(); ++ } ++ if (unlikely(err < 0)) ++ goto out_unpin; ++ ++ err = epilog(dir, btop, wh_dentry, dentry); ++ if (!err) ++ goto out_unpin; /* success */ ++ ++ /* revert */ ++ if (created /* && d_is_positive(a->h_path.dentry) */) { ++ /* no delegation since it is just created */ ++ rerr = vfsub_unlink(h_dir, &a->h_path, /*delegated*/NULL, ++ /*force*/0); ++ if (rerr) { ++ AuIOErr("%pd revert failure(%d, %d)\n", ++ dentry, err, rerr); ++ err = -EIO; ++ } ++ au_dtime_revert(&a->dt); ++ } ++ if (try_aopen && h_dir->i_op->atomic_open ++ && (aopen->file->f_mode & FMODE_OPENED)) ++ /* aopen->file is still opened */ ++ au_lcnt_dec(&aopen->br->br_nfiles); ++ ++out_unpin: ++ au_unpin(&a->pin); ++ dput(wh_dentry); ++out_parent: ++ if (!try_aopen) ++ di_write_unlock(parent); ++out_unlock: ++ if (unlikely(err)) { ++ au_update_dbtop(dentry); ++ d_drop(dentry); ++ } ++ if (!try_aopen) ++ aufs_read_unlock(dentry, AuLock_DW); ++out_free: ++ au_kfree_rcu(a); ++out: ++ return err; ++} ++ ++int aufs_mknod(struct mnt_idmap *idmap, struct inode *dir, ++ struct dentry *dentry, umode_t mode, dev_t dev) ++{ ++ struct simple_arg arg = { ++ .type = Mknod, ++ .u.m = { ++ .mode = mode, ++ .dev = dev ++ } ++ }; ++ return add_simple(dir, dentry, &arg); ++} ++ ++int aufs_symlink(struct mnt_idmap *idmap, struct inode *dir, ++ struct dentry *dentry, const char *symname) ++{ ++ struct simple_arg arg = { ++ .type = Symlink, ++ .u.s.symname = symname ++ }; ++ return add_simple(dir, dentry, &arg); ++} ++ ++int aufs_create(struct mnt_idmap *idmap, struct inode *dir, ++ struct dentry *dentry, umode_t mode, bool want_excl) ++{ ++ struct simple_arg arg = { ++ .type = Creat, ++ .u.c = { ++ .mode = mode, ++ .want_excl = want_excl ++ } ++ }; ++ return add_simple(dir, dentry, &arg); ++} ++ ++int au_aopen_or_create(struct inode *dir, struct dentry *dentry, ++ struct vfsub_aopen_args *aopen_args) ++{ ++ struct simple_arg arg = { ++ .type = Creat, ++ .u.c = { ++ .mode = aopen_args->create_mode, ++ .want_excl = aopen_args->open_flag & O_EXCL, ++ .try_aopen = true, ++ .aopen = aopen_args ++ } ++ }; ++ return add_simple(dir, dentry, &arg); ++} ++ ++int aufs_tmpfile(struct mnt_idmap *idmap, struct inode *dir, ++ struct file *file, umode_t mode) ++{ ++ int err; ++ aufs_bindex_t bindex; ++ struct path h_ppath; ++ struct super_block *sb; ++ struct au_branch *br; ++ struct dentry *dentry, *parent, *h_parent, *h_dentry; ++ struct inode *h_dir, *inode; ++ struct vfsmount *h_mnt; ++ struct mnt_idmap *h_idmap; ++ struct file *h_file; ++ struct au_wr_dir_args wr_dir_args = { ++ .force_btgt = -1, ++ .flags = AuWrDir_TMPFILE ++ }; ++ ++ /* copy-up may happen */ ++ inode_lock(dir); ++ ++ h_file = NULL; ++ sb = dir->i_sb; ++ err = si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLM); ++ if (unlikely(err)) ++ goto out; ++ ++ dentry = file->f_path.dentry; ++ err = au_di_init(dentry); ++ if (unlikely(err)) ++ goto out_si; ++ ++ err = -EBUSY; ++ parent = d_find_any_alias(dir); ++ AuDebugOn(!parent); ++ di_write_lock_parent(parent); ++ if (unlikely(d_inode(parent) != dir)) ++ goto out_parent; ++ ++ err = au_digen_test(parent, au_sigen(sb)); ++ if (unlikely(err)) ++ goto out_parent; ++ ++ bindex = au_dbtop(parent); ++ au_set_dbtop(dentry, bindex); ++ au_set_dbbot(dentry, bindex); ++ err = au_wr_dir(dentry, /*src_dentry*/NULL, &wr_dir_args); ++ bindex = err; ++ if (unlikely(err < 0)) ++ goto out_parent; ++ ++ err = -EOPNOTSUPP; ++ h_dir = au_h_iptr(dir, bindex); ++ if (unlikely(!h_dir->i_op->tmpfile)) ++ goto out_parent; ++ ++ br = au_sbr(sb, bindex); ++ h_mnt = au_br_mnt(br); ++ err = vfsub_mnt_want_write(h_mnt); ++ if (unlikely(err)) ++ goto out_parent; ++ ++ h_idmap = mnt_idmap(h_mnt); ++ h_parent = au_h_dptr(parent, bindex); ++ h_ppath.mnt = h_mnt; ++ h_ppath.dentry = h_parent; ++ h_file = kernel_tmpfile_open(h_idmap, &h_ppath, mode, /*open_flag*/0, ++ current_cred()); ++ if (IS_ERR(h_file)) { ++ err = PTR_ERR(h_file); ++ h_file = NULL; ++ goto out_mnt; ++ } ++ ++ h_dentry = h_file->f_path.dentry; ++ au_set_dbtop(dentry, bindex); ++ au_set_dbbot(dentry, bindex); ++ au_set_h_dptr(dentry, bindex, dget(h_dentry)); ++ inode = au_new_inode(dentry, /*must_new*/1); ++ if (IS_ERR(inode)) { ++ err = PTR_ERR(inode); ++ au_set_h_dptr(dentry, bindex, NULL); ++ au_set_dbtop(dentry, -1); ++ au_set_dbbot(dentry, -1); ++ goto out_h_file; ++ } ++ ++ if (!inode->i_nlink) ++ set_nlink(inode, 1); ++ d_tmpfile(file, inode); ++ au_di(dentry)->di_tmpfile = 1; ++ get_file(h_file); ++ au_di(dentry)->di_htmpfile = h_file; ++ ++ /* update without i_mutex */ ++ if (au_ibtop(dir) == au_dbtop(dentry)) ++ au_cpup_attr_timesizes(dir); ++ ++out_h_file: ++ fput(h_file); ++out_mnt: ++ vfsub_mnt_drop_write(h_mnt); ++out_parent: ++ di_write_unlock(parent); ++ dput(parent); ++ di_write_unlock(dentry); ++ if (!err) ++ goto out_si; ++ if (h_file) ++ fput(h_file); ++ au_di(dentry)->di_htmpfile = NULL; ++ au_di_fin(dentry); ++ dentry->d_fsdata = NULL; ++out_si: ++ si_read_unlock(sb); ++ if (!err && h_file) { ++ /* finally... */ ++ err = finish_open_simple(file, err); ++ if (!err) ++ au_lcnt_inc(&br->br_nfiles); ++ else { ++ fput(h_file); ++ au_di(dentry)->di_htmpfile = NULL; ++ au_di_fin(dentry); ++ dentry->d_fsdata = NULL; ++ } ++ } ++out: ++ inode_unlock(dir); ++ AuTraceErr(err); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++struct au_link_args { ++ aufs_bindex_t bdst, bsrc; ++ struct au_pin pin; ++ struct path h_path; ++ struct dentry *src_parent, *parent; ++}; ++ ++static int au_cpup_before_link(struct dentry *src_dentry, ++ struct au_link_args *a) ++{ ++ int err; ++ struct dentry *h_src_dentry; ++ struct au_cp_generic cpg = { ++ .dentry = src_dentry, ++ .bdst = a->bdst, ++ .bsrc = a->bsrc, ++ .len = -1, ++ .pin = &a->pin, ++ .flags = AuCpup_DTIME | AuCpup_HOPEN /* | AuCpup_KEEPLINO */ ++ }; ++ ++ di_read_lock_parent(a->src_parent, AuLock_IR); ++ err = au_test_and_cpup_dirs(src_dentry, a->bdst); ++ if (unlikely(err)) ++ goto out; ++ ++ h_src_dentry = au_h_dptr(src_dentry, a->bsrc); ++ err = au_pin(&a->pin, src_dentry, a->bdst, ++ au_opt_udba(src_dentry->d_sb), ++ AuPin_DI_LOCKED | AuPin_MNT_WRITE); ++ if (unlikely(err)) ++ goto out; ++ ++ err = au_sio_cpup_simple(&cpg); ++ au_unpin(&a->pin); ++ ++out: ++ di_read_unlock(a->src_parent, AuLock_IR); ++ return err; ++} ++ ++static int au_cpup_or_link(struct dentry *src_dentry, struct dentry *dentry, ++ struct au_link_args *a) ++{ ++ int err; ++ unsigned char plink; ++ aufs_bindex_t bbot; ++ struct dentry *h_src_dentry; ++ struct inode *h_inode, *inode, *delegated; ++ struct super_block *sb; ++ struct file *h_file; ++ ++ plink = 0; ++ h_inode = NULL; ++ sb = src_dentry->d_sb; ++ inode = d_inode(src_dentry); ++ if (au_ibtop(inode) <= a->bdst) ++ h_inode = au_h_iptr(inode, a->bdst); ++ if (!h_inode || !h_inode->i_nlink) { ++ /* copyup src_dentry as the name of dentry. */ ++ bbot = au_dbbot(dentry); ++ if (bbot < a->bsrc) ++ au_set_dbbot(dentry, a->bsrc); ++ au_set_h_dptr(dentry, a->bsrc, ++ dget(au_h_dptr(src_dentry, a->bsrc))); ++ dget(a->h_path.dentry); ++ au_set_h_dptr(dentry, a->bdst, NULL); ++ AuDbg("temporary d_inode...\n"); ++ spin_lock(&dentry->d_lock); ++ dentry->d_inode = d_inode(src_dentry); /* tmp */ ++ spin_unlock(&dentry->d_lock); ++ h_file = au_h_open_pre(dentry, a->bsrc, /*force_wr*/0); ++ if (IS_ERR(h_file)) ++ err = PTR_ERR(h_file); ++ else { ++ struct au_cp_generic cpg = { ++ .dentry = dentry, ++ .bdst = a->bdst, ++ .bsrc = -1, ++ .len = -1, ++ .pin = &a->pin, ++ .flags = AuCpup_KEEPLINO ++ }; ++ err = au_sio_cpup_simple(&cpg); ++ au_h_open_post(dentry, a->bsrc, h_file); ++ if (!err) { ++ dput(a->h_path.dentry); ++ a->h_path.dentry = au_h_dptr(dentry, a->bdst); ++ } else ++ au_set_h_dptr(dentry, a->bdst, ++ a->h_path.dentry); ++ } ++ spin_lock(&dentry->d_lock); ++ dentry->d_inode = NULL; /* restore */ ++ spin_unlock(&dentry->d_lock); ++ AuDbg("temporary d_inode...done\n"); ++ au_set_h_dptr(dentry, a->bsrc, NULL); ++ au_set_dbbot(dentry, bbot); ++ } else { ++ /* the inode of src_dentry already exists on a.bdst branch */ ++ h_src_dentry = d_find_alias(h_inode); ++ if (!h_src_dentry && au_plink_test(inode)) { ++ plink = 1; ++ h_src_dentry = au_plink_lkup(inode, a->bdst); ++ err = PTR_ERR(h_src_dentry); ++ if (IS_ERR(h_src_dentry)) ++ goto out; ++ ++ if (unlikely(d_is_negative(h_src_dentry))) { ++ dput(h_src_dentry); ++ h_src_dentry = NULL; ++ } ++ ++ } ++ if (h_src_dentry) { ++ delegated = NULL; ++ err = vfsub_link(h_src_dentry, au_pinned_h_dir(&a->pin), ++ &a->h_path, &delegated); ++ if (unlikely(err == -EWOULDBLOCK)) { ++ pr_warn("cannot retry for NFSv4 delegation" ++ " for an internal link\n"); ++ iput(delegated); ++ } ++ dput(h_src_dentry); ++ } else { ++ AuIOErr("no dentry found for hi%lu on b%d\n", ++ h_inode->i_ino, a->bdst); ++ err = -EIO; ++ } ++ } ++ ++ if (!err && !plink) ++ au_plink_append(inode, a->bdst, a->h_path.dentry); ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++int aufs_link(struct dentry *src_dentry, struct inode *dir, ++ struct dentry *dentry) ++{ ++ int err, rerr; ++ struct au_dtime dt; ++ struct au_link_args *a; ++ struct dentry *wh_dentry, *h_src_dentry; ++ struct inode *inode, *delegated; ++ struct super_block *sb; ++ struct au_wr_dir_args wr_dir_args = { ++ /* .force_btgt = -1, */ ++ .flags = AuWrDir_ADD_ENTRY ++ }; ++ ++ IMustLock(dir); ++ inode = d_inode(src_dentry); ++ IMustLock(inode); ++ ++ err = -ENOMEM; ++ a = kzalloc(sizeof(*a), GFP_NOFS); ++ if (unlikely(!a)) ++ goto out; ++ ++ a->parent = dentry->d_parent; /* dir inode is locked */ ++ err = aufs_read_and_write_lock2(dentry, src_dentry, ++ AuLock_NOPLM | AuLock_GEN); ++ if (unlikely(err)) ++ goto out_kfree; ++ err = au_d_linkable(src_dentry); ++ if (unlikely(err)) ++ goto out_unlock; ++ err = au_d_may_add(dentry); ++ if (unlikely(err)) ++ goto out_unlock; ++ ++ a->src_parent = dget_parent(src_dentry); ++ wr_dir_args.force_btgt = au_ibtop(inode); ++ ++ di_write_lock_parent(a->parent); ++ wr_dir_args.force_btgt = au_wbr(dentry, wr_dir_args.force_btgt); ++ wh_dentry = lock_hdir_lkup_wh(dentry, &dt, src_dentry, &a->pin, ++ &wr_dir_args); ++ err = PTR_ERR(wh_dentry); ++ if (IS_ERR(wh_dentry)) ++ goto out_parent; ++ ++ err = 0; ++ sb = dentry->d_sb; ++ a->bdst = au_dbtop(dentry); ++ a->h_path.dentry = au_h_dptr(dentry, a->bdst); ++ a->h_path.mnt = au_sbr_mnt(sb, a->bdst); ++ a->bsrc = au_ibtop(inode); ++ h_src_dentry = au_h_d_alias(src_dentry, a->bsrc); ++ if (!h_src_dentry && au_di(src_dentry)->di_tmpfile) ++ h_src_dentry = dget(au_hi_wh(inode, a->bsrc)); ++ if (!h_src_dentry) { ++ a->bsrc = au_dbtop(src_dentry); ++ h_src_dentry = au_h_d_alias(src_dentry, a->bsrc); ++ AuDebugOn(!h_src_dentry); ++ } else if (IS_ERR(h_src_dentry)) { ++ err = PTR_ERR(h_src_dentry); ++ goto out_parent; ++ } ++ ++ /* ++ * aufs doesn't touch the credential so ++ * security_dentry_create_files_as() is unnecessary. ++ */ ++ if (au_opt_test(au_mntflags(sb), PLINK)) { ++ if (a->bdst < a->bsrc ++ /* && h_src_dentry->d_sb != a->h_path.dentry->d_sb */) ++ err = au_cpup_or_link(src_dentry, dentry, a); ++ else { ++ delegated = NULL; ++ err = vfsub_link(h_src_dentry, au_pinned_h_dir(&a->pin), ++ &a->h_path, &delegated); ++ if (unlikely(err == -EWOULDBLOCK)) { ++ pr_warn("cannot retry for NFSv4 delegation" ++ " for an internal link\n"); ++ iput(delegated); ++ } ++ } ++ dput(h_src_dentry); ++ } else { ++ /* ++ * copyup src_dentry to the branch we process, ++ * and then link(2) to it. ++ */ ++ dput(h_src_dentry); ++ if (a->bdst < a->bsrc ++ /* && h_src_dentry->d_sb != a->h_path.dentry->d_sb */) { ++ au_unpin(&a->pin); ++ di_write_unlock(a->parent); ++ err = au_cpup_before_link(src_dentry, a); ++ di_write_lock_parent(a->parent); ++ if (!err) ++ err = au_pin(&a->pin, dentry, a->bdst, ++ au_opt_udba(sb), ++ AuPin_DI_LOCKED | AuPin_MNT_WRITE); ++ if (unlikely(err)) ++ goto out_wh; ++ } ++ if (!err) { ++ h_src_dentry = au_h_dptr(src_dentry, a->bdst); ++ err = -ENOENT; ++ if (h_src_dentry && d_is_positive(h_src_dentry)) { ++ delegated = NULL; ++ err = vfsub_link(h_src_dentry, ++ au_pinned_h_dir(&a->pin), ++ &a->h_path, &delegated); ++ if (unlikely(err == -EWOULDBLOCK)) { ++ pr_warn("cannot retry" ++ " for NFSv4 delegation" ++ " for an internal link\n"); ++ iput(delegated); ++ } ++ } ++ } ++ } ++ if (unlikely(err)) ++ goto out_unpin; ++ ++ if (wh_dentry) { ++ a->h_path.dentry = wh_dentry; ++ err = au_wh_unlink_dentry(au_pinned_h_dir(&a->pin), &a->h_path, ++ dentry); ++ if (unlikely(err)) ++ goto out_revert; ++ } ++ ++ au_dir_ts(dir, a->bdst); ++ inode_inc_iversion(dir); ++ inc_nlink(inode); ++ inode->i_ctime = dir->i_ctime; ++ d_instantiate(dentry, au_igrab(inode)); ++ if (d_unhashed(a->h_path.dentry)) ++ /* some filesystem calls d_drop() */ ++ d_drop(dentry); ++ /* some filesystems consume an inode even hardlink */ ++ au_fhsm_wrote(sb, a->bdst, /*force*/0); ++ goto out_unpin; /* success */ ++ ++out_revert: ++ /* no delegation since it is just created */ ++ rerr = vfsub_unlink(au_pinned_h_dir(&a->pin), &a->h_path, ++ /*delegated*/NULL, /*force*/0); ++ if (unlikely(rerr)) { ++ AuIOErr("%pd reverting failed(%d, %d)\n", dentry, err, rerr); ++ err = -EIO; ++ } ++ au_dtime_revert(&dt); ++out_unpin: ++ au_unpin(&a->pin); ++out_wh: ++ dput(wh_dentry); ++out_parent: ++ di_write_unlock(a->parent); ++ dput(a->src_parent); ++out_unlock: ++ if (unlikely(err)) { ++ au_update_dbtop(dentry); ++ d_drop(dentry); ++ } ++ aufs_read_and_write_unlock2(dentry, src_dentry); ++out_kfree: ++ au_kfree_rcu(a); ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++int aufs_mkdir(struct mnt_idmap *idmap, struct inode *dir, ++ struct dentry *dentry, umode_t mode) ++{ ++ int err, rerr; ++ aufs_bindex_t bindex; ++ unsigned char diropq; ++ struct path h_path; ++ struct dentry *wh_dentry, *parent, *opq_dentry; ++ struct inode *h_inode; ++ struct super_block *sb; ++ struct { ++ struct au_pin pin; ++ struct au_dtime dt; ++ } *a; /* reduce the stack usage */ ++ struct au_wr_dir_args wr_dir_args = { ++ .force_btgt = -1, ++ .flags = AuWrDir_ADD_ENTRY | AuWrDir_ISDIR ++ }; ++ ++ IMustLock(dir); ++ ++ err = -ENOMEM; ++ a = kmalloc(sizeof(*a), GFP_NOFS); ++ if (unlikely(!a)) ++ goto out; ++ ++ err = aufs_read_lock(dentry, AuLock_DW | AuLock_GEN); ++ if (unlikely(err)) ++ goto out_free; ++ err = au_d_may_add(dentry); ++ if (unlikely(err)) ++ goto out_unlock; ++ ++ parent = dentry->d_parent; /* dir inode is locked */ ++ di_write_lock_parent(parent); ++ wh_dentry = lock_hdir_lkup_wh(dentry, &a->dt, /*src_dentry*/NULL, ++ &a->pin, &wr_dir_args); ++ err = PTR_ERR(wh_dentry); ++ if (IS_ERR(wh_dentry)) ++ goto out_parent; ++ ++ sb = dentry->d_sb; ++ bindex = au_dbtop(dentry); ++ h_path.dentry = au_h_dptr(dentry, bindex); ++ h_path.mnt = au_sbr_mnt(sb, bindex); ++ err = vfsub_mkdir(au_pinned_h_dir(&a->pin), &h_path, mode); ++ if (unlikely(err)) ++ goto out_unpin; ++ ++ /* make the dir opaque */ ++ diropq = 0; ++ h_inode = d_inode(h_path.dentry); ++ if (wh_dentry ++ || au_opt_test(au_mntflags(sb), ALWAYS_DIROPQ)) { ++ inode_lock_nested(h_inode, AuLsc_I_CHILD); ++ opq_dentry = au_diropq_create(dentry, bindex); ++ inode_unlock(h_inode); ++ err = PTR_ERR(opq_dentry); ++ if (IS_ERR(opq_dentry)) ++ goto out_dir; ++ dput(opq_dentry); ++ diropq = 1; ++ } ++ ++ err = epilog(dir, bindex, wh_dentry, dentry); ++ if (!err) { ++ inc_nlink(dir); ++ goto out_unpin; /* success */ ++ } ++ ++ /* revert */ ++ if (diropq) { ++ AuLabel(revert opq); ++ inode_lock_nested(h_inode, AuLsc_I_CHILD); ++ rerr = au_diropq_remove(dentry, bindex); ++ inode_unlock(h_inode); ++ if (rerr) { ++ AuIOErr("%pd reverting diropq failed(%d, %d)\n", ++ dentry, err, rerr); ++ err = -EIO; ++ } ++ } ++ ++out_dir: ++ AuLabel(revert dir); ++ rerr = vfsub_rmdir(au_pinned_h_dir(&a->pin), &h_path); ++ if (rerr) { ++ AuIOErr("%pd reverting dir failed(%d, %d)\n", ++ dentry, err, rerr); ++ err = -EIO; ++ } ++ au_dtime_revert(&a->dt); ++out_unpin: ++ au_unpin(&a->pin); ++ dput(wh_dentry); ++out_parent: ++ di_write_unlock(parent); ++out_unlock: ++ if (unlikely(err)) { ++ au_update_dbtop(dentry); ++ d_drop(dentry); ++ } ++ aufs_read_unlock(dentry, AuLock_DW); ++out_free: ++ au_kfree_rcu(a); ++out: ++ return err; ++} +diff --git a/fs/aufs/i_op_del.c b/fs/aufs/i_op_del.c +new file mode 100644 +index 000000000000..d85f47cef29f +--- /dev/null ++++ b/fs/aufs/i_op_del.c +@@ -0,0 +1,522 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * inode operations (del entry) ++ */ ++ ++#include <linux/iversion.h> ++#include "aufs.h" ++ ++/* ++ * decide if a new whiteout for @dentry is necessary or not. ++ * when it is necessary, prepare the parent dir for the upper branch whose ++ * branch index is @bcpup for creation. the actual creation of the whiteout will ++ * be done by caller. ++ * return value: ++ * 0: wh is unnecessary ++ * plus: wh is necessary ++ * minus: error ++ */ ++int au_wr_dir_need_wh(struct dentry *dentry, int isdir, aufs_bindex_t *bcpup) ++{ ++ int need_wh, err; ++ aufs_bindex_t btop; ++ struct super_block *sb; ++ ++ sb = dentry->d_sb; ++ btop = au_dbtop(dentry); ++ if (*bcpup < 0) { ++ *bcpup = btop; ++ if (au_test_ro(sb, btop, d_inode(dentry))) { ++ err = AuWbrCopyup(au_sbi(sb), dentry); ++ *bcpup = err; ++ if (unlikely(err < 0)) ++ goto out; ++ } ++ } else ++ AuDebugOn(btop < *bcpup ++ || au_test_ro(sb, *bcpup, d_inode(dentry))); ++ AuDbg("bcpup %d, btop %d\n", *bcpup, btop); ++ ++ if (*bcpup != btop) { ++ err = au_cpup_dirs(dentry, *bcpup); ++ if (unlikely(err)) ++ goto out; ++ need_wh = 1; ++ } else { ++ struct au_dinfo *dinfo, *tmp; ++ ++ need_wh = -ENOMEM; ++ dinfo = au_di(dentry); ++ tmp = au_di_alloc(sb, AuLsc_DI_TMP); ++ if (tmp) { ++ au_di_cp(tmp, dinfo); ++ au_di_swap(tmp, dinfo); ++ /* returns the number of positive dentries */ ++ need_wh = au_lkup_dentry(dentry, btop + 1, ++ /* AuLkup_IGNORE_PERM */ 0); ++ au_di_swap(tmp, dinfo); ++ au_rw_write_unlock(&tmp->di_rwsem); ++ au_di_free(tmp); ++ } ++ } ++ AuDbg("need_wh %d\n", need_wh); ++ err = need_wh; ++ ++out: ++ return err; ++} ++ ++/* ++ * simple tests for the del-entry operations. ++ * following the checks in vfs, plus the parent-child relationship. ++ */ ++int au_may_del(struct dentry *dentry, aufs_bindex_t bindex, ++ struct dentry *h_parent, int isdir) ++{ ++ int err; ++ umode_t h_mode; ++ struct dentry *h_dentry, *h_latest; ++ struct inode *h_inode; ++ struct path h_ppath; ++ struct super_block *sb; ++ struct au_branch *br; ++ struct mnt_idmap *h_idmap; ++ ++ h_dentry = au_h_dptr(dentry, bindex); ++ if (d_really_is_positive(dentry)) { ++ err = -ENOENT; ++ if (unlikely(d_is_negative(h_dentry))) ++ goto out; ++ h_inode = d_inode(h_dentry); ++ if (unlikely(!h_inode->i_nlink)) ++ goto out; ++ ++ h_mode = h_inode->i_mode; ++ if (!isdir) { ++ err = -EISDIR; ++ if (unlikely(S_ISDIR(h_mode))) ++ goto out; ++ } else if (unlikely(!S_ISDIR(h_mode))) { ++ err = -ENOTDIR; ++ goto out; ++ } ++ } else { ++ /* rename(2) case */ ++ err = -EIO; ++ if (unlikely(d_is_positive(h_dentry))) ++ goto out; ++ } ++ ++ err = -ENOENT; ++ /* expected parent dir is locked */ ++ if (unlikely(h_parent != h_dentry->d_parent)) ++ goto out; ++ err = 0; ++ ++ /* ++ * rmdir a dir may break the consistency on some filesystem. ++ * let's try heavy test. ++ */ ++ err = -EACCES; ++ sb = dentry->d_sb; ++ br = au_sbr(sb, bindex); ++ h_idmap = au_br_idmap(br); ++ if (unlikely(!au_opt_test(au_mntflags(sb), DIRPERM1) ++ && au_test_h_perm(h_idmap, d_inode(h_parent), ++ MAY_EXEC | MAY_WRITE))) ++ goto out; ++ ++ h_ppath.dentry = h_parent; ++ h_ppath.mnt = au_br_mnt(br); ++ h_latest = au_sio_lkup_one(h_idmap, &dentry->d_name, &h_ppath); ++ err = -EIO; ++ if (IS_ERR(h_latest)) ++ goto out; ++ if (h_latest == h_dentry) ++ err = 0; ++ dput(h_latest); ++ ++out: ++ return err; ++} ++ ++/* ++ * decide the branch where we operate for @dentry. the branch index will be set ++ * @rbcpup. after deciding it, 'pin' it and store the timestamps of the parent ++ * dir for reverting. ++ * when a new whiteout is necessary, create it. ++ */ ++static struct dentry* ++lock_hdir_create_wh(struct dentry *dentry, int isdir, aufs_bindex_t *rbcpup, ++ struct au_dtime *dt, struct au_pin *pin) ++{ ++ struct dentry *wh_dentry; ++ struct super_block *sb; ++ struct path h_path; ++ int err, need_wh; ++ unsigned int udba; ++ aufs_bindex_t bcpup; ++ ++ need_wh = au_wr_dir_need_wh(dentry, isdir, rbcpup); ++ wh_dentry = ERR_PTR(need_wh); ++ if (unlikely(need_wh < 0)) ++ goto out; ++ ++ sb = dentry->d_sb; ++ udba = au_opt_udba(sb); ++ bcpup = *rbcpup; ++ err = au_pin(pin, dentry, bcpup, udba, ++ AuPin_DI_LOCKED | AuPin_MNT_WRITE); ++ wh_dentry = ERR_PTR(err); ++ if (unlikely(err)) ++ goto out; ++ ++ h_path.dentry = au_pinned_h_parent(pin); ++ if (udba != AuOpt_UDBA_NONE ++ && au_dbtop(dentry) == bcpup) { ++ err = au_may_del(dentry, bcpup, h_path.dentry, isdir); ++ wh_dentry = ERR_PTR(err); ++ if (unlikely(err)) ++ goto out_unpin; ++ } ++ ++ h_path.mnt = au_sbr_mnt(sb, bcpup); ++ au_dtime_store(dt, au_pinned_parent(pin), &h_path); ++ wh_dentry = NULL; ++ if (!need_wh) ++ goto out; /* success, no need to create whiteout */ ++ ++ wh_dentry = au_wh_create(dentry, bcpup, h_path.dentry); ++ if (IS_ERR(wh_dentry)) ++ goto out_unpin; ++ ++ /* returns with the parent is locked and wh_dentry is dget-ed */ ++ goto out; /* success */ ++ ++out_unpin: ++ au_unpin(pin); ++out: ++ return wh_dentry; ++} ++ ++/* ++ * when removing a dir, rename it to a unique temporary whiteout-ed name first ++ * in order to be revertible and save time for removing many child whiteouts ++ * under the dir. ++ * returns 1 when there are too many child whiteout and caller should remove ++ * them asynchronously. returns 0 when the number of children is enough small to ++ * remove now or the branch fs is a remote fs. ++ * otherwise return an error. ++ */ ++static int renwh_and_rmdir(struct dentry *dentry, aufs_bindex_t bindex, ++ struct au_nhash *whlist, struct inode *dir) ++{ ++ int rmdir_later, err, dirwh; ++ struct dentry *h_dentry; ++ struct super_block *sb; ++ struct inode *inode; ++ ++ sb = dentry->d_sb; ++ SiMustAnyLock(sb); ++ h_dentry = au_h_dptr(dentry, bindex); ++ err = au_whtmp_ren(h_dentry, au_sbr(sb, bindex)); ++ if (unlikely(err)) ++ goto out; ++ ++ /* stop monitoring */ ++ inode = d_inode(dentry); ++ au_hn_free(au_hi(inode, bindex)); ++ ++ if (!au_test_fs_remote(h_dentry->d_sb)) { ++ dirwh = au_sbi(sb)->si_dirwh; ++ rmdir_later = (dirwh <= 1); ++ if (!rmdir_later) ++ rmdir_later = au_nhash_test_longer_wh(whlist, bindex, ++ dirwh); ++ if (rmdir_later) ++ return rmdir_later; ++ } ++ ++ err = au_whtmp_rmdir(dir, bindex, h_dentry, whlist); ++ if (unlikely(err)) { ++ AuIOErr("rmdir %pd, b%d failed, %d. ignored\n", ++ h_dentry, bindex, err); ++ err = 0; ++ } ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++/* ++ * final procedure for deleting a entry. ++ * maintain dentry and iattr. ++ */ ++static void epilog(struct inode *dir, struct dentry *dentry, ++ aufs_bindex_t bindex) ++{ ++ struct inode *inode; ++ ++ inode = d_inode(dentry); ++ d_drop(dentry); ++ inode->i_ctime = dir->i_ctime; ++ ++ au_dir_ts(dir, bindex); ++ inode_inc_iversion(dir); ++} ++ ++/* ++ * when an error happened, remove the created whiteout and revert everything. ++ */ ++static int do_revert(int err, struct inode *dir, aufs_bindex_t bindex, ++ aufs_bindex_t bwh, struct dentry *wh_dentry, ++ struct dentry *dentry, struct au_dtime *dt) ++{ ++ int rerr; ++ struct path h_path = { ++ .dentry = wh_dentry, ++ .mnt = au_sbr_mnt(dir->i_sb, bindex) ++ }; ++ ++ rerr = au_wh_unlink_dentry(au_h_iptr(dir, bindex), &h_path, dentry); ++ if (!rerr) { ++ au_set_dbwh(dentry, bwh); ++ au_dtime_revert(dt); ++ return 0; ++ } ++ ++ AuIOErr("%pd reverting whiteout failed(%d, %d)\n", dentry, err, rerr); ++ return -EIO; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++int aufs_unlink(struct inode *dir, struct dentry *dentry) ++{ ++ int err; ++ aufs_bindex_t bwh, bindex, btop; ++ struct inode *inode, *h_dir, *delegated; ++ struct dentry *parent, *wh_dentry; ++ /* to reduce stack size */ ++ struct { ++ struct au_dtime dt; ++ struct au_pin pin; ++ struct path h_path; ++ } *a; ++ ++ IMustLock(dir); ++ ++ err = -ENOMEM; ++ a = kmalloc(sizeof(*a), GFP_NOFS); ++ if (unlikely(!a)) ++ goto out; ++ ++ err = aufs_read_lock(dentry, AuLock_DW | AuLock_GEN); ++ if (unlikely(err)) ++ goto out_free; ++ err = au_d_hashed_positive(dentry); ++ if (unlikely(err)) ++ goto out_unlock; ++ inode = d_inode(dentry); ++ IMustLock(inode); ++ err = -EISDIR; ++ if (unlikely(d_is_dir(dentry))) ++ goto out_unlock; /* possible? */ ++ ++ btop = au_dbtop(dentry); ++ bwh = au_dbwh(dentry); ++ bindex = -1; ++ parent = dentry->d_parent; /* dir inode is locked */ ++ di_write_lock_parent(parent); ++ wh_dentry = lock_hdir_create_wh(dentry, /*isdir*/0, &bindex, &a->dt, ++ &a->pin); ++ err = PTR_ERR(wh_dentry); ++ if (IS_ERR(wh_dentry)) ++ goto out_parent; ++ ++ a->h_path.mnt = au_sbr_mnt(dentry->d_sb, btop); ++ a->h_path.dentry = au_h_dptr(dentry, btop); ++ dget(a->h_path.dentry); ++ if (bindex == btop) { ++ h_dir = au_pinned_h_dir(&a->pin); ++ delegated = NULL; ++ err = vfsub_unlink(h_dir, &a->h_path, &delegated, /*force*/0); ++ if (unlikely(err == -EWOULDBLOCK)) { ++ pr_warn("cannot retry for NFSv4 delegation" ++ " for an internal unlink\n"); ++ iput(delegated); ++ } ++ } else { ++ /* dir inode is locked */ ++ h_dir = d_inode(wh_dentry->d_parent); ++ IMustLock(h_dir); ++ err = 0; ++ } ++ ++ if (!err) { ++ vfsub_drop_nlink(inode); ++ epilog(dir, dentry, bindex); ++ ++ /* update target timestamps */ ++ if (bindex == btop) { ++ vfsub_update_h_iattr(&a->h_path, /*did*/NULL); ++ /*ignore*/ ++ inode->i_ctime = d_inode(a->h_path.dentry)->i_ctime; ++ } else ++ /* todo: this timestamp may be reverted later */ ++ inode->i_ctime = h_dir->i_ctime; ++ goto out_unpin; /* success */ ++ } ++ ++ /* revert */ ++ if (wh_dentry) { ++ int rerr; ++ ++ rerr = do_revert(err, dir, bindex, bwh, wh_dentry, dentry, ++ &a->dt); ++ if (rerr) ++ err = rerr; ++ } ++ ++out_unpin: ++ au_unpin(&a->pin); ++ dput(wh_dentry); ++ dput(a->h_path.dentry); ++out_parent: ++ di_write_unlock(parent); ++out_unlock: ++ aufs_read_unlock(dentry, AuLock_DW); ++out_free: ++ au_kfree_rcu(a); ++out: ++ return err; ++} ++ ++int aufs_rmdir(struct inode *dir, struct dentry *dentry) ++{ ++ int err, rmdir_later; ++ aufs_bindex_t bwh, bindex, btop; ++ struct inode *inode; ++ struct dentry *parent, *wh_dentry, *h_dentry; ++ struct au_whtmp_rmdir *args; ++ /* to reduce stack size */ ++ struct { ++ struct au_dtime dt; ++ struct au_pin pin; ++ } *a; ++ ++ IMustLock(dir); ++ ++ err = -ENOMEM; ++ a = kmalloc(sizeof(*a), GFP_NOFS); ++ if (unlikely(!a)) ++ goto out; ++ ++ err = aufs_read_lock(dentry, AuLock_DW | AuLock_FLUSH | AuLock_GEN); ++ if (unlikely(err)) ++ goto out_free; ++ err = au_alive_dir(dentry); ++ if (unlikely(err)) ++ goto out_unlock; ++ inode = d_inode(dentry); ++ IMustLock(inode); ++ err = -ENOTDIR; ++ if (unlikely(!d_is_dir(dentry))) ++ goto out_unlock; /* possible? */ ++ ++ err = -ENOMEM; ++ args = au_whtmp_rmdir_alloc(dir->i_sb, GFP_NOFS); ++ if (unlikely(!args)) ++ goto out_unlock; ++ ++ parent = dentry->d_parent; /* dir inode is locked */ ++ di_write_lock_parent(parent); ++ err = au_test_empty(dentry, &args->whlist); ++ if (unlikely(err)) ++ goto out_parent; ++ ++ btop = au_dbtop(dentry); ++ bwh = au_dbwh(dentry); ++ bindex = -1; ++ wh_dentry = lock_hdir_create_wh(dentry, /*isdir*/1, &bindex, &a->dt, ++ &a->pin); ++ err = PTR_ERR(wh_dentry); ++ if (IS_ERR(wh_dentry)) ++ goto out_parent; ++ ++ h_dentry = au_h_dptr(dentry, btop); ++ dget(h_dentry); ++ rmdir_later = 0; ++ if (bindex == btop) { ++ err = renwh_and_rmdir(dentry, btop, &args->whlist, dir); ++ if (err > 0) { ++ rmdir_later = err; ++ err = 0; ++ } ++ } else { ++ /* stop monitoring */ ++ au_hn_free(au_hi(inode, btop)); ++ ++ /* dir inode is locked */ ++ IMustLock(d_inode(wh_dentry->d_parent)); ++ err = 0; ++ } ++ ++ if (!err) { ++ vfsub_dead_dir(inode); ++ au_set_dbdiropq(dentry, -1); ++ epilog(dir, dentry, bindex); ++ ++ if (rmdir_later) { ++ au_whtmp_kick_rmdir(dir, btop, h_dentry, args); ++ args = NULL; ++ } ++ ++ goto out_unpin; /* success */ ++ } ++ ++ /* revert */ ++ AuLabel(revert); ++ if (wh_dentry) { ++ int rerr; ++ ++ rerr = do_revert(err, dir, bindex, bwh, wh_dentry, dentry, ++ &a->dt); ++ if (rerr) ++ err = rerr; ++ } ++ ++out_unpin: ++ au_unpin(&a->pin); ++ dput(wh_dentry); ++ dput(h_dentry); ++out_parent: ++ di_write_unlock(parent); ++ if (args) ++ au_whtmp_rmdir_free(args); ++out_unlock: ++ aufs_read_unlock(dentry, AuLock_DW); ++out_free: ++ au_kfree_rcu(a); ++out: ++ AuTraceErr(err); ++ return err; ++} +diff --git a/fs/aufs/i_op_ren.c b/fs/aufs/i_op_ren.c +new file mode 100644 +index 000000000000..ab69a6ac9a42 +--- /dev/null ++++ b/fs/aufs/i_op_ren.c +@@ -0,0 +1,1257 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * inode operation (rename entry) ++ * todo: this is crazy monster ++ */ ++ ++#include <linux/iversion.h> ++#include "aufs.h" ++ ++enum { AuSRC, AuDST, AuSrcDst }; ++enum { AuPARENT, AuCHILD, AuParentChild }; ++ ++#define AuRen_ISDIR_SRC 1 ++#define AuRen_ISDIR_DST (1 << 1) ++#define AuRen_ISSAMEDIR (1 << 2) ++#define AuRen_WHSRC (1 << 3) ++#define AuRen_WHDST (1 << 4) ++#define AuRen_MNT_WRITE (1 << 5) ++#define AuRen_DT_DSTDIR (1 << 6) ++#define AuRen_DIROPQ_SRC (1 << 7) ++#define AuRen_DIROPQ_DST (1 << 8) ++#define AuRen_DIRREN (1 << 9) ++#define AuRen_DROPPED_SRC (1 << 10) ++#define AuRen_DROPPED_DST (1 << 11) ++#define au_ftest_ren(flags, name) ((flags) & AuRen_##name) ++#define au_fset_ren(flags, name) \ ++ do { (flags) |= AuRen_##name; } while (0) ++#define au_fclr_ren(flags, name) \ ++ do { (flags) &= ~AuRen_##name; } while (0) ++ ++#ifndef CONFIG_AUFS_DIRREN ++#undef AuRen_DIRREN ++#define AuRen_DIRREN 0 ++#endif ++ ++struct au_ren_args { ++ struct { ++ struct dentry *dentry, *h_dentry, *parent, *h_parent, ++ *wh_dentry; ++ struct inode *dir, *inode; ++ struct au_hinode *hdir, *hinode; ++ struct au_dtime dt[AuParentChild]; ++ aufs_bindex_t btop, bdiropq; ++ } sd[AuSrcDst]; ++ ++#define src_dentry sd[AuSRC].dentry ++#define src_dir sd[AuSRC].dir ++#define src_inode sd[AuSRC].inode ++#define src_h_dentry sd[AuSRC].h_dentry ++#define src_parent sd[AuSRC].parent ++#define src_h_parent sd[AuSRC].h_parent ++#define src_wh_dentry sd[AuSRC].wh_dentry ++#define src_hdir sd[AuSRC].hdir ++#define src_hinode sd[AuSRC].hinode ++#define src_h_dir sd[AuSRC].hdir->hi_inode ++#define src_dt sd[AuSRC].dt ++#define src_btop sd[AuSRC].btop ++#define src_bdiropq sd[AuSRC].bdiropq ++ ++#define dst_dentry sd[AuDST].dentry ++#define dst_dir sd[AuDST].dir ++#define dst_inode sd[AuDST].inode ++#define dst_h_dentry sd[AuDST].h_dentry ++#define dst_parent sd[AuDST].parent ++#define dst_h_parent sd[AuDST].h_parent ++#define dst_wh_dentry sd[AuDST].wh_dentry ++#define dst_hdir sd[AuDST].hdir ++#define dst_hinode sd[AuDST].hinode ++#define dst_h_dir sd[AuDST].hdir->hi_inode ++#define dst_dt sd[AuDST].dt ++#define dst_btop sd[AuDST].btop ++#define dst_bdiropq sd[AuDST].bdiropq ++ ++ struct dentry *h_trap; ++ struct au_branch *br; ++ struct path h_path; ++ struct au_nhash whlist; ++ aufs_bindex_t btgt, src_bwh; ++ ++ struct { ++ unsigned short auren_flags; ++ unsigned char flags; /* syscall parameter */ ++ unsigned char exchange; ++ } __packed; ++ ++ struct au_whtmp_rmdir *thargs; ++ struct dentry *h_dst; ++ struct au_hinode *h_root; ++}; ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * functions for reverting. ++ * when an error happened in a single rename systemcall, we should revert ++ * everything as if nothing happened. ++ * we don't need to revert the copied-up/down the parent dir since they are ++ * harmless. ++ */ ++ ++#define RevertFailure(fmt, ...) do { \ ++ AuIOErr("revert failure: " fmt " (%d, %d)\n", \ ++ ##__VA_ARGS__, err, rerr); \ ++ err = -EIO; \ ++} while (0) ++ ++static void au_ren_do_rev_diropq(int err, struct au_ren_args *a, int idx) ++{ ++ int rerr; ++ struct dentry *d; ++#define src_or_dst(member) a->sd[idx].member ++ ++ d = src_or_dst(dentry); /* {src,dst}_dentry */ ++ au_hn_inode_lock_nested(src_or_dst(hinode), AuLsc_I_CHILD); ++ rerr = au_diropq_remove(d, a->btgt); ++ au_hn_inode_unlock(src_or_dst(hinode)); ++ au_set_dbdiropq(d, src_or_dst(bdiropq)); ++ if (rerr) ++ RevertFailure("remove diropq %pd", d); ++ ++#undef src_or_dst_ ++} ++ ++static void au_ren_rev_diropq(int err, struct au_ren_args *a) ++{ ++ if (au_ftest_ren(a->auren_flags, DIROPQ_SRC)) ++ au_ren_do_rev_diropq(err, a, AuSRC); ++ if (au_ftest_ren(a->auren_flags, DIROPQ_DST)) ++ au_ren_do_rev_diropq(err, a, AuDST); ++} ++ ++static void au_ren_rev_rename(int err, struct au_ren_args *a) ++{ ++ int rerr; ++ struct inode *delegated; ++ struct path h_ppath = { ++ .dentry = a->src_h_parent, ++ .mnt = a->h_path.mnt ++ }; ++ ++ a->h_path.dentry = vfsub_lkup_one(&a->src_dentry->d_name, &h_ppath); ++ rerr = PTR_ERR(a->h_path.dentry); ++ if (IS_ERR(a->h_path.dentry)) { ++ RevertFailure("lkup one %pd", a->src_dentry); ++ return; ++ } ++ ++ delegated = NULL; ++ rerr = vfsub_rename(a->dst_h_dir, ++ au_h_dptr(a->src_dentry, a->btgt), ++ a->src_h_dir, &a->h_path, &delegated, a->flags); ++ if (unlikely(rerr == -EWOULDBLOCK)) { ++ pr_warn("cannot retry for NFSv4 delegation" ++ " for an internal rename\n"); ++ iput(delegated); ++ } ++ d_drop(a->h_path.dentry); ++ dput(a->h_path.dentry); ++ /* au_set_h_dptr(a->src_dentry, a->btgt, NULL); */ ++ if (rerr) ++ RevertFailure("rename %pd", a->src_dentry); ++} ++ ++static void au_ren_rev_whtmp(int err, struct au_ren_args *a) ++{ ++ int rerr; ++ struct inode *delegated; ++ struct path h_ppath = { ++ .dentry = a->dst_h_parent, ++ .mnt = a->h_path.mnt ++ }; ++ ++ a->h_path.dentry = vfsub_lkup_one(&a->dst_dentry->d_name, &h_ppath); ++ rerr = PTR_ERR(a->h_path.dentry); ++ if (IS_ERR(a->h_path.dentry)) { ++ RevertFailure("lkup one %pd", a->dst_dentry); ++ return; ++ } ++ if (d_is_positive(a->h_path.dentry)) { ++ d_drop(a->h_path.dentry); ++ dput(a->h_path.dentry); ++ return; ++ } ++ ++ delegated = NULL; ++ rerr = vfsub_rename(a->dst_h_dir, a->h_dst, a->dst_h_dir, &a->h_path, ++ &delegated, a->flags); ++ if (unlikely(rerr == -EWOULDBLOCK)) { ++ pr_warn("cannot retry for NFSv4 delegation" ++ " for an internal rename\n"); ++ iput(delegated); ++ } ++ d_drop(a->h_path.dentry); ++ dput(a->h_path.dentry); ++ if (!rerr) ++ au_set_h_dptr(a->dst_dentry, a->btgt, dget(a->h_dst)); ++ else ++ RevertFailure("rename %pd", a->h_dst); ++} ++ ++static void au_ren_rev_whsrc(int err, struct au_ren_args *a) ++{ ++ int rerr; ++ ++ a->h_path.dentry = a->src_wh_dentry; ++ rerr = au_wh_unlink_dentry(a->src_h_dir, &a->h_path, a->src_dentry); ++ au_set_dbwh(a->src_dentry, a->src_bwh); ++ if (rerr) ++ RevertFailure("unlink %pd", a->src_wh_dentry); ++} ++#undef RevertFailure ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * when we have to copyup the renaming entry, do it with the rename-target name ++ * in order to minimize the cost (the later actual rename is unnecessary). ++ * otherwise rename it on the target branch. ++ */ ++static int au_ren_or_cpup(struct au_ren_args *a) ++{ ++ int err; ++ struct dentry *d; ++ struct inode *delegated; ++ ++ d = a->src_dentry; ++ if (au_dbtop(d) == a->btgt) { ++ a->h_path.dentry = a->dst_h_dentry; ++ AuDebugOn(au_dbtop(d) != a->btgt); ++ delegated = NULL; ++ err = vfsub_rename(a->src_h_dir, au_h_dptr(d, a->btgt), ++ a->dst_h_dir, &a->h_path, &delegated, ++ a->flags); ++ if (unlikely(err == -EWOULDBLOCK)) { ++ pr_warn("cannot retry for NFSv4 delegation" ++ " for an internal rename\n"); ++ iput(delegated); ++ } ++ } else ++ BUG(); ++ ++ if (!err && a->h_dst) ++ /* it will be set to dinfo later */ ++ dget(a->h_dst); ++ ++ return err; ++} ++ ++/* cf. aufs_rmdir() */ ++static int au_ren_del_whtmp(struct au_ren_args *a) ++{ ++ int err; ++ struct inode *dir; ++ ++ dir = a->dst_dir; ++ SiMustAnyLock(dir->i_sb); ++ if (!au_nhash_test_longer_wh(&a->whlist, a->btgt, ++ au_sbi(dir->i_sb)->si_dirwh) ++ || au_test_fs_remote(a->h_dst->d_sb)) { ++ err = au_whtmp_rmdir(dir, a->btgt, a->h_dst, &a->whlist); ++ if (unlikely(err)) ++ pr_warn("failed removing whtmp dir %pd (%d), " ++ "ignored.\n", a->h_dst, err); ++ } else { ++ au_nhash_wh_free(&a->thargs->whlist); ++ a->thargs->whlist = a->whlist; ++ a->whlist.nh_num = 0; ++ au_whtmp_kick_rmdir(dir, a->btgt, a->h_dst, a->thargs); ++ dput(a->h_dst); ++ a->thargs = NULL; ++ } ++ ++ return 0; ++} ++ ++/* make it 'opaque' dir. */ ++static int au_ren_do_diropq(struct au_ren_args *a, int idx) ++{ ++ int err; ++ struct dentry *d, *diropq; ++#define src_or_dst(member) a->sd[idx].member ++ ++ err = 0; ++ d = src_or_dst(dentry); /* {src,dst}_dentry */ ++ src_or_dst(bdiropq) = au_dbdiropq(d); ++ src_or_dst(hinode) = au_hi(src_or_dst(inode), a->btgt); ++ au_hn_inode_lock_nested(src_or_dst(hinode), AuLsc_I_CHILD); ++ diropq = au_diropq_create(d, a->btgt); ++ au_hn_inode_unlock(src_or_dst(hinode)); ++ if (IS_ERR(diropq)) ++ err = PTR_ERR(diropq); ++ else ++ dput(diropq); ++ ++#undef src_or_dst_ ++ return err; ++} ++ ++static int au_ren_diropq(struct au_ren_args *a) ++{ ++ int err; ++ unsigned char always; ++ struct dentry *d; ++ ++ err = 0; ++ d = a->dst_dentry; /* already renamed on the branch */ ++ always = !!au_opt_test(au_mntflags(d->d_sb), ALWAYS_DIROPQ); ++ if (au_ftest_ren(a->auren_flags, ISDIR_SRC) ++ && !au_ftest_ren(a->auren_flags, DIRREN) ++ && a->btgt != au_dbdiropq(a->src_dentry) ++ && (a->dst_wh_dentry ++ || a->btgt <= au_dbdiropq(d) ++ /* hide the lower to keep xino */ ++ /* the lowers may not be a dir, but we hide them anyway */ ++ || a->btgt < au_dbbot(d) ++ || always)) { ++ AuDbg("here\n"); ++ err = au_ren_do_diropq(a, AuSRC); ++ if (unlikely(err)) ++ goto out; ++ au_fset_ren(a->auren_flags, DIROPQ_SRC); ++ } ++ if (!a->exchange) ++ goto out; /* success */ ++ ++ d = a->src_dentry; /* already renamed on the branch */ ++ if (au_ftest_ren(a->auren_flags, ISDIR_DST) ++ && a->btgt != au_dbdiropq(a->dst_dentry) ++ && (a->btgt < au_dbdiropq(d) ++ || a->btgt < au_dbbot(d) ++ || always)) { ++ AuDbgDentry(a->src_dentry); ++ AuDbgDentry(a->dst_dentry); ++ err = au_ren_do_diropq(a, AuDST); ++ if (unlikely(err)) ++ goto out_rev_src; ++ au_fset_ren(a->auren_flags, DIROPQ_DST); ++ } ++ goto out; /* success */ ++ ++out_rev_src: ++ AuDbg("err %d, reverting src\n", err); ++ au_ren_rev_diropq(err, a); ++out: ++ return err; ++} ++ ++static int do_rename(struct au_ren_args *a) ++{ ++ int err; ++ struct dentry *d, *h_d; ++ ++ if (!a->exchange) { ++ /* prepare workqueue args for asynchronous rmdir */ ++ h_d = a->dst_h_dentry; ++ if (au_ftest_ren(a->auren_flags, ISDIR_DST) ++ /* && !au_ftest_ren(a->auren_flags, DIRREN) */ ++ && d_is_positive(h_d)) { ++ err = -ENOMEM; ++ a->thargs = au_whtmp_rmdir_alloc(a->src_dentry->d_sb, ++ GFP_NOFS); ++ if (unlikely(!a->thargs)) ++ goto out; ++ a->h_dst = dget(h_d); ++ } ++ ++ /* create whiteout for src_dentry */ ++ if (au_ftest_ren(a->auren_flags, WHSRC)) { ++ a->src_bwh = au_dbwh(a->src_dentry); ++ AuDebugOn(a->src_bwh >= 0); ++ a->src_wh_dentry = au_wh_create(a->src_dentry, a->btgt, ++ a->src_h_parent); ++ err = PTR_ERR(a->src_wh_dentry); ++ if (IS_ERR(a->src_wh_dentry)) ++ goto out_thargs; ++ } ++ ++ /* lookup whiteout for dentry */ ++ if (au_ftest_ren(a->auren_flags, WHDST)) { ++ h_d = au_wh_lkup(a->dst_h_parent, ++ &a->dst_dentry->d_name, a->br); ++ err = PTR_ERR(h_d); ++ if (IS_ERR(h_d)) ++ goto out_whsrc; ++ if (d_is_negative(h_d)) ++ dput(h_d); ++ else ++ a->dst_wh_dentry = h_d; ++ } ++ ++ /* rename dentry to tmpwh */ ++ if (a->thargs) { ++ err = au_whtmp_ren(a->dst_h_dentry, a->br); ++ if (unlikely(err)) ++ goto out_whdst; ++ ++ d = a->dst_dentry; ++ au_set_h_dptr(d, a->btgt, NULL); ++ err = au_lkup_neg(d, a->btgt, /*wh*/0); ++ if (unlikely(err)) ++ goto out_whtmp; ++ a->dst_h_dentry = au_h_dptr(d, a->btgt); ++ } ++ } ++ ++ BUG_ON(d_is_positive(a->dst_h_dentry) && a->src_btop != a->btgt); ++#if 0 /* debugging */ ++ BUG_ON(!au_ftest_ren(a->auren_flags, DIRREN) ++ && d_is_positive(a->dst_h_dentry) ++ && a->src_btop != a->btgt); ++#endif ++ ++ /* rename by vfs_rename or cpup */ ++ err = au_ren_or_cpup(a); ++ if (unlikely(err)) ++ /* leave the copied-up one */ ++ goto out_whtmp; ++ ++ /* make dir opaque */ ++ err = au_ren_diropq(a); ++ if (unlikely(err)) ++ goto out_rename; ++ ++ /* update target timestamps */ ++ if (a->exchange) { ++ AuDebugOn(au_dbtop(a->dst_dentry) != a->btgt); ++ a->h_path.dentry = au_h_dptr(a->dst_dentry, a->btgt); ++ vfsub_update_h_iattr(&a->h_path, /*did*/NULL); /*ignore*/ ++ a->dst_inode->i_ctime = d_inode(a->h_path.dentry)->i_ctime; ++ } ++ AuDebugOn(au_dbtop(a->src_dentry) != a->btgt); ++ a->h_path.dentry = au_h_dptr(a->src_dentry, a->btgt); ++ vfsub_update_h_iattr(&a->h_path, /*did*/NULL); /*ignore*/ ++ a->src_inode->i_ctime = d_inode(a->h_path.dentry)->i_ctime; ++ ++ if (!a->exchange) { ++ /* remove whiteout for dentry */ ++ if (a->dst_wh_dentry) { ++ a->h_path.dentry = a->dst_wh_dentry; ++ err = au_wh_unlink_dentry(a->dst_h_dir, &a->h_path, ++ a->dst_dentry); ++ if (unlikely(err)) ++ goto out_diropq; ++ } ++ ++ /* remove whtmp */ ++ if (a->thargs) ++ au_ren_del_whtmp(a); /* ignore this error */ ++ ++ au_fhsm_wrote(a->src_dentry->d_sb, a->btgt, /*force*/0); ++ } ++ err = 0; ++ goto out_success; ++ ++out_diropq: ++ au_ren_rev_diropq(err, a); ++out_rename: ++ au_ren_rev_rename(err, a); ++ dput(a->h_dst); ++out_whtmp: ++ if (a->thargs) ++ au_ren_rev_whtmp(err, a); ++out_whdst: ++ dput(a->dst_wh_dentry); ++ a->dst_wh_dentry = NULL; ++out_whsrc: ++ if (a->src_wh_dentry) ++ au_ren_rev_whsrc(err, a); ++out_success: ++ dput(a->src_wh_dentry); ++ dput(a->dst_wh_dentry); ++out_thargs: ++ if (a->thargs) { ++ dput(a->h_dst); ++ au_whtmp_rmdir_free(a->thargs); ++ a->thargs = NULL; ++ } ++out: ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * test if @dentry dir can be rename destination or not. ++ * success means, it is a logically empty dir. ++ */ ++static int may_rename_dstdir(struct dentry *dentry, struct au_nhash *whlist) ++{ ++ return au_test_empty(dentry, whlist); ++} ++ ++/* ++ * test if @a->src_dentry dir can be rename source or not. ++ * if it can, return 0. ++ * success means, ++ * - it is a logically empty dir. ++ * - or, it exists on writable branch and has no children including whiteouts ++ * on the lower branch unless DIRREN is on. ++ */ ++static int may_rename_srcdir(struct au_ren_args *a) ++{ ++ int err; ++ unsigned int rdhash; ++ aufs_bindex_t btop, btgt; ++ struct dentry *dentry; ++ struct super_block *sb; ++ struct au_sbinfo *sbinfo; ++ ++ dentry = a->src_dentry; ++ sb = dentry->d_sb; ++ sbinfo = au_sbi(sb); ++ if (au_opt_test(sbinfo->si_mntflags, DIRREN)) ++ au_fset_ren(a->auren_flags, DIRREN); ++ ++ btgt = a->btgt; ++ btop = au_dbtop(dentry); ++ if (btop != btgt) { ++ struct au_nhash whlist; ++ ++ SiMustAnyLock(sb); ++ rdhash = sbinfo->si_rdhash; ++ if (!rdhash) ++ rdhash = au_rdhash_est(au_dir_size(/*file*/NULL, ++ dentry)); ++ err = au_nhash_alloc(&whlist, rdhash, GFP_NOFS); ++ if (unlikely(err)) ++ goto out; ++ err = au_test_empty(dentry, &whlist); ++ au_nhash_wh_free(&whlist); ++ goto out; ++ } ++ ++ if (btop == au_dbtaildir(dentry)) ++ return 0; /* success */ ++ ++ err = au_test_empty_lower(dentry); ++ ++out: ++ if (err == -ENOTEMPTY) { ++ if (au_ftest_ren(a->auren_flags, DIRREN)) { ++ err = 0; ++ } else { ++ AuWarn1("renaming dir who has child(ren) on multiple " ++ "branches, is not supported\n"); ++ err = -EXDEV; ++ } ++ } ++ return err; ++} ++ ++/* side effect: sets whlist and h_dentry */ ++static int au_ren_may_dir(struct au_ren_args *a) ++{ ++ int err; ++ unsigned int rdhash; ++ struct dentry *d; ++ ++ d = a->dst_dentry; ++ SiMustAnyLock(d->d_sb); ++ ++ err = 0; ++ if (au_ftest_ren(a->auren_flags, ISDIR_DST) && a->dst_inode) { ++ rdhash = au_sbi(d->d_sb)->si_rdhash; ++ if (!rdhash) ++ rdhash = au_rdhash_est(au_dir_size(/*file*/NULL, d)); ++ err = au_nhash_alloc(&a->whlist, rdhash, GFP_NOFS); ++ if (unlikely(err)) ++ goto out; ++ ++ if (!a->exchange) { ++ au_set_dbtop(d, a->dst_btop); ++ err = may_rename_dstdir(d, &a->whlist); ++ au_set_dbtop(d, a->btgt); ++ } else ++ err = may_rename_srcdir(a); ++ } ++ a->dst_h_dentry = au_h_dptr(d, au_dbtop(d)); ++ if (unlikely(err)) ++ goto out; ++ ++ d = a->src_dentry; ++ a->src_h_dentry = au_h_dptr(d, au_dbtop(d)); ++ if (au_ftest_ren(a->auren_flags, ISDIR_SRC)) { ++ err = may_rename_srcdir(a); ++ if (unlikely(err)) { ++ au_nhash_wh_free(&a->whlist); ++ a->whlist.nh_num = 0; ++ } ++ } ++out: ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * simple tests for rename. ++ * following the checks in vfs, plus the parent-child relationship. ++ */ ++static int au_may_ren(struct au_ren_args *a) ++{ ++ int err, isdir; ++ struct inode *h_inode; ++ ++ if (a->src_btop == a->btgt) { ++ err = au_may_del(a->src_dentry, a->btgt, a->src_h_parent, ++ au_ftest_ren(a->auren_flags, ISDIR_SRC)); ++ if (unlikely(err)) ++ goto out; ++ err = -EINVAL; ++ if (unlikely(a->src_h_dentry == a->h_trap)) ++ goto out; ++ } ++ ++ err = 0; ++ if (a->dst_btop != a->btgt) ++ goto out; ++ ++ err = -ENOTEMPTY; ++ if (unlikely(a->dst_h_dentry == a->h_trap)) ++ goto out; ++ ++ err = -EIO; ++ isdir = !!au_ftest_ren(a->auren_flags, ISDIR_DST); ++ if (d_really_is_negative(a->dst_dentry)) { ++ if (d_is_negative(a->dst_h_dentry)) ++ err = au_may_add(a->dst_dentry, a->btgt, ++ a->dst_h_parent, isdir); ++ } else { ++ if (unlikely(d_is_negative(a->dst_h_dentry))) ++ goto out; ++ h_inode = d_inode(a->dst_h_dentry); ++ if (h_inode->i_nlink) ++ err = au_may_del(a->dst_dentry, a->btgt, ++ a->dst_h_parent, isdir); ++ } ++ ++out: ++ if (unlikely(err == -ENOENT || err == -EEXIST)) ++ err = -EIO; ++ AuTraceErr(err); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * locking order ++ * (VFS) ++ * - src_dir and dir by lock_rename() ++ * - inode if exists ++ * (aufs) ++ * - lock all ++ * + src_dentry and dentry by aufs_read_and_write_lock2() which calls, ++ * + si_read_lock ++ * + di_write_lock2_child() ++ * + di_write_lock_child() ++ * + ii_write_lock_child() ++ * + di_write_lock_child2() ++ * + ii_write_lock_child2() ++ * + src_parent and parent ++ * + di_write_lock_parent() ++ * + ii_write_lock_parent() ++ * + di_write_lock_parent2() ++ * + ii_write_lock_parent2() ++ * + lower src_dir and dir by vfsub_lock_rename() ++ * + verify the every relationships between child and parent. if any ++ * of them failed, unlock all and return -EBUSY. ++ */ ++static void au_ren_unlock(struct au_ren_args *a) ++{ ++ vfsub_unlock_rename(a->src_h_parent, a->src_hdir, ++ a->dst_h_parent, a->dst_hdir); ++ if (au_ftest_ren(a->auren_flags, DIRREN) ++ && a->h_root) ++ au_hn_inode_unlock(a->h_root); ++ if (au_ftest_ren(a->auren_flags, MNT_WRITE)) ++ vfsub_mnt_drop_write(au_br_mnt(a->br)); ++} ++ ++static int au_ren_lock(struct au_ren_args *a) ++{ ++ int err; ++ unsigned int udba; ++ ++ err = 0; ++ a->src_h_parent = au_h_dptr(a->src_parent, a->btgt); ++ a->src_hdir = au_hi(a->src_dir, a->btgt); ++ a->dst_h_parent = au_h_dptr(a->dst_parent, a->btgt); ++ a->dst_hdir = au_hi(a->dst_dir, a->btgt); ++ ++ err = vfsub_mnt_want_write(au_br_mnt(a->br)); ++ if (unlikely(err)) ++ goto out; ++ au_fset_ren(a->auren_flags, MNT_WRITE); ++ if (au_ftest_ren(a->auren_flags, DIRREN)) { ++ struct dentry *root; ++ struct inode *dir; ++ ++ /* ++ * sbinfo is already locked, so this ii_read_lock is ++ * unnecessary. but our debugging feature checks it. ++ */ ++ root = a->src_inode->i_sb->s_root; ++ if (root != a->src_parent && root != a->dst_parent) { ++ dir = d_inode(root); ++ ii_read_lock_parent3(dir); ++ a->h_root = au_hi(dir, a->btgt); ++ ii_read_unlock(dir); ++ au_hn_inode_lock_nested(a->h_root, AuLsc_I_PARENT3); ++ } ++ } ++ a->h_trap = vfsub_lock_rename(a->src_h_parent, a->src_hdir, ++ a->dst_h_parent, a->dst_hdir); ++ udba = au_opt_udba(a->src_dentry->d_sb); ++ if (unlikely(a->src_hdir->hi_inode != d_inode(a->src_h_parent) ++ || a->dst_hdir->hi_inode != d_inode(a->dst_h_parent))) ++ err = au_busy_or_stale(); ++ if (!err && au_dbtop(a->src_dentry) == a->btgt) ++ err = au_h_verify(a->src_h_dentry, udba, ++ d_inode(a->src_h_parent), a->src_h_parent, ++ a->br); ++ if (!err && au_dbtop(a->dst_dentry) == a->btgt) ++ err = au_h_verify(a->dst_h_dentry, udba, ++ d_inode(a->dst_h_parent), a->dst_h_parent, ++ a->br); ++ if (!err) ++ goto out; /* success */ ++ ++ err = au_busy_or_stale(); ++ au_ren_unlock(a); ++ ++out: ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static void au_ren_refresh_dir(struct au_ren_args *a) ++{ ++ struct inode *dir; ++ ++ dir = a->dst_dir; ++ inode_inc_iversion(dir); ++ if (au_ftest_ren(a->auren_flags, ISDIR_SRC)) { ++ /* is this updating defined in POSIX? */ ++ au_cpup_attr_timesizes(a->src_inode); ++ au_cpup_attr_nlink(dir, /*force*/1); ++ } ++ au_dir_ts(dir, a->btgt); ++ ++ if (a->exchange) { ++ dir = a->src_dir; ++ inode_inc_iversion(dir); ++ if (au_ftest_ren(a->auren_flags, ISDIR_DST)) { ++ /* is this updating defined in POSIX? */ ++ au_cpup_attr_timesizes(a->dst_inode); ++ au_cpup_attr_nlink(dir, /*force*/1); ++ } ++ au_dir_ts(dir, a->btgt); ++ } ++ ++ if (au_ftest_ren(a->auren_flags, ISSAMEDIR)) ++ return; ++ ++ dir = a->src_dir; ++ inode_inc_iversion(dir); ++ if (au_ftest_ren(a->auren_flags, ISDIR_SRC)) ++ au_cpup_attr_nlink(dir, /*force*/1); ++ au_dir_ts(dir, a->btgt); ++} ++ ++static void au_ren_refresh(struct au_ren_args *a) ++{ ++ aufs_bindex_t bbot, bindex; ++ struct dentry *d, *h_d; ++ struct inode *i, *h_i; ++ struct super_block *sb; ++ ++ d = a->dst_dentry; ++ d_drop(d); ++ if (a->h_dst) ++ /* already dget-ed by au_ren_or_cpup() */ ++ au_set_h_dptr(d, a->btgt, a->h_dst); ++ ++ i = a->dst_inode; ++ if (i) { ++ if (!a->exchange) { ++ if (!au_ftest_ren(a->auren_flags, ISDIR_DST)) ++ vfsub_drop_nlink(i); ++ else { ++ vfsub_dead_dir(i); ++ au_cpup_attr_timesizes(i); ++ } ++ au_update_dbrange(d, /*do_put_zero*/1); ++ } else ++ au_cpup_attr_nlink(i, /*force*/1); ++ } else { ++ bbot = a->btgt; ++ for (bindex = au_dbtop(d); bindex < bbot; bindex++) ++ au_set_h_dptr(d, bindex, NULL); ++ bbot = au_dbbot(d); ++ for (bindex = a->btgt + 1; bindex <= bbot; bindex++) ++ au_set_h_dptr(d, bindex, NULL); ++ au_update_dbrange(d, /*do_put_zero*/0); ++ } ++ ++ if (a->exchange ++ || au_ftest_ren(a->auren_flags, DIRREN)) { ++ d_drop(a->src_dentry); ++ if (au_ftest_ren(a->auren_flags, DIRREN)) ++ au_set_dbwh(a->src_dentry, -1); ++ return; ++ } ++ ++ d = a->src_dentry; ++ au_set_dbwh(d, -1); ++ bbot = au_dbbot(d); ++ for (bindex = a->btgt + 1; bindex <= bbot; bindex++) { ++ h_d = au_h_dptr(d, bindex); ++ if (h_d) ++ au_set_h_dptr(d, bindex, NULL); ++ } ++ au_set_dbbot(d, a->btgt); ++ ++ sb = d->d_sb; ++ i = a->src_inode; ++ if (au_opt_test(au_mntflags(sb), PLINK) && au_plink_test(i)) ++ return; /* success */ ++ ++ bbot = au_ibbot(i); ++ for (bindex = a->btgt + 1; bindex <= bbot; bindex++) { ++ h_i = au_h_iptr(i, bindex); ++ if (h_i) { ++ au_xino_write(sb, bindex, h_i->i_ino, /*ino*/0); ++ /* ignore this error */ ++ au_set_h_iptr(i, bindex, NULL, 0); ++ } ++ } ++ au_set_ibbot(i, a->btgt); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* mainly for link(2) and rename(2) */ ++int au_wbr(struct dentry *dentry, aufs_bindex_t btgt) ++{ ++ aufs_bindex_t bdiropq, bwh; ++ struct dentry *parent; ++ struct au_branch *br; ++ ++ parent = dentry->d_parent; ++ IMustLock(d_inode(parent)); /* dir is locked */ ++ ++ bdiropq = au_dbdiropq(parent); ++ bwh = au_dbwh(dentry); ++ br = au_sbr(dentry->d_sb, btgt); ++ if (au_br_rdonly(br) ++ || (0 <= bdiropq && bdiropq < btgt) ++ || (0 <= bwh && bwh < btgt)) ++ btgt = -1; ++ ++ AuDbg("btgt %d\n", btgt); ++ return btgt; ++} ++ ++/* sets src_btop, dst_btop and btgt */ ++static int au_ren_wbr(struct au_ren_args *a) ++{ ++ int err; ++ struct au_wr_dir_args wr_dir_args = { ++ /* .force_btgt = -1, */ ++ .flags = AuWrDir_ADD_ENTRY ++ }; ++ ++ a->src_btop = au_dbtop(a->src_dentry); ++ a->dst_btop = au_dbtop(a->dst_dentry); ++ if (au_ftest_ren(a->auren_flags, ISDIR_SRC) ++ || au_ftest_ren(a->auren_flags, ISDIR_DST)) ++ au_fset_wrdir(wr_dir_args.flags, ISDIR); ++ wr_dir_args.force_btgt = a->src_btop; ++ if (a->dst_inode && a->dst_btop < a->src_btop) ++ wr_dir_args.force_btgt = a->dst_btop; ++ wr_dir_args.force_btgt = au_wbr(a->dst_dentry, wr_dir_args.force_btgt); ++ err = au_wr_dir(a->dst_dentry, a->src_dentry, &wr_dir_args); ++ a->btgt = err; ++ if (a->exchange) ++ au_update_dbtop(a->dst_dentry); ++ ++ return err; ++} ++ ++static void au_ren_dt(struct au_ren_args *a) ++{ ++ a->h_path.dentry = a->src_h_parent; ++ au_dtime_store(a->src_dt + AuPARENT, a->src_parent, &a->h_path); ++ if (!au_ftest_ren(a->auren_flags, ISSAMEDIR)) { ++ a->h_path.dentry = a->dst_h_parent; ++ au_dtime_store(a->dst_dt + AuPARENT, a->dst_parent, &a->h_path); ++ } ++ ++ au_fclr_ren(a->auren_flags, DT_DSTDIR); ++ if (!au_ftest_ren(a->auren_flags, ISDIR_SRC) ++ && !a->exchange) ++ return; ++ ++ a->h_path.dentry = a->src_h_dentry; ++ au_dtime_store(a->src_dt + AuCHILD, a->src_dentry, &a->h_path); ++ if (d_is_positive(a->dst_h_dentry)) { ++ au_fset_ren(a->auren_flags, DT_DSTDIR); ++ a->h_path.dentry = a->dst_h_dentry; ++ au_dtime_store(a->dst_dt + AuCHILD, a->dst_dentry, &a->h_path); ++ } ++} ++ ++static void au_ren_rev_dt(int err, struct au_ren_args *a) ++{ ++ struct dentry *h_d; ++ struct inode *h_inode; ++ ++ au_dtime_revert(a->src_dt + AuPARENT); ++ if (!au_ftest_ren(a->auren_flags, ISSAMEDIR)) ++ au_dtime_revert(a->dst_dt + AuPARENT); ++ ++ if (au_ftest_ren(a->auren_flags, ISDIR_SRC) && err != -EIO) { ++ h_d = a->src_dt[AuCHILD].dt_h_path.dentry; ++ h_inode = d_inode(h_d); ++ inode_lock_nested(h_inode, AuLsc_I_CHILD); ++ au_dtime_revert(a->src_dt + AuCHILD); ++ inode_unlock(h_inode); ++ ++ if (au_ftest_ren(a->auren_flags, DT_DSTDIR)) { ++ h_d = a->dst_dt[AuCHILD].dt_h_path.dentry; ++ h_inode = d_inode(h_d); ++ inode_lock_nested(h_inode, AuLsc_I_CHILD); ++ au_dtime_revert(a->dst_dt + AuCHILD); ++ inode_unlock(h_inode); ++ } ++ } ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++int aufs_rename(struct mnt_idmap *idmap, ++ struct inode *_src_dir, struct dentry *_src_dentry, ++ struct inode *_dst_dir, struct dentry *_dst_dentry, ++ unsigned int _flags) ++{ ++ int err, lock_flags; ++ void *rev; ++ /* reduce stack space */ ++ struct au_ren_args *a; ++ struct au_pin pin; ++ ++ AuDbg("%pd, %pd, 0x%x\n", _src_dentry, _dst_dentry, _flags); ++ IMustLock(_src_dir); ++ IMustLock(_dst_dir); ++ ++ err = -EINVAL; ++ if (unlikely(_flags & RENAME_WHITEOUT)) ++ goto out; ++ ++ err = -ENOMEM; ++ BUILD_BUG_ON(sizeof(*a) > PAGE_SIZE); ++ a = kzalloc(sizeof(*a), GFP_NOFS); ++ if (unlikely(!a)) ++ goto out; ++ ++ a->flags = _flags; ++ BUILD_BUG_ON(sizeof(a->exchange) == sizeof(u8) ++ && RENAME_EXCHANGE > U8_MAX); ++ a->exchange = _flags & RENAME_EXCHANGE; ++ a->src_dir = _src_dir; ++ a->src_dentry = _src_dentry; ++ a->src_inode = NULL; ++ if (d_really_is_positive(a->src_dentry)) ++ a->src_inode = d_inode(a->src_dentry); ++ a->src_parent = a->src_dentry->d_parent; /* dir inode is locked */ ++ a->dst_dir = _dst_dir; ++ a->dst_dentry = _dst_dentry; ++ a->dst_inode = NULL; ++ if (d_really_is_positive(a->dst_dentry)) ++ a->dst_inode = d_inode(a->dst_dentry); ++ a->dst_parent = a->dst_dentry->d_parent; /* dir inode is locked */ ++ if (a->dst_inode) { ++ /* ++ * if EXCHANGE && src is non-dir && dst is dir, ++ * dst is not locked. ++ */ ++ /* IMustLock(a->dst_inode); */ ++ au_igrab(a->dst_inode); ++ } ++ ++ err = -ENOTDIR; ++ lock_flags = AuLock_FLUSH | AuLock_NOPLM | AuLock_GEN; ++ if (d_is_dir(a->src_dentry)) { ++ au_fset_ren(a->auren_flags, ISDIR_SRC); ++ if (unlikely(!a->exchange ++ && d_really_is_positive(a->dst_dentry) ++ && !d_is_dir(a->dst_dentry))) ++ goto out_free; ++ lock_flags |= AuLock_DIRS; ++ } ++ if (a->dst_inode && d_is_dir(a->dst_dentry)) { ++ au_fset_ren(a->auren_flags, ISDIR_DST); ++ if (unlikely(!a->exchange ++ && d_really_is_positive(a->src_dentry) ++ && !d_is_dir(a->src_dentry))) ++ goto out_free; ++ lock_flags |= AuLock_DIRS; ++ } ++ err = aufs_read_and_write_lock2(a->dst_dentry, a->src_dentry, ++ lock_flags); ++ if (unlikely(err)) ++ goto out_free; ++ ++ err = au_d_hashed_positive(a->src_dentry); ++ if (unlikely(err)) ++ goto out_unlock; ++ err = -ENOENT; ++ if (a->dst_inode) { ++ /* ++ * If it is a dir, VFS unhash it before this ++ * function. It means we cannot rely upon d_unhashed(). ++ */ ++ if (unlikely(!a->dst_inode->i_nlink)) ++ goto out_unlock; ++ if (!au_ftest_ren(a->auren_flags, ISDIR_DST)) { ++ err = au_d_hashed_positive(a->dst_dentry); ++ if (unlikely(err && !a->exchange)) ++ goto out_unlock; ++ } else if (unlikely(IS_DEADDIR(a->dst_inode))) ++ goto out_unlock; ++ } else if (unlikely(d_unhashed(a->dst_dentry))) ++ goto out_unlock; ++ ++ /* ++ * is it possible? ++ * yes, it happened (in linux-3.3-rcN) but I don't know why. ++ * there may exist a problem somewhere else. ++ */ ++ err = -EINVAL; ++ if (unlikely(d_inode(a->dst_parent) == d_inode(a->src_dentry))) ++ goto out_unlock; ++ ++ au_fset_ren(a->auren_flags, ISSAMEDIR); /* temporary */ ++ di_write_lock_parent(a->dst_parent); ++ ++ /* which branch we process */ ++ err = au_ren_wbr(a); ++ if (unlikely(err < 0)) ++ goto out_parent; ++ a->br = au_sbr(a->dst_dentry->d_sb, a->btgt); ++ a->h_path.mnt = au_br_mnt(a->br); ++ ++ /* are they available to be renamed */ ++ err = au_ren_may_dir(a); ++ if (unlikely(err)) ++ goto out_children; ++ ++ /* prepare the writable parent dir on the same branch */ ++ if (a->dst_btop == a->btgt) { ++ au_fset_ren(a->auren_flags, WHDST); ++ } else { ++ err = au_cpup_dirs(a->dst_dentry, a->btgt); ++ if (unlikely(err)) ++ goto out_children; ++ } ++ ++ err = 0; ++ if (!a->exchange) { ++ if (a->src_dir != a->dst_dir) { ++ /* ++ * this temporary unlock is safe, ++ * because both dir->i_mutex are locked. ++ */ ++ di_write_unlock(a->dst_parent); ++ di_write_lock_parent(a->src_parent); ++ err = au_wr_dir_need_wh(a->src_dentry, ++ au_ftest_ren(a->auren_flags, ++ ISDIR_SRC), ++ &a->btgt); ++ di_write_unlock(a->src_parent); ++ di_write_lock2_parent(a->src_parent, a->dst_parent, ++ /*isdir*/1); ++ au_fclr_ren(a->auren_flags, ISSAMEDIR); ++ } else ++ err = au_wr_dir_need_wh(a->src_dentry, ++ au_ftest_ren(a->auren_flags, ++ ISDIR_SRC), ++ &a->btgt); ++ } ++ if (unlikely(err < 0)) ++ goto out_children; ++ if (err) ++ au_fset_ren(a->auren_flags, WHSRC); ++ ++ /* cpup src */ ++ if (a->src_btop != a->btgt) { ++ err = au_pin(&pin, a->src_dentry, a->btgt, ++ au_opt_udba(a->src_dentry->d_sb), ++ AuPin_DI_LOCKED | AuPin_MNT_WRITE); ++ if (!err) { ++ struct au_cp_generic cpg = { ++ .dentry = a->src_dentry, ++ .bdst = a->btgt, ++ .bsrc = a->src_btop, ++ .len = -1, ++ .pin = &pin, ++ .flags = AuCpup_DTIME | AuCpup_HOPEN ++ }; ++ AuDebugOn(au_dbtop(a->src_dentry) != a->src_btop); ++ err = au_sio_cpup_simple(&cpg); ++ au_unpin(&pin); ++ } ++ if (unlikely(err)) ++ goto out_children; ++ a->src_btop = a->btgt; ++ a->src_h_dentry = au_h_dptr(a->src_dentry, a->btgt); ++ if (!a->exchange) ++ au_fset_ren(a->auren_flags, WHSRC); ++ } ++ ++ /* cpup dst */ ++ if (a->exchange && a->dst_inode ++ && a->dst_btop != a->btgt) { ++ err = au_pin(&pin, a->dst_dentry, a->btgt, ++ au_opt_udba(a->dst_dentry->d_sb), ++ AuPin_DI_LOCKED | AuPin_MNT_WRITE); ++ if (!err) { ++ struct au_cp_generic cpg = { ++ .dentry = a->dst_dentry, ++ .bdst = a->btgt, ++ .bsrc = a->dst_btop, ++ .len = -1, ++ .pin = &pin, ++ .flags = AuCpup_DTIME | AuCpup_HOPEN ++ }; ++ err = au_sio_cpup_simple(&cpg); ++ au_unpin(&pin); ++ } ++ if (unlikely(err)) ++ goto out_children; ++ a->dst_btop = a->btgt; ++ a->dst_h_dentry = au_h_dptr(a->dst_dentry, a->btgt); ++ } ++ ++ /* lock them all */ ++ err = au_ren_lock(a); ++ if (unlikely(err)) ++ /* leave the copied-up one */ ++ goto out_children; ++ ++ if (!a->exchange) { ++ if (!au_opt_test(au_mntflags(a->dst_dir->i_sb), UDBA_NONE)) ++ err = au_may_ren(a); ++ else if (unlikely(a->dst_dentry->d_name.len > AUFS_MAX_NAMELEN)) ++ err = -ENAMETOOLONG; ++ if (unlikely(err)) ++ goto out_hdir; ++ } ++ ++ /* store timestamps to be revertible */ ++ au_ren_dt(a); ++ ++ /* store dirren info */ ++ if (au_ftest_ren(a->auren_flags, DIRREN)) { ++ err = au_dr_rename(a->src_dentry, a->btgt, ++ &a->dst_dentry->d_name, &rev); ++ AuTraceErr(err); ++ if (unlikely(err)) ++ goto out_dt; ++ } ++ ++ /* here we go */ ++ err = do_rename(a); ++ if (unlikely(err)) ++ goto out_dirren; ++ ++ if (au_ftest_ren(a->auren_flags, DIRREN)) ++ au_dr_rename_fin(a->src_dentry, a->btgt, rev); ++ ++ /* update dir attributes */ ++ au_ren_refresh_dir(a); ++ ++ /* dput/iput all lower dentries */ ++ au_ren_refresh(a); ++ ++ goto out_hdir; /* success */ ++ ++out_dirren: ++ if (au_ftest_ren(a->auren_flags, DIRREN)) ++ au_dr_rename_rev(a->src_dentry, a->btgt, rev); ++out_dt: ++ au_ren_rev_dt(err, a); ++out_hdir: ++ au_ren_unlock(a); ++out_children: ++ au_nhash_wh_free(&a->whlist); ++ if (err && a->dst_inode && a->dst_btop != a->btgt) { ++ AuDbg("btop %d, btgt %d\n", a->dst_btop, a->btgt); ++ au_set_h_dptr(a->dst_dentry, a->btgt, NULL); ++ au_set_dbtop(a->dst_dentry, a->dst_btop); ++ } ++out_parent: ++ if (!err) { ++ if (d_unhashed(a->src_dentry)) ++ au_fset_ren(a->auren_flags, DROPPED_SRC); ++ if (d_unhashed(a->dst_dentry)) ++ au_fset_ren(a->auren_flags, DROPPED_DST); ++ if (!a->exchange) ++ d_move(a->src_dentry, a->dst_dentry); ++ else { ++ d_exchange(a->src_dentry, a->dst_dentry); ++ if (au_ftest_ren(a->auren_flags, DROPPED_DST)) ++ d_drop(a->dst_dentry); ++ } ++ if (au_ftest_ren(a->auren_flags, DROPPED_SRC)) ++ d_drop(a->src_dentry); ++ } else { ++ au_update_dbtop(a->dst_dentry); ++ if (!a->dst_inode) ++ d_drop(a->dst_dentry); ++ } ++ if (au_ftest_ren(a->auren_flags, ISSAMEDIR)) ++ di_write_unlock(a->dst_parent); ++ else ++ di_write_unlock2(a->src_parent, a->dst_parent); ++out_unlock: ++ aufs_read_and_write_unlock2(a->dst_dentry, a->src_dentry); ++out_free: ++ iput(a->dst_inode); ++ if (a->thargs) ++ au_whtmp_rmdir_free(a->thargs); ++ au_kfree_rcu(a); ++out: ++ AuTraceErr(err); ++ return err; ++} +diff --git a/fs/aufs/iinfo.c b/fs/aufs/iinfo.c +new file mode 100644 +index 000000000000..0d3a2487643b +--- /dev/null ++++ b/fs/aufs/iinfo.c +@@ -0,0 +1,286 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * inode private data ++ */ ++ ++#include "aufs.h" ++ ++struct inode *au_h_iptr(struct inode *inode, aufs_bindex_t bindex) ++{ ++ struct inode *h_inode; ++ struct au_hinode *hinode; ++ ++ IiMustAnyLock(inode); ++ ++ hinode = au_hinode(au_ii(inode), bindex); ++ h_inode = hinode->hi_inode; ++ AuDebugOn(h_inode && atomic_read(&h_inode->i_count) <= 0); ++ return h_inode; ++} ++ ++/* todo: hard/soft set? */ ++void au_hiput(struct au_hinode *hinode) ++{ ++ au_hn_free(hinode); ++ dput(hinode->hi_whdentry); ++ iput(hinode->hi_inode); ++} ++ ++unsigned int au_hi_flags(struct inode *inode, int isdir) ++{ ++ unsigned int flags; ++ const unsigned int mnt_flags = au_mntflags(inode->i_sb); ++ ++ flags = 0; ++ if (au_opt_test(mnt_flags, XINO)) ++ au_fset_hi(flags, XINO); ++ if (isdir && au_opt_test(mnt_flags, UDBA_HNOTIFY)) ++ au_fset_hi(flags, HNOTIFY); ++ return flags; ++} ++ ++void au_set_h_iptr(struct inode *inode, aufs_bindex_t bindex, ++ struct inode *h_inode, unsigned int flags) ++{ ++ struct au_hinode *hinode; ++ struct inode *hi; ++ struct au_iinfo *iinfo = au_ii(inode); ++ ++ IiMustWriteLock(inode); ++ ++ hinode = au_hinode(iinfo, bindex); ++ hi = hinode->hi_inode; ++ AuDebugOn(h_inode && atomic_read(&h_inode->i_count) <= 0); ++ ++ if (hi) ++ au_hiput(hinode); ++ hinode->hi_inode = h_inode; ++ if (h_inode) { ++ int err; ++ struct super_block *sb = inode->i_sb; ++ struct au_branch *br; ++ ++ AuDebugOn(inode->i_mode ++ && (h_inode->i_mode & S_IFMT) ++ != (inode->i_mode & S_IFMT)); ++ if (bindex == iinfo->ii_btop) ++ au_cpup_igen(inode, h_inode); ++ br = au_sbr(sb, bindex); ++ hinode->hi_id = br->br_id; ++ if (au_ftest_hi(flags, XINO)) { ++ err = au_xino_write(sb, bindex, h_inode->i_ino, ++ inode->i_ino); ++ if (unlikely(err)) ++ AuIOErr1("failed au_xino_write() %d\n", err); ++ } ++ ++ if (au_ftest_hi(flags, HNOTIFY) ++ && au_br_hnotifyable(br->br_perm)) { ++ err = au_hn_alloc(hinode, inode); ++ if (unlikely(err)) ++ AuIOErr1("au_hn_alloc() %d\n", err); ++ } ++ } ++} ++ ++void au_set_hi_wh(struct inode *inode, aufs_bindex_t bindex, ++ struct dentry *h_wh) ++{ ++ struct au_hinode *hinode; ++ ++ IiMustWriteLock(inode); ++ ++ hinode = au_hinode(au_ii(inode), bindex); ++ AuDebugOn(hinode->hi_whdentry); ++ hinode->hi_whdentry = h_wh; ++} ++ ++void au_update_iigen(struct inode *inode, int half) ++{ ++ struct au_iinfo *iinfo; ++ struct au_iigen *iigen; ++ unsigned int sigen; ++ ++ sigen = au_sigen(inode->i_sb); ++ iinfo = au_ii(inode); ++ iigen = &iinfo->ii_generation; ++ spin_lock(&iigen->ig_spin); ++ iigen->ig_generation = sigen; ++ if (half) ++ au_ig_fset(iigen->ig_flags, HALF_REFRESHED); ++ else ++ au_ig_fclr(iigen->ig_flags, HALF_REFRESHED); ++ spin_unlock(&iigen->ig_spin); ++} ++ ++/* it may be called at remount time, too */ ++void au_update_ibrange(struct inode *inode, int do_put_zero) ++{ ++ struct au_iinfo *iinfo; ++ aufs_bindex_t bindex, bbot; ++ ++ AuDebugOn(au_is_bad_inode(inode)); ++ IiMustWriteLock(inode); ++ ++ iinfo = au_ii(inode); ++ if (do_put_zero && iinfo->ii_btop >= 0) { ++ for (bindex = iinfo->ii_btop; bindex <= iinfo->ii_bbot; ++ bindex++) { ++ struct inode *h_i; ++ ++ h_i = au_hinode(iinfo, bindex)->hi_inode; ++ if (h_i ++ && !h_i->i_nlink ++ && !(h_i->i_state & I_LINKABLE)) ++ au_set_h_iptr(inode, bindex, NULL, 0); ++ } ++ } ++ ++ iinfo->ii_btop = -1; ++ iinfo->ii_bbot = -1; ++ bbot = au_sbbot(inode->i_sb); ++ for (bindex = 0; bindex <= bbot; bindex++) ++ if (au_hinode(iinfo, bindex)->hi_inode) { ++ iinfo->ii_btop = bindex; ++ break; ++ } ++ if (iinfo->ii_btop >= 0) ++ for (bindex = bbot; bindex >= iinfo->ii_btop; bindex--) ++ if (au_hinode(iinfo, bindex)->hi_inode) { ++ iinfo->ii_bbot = bindex; ++ break; ++ } ++ AuDebugOn(iinfo->ii_btop > iinfo->ii_bbot); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++void au_icntnr_init_once(void *_c) ++{ ++ struct au_icntnr *c = _c; ++ struct au_iinfo *iinfo = &c->iinfo; ++ ++ spin_lock_init(&iinfo->ii_generation.ig_spin); ++ au_rw_init(&iinfo->ii_rwsem); ++ inode_init_once(&c->vfs_inode); ++} ++ ++void au_hinode_init(struct au_hinode *hinode) ++{ ++ hinode->hi_inode = NULL; ++ hinode->hi_id = -1; ++ au_hn_init(hinode); ++ hinode->hi_whdentry = NULL; ++} ++ ++int au_iinfo_init(struct inode *inode) ++{ ++ struct au_iinfo *iinfo; ++ struct super_block *sb; ++ struct au_hinode *hi; ++ int nbr, i; ++ ++ sb = inode->i_sb; ++ iinfo = &(container_of(inode, struct au_icntnr, vfs_inode)->iinfo); ++ nbr = au_sbbot(sb) + 1; ++ if (unlikely(nbr <= 0)) ++ nbr = 1; ++ hi = kmalloc_array(nbr, sizeof(*iinfo->ii_hinode), GFP_NOFS); ++ if (hi) { ++ au_lcnt_inc(&au_sbi(sb)->si_ninodes); ++ ++ iinfo->ii_hinode = hi; ++ for (i = 0; i < nbr; i++, hi++) ++ au_hinode_init(hi); ++ ++ iinfo->ii_generation.ig_generation = au_sigen(sb); ++ iinfo->ii_btop = -1; ++ iinfo->ii_bbot = -1; ++ iinfo->ii_vdir = NULL; ++ return 0; ++ } ++ return -ENOMEM; ++} ++ ++int au_hinode_realloc(struct au_iinfo *iinfo, int nbr, int may_shrink) ++{ ++ int err, i; ++ struct au_hinode *hip; ++ ++ AuRwMustWriteLock(&iinfo->ii_rwsem); ++ ++ err = -ENOMEM; ++ hip = au_krealloc(iinfo->ii_hinode, sizeof(*hip) * nbr, GFP_NOFS, ++ may_shrink); ++ if (hip) { ++ iinfo->ii_hinode = hip; ++ i = iinfo->ii_bbot + 1; ++ hip += i; ++ for (; i < nbr; i++, hip++) ++ au_hinode_init(hip); ++ err = 0; ++ } ++ ++ return err; ++} ++ ++void au_iinfo_fin(struct inode *inode) ++{ ++ struct au_iinfo *iinfo; ++ struct au_hinode *hi; ++ struct super_block *sb; ++ aufs_bindex_t bindex, bbot; ++ const unsigned char unlinked = !inode->i_nlink; ++ ++ AuDebugOn(au_is_bad_inode(inode)); ++ ++ sb = inode->i_sb; ++ au_lcnt_dec(&au_sbi(sb)->si_ninodes); ++ if (si_pid_test(sb)) ++ au_xino_delete_inode(inode, unlinked); ++ else { ++ /* ++ * it is safe to hide the dependency between sbinfo and ++ * sb->s_umount. ++ */ ++ lockdep_off(); ++ si_noflush_read_lock(sb); ++ au_xino_delete_inode(inode, unlinked); ++ si_read_unlock(sb); ++ lockdep_on(); ++ } ++ ++ iinfo = au_ii(inode); ++ if (iinfo->ii_vdir) ++ au_vdir_free(iinfo->ii_vdir); ++ ++ bindex = iinfo->ii_btop; ++ if (bindex >= 0) { ++ hi = au_hinode(iinfo, bindex); ++ bbot = iinfo->ii_bbot; ++ while (bindex++ <= bbot) { ++ if (hi->hi_inode) ++ au_hiput(hi); ++ hi++; ++ } ++ } ++ au_kfree_rcu(iinfo->ii_hinode); ++ AuRwDestroy(&iinfo->ii_rwsem); ++} +diff --git a/fs/aufs/inode.c b/fs/aufs/inode.c +new file mode 100644 +index 000000000000..7dbf6a6f2fee +--- /dev/null ++++ b/fs/aufs/inode.c +@@ -0,0 +1,531 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * inode functions ++ */ ++ ++#include <linux/iversion.h> ++#include "aufs.h" ++ ++struct inode *au_igrab(struct inode *inode) ++{ ++ if (inode) { ++ AuDebugOn(!atomic_read(&inode->i_count)); ++ ihold(inode); ++ } ++ return inode; ++} ++ ++static void au_refresh_hinode_attr(struct inode *inode, int do_version) ++{ ++ au_cpup_attr_all(inode, /*force*/0); ++ au_update_iigen(inode, /*half*/1); ++ if (do_version) ++ inode_inc_iversion(inode); ++} ++ ++static int au_ii_refresh(struct inode *inode, int *update) ++{ ++ int err, e, nbr; ++ umode_t type; ++ aufs_bindex_t bindex, new_bindex; ++ struct super_block *sb; ++ struct au_iinfo *iinfo; ++ struct au_hinode *p, *q, tmp; ++ ++ AuDebugOn(au_is_bad_inode(inode)); ++ IiMustWriteLock(inode); ++ ++ *update = 0; ++ sb = inode->i_sb; ++ nbr = au_sbbot(sb) + 1; ++ type = inode->i_mode & S_IFMT; ++ iinfo = au_ii(inode); ++ err = au_hinode_realloc(iinfo, nbr, /*may_shrink*/0); ++ if (unlikely(err)) ++ goto out; ++ ++ AuDebugOn(iinfo->ii_btop < 0); ++ p = au_hinode(iinfo, iinfo->ii_btop); ++ for (bindex = iinfo->ii_btop; bindex <= iinfo->ii_bbot; ++ bindex++, p++) { ++ if (!p->hi_inode) ++ continue; ++ ++ AuDebugOn(type != (p->hi_inode->i_mode & S_IFMT)); ++ new_bindex = au_br_index(sb, p->hi_id); ++ if (new_bindex == bindex) ++ continue; ++ ++ if (new_bindex < 0) { ++ *update = 1; ++ au_hiput(p); ++ p->hi_inode = NULL; ++ continue; ++ } ++ ++ if (new_bindex < iinfo->ii_btop) ++ iinfo->ii_btop = new_bindex; ++ if (iinfo->ii_bbot < new_bindex) ++ iinfo->ii_bbot = new_bindex; ++ /* swap two lower inode, and loop again */ ++ q = au_hinode(iinfo, new_bindex); ++ tmp = *q; ++ *q = *p; ++ *p = tmp; ++ if (tmp.hi_inode) { ++ bindex--; ++ p--; ++ } ++ } ++ au_update_ibrange(inode, /*do_put_zero*/0); ++ au_hinode_realloc(iinfo, nbr, /*may_shrink*/1); /* harmless if err */ ++ e = au_dy_irefresh(inode); ++ if (unlikely(e && !err)) ++ err = e; ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++void au_refresh_iop(struct inode *inode, int force_getattr) ++{ ++ int type; ++ struct au_sbinfo *sbi = au_sbi(inode->i_sb); ++ const struct inode_operations *iop ++ = force_getattr ? aufs_iop : sbi->si_iop_array; ++ ++ if (inode->i_op == iop) ++ return; ++ ++ switch (inode->i_mode & S_IFMT) { ++ case S_IFDIR: ++ type = AuIop_DIR; ++ break; ++ case S_IFLNK: ++ type = AuIop_SYMLINK; ++ break; ++ default: ++ type = AuIop_OTHER; ++ break; ++ } ++ ++ inode->i_op = iop + type; ++ /* unnecessary smp_wmb() */ ++} ++ ++int au_refresh_hinode_self(struct inode *inode) ++{ ++ int err, update; ++ ++ err = au_ii_refresh(inode, &update); ++ if (!err) ++ au_refresh_hinode_attr(inode, update && S_ISDIR(inode->i_mode)); ++ ++ AuTraceErr(err); ++ return err; ++} ++ ++int au_refresh_hinode(struct inode *inode, struct dentry *dentry) ++{ ++ int err, e, update; ++ unsigned int flags; ++ umode_t mode; ++ aufs_bindex_t bindex, bbot; ++ unsigned char isdir; ++ struct au_hinode *p; ++ struct au_iinfo *iinfo; ++ ++ err = au_ii_refresh(inode, &update); ++ if (unlikely(err)) ++ goto out; ++ ++ update = 0; ++ iinfo = au_ii(inode); ++ p = au_hinode(iinfo, iinfo->ii_btop); ++ mode = (inode->i_mode & S_IFMT); ++ isdir = S_ISDIR(mode); ++ flags = au_hi_flags(inode, isdir); ++ bbot = au_dbbot(dentry); ++ for (bindex = au_dbtop(dentry); bindex <= bbot; bindex++) { ++ struct inode *h_i, *h_inode; ++ struct dentry *h_d; ++ ++ h_d = au_h_dptr(dentry, bindex); ++ if (!h_d || d_is_negative(h_d)) ++ continue; ++ ++ h_inode = d_inode(h_d); ++ AuDebugOn(mode != (h_inode->i_mode & S_IFMT)); ++ if (iinfo->ii_btop <= bindex && bindex <= iinfo->ii_bbot) { ++ h_i = au_h_iptr(inode, bindex); ++ if (h_i) { ++ if (h_i == h_inode) ++ continue; ++ err = -EIO; ++ break; ++ } ++ } ++ if (bindex < iinfo->ii_btop) ++ iinfo->ii_btop = bindex; ++ if (iinfo->ii_bbot < bindex) ++ iinfo->ii_bbot = bindex; ++ au_set_h_iptr(inode, bindex, au_igrab(h_inode), flags); ++ update = 1; ++ } ++ au_update_ibrange(inode, /*do_put_zero*/0); ++ e = au_dy_irefresh(inode); ++ if (unlikely(e && !err)) ++ err = e; ++ if (!err) ++ au_refresh_hinode_attr(inode, update && isdir); ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++static int set_inode(struct inode *inode, struct dentry *dentry) ++{ ++ int err; ++ unsigned int flags; ++ umode_t mode; ++ aufs_bindex_t bindex, btop, btail; ++ unsigned char isdir; ++ struct dentry *h_dentry; ++ struct inode *h_inode; ++ struct au_iinfo *iinfo; ++ const struct inode_operations *iop; ++ ++ IiMustWriteLock(inode); ++ ++ err = 0; ++ isdir = 0; ++ iop = au_sbi(inode->i_sb)->si_iop_array; ++ btop = au_dbtop(dentry); ++ h_dentry = au_h_dptr(dentry, btop); ++ h_inode = d_inode(h_dentry); ++ mode = h_inode->i_mode; ++ switch (mode & S_IFMT) { ++ case S_IFREG: ++ btail = au_dbtail(dentry); ++ inode->i_op = iop + AuIop_OTHER; ++ inode->i_fop = &aufs_file_fop; ++ err = au_dy_iaop(inode, btop, h_inode); ++ if (unlikely(err)) ++ goto out; ++ break; ++ case S_IFDIR: ++ isdir = 1; ++ btail = au_dbtaildir(dentry); ++ inode->i_op = iop + AuIop_DIR; ++ inode->i_fop = &aufs_dir_fop; ++ break; ++ case S_IFLNK: ++ btail = au_dbtail(dentry); ++ inode->i_op = iop + AuIop_SYMLINK; ++ break; ++ case S_IFBLK: ++ case S_IFCHR: ++ case S_IFIFO: ++ case S_IFSOCK: ++ btail = au_dbtail(dentry); ++ inode->i_op = iop + AuIop_OTHER; ++ init_special_inode(inode, mode, h_inode->i_rdev); ++ break; ++ default: ++ AuIOErr("Unknown file type 0%o\n", mode); ++ err = -EIO; ++ goto out; ++ } ++ ++ /* do not set hnotify for whiteouted dirs (SHWH mode) */ ++ flags = au_hi_flags(inode, isdir); ++ if (au_opt_test(au_mntflags(dentry->d_sb), SHWH) ++ && au_ftest_hi(flags, HNOTIFY) ++ && dentry->d_name.len > AUFS_WH_PFX_LEN ++ && !memcmp(dentry->d_name.name, AUFS_WH_PFX, AUFS_WH_PFX_LEN)) ++ au_fclr_hi(flags, HNOTIFY); ++ iinfo = au_ii(inode); ++ iinfo->ii_btop = btop; ++ iinfo->ii_bbot = btail; ++ for (bindex = btop; bindex <= btail; bindex++) { ++ h_dentry = au_h_dptr(dentry, bindex); ++ if (h_dentry) ++ au_set_h_iptr(inode, bindex, ++ au_igrab(d_inode(h_dentry)), flags); ++ } ++ au_cpup_attr_all(inode, /*force*/1); ++ /* ++ * to force calling aufs_get_inode_acl() every time, ++ * do not call cache_no_acl() for aufs inode. ++ */ ++ ++out: ++ return err; ++} ++ ++/* ++ * successful returns with iinfo write_locked ++ * minus: errno ++ * zero: success, matched ++ * plus: no error, but unmatched ++ */ ++static int reval_inode(struct inode *inode, struct dentry *dentry) ++{ ++ int err; ++ unsigned int gen, igflags; ++ aufs_bindex_t bindex, bbot; ++ struct inode *h_inode, *h_dinode; ++ struct dentry *h_dentry; ++ ++ /* ++ * before this function, if aufs got any iinfo lock, it must be only ++ * one, the parent dir. ++ * it can happen by UDBA and the obsoleted inode number. ++ */ ++ err = -EIO; ++ if (unlikely(inode->i_ino == parent_ino(dentry))) ++ goto out; ++ ++ err = 1; ++ ii_write_lock_new_child(inode); ++ h_dentry = au_h_dptr(dentry, au_dbtop(dentry)); ++ h_dinode = d_inode(h_dentry); ++ bbot = au_ibbot(inode); ++ for (bindex = au_ibtop(inode); bindex <= bbot; bindex++) { ++ h_inode = au_h_iptr(inode, bindex); ++ if (!h_inode || h_inode != h_dinode) ++ continue; ++ ++ err = 0; ++ gen = au_iigen(inode, &igflags); ++ if (gen == au_digen(dentry) ++ && !au_ig_ftest(igflags, HALF_REFRESHED)) ++ break; ++ ++ /* fully refresh inode using dentry */ ++ err = au_refresh_hinode(inode, dentry); ++ if (!err) ++ au_update_iigen(inode, /*half*/0); ++ break; ++ } ++ ++ if (unlikely(err)) ++ ii_write_unlock(inode); ++out: ++ return err; ++} ++ ++int au_ino(struct super_block *sb, aufs_bindex_t bindex, ino_t h_ino, ++ unsigned int d_type, ino_t *ino) ++{ ++ int err, idx; ++ const int isnondir = d_type != DT_DIR; ++ ++ /* prevent hardlinked inode number from race condition */ ++ if (isnondir) { ++ err = au_xinondir_enter(sb, bindex, h_ino, &idx); ++ if (unlikely(err)) ++ goto out; ++ } ++ ++ err = au_xino_read(sb, bindex, h_ino, ino); ++ if (unlikely(err)) ++ goto out_xinondir; ++ ++ if (!*ino) { ++ err = -EIO; ++ *ino = au_xino_new_ino(sb); ++ if (unlikely(!*ino)) ++ goto out_xinondir; ++ err = au_xino_write(sb, bindex, h_ino, *ino); ++ if (unlikely(err)) ++ goto out_xinondir; ++ } ++ ++out_xinondir: ++ if (isnondir && idx >= 0) ++ au_xinondir_leave(sb, bindex, h_ino, idx); ++out: ++ return err; ++} ++ ++/* successful returns with iinfo write_locked */ ++/* todo: return with unlocked? */ ++struct inode *au_new_inode(struct dentry *dentry, int must_new) ++{ ++ struct inode *inode, *h_inode; ++ struct dentry *h_dentry; ++ struct super_block *sb; ++ ino_t h_ino, ino; ++ int err, idx, hlinked; ++ aufs_bindex_t btop; ++ ++ sb = dentry->d_sb; ++ btop = au_dbtop(dentry); ++ h_dentry = au_h_dptr(dentry, btop); ++ h_inode = d_inode(h_dentry); ++ h_ino = h_inode->i_ino; ++ hlinked = !d_is_dir(h_dentry) && h_inode->i_nlink > 1; ++ ++new_ino: ++ /* ++ * stop 'race'-ing between hardlinks under different ++ * parents. ++ */ ++ if (hlinked) { ++ err = au_xinondir_enter(sb, btop, h_ino, &idx); ++ inode = ERR_PTR(err); ++ if (unlikely(err)) ++ goto out; ++ } ++ ++ err = au_xino_read(sb, btop, h_ino, &ino); ++ inode = ERR_PTR(err); ++ if (unlikely(err)) ++ goto out_xinondir; ++ ++ if (!ino) { ++ ino = au_xino_new_ino(sb); ++ if (unlikely(!ino)) { ++ inode = ERR_PTR(-EIO); ++ goto out_xinondir; ++ } ++ } ++ ++ AuDbg("i%lu\n", (unsigned long)ino); ++ inode = au_iget_locked(sb, ino); ++ err = PTR_ERR(inode); ++ if (IS_ERR(inode)) ++ goto out_xinondir; ++ ++ AuDbg("%lx, new %d\n", inode->i_state, !!(inode->i_state & I_NEW)); ++ if (inode->i_state & I_NEW) { ++ ii_write_lock_new_child(inode); ++ err = set_inode(inode, dentry); ++ if (!err) { ++ unlock_new_inode(inode); ++ goto out_xinondir; /* success */ ++ } ++ ++ /* ++ * iget_failed() calls iput(), but we need to call ++ * ii_write_unlock() after iget_failed(). so dirty hack for ++ * i_count. ++ */ ++ atomic_inc(&inode->i_count); ++ iget_failed(inode); ++ ii_write_unlock(inode); ++ au_xino_write(sb, btop, h_ino, /*ino*/0); ++ /* ignore this error */ ++ goto out_iput; ++ } else if (!must_new && !IS_DEADDIR(inode) && inode->i_nlink) { ++ /* ++ * horrible race condition between lookup, readdir and copyup ++ * (or something). ++ */ ++ if (hlinked && idx >= 0) ++ au_xinondir_leave(sb, btop, h_ino, idx); ++ err = reval_inode(inode, dentry); ++ if (unlikely(err < 0)) { ++ hlinked = 0; ++ goto out_iput; ++ } ++ if (!err) ++ goto out; /* success */ ++ else if (hlinked && idx >= 0) { ++ err = au_xinondir_enter(sb, btop, h_ino, &idx); ++ if (unlikely(err)) { ++ iput(inode); ++ inode = ERR_PTR(err); ++ goto out; ++ } ++ } ++ } ++ ++ if (unlikely(au_test_fs_unique_ino(h_inode))) ++ AuWarn1("Warning: Un-notified UDBA or repeatedly renamed dir," ++ " b%d, %s, %pd, hi%lu, i%lu.\n", ++ btop, au_sbtype(h_dentry->d_sb), dentry, ++ (unsigned long)h_ino, (unsigned long)ino); ++ ino = 0; ++ err = au_xino_write(sb, btop, h_ino, /*ino*/0); ++ if (!err) { ++ iput(inode); ++ if (hlinked && idx >= 0) ++ au_xinondir_leave(sb, btop, h_ino, idx); ++ goto new_ino; ++ } ++ ++out_iput: ++ iput(inode); ++ inode = ERR_PTR(err); ++out_xinondir: ++ if (hlinked && idx >= 0) ++ au_xinondir_leave(sb, btop, h_ino, idx); ++out: ++ return inode; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++int au_test_ro(struct super_block *sb, aufs_bindex_t bindex, ++ struct inode *inode) ++{ ++ int err; ++ struct inode *hi; ++ ++ err = au_br_rdonly(au_sbr(sb, bindex)); ++ ++ /* pseudo-link after flushed may happen out of bounds */ ++ if (!err ++ && inode ++ && au_ibtop(inode) <= bindex ++ && bindex <= au_ibbot(inode)) { ++ /* ++ * permission check is unnecessary since vfsub routine ++ * will be called later ++ */ ++ hi = au_h_iptr(inode, bindex); ++ if (hi) ++ err = IS_IMMUTABLE(hi) ? -EROFS : 0; ++ } ++ ++ return err; ++} ++ ++int au_test_h_perm(struct mnt_idmap *h_idmap, struct inode *h_inode, ++ int mask) ++{ ++ if (uid_eq(current_fsuid(), GLOBAL_ROOT_UID)) ++ return 0; ++ return inode_permission(h_idmap, h_inode, mask); ++} ++ ++int au_test_h_perm_sio(struct mnt_idmap *h_idmap, struct inode *h_inode, ++ int mask) ++{ ++ if (au_test_nfs(h_inode->i_sb) ++ && (mask & MAY_WRITE) ++ && S_ISDIR(h_inode->i_mode)) ++ mask |= MAY_READ; /* force permission check */ ++ return au_test_h_perm(h_idmap, h_inode, mask); ++} +diff --git a/fs/aufs/inode.h b/fs/aufs/inode.h +new file mode 100644 +index 000000000000..76c3bd49674a +--- /dev/null ++++ b/fs/aufs/inode.h +@@ -0,0 +1,707 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * inode operations ++ */ ++ ++#ifndef __AUFS_INODE_H__ ++#define __AUFS_INODE_H__ ++ ++#ifdef __KERNEL__ ++ ++#include <linux/fsnotify.h> ++#include "rwsem.h" ++ ++struct vfsmount; ++ ++struct au_hnotify { ++#ifdef CONFIG_AUFS_HNOTIFY ++#ifdef CONFIG_AUFS_HFSNOTIFY ++ /* never use fsnotify_add_vfsmount_mark() */ ++ struct fsnotify_mark hn_mark; ++#endif ++ struct inode *hn_aufs_inode; /* no get/put */ ++ struct rcu_head rcu; ++#endif ++} ____cacheline_aligned_in_smp; ++ ++struct au_hinode { ++ struct inode *hi_inode; ++ aufs_bindex_t hi_id; ++#ifdef CONFIG_AUFS_HNOTIFY ++ struct au_hnotify *hi_notify; ++#endif ++ ++ /* reference to the copied-up whiteout with get/put */ ++ struct dentry *hi_whdentry; ++}; ++ ++/* ig_flags */ ++#define AuIG_HALF_REFRESHED 1 ++#define au_ig_ftest(flags, name) ((flags) & AuIG_##name) ++#define au_ig_fset(flags, name) \ ++ do { (flags) |= AuIG_##name; } while (0) ++#define au_ig_fclr(flags, name) \ ++ do { (flags) &= ~AuIG_##name; } while (0) ++ ++struct au_iigen { ++ spinlock_t ig_spin; ++ __u32 ig_generation, ig_flags; ++}; ++ ++struct au_vdir; ++struct au_iinfo { ++ struct au_iigen ii_generation; ++ struct super_block *ii_hsb1; /* no get/put */ ++ ++ struct au_rwsem ii_rwsem; ++ aufs_bindex_t ii_btop, ii_bbot; ++ __u32 ii_higen; ++ struct au_hinode *ii_hinode; ++ struct au_vdir *ii_vdir; ++}; ++ ++struct au_icntnr { ++ struct au_iinfo iinfo; ++ struct inode vfs_inode; ++ struct hlist_bl_node plink; ++ struct rcu_head rcu; ++} ____cacheline_aligned_in_smp; ++ ++/* au_pin flags */ ++#define AuPin_DI_LOCKED 1 ++#define AuPin_MNT_WRITE (1 << 1) ++#define au_ftest_pin(flags, name) ((flags) & AuPin_##name) ++#define au_fset_pin(flags, name) \ ++ do { (flags) |= AuPin_##name; } while (0) ++#define au_fclr_pin(flags, name) \ ++ do { (flags) &= ~AuPin_##name; } while (0) ++ ++struct au_pin { ++ /* input */ ++ struct dentry *dentry; ++ unsigned int udba; ++ unsigned char lsc_di, lsc_hi, flags; ++ aufs_bindex_t bindex; ++ ++ /* output */ ++ struct dentry *parent; ++ struct au_hinode *hdir; ++ struct vfsmount *h_mnt; ++ ++ /* temporary unlock/relock for copyup */ ++ struct dentry *h_dentry, *h_parent; ++ struct au_branch *br; ++ struct task_struct *task; ++}; ++ ++void au_pin_hdir_unlock(struct au_pin *p); ++int au_pin_hdir_lock(struct au_pin *p); ++int au_pin_hdir_relock(struct au_pin *p); ++void au_pin_hdir_acquire_nest(struct au_pin *p); ++void au_pin_hdir_release(struct au_pin *p); ++ ++/* ---------------------------------------------------------------------- */ ++ ++static inline struct au_iinfo *au_ii(struct inode *inode) ++{ ++ BUG_ON(is_bad_inode(inode)); ++ return &(container_of(inode, struct au_icntnr, vfs_inode)->iinfo); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* inode.c */ ++struct inode *au_igrab(struct inode *inode); ++void au_refresh_iop(struct inode *inode, int force_getattr); ++int au_refresh_hinode_self(struct inode *inode); ++int au_refresh_hinode(struct inode *inode, struct dentry *dentry); ++int au_ino(struct super_block *sb, aufs_bindex_t bindex, ino_t h_ino, ++ unsigned int d_type, ino_t *ino); ++struct inode *au_new_inode(struct dentry *dentry, int must_new); ++int au_test_ro(struct super_block *sb, aufs_bindex_t bindex, ++ struct inode *inode); ++int au_test_h_perm(struct mnt_idmap *h_idmap, struct inode *h_inode, ++ int mask); ++int au_test_h_perm_sio(struct mnt_idmap *h_idmap, struct inode *h_inode, ++ int mask); ++ ++static inline int au_wh_ino(struct super_block *sb, aufs_bindex_t bindex, ++ ino_t h_ino, unsigned int d_type, ino_t *ino) ++{ ++#ifdef CONFIG_AUFS_SHWH ++ return au_ino(sb, bindex, h_ino, d_type, ino); ++#else ++ return 0; ++#endif ++} ++ ++/* i_op.c */ ++enum { ++ AuIop_SYMLINK, ++ AuIop_DIR, ++ AuIop_OTHER, ++ AuIop_Last ++}; ++extern struct inode_operations aufs_iop[AuIop_Last], /* not const */ ++ aufs_iop_nogetattr[AuIop_Last]; ++ ++/* au_wr_dir flags */ ++#define AuWrDir_ADD_ENTRY 1 ++#define AuWrDir_ISDIR (1 << 1) ++#define AuWrDir_TMPFILE (1 << 2) ++#define au_ftest_wrdir(flags, name) ((flags) & AuWrDir_##name) ++#define au_fset_wrdir(flags, name) \ ++ do { (flags) |= AuWrDir_##name; } while (0) ++#define au_fclr_wrdir(flags, name) \ ++ do { (flags) &= ~AuWrDir_##name; } while (0) ++ ++struct au_wr_dir_args { ++ aufs_bindex_t force_btgt; ++ unsigned char flags; ++}; ++int au_wr_dir(struct dentry *dentry, struct dentry *src_dentry, ++ struct au_wr_dir_args *args); ++ ++struct dentry *au_pinned_h_parent(struct au_pin *pin); ++void au_pin_init(struct au_pin *pin, struct dentry *dentry, ++ aufs_bindex_t bindex, int lsc_di, int lsc_hi, ++ unsigned int udba, unsigned char flags); ++int au_pin(struct au_pin *pin, struct dentry *dentry, aufs_bindex_t bindex, ++ unsigned int udba, unsigned char flags) __must_check; ++int au_do_pin(struct au_pin *pin) __must_check; ++void au_unpin(struct au_pin *pin); ++int au_reval_for_attr(struct dentry *dentry, unsigned int sigen); ++ ++#define AuIcpup_DID_CPUP 1 ++#define au_ftest_icpup(flags, name) ((flags) & AuIcpup_##name) ++#define au_fset_icpup(flags, name) \ ++ do { (flags) |= AuIcpup_##name; } while (0) ++#define au_fclr_icpup(flags, name) \ ++ do { (flags) &= ~AuIcpup_##name; } while (0) ++ ++struct au_icpup_args { ++ unsigned char flags; ++ unsigned char pin_flags; ++ aufs_bindex_t btgt; ++ unsigned int udba; ++ struct au_pin pin; ++ struct path h_path; ++ struct inode *h_inode; ++}; ++ ++int au_pin_and_icpup(struct dentry *dentry, struct iattr *ia, ++ struct au_icpup_args *a); ++ ++int au_h_path_getattr(struct dentry *dentry, struct inode *inode, int force, ++ struct path *h_path, int locked); ++ ++/* i_op_add.c */ ++int au_may_add(struct dentry *dentry, aufs_bindex_t bindex, ++ struct dentry *h_parent, int isdir); ++int aufs_mknod(struct mnt_idmap *idmap, struct inode *dir, ++ struct dentry *dentry, umode_t mode, dev_t dev); ++int aufs_symlink(struct mnt_idmap *idmap, struct inode *dir, ++ struct dentry *dentry, const char *symname); ++int aufs_create(struct mnt_idmap *idmap, struct inode *dir, ++ struct dentry *dentry, umode_t mode, bool want_excl); ++struct vfsub_aopen_args; ++int au_aopen_or_create(struct inode *dir, struct dentry *dentry, ++ struct vfsub_aopen_args *args); ++int aufs_tmpfile(struct mnt_idmap *idmap, struct inode *dir, ++ struct file *file, umode_t mode); ++int aufs_link(struct dentry *src_dentry, struct inode *dir, ++ struct dentry *dentry); ++int aufs_mkdir(struct mnt_idmap *idmap, struct inode *dir, ++ struct dentry *dentry, umode_t mode); ++ ++/* i_op_del.c */ ++int au_wr_dir_need_wh(struct dentry *dentry, int isdir, aufs_bindex_t *bcpup); ++int au_may_del(struct dentry *dentry, aufs_bindex_t bindex, ++ struct dentry *h_parent, int isdir); ++int aufs_unlink(struct inode *dir, struct dentry *dentry); ++int aufs_rmdir(struct inode *dir, struct dentry *dentry); ++ ++/* i_op_ren.c */ ++int au_wbr(struct dentry *dentry, aufs_bindex_t btgt); ++int aufs_rename(struct mnt_idmap *idmap, ++ struct inode *_src_dir, struct dentry *_src_dentry, ++ struct inode *_dst_dir, struct dentry *_dst_dentry, ++ unsigned int _flags); ++ ++/* iinfo.c */ ++struct inode *au_h_iptr(struct inode *inode, aufs_bindex_t bindex); ++void au_hiput(struct au_hinode *hinode); ++void au_set_hi_wh(struct inode *inode, aufs_bindex_t bindex, ++ struct dentry *h_wh); ++unsigned int au_hi_flags(struct inode *inode, int isdir); ++ ++/* hinode flags */ ++#define AuHi_XINO 1 ++#define AuHi_HNOTIFY (1 << 1) ++#define au_ftest_hi(flags, name) ((flags) & AuHi_##name) ++#define au_fset_hi(flags, name) \ ++ do { (flags) |= AuHi_##name; } while (0) ++#define au_fclr_hi(flags, name) \ ++ do { (flags) &= ~AuHi_##name; } while (0) ++ ++#ifndef CONFIG_AUFS_HNOTIFY ++#undef AuHi_HNOTIFY ++#define AuHi_HNOTIFY 0 ++#endif ++ ++void au_set_h_iptr(struct inode *inode, aufs_bindex_t bindex, ++ struct inode *h_inode, unsigned int flags); ++ ++void au_update_iigen(struct inode *inode, int half); ++void au_update_ibrange(struct inode *inode, int do_put_zero); ++ ++void au_icntnr_init_once(void *_c); ++void au_hinode_init(struct au_hinode *hinode); ++int au_iinfo_init(struct inode *inode); ++void au_iinfo_fin(struct inode *inode); ++int au_hinode_realloc(struct au_iinfo *iinfo, int nbr, int may_shrink); ++ ++#ifdef CONFIG_PROC_FS ++/* plink.c */ ++int au_plink_maint(struct super_block *sb, int flags); ++struct au_sbinfo; ++void au_plink_maint_leave(struct au_sbinfo *sbinfo); ++int au_plink_maint_enter(struct super_block *sb); ++#ifdef CONFIG_AUFS_DEBUG ++void au_plink_list(struct super_block *sb); ++#else ++AuStubVoid(au_plink_list, struct super_block *sb) ++#endif ++int au_plink_test(struct inode *inode); ++struct dentry *au_plink_lkup(struct inode *inode, aufs_bindex_t bindex); ++void au_plink_append(struct inode *inode, aufs_bindex_t bindex, ++ struct dentry *h_dentry); ++void au_plink_put(struct super_block *sb, int verbose); ++void au_plink_clean(struct super_block *sb, int verbose); ++void au_plink_half_refresh(struct super_block *sb, aufs_bindex_t br_id); ++#else ++AuStubInt0(au_plink_maint, struct super_block *sb, int flags); ++AuStubVoid(au_plink_maint_leave, struct au_sbinfo *sbinfo); ++AuStubInt0(au_plink_maint_enter, struct super_block *sb); ++AuStubVoid(au_plink_list, struct super_block *sb); ++AuStubInt0(au_plink_test, struct inode *inode); ++AuStub(struct dentry *, au_plink_lkup, return NULL, ++ struct inode *inode, aufs_bindex_t bindex); ++AuStubVoid(au_plink_append, struct inode *inode, aufs_bindex_t bindex, ++ struct dentry *h_dentry); ++AuStubVoid(au_plink_put, struct super_block *sb, int verbose); ++AuStubVoid(au_plink_clean, struct super_block *sb, int verbose); ++AuStubVoid(au_plink_half_refresh, struct super_block *sb, aufs_bindex_t br_id); ++#endif /* CONFIG_PROC_FS */ ++ ++#ifdef CONFIG_AUFS_XATTR ++/* xattr.c */ ++int au_cpup_xattr(struct path *h_dst, struct path *h_src, int ignore_flags, ++ unsigned int verbose); ++ssize_t aufs_listxattr(struct dentry *dentry, char *list, size_t size); ++void au_xattr_init(struct super_block *sb); ++#else ++AuStubInt0(au_cpup_xattr, struct path *h_dst, struct path *h_src, ++ int ignore_flags, unsigned int verbose); ++AuStubVoid(au_xattr_init, struct super_block *sb); ++#endif ++ ++#ifdef CONFIG_FS_POSIX_ACL ++struct posix_acl *aufs_get_inode_acl(struct inode *inode, int type, bool rcu); ++struct posix_acl *aufs_get_acl(struct mnt_idmap *idmap, ++ struct dentry *dentry, int type); ++int aufs_set_acl(struct mnt_idmap *idmap, struct dentry *dentry, ++ struct posix_acl *acl, int type); ++#endif ++ ++#if IS_ENABLED(CONFIG_AUFS_XATTR) || IS_ENABLED(CONFIG_FS_POSIX_ACL) ++enum { ++ AU_XATTR_SET, ++ AU_ACL_SET ++}; ++ ++struct au_sxattr { ++ int type; ++ union { ++ struct { ++ const char *name; ++ const void *value; ++ size_t size; ++ int flags; ++ } set; ++ struct { ++ struct posix_acl *acl; ++ int type; ++ } acl_set; ++ } u; ++}; ++ssize_t au_sxattr(struct dentry *dentry, struct inode *inode, ++ struct au_sxattr *arg); ++#endif ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* lock subclass for iinfo */ ++enum { ++ AuLsc_II_CHILD, /* child first */ ++ AuLsc_II_CHILD2, /* rename(2), link(2), and cpup at hnotify */ ++ AuLsc_II_CHILD3, /* copyup dirs */ ++ AuLsc_II_PARENT, /* see AuLsc_I_PARENT in vfsub.h */ ++ AuLsc_II_PARENT2, ++ AuLsc_II_PARENT3, /* copyup dirs */ ++ AuLsc_II_NEW_CHILD ++}; ++ ++/* ++ * ii_read_lock_child, ii_write_lock_child, ++ * ii_read_lock_child2, ii_write_lock_child2, ++ * ii_read_lock_child3, ii_write_lock_child3, ++ * ii_read_lock_parent, ii_write_lock_parent, ++ * ii_read_lock_parent2, ii_write_lock_parent2, ++ * ii_read_lock_parent3, ii_write_lock_parent3, ++ * ii_read_lock_new_child, ii_write_lock_new_child, ++ */ ++#define AuReadLockFunc(name, lsc) \ ++static inline void ii_read_lock_##name(struct inode *i) \ ++{ \ ++ au_rw_read_lock_nested(&au_ii(i)->ii_rwsem, AuLsc_II_##lsc); \ ++} ++ ++#define AuWriteLockFunc(name, lsc) \ ++static inline void ii_write_lock_##name(struct inode *i) \ ++{ \ ++ au_rw_write_lock_nested(&au_ii(i)->ii_rwsem, AuLsc_II_##lsc); \ ++} ++ ++#define AuRWLockFuncs(name, lsc) \ ++ AuReadLockFunc(name, lsc) \ ++ AuWriteLockFunc(name, lsc) ++ ++AuRWLockFuncs(child, CHILD); ++AuRWLockFuncs(child2, CHILD2); ++AuRWLockFuncs(child3, CHILD3); ++AuRWLockFuncs(parent, PARENT); ++AuRWLockFuncs(parent2, PARENT2); ++AuRWLockFuncs(parent3, PARENT3); ++AuRWLockFuncs(new_child, NEW_CHILD); ++ ++#undef AuReadLockFunc ++#undef AuWriteLockFunc ++#undef AuRWLockFuncs ++ ++#define ii_read_unlock(i) au_rw_read_unlock(&au_ii(i)->ii_rwsem) ++#define ii_write_unlock(i) au_rw_write_unlock(&au_ii(i)->ii_rwsem) ++#define ii_downgrade_lock(i) au_rw_dgrade_lock(&au_ii(i)->ii_rwsem) ++ ++#define IiMustNoWaiters(i) AuRwMustNoWaiters(&au_ii(i)->ii_rwsem) ++#define IiMustAnyLock(i) AuRwMustAnyLock(&au_ii(i)->ii_rwsem) ++#define IiMustWriteLock(i) AuRwMustWriteLock(&au_ii(i)->ii_rwsem) ++ ++/* ---------------------------------------------------------------------- */ ++ ++static inline void au_icntnr_init(struct au_icntnr *c) ++{ ++#ifdef CONFIG_AUFS_DEBUG ++ c->vfs_inode.i_mode = 0; ++#endif ++} ++ ++static inline unsigned int au_iigen(struct inode *inode, unsigned int *igflags) ++{ ++ unsigned int gen; ++ struct au_iinfo *iinfo; ++ struct au_iigen *iigen; ++ ++ iinfo = au_ii(inode); ++ iigen = &iinfo->ii_generation; ++ spin_lock(&iigen->ig_spin); ++ if (igflags) ++ *igflags = iigen->ig_flags; ++ gen = iigen->ig_generation; ++ spin_unlock(&iigen->ig_spin); ++ ++ return gen; ++} ++ ++/* tiny test for inode number */ ++/* tmpfs generation is too rough */ ++static inline int au_test_higen(struct inode *inode, struct inode *h_inode) ++{ ++ struct au_iinfo *iinfo; ++ ++ iinfo = au_ii(inode); ++ AuRwMustAnyLock(&iinfo->ii_rwsem); ++ return !(iinfo->ii_hsb1 == h_inode->i_sb ++ && iinfo->ii_higen == h_inode->i_generation); ++} ++ ++static inline void au_iigen_dec(struct inode *inode) ++{ ++ struct au_iinfo *iinfo; ++ struct au_iigen *iigen; ++ ++ iinfo = au_ii(inode); ++ iigen = &iinfo->ii_generation; ++ spin_lock(&iigen->ig_spin); ++ iigen->ig_generation--; ++ spin_unlock(&iigen->ig_spin); ++} ++ ++static inline int au_iigen_test(struct inode *inode, unsigned int sigen) ++{ ++ int err; ++ ++ err = 0; ++ if (unlikely(inode && au_iigen(inode, NULL) != sigen)) ++ err = -EIO; ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static inline struct au_hinode *au_hinode(struct au_iinfo *iinfo, ++ aufs_bindex_t bindex) ++{ ++ return iinfo->ii_hinode + bindex; ++} ++ ++static inline int au_is_bad_inode(struct inode *inode) ++{ ++ return !!(is_bad_inode(inode) || !au_hinode(au_ii(inode), 0)); ++} ++ ++static inline aufs_bindex_t au_ii_br_id(struct inode *inode, ++ aufs_bindex_t bindex) ++{ ++ IiMustAnyLock(inode); ++ return au_hinode(au_ii(inode), bindex)->hi_id; ++} ++ ++static inline aufs_bindex_t au_ibtop(struct inode *inode) ++{ ++ IiMustAnyLock(inode); ++ return au_ii(inode)->ii_btop; ++} ++ ++static inline aufs_bindex_t au_ibbot(struct inode *inode) ++{ ++ IiMustAnyLock(inode); ++ return au_ii(inode)->ii_bbot; ++} ++ ++static inline struct au_vdir *au_ivdir(struct inode *inode) ++{ ++ IiMustAnyLock(inode); ++ return au_ii(inode)->ii_vdir; ++} ++ ++static inline struct dentry *au_hi_wh(struct inode *inode, aufs_bindex_t bindex) ++{ ++ IiMustAnyLock(inode); ++ return au_hinode(au_ii(inode), bindex)->hi_whdentry; ++} ++ ++static inline void au_set_ibtop(struct inode *inode, aufs_bindex_t bindex) ++{ ++ IiMustWriteLock(inode); ++ au_ii(inode)->ii_btop = bindex; ++} ++ ++static inline void au_set_ibbot(struct inode *inode, aufs_bindex_t bindex) ++{ ++ IiMustWriteLock(inode); ++ au_ii(inode)->ii_bbot = bindex; ++} ++ ++static inline void au_set_ivdir(struct inode *inode, struct au_vdir *vdir) ++{ ++ IiMustWriteLock(inode); ++ au_ii(inode)->ii_vdir = vdir; ++} ++ ++static inline struct au_hinode *au_hi(struct inode *inode, aufs_bindex_t bindex) ++{ ++ IiMustAnyLock(inode); ++ return au_hinode(au_ii(inode), bindex); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static inline struct dentry *au_pinned_parent(struct au_pin *pin) ++{ ++ if (pin) ++ return pin->parent; ++ return NULL; ++} ++ ++static inline struct inode *au_pinned_h_dir(struct au_pin *pin) ++{ ++ if (pin && pin->hdir) ++ return pin->hdir->hi_inode; ++ return NULL; ++} ++ ++static inline struct au_hinode *au_pinned_hdir(struct au_pin *pin) ++{ ++ if (pin) ++ return pin->hdir; ++ return NULL; ++} ++ ++static inline void au_pin_set_dentry(struct au_pin *pin, struct dentry *dentry) ++{ ++ if (pin) ++ pin->dentry = dentry; ++} ++ ++static inline void au_pin_set_parent_lflag(struct au_pin *pin, ++ unsigned char lflag) ++{ ++ if (pin) { ++ if (lflag) ++ au_fset_pin(pin->flags, DI_LOCKED); ++ else ++ au_fclr_pin(pin->flags, DI_LOCKED); ++ } ++} ++ ++#if 0 /* reserved */ ++static inline void au_pin_set_parent(struct au_pin *pin, struct dentry *parent) ++{ ++ if (pin) { ++ dput(pin->parent); ++ pin->parent = dget(parent); ++ } ++} ++#endif ++ ++/* ---------------------------------------------------------------------- */ ++ ++struct au_branch; ++#ifdef CONFIG_AUFS_HNOTIFY ++struct au_hnotify_op { ++ void (*ctl)(struct au_hinode *hinode, int do_set); ++ int (*alloc)(struct au_hinode *hinode); ++ ++ /* ++ * if it returns true, the caller should free hinode->hi_notify, ++ * otherwise ->free() frees it. ++ */ ++ int (*free)(struct au_hinode *hinode, ++ struct au_hnotify *hn) __must_check; ++ ++ void (*fin)(void); ++ int (*init)(void); ++ ++ int (*reset_br)(unsigned int udba, struct au_branch *br, int perm); ++ void (*fin_br)(struct au_branch *br); ++ int (*init_br)(struct au_branch *br, int perm); ++}; ++ ++/* hnotify.c */ ++int au_hn_alloc(struct au_hinode *hinode, struct inode *inode); ++void au_hn_free(struct au_hinode *hinode); ++void au_hn_ctl(struct au_hinode *hinode, int do_set); ++void au_hn_reset(struct inode *inode, unsigned int flags); ++int au_hnotify(struct inode *h_dir, struct au_hnotify *hnotify, u32 mask, ++ const struct qstr *h_child_qstr, struct inode *h_child_inode); ++int au_hnotify_reset_br(unsigned int udba, struct au_branch *br, int perm); ++int au_hnotify_init_br(struct au_branch *br, int perm); ++void au_hnotify_fin_br(struct au_branch *br); ++int __init au_hnotify_init(void); ++void au_hnotify_fin(void); ++ ++/* hfsnotify.c */ ++extern const struct au_hnotify_op au_hnotify_op; ++ ++static inline ++void au_hn_init(struct au_hinode *hinode) ++{ ++ hinode->hi_notify = NULL; ++} ++ ++static inline struct au_hnotify *au_hn(struct au_hinode *hinode) ++{ ++ return hinode->hi_notify; ++} ++ ++#else ++AuStub(int, au_hn_alloc, return -EOPNOTSUPP, ++ struct au_hinode *hinode __maybe_unused, ++ struct inode *inode __maybe_unused) ++AuStub(struct au_hnotify *, au_hn, return NULL, struct au_hinode *hinode) ++AuStubVoid(au_hn_free, struct au_hinode *hinode __maybe_unused) ++AuStubVoid(au_hn_ctl, struct au_hinode *hinode __maybe_unused, ++ int do_set __maybe_unused) ++AuStubVoid(au_hn_reset, struct inode *inode __maybe_unused, ++ unsigned int flags __maybe_unused) ++AuStubInt0(au_hnotify_reset_br, unsigned int udba __maybe_unused, ++ struct au_branch *br __maybe_unused, ++ int perm __maybe_unused) ++AuStubInt0(au_hnotify_init_br, struct au_branch *br __maybe_unused, ++ int perm __maybe_unused) ++AuStubVoid(au_hnotify_fin_br, struct au_branch *br __maybe_unused) ++AuStubInt0(__init au_hnotify_init, void) ++AuStubVoid(au_hnotify_fin, void) ++AuStubVoid(au_hn_init, struct au_hinode *hinode __maybe_unused) ++#endif /* CONFIG_AUFS_HNOTIFY */ ++ ++static inline void au_hn_suspend(struct au_hinode *hdir) ++{ ++ au_hn_ctl(hdir, /*do_set*/0); ++} ++ ++static inline void au_hn_resume(struct au_hinode *hdir) ++{ ++ au_hn_ctl(hdir, /*do_set*/1); ++} ++ ++static inline void au_hn_inode_lock(struct au_hinode *hdir) ++{ ++ inode_lock(hdir->hi_inode); ++ au_hn_suspend(hdir); ++} ++ ++static inline void au_hn_inode_lock_nested(struct au_hinode *hdir, ++ unsigned int sc __maybe_unused) ++{ ++ inode_lock_nested(hdir->hi_inode, sc); ++ au_hn_suspend(hdir); ++} ++ ++#if 0 /* unused */ ++#include "vfsub.h" ++static inline void au_hn_inode_lock_shared_nested(struct au_hinode *hdir, ++ unsigned int sc) ++{ ++ inode_lock_shared_nested(hdir->hi_inode, sc); ++ au_hn_suspend(hdir); ++} ++#endif ++ ++static inline void au_hn_inode_unlock(struct au_hinode *hdir) ++{ ++ au_hn_resume(hdir); ++ inode_unlock(hdir->hi_inode); ++} ++ ++#endif /* __KERNEL__ */ ++#endif /* __AUFS_INODE_H__ */ +diff --git a/fs/aufs/ioctl.c b/fs/aufs/ioctl.c +new file mode 100644 +index 000000000000..2d8d91084099 +--- /dev/null ++++ b/fs/aufs/ioctl.c +@@ -0,0 +1,220 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * ioctl ++ * plink-management and readdir in userspace. ++ * assist the pathconf(3) wrapper library. ++ * move-down ++ * File-based Hierarchical Storage Management. ++ */ ++ ++#include <linux/compat.h> ++#include <linux/file.h> ++#include "aufs.h" ++ ++static int au_wbr_fd(struct path *path, struct aufs_wbr_fd __user *arg) ++{ ++ int err, fd; ++ aufs_bindex_t wbi, bindex, bbot; ++ struct file *h_file; ++ struct super_block *sb; ++ struct dentry *root; ++ struct au_branch *br; ++ struct aufs_wbr_fd wbrfd = { ++ .oflags = au_dir_roflags, ++ .brid = -1 ++ }; ++ const int valid = O_RDONLY | O_NONBLOCK | O_LARGEFILE | O_DIRECTORY ++ | O_NOATIME | O_CLOEXEC; ++ ++ AuDebugOn(wbrfd.oflags & ~valid); ++ ++ if (arg) { ++ err = copy_from_user(&wbrfd, arg, sizeof(wbrfd)); ++ if (unlikely(err)) { ++ err = -EFAULT; ++ goto out; ++ } ++ ++ err = -EINVAL; ++ AuDbg("wbrfd{0%o, %d}\n", wbrfd.oflags, wbrfd.brid); ++ wbrfd.oflags |= au_dir_roflags; ++ AuDbg("0%o\n", wbrfd.oflags); ++ if (unlikely(wbrfd.oflags & ~valid)) ++ goto out; ++ } ++ ++ fd = get_unused_fd_flags(0); ++ err = fd; ++ if (unlikely(fd < 0)) ++ goto out; ++ ++ h_file = ERR_PTR(-EINVAL); ++ wbi = 0; ++ br = NULL; ++ sb = path->dentry->d_sb; ++ root = sb->s_root; ++ aufs_read_lock(root, AuLock_IR); ++ bbot = au_sbbot(sb); ++ if (wbrfd.brid >= 0) { ++ wbi = au_br_index(sb, wbrfd.brid); ++ if (unlikely(wbi < 0 || wbi > bbot)) ++ goto out_unlock; ++ } ++ ++ h_file = ERR_PTR(-ENOENT); ++ br = au_sbr(sb, wbi); ++ if (!au_br_writable(br->br_perm)) { ++ if (arg) ++ goto out_unlock; ++ ++ bindex = wbi + 1; ++ wbi = -1; ++ for (; bindex <= bbot; bindex++) { ++ br = au_sbr(sb, bindex); ++ if (au_br_writable(br->br_perm)) { ++ wbi = bindex; ++ br = au_sbr(sb, wbi); ++ break; ++ } ++ } ++ } ++ AuDbg("wbi %d\n", wbi); ++ if (wbi >= 0) ++ h_file = au_h_open(root, wbi, wbrfd.oflags, NULL, ++ /*force_wr*/0); ++ ++out_unlock: ++ aufs_read_unlock(root, AuLock_IR); ++ err = PTR_ERR(h_file); ++ if (IS_ERR(h_file)) ++ goto out_fd; ++ ++ au_lcnt_dec(&br->br_nfiles); /* cf. au_h_open() */ ++ fd_install(fd, h_file); ++ err = fd; ++ goto out; /* success */ ++ ++out_fd: ++ put_unused_fd(fd); ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++long aufs_ioctl_dir(struct file *file, unsigned int cmd, unsigned long arg) ++{ ++ long err; ++ struct dentry *dentry; ++ ++ switch (cmd) { ++ case AUFS_CTL_RDU: ++ case AUFS_CTL_RDU_INO: ++ err = au_rdu_ioctl(file, cmd, arg); ++ break; ++ ++ case AUFS_CTL_WBR_FD: ++ err = au_wbr_fd(&file->f_path, (void __user *)arg); ++ break; ++ ++ case AUFS_CTL_IBUSY: ++ err = au_ibusy_ioctl(file, arg); ++ break; ++ ++ case AUFS_CTL_BRINFO: ++ err = au_brinfo_ioctl(file, arg); ++ break; ++ ++ case AUFS_CTL_FHSM_FD: ++ dentry = file->f_path.dentry; ++ if (IS_ROOT(dentry)) ++ err = au_fhsm_fd(dentry->d_sb, arg); ++ else ++ err = -ENOTTY; ++ break; ++ ++ default: ++ /* do not call the lower */ ++ AuDbg("0x%x\n", cmd); ++ err = -ENOTTY; ++ } ++ ++ AuTraceErr(err); ++ return err; ++} ++ ++long aufs_ioctl_nondir(struct file *file, unsigned int cmd, unsigned long arg) ++{ ++ long err; ++ ++ switch (cmd) { ++ case AUFS_CTL_MVDOWN: ++ err = au_mvdown(file->f_path.dentry, (void __user *)arg); ++ break; ++ ++ case AUFS_CTL_WBR_FD: ++ err = au_wbr_fd(&file->f_path, (void __user *)arg); ++ break; ++ ++ default: ++ /* do not call the lower */ ++ AuDbg("0x%x\n", cmd); ++ err = -ENOTTY; ++ } ++ ++ AuTraceErr(err); ++ return err; ++} ++ ++#ifdef CONFIG_COMPAT ++long aufs_compat_ioctl_dir(struct file *file, unsigned int cmd, ++ unsigned long arg) ++{ ++ long err; ++ ++ switch (cmd) { ++ case AUFS_CTL_RDU: ++ case AUFS_CTL_RDU_INO: ++ err = au_rdu_compat_ioctl(file, cmd, arg); ++ break; ++ ++ case AUFS_CTL_IBUSY: ++ err = au_ibusy_compat_ioctl(file, arg); ++ break; ++ ++ case AUFS_CTL_BRINFO: ++ err = au_brinfo_compat_ioctl(file, arg); ++ break; ++ ++ default: ++ err = aufs_ioctl_dir(file, cmd, arg); ++ } ++ ++ AuTraceErr(err); ++ return err; ++} ++ ++long aufs_compat_ioctl_nondir(struct file *file, unsigned int cmd, ++ unsigned long arg) ++{ ++ return aufs_ioctl_nondir(file, cmd, (unsigned long)compat_ptr(arg)); ++} ++#endif +diff --git a/fs/aufs/lcnt.h b/fs/aufs/lcnt.h +new file mode 100644 +index 000000000000..6dc37108565f +--- /dev/null ++++ b/fs/aufs/lcnt.h +@@ -0,0 +1,186 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2018-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * simple long counter wrapper ++ */ ++ ++#ifndef __AUFS_LCNT_H__ ++#define __AUFS_LCNT_H__ ++ ++#ifdef __KERNEL__ ++ ++#include "debug.h" ++ ++#define AuLCntATOMIC 1 ++#define AuLCntPCPUCNT 2 ++/* ++ * why does percpu_refcount require extra synchronize_rcu()s in ++ * au_br_do_free() ++ */ ++#define AuLCntPCPUREF 3 ++ ++/* #define AuLCntChosen AuLCntATOMIC */ ++#define AuLCntChosen AuLCntPCPUCNT ++/* #define AuLCntChosen AuLCntPCPUREF */ ++ ++#if AuLCntChosen == AuLCntATOMIC ++#include <linux/atomic.h> ++ ++typedef atomic_long_t au_lcnt_t; ++ ++static inline int au_lcnt_init(au_lcnt_t *cnt, void *release __maybe_unused) ++{ ++ atomic_long_set(cnt, 0); ++ return 0; ++} ++ ++static inline void au_lcnt_wait_for_fin(au_lcnt_t *cnt __maybe_unused) ++{ ++ /* empty */ ++} ++ ++static inline void au_lcnt_fin(au_lcnt_t *cnt __maybe_unused, ++ int do_sync __maybe_unused) ++{ ++ /* empty */ ++} ++ ++static inline void au_lcnt_inc(au_lcnt_t *cnt) ++{ ++ atomic_long_inc(cnt); ++} ++ ++static inline void au_lcnt_dec(au_lcnt_t *cnt) ++{ ++ atomic_long_dec(cnt); ++} ++ ++static inline long au_lcnt_read(au_lcnt_t *cnt, int do_rev __maybe_unused) ++{ ++ return atomic_long_read(cnt); ++} ++#endif ++ ++#if AuLCntChosen == AuLCntPCPUCNT ++#include <linux/percpu_counter.h> ++ ++typedef struct percpu_counter au_lcnt_t; ++ ++static inline int au_lcnt_init(au_lcnt_t *cnt, void *release __maybe_unused) ++{ ++ return percpu_counter_init(cnt, 0, GFP_NOFS); ++} ++ ++static inline void au_lcnt_wait_for_fin(au_lcnt_t *cnt __maybe_unused) ++{ ++ /* empty */ ++} ++ ++static inline void au_lcnt_fin(au_lcnt_t *cnt, int do_sync __maybe_unused) ++{ ++ percpu_counter_destroy(cnt); ++} ++ ++static inline void au_lcnt_inc(au_lcnt_t *cnt) ++{ ++ percpu_counter_inc(cnt); ++} ++ ++static inline void au_lcnt_dec(au_lcnt_t *cnt) ++{ ++ percpu_counter_dec(cnt); ++} ++ ++static inline long au_lcnt_read(au_lcnt_t *cnt, int do_rev __maybe_unused) ++{ ++ s64 n; ++ ++ n = percpu_counter_sum(cnt); ++ BUG_ON(n < 0); ++ if (LONG_MAX != LLONG_MAX ++ && n > LONG_MAX) ++ AuWarn1("%s\n", "wrap-around"); ++ ++ return n; ++} ++#endif ++ ++#if AuLCntChosen == AuLCntPCPUREF ++#include <linux/percpu-refcount.h> ++ ++typedef struct percpu_ref au_lcnt_t; ++ ++static inline int au_lcnt_init(au_lcnt_t *cnt, percpu_ref_func_t *release) ++{ ++ if (!release) ++ release = percpu_ref_exit; ++ return percpu_ref_init(cnt, release, /*percpu mode*/0, GFP_NOFS); ++} ++ ++static inline void au_lcnt_wait_for_fin(au_lcnt_t *cnt __maybe_unused) ++{ ++ synchronize_rcu(); ++} ++ ++static inline void au_lcnt_fin(au_lcnt_t *cnt, int do_sync) ++{ ++ percpu_ref_kill(cnt); ++ if (do_sync) ++ au_lcnt_wait_for_fin(cnt); ++} ++ ++static inline void au_lcnt_inc(au_lcnt_t *cnt) ++{ ++ percpu_ref_get(cnt); ++} ++ ++static inline void au_lcnt_dec(au_lcnt_t *cnt) ++{ ++ percpu_ref_put(cnt); ++} ++ ++/* ++ * avoid calling this func as possible. ++ */ ++static inline long au_lcnt_read(au_lcnt_t *cnt, int do_rev) ++{ ++ long l; ++ ++ percpu_ref_switch_to_atomic_sync(cnt); ++ l = atomic_long_read(&cnt->count); ++ if (do_rev) ++ percpu_ref_switch_to_percpu(cnt); ++ ++ /* percpu_ref is initialized by 1 instead of 0 */ ++ return l - 1; ++} ++#endif ++ ++#ifdef CONFIG_AUFS_DEBUG ++#define AuLCntZero(val) do { \ ++ long l = val; \ ++ if (l) \ ++ AuDbg("%s = %ld\n", #val, l); \ ++} while (0) ++#else ++#define AuLCntZero(val) do {} while (0) ++#endif ++ ++#endif /* __KERNEL__ */ ++#endif /* __AUFS_LCNT_H__ */ +diff --git a/fs/aufs/loop.c b/fs/aufs/loop.c +new file mode 100644 +index 000000000000..383190588595 +--- /dev/null ++++ b/fs/aufs/loop.c +@@ -0,0 +1,148 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * support for loopback block device as a branch ++ */ ++ ++#include "aufs.h" ++ ++/* added into drivers/block/loop.c */ ++static struct file *(*backing_file_func)(struct super_block *sb); ++ ++/* ++ * test if two lower dentries have overlapping branches. ++ */ ++int au_test_loopback_overlap(struct super_block *sb, struct dentry *h_adding) ++{ ++ struct super_block *h_sb; ++ struct file *backing_file; ++ ++ if (unlikely(!backing_file_func)) { ++ /* don't load "loop" module here */ ++ backing_file_func = symbol_get(loop_backing_file); ++ if (unlikely(!backing_file_func)) ++ /* "loop" module is not loaded */ ++ return 0; ++ } ++ ++ h_sb = h_adding->d_sb; ++ backing_file = backing_file_func(h_sb); ++ if (!backing_file) ++ return 0; ++ ++ h_adding = backing_file->f_path.dentry; ++ /* ++ * h_adding can be local NFS. ++ * in this case aufs cannot detect the loop. ++ */ ++ if (unlikely(h_adding->d_sb == sb)) ++ return 1; ++ return !!au_test_subdir(h_adding, sb->s_root); ++} ++ ++/* true if a kernel thread named 'loop[0-9].*' accesses a file */ ++int au_test_loopback_kthread(void) ++{ ++ int ret; ++ struct task_struct *tsk = current; ++ char c, comm[sizeof(tsk->comm)]; ++ ++ ret = 0; ++ if (tsk->flags & PF_KTHREAD) { ++ get_task_comm(comm, tsk); ++ c = comm[4]; ++ ret = ('0' <= c && c <= '9' ++ && !strncmp(comm, "loop", 4)); ++ } ++ ++ return ret; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++#define au_warn_loopback_step 16 ++static int au_warn_loopback_nelem = au_warn_loopback_step; ++static unsigned long *au_warn_loopback_array; ++ ++void au_warn_loopback(struct super_block *h_sb) ++{ ++ int i, new_nelem; ++ unsigned long *a, magic; ++ static DEFINE_SPINLOCK(spin); ++ ++ magic = h_sb->s_magic; ++ spin_lock(&spin); ++ a = au_warn_loopback_array; ++ for (i = 0; i < au_warn_loopback_nelem && *a; i++) ++ if (a[i] == magic) { ++ spin_unlock(&spin); ++ return; ++ } ++ ++ /* h_sb is new to us, print it */ ++ if (i < au_warn_loopback_nelem) { ++ a[i] = magic; ++ goto pr; ++ } ++ ++ /* expand the array */ ++ new_nelem = au_warn_loopback_nelem + au_warn_loopback_step; ++ a = au_kzrealloc(au_warn_loopback_array, ++ au_warn_loopback_nelem * sizeof(unsigned long), ++ new_nelem * sizeof(unsigned long), GFP_ATOMIC, ++ /*may_shrink*/0); ++ if (a) { ++ au_warn_loopback_nelem = new_nelem; ++ au_warn_loopback_array = a; ++ a[i] = magic; ++ goto pr; ++ } ++ ++ spin_unlock(&spin); ++ AuWarn1("realloc failed, ignored\n"); ++ return; ++ ++pr: ++ spin_unlock(&spin); ++ pr_warn("you may want to try another patch for loopback file " ++ "on %s(0x%lx) branch\n", au_sbtype(h_sb), magic); ++} ++ ++int au_loopback_init(void) ++{ ++ int err; ++ struct super_block *sb __maybe_unused; ++ ++ BUILD_BUG_ON(sizeof(sb->s_magic) != sizeof(*au_warn_loopback_array)); ++ ++ err = 0; ++ au_warn_loopback_array = kcalloc(au_warn_loopback_step, ++ sizeof(unsigned long), GFP_NOFS); ++ if (unlikely(!au_warn_loopback_array)) ++ err = -ENOMEM; ++ ++ return err; ++} ++ ++void au_loopback_fin(void) ++{ ++ if (backing_file_func) ++ symbol_put(loop_backing_file); ++ au_kfree_try_rcu(au_warn_loopback_array); ++} +diff --git a/fs/aufs/loop.h b/fs/aufs/loop.h +new file mode 100644 +index 000000000000..9726b8354e00 +--- /dev/null ++++ b/fs/aufs/loop.h +@@ -0,0 +1,55 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * support for loopback mount as a branch ++ */ ++ ++#ifndef __AUFS_LOOP_H__ ++#define __AUFS_LOOP_H__ ++ ++#ifdef __KERNEL__ ++ ++struct dentry; ++struct super_block; ++ ++#ifdef CONFIG_AUFS_BDEV_LOOP ++/* drivers/block/loop.c */ ++struct file *loop_backing_file(struct super_block *sb); ++ ++/* loop.c */ ++int au_test_loopback_overlap(struct super_block *sb, struct dentry *h_adding); ++int au_test_loopback_kthread(void); ++void au_warn_loopback(struct super_block *h_sb); ++ ++int au_loopback_init(void); ++void au_loopback_fin(void); ++#else ++AuStub(struct file *, loop_backing_file, return NULL, struct super_block *sb) ++ ++AuStubInt0(au_test_loopback_overlap, struct super_block *sb, ++ struct dentry *h_adding) ++AuStubInt0(au_test_loopback_kthread, void) ++AuStubVoid(au_warn_loopback, struct super_block *h_sb) ++ ++AuStubInt0(au_loopback_init, void) ++AuStubVoid(au_loopback_fin, void) ++#endif /* BLK_DEV_LOOP */ ++ ++#endif /* __KERNEL__ */ ++#endif /* __AUFS_LOOP_H__ */ +diff --git a/fs/aufs/magic.mk b/fs/aufs/magic.mk +new file mode 100644 +index 000000000000..7bc9eef3ffec +--- /dev/null ++++ b/fs/aufs/magic.mk +@@ -0,0 +1,31 @@ ++# SPDX-License-Identifier: GPL-2.0 ++ ++# defined in ${srctree}/fs/fuse/inode.c ++# tristate ++ifdef CONFIG_FUSE_FS ++ccflags-y += -DFUSE_SUPER_MAGIC=0x65735546 ++endif ++ ++# defined in ${srctree}/fs/xfs/xfs_sb.h ++# tristate ++ifdef CONFIG_XFS_FS ++ccflags-y += -DXFS_SB_MAGIC=0x58465342 ++endif ++ ++# defined in ${srctree}/fs/configfs/mount.c ++# tristate ++ifdef CONFIG_CONFIGFS_FS ++ccflags-y += -DCONFIGFS_MAGIC=0x62656570 ++endif ++ ++# defined in ${srctree}/fs/ubifs/ubifs.h ++# tristate ++ifdef CONFIG_UBIFS_FS ++ccflags-y += -DUBIFS_SUPER_MAGIC=0x24051905 ++endif ++ ++# defined in ${srctree}/fs/hfsplus/hfsplus_raw.h ++# tristate ++ifdef CONFIG_HFSPLUS_FS ++ccflags-y += -DHFSPLUS_SUPER_MAGIC=0x482b ++endif +diff --git a/fs/aufs/module.c b/fs/aufs/module.c +new file mode 100644 +index 000000000000..c2815fffb5c6 +--- /dev/null ++++ b/fs/aufs/module.c +@@ -0,0 +1,273 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * module global variables and operations ++ */ ++ ++#include <linux/module.h> ++#include <linux/seq_file.h> ++#include "aufs.h" ++ ++/* shrinkable realloc */ ++void *au_krealloc(void *p, unsigned int new_sz, gfp_t gfp, int may_shrink) ++{ ++ size_t sz; ++ int diff; ++ ++ sz = 0; ++ diff = -1; ++ if (p) { ++#if 0 /* unused */ ++ if (!new_sz) { ++ au_kfree_rcu(p); ++ p = NULL; ++ goto out; ++ } ++#else ++ AuDebugOn(!new_sz); ++#endif ++ sz = ksize(p); ++ diff = au_kmidx_sub(sz, new_sz); ++ } ++ if (sz && !diff) ++ goto out; ++ ++ if (sz < new_sz) ++ /* expand or SLOB */ ++ p = krealloc(p, new_sz, gfp); ++ else if (new_sz < sz && may_shrink) { ++ /* shrink */ ++ void *q; ++ ++ q = kmalloc(new_sz, gfp); ++ if (q) { ++ if (p) { ++ memcpy(q, p, new_sz); ++ au_kfree_try_rcu(p); ++ } ++ p = q; ++ } else ++ p = NULL; ++ } ++ ++out: ++ return p; ++} ++ ++void *au_kzrealloc(void *p, unsigned int nused, unsigned int new_sz, gfp_t gfp, ++ int may_shrink) ++{ ++ p = au_krealloc(p, new_sz, gfp, may_shrink); ++ if (p && new_sz > nused) ++ memset(p + nused, 0, new_sz - nused); ++ return p; ++} ++ ++/* ---------------------------------------------------------------------- */ ++/* ++ * aufs caches ++ */ ++struct kmem_cache *au_cache[AuCache_Last]; ++ ++static void au_cache_fin(void) ++{ ++ int i; ++ ++ /* ++ * Make sure all delayed rcu free inodes are flushed before we ++ * destroy cache. ++ */ ++ rcu_barrier(); ++ ++ /* excluding AuCache_HNOTIFY */ ++ BUILD_BUG_ON(AuCache_HNOTIFY + 1 != AuCache_Last); ++ for (i = 0; i < AuCache_HNOTIFY; i++) { ++ kmem_cache_destroy(au_cache[i]); ++ au_cache[i] = NULL; ++ } ++} ++ ++static int __init au_cache_init(void) ++{ ++ au_cache[AuCache_DINFO] = AuCacheCtor(au_dinfo, au_di_init_once); ++ if (au_cache[AuCache_DINFO]) ++ /* SLAB_DESTROY_BY_RCU */ ++ au_cache[AuCache_ICNTNR] = AuCacheCtor(au_icntnr, ++ au_icntnr_init_once); ++ if (au_cache[AuCache_ICNTNR]) ++ au_cache[AuCache_FINFO] = AuCacheCtor(au_finfo, ++ au_fi_init_once); ++ if (au_cache[AuCache_FINFO]) ++ au_cache[AuCache_VDIR] = AuCache(au_vdir); ++ if (au_cache[AuCache_VDIR]) ++ au_cache[AuCache_DEHSTR] = AuCache(au_vdir_dehstr); ++ if (au_cache[AuCache_DEHSTR]) ++ return 0; ++ ++ au_cache_fin(); ++ return -ENOMEM; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++int au_dir_roflags; ++ ++#ifdef CONFIG_AUFS_SBILIST ++/* ++ * iterate_supers_type() doesn't protect us from ++ * remounting (branch management) ++ */ ++struct hlist_bl_head au_sbilist; ++#endif ++ ++/* ++ * functions for module interface. ++ */ ++MODULE_LICENSE("GPL"); ++/* MODULE_LICENSE("GPL v2"); */ ++MODULE_AUTHOR("Junjiro R. Okajima <aufs-users@lists.sourceforge.net>"); ++MODULE_DESCRIPTION(AUFS_NAME ++ " -- Advanced multi layered unification filesystem"); ++MODULE_VERSION(AUFS_VERSION); ++MODULE_ALIAS_FS(AUFS_NAME); ++ ++/* this module parameter has no meaning when SYSFS is disabled */ ++int sysaufs_brs = 1; ++MODULE_PARM_DESC(brs, "use <sysfs>/fs/aufs/si_*/brN"); ++module_param_named(brs, sysaufs_brs, int, 0444); ++ ++/* this module parameter has no meaning when USER_NS is disabled */ ++bool au_userns; ++MODULE_PARM_DESC(allow_userns, "allow unprivileged to mount under userns"); ++module_param_named(allow_userns, au_userns, bool, 0444); ++ ++/* ---------------------------------------------------------------------- */ ++ ++static char au_esc_chars[0x20 + 3]; /* 0x01-0x20, backslash, del, and NULL */ ++ ++int au_seq_path(struct seq_file *seq, struct path *path) ++{ ++ int err; ++ ++ err = seq_path(seq, path, au_esc_chars); ++ if (err >= 0) ++ err = 0; ++ else ++ err = -ENOMEM; ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int __init aufs_init(void) ++{ ++ int err, i; ++ char *p; ++ ++ p = au_esc_chars; ++ for (i = 1; i <= ' '; i++) ++ *p++ = i; ++ *p++ = '\\'; ++ *p++ = '\x7f'; ++ *p = 0; ++ ++ au_dir_roflags = au_file_roflags(O_DIRECTORY | O_LARGEFILE); ++ ++ memcpy(aufs_iop_nogetattr, aufs_iop, sizeof(aufs_iop)); ++ for (i = 0; i < AuIop_Last; i++) ++ aufs_iop_nogetattr[i].getattr = NULL; ++ ++ memset(au_cache, 0, sizeof(au_cache)); /* including hnotify */ ++ ++ au_sbilist_init(); ++ sysaufs_brs_init(); ++ au_debug_init(); ++ au_dy_init(); ++ err = sysaufs_init(); ++ if (unlikely(err)) ++ goto out; ++ err = dbgaufs_init(); ++ if (unlikely(err)) ++ goto out_sysaufs; ++ err = au_procfs_init(); ++ if (unlikely(err)) ++ goto out_dbgaufs; ++ err = au_wkq_init(); ++ if (unlikely(err)) ++ goto out_procfs; ++ err = au_loopback_init(); ++ if (unlikely(err)) ++ goto out_wkq; ++ err = au_hnotify_init(); ++ if (unlikely(err)) ++ goto out_loopback; ++ err = au_sysrq_init(); ++ if (unlikely(err)) ++ goto out_hin; ++ err = au_cache_init(); ++ if (unlikely(err)) ++ goto out_sysrq; ++ ++ aufs_fs_type.fs_flags |= au_userns ? FS_USERNS_MOUNT : 0; ++ err = register_filesystem(&aufs_fs_type); ++ if (unlikely(err)) ++ goto out_cache; ++ ++ /* since we define pr_fmt, call printk directly */ ++ printk(KERN_INFO AUFS_NAME " " AUFS_VERSION "\n"); ++ goto out; /* success */ ++ ++out_cache: ++ au_cache_fin(); ++out_sysrq: ++ au_sysrq_fin(); ++out_hin: ++ au_hnotify_fin(); ++out_loopback: ++ au_loopback_fin(); ++out_wkq: ++ au_wkq_fin(); ++out_procfs: ++ au_procfs_fin(); ++out_dbgaufs: ++ dbgaufs_fin(); ++out_sysaufs: ++ sysaufs_fin(); ++ au_dy_fin(); ++out: ++ return err; ++} ++ ++static void __exit aufs_exit(void) ++{ ++ unregister_filesystem(&aufs_fs_type); ++ au_cache_fin(); ++ au_sysrq_fin(); ++ au_hnotify_fin(); ++ au_loopback_fin(); ++ au_wkq_fin(); ++ au_procfs_fin(); ++ dbgaufs_fin(); ++ sysaufs_fin(); ++ au_dy_fin(); ++} ++ ++module_init(aufs_init); ++module_exit(aufs_exit); +diff --git a/fs/aufs/module.h b/fs/aufs/module.h +new file mode 100644 +index 000000000000..a9d21d3e5414 +--- /dev/null ++++ b/fs/aufs/module.h +@@ -0,0 +1,180 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * module initialization and module-global ++ */ ++ ++#ifndef __AUFS_MODULE_H__ ++#define __AUFS_MODULE_H__ ++ ++#ifdef __KERNEL__ ++ ++#include <linux/slab.h> ++#include "debug.h" ++#include "dentry.h" ++#include "dir.h" ++#include "file.h" ++#include "inode.h" ++ ++struct path; ++struct seq_file; ++ ++/* module parameters */ ++extern int sysaufs_brs; ++extern bool au_userns; ++ ++/* ---------------------------------------------------------------------- */ ++ ++extern int au_dir_roflags; ++ ++void *au_krealloc(void *p, unsigned int new_sz, gfp_t gfp, int may_shrink); ++void *au_kzrealloc(void *p, unsigned int nused, unsigned int new_sz, gfp_t gfp, ++ int may_shrink); ++ ++/* ++ * Comparing the size of the object with sizeof(struct rcu_head) ++ * case 1: object is always larger ++ * --> au_kfree_rcu() or au_kfree_do_rcu() ++ * case 2: object is always smaller ++ * --> au_kfree_small() ++ * case 3: object can be any size ++ * --> au_kfree_try_rcu() ++ */ ++ ++static inline void au_kfree_do_rcu(const void *p) ++{ ++ struct { ++ struct rcu_head rcu; ++ } *a = (void *)p; ++ ++ kfree_rcu(a, rcu); ++} ++ ++#define au_kfree_rcu(_p) do { \ ++ typeof(_p) p = (_p); \ ++ BUILD_BUG_ON(sizeof(*p) < sizeof(struct rcu_head)); \ ++ if (p) \ ++ au_kfree_do_rcu(p); \ ++ } while (0) ++ ++#define au_kfree_do_sz_test(sz) (sz >= sizeof(struct rcu_head)) ++#define au_kfree_sz_test(p) (p && au_kfree_do_sz_test(ksize(p))) ++ ++static inline void au_kfree_try_rcu(const void *p) ++{ ++ if (!p) ++ return; ++ if (au_kfree_sz_test(p)) ++ au_kfree_do_rcu(p); ++ else ++ kfree(p); ++} ++ ++static inline void au_kfree_small(const void *p) ++{ ++ if (!p) ++ return; ++ AuDebugOn(au_kfree_sz_test(p)); ++ kfree(p); ++} ++ ++static inline int au_kmidx_sub(size_t sz, size_t new_sz) ++{ ++#ifndef CONFIG_SLOB ++ return __kmalloc_index(sz, false) - __kmalloc_index(new_sz, false); ++#else ++ return -1; /* SLOB is untested */ ++#endif ++} ++ ++int au_seq_path(struct seq_file *seq, struct path *path); ++ ++#ifdef CONFIG_PROC_FS ++/* procfs.c */ ++int __init au_procfs_init(void); ++void au_procfs_fin(void); ++#else ++AuStubInt0(au_procfs_init, void); ++AuStubVoid(au_procfs_fin, void); ++#endif ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* kmem cache */ ++enum { ++ AuCache_DINFO, ++ AuCache_ICNTNR, ++ AuCache_FINFO, ++ AuCache_VDIR, ++ AuCache_DEHSTR, ++ AuCache_HNOTIFY, /* must be last */ ++ AuCache_Last ++}; ++ ++extern struct kmem_cache *au_cache[AuCache_Last]; ++ ++#define AuCacheFlags (SLAB_RECLAIM_ACCOUNT | SLAB_MEM_SPREAD) ++#define AuCache(type) KMEM_CACHE(type, AuCacheFlags) ++#define AuCacheCtor(type, ctor) \ ++ kmem_cache_create(#type, sizeof(struct type), \ ++ __alignof__(struct type), AuCacheFlags, ctor) ++ ++#define AuCacheFuncAlloc(name, index) \ ++ static inline struct au_##name *au_cache_alloc_##name(void) \ ++ { return kmem_cache_alloc(au_cache[AuCache_##index], GFP_NOFS); } ++ ++#define AuCacheFuncs(name, index) \ ++ static inline void au_cache_free_##name##_norcu(struct au_##name *p) \ ++ { kmem_cache_free(au_cache[AuCache_##index], p); } \ ++ \ ++ static inline void au_cache_free_##name##_rcu_cb(struct rcu_head *rcu) \ ++ { void *p = rcu; \ ++ p -= offsetof(struct au_##name, rcu); \ ++ kmem_cache_free(au_cache[AuCache_##index], p); } \ ++ static inline void au_cache_free_##name##_rcu(struct au_##name *p) \ ++ { BUILD_BUG_ON(sizeof(struct au_##name) < sizeof(struct rcu_head)); \ ++ call_rcu(&p->rcu, au_cache_free_##name##_rcu_cb); } \ ++ \ ++ static inline void au_cache_free_##name(struct au_##name *p) \ ++ { /* au_cache_free_##name##_norcu(p); */ \ ++ au_cache_free_##name##_rcu(p); } ++ ++AuCacheFuncs(dinfo, DINFO); ++AuCacheFuncAlloc(dinfo, DINFO); ++ ++AuCacheFuncs(icntnr, ICNTNR); ++static inline struct au_icntnr *au_cache_alloc_icntnr(struct super_block *sb) ++{ return alloc_inode_sb(sb, au_cache[AuCache_ICNTNR], GFP_NOFS); } ++ ++AuCacheFuncs(finfo, FINFO); ++AuCacheFuncAlloc(finfo, FINFO); ++ ++AuCacheFuncs(vdir, VDIR); ++AuCacheFuncAlloc(vdir, VDIR); ++ ++AuCacheFuncs(vdir_dehstr, DEHSTR); ++AuCacheFuncAlloc(vdir_dehstr, DEHSTR); ++ ++#ifdef CONFIG_AUFS_HNOTIFY ++AuCacheFuncs(hnotify, HNOTIFY); ++AuCacheFuncAlloc(hnotify, HNOTIFY); ++#endif ++ ++#endif /* __KERNEL__ */ ++#endif /* __AUFS_MODULE_H__ */ +diff --git a/fs/aufs/mvdown.c b/fs/aufs/mvdown.c +new file mode 100644 +index 000000000000..daafc27e64b0 +--- /dev/null ++++ b/fs/aufs/mvdown.c +@@ -0,0 +1,706 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2011-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * move-down, opposite of copy-up ++ */ ++ ++#include "aufs.h" ++ ++struct au_mvd_args { ++ struct { ++ struct super_block *h_sb; ++ struct dentry *h_parent; ++ struct au_hinode *hdir; ++ struct inode *h_dir, *h_inode; ++ struct au_pin pin; ++ } info[AUFS_MVDOWN_NARRAY]; ++ ++ struct aufs_mvdown mvdown; ++ struct dentry *dentry, *parent; ++ struct inode *inode, *dir; ++ struct super_block *sb; ++ aufs_bindex_t bopq, bwh, bfound; ++ unsigned char rename_lock; ++}; ++ ++#define mvd_errno mvdown.au_errno ++#define mvd_bsrc mvdown.stbr[AUFS_MVDOWN_UPPER].bindex ++#define mvd_src_brid mvdown.stbr[AUFS_MVDOWN_UPPER].brid ++#define mvd_bdst mvdown.stbr[AUFS_MVDOWN_LOWER].bindex ++#define mvd_dst_brid mvdown.stbr[AUFS_MVDOWN_LOWER].brid ++ ++#define mvd_h_src_sb info[AUFS_MVDOWN_UPPER].h_sb ++#define mvd_h_src_parent info[AUFS_MVDOWN_UPPER].h_parent ++#define mvd_hdir_src info[AUFS_MVDOWN_UPPER].hdir ++#define mvd_h_src_dir info[AUFS_MVDOWN_UPPER].h_dir ++#define mvd_h_src_inode info[AUFS_MVDOWN_UPPER].h_inode ++#define mvd_pin_src info[AUFS_MVDOWN_UPPER].pin ++ ++#define mvd_h_dst_sb info[AUFS_MVDOWN_LOWER].h_sb ++#define mvd_h_dst_parent info[AUFS_MVDOWN_LOWER].h_parent ++#define mvd_hdir_dst info[AUFS_MVDOWN_LOWER].hdir ++#define mvd_h_dst_dir info[AUFS_MVDOWN_LOWER].h_dir ++#define mvd_h_dst_inode info[AUFS_MVDOWN_LOWER].h_inode ++#define mvd_pin_dst info[AUFS_MVDOWN_LOWER].pin ++ ++#define AU_MVD_PR(flag, ...) do { \ ++ if (flag) \ ++ pr_err(__VA_ARGS__); \ ++ } while (0) ++ ++static int find_lower_writable(struct au_mvd_args *a) ++{ ++ struct super_block *sb; ++ aufs_bindex_t bindex, bbot; ++ struct au_branch *br; ++ ++ sb = a->sb; ++ bindex = a->mvd_bsrc; ++ bbot = au_sbbot(sb); ++ if (a->mvdown.flags & AUFS_MVDOWN_FHSM_LOWER) ++ for (bindex++; bindex <= bbot; bindex++) { ++ br = au_sbr(sb, bindex); ++ if (au_br_fhsm(br->br_perm) ++ && !sb_rdonly(au_br_sb(br))) ++ return bindex; ++ } ++ else if (!(a->mvdown.flags & AUFS_MVDOWN_ROLOWER)) ++ for (bindex++; bindex <= bbot; bindex++) { ++ br = au_sbr(sb, bindex); ++ if (!au_br_rdonly(br)) ++ return bindex; ++ } ++ else ++ for (bindex++; bindex <= bbot; bindex++) { ++ br = au_sbr(sb, bindex); ++ if (!sb_rdonly(au_br_sb(br))) { ++ if (au_br_rdonly(br)) ++ a->mvdown.flags ++ |= AUFS_MVDOWN_ROLOWER_R; ++ return bindex; ++ } ++ } ++ ++ return -1; ++} ++ ++/* make the parent dir on bdst */ ++static int au_do_mkdir(const unsigned char dmsg, struct au_mvd_args *a) ++{ ++ int err; ++ ++ err = 0; ++ a->mvd_hdir_src = au_hi(a->dir, a->mvd_bsrc); ++ a->mvd_hdir_dst = au_hi(a->dir, a->mvd_bdst); ++ a->mvd_h_src_parent = au_h_dptr(a->parent, a->mvd_bsrc); ++ a->mvd_h_dst_parent = NULL; ++ if (au_dbbot(a->parent) >= a->mvd_bdst) ++ a->mvd_h_dst_parent = au_h_dptr(a->parent, a->mvd_bdst); ++ if (!a->mvd_h_dst_parent) { ++ err = au_cpdown_dirs(a->dentry, a->mvd_bdst); ++ if (unlikely(err)) { ++ AU_MVD_PR(dmsg, "cpdown_dirs failed\n"); ++ goto out; ++ } ++ a->mvd_h_dst_parent = au_h_dptr(a->parent, a->mvd_bdst); ++ } ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++/* lock them all */ ++static int au_do_lock(const unsigned char dmsg, struct au_mvd_args *a) ++{ ++ int err; ++ struct dentry *h_trap; ++ ++ a->mvd_h_src_sb = au_sbr_sb(a->sb, a->mvd_bsrc); ++ a->mvd_h_dst_sb = au_sbr_sb(a->sb, a->mvd_bdst); ++ err = au_pin(&a->mvd_pin_dst, a->dentry, a->mvd_bdst, ++ au_opt_udba(a->sb), ++ AuPin_MNT_WRITE | AuPin_DI_LOCKED); ++ AuTraceErr(err); ++ if (unlikely(err)) { ++ AU_MVD_PR(dmsg, "pin_dst failed\n"); ++ goto out; ++ } ++ ++ if (a->mvd_h_src_sb != a->mvd_h_dst_sb) { ++ a->rename_lock = 0; ++ au_pin_init(&a->mvd_pin_src, a->dentry, a->mvd_bsrc, ++ AuLsc_DI_PARENT, AuLsc_I_PARENT3, ++ au_opt_udba(a->sb), ++ AuPin_MNT_WRITE | AuPin_DI_LOCKED); ++ err = au_do_pin(&a->mvd_pin_src); ++ AuTraceErr(err); ++ a->mvd_h_src_dir = d_inode(a->mvd_h_src_parent); ++ if (unlikely(err)) { ++ AU_MVD_PR(dmsg, "pin_src failed\n"); ++ goto out_dst; ++ } ++ goto out; /* success */ ++ } ++ ++ a->rename_lock = 1; ++ au_pin_hdir_unlock(&a->mvd_pin_dst); ++ err = au_pin(&a->mvd_pin_src, a->dentry, a->mvd_bsrc, ++ au_opt_udba(a->sb), ++ AuPin_MNT_WRITE | AuPin_DI_LOCKED); ++ AuTraceErr(err); ++ a->mvd_h_src_dir = d_inode(a->mvd_h_src_parent); ++ if (unlikely(err)) { ++ AU_MVD_PR(dmsg, "pin_src failed\n"); ++ au_pin_hdir_lock(&a->mvd_pin_dst); ++ goto out_dst; ++ } ++ au_pin_hdir_unlock(&a->mvd_pin_src); ++ h_trap = vfsub_lock_rename(a->mvd_h_src_parent, a->mvd_hdir_src, ++ a->mvd_h_dst_parent, a->mvd_hdir_dst); ++ if (h_trap) { ++ err = (h_trap != a->mvd_h_src_parent); ++ if (err) ++ err = (h_trap != a->mvd_h_dst_parent); ++ } ++ BUG_ON(err); /* it should never happen */ ++ if (unlikely(a->mvd_h_src_dir != au_pinned_h_dir(&a->mvd_pin_src))) { ++ err = -EBUSY; ++ AuTraceErr(err); ++ vfsub_unlock_rename(a->mvd_h_src_parent, a->mvd_hdir_src, ++ a->mvd_h_dst_parent, a->mvd_hdir_dst); ++ au_pin_hdir_lock(&a->mvd_pin_src); ++ au_unpin(&a->mvd_pin_src); ++ au_pin_hdir_lock(&a->mvd_pin_dst); ++ goto out_dst; ++ } ++ goto out; /* success */ ++ ++out_dst: ++ au_unpin(&a->mvd_pin_dst); ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++static void au_do_unlock(const unsigned char dmsg, struct au_mvd_args *a) ++{ ++ if (!a->rename_lock) ++ au_unpin(&a->mvd_pin_src); ++ else { ++ vfsub_unlock_rename(a->mvd_h_src_parent, a->mvd_hdir_src, ++ a->mvd_h_dst_parent, a->mvd_hdir_dst); ++ au_pin_hdir_lock(&a->mvd_pin_src); ++ au_unpin(&a->mvd_pin_src); ++ au_pin_hdir_lock(&a->mvd_pin_dst); ++ } ++ au_unpin(&a->mvd_pin_dst); ++} ++ ++/* copy-down the file */ ++static int au_do_cpdown(const unsigned char dmsg, struct au_mvd_args *a) ++{ ++ int err; ++ struct au_cp_generic cpg = { ++ .dentry = a->dentry, ++ .bdst = a->mvd_bdst, ++ .bsrc = a->mvd_bsrc, ++ .len = -1, ++ .pin = &a->mvd_pin_dst, ++ .flags = AuCpup_DTIME | AuCpup_HOPEN ++ }; ++ ++ AuDbg("b%d, b%d\n", cpg.bsrc, cpg.bdst); ++ if (a->mvdown.flags & AUFS_MVDOWN_OWLOWER) ++ au_fset_cpup(cpg.flags, OVERWRITE); ++ if (a->mvdown.flags & AUFS_MVDOWN_ROLOWER) ++ au_fset_cpup(cpg.flags, RWDST); ++ err = au_sio_cpdown_simple(&cpg); ++ if (unlikely(err)) ++ AU_MVD_PR(dmsg, "cpdown failed\n"); ++ ++ AuTraceErr(err); ++ return err; ++} ++ ++/* ++ * unlink the whiteout on bdst if exist which may be created by UDBA while we ++ * were sleeping ++ */ ++static int au_do_unlink_wh(const unsigned char dmsg, struct au_mvd_args *a) ++{ ++ int err; ++ struct path h_path; ++ struct au_branch *br; ++ struct inode *delegated; ++ ++ br = au_sbr(a->sb, a->mvd_bdst); ++ h_path.dentry = au_wh_lkup(a->mvd_h_dst_parent, &a->dentry->d_name, br); ++ err = PTR_ERR(h_path.dentry); ++ if (IS_ERR(h_path.dentry)) { ++ AU_MVD_PR(dmsg, "wh_lkup failed\n"); ++ goto out; ++ } ++ ++ err = 0; ++ if (d_is_positive(h_path.dentry)) { ++ h_path.mnt = au_br_mnt(br); ++ delegated = NULL; ++ err = vfsub_unlink(d_inode(a->mvd_h_dst_parent), &h_path, ++ &delegated, /*force*/0); ++ if (unlikely(err == -EWOULDBLOCK)) { ++ pr_warn("cannot retry for NFSv4 delegation" ++ " for an internal unlink\n"); ++ iput(delegated); ++ } ++ if (unlikely(err)) ++ AU_MVD_PR(dmsg, "wh_unlink failed\n"); ++ } ++ dput(h_path.dentry); ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++/* ++ * unlink the topmost h_dentry ++ */ ++static int au_do_unlink(const unsigned char dmsg, struct au_mvd_args *a) ++{ ++ int err; ++ struct path h_path; ++ struct inode *delegated; ++ ++ h_path.mnt = au_sbr_mnt(a->sb, a->mvd_bsrc); ++ h_path.dentry = au_h_dptr(a->dentry, a->mvd_bsrc); ++ delegated = NULL; ++ err = vfsub_unlink(a->mvd_h_src_dir, &h_path, &delegated, /*force*/0); ++ if (unlikely(err == -EWOULDBLOCK)) { ++ pr_warn("cannot retry for NFSv4 delegation" ++ " for an internal unlink\n"); ++ iput(delegated); ++ } ++ if (unlikely(err)) ++ AU_MVD_PR(dmsg, "unlink failed\n"); ++ ++ AuTraceErr(err); ++ return err; ++} ++ ++/* Since mvdown succeeded, we ignore an error of this function */ ++static void au_do_stfs(const unsigned char dmsg, struct au_mvd_args *a) ++{ ++ int err; ++ struct au_branch *br; ++ ++ a->mvdown.flags |= AUFS_MVDOWN_STFS_FAILED; ++ br = au_sbr(a->sb, a->mvd_bsrc); ++ err = au_br_stfs(br, &a->mvdown.stbr[AUFS_MVDOWN_UPPER].stfs); ++ if (!err) { ++ br = au_sbr(a->sb, a->mvd_bdst); ++ a->mvdown.stbr[AUFS_MVDOWN_LOWER].brid = br->br_id; ++ err = au_br_stfs(br, &a->mvdown.stbr[AUFS_MVDOWN_LOWER].stfs); ++ } ++ if (!err) ++ a->mvdown.flags &= ~AUFS_MVDOWN_STFS_FAILED; ++ else ++ AU_MVD_PR(dmsg, "statfs failed (%d), ignored\n", err); ++} ++ ++/* ++ * copy-down the file and unlink the bsrc file. ++ * - unlink the bdst whout if exist ++ * - copy-down the file (with whtmp name and rename) ++ * - unlink the bsrc file ++ */ ++static int au_do_mvdown(const unsigned char dmsg, struct au_mvd_args *a) ++{ ++ int err; ++ ++ err = au_do_mkdir(dmsg, a); ++ if (!err) ++ err = au_do_lock(dmsg, a); ++ if (unlikely(err)) ++ goto out; ++ ++ /* ++ * do not revert the activities we made on bdst since they should be ++ * harmless in aufs. ++ */ ++ ++ err = au_do_cpdown(dmsg, a); ++ if (!err) ++ err = au_do_unlink_wh(dmsg, a); ++ if (!err && !(a->mvdown.flags & AUFS_MVDOWN_KUPPER)) ++ err = au_do_unlink(dmsg, a); ++ if (unlikely(err)) ++ goto out_unlock; ++ ++ AuDbg("%pd2, 0x%x, %d --> %d\n", ++ a->dentry, a->mvdown.flags, a->mvd_bsrc, a->mvd_bdst); ++ if (find_lower_writable(a) < 0) ++ a->mvdown.flags |= AUFS_MVDOWN_BOTTOM; ++ ++ if (a->mvdown.flags & AUFS_MVDOWN_STFS) ++ au_do_stfs(dmsg, a); ++ ++ /* maintain internal array */ ++ if (!(a->mvdown.flags & AUFS_MVDOWN_KUPPER)) { ++ au_set_h_dptr(a->dentry, a->mvd_bsrc, NULL); ++ au_set_dbtop(a->dentry, a->mvd_bdst); ++ au_set_h_iptr(a->inode, a->mvd_bsrc, NULL, /*flags*/0); ++ au_set_ibtop(a->inode, a->mvd_bdst); ++ } else { ++ /* hide the lower */ ++ au_set_h_dptr(a->dentry, a->mvd_bdst, NULL); ++ au_set_dbbot(a->dentry, a->mvd_bsrc); ++ au_set_h_iptr(a->inode, a->mvd_bdst, NULL, /*flags*/0); ++ au_set_ibbot(a->inode, a->mvd_bsrc); ++ } ++ if (au_dbbot(a->dentry) < a->mvd_bdst) ++ au_set_dbbot(a->dentry, a->mvd_bdst); ++ if (au_ibbot(a->inode) < a->mvd_bdst) ++ au_set_ibbot(a->inode, a->mvd_bdst); ++ ++out_unlock: ++ au_do_unlock(dmsg, a); ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* make sure the file is idle */ ++static int au_mvd_args_busy(const unsigned char dmsg, struct au_mvd_args *a) ++{ ++ int err, plinked; ++ ++ err = 0; ++ plinked = !!au_opt_test(au_mntflags(a->sb), PLINK); ++ if (au_dbtop(a->dentry) == a->mvd_bsrc ++ && au_dcount(a->dentry) == 1 ++ && atomic_read(&a->inode->i_count) == 1 ++ /* && a->mvd_h_src_inode->i_nlink == 1 */ ++ && (!plinked || !au_plink_test(a->inode)) ++ && a->inode->i_nlink == 1) ++ goto out; ++ ++ err = -EBUSY; ++ AU_MVD_PR(dmsg, ++ "b%d, d{b%d, c%d?}, i{c%d?, l%u}, hi{l%u}, p{%d, %d}\n", ++ a->mvd_bsrc, au_dbtop(a->dentry), au_dcount(a->dentry), ++ atomic_read(&a->inode->i_count), a->inode->i_nlink, ++ a->mvd_h_src_inode->i_nlink, ++ plinked, plinked ? au_plink_test(a->inode) : 0); ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++/* make sure the parent dir is fine */ ++static int au_mvd_args_parent(const unsigned char dmsg, ++ struct au_mvd_args *a) ++{ ++ int err; ++ aufs_bindex_t bindex; ++ ++ err = 0; ++ if (unlikely(au_alive_dir(a->parent))) { ++ err = -ENOENT; ++ AU_MVD_PR(dmsg, "parent dir is dead\n"); ++ goto out; ++ } ++ ++ a->bopq = au_dbdiropq(a->parent); ++ bindex = au_wbr_nonopq(a->dentry, a->mvd_bdst); ++ AuDbg("b%d\n", bindex); ++ if (unlikely((bindex >= 0 && bindex < a->mvd_bdst) ++ || (a->bopq != -1 && a->bopq < a->mvd_bdst))) { ++ err = -EINVAL; ++ a->mvd_errno = EAU_MVDOWN_OPAQUE; ++ AU_MVD_PR(dmsg, "ancestor is opaque b%d, b%d\n", ++ a->bopq, a->mvd_bdst); ++ } ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++static int au_mvd_args_intermediate(const unsigned char dmsg, ++ struct au_mvd_args *a) ++{ ++ int err; ++ struct au_dinfo *dinfo, *tmp; ++ ++ /* lookup the next lower positive entry */ ++ err = -ENOMEM; ++ tmp = au_di_alloc(a->sb, AuLsc_DI_TMP); ++ if (unlikely(!tmp)) ++ goto out; ++ ++ a->bfound = -1; ++ a->bwh = -1; ++ dinfo = au_di(a->dentry); ++ au_di_cp(tmp, dinfo); ++ au_di_swap(tmp, dinfo); ++ ++ /* returns the number of positive dentries */ ++ err = au_lkup_dentry(a->dentry, a->mvd_bsrc + 1, ++ /* AuLkup_IGNORE_PERM */ 0); ++ if (!err) ++ a->bwh = au_dbwh(a->dentry); ++ else if (err > 0) ++ a->bfound = au_dbtop(a->dentry); ++ ++ au_di_swap(tmp, dinfo); ++ au_rw_write_unlock(&tmp->di_rwsem); ++ au_di_free(tmp); ++ if (unlikely(err < 0)) ++ AU_MVD_PR(dmsg, "failed look-up lower\n"); ++ ++ /* ++ * here, we have these cases. ++ * bfound == -1 ++ * no positive dentry under bsrc. there are more sub-cases. ++ * bwh < 0 ++ * there no whiteout, we can safely move-down. ++ * bwh <= bsrc ++ * impossible ++ * bsrc < bwh && bwh < bdst ++ * there is a whiteout on RO branch. cannot proceed. ++ * bwh == bdst ++ * there is a whiteout on the RW target branch. it should ++ * be removed. ++ * bdst < bwh ++ * there is a whiteout somewhere unrelated branch. ++ * -1 < bfound && bfound <= bsrc ++ * impossible. ++ * bfound < bdst ++ * found, but it is on RO branch between bsrc and bdst. cannot ++ * proceed. ++ * bfound == bdst ++ * found, replace it if AUFS_MVDOWN_FORCE is set. otherwise return ++ * error. ++ * bdst < bfound ++ * found, after we create the file on bdst, it will be hidden. ++ */ ++ ++ AuDebugOn(a->bfound == -1 ++ && a->bwh != -1 ++ && a->bwh <= a->mvd_bsrc); ++ AuDebugOn(-1 < a->bfound ++ && a->bfound <= a->mvd_bsrc); ++ ++ err = -EINVAL; ++ if (a->bfound == -1 ++ && a->mvd_bsrc < a->bwh ++ && a->bwh != -1 ++ && a->bwh < a->mvd_bdst) { ++ a->mvd_errno = EAU_MVDOWN_WHITEOUT; ++ AU_MVD_PR(dmsg, "bsrc %d, bdst %d, bfound %d, bwh %d\n", ++ a->mvd_bsrc, a->mvd_bdst, a->bfound, a->bwh); ++ goto out; ++ } else if (a->bfound != -1 && a->bfound < a->mvd_bdst) { ++ a->mvd_errno = EAU_MVDOWN_UPPER; ++ AU_MVD_PR(dmsg, "bdst %d, bfound %d\n", ++ a->mvd_bdst, a->bfound); ++ goto out; ++ } ++ ++ err = 0; /* success */ ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++static int au_mvd_args_exist(const unsigned char dmsg, struct au_mvd_args *a) ++{ ++ int err; ++ ++ err = 0; ++ if (!(a->mvdown.flags & AUFS_MVDOWN_OWLOWER) ++ && a->bfound == a->mvd_bdst) ++ err = -EEXIST; ++ AuTraceErr(err); ++ return err; ++} ++ ++static int au_mvd_args(const unsigned char dmsg, struct au_mvd_args *a) ++{ ++ int err; ++ struct au_branch *br; ++ ++ err = -EISDIR; ++ if (unlikely(S_ISDIR(a->inode->i_mode))) ++ goto out; ++ ++ err = -EINVAL; ++ if (!(a->mvdown.flags & AUFS_MVDOWN_BRID_UPPER)) ++ a->mvd_bsrc = au_ibtop(a->inode); ++ else { ++ a->mvd_bsrc = au_br_index(a->sb, a->mvd_src_brid); ++ if (unlikely(a->mvd_bsrc < 0 ++ || (a->mvd_bsrc < au_dbtop(a->dentry) ++ || au_dbbot(a->dentry) < a->mvd_bsrc ++ || !au_h_dptr(a->dentry, a->mvd_bsrc)) ++ || (a->mvd_bsrc < au_ibtop(a->inode) ++ || au_ibbot(a->inode) < a->mvd_bsrc ++ || !au_h_iptr(a->inode, a->mvd_bsrc)))) { ++ a->mvd_errno = EAU_MVDOWN_NOUPPER; ++ AU_MVD_PR(dmsg, "no upper\n"); ++ goto out; ++ } ++ } ++ if (unlikely(a->mvd_bsrc == au_sbbot(a->sb))) { ++ a->mvd_errno = EAU_MVDOWN_BOTTOM; ++ AU_MVD_PR(dmsg, "on the bottom\n"); ++ goto out; ++ } ++ a->mvd_h_src_inode = au_h_iptr(a->inode, a->mvd_bsrc); ++ br = au_sbr(a->sb, a->mvd_bsrc); ++ err = au_br_rdonly(br); ++ if (!(a->mvdown.flags & AUFS_MVDOWN_ROUPPER)) { ++ if (unlikely(err)) ++ goto out; ++ } else if (!(vfsub_native_ro(a->mvd_h_src_inode) ++ || IS_APPEND(a->mvd_h_src_inode))) { ++ if (err) ++ a->mvdown.flags |= AUFS_MVDOWN_ROUPPER_R; ++ /* go on */ ++ } else ++ goto out; ++ ++ err = -EINVAL; ++ if (!(a->mvdown.flags & AUFS_MVDOWN_BRID_LOWER)) { ++ a->mvd_bdst = find_lower_writable(a); ++ if (unlikely(a->mvd_bdst < 0)) { ++ a->mvd_errno = EAU_MVDOWN_BOTTOM; ++ AU_MVD_PR(dmsg, "no writable lower branch\n"); ++ goto out; ++ } ++ } else { ++ a->mvd_bdst = au_br_index(a->sb, a->mvd_dst_brid); ++ if (unlikely(a->mvd_bdst < 0 ++ || au_sbbot(a->sb) < a->mvd_bdst)) { ++ a->mvd_errno = EAU_MVDOWN_NOLOWERBR; ++ AU_MVD_PR(dmsg, "no lower brid\n"); ++ goto out; ++ } ++ } ++ ++ err = au_mvd_args_busy(dmsg, a); ++ if (!err) ++ err = au_mvd_args_parent(dmsg, a); ++ if (!err) ++ err = au_mvd_args_intermediate(dmsg, a); ++ if (!err) ++ err = au_mvd_args_exist(dmsg, a); ++ if (!err) ++ AuDbg("b%d, b%d\n", a->mvd_bsrc, a->mvd_bdst); ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++int au_mvdown(struct dentry *dentry, struct aufs_mvdown __user *uarg) ++{ ++ int err, e; ++ unsigned char dmsg; ++ struct au_mvd_args *args; ++ struct inode *inode; ++ ++ inode = d_inode(dentry); ++ err = -EPERM; ++ if (unlikely(!capable(CAP_SYS_ADMIN))) ++ goto out; ++ ++ err = -ENOMEM; ++ args = kmalloc(sizeof(*args), GFP_NOFS); ++ if (unlikely(!args)) ++ goto out; ++ ++ err = copy_from_user(&args->mvdown, uarg, sizeof(args->mvdown)); ++ if (!err) ++ /* VERIFY_WRITE */ ++ err = !access_ok(uarg, sizeof(*uarg)); ++ if (unlikely(err)) { ++ err = -EFAULT; ++ AuTraceErr(err); ++ goto out_free; ++ } ++ AuDbg("flags 0x%x\n", args->mvdown.flags); ++ args->mvdown.flags &= ~(AUFS_MVDOWN_ROLOWER_R | AUFS_MVDOWN_ROUPPER_R); ++ args->mvdown.au_errno = 0; ++ args->dentry = dentry; ++ args->inode = inode; ++ args->sb = dentry->d_sb; ++ ++ err = -ENOENT; ++ dmsg = !!(args->mvdown.flags & AUFS_MVDOWN_DMSG); ++ args->parent = dget_parent(dentry); ++ args->dir = d_inode(args->parent); ++ inode_lock_nested(args->dir, I_MUTEX_PARENT); ++ dput(args->parent); ++ if (unlikely(args->parent != dentry->d_parent)) { ++ AU_MVD_PR(dmsg, "parent dir is moved\n"); ++ goto out_dir; ++ } ++ ++ inode_lock_nested(inode, I_MUTEX_CHILD); ++ err = aufs_read_lock(dentry, AuLock_DW | AuLock_FLUSH | AuLock_NOPLMW); ++ if (unlikely(err)) ++ goto out_inode; ++ ++ di_write_lock_parent(args->parent); ++ err = au_mvd_args(dmsg, args); ++ if (unlikely(err)) ++ goto out_parent; ++ ++ err = au_do_mvdown(dmsg, args); ++ if (unlikely(err)) ++ goto out_parent; ++ ++ au_cpup_attr_timesizes(args->dir); ++ au_cpup_attr_timesizes(inode); ++ if (!(args->mvdown.flags & AUFS_MVDOWN_KUPPER)) ++ au_cpup_igen(inode, au_h_iptr(inode, args->mvd_bdst)); ++ /* au_digen_dec(dentry); */ ++ ++out_parent: ++ di_write_unlock(args->parent); ++ aufs_read_unlock(dentry, AuLock_DW); ++out_inode: ++ inode_unlock(inode); ++out_dir: ++ inode_unlock(args->dir); ++out_free: ++ e = copy_to_user(uarg, &args->mvdown, sizeof(args->mvdown)); ++ if (unlikely(e)) ++ err = -EFAULT; ++ au_kfree_rcu(args); ++out: ++ AuTraceErr(err); ++ return err; ++} +diff --git a/fs/aufs/opts.c b/fs/aufs/opts.c +new file mode 100644 +index 000000000000..20421440c004 +--- /dev/null ++++ b/fs/aufs/opts.c +@@ -0,0 +1,1032 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * mount options/flags ++ */ ++ ++#include <linux/types.h> /* a distribution requires */ ++#include <linux/parser.h> ++#include "aufs.h" ++ ++/* ---------------------------------------------------------------------- */ ++ ++static const char *au_parser_pattern(int val, match_table_t tbl) ++{ ++ struct match_token *p; ++ ++ p = tbl; ++ while (p->pattern) { ++ if (p->token == val) ++ return p->pattern; ++ p++; ++ } ++ BUG(); ++ return "??"; ++} ++ ++static const char *au_optstr(int *val, match_table_t tbl) ++{ ++ struct match_token *p; ++ int v; ++ ++ v = *val; ++ if (!v) ++ goto out; ++ p = tbl; ++ while (p->pattern) { ++ if (p->token ++ && (v & p->token) == p->token) { ++ *val &= ~p->token; ++ return p->pattern; ++ } ++ p++; ++ } ++ ++out: ++ return NULL; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static match_table_t brperm = { ++ {AuBrPerm_RO, AUFS_BRPERM_RO}, ++ {AuBrPerm_RR, AUFS_BRPERM_RR}, ++ {AuBrPerm_RW, AUFS_BRPERM_RW}, ++ {0, NULL} ++}; ++ ++static match_table_t brattr = { ++ /* general */ ++ {AuBrAttr_COO_REG, AUFS_BRATTR_COO_REG}, ++ {AuBrAttr_COO_ALL, AUFS_BRATTR_COO_ALL}, ++ /* 'unpin' attrib is meaningless since linux-3.18-rc1 */ ++ {AuBrAttr_UNPIN, AUFS_BRATTR_UNPIN}, ++#ifdef CONFIG_AUFS_FHSM ++ {AuBrAttr_FHSM, AUFS_BRATTR_FHSM}, ++#endif ++#ifdef CONFIG_AUFS_XATTR ++ {AuBrAttr_ICEX, AUFS_BRATTR_ICEX}, ++ {AuBrAttr_ICEX_SEC, AUFS_BRATTR_ICEX_SEC}, ++ {AuBrAttr_ICEX_SYS, AUFS_BRATTR_ICEX_SYS}, ++ {AuBrAttr_ICEX_TR, AUFS_BRATTR_ICEX_TR}, ++ {AuBrAttr_ICEX_USR, AUFS_BRATTR_ICEX_USR}, ++ {AuBrAttr_ICEX_OTH, AUFS_BRATTR_ICEX_OTH}, ++#endif ++ ++ /* ro/rr branch */ ++ {AuBrRAttr_WH, AUFS_BRRATTR_WH}, ++ ++ /* rw branch */ ++ {AuBrWAttr_MOO, AUFS_BRWATTR_MOO}, ++ {AuBrWAttr_NoLinkWH, AUFS_BRWATTR_NLWH}, ++ ++ {0, NULL} ++}; ++ ++static int br_attr_val(char *str, match_table_t table, substring_t args[]) ++{ ++ int attr, v; ++ char *p; ++ ++ attr = 0; ++ do { ++ p = strchr(str, '+'); ++ if (p) ++ *p = 0; ++ v = match_token(str, table, args); ++ if (v) { ++ if (v & AuBrAttr_CMOO_Mask) ++ attr &= ~AuBrAttr_CMOO_Mask; ++ attr |= v; ++ } else { ++ if (p) ++ *p = '+'; ++ pr_warn("ignored branch attribute %s\n", str); ++ break; ++ } ++ if (p) ++ str = p + 1; ++ } while (p); ++ ++ return attr; ++} ++ ++static int au_do_optstr_br_attr(au_br_perm_str_t *str, int perm) ++{ ++ int sz; ++ const char *p; ++ char *q; ++ ++ q = str->a; ++ *q = 0; ++ p = au_optstr(&perm, brattr); ++ if (p) { ++ sz = strlen(p); ++ memcpy(q, p, sz + 1); ++ q += sz; ++ } else ++ goto out; ++ ++ do { ++ p = au_optstr(&perm, brattr); ++ if (p) { ++ *q++ = '+'; ++ sz = strlen(p); ++ memcpy(q, p, sz + 1); ++ q += sz; ++ } ++ } while (p); ++ ++out: ++ return q - str->a; ++} ++ ++int au_br_perm_val(char *perm) ++{ ++ int val, bad, sz; ++ char *p; ++ substring_t args[MAX_OPT_ARGS]; ++ au_br_perm_str_t attr; ++ ++ p = strchr(perm, '+'); ++ if (p) ++ *p = 0; ++ val = match_token(perm, brperm, args); ++ if (!val) { ++ if (p) ++ *p = '+'; ++ pr_warn("ignored branch permission %s\n", perm); ++ val = AuBrPerm_RO; ++ goto out; ++ } ++ if (!p) ++ goto out; ++ ++ val |= br_attr_val(p + 1, brattr, args); ++ ++ bad = 0; ++ switch (val & AuBrPerm_Mask) { ++ case AuBrPerm_RO: ++ case AuBrPerm_RR: ++ bad = val & AuBrWAttr_Mask; ++ val &= ~AuBrWAttr_Mask; ++ break; ++ case AuBrPerm_RW: ++ bad = val & AuBrRAttr_Mask; ++ val &= ~AuBrRAttr_Mask; ++ break; ++ } ++ ++ /* ++ * 'unpin' attrib becomes meaningless since linux-3.18-rc1, but aufs ++ * does not treat it as an error, just warning. ++ * this is a tiny guard for the user operation. ++ */ ++ if (val & AuBrAttr_UNPIN) { ++ bad |= AuBrAttr_UNPIN; ++ val &= ~AuBrAttr_UNPIN; ++ } ++ ++ if (unlikely(bad)) { ++ sz = au_do_optstr_br_attr(&attr, bad); ++ AuDebugOn(!sz); ++ pr_warn("ignored branch attribute %s\n", attr.a); ++ } ++ ++out: ++ return val; ++} ++ ++void au_optstr_br_perm(au_br_perm_str_t *str, int perm) ++{ ++ au_br_perm_str_t attr; ++ const char *p; ++ char *q; ++ int sz; ++ ++ q = str->a; ++ p = au_optstr(&perm, brperm); ++ AuDebugOn(!p || !*p); ++ sz = strlen(p); ++ memcpy(q, p, sz + 1); ++ q += sz; ++ ++ sz = au_do_optstr_br_attr(&attr, perm); ++ if (sz) { ++ *q++ = '+'; ++ memcpy(q, attr.a, sz + 1); ++ } ++ ++ AuDebugOn(strlen(str->a) >= sizeof(str->a)); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static match_table_t udbalevel = { ++ {AuOpt_UDBA_REVAL, "reval"}, ++ {AuOpt_UDBA_NONE, "none"}, ++#ifdef CONFIG_AUFS_HNOTIFY ++ {AuOpt_UDBA_HNOTIFY, "notify"}, /* abstraction */ ++#ifdef CONFIG_AUFS_HFSNOTIFY ++ {AuOpt_UDBA_HNOTIFY, "fsnotify"}, ++#endif ++#endif ++ {-1, NULL} ++}; ++ ++int au_udba_val(char *str) ++{ ++ substring_t args[MAX_OPT_ARGS]; ++ ++ return match_token(str, udbalevel, args); ++} ++ ++const char *au_optstr_udba(int udba) ++{ ++ return au_parser_pattern(udba, udbalevel); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static match_table_t au_wbr_create_policy = { ++ {AuWbrCreate_TDP, "tdp"}, ++ {AuWbrCreate_TDP, "top-down-parent"}, ++ {AuWbrCreate_RR, "rr"}, ++ {AuWbrCreate_RR, "round-robin"}, ++ {AuWbrCreate_MFS, "mfs"}, ++ {AuWbrCreate_MFS, "most-free-space"}, ++ {AuWbrCreate_MFSV, "mfs:%d"}, ++ {AuWbrCreate_MFSV, "most-free-space:%d"}, ++ ++ /* top-down regardless the parent, and then mfs */ ++ {AuWbrCreate_TDMFS, "tdmfs:%d"}, ++ {AuWbrCreate_TDMFSV, "tdmfs:%d:%d"}, ++ ++ {AuWbrCreate_MFSRR, "mfsrr:%d"}, ++ {AuWbrCreate_MFSRRV, "mfsrr:%d:%d"}, ++ {AuWbrCreate_PMFS, "pmfs"}, ++ {AuWbrCreate_PMFSV, "pmfs:%d"}, ++ {AuWbrCreate_PMFSRR, "pmfsrr:%d"}, ++ {AuWbrCreate_PMFSRRV, "pmfsrr:%d:%d"}, ++ ++ {-1, NULL} ++}; ++ ++static int au_wbr_mfs_wmark(substring_t *arg, char *str, ++ struct au_opt_wbr_create *create) ++{ ++ int err; ++ unsigned long long ull; ++ ++ err = 0; ++ if (!match_u64(arg, &ull)) ++ create->mfsrr_watermark = ull; ++ else { ++ pr_err("bad integer in %s\n", str); ++ err = -EINVAL; ++ } ++ ++ return err; ++} ++ ++static int au_wbr_mfs_sec(substring_t *arg, char *str, ++ struct au_opt_wbr_create *create) ++{ ++ int n, err; ++ ++ err = 0; ++ if (!match_int(arg, &n) && 0 <= n && n <= AUFS_MFS_MAX_SEC) ++ create->mfs_second = n; ++ else { ++ pr_err("bad integer in %s\n", str); ++ err = -EINVAL; ++ } ++ ++ return err; ++} ++ ++int au_wbr_create_val(char *str, struct au_opt_wbr_create *create) ++{ ++ int err, e; ++ substring_t args[MAX_OPT_ARGS]; ++ ++ err = match_token(str, au_wbr_create_policy, args); ++ create->wbr_create = err; ++ switch (err) { ++ case AuWbrCreate_MFSRRV: ++ case AuWbrCreate_TDMFSV: ++ case AuWbrCreate_PMFSRRV: ++ e = au_wbr_mfs_wmark(&args[0], str, create); ++ if (!e) ++ e = au_wbr_mfs_sec(&args[1], str, create); ++ if (unlikely(e)) ++ err = e; ++ break; ++ case AuWbrCreate_MFSRR: ++ case AuWbrCreate_TDMFS: ++ case AuWbrCreate_PMFSRR: ++ e = au_wbr_mfs_wmark(&args[0], str, create); ++ if (unlikely(e)) { ++ err = e; ++ break; ++ } ++ fallthrough; ++ case AuWbrCreate_MFS: ++ case AuWbrCreate_PMFS: ++ create->mfs_second = AUFS_MFS_DEF_SEC; ++ break; ++ case AuWbrCreate_MFSV: ++ case AuWbrCreate_PMFSV: ++ e = au_wbr_mfs_sec(&args[0], str, create); ++ if (unlikely(e)) ++ err = e; ++ break; ++ } ++ ++ return err; ++} ++ ++const char *au_optstr_wbr_create(int wbr_create) ++{ ++ return au_parser_pattern(wbr_create, au_wbr_create_policy); ++} ++ ++static match_table_t au_wbr_copyup_policy = { ++ {AuWbrCopyup_TDP, "tdp"}, ++ {AuWbrCopyup_TDP, "top-down-parent"}, ++ {AuWbrCopyup_BUP, "bup"}, ++ {AuWbrCopyup_BUP, "bottom-up-parent"}, ++ {AuWbrCopyup_BU, "bu"}, ++ {AuWbrCopyup_BU, "bottom-up"}, ++ {-1, NULL} ++}; ++ ++int au_wbr_copyup_val(char *str) ++{ ++ substring_t args[MAX_OPT_ARGS]; ++ ++ return match_token(str, au_wbr_copyup_policy, args); ++} ++ ++const char *au_optstr_wbr_copyup(int wbr_copyup) ++{ ++ return au_parser_pattern(wbr_copyup, au_wbr_copyup_policy); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++int au_opt_add(struct au_opt *opt, char *opt_str, unsigned long sb_flags, ++ aufs_bindex_t bindex) ++{ ++ int err; ++ struct au_opt_add *add = &opt->add; ++ char *p; ++ ++ add->bindex = bindex; ++ add->perm = AuBrPerm_RO; ++ add->pathname = opt_str; ++ p = strchr(opt_str, '='); ++ if (p) { ++ *p++ = 0; ++ if (*p) ++ add->perm = au_br_perm_val(p); ++ } ++ ++ err = vfsub_kern_path(add->pathname, AuOpt_LkupDirFlags, &add->path); ++ if (!err) { ++ if (!p) { ++ add->perm = AuBrPerm_RO; ++ if (au_test_fs_rr(add->path.dentry->d_sb)) ++ add->perm = AuBrPerm_RR; ++ else if (!bindex && !(sb_flags & SB_RDONLY)) ++ add->perm = AuBrPerm_RW; ++ } ++ opt->type = Opt_add; ++ goto out; ++ } ++ pr_err("lookup failed %s (%d)\n", add->pathname, err); ++ err = -EINVAL; ++ ++out: ++ return err; ++} ++ ++static int au_opt_wbr_create(struct super_block *sb, ++ struct au_opt_wbr_create *create) ++{ ++ int err; ++ struct au_sbinfo *sbinfo; ++ ++ SiMustWriteLock(sb); ++ ++ err = 1; /* handled */ ++ sbinfo = au_sbi(sb); ++ if (sbinfo->si_wbr_create_ops->fin) { ++ err = sbinfo->si_wbr_create_ops->fin(sb); ++ if (!err) ++ err = 1; ++ } ++ ++ sbinfo->si_wbr_create = create->wbr_create; ++ sbinfo->si_wbr_create_ops = au_wbr_create_ops + create->wbr_create; ++ switch (create->wbr_create) { ++ case AuWbrCreate_MFSRRV: ++ case AuWbrCreate_MFSRR: ++ case AuWbrCreate_TDMFS: ++ case AuWbrCreate_TDMFSV: ++ case AuWbrCreate_PMFSRR: ++ case AuWbrCreate_PMFSRRV: ++ sbinfo->si_wbr_mfs.mfsrr_watermark = create->mfsrr_watermark; ++ fallthrough; ++ case AuWbrCreate_MFS: ++ case AuWbrCreate_MFSV: ++ case AuWbrCreate_PMFS: ++ case AuWbrCreate_PMFSV: ++ sbinfo->si_wbr_mfs.mfs_expire ++ = msecs_to_jiffies(create->mfs_second * MSEC_PER_SEC); ++ break; ++ } ++ ++ if (sbinfo->si_wbr_create_ops->init) ++ sbinfo->si_wbr_create_ops->init(sb); /* ignore */ ++ ++ return err; ++} ++ ++/* ++ * returns, ++ * plus: processed without an error ++ * zero: unprocessed ++ */ ++static int au_opt_simple(struct super_block *sb, struct au_opt *opt, ++ struct au_opts *opts) ++{ ++ int err; ++ struct au_sbinfo *sbinfo; ++ ++ SiMustWriteLock(sb); ++ ++ err = 1; /* handled */ ++ sbinfo = au_sbi(sb); ++ switch (opt->type) { ++ case Opt_udba: ++ sbinfo->si_mntflags &= ~AuOptMask_UDBA; ++ sbinfo->si_mntflags |= opt->udba; ++ opts->given_udba |= opt->udba; ++ break; ++ ++ case Opt_plink: ++ if (opt->tf) ++ au_opt_set(sbinfo->si_mntflags, PLINK); ++ else { ++ if (au_opt_test(sbinfo->si_mntflags, PLINK)) ++ au_plink_put(sb, /*verbose*/1); ++ au_opt_clr(sbinfo->si_mntflags, PLINK); ++ } ++ break; ++ case Opt_list_plink: ++ if (au_opt_test(sbinfo->si_mntflags, PLINK)) ++ au_plink_list(sb); ++ break; ++ ++ case Opt_dio: ++ if (opt->tf) { ++ au_opt_set(sbinfo->si_mntflags, DIO); ++ au_fset_opts(opts->flags, REFRESH_DYAOP); ++ } else { ++ au_opt_clr(sbinfo->si_mntflags, DIO); ++ au_fset_opts(opts->flags, REFRESH_DYAOP); ++ } ++ break; ++ ++ case Opt_fhsm_sec: ++ au_fhsm_set(sbinfo, opt->fhsm_second); ++ break; ++ ++ case Opt_diropq_a: ++ au_opt_set(sbinfo->si_mntflags, ALWAYS_DIROPQ); ++ break; ++ case Opt_diropq_w: ++ au_opt_clr(sbinfo->si_mntflags, ALWAYS_DIROPQ); ++ break; ++ ++ case Opt_warn_perm: ++ if (opt->tf) ++ au_opt_set(sbinfo->si_mntflags, WARN_PERM); ++ else ++ au_opt_clr(sbinfo->si_mntflags, WARN_PERM); ++ break; ++ ++ case Opt_verbose: ++ if (opt->tf) ++ au_opt_set(sbinfo->si_mntflags, VERBOSE); ++ else ++ au_opt_clr(sbinfo->si_mntflags, VERBOSE); ++ break; ++ ++ case Opt_sum: ++ if (opt->tf) ++ au_opt_set(sbinfo->si_mntflags, SUM); ++ else { ++ au_opt_clr(sbinfo->si_mntflags, SUM); ++ au_opt_clr(sbinfo->si_mntflags, SUM_W); ++ } ++ break; ++ case Opt_wsum: ++ au_opt_clr(sbinfo->si_mntflags, SUM); ++ au_opt_set(sbinfo->si_mntflags, SUM_W); ++ break; ++ ++ case Opt_wbr_create: ++ err = au_opt_wbr_create(sb, &opt->wbr_create); ++ break; ++ case Opt_wbr_copyup: ++ sbinfo->si_wbr_copyup = opt->wbr_copyup; ++ sbinfo->si_wbr_copyup_ops = au_wbr_copyup_ops + opt->wbr_copyup; ++ break; ++ ++ case Opt_dirwh: ++ sbinfo->si_dirwh = opt->dirwh; ++ break; ++ ++ case Opt_rdcache: ++ sbinfo->si_rdcache ++ = msecs_to_jiffies(opt->rdcache * MSEC_PER_SEC); ++ break; ++ case Opt_rdblk: ++ sbinfo->si_rdblk = opt->rdblk; ++ break; ++ case Opt_rdhash: ++ sbinfo->si_rdhash = opt->rdhash; ++ break; ++ ++ case Opt_shwh: ++ if (opt->tf) ++ au_opt_set(sbinfo->si_mntflags, SHWH); ++ else ++ au_opt_clr(sbinfo->si_mntflags, SHWH); ++ break; ++ ++ case Opt_dirperm1: ++ if (opt->tf) ++ au_opt_set(sbinfo->si_mntflags, DIRPERM1); ++ else ++ au_opt_clr(sbinfo->si_mntflags, DIRPERM1); ++ break; ++ ++ case Opt_trunc_xino: ++ if (opt->tf) ++ au_opt_set(sbinfo->si_mntflags, TRUNC_XINO); ++ else ++ au_opt_clr(sbinfo->si_mntflags, TRUNC_XINO); ++ break; ++ ++ case Opt_trunc_xino_path: ++ case Opt_itrunc_xino: ++ err = au_xino_trunc(sb, opt->xino_itrunc.bindex, ++ /*idx_begin*/0); ++ if (!err) ++ err = 1; ++ break; ++ ++ case Opt_trunc_xib: ++ if (opt->tf) ++ au_fset_opts(opts->flags, TRUNC_XIB); ++ else ++ au_fclr_opts(opts->flags, TRUNC_XIB); ++ break; ++ ++ case Opt_dirren: ++ err = 1; ++ if (opt->tf) { ++ if (!au_opt_test(sbinfo->si_mntflags, DIRREN)) { ++ err = au_dr_opt_set(sb); ++ if (!err) ++ err = 1; ++ } ++ if (err == 1) ++ au_opt_set(sbinfo->si_mntflags, DIRREN); ++ } else { ++ if (au_opt_test(sbinfo->si_mntflags, DIRREN)) { ++ err = au_dr_opt_clr(sb, au_ftest_opts(opts->flags, ++ DR_FLUSHED)); ++ if (!err) ++ err = 1; ++ } ++ if (err == 1) ++ au_opt_clr(sbinfo->si_mntflags, DIRREN); ++ } ++ break; ++ ++ case Opt_acl: ++ if (opt->tf) ++ sb->s_flags |= SB_POSIXACL; ++ else ++ sb->s_flags &= ~SB_POSIXACL; ++ break; ++ ++ default: ++ err = 0; ++ break; ++ } ++ ++ return err; ++} ++ ++/* ++ * returns tri-state. ++ * plus: processed without an error ++ * zero: unprocessed ++ * minus: error ++ */ ++static int au_opt_br(struct super_block *sb, struct au_opt *opt, ++ struct au_opts *opts) ++{ ++ int err, do_refresh; ++ ++ err = 0; ++ switch (opt->type) { ++ case Opt_append: ++ opt->add.bindex = au_sbbot(sb) + 1; ++ if (opt->add.bindex < 0) ++ opt->add.bindex = 0; ++ goto add; ++ /* Always goto add, not fallthrough */ ++ case Opt_prepend: ++ opt->add.bindex = 0; ++ fallthrough; ++ add: /* indented label */ ++ case Opt_add: ++ err = au_br_add(sb, &opt->add, ++ au_ftest_opts(opts->flags, REMOUNT)); ++ if (!err) { ++ err = 1; ++ au_fset_opts(opts->flags, REFRESH); ++ } ++ break; ++ ++ case Opt_del: ++ case Opt_idel: ++ err = au_br_del(sb, &opt->del, ++ au_ftest_opts(opts->flags, REMOUNT)); ++ if (!err) { ++ err = 1; ++ au_fset_opts(opts->flags, TRUNC_XIB); ++ au_fset_opts(opts->flags, REFRESH); ++ } ++ break; ++ ++ case Opt_mod: ++ case Opt_imod: ++ err = au_br_mod(sb, &opt->mod, ++ au_ftest_opts(opts->flags, REMOUNT), ++ &do_refresh); ++ if (!err) { ++ err = 1; ++ if (do_refresh) ++ au_fset_opts(opts->flags, REFRESH); ++ } ++ break; ++ } ++ return err; ++} ++ ++static int au_opt_xino(struct super_block *sb, struct au_opt *opt, ++ struct au_opt_xino **opt_xino, ++ struct au_opts *opts) ++{ ++ int err; ++ ++ err = 0; ++ switch (opt->type) { ++ case Opt_xino: ++ err = au_xino_set(sb, &opt->xino, ++ !!au_ftest_opts(opts->flags, REMOUNT)); ++ if (!err) ++ *opt_xino = &opt->xino; ++ break; ++ case Opt_noxino: ++ au_xino_clr(sb); ++ *opt_xino = (void *)-1; ++ break; ++ } ++ ++ return err; ++} ++ ++int au_opts_verify(struct super_block *sb, unsigned long sb_flags, ++ unsigned int pending) ++{ ++ int err, fhsm; ++ aufs_bindex_t bindex, bbot; ++ unsigned char do_plink, skip, do_free, can_no_dreval; ++ struct au_branch *br; ++ struct au_wbr *wbr; ++ struct dentry *root, *dentry; ++ struct inode *dir, *h_dir; ++ struct au_sbinfo *sbinfo; ++ struct au_hinode *hdir; ++ ++ SiMustAnyLock(sb); ++ ++ sbinfo = au_sbi(sb); ++ AuDebugOn(!(sbinfo->si_mntflags & AuOptMask_UDBA)); ++ ++ if (!(sb_flags & SB_RDONLY)) { ++ if (unlikely(!au_br_writable(au_sbr_perm(sb, 0)))) ++ pr_warn("first branch should be rw\n"); ++ if (unlikely(au_opt_test(sbinfo->si_mntflags, SHWH))) ++ pr_warn_once("shwh should be used with ro\n"); ++ } ++ ++ if (au_opt_test((sbinfo->si_mntflags | pending), UDBA_HNOTIFY) ++ && !au_opt_test(sbinfo->si_mntflags, XINO)) ++ pr_warn_once("udba=*notify requires xino\n"); ++ ++ if (au_opt_test(sbinfo->si_mntflags, DIRPERM1)) ++ pr_warn_once("dirperm1 breaks the protection" ++ " by the permission bits on the lower branch\n"); ++ ++ err = 0; ++ fhsm = 0; ++ root = sb->s_root; ++ dir = d_inode(root); ++ do_plink = !!au_opt_test(sbinfo->si_mntflags, PLINK); ++ can_no_dreval = !!au_opt_test((sbinfo->si_mntflags | pending), ++ UDBA_NONE); ++ bbot = au_sbbot(sb); ++ for (bindex = 0; !err && bindex <= bbot; bindex++) { ++ skip = 0; ++ h_dir = au_h_iptr(dir, bindex); ++ br = au_sbr(sb, bindex); ++ ++ if ((br->br_perm & AuBrAttr_ICEX) ++ && !h_dir->i_op->listxattr) ++ br->br_perm &= ~AuBrAttr_ICEX; ++#if 0 /* untested */ ++ if ((br->br_perm & AuBrAttr_ICEX_SEC) ++ && (au_br_sb(br)->s_flags & SB_NOSEC)) ++ br->br_perm &= ~AuBrAttr_ICEX_SEC; ++#endif ++ ++ do_free = 0; ++ wbr = br->br_wbr; ++ if (wbr) ++ wbr_wh_read_lock(wbr); ++ ++ if (!au_br_writable(br->br_perm)) { ++ do_free = !!wbr; ++ skip = (!wbr ++ || (!wbr->wbr_whbase ++ && !wbr->wbr_plink ++ && !wbr->wbr_orph)); ++ } else if (!au_br_wh_linkable(br->br_perm)) { ++ /* skip = (!br->br_whbase && !br->br_orph); */ ++ skip = (!wbr || !wbr->wbr_whbase); ++ if (skip && wbr) { ++ if (do_plink) ++ skip = !!wbr->wbr_plink; ++ else ++ skip = !wbr->wbr_plink; ++ } ++ } else { ++ /* skip = (br->br_whbase && br->br_ohph); */ ++ skip = (wbr && wbr->wbr_whbase); ++ if (skip) { ++ if (do_plink) ++ skip = !!wbr->wbr_plink; ++ else ++ skip = !wbr->wbr_plink; ++ } ++ } ++ if (wbr) ++ wbr_wh_read_unlock(wbr); ++ ++ if (can_no_dreval) { ++ dentry = br->br_path.dentry; ++ spin_lock(&dentry->d_lock); ++ if (dentry->d_flags & ++ (DCACHE_OP_REVALIDATE | DCACHE_OP_WEAK_REVALIDATE)) ++ can_no_dreval = 0; ++ spin_unlock(&dentry->d_lock); ++ } ++ ++ if (au_br_fhsm(br->br_perm)) { ++ fhsm++; ++ AuDebugOn(!br->br_fhsm); ++ } ++ ++ if (skip) ++ continue; ++ ++ hdir = au_hi(dir, bindex); ++ au_hn_inode_lock_nested(hdir, AuLsc_I_PARENT); ++ if (wbr) ++ wbr_wh_write_lock(wbr); ++ err = au_wh_init(br, sb); ++ if (wbr) ++ wbr_wh_write_unlock(wbr); ++ au_hn_inode_unlock(hdir); ++ ++ if (!err && do_free) { ++ au_kfree_rcu(wbr); ++ br->br_wbr = NULL; ++ } ++ } ++ ++ if (can_no_dreval) ++ au_fset_si(sbinfo, NO_DREVAL); ++ else ++ au_fclr_si(sbinfo, NO_DREVAL); ++ ++ if (fhsm >= 2) { ++ au_fset_si(sbinfo, FHSM); ++ for (bindex = bbot; bindex >= 0; bindex--) { ++ br = au_sbr(sb, bindex); ++ if (au_br_fhsm(br->br_perm)) { ++ au_fhsm_set_bottom(sb, bindex); ++ break; ++ } ++ } ++ } else { ++ au_fclr_si(sbinfo, FHSM); ++ au_fhsm_set_bottom(sb, -1); ++ } ++ ++ return err; ++} ++ ++int au_opts_mount(struct super_block *sb, struct au_opts *opts) ++{ ++ int err; ++ unsigned int tmp; ++ aufs_bindex_t bindex, bbot; ++ struct au_opt *opt; ++ struct au_opt_xino *opt_xino, xino; ++ struct au_sbinfo *sbinfo; ++ struct au_branch *br; ++ struct inode *dir; ++ ++ SiMustWriteLock(sb); ++ ++ err = 0; ++ opt_xino = NULL; ++ opt = opts->opt; ++ while (err >= 0 && opt->type != Opt_tail) ++ err = au_opt_simple(sb, opt++, opts); ++ if (err > 0) ++ err = 0; ++ else if (unlikely(err < 0)) ++ goto out; ++ ++ /* disable xino and udba temporary */ ++ sbinfo = au_sbi(sb); ++ tmp = sbinfo->si_mntflags; ++ au_opt_clr(sbinfo->si_mntflags, XINO); ++ au_opt_set_udba(sbinfo->si_mntflags, UDBA_REVAL); ++ ++ opt = opts->opt; ++ while (err >= 0 && opt->type != Opt_tail) ++ err = au_opt_br(sb, opt++, opts); ++ if (err > 0) ++ err = 0; ++ else if (unlikely(err < 0)) ++ goto out; ++ ++ bbot = au_sbbot(sb); ++ if (unlikely(bbot < 0)) { ++ err = -EINVAL; ++ pr_err("no branches\n"); ++ goto out; ++ } ++ ++ if (au_opt_test(tmp, XINO)) ++ au_opt_set(sbinfo->si_mntflags, XINO); ++ opt = opts->opt; ++ while (!err && opt->type != Opt_tail) ++ err = au_opt_xino(sb, opt++, &opt_xino, opts); ++ if (unlikely(err)) ++ goto out; ++ ++ err = au_opts_verify(sb, sb->s_flags, tmp); ++ if (unlikely(err)) ++ goto out; ++ ++ /* restore xino */ ++ if (au_opt_test(tmp, XINO) && !opt_xino) { ++ xino.file = au_xino_def(sb); ++ err = PTR_ERR(xino.file); ++ if (IS_ERR(xino.file)) ++ goto out; ++ ++ err = au_xino_set(sb, &xino, /*remount*/0); ++ fput(xino.file); ++ if (unlikely(err)) ++ goto out; ++ } ++ ++ /* restore udba */ ++ tmp &= AuOptMask_UDBA; ++ sbinfo->si_mntflags &= ~AuOptMask_UDBA; ++ sbinfo->si_mntflags |= tmp; ++ bbot = au_sbbot(sb); ++ for (bindex = 0; bindex <= bbot; bindex++) { ++ br = au_sbr(sb, bindex); ++ err = au_hnotify_reset_br(tmp, br, br->br_perm); ++ if (unlikely(err)) ++ AuIOErr("hnotify failed on br %d, %d, ignored\n", ++ bindex, err); ++ /* go on even if err */ ++ } ++ if (au_opt_test(tmp, UDBA_HNOTIFY)) { ++ dir = d_inode(sb->s_root); ++ au_hn_reset(dir, au_hi_flags(dir, /*isdir*/1) & ~AuHi_XINO); ++ } ++ ++out: ++ return err; ++} ++ ++int au_opts_remount(struct super_block *sb, struct au_opts *opts) ++{ ++ int err, rerr; ++ unsigned char no_dreval; ++ struct inode *dir; ++ struct au_opt_xino *opt_xino; ++ struct au_opt *opt; ++ struct au_sbinfo *sbinfo; ++ ++ SiMustWriteLock(sb); ++ ++ err = au_dr_opt_flush(sb); ++ if (unlikely(err)) ++ goto out; ++ au_fset_opts(opts->flags, DR_FLUSHED); ++ ++ dir = d_inode(sb->s_root); ++ sbinfo = au_sbi(sb); ++ opt_xino = NULL; ++ opt = opts->opt; ++ while (err >= 0 && opt->type != Opt_tail) { ++ err = au_opt_simple(sb, opt, opts); ++ if (!err) ++ err = au_opt_br(sb, opt, opts); ++ if (!err) ++ err = au_opt_xino(sb, opt, &opt_xino, opts); ++ opt++; ++ } ++ if (err > 0) ++ err = 0; ++ AuTraceErr(err); ++ /* go on even err */ ++ ++ no_dreval = !!au_ftest_si(sbinfo, NO_DREVAL); ++ rerr = au_opts_verify(sb, opts->sb_flags, /*pending*/0); ++ if (unlikely(rerr && !err)) ++ err = rerr; ++ ++ if (no_dreval != !!au_ftest_si(sbinfo, NO_DREVAL)) ++ au_fset_opts(opts->flags, REFRESH_IDOP); ++ ++ if (au_ftest_opts(opts->flags, TRUNC_XIB)) { ++ rerr = au_xib_trunc(sb); ++ if (unlikely(rerr && !err)) ++ err = rerr; ++ } ++ ++ /* will be handled by the caller */ ++ if (!au_ftest_opts(opts->flags, REFRESH) ++ && (opts->given_udba ++ || au_opt_test(sbinfo->si_mntflags, XINO) ++ || au_ftest_opts(opts->flags, REFRESH_IDOP) ++ )) ++ au_fset_opts(opts->flags, REFRESH); ++ ++ AuDbg("status 0x%x\n", opts->flags); ++ ++out: ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++unsigned int au_opt_udba(struct super_block *sb) ++{ ++ return au_mntflags(sb) & AuOptMask_UDBA; ++} +diff --git a/fs/aufs/opts.h b/fs/aufs/opts.h +new file mode 100644 +index 000000000000..d8bbdbf0560a +--- /dev/null ++++ b/fs/aufs/opts.h +@@ -0,0 +1,263 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * mount options/flags ++ */ ++ ++#ifndef __AUFS_OPTS_H__ ++#define __AUFS_OPTS_H__ ++ ++#ifdef __KERNEL__ ++ ++#include <linux/fs_parser.h> ++#include <linux/namei.h> ++#include <linux/path.h> ++ ++enum { ++ Opt_br, ++ Opt_add, Opt_del, Opt_mod, Opt_append, Opt_prepend, ++ Opt_idel, Opt_imod, ++ Opt_dirwh, Opt_rdcache, Opt_rdblk, Opt_rdhash, ++ Opt_xino, Opt_noxino, ++ Opt_trunc_xino, Opt_trunc_xino_v, ++ Opt_trunc_xino_path, Opt_itrunc_xino, ++ Opt_trunc_xib, ++ Opt_shwh, ++ Opt_plink, Opt_list_plink, ++ Opt_udba, ++ Opt_dio, ++ Opt_diropq, Opt_diropq_a, Opt_diropq_w, ++ Opt_warn_perm, ++ Opt_wbr_copyup, Opt_wbr_create, ++ Opt_fhsm_sec, ++ Opt_verbose, Opt_noverbose, ++ Opt_sum, Opt_wsum, ++ Opt_dirperm1, ++ Opt_dirren, ++ Opt_acl, ++ Opt_tail, Opt_ignore, Opt_ignore_silent, Opt_err ++}; ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* mount flags */ ++#define AuOpt_XINO 1 /* external inode number bitmap ++ and translation table */ ++#define AuOpt_TRUNC_XINO (1 << 1) /* truncate xino files */ ++#define AuOpt_UDBA_NONE (1 << 2) /* users direct branch access */ ++#define AuOpt_UDBA_REVAL (1 << 3) ++#define AuOpt_UDBA_HNOTIFY (1 << 4) ++#define AuOpt_SHWH (1 << 5) /* show whiteout */ ++#define AuOpt_PLINK (1 << 6) /* pseudo-link */ ++#define AuOpt_DIRPERM1 (1 << 7) /* ignore the lower dir's perm ++ bits */ ++#define AuOpt_ALWAYS_DIROPQ (1 << 9) /* policy to creating diropq */ ++#define AuOpt_SUM (1 << 10) /* summation for statfs(2) */ ++#define AuOpt_SUM_W (1 << 11) /* unimplemented */ ++#define AuOpt_WARN_PERM (1 << 12) /* warn when add-branch */ ++#define AuOpt_VERBOSE (1 << 13) /* print the cause of error */ ++#define AuOpt_DIO (1 << 14) /* direct io */ ++#define AuOpt_DIRREN (1 << 15) /* directory rename */ ++ ++#ifndef CONFIG_AUFS_HNOTIFY ++#undef AuOpt_UDBA_HNOTIFY ++#define AuOpt_UDBA_HNOTIFY 0 ++#endif ++#ifndef CONFIG_AUFS_DIRREN ++#undef AuOpt_DIRREN ++#define AuOpt_DIRREN 0 ++#endif ++#ifndef CONFIG_AUFS_SHWH ++#undef AuOpt_SHWH ++#define AuOpt_SHWH 0 ++#endif ++ ++#define AuOpt_Def (AuOpt_XINO \ ++ | AuOpt_UDBA_REVAL \ ++ | AuOpt_PLINK \ ++ /* | AuOpt_DIRPERM1 */ \ ++ | AuOpt_WARN_PERM) ++#define AuOptMask_UDBA (AuOpt_UDBA_NONE \ ++ | AuOpt_UDBA_REVAL \ ++ | AuOpt_UDBA_HNOTIFY) ++ ++#define AuOpt_LkupDirFlags (LOOKUP_FOLLOW | LOOKUP_DIRECTORY) ++ ++#define au_opt_test(flags, name) (flags & AuOpt_##name) ++#define au_opt_set(flags, name) do { \ ++ BUILD_BUG_ON(AuOpt_##name & AuOptMask_UDBA); \ ++ ((flags) |= AuOpt_##name); \ ++} while (0) ++#define au_opt_set_udba(flags, name) do { \ ++ (flags) &= ~AuOptMask_UDBA; \ ++ ((flags) |= AuOpt_##name); \ ++} while (0) ++#define au_opt_clr(flags, name) do { \ ++ ((flags) &= ~AuOpt_##name); \ ++} while (0) ++ ++static inline unsigned int au_opts_plink(unsigned int mntflags) ++{ ++#ifdef CONFIG_PROC_FS ++ return mntflags; ++#else ++ return mntflags & ~AuOpt_PLINK; ++#endif ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* policies to select one among multiple writable branches */ ++enum { ++ AuWbrCreate_TDP, /* top down parent */ ++ AuWbrCreate_RR, /* round robin */ ++ AuWbrCreate_MFS, /* most free space */ ++ AuWbrCreate_MFSV, /* mfs with seconds */ ++ AuWbrCreate_MFSRR, /* mfs then rr */ ++ AuWbrCreate_MFSRRV, /* mfs then rr with seconds */ ++ AuWbrCreate_TDMFS, /* top down regardless parent and mfs */ ++ AuWbrCreate_TDMFSV, /* top down regardless parent and mfs */ ++ AuWbrCreate_PMFS, /* parent and mfs */ ++ AuWbrCreate_PMFSV, /* parent and mfs with seconds */ ++ AuWbrCreate_PMFSRR, /* parent, mfs and round-robin */ ++ AuWbrCreate_PMFSRRV, /* plus seconds */ ++ ++ AuWbrCreate_Def = AuWbrCreate_TDP ++}; ++ ++enum { ++ AuWbrCopyup_TDP, /* top down parent */ ++ AuWbrCopyup_BUP, /* bottom up parent */ ++ AuWbrCopyup_BU, /* bottom up */ ++ ++ AuWbrCopyup_Def = AuWbrCopyup_TDP ++}; ++ ++/* ---------------------------------------------------------------------- */ ++ ++struct file; ++ ++struct au_opt_add { ++ aufs_bindex_t bindex; ++ char *pathname; ++ int perm; ++ struct path path; ++}; ++ ++struct au_opt_del { ++ char *pathname; ++ struct path h_path; ++}; ++ ++struct au_opt_mod { ++ char *path; ++ int perm; ++ struct dentry *h_root; ++}; ++ ++struct au_opt_xino { ++ char *path; ++ struct file *file; ++}; ++ ++struct au_opt_xino_itrunc { ++ aufs_bindex_t bindex; ++}; ++ ++struct au_opt_wbr_create { ++ int wbr_create; ++ int mfs_second; ++ unsigned long long mfsrr_watermark; ++}; ++ ++struct au_opt { ++ int type; ++ union { ++ struct au_opt_xino xino; ++ struct au_opt_xino_itrunc xino_itrunc; ++ struct au_opt_add add; ++ struct au_opt_del del; ++ struct au_opt_mod mod; ++ int dirwh; ++ int rdcache; ++ unsigned int rdblk; ++ unsigned int rdhash; ++ int udba; ++ struct au_opt_wbr_create wbr_create; ++ int wbr_copyup; ++ unsigned int fhsm_second; ++ bool tf; /* generic flag, true or false */ ++ }; ++}; ++ ++/* opts flags */ ++#define AuOpts_REMOUNT 1 ++#define AuOpts_REFRESH (1 << 1) ++#define AuOpts_TRUNC_XIB (1 << 2) ++#define AuOpts_REFRESH_DYAOP (1 << 3) ++#define AuOpts_REFRESH_IDOP (1 << 4) ++#define AuOpts_DR_FLUSHED (1 << 5) ++#define au_ftest_opts(flags, name) ((flags) & AuOpts_##name) ++#define au_fset_opts(flags, name) \ ++ do { (flags) |= AuOpts_##name; } while (0) ++#define au_fclr_opts(flags, name) \ ++ do { (flags) &= ~AuOpts_##name; } while (0) ++ ++#ifndef CONFIG_AUFS_DIRREN ++#undef AuOpts_DR_FLUSHED ++#define AuOpts_DR_FLUSHED 0 ++#endif ++ ++struct au_opts { ++ struct au_opt *opt; ++ int max_opt; ++ ++ unsigned int given_udba; ++ unsigned int flags; ++ unsigned long sb_flags; ++}; ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* opts.c */ ++int au_br_perm_val(char *perm); ++void au_optstr_br_perm(au_br_perm_str_t *str, int perm); ++int au_udba_val(char *str); ++const char *au_optstr_udba(int udba); ++int au_wbr_create_val(char *str, struct au_opt_wbr_create *create); ++const char *au_optstr_wbr_create(int wbr_create); ++int au_wbr_copyup_val(char *str); ++const char *au_optstr_wbr_copyup(int wbr_copyup); ++ ++int au_opt_add(struct au_opt *opt, char *opt_str, unsigned long sb_flags, ++ aufs_bindex_t bindex); ++struct super_block; ++int au_opts_verify(struct super_block *sb, unsigned long sb_flags, ++ unsigned int pending); ++int au_opts_mount(struct super_block *sb, struct au_opts *opts); ++int au_opts_remount(struct super_block *sb, struct au_opts *opts); ++ ++unsigned int au_opt_udba(struct super_block *sb); ++ ++/* fsctx.c */ ++int aufs_fsctx_init(struct fs_context *fc); ++extern const struct fs_parameter_spec aufs_fsctx_paramspec[]; ++ ++#endif /* __KERNEL__ */ ++#endif /* __AUFS_OPTS_H__ */ +diff --git a/fs/aufs/plink.c b/fs/aufs/plink.c +new file mode 100644 +index 000000000000..5f9a5b50dcc6 +--- /dev/null ++++ b/fs/aufs/plink.c +@@ -0,0 +1,516 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * pseudo-link ++ */ ++ ++#include "aufs.h" ++ ++/* ++ * the pseudo-link maintenance mode. ++ * during a user process maintains the pseudo-links, ++ * prohibit adding a new plink and branch manipulation. ++ * ++ * Flags ++ * NOPLM: ++ * For entry functions which will handle plink, and i_mutex is already held ++ * in VFS. ++ * They cannot wait and should return an error at once. ++ * Callers has to check the error. ++ * NOPLMW: ++ * For entry functions which will handle plink, but i_mutex is not held ++ * in VFS. ++ * They can wait the plink maintenance mode to finish. ++ * ++ * They behave like F_SETLK and F_SETLKW. ++ * If the caller never handle plink, then both flags are unnecessary. ++ */ ++ ++int au_plink_maint(struct super_block *sb, int flags) ++{ ++ int err; ++ pid_t pid, ppid; ++ struct task_struct *parent, *prev; ++ struct au_sbinfo *sbi; ++ ++ SiMustAnyLock(sb); ++ ++ err = 0; ++ if (!au_opt_test(au_mntflags(sb), PLINK)) ++ goto out; ++ ++ sbi = au_sbi(sb); ++ pid = sbi->si_plink_maint_pid; ++ if (!pid || pid == current->pid) ++ goto out; ++ ++ /* todo: it highly depends upon /sbin/mount.aufs */ ++ prev = NULL; ++ parent = current; ++ ppid = 0; ++ rcu_read_lock(); ++ while (1) { ++ parent = rcu_dereference(parent->real_parent); ++ if (parent == prev) ++ break; ++ ppid = task_pid_vnr(parent); ++ if (pid == ppid) { ++ rcu_read_unlock(); ++ goto out; ++ } ++ prev = parent; ++ } ++ rcu_read_unlock(); ++ ++ if (au_ftest_lock(flags, NOPLMW)) { ++ /* if there is no i_mutex lock in VFS, we don't need to wait */ ++ /* AuDebugOn(!lockdep_depth(current)); */ ++ while (sbi->si_plink_maint_pid) { ++ si_read_unlock(sb); ++ /* gave up wake_up_bit() */ ++ wait_event(sbi->si_plink_wq, !sbi->si_plink_maint_pid); ++ ++ if (au_ftest_lock(flags, FLUSH)) ++ au_nwt_flush(&sbi->si_nowait); ++ si_noflush_read_lock(sb); ++ } ++ } else if (au_ftest_lock(flags, NOPLM)) { ++ AuDbg("ppid %d, pid %d\n", ppid, pid); ++ err = -EAGAIN; ++ } ++ ++out: ++ return err; ++} ++ ++void au_plink_maint_leave(struct au_sbinfo *sbinfo) ++{ ++ spin_lock(&sbinfo->si_plink_maint_lock); ++ sbinfo->si_plink_maint_pid = 0; ++ spin_unlock(&sbinfo->si_plink_maint_lock); ++ wake_up_all(&sbinfo->si_plink_wq); ++} ++ ++int au_plink_maint_enter(struct super_block *sb) ++{ ++ int err; ++ struct au_sbinfo *sbinfo; ++ ++ err = 0; ++ sbinfo = au_sbi(sb); ++ /* make sure i am the only one in this fs */ ++ si_write_lock(sb, AuLock_FLUSH); ++ if (au_opt_test(au_mntflags(sb), PLINK)) { ++ spin_lock(&sbinfo->si_plink_maint_lock); ++ if (!sbinfo->si_plink_maint_pid) ++ sbinfo->si_plink_maint_pid = current->pid; ++ else ++ err = -EBUSY; ++ spin_unlock(&sbinfo->si_plink_maint_lock); ++ } ++ si_write_unlock(sb); ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++#ifdef CONFIG_AUFS_DEBUG ++void au_plink_list(struct super_block *sb) ++{ ++ int i; ++ struct au_sbinfo *sbinfo; ++ struct hlist_bl_head *hbl; ++ struct hlist_bl_node *pos; ++ struct au_icntnr *icntnr; ++ ++ SiMustAnyLock(sb); ++ ++ sbinfo = au_sbi(sb); ++ AuDebugOn(!au_opt_test(au_mntflags(sb), PLINK)); ++ AuDebugOn(au_plink_maint(sb, AuLock_NOPLM)); ++ ++ for (i = 0; i < AuPlink_NHASH; i++) { ++ hbl = sbinfo->si_plink + i; ++ hlist_bl_lock(hbl); ++ hlist_bl_for_each_entry(icntnr, pos, hbl, plink) ++ AuDbg("%lu\n", icntnr->vfs_inode.i_ino); ++ hlist_bl_unlock(hbl); ++ } ++} ++#endif ++ ++/* is the inode pseudo-linked? */ ++int au_plink_test(struct inode *inode) ++{ ++ int found, i; ++ struct au_sbinfo *sbinfo; ++ struct hlist_bl_head *hbl; ++ struct hlist_bl_node *pos; ++ struct au_icntnr *icntnr; ++ ++ sbinfo = au_sbi(inode->i_sb); ++ AuRwMustAnyLock(&sbinfo->si_rwsem); ++ AuDebugOn(!au_opt_test(au_mntflags(inode->i_sb), PLINK)); ++ AuDebugOn(au_plink_maint(inode->i_sb, AuLock_NOPLM)); ++ ++ found = 0; ++ i = au_plink_hash(inode->i_ino); ++ hbl = sbinfo->si_plink + i; ++ hlist_bl_lock(hbl); ++ hlist_bl_for_each_entry(icntnr, pos, hbl, plink) ++ if (&icntnr->vfs_inode == inode) { ++ found = 1; ++ break; ++ } ++ hlist_bl_unlock(hbl); ++ return found; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * generate a name for plink. ++ * the file will be stored under AUFS_WH_PLINKDIR. ++ */ ++/* 20 is max digits length of ulong 64 */ ++#define PLINK_NAME_LEN ((20 + 1) * 2) ++ ++static int plink_name(char *name, int len, struct inode *inode, ++ aufs_bindex_t bindex) ++{ ++ int rlen; ++ struct inode *h_inode; ++ ++ h_inode = au_h_iptr(inode, bindex); ++ rlen = snprintf(name, len, "%lu.%lu", inode->i_ino, h_inode->i_ino); ++ return rlen; ++} ++ ++struct au_do_plink_lkup_args { ++ struct dentry **errp; ++ struct qstr *tgtname; ++ struct path *h_ppath; ++}; ++ ++static struct dentry *au_do_plink_lkup(struct qstr *tgtname, ++ struct path *h_ppath) ++{ ++ struct dentry *h_dentry; ++ struct inode *h_inode; ++ ++ h_inode = d_inode(h_ppath->dentry); ++ inode_lock_shared_nested(h_inode, AuLsc_I_CHILD2); ++ h_dentry = vfsub_lkup_one(tgtname, h_ppath); ++ inode_unlock_shared(h_inode); ++ ++ return h_dentry; ++} ++ ++static void au_call_do_plink_lkup(void *args) ++{ ++ struct au_do_plink_lkup_args *a = args; ++ *a->errp = au_do_plink_lkup(a->tgtname, a->h_ppath); ++} ++ ++/* lookup the plink-ed @inode under the branch at @bindex */ ++struct dentry *au_plink_lkup(struct inode *inode, aufs_bindex_t bindex) ++{ ++ struct dentry *h_dentry; ++ struct au_branch *br; ++ struct path h_ppath; ++ int wkq_err; ++ char a[PLINK_NAME_LEN]; ++ struct qstr tgtname = QSTR_INIT(a, 0); ++ ++ AuDebugOn(au_plink_maint(inode->i_sb, AuLock_NOPLM)); ++ ++ br = au_sbr(inode->i_sb, bindex); ++ h_ppath.dentry = br->br_wbr->wbr_plink; ++ h_ppath.mnt = au_br_mnt(br); ++ tgtname.len = plink_name(a, sizeof(a), inode, bindex); ++ ++ if (!uid_eq(current_fsuid(), GLOBAL_ROOT_UID)) { ++ struct au_do_plink_lkup_args args = { ++ .errp = &h_dentry, ++ .tgtname = &tgtname, ++ .h_ppath = &h_ppath ++ }; ++ ++ wkq_err = au_wkq_wait(au_call_do_plink_lkup, &args); ++ if (unlikely(wkq_err)) ++ h_dentry = ERR_PTR(wkq_err); ++ } else ++ h_dentry = au_do_plink_lkup(&tgtname, &h_ppath); ++ ++ return h_dentry; ++} ++ ++/* create a pseudo-link */ ++static int do_whplink(struct qstr *tgt, struct path *h_ppath, ++ struct dentry *h_dentry) ++{ ++ int err; ++ struct path h_path; ++ struct inode *h_dir, *delegated; ++ ++ h_dir = d_inode(h_ppath->dentry); ++ inode_lock_nested(h_dir, AuLsc_I_CHILD2); ++ h_path.mnt = h_ppath->mnt; ++again: ++ h_path.dentry = vfsub_lkup_one(tgt, h_ppath); ++ err = PTR_ERR(h_path.dentry); ++ if (IS_ERR(h_path.dentry)) ++ goto out; ++ ++ err = 0; ++ /* wh.plink dir is not monitored */ ++ /* todo: is it really safe? */ ++ if (d_is_positive(h_path.dentry) ++ && d_inode(h_path.dentry) != d_inode(h_dentry)) { ++ delegated = NULL; ++ err = vfsub_unlink(h_dir, &h_path, &delegated, /*force*/0); ++ if (unlikely(err == -EWOULDBLOCK)) { ++ pr_warn("cannot retry for NFSv4 delegation" ++ " for an internal unlink\n"); ++ iput(delegated); ++ } ++ dput(h_path.dentry); ++ h_path.dentry = NULL; ++ if (!err) ++ goto again; ++ } ++ if (!err && d_is_negative(h_path.dentry)) { ++ delegated = NULL; ++ err = vfsub_link(h_dentry, h_dir, &h_path, &delegated); ++ if (unlikely(err == -EWOULDBLOCK)) { ++ pr_warn("cannot retry for NFSv4 delegation" ++ " for an internal link\n"); ++ iput(delegated); ++ } ++ } ++ dput(h_path.dentry); ++ ++out: ++ inode_unlock(h_dir); ++ return err; ++} ++ ++struct do_whplink_args { ++ int *errp; ++ struct qstr *tgt; ++ struct path *h_ppath; ++ struct dentry *h_dentry; ++}; ++ ++static void call_do_whplink(void *args) ++{ ++ struct do_whplink_args *a = args; ++ *a->errp = do_whplink(a->tgt, a->h_ppath, a->h_dentry); ++} ++ ++static int whplink(struct dentry *h_dentry, struct inode *inode, ++ aufs_bindex_t bindex) ++{ ++ int err, wkq_err; ++ struct au_branch *br; ++ struct au_wbr *wbr; ++ struct path h_ppath; ++ char a[PLINK_NAME_LEN]; ++ struct qstr tgtname = QSTR_INIT(a, 0); ++ ++ br = au_sbr(inode->i_sb, bindex); ++ wbr = br->br_wbr; ++ h_ppath.dentry = wbr->wbr_plink; ++ h_ppath.mnt = au_br_mnt(br); ++ tgtname.len = plink_name(a, sizeof(a), inode, bindex); ++ ++ /* always superio. */ ++ if (!uid_eq(current_fsuid(), GLOBAL_ROOT_UID)) { ++ struct do_whplink_args args = { ++ .errp = &err, ++ .tgt = &tgtname, ++ .h_ppath = &h_ppath, ++ .h_dentry = h_dentry ++ }; ++ wkq_err = au_wkq_wait(call_do_whplink, &args); ++ if (unlikely(wkq_err)) ++ err = wkq_err; ++ } else ++ err = do_whplink(&tgtname, &h_ppath, h_dentry); ++ ++ return err; ++} ++ ++/* ++ * create a new pseudo-link for @h_dentry on @bindex. ++ * the linked inode is held in aufs @inode. ++ */ ++void au_plink_append(struct inode *inode, aufs_bindex_t bindex, ++ struct dentry *h_dentry) ++{ ++ struct super_block *sb; ++ struct au_sbinfo *sbinfo; ++ struct hlist_bl_head *hbl; ++ struct hlist_bl_node *pos; ++ struct au_icntnr *icntnr; ++ int found, err, cnt, i; ++ ++ sb = inode->i_sb; ++ sbinfo = au_sbi(sb); ++ AuDebugOn(!au_opt_test(au_mntflags(sb), PLINK)); ++ AuDebugOn(au_plink_maint(sb, AuLock_NOPLM)); ++ ++ found = au_plink_test(inode); ++ if (found) ++ return; ++ ++ i = au_plink_hash(inode->i_ino); ++ hbl = sbinfo->si_plink + i; ++ au_igrab(inode); ++ ++ hlist_bl_lock(hbl); ++ hlist_bl_for_each_entry(icntnr, pos, hbl, plink) { ++ if (&icntnr->vfs_inode == inode) { ++ found = 1; ++ break; ++ } ++ } ++ if (!found) { ++ icntnr = container_of(inode, struct au_icntnr, vfs_inode); ++ hlist_bl_add_head(&icntnr->plink, hbl); ++ } ++ hlist_bl_unlock(hbl); ++ if (!found) { ++ cnt = au_hbl_count(hbl); ++#define msg "unexpectedly unbalanced or too many pseudo-links" ++ if (cnt > AUFS_PLINK_WARN) ++ AuWarn1(msg ", %d\n", cnt); ++#undef msg ++ err = whplink(h_dentry, inode, bindex); ++ if (unlikely(err)) { ++ pr_warn("err %d, damaged pseudo link.\n", err); ++ au_hbl_del(&icntnr->plink, hbl); ++ iput(&icntnr->vfs_inode); ++ } ++ } else ++ iput(&icntnr->vfs_inode); ++} ++ ++/* free all plinks */ ++void au_plink_put(struct super_block *sb, int verbose) ++{ ++ int i, warned; ++ struct au_sbinfo *sbinfo; ++ struct hlist_bl_head *hbl; ++ struct hlist_bl_node *pos, *tmp; ++ struct au_icntnr *icntnr; ++ ++ SiMustWriteLock(sb); ++ ++ sbinfo = au_sbi(sb); ++ AuDebugOn(!au_opt_test(au_mntflags(sb), PLINK)); ++ AuDebugOn(au_plink_maint(sb, AuLock_NOPLM)); ++ ++ /* no spin_lock since sbinfo is write-locked */ ++ warned = 0; ++ for (i = 0; i < AuPlink_NHASH; i++) { ++ hbl = sbinfo->si_plink + i; ++ if (!warned && verbose && !hlist_bl_empty(hbl)) { ++ pr_warn("pseudo-link is not flushed"); ++ warned = 1; ++ } ++ hlist_bl_for_each_entry_safe(icntnr, pos, tmp, hbl, plink) ++ iput(&icntnr->vfs_inode); ++ INIT_HLIST_BL_HEAD(hbl); ++ } ++} ++ ++void au_plink_clean(struct super_block *sb, int verbose) ++{ ++ struct dentry *root; ++ ++ root = sb->s_root; ++ aufs_write_lock(root); ++ if (au_opt_test(au_mntflags(sb), PLINK)) ++ au_plink_put(sb, verbose); ++ aufs_write_unlock(root); ++} ++ ++static int au_plink_do_half_refresh(struct inode *inode, aufs_bindex_t br_id) ++{ ++ int do_put; ++ aufs_bindex_t btop, bbot, bindex; ++ ++ do_put = 0; ++ btop = au_ibtop(inode); ++ bbot = au_ibbot(inode); ++ if (btop >= 0) { ++ for (bindex = btop; bindex <= bbot; bindex++) { ++ if (!au_h_iptr(inode, bindex) ++ || au_ii_br_id(inode, bindex) != br_id) ++ continue; ++ au_set_h_iptr(inode, bindex, NULL, 0); ++ do_put = 1; ++ break; ++ } ++ if (do_put) ++ for (bindex = btop; bindex <= bbot; bindex++) ++ if (au_h_iptr(inode, bindex)) { ++ do_put = 0; ++ break; ++ } ++ } else ++ do_put = 1; ++ ++ return do_put; ++} ++ ++/* free the plinks on a branch specified by @br_id */ ++void au_plink_half_refresh(struct super_block *sb, aufs_bindex_t br_id) ++{ ++ struct au_sbinfo *sbinfo; ++ struct hlist_bl_head *hbl; ++ struct hlist_bl_node *pos, *tmp; ++ struct au_icntnr *icntnr; ++ struct inode *inode; ++ int i, do_put; ++ ++ SiMustWriteLock(sb); ++ ++ sbinfo = au_sbi(sb); ++ AuDebugOn(!au_opt_test(au_mntflags(sb), PLINK)); ++ AuDebugOn(au_plink_maint(sb, AuLock_NOPLM)); ++ ++ /* no bit_lock since sbinfo is write-locked */ ++ for (i = 0; i < AuPlink_NHASH; i++) { ++ hbl = sbinfo->si_plink + i; ++ hlist_bl_for_each_entry_safe(icntnr, pos, tmp, hbl, plink) { ++ inode = au_igrab(&icntnr->vfs_inode); ++ ii_write_lock_child(inode); ++ do_put = au_plink_do_half_refresh(inode, br_id); ++ if (do_put) { ++ hlist_bl_del(&icntnr->plink); ++ iput(inode); ++ } ++ ii_write_unlock(inode); ++ iput(inode); ++ } ++ } ++} +diff --git a/fs/aufs/poll.c b/fs/aufs/poll.c +new file mode 100644 +index 000000000000..83defa454c8e +--- /dev/null ++++ b/fs/aufs/poll.c +@@ -0,0 +1,51 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * poll operation ++ * There is only one filesystem which implements ->poll operation, currently. ++ */ ++ ++#include "aufs.h" ++ ++__poll_t aufs_poll(struct file *file, struct poll_table_struct *pt) ++{ ++ __poll_t mask; ++ struct file *h_file; ++ struct super_block *sb; ++ ++ /* We should pretend an error happened. */ ++ mask = EPOLLERR /* | EPOLLIN | EPOLLOUT */; ++ sb = file->f_path.dentry->d_sb; ++ si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLMW); ++ ++ h_file = au_read_pre(file, /*keep_fi*/0, /*lsc*/0); ++ if (IS_ERR(h_file)) { ++ AuDbg("h_file %ld\n", PTR_ERR(h_file)); ++ goto out; ++ } ++ ++ mask = vfs_poll(h_file, pt); ++ fput(h_file); /* instead of au_read_post() */ ++ ++out: ++ si_read_unlock(sb); ++ if (mask & EPOLLERR) ++ AuDbg("mask 0x%x\n", mask); ++ return mask; ++} +diff --git a/fs/aufs/posix_acl.c b/fs/aufs/posix_acl.c +new file mode 100644 +index 000000000000..03742bcc6603 +--- /dev/null ++++ b/fs/aufs/posix_acl.c +@@ -0,0 +1,108 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2014-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * posix acl operations ++ */ ++ ++#include <linux/fs.h> ++#include "aufs.h" ++ ++struct posix_acl *aufs_get_inode_acl(struct inode *inode, int type, bool rcu) ++{ ++ struct posix_acl *acl; ++ int err; ++ aufs_bindex_t bindex; ++ struct inode *h_inode; ++ struct super_block *sb; ++ ++ acl = ERR_PTR(-ECHILD); ++ if (rcu) ++ goto out; ++ ++ acl = NULL; ++ sb = inode->i_sb; ++ si_read_lock(sb, AuLock_FLUSH); ++ ii_read_lock_child(inode); ++ if (!(sb->s_flags & SB_POSIXACL)) ++ goto unlock; ++ ++ bindex = au_ibtop(inode); ++ h_inode = au_h_iptr(inode, bindex); ++ if (unlikely(!h_inode ++ || ((h_inode->i_mode & S_IFMT) ++ != (inode->i_mode & S_IFMT)))) { ++ err = au_busy_or_stale(); ++ acl = ERR_PTR(err); ++ goto unlock; ++ } ++ ++ /* always topmost only */ ++ acl = get_inode_acl(h_inode, type); ++ if (IS_ERR(acl)) ++ forget_cached_acl(inode, type); ++ else ++ set_cached_acl(inode, type, acl); ++ ++unlock: ++ ii_read_unlock(inode); ++ si_read_unlock(sb); ++ ++out: ++ AuTraceErrPtr(acl); ++ return acl; ++} ++ ++struct posix_acl *aufs_get_acl(struct mnt_idmap *idmap, ++ struct dentry *dentry, int type) ++{ ++ struct posix_acl *acl; ++ struct inode *inode; ++ ++ inode = d_inode(dentry); ++ acl = aufs_get_inode_acl(inode, type, /*rcu*/false); ++ ++ return acl; ++} ++ ++int aufs_set_acl(struct mnt_idmap *idmap, struct dentry *dentry, ++ struct posix_acl *acl, int type) ++{ ++ int err; ++ ssize_t ssz; ++ struct inode *inode; ++ struct au_sxattr arg = { ++ .type = AU_ACL_SET, ++ .u.acl_set = { ++ .acl = acl, ++ .type = type ++ }, ++ }; ++ ++ inode = d_inode(dentry); ++ IMustLock(inode); ++ ++ ssz = au_sxattr(dentry, inode, &arg); ++ /* forget even it if succeeds since the branch might set differently */ ++ forget_cached_acl(inode, type); ++ err = ssz; ++ if (ssz >= 0) ++ err = 0; ++ ++ return err; ++} +diff --git a/fs/aufs/procfs.c b/fs/aufs/procfs.c +new file mode 100644 +index 000000000000..0fca104ac554 +--- /dev/null ++++ b/fs/aufs/procfs.c +@@ -0,0 +1,170 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2010-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * procfs interfaces ++ */ ++ ++#include <linux/proc_fs.h> ++#include "aufs.h" ++ ++static int au_procfs_plm_release(struct inode *inode, struct file *file) ++{ ++ struct au_sbinfo *sbinfo; ++ ++ sbinfo = file->private_data; ++ if (sbinfo) { ++ au_plink_maint_leave(sbinfo); ++ kobject_put(&sbinfo->si_kobj); ++ } ++ ++ return 0; ++} ++ ++static void au_procfs_plm_write_clean(struct file *file) ++{ ++ struct au_sbinfo *sbinfo; ++ ++ sbinfo = file->private_data; ++ if (sbinfo) ++ au_plink_clean(sbinfo->si_sb, /*verbose*/0); ++} ++ ++static int au_procfs_plm_write_si(struct file *file, unsigned long id) ++{ ++ int err; ++ struct super_block *sb; ++ struct au_sbinfo *sbinfo; ++ struct hlist_bl_node *pos; ++ ++ err = -EBUSY; ++ if (unlikely(file->private_data)) ++ goto out; ++ ++ sb = NULL; ++ /* don't use au_sbilist_lock() here */ ++ hlist_bl_lock(&au_sbilist); ++ hlist_bl_for_each_entry(sbinfo, pos, &au_sbilist, si_list) ++ if (id == sysaufs_si_id(sbinfo)) { ++ if (kobject_get_unless_zero(&sbinfo->si_kobj)) ++ sb = sbinfo->si_sb; ++ break; ++ } ++ hlist_bl_unlock(&au_sbilist); ++ ++ err = -EINVAL; ++ if (unlikely(!sb)) ++ goto out; ++ ++ err = au_plink_maint_enter(sb); ++ if (!err) ++ /* keep kobject_get() */ ++ file->private_data = sbinfo; ++ else ++ kobject_put(&sbinfo->si_kobj); ++out: ++ return err; ++} ++ ++/* ++ * Accept a valid "si=xxxx" only. ++ * Once it is accepted successfully, accept "clean" too. ++ */ ++static ssize_t au_procfs_plm_write(struct file *file, const char __user *ubuf, ++ size_t count, loff_t *ppos) ++{ ++ ssize_t err; ++ unsigned long id; ++ /* last newline is allowed */ ++ char buf[3 + sizeof(unsigned long) * 2 + 1]; ++ ++ err = -EACCES; ++ if (unlikely(!capable(CAP_SYS_ADMIN))) ++ goto out; ++ ++ err = -EINVAL; ++ if (unlikely(count > sizeof(buf))) ++ goto out; ++ ++ err = copy_from_user(buf, ubuf, count); ++ if (unlikely(err)) { ++ err = -EFAULT; ++ goto out; ++ } ++ buf[count] = 0; ++ ++ err = -EINVAL; ++ if (!strcmp("clean", buf)) { ++ au_procfs_plm_write_clean(file); ++ goto out_success; ++ } else if (unlikely(strncmp("si=", buf, 3))) ++ goto out; ++ ++ err = kstrtoul(buf + 3, 16, &id); ++ if (unlikely(err)) ++ goto out; ++ ++ err = au_procfs_plm_write_si(file, id); ++ if (unlikely(err)) ++ goto out; ++ ++out_success: ++ err = count; /* success */ ++out: ++ return err; ++} ++ ++static const struct proc_ops au_procfs_plm_op = { ++ .proc_write = au_procfs_plm_write, ++ .proc_release = au_procfs_plm_release ++}; ++ ++/* ---------------------------------------------------------------------- */ ++ ++static struct proc_dir_entry *au_procfs_dir; ++ ++void au_procfs_fin(void) ++{ ++ remove_proc_entry(AUFS_PLINK_MAINT_NAME, au_procfs_dir); ++ remove_proc_entry(AUFS_PLINK_MAINT_DIR, NULL); ++} ++ ++int __init au_procfs_init(void) ++{ ++ int err; ++ struct proc_dir_entry *entry; ++ ++ err = -ENOMEM; ++ au_procfs_dir = proc_mkdir(AUFS_PLINK_MAINT_DIR, NULL); ++ if (unlikely(!au_procfs_dir)) ++ goto out; ++ ++ entry = proc_create(AUFS_PLINK_MAINT_NAME, S_IFREG | 0200, ++ au_procfs_dir, &au_procfs_plm_op); ++ if (unlikely(!entry)) ++ goto out_dir; ++ ++ err = 0; ++ goto out; /* success */ ++ ++ ++out_dir: ++ remove_proc_entry(AUFS_PLINK_MAINT_DIR, NULL); ++out: ++ return err; ++} +diff --git a/fs/aufs/rdu.c b/fs/aufs/rdu.c +new file mode 100644 +index 000000000000..144251c02c3f +--- /dev/null ++++ b/fs/aufs/rdu.c +@@ -0,0 +1,384 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * readdir in userspace. ++ */ ++ ++#include <linux/compat.h> ++#include <linux/fs_stack.h> ++#include <linux/security.h> ++#include "aufs.h" ++ ++/* bits for struct aufs_rdu.flags */ ++#define AuRdu_CALLED 1 ++#define AuRdu_CONT (1 << 1) ++#define AuRdu_FULL (1 << 2) ++#define au_ftest_rdu(flags, name) ((flags) & AuRdu_##name) ++#define au_fset_rdu(flags, name) \ ++ do { (flags) |= AuRdu_##name; } while (0) ++#define au_fclr_rdu(flags, name) \ ++ do { (flags) &= ~AuRdu_##name; } while (0) ++ ++struct au_rdu_arg { ++ struct dir_context ctx; ++ struct aufs_rdu *rdu; ++ union au_rdu_ent_ul ent; ++ unsigned long end; ++ ++ struct super_block *sb; ++ int err; ++}; ++ ++static bool au_rdu_fill(struct dir_context *ctx, const char *name, int nlen, ++ loff_t offset, u64 h_ino, unsigned int d_type) ++{ ++ int err, len; ++ struct au_rdu_arg *arg = container_of(ctx, struct au_rdu_arg, ctx); ++ struct aufs_rdu *rdu = arg->rdu; ++ struct au_rdu_ent ent; ++ ++ err = 0; ++ arg->err = 0; ++ au_fset_rdu(rdu->cookie.flags, CALLED); ++ len = au_rdu_len(nlen); ++ if (arg->ent.ul + len < arg->end) { ++ ent.ino = h_ino; ++ ent.bindex = rdu->cookie.bindex; ++ ent.type = d_type; ++ ent.nlen = nlen; ++ if (unlikely(nlen > AUFS_MAX_NAMELEN)) ++ ent.type = DT_UNKNOWN; ++ ++ /* unnecessary to support mmap_sem since this is a dir */ ++ err = -EFAULT; ++ if (copy_to_user(arg->ent.e, &ent, sizeof(ent))) ++ goto out; ++ if (copy_to_user(arg->ent.e->name, name, nlen)) ++ goto out; ++ /* the terminating NULL */ ++ if (__put_user(0, arg->ent.e->name + nlen)) ++ goto out; ++ err = 0; ++ /* AuDbg("%p, %.*s\n", arg->ent.p, nlen, name); */ ++ arg->ent.ul += len; ++ rdu->rent++; ++ } else { ++ err = -EFAULT; ++ au_fset_rdu(rdu->cookie.flags, FULL); ++ rdu->full = 1; ++ rdu->tail = arg->ent; ++ } ++ ++out: ++ /* AuTraceErr(err); */ ++ return !err; ++} ++ ++static int au_rdu_do(struct file *h_file, struct au_rdu_arg *arg) ++{ ++ int err; ++ loff_t offset; ++ struct au_rdu_cookie *cookie = &arg->rdu->cookie; ++ ++ /* we don't have to care (FMODE_32BITHASH | FMODE_64BITHASH) for ext4 */ ++ offset = vfsub_llseek(h_file, cookie->h_pos, SEEK_SET); ++ err = offset; ++ if (unlikely(offset != cookie->h_pos)) ++ goto out; ++ ++ err = 0; ++ do { ++ arg->err = 0; ++ au_fclr_rdu(cookie->flags, CALLED); ++ /* smp_mb(); */ ++ err = vfsub_iterate_dir(h_file, &arg->ctx); ++ if (err >= 0) ++ err = arg->err; ++ } while (!err ++ && au_ftest_rdu(cookie->flags, CALLED) ++ && !au_ftest_rdu(cookie->flags, FULL)); ++ cookie->h_pos = h_file->f_pos; ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++static int au_rdu(struct file *file, struct aufs_rdu *rdu) ++{ ++ int err; ++ aufs_bindex_t bbot; ++ struct au_rdu_arg arg = { ++ .ctx = { ++ .actor = au_rdu_fill ++ } ++ }; ++ struct dentry *dentry; ++ struct inode *inode; ++ struct file *h_file; ++ struct au_rdu_cookie *cookie = &rdu->cookie; ++ ++ /* VERIFY_WRITE */ ++ err = !access_ok(rdu->ent.e, rdu->sz); ++ if (unlikely(err)) { ++ err = -EFAULT; ++ AuTraceErr(err); ++ goto out; ++ } ++ rdu->rent = 0; ++ rdu->tail = rdu->ent; ++ rdu->full = 0; ++ arg.rdu = rdu; ++ arg.ent = rdu->ent; ++ arg.end = arg.ent.ul; ++ arg.end += rdu->sz; ++ ++ err = -ENOTDIR; ++ if (unlikely(!file->f_op->iterate_shared)) ++ goto out; ++ ++ err = security_file_permission(file, MAY_READ); ++ AuTraceErr(err); ++ if (unlikely(err)) ++ goto out; ++ ++ dentry = file->f_path.dentry; ++ inode = d_inode(dentry); ++ inode_lock_shared(inode); ++ ++ arg.sb = inode->i_sb; ++ err = si_read_lock(arg.sb, AuLock_FLUSH | AuLock_NOPLM); ++ if (unlikely(err)) ++ goto out_mtx; ++ err = au_alive_dir(dentry); ++ if (unlikely(err)) ++ goto out_si; ++ /* todo: reval? */ ++ fi_read_lock(file); ++ ++ err = -EAGAIN; ++ if (unlikely(au_ftest_rdu(cookie->flags, CONT) ++ && cookie->generation != au_figen(file))) ++ goto out_unlock; ++ ++ err = 0; ++ if (!rdu->blk) { ++ rdu->blk = au_sbi(arg.sb)->si_rdblk; ++ if (!rdu->blk) ++ rdu->blk = au_dir_size(file, /*dentry*/NULL); ++ } ++ bbot = au_fbtop(file); ++ if (cookie->bindex < bbot) ++ cookie->bindex = bbot; ++ bbot = au_fbbot_dir(file); ++ /* AuDbg("b%d, b%d\n", cookie->bindex, bbot); */ ++ for (; !err && cookie->bindex <= bbot; ++ cookie->bindex++, cookie->h_pos = 0) { ++ h_file = au_hf_dir(file, cookie->bindex); ++ if (!h_file) ++ continue; ++ ++ au_fclr_rdu(cookie->flags, FULL); ++ err = au_rdu_do(h_file, &arg); ++ AuTraceErr(err); ++ if (unlikely(au_ftest_rdu(cookie->flags, FULL) || err)) ++ break; ++ } ++ AuDbg("rent %llu\n", rdu->rent); ++ ++ if (!err && !au_ftest_rdu(cookie->flags, CONT)) { ++ rdu->shwh = !!au_opt_test(au_sbi(arg.sb)->si_mntflags, SHWH); ++ au_fset_rdu(cookie->flags, CONT); ++ cookie->generation = au_figen(file); ++ } ++ ++ ii_read_lock_child(inode); ++ fsstack_copy_attr_atime(inode, au_h_iptr(inode, au_ibtop(inode))); ++ ii_read_unlock(inode); ++ ++out_unlock: ++ fi_read_unlock(file); ++out_si: ++ si_read_unlock(arg.sb); ++out_mtx: ++ inode_unlock_shared(inode); ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++static int au_rdu_ino(struct file *file, struct aufs_rdu *rdu) ++{ ++ int err; ++ ino_t ino; ++ unsigned long long nent; ++ union au_rdu_ent_ul *u; ++ struct au_rdu_ent ent; ++ struct super_block *sb; ++ ++ err = 0; ++ nent = rdu->nent; ++ u = &rdu->ent; ++ sb = file->f_path.dentry->d_sb; ++ si_read_lock(sb, AuLock_FLUSH); ++ while (nent-- > 0) { ++ /* unnecessary to support mmap_sem since this is a dir */ ++ err = copy_from_user(&ent, u->e, sizeof(ent)); ++ if (!err) ++ /* VERIFY_WRITE */ ++ err = !access_ok(&u->e->ino, sizeof(ino)); ++ if (unlikely(err)) { ++ err = -EFAULT; ++ AuTraceErr(err); ++ break; ++ } ++ ++ /* AuDbg("b%d, i%llu\n", ent.bindex, ent.ino); */ ++ if (!ent.wh) ++ err = au_ino(sb, ent.bindex, ent.ino, ent.type, &ino); ++ else ++ err = au_wh_ino(sb, ent.bindex, ent.ino, ent.type, ++ &ino); ++ if (unlikely(err)) { ++ AuTraceErr(err); ++ break; ++ } ++ ++ err = __put_user(ino, &u->e->ino); ++ if (unlikely(err)) { ++ err = -EFAULT; ++ AuTraceErr(err); ++ break; ++ } ++ u->ul += au_rdu_len(ent.nlen); ++ } ++ si_read_unlock(sb); ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int au_rdu_verify(struct aufs_rdu *rdu) ++{ ++ AuDbg("rdu{%llu, %p, %u | %u | %llu, %u, %u | " ++ "%llu, b%d, 0x%x, g%u}\n", ++ rdu->sz, rdu->ent.e, rdu->verify[AufsCtlRduV_SZ], ++ rdu->blk, ++ rdu->rent, rdu->shwh, rdu->full, ++ rdu->cookie.h_pos, rdu->cookie.bindex, rdu->cookie.flags, ++ rdu->cookie.generation); ++ ++ if (rdu->verify[AufsCtlRduV_SZ] == sizeof(*rdu)) ++ return 0; ++ ++ AuDbg("%u:%u\n", ++ rdu->verify[AufsCtlRduV_SZ], (unsigned int)sizeof(*rdu)); ++ return -EINVAL; ++} ++ ++long au_rdu_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ++{ ++ long err, e; ++ struct aufs_rdu rdu; ++ void __user *p = (void __user *)arg; ++ ++ err = copy_from_user(&rdu, p, sizeof(rdu)); ++ if (unlikely(err)) { ++ err = -EFAULT; ++ AuTraceErr(err); ++ goto out; ++ } ++ err = au_rdu_verify(&rdu); ++ if (unlikely(err)) ++ goto out; ++ ++ switch (cmd) { ++ case AUFS_CTL_RDU: ++ err = au_rdu(file, &rdu); ++ if (unlikely(err)) ++ break; ++ ++ e = copy_to_user(p, &rdu, sizeof(rdu)); ++ if (unlikely(e)) { ++ err = -EFAULT; ++ AuTraceErr(err); ++ } ++ break; ++ case AUFS_CTL_RDU_INO: ++ err = au_rdu_ino(file, &rdu); ++ break; ++ ++ default: ++ /* err = -ENOTTY; */ ++ err = -EINVAL; ++ } ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++#ifdef CONFIG_COMPAT ++long au_rdu_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg) ++{ ++ long err, e; ++ struct aufs_rdu rdu; ++ void __user *p = compat_ptr(arg); ++ ++ /* todo: get_user()? */ ++ err = copy_from_user(&rdu, p, sizeof(rdu)); ++ if (unlikely(err)) { ++ err = -EFAULT; ++ AuTraceErr(err); ++ goto out; ++ } ++ rdu.ent.e = compat_ptr(rdu.ent.ul); ++ err = au_rdu_verify(&rdu); ++ if (unlikely(err)) ++ goto out; ++ ++ switch (cmd) { ++ case AUFS_CTL_RDU: ++ err = au_rdu(file, &rdu); ++ if (unlikely(err)) ++ break; ++ ++ rdu.ent.ul = ptr_to_compat(rdu.ent.e); ++ rdu.tail.ul = ptr_to_compat(rdu.tail.e); ++ e = copy_to_user(p, &rdu, sizeof(rdu)); ++ if (unlikely(e)) { ++ err = -EFAULT; ++ AuTraceErr(err); ++ } ++ break; ++ case AUFS_CTL_RDU_INO: ++ err = au_rdu_ino(file, &rdu); ++ break; ++ ++ default: ++ /* err = -ENOTTY; */ ++ err = -EINVAL; ++ } ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++#endif +diff --git a/fs/aufs/rwsem.h b/fs/aufs/rwsem.h +new file mode 100644 +index 000000000000..9d9cd50ef155 +--- /dev/null ++++ b/fs/aufs/rwsem.h +@@ -0,0 +1,85 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * simple read-write semaphore wrappers ++ */ ++ ++#ifndef __AUFS_RWSEM_H__ ++#define __AUFS_RWSEM_H__ ++ ++#ifdef __KERNEL__ ++ ++#include "debug.h" ++ ++/* in the future, the name 'au_rwsem' will be totally gone */ ++#define au_rwsem rw_semaphore ++ ++/* to debug easier, do not make them inlined functions */ ++#define AuRwMustNoWaiters(rw) AuDebugOn(rwsem_is_contended(rw)) ++ ++#ifdef CONFIG_LOCKDEP ++/* rwsem_is_locked() is unusable */ ++#define AuRwMustReadLock(rw) AuDebugOn(IS_ENABLED(CONFIG_LOCKDEP) \ ++ && !lockdep_recursing(current) \ ++ && debug_locks \ ++ && !lockdep_is_held_type(rw, 1)) ++#define AuRwMustWriteLock(rw) AuDebugOn(IS_ENABLED(CONFIG_LOCKDEP) \ ++ && !lockdep_recursing(current) \ ++ && debug_locks \ ++ && !lockdep_is_held_type(rw, 0)) ++#define AuRwMustAnyLock(rw) AuDebugOn(IS_ENABLED(CONFIG_LOCKDEP) \ ++ && !lockdep_recursing(current) \ ++ && debug_locks \ ++ && !lockdep_is_held(rw)) ++#define AuRwDestroy(rw) AuDebugOn(IS_ENABLED(CONFIG_LOCKDEP) \ ++ && !lockdep_recursing(current) \ ++ && debug_locks \ ++ && lockdep_is_held(rw)) ++#else ++#define AuRwMustReadLock(rw) do {} while (0) ++#define AuRwMustWriteLock(rw) do {} while (0) ++#define AuRwMustAnyLock(rw) do {} while (0) ++#define AuRwDestroy(rw) do {} while (0) ++#endif ++ ++#define au_rw_init(rw) init_rwsem(rw) ++ ++#define au_rw_init_wlock(rw) do { \ ++ au_rw_init(rw); \ ++ down_write(rw); \ ++ } while (0) ++ ++#define au_rw_init_wlock_nested(rw, lsc) do { \ ++ au_rw_init(rw); \ ++ down_write_nested(rw, lsc); \ ++ } while (0) ++ ++#define au_rw_read_lock(rw) down_read(rw) ++#define au_rw_read_lock_nested(rw, lsc) down_read_nested(rw, lsc) ++#define au_rw_read_unlock(rw) up_read(rw) ++#define au_rw_dgrade_lock(rw) downgrade_write(rw) ++#define au_rw_write_lock(rw) down_write(rw) ++#define au_rw_write_lock_nested(rw, lsc) down_write_nested(rw, lsc) ++#define au_rw_write_unlock(rw) up_write(rw) ++/* why is not _nested version defined? */ ++#define au_rw_read_trylock(rw) down_read_trylock(rw) ++#define au_rw_write_trylock(rw) down_write_trylock(rw) ++ ++#endif /* __KERNEL__ */ ++#endif /* __AUFS_RWSEM_H__ */ +diff --git a/fs/aufs/sbinfo.c b/fs/aufs/sbinfo.c +new file mode 100644 +index 000000000000..dde9f9c17b18 +--- /dev/null ++++ b/fs/aufs/sbinfo.c +@@ -0,0 +1,316 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * superblock private data ++ */ ++ ++#include <linux/iversion.h> ++#include "aufs.h" ++ ++/* ++ * they are necessary regardless sysfs is disabled. ++ */ ++void au_si_free(struct kobject *kobj) ++{ ++ int i; ++ struct au_sbinfo *sbinfo; ++ char *locked __maybe_unused; /* debug only */ ++ ++ sbinfo = container_of(kobj, struct au_sbinfo, si_kobj); ++ for (i = 0; i < AuPlink_NHASH; i++) ++ AuDebugOn(!hlist_bl_empty(sbinfo->si_plink + i)); ++ AuDebugOn(atomic_read(&sbinfo->si_nowait.nw_len)); ++ ++ AuLCntZero(au_lcnt_read(&sbinfo->si_ninodes, /*do_rev*/0)); ++ au_lcnt_fin(&sbinfo->si_ninodes, /*do_sync*/0); ++ AuLCntZero(au_lcnt_read(&sbinfo->si_nfiles, /*do_rev*/0)); ++ au_lcnt_fin(&sbinfo->si_nfiles, /*do_sync*/0); ++ ++ dbgaufs_si_fin(sbinfo); ++ au_rw_write_lock(&sbinfo->si_rwsem); ++ au_br_free(sbinfo); ++ au_rw_write_unlock(&sbinfo->si_rwsem); ++ ++ au_kfree_try_rcu(sbinfo->si_branch); ++ mutex_destroy(&sbinfo->si_xib_mtx); ++ AuRwDestroy(&sbinfo->si_rwsem); ++ ++ au_lcnt_wait_for_fin(&sbinfo->si_ninodes); ++ /* si_nfiles is waited too */ ++ au_kfree_rcu(sbinfo); ++} ++ ++struct au_sbinfo *au_si_alloc(struct super_block *sb) ++{ ++ struct au_sbinfo *sbinfo; ++ int err, i; ++ ++ err = -ENOMEM; ++ sbinfo = kzalloc(sizeof(*sbinfo), GFP_NOFS); ++ if (unlikely(!sbinfo)) ++ goto out; ++ ++ /* will be reallocated separately */ ++ sbinfo->si_branch = kzalloc(sizeof(*sbinfo->si_branch), GFP_NOFS); ++ if (unlikely(!sbinfo->si_branch)) ++ goto out_sbinfo; ++ ++ err = sysaufs_si_init(sbinfo); ++ if (!err) { ++ dbgaufs_si_null(sbinfo); ++ err = dbgaufs_si_init(sbinfo); ++ if (unlikely(err)) ++ kobject_put(&sbinfo->si_kobj); ++ } ++ if (unlikely(err)) ++ goto out_br; ++ ++ au_nwt_init(&sbinfo->si_nowait); ++ au_rw_init_wlock(&sbinfo->si_rwsem); ++ ++ au_lcnt_init(&sbinfo->si_ninodes, /*release*/NULL); ++ au_lcnt_init(&sbinfo->si_nfiles, /*release*/NULL); ++ ++ sbinfo->si_bbot = -1; ++ sbinfo->si_last_br_id = AUFS_BRANCH_MAX / 2; ++ ++ sbinfo->si_wbr_copyup = AuWbrCopyup_Def; ++ sbinfo->si_wbr_create = AuWbrCreate_Def; ++ sbinfo->si_wbr_copyup_ops = au_wbr_copyup_ops + sbinfo->si_wbr_copyup; ++ sbinfo->si_wbr_create_ops = au_wbr_create_ops + sbinfo->si_wbr_create; ++ ++ au_fhsm_init(sbinfo); ++ ++ sbinfo->si_mntflags = au_opts_plink(AuOpt_Def); ++ ++ sbinfo->si_xino_jiffy = jiffies; ++ sbinfo->si_xino_expire ++ = msecs_to_jiffies(AUFS_XINO_DEF_SEC * MSEC_PER_SEC); ++ mutex_init(&sbinfo->si_xib_mtx); ++ /* leave si_xib_last_pindex and si_xib_next_bit */ ++ ++ INIT_HLIST_BL_HEAD(&sbinfo->si_aopen); ++ ++ sbinfo->si_rdcache = msecs_to_jiffies(AUFS_RDCACHE_DEF * MSEC_PER_SEC); ++ sbinfo->si_rdblk = AUFS_RDBLK_DEF; ++ sbinfo->si_rdhash = AUFS_RDHASH_DEF; ++ sbinfo->si_dirwh = AUFS_DIRWH_DEF; ++ ++ for (i = 0; i < AuPlink_NHASH; i++) ++ INIT_HLIST_BL_HEAD(sbinfo->si_plink + i); ++ init_waitqueue_head(&sbinfo->si_plink_wq); ++ spin_lock_init(&sbinfo->si_plink_maint_lock); ++ ++ INIT_HLIST_BL_HEAD(&sbinfo->si_files); ++ ++ /* with getattr by default */ ++ sbinfo->si_iop_array = aufs_iop; ++ ++ /* leave other members for sysaufs and si_mnt. */ ++ sbinfo->si_sb = sb; ++ if (sb) { ++ sb->s_fs_info = sbinfo; ++ si_pid_set(sb); ++ } ++ return sbinfo; /* success */ ++ ++out_br: ++ au_kfree_try_rcu(sbinfo->si_branch); ++out_sbinfo: ++ au_kfree_rcu(sbinfo); ++out: ++ return ERR_PTR(err); ++} ++ ++int au_sbr_realloc(struct au_sbinfo *sbinfo, int nbr, int may_shrink) ++{ ++ int err, sz; ++ struct au_branch **brp; ++ ++ AuRwMustWriteLock(&sbinfo->si_rwsem); ++ ++ err = -ENOMEM; ++ sz = sizeof(*brp) * (sbinfo->si_bbot + 1); ++ if (unlikely(!sz)) ++ sz = sizeof(*brp); ++ brp = au_kzrealloc(sbinfo->si_branch, sz, sizeof(*brp) * nbr, GFP_NOFS, ++ may_shrink); ++ if (brp) { ++ sbinfo->si_branch = brp; ++ err = 0; ++ } ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++unsigned int au_sigen_inc(struct super_block *sb) ++{ ++ unsigned int gen; ++ struct inode *inode; ++ ++ SiMustWriteLock(sb); ++ ++ gen = ++au_sbi(sb)->si_generation; ++ au_update_digen(sb->s_root); ++ inode = d_inode(sb->s_root); ++ au_update_iigen(inode, /*half*/0); ++ inode_inc_iversion(inode); ++ return gen; ++} ++ ++aufs_bindex_t au_new_br_id(struct super_block *sb) ++{ ++ aufs_bindex_t br_id; ++ int i; ++ struct au_sbinfo *sbinfo; ++ ++ SiMustWriteLock(sb); ++ ++ sbinfo = au_sbi(sb); ++ for (i = 0; i <= AUFS_BRANCH_MAX; i++) { ++ br_id = ++sbinfo->si_last_br_id; ++ AuDebugOn(br_id < 0); ++ if (br_id && au_br_index(sb, br_id) < 0) ++ return br_id; ++ } ++ ++ return -1; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* it is ok that new 'nwt' tasks are appended while we are sleeping */ ++int si_read_lock(struct super_block *sb, int flags) ++{ ++ int err; ++ ++ err = 0; ++ if (au_ftest_lock(flags, FLUSH)) ++ au_nwt_flush(&au_sbi(sb)->si_nowait); ++ ++ si_noflush_read_lock(sb); ++ err = au_plink_maint(sb, flags); ++ if (unlikely(err)) ++ si_read_unlock(sb); ++ ++ return err; ++} ++ ++int si_write_lock(struct super_block *sb, int flags) ++{ ++ int err; ++ ++ if (au_ftest_lock(flags, FLUSH)) ++ au_nwt_flush(&au_sbi(sb)->si_nowait); ++ ++ si_noflush_write_lock(sb); ++ err = au_plink_maint(sb, flags); ++ if (unlikely(err)) ++ si_write_unlock(sb); ++ ++ return err; ++} ++ ++/* dentry and super_block lock. call at entry point */ ++int aufs_read_lock(struct dentry *dentry, int flags) ++{ ++ int err; ++ struct super_block *sb; ++ ++ sb = dentry->d_sb; ++ err = si_read_lock(sb, flags); ++ if (unlikely(err)) ++ goto out; ++ ++ if (au_ftest_lock(flags, DW)) ++ di_write_lock_child(dentry); ++ else ++ di_read_lock_child(dentry, flags); ++ ++ if (au_ftest_lock(flags, GEN)) { ++ err = au_digen_test(dentry, au_sigen(sb)); ++ if (!au_opt_test(au_mntflags(sb), UDBA_NONE)) ++ AuDebugOn(!err && au_dbrange_test(dentry)); ++ else if (!err) ++ err = au_dbrange_test(dentry); ++ if (unlikely(err)) ++ aufs_read_unlock(dentry, flags); ++ } ++ ++out: ++ return err; ++} ++ ++void aufs_read_unlock(struct dentry *dentry, int flags) ++{ ++ if (au_ftest_lock(flags, DW)) ++ di_write_unlock(dentry); ++ else ++ di_read_unlock(dentry, flags); ++ si_read_unlock(dentry->d_sb); ++} ++ ++void aufs_write_lock(struct dentry *dentry) ++{ ++ si_write_lock(dentry->d_sb, AuLock_FLUSH | AuLock_NOPLMW); ++ di_write_lock_child(dentry); ++} ++ ++void aufs_write_unlock(struct dentry *dentry) ++{ ++ di_write_unlock(dentry); ++ si_write_unlock(dentry->d_sb); ++} ++ ++int aufs_read_and_write_lock2(struct dentry *d1, struct dentry *d2, int flags) ++{ ++ int err; ++ unsigned int sigen; ++ struct super_block *sb; ++ ++ sb = d1->d_sb; ++ err = si_read_lock(sb, flags); ++ if (unlikely(err)) ++ goto out; ++ ++ di_write_lock2_child(d1, d2, au_ftest_lock(flags, DIRS)); ++ ++ if (au_ftest_lock(flags, GEN)) { ++ sigen = au_sigen(sb); ++ err = au_digen_test(d1, sigen); ++ AuDebugOn(!err && au_dbrange_test(d1)); ++ if (!err) { ++ err = au_digen_test(d2, sigen); ++ AuDebugOn(!err && au_dbrange_test(d2)); ++ } ++ if (unlikely(err)) ++ aufs_read_and_write_unlock2(d1, d2); ++ } ++ ++out: ++ return err; ++} ++ ++void aufs_read_and_write_unlock2(struct dentry *d1, struct dentry *d2) ++{ ++ di_write_unlock2(d1, d2); ++ si_read_unlock(d1->d_sb); ++} +diff --git a/fs/aufs/super.c b/fs/aufs/super.c +new file mode 100644 +index 000000000000..77c6d90808bb +--- /dev/null ++++ b/fs/aufs/super.c +@@ -0,0 +1,871 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * mount and super_block operations ++ */ ++ ++#include <linux/iversion.h> ++#include <linux/mm.h> ++#include <linux/seq_file.h> ++#include <linux/statfs.h> ++#include <linux/vmalloc.h> ++#include "aufs.h" ++ ++/* ++ * super_operations ++ */ ++static struct inode *aufs_alloc_inode(struct super_block *sb __maybe_unused) ++{ ++ struct au_icntnr *c; ++ ++ c = au_cache_alloc_icntnr(sb); ++ if (c) { ++ au_icntnr_init(c); ++ inode_set_iversion(&c->vfs_inode, 1); /* sigen(sb); */ ++ c->iinfo.ii_hinode = NULL; ++ return &c->vfs_inode; ++ } ++ return NULL; ++} ++ ++static void aufs_destroy_inode(struct inode *inode) ++{ ++ if (!au_is_bad_inode(inode)) ++ au_iinfo_fin(inode); ++} ++ ++static void aufs_free_inode(struct inode *inode) ++{ ++ au_cache_free_icntnr(container_of(inode, struct au_icntnr, vfs_inode)); ++} ++ ++struct inode *au_iget_locked(struct super_block *sb, ino_t ino) ++{ ++ struct inode *inode; ++ int err; ++ ++ inode = iget_locked(sb, ino); ++ if (unlikely(!inode)) { ++ inode = ERR_PTR(-ENOMEM); ++ goto out; ++ } ++ if (!(inode->i_state & I_NEW)) ++ goto out; ++ ++ err = au_xigen_new(inode); ++ if (!err) ++ err = au_iinfo_init(inode); ++ if (!err) ++ inode_inc_iversion(inode); ++ else { ++ iget_failed(inode); ++ inode = ERR_PTR(err); ++ } ++ ++out: ++ /* never return NULL */ ++ AuDebugOn(!inode); ++ AuTraceErrPtr(inode); ++ return inode; ++} ++ ++/* lock free root dinfo */ ++static int au_show_brs(struct seq_file *seq, struct super_block *sb) ++{ ++ int err; ++ aufs_bindex_t bindex, bbot; ++ struct path path; ++ struct au_hdentry *hdp; ++ struct au_branch *br; ++ au_br_perm_str_t perm; ++ ++ err = 0; ++ bbot = au_sbbot(sb); ++ bindex = 0; ++ hdp = au_hdentry(au_di(sb->s_root), bindex); ++ for (; !err && bindex <= bbot; bindex++, hdp++) { ++ br = au_sbr(sb, bindex); ++ path.mnt = au_br_mnt(br); ++ path.dentry = hdp->hd_dentry; ++ err = au_seq_path(seq, &path); ++ if (!err) { ++ au_optstr_br_perm(&perm, br->br_perm); ++ seq_printf(seq, "=%s", perm.a); ++ if (bindex != bbot) ++ seq_putc(seq, ':'); ++ } ++ } ++ if (unlikely(err || seq_has_overflowed(seq))) ++ err = -E2BIG; ++ ++ return err; ++} ++ ++static void au_gen_fmt(char *fmt, int len, const char *pat, ++ const char *append) ++{ ++ char *p; ++ ++ p = fmt; ++ while (*pat != ':') ++ *p++ = *pat++; ++ *p++ = *pat++; ++ strscpy(p, append, len - (p - fmt)); ++ AuDebugOn(strlen(fmt) >= len); ++} ++ ++static void au_show_wbr_create(struct seq_file *m, int v, ++ struct au_sbinfo *sbinfo) ++{ ++ const char *pat; ++ char fmt[32]; ++ struct au_wbr_mfs *mfs; ++ ++ AuRwMustAnyLock(&sbinfo->si_rwsem); ++ ++ seq_puts(m, ",create="); ++ pat = au_optstr_wbr_create(v); ++ mfs = &sbinfo->si_wbr_mfs; ++ switch (v) { ++ case AuWbrCreate_TDP: ++ case AuWbrCreate_RR: ++ case AuWbrCreate_MFS: ++ case AuWbrCreate_PMFS: ++ seq_puts(m, pat); ++ break; ++ case AuWbrCreate_MFSRR: ++ case AuWbrCreate_TDMFS: ++ case AuWbrCreate_PMFSRR: ++ au_gen_fmt(fmt, sizeof(fmt), pat, "%llu"); ++ seq_printf(m, fmt, mfs->mfsrr_watermark); ++ break; ++ case AuWbrCreate_MFSV: ++ case AuWbrCreate_PMFSV: ++ au_gen_fmt(fmt, sizeof(fmt), pat, "%lu"); ++ seq_printf(m, fmt, ++ jiffies_to_msecs(mfs->mfs_expire) ++ / MSEC_PER_SEC); ++ break; ++ case AuWbrCreate_MFSRRV: ++ case AuWbrCreate_TDMFSV: ++ case AuWbrCreate_PMFSRRV: ++ au_gen_fmt(fmt, sizeof(fmt), pat, "%llu:%lu"); ++ seq_printf(m, fmt, mfs->mfsrr_watermark, ++ jiffies_to_msecs(mfs->mfs_expire) / MSEC_PER_SEC); ++ break; ++ default: ++ BUG(); ++ } ++} ++ ++static int au_show_xino(struct seq_file *seq, struct super_block *sb) ++{ ++#ifdef CONFIG_SYSFS ++ return 0; ++#else ++ int err; ++ const int len = sizeof(AUFS_XINO_FNAME) - 1; ++ aufs_bindex_t bindex, brid; ++ struct qstr *name; ++ struct file *f; ++ struct dentry *d, *h_root; ++ struct au_branch *br; ++ ++ AuRwMustAnyLock(&sbinfo->si_rwsem); ++ ++ err = 0; ++ f = au_sbi(sb)->si_xib; ++ if (!f) ++ goto out; ++ ++ /* stop printing the default xino path on the first writable branch */ ++ h_root = NULL; ++ bindex = au_xi_root(sb, f->f_path.dentry); ++ if (bindex >= 0) { ++ br = au_sbr_sb(sb, bindex); ++ h_root = au_br_dentry(br); ++ } ++ ++ d = f->f_path.dentry; ++ name = &d->d_name; ++ /* safe ->d_parent because the file is unlinked */ ++ if (d->d_parent == h_root ++ && name->len == len ++ && !memcmp(name->name, AUFS_XINO_FNAME, len)) ++ goto out; ++ ++ seq_puts(seq, ",xino="); ++ err = au_xino_path(seq, f); ++ ++out: ++ return err; ++#endif ++} ++ ++/* seq_file will re-call me in case of too long string */ ++static int aufs_show_options(struct seq_file *m, struct dentry *dentry) ++{ ++ int err; ++ unsigned int mnt_flags, v; ++ struct super_block *sb; ++ struct au_sbinfo *sbinfo; ++ ++#define AuBool(name, str) do { \ ++ v = au_opt_test(mnt_flags, name); \ ++ if (v != au_opt_test(AuOpt_Def, name)) \ ++ seq_printf(m, ",%s" #str, v ? "" : "no"); \ ++} while (0) ++ ++#define AuStr(name, str) do { \ ++ v = mnt_flags & AuOptMask_##name; \ ++ if (v != (AuOpt_Def & AuOptMask_##name)) \ ++ seq_printf(m, "," #str "=%s", au_optstr_##str(v)); \ ++} while (0) ++ ++#define AuUInt(name, str, val) do { \ ++ if (val != AUFS_##name##_DEF) \ ++ seq_printf(m, "," #str "=%u", val); \ ++} while (0) ++ ++ sb = dentry->d_sb; ++ if (sb->s_flags & SB_POSIXACL) ++ seq_puts(m, ",acl"); ++#if 0 /* reserved for future use */ ++ if (sb->s_flags & SB_I_VERSION) ++ seq_puts(m, ",i_version"); ++#endif ++ ++ /* lock free root dinfo */ ++ si_noflush_read_lock(sb); ++ sbinfo = au_sbi(sb); ++ seq_printf(m, ",si=%lx", sysaufs_si_id(sbinfo)); ++ ++ mnt_flags = au_mntflags(sb); ++ if (au_opt_test(mnt_flags, XINO)) { ++ err = au_show_xino(m, sb); ++ if (unlikely(err)) ++ goto out; ++ } else ++ seq_puts(m, ",noxino"); ++ ++ AuBool(TRUNC_XINO, trunc_xino); ++ AuStr(UDBA, udba); ++ AuBool(SHWH, shwh); ++ AuBool(PLINK, plink); ++ AuBool(DIO, dio); ++ AuBool(DIRPERM1, dirperm1); ++ ++ v = sbinfo->si_wbr_create; ++ if (v != AuWbrCreate_Def) ++ au_show_wbr_create(m, v, sbinfo); ++ ++ v = sbinfo->si_wbr_copyup; ++ if (v != AuWbrCopyup_Def) ++ seq_printf(m, ",cpup=%s", au_optstr_wbr_copyup(v)); ++ ++ v = au_opt_test(mnt_flags, ALWAYS_DIROPQ); ++ if (v != au_opt_test(AuOpt_Def, ALWAYS_DIROPQ)) ++ seq_printf(m, ",diropq=%c", v ? 'a' : 'w'); ++ ++ AuUInt(DIRWH, dirwh, sbinfo->si_dirwh); ++ ++ v = jiffies_to_msecs(sbinfo->si_rdcache) / MSEC_PER_SEC; ++ AuUInt(RDCACHE, rdcache, v); ++ ++ AuUInt(RDBLK, rdblk, sbinfo->si_rdblk); ++ AuUInt(RDHASH, rdhash, sbinfo->si_rdhash); ++ ++ au_fhsm_show(m, sbinfo); ++ ++ AuBool(DIRREN, dirren); ++ AuBool(SUM, sum); ++ /* AuBool(SUM_W, wsum); */ ++ AuBool(WARN_PERM, warn_perm); ++ AuBool(VERBOSE, verbose); ++ ++out: ++ /* be sure to print "br:" last */ ++ if (!sysaufs_brs) { ++ seq_puts(m, ",br:"); ++ au_show_brs(m, sb); ++ } ++ si_read_unlock(sb); ++ return 0; ++ ++#undef AuBool ++#undef AuStr ++#undef AuUInt ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* sum mode which returns the summation for statfs(2) */ ++ ++static u64 au_add_till_max(u64 a, u64 b) ++{ ++ u64 old; ++ ++ old = a; ++ a += b; ++ if (old <= a) ++ return a; ++ return ULLONG_MAX; ++} ++ ++static u64 au_mul_till_max(u64 a, long mul) ++{ ++ u64 old; ++ ++ old = a; ++ a *= mul; ++ if (old <= a) ++ return a; ++ return ULLONG_MAX; ++} ++ ++static int au_statfs_sum(struct super_block *sb, struct kstatfs *buf) ++{ ++ int err; ++ long bsize, factor; ++ u64 blocks, bfree, bavail, files, ffree; ++ aufs_bindex_t bbot, bindex, i; ++ unsigned char shared; ++ struct path h_path; ++ struct super_block *h_sb; ++ ++ err = 0; ++ bsize = LONG_MAX; ++ files = 0; ++ ffree = 0; ++ blocks = 0; ++ bfree = 0; ++ bavail = 0; ++ bbot = au_sbbot(sb); ++ for (bindex = 0; bindex <= bbot; bindex++) { ++ h_path.mnt = au_sbr_mnt(sb, bindex); ++ h_sb = h_path.mnt->mnt_sb; ++ shared = 0; ++ for (i = 0; !shared && i < bindex; i++) ++ shared = (au_sbr_sb(sb, i) == h_sb); ++ if (shared) ++ continue; ++ ++ /* sb->s_root for NFS is unreliable */ ++ h_path.dentry = h_path.mnt->mnt_root; ++ err = vfs_statfs(&h_path, buf); ++ if (unlikely(err)) ++ goto out; ++ ++ if (bsize > buf->f_bsize) { ++ /* ++ * we will reduce bsize, so we have to expand blocks ++ * etc. to match them again ++ */ ++ factor = (bsize / buf->f_bsize); ++ blocks = au_mul_till_max(blocks, factor); ++ bfree = au_mul_till_max(bfree, factor); ++ bavail = au_mul_till_max(bavail, factor); ++ bsize = buf->f_bsize; ++ } ++ ++ factor = (buf->f_bsize / bsize); ++ blocks = au_add_till_max(blocks, ++ au_mul_till_max(buf->f_blocks, factor)); ++ bfree = au_add_till_max(bfree, ++ au_mul_till_max(buf->f_bfree, factor)); ++ bavail = au_add_till_max(bavail, ++ au_mul_till_max(buf->f_bavail, factor)); ++ files = au_add_till_max(files, buf->f_files); ++ ffree = au_add_till_max(ffree, buf->f_ffree); ++ } ++ ++ buf->f_bsize = bsize; ++ buf->f_blocks = blocks; ++ buf->f_bfree = bfree; ++ buf->f_bavail = bavail; ++ buf->f_files = files; ++ buf->f_ffree = ffree; ++ buf->f_frsize = 0; ++ ++out: ++ return err; ++} ++ ++static int aufs_statfs(struct dentry *dentry, struct kstatfs *buf) ++{ ++ int err; ++ struct path h_path; ++ struct super_block *sb; ++ ++ /* lock free root dinfo */ ++ sb = dentry->d_sb; ++ si_noflush_read_lock(sb); ++ if (!au_opt_test(au_mntflags(sb), SUM)) { ++ /* sb->s_root for NFS is unreliable */ ++ h_path.mnt = au_sbr_mnt(sb, 0); ++ h_path.dentry = h_path.mnt->mnt_root; ++ err = vfs_statfs(&h_path, buf); ++ } else ++ err = au_statfs_sum(sb, buf); ++ si_read_unlock(sb); ++ ++ if (!err) { ++ buf->f_type = AUFS_SUPER_MAGIC; ++ buf->f_namelen = AUFS_MAX_NAMELEN; ++ memset(&buf->f_fsid, 0, sizeof(buf->f_fsid)); ++ } ++ /* buf->f_bsize = buf->f_blocks = buf->f_bfree = buf->f_bavail = -1; */ ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int aufs_sync_fs(struct super_block *sb, int wait) ++{ ++ int err, e; ++ aufs_bindex_t bbot, bindex; ++ struct au_branch *br; ++ struct super_block *h_sb; ++ ++ err = 0; ++ si_noflush_read_lock(sb); ++ bbot = au_sbbot(sb); ++ for (bindex = 0; bindex <= bbot; bindex++) { ++ br = au_sbr(sb, bindex); ++ if (!au_br_writable(br->br_perm)) ++ continue; ++ ++ h_sb = au_sbr_sb(sb, bindex); ++ e = vfsub_sync_filesystem(h_sb); ++ if (unlikely(e && !err)) ++ err = e; ++ /* go on even if an error happens */ ++ } ++ si_read_unlock(sb); ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* final actions when unmounting a file system */ ++static void aufs_put_super(struct super_block *sb) ++{ ++ struct au_sbinfo *sbinfo; ++ ++ sbinfo = au_sbi(sb); ++ if (sbinfo) ++ kobject_put(&sbinfo->si_kobj); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++void *au_array_alloc(unsigned long long *hint, au_arraycb_t cb, ++ struct super_block *sb, void *arg) ++{ ++ void *array; ++ unsigned long long n, sz; ++ ++ array = NULL; ++ n = 0; ++ if (!*hint) ++ goto out; ++ ++ if (*hint > ULLONG_MAX / sizeof(array)) { ++ array = ERR_PTR(-EMFILE); ++ pr_err("hint %llu\n", *hint); ++ goto out; ++ } ++ ++ sz = sizeof(array) * *hint; ++ array = kzalloc(sz, GFP_NOFS); ++ if (unlikely(!array)) ++ array = vzalloc(sz); ++ if (unlikely(!array)) { ++ array = ERR_PTR(-ENOMEM); ++ goto out; ++ } ++ ++ n = cb(sb, array, *hint, arg); ++ AuDebugOn(n > *hint); ++ ++out: ++ *hint = n; ++ return array; ++} ++ ++static unsigned long long au_iarray_cb(struct super_block *sb, void *a, ++ unsigned long long max __maybe_unused, ++ void *arg) ++{ ++ unsigned long long n; ++ struct inode **p, *inode; ++ struct list_head *head; ++ ++ n = 0; ++ p = a; ++ head = arg; ++ spin_lock(&sb->s_inode_list_lock); ++ list_for_each_entry(inode, head, i_sb_list) { ++ if (!au_is_bad_inode(inode) ++ && au_ii(inode)->ii_btop >= 0) { ++ spin_lock(&inode->i_lock); ++ if (atomic_read(&inode->i_count)) { ++ au_igrab(inode); ++ *p++ = inode; ++ n++; ++ AuDebugOn(n > max); ++ } ++ spin_unlock(&inode->i_lock); ++ } ++ } ++ spin_unlock(&sb->s_inode_list_lock); ++ ++ return n; ++} ++ ++struct inode **au_iarray_alloc(struct super_block *sb, unsigned long long *max) ++{ ++ struct au_sbinfo *sbi; ++ ++ sbi = au_sbi(sb); ++ *max = au_lcnt_read(&sbi->si_ninodes, /*do_rev*/1); ++ return au_array_alloc(max, au_iarray_cb, sb, &sb->s_inodes); ++} ++ ++void au_iarray_free(struct inode **a, unsigned long long max) ++{ ++ unsigned long long ull; ++ ++ for (ull = 0; ull < max; ull++) ++ iput(a[ull]); ++ kvfree(a); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * refresh dentry and inode at remount time. ++ */ ++/* todo: consolidate with simple_reval_dpath() and au_reval_for_attr() */ ++static int au_do_refresh(struct dentry *dentry, unsigned int dir_flags, ++ struct dentry *parent) ++{ ++ int err; ++ ++ di_write_lock_child(dentry); ++ di_read_lock_parent(parent, AuLock_IR); ++ err = au_refresh_dentry(dentry, parent); ++ if (!err && dir_flags) ++ au_hn_reset(d_inode(dentry), dir_flags); ++ di_read_unlock(parent, AuLock_IR); ++ di_write_unlock(dentry); ++ ++ return err; ++} ++ ++static int au_do_refresh_d(struct dentry *dentry, unsigned int sigen, ++ struct au_sbinfo *sbinfo, ++ const unsigned int dir_flags, unsigned int do_idop) ++{ ++ int err; ++ struct dentry *parent; ++ ++ err = 0; ++ parent = dget_parent(dentry); ++ if (!au_digen_test(parent, sigen) && au_digen_test(dentry, sigen)) { ++ if (d_really_is_positive(dentry)) { ++ if (!d_is_dir(dentry)) ++ err = au_do_refresh(dentry, /*dir_flags*/0, ++ parent); ++ else { ++ err = au_do_refresh(dentry, dir_flags, parent); ++ if (unlikely(err)) ++ au_fset_si(sbinfo, FAILED_REFRESH_DIR); ++ } ++ } else ++ err = au_do_refresh(dentry, /*dir_flags*/0, parent); ++ AuDbgDentry(dentry); ++ } ++ dput(parent); ++ ++ if (!err) { ++ if (do_idop) ++ au_refresh_dop(dentry, /*force_reval*/0); ++ } else ++ au_refresh_dop(dentry, /*force_reval*/1); ++ ++ AuTraceErr(err); ++ return err; ++} ++ ++static int au_refresh_d(struct super_block *sb, unsigned int do_idop) ++{ ++ int err, i, j, ndentry, e; ++ unsigned int sigen; ++ struct au_dcsub_pages dpages; ++ struct au_dpage *dpage; ++ struct dentry **dentries, *d; ++ struct au_sbinfo *sbinfo; ++ struct dentry *root = sb->s_root; ++ const unsigned int dir_flags = au_hi_flags(d_inode(root), /*isdir*/1); ++ ++ if (do_idop) ++ au_refresh_dop(root, /*force_reval*/0); ++ ++ err = au_dpages_init(&dpages, GFP_NOFS); ++ if (unlikely(err)) ++ goto out; ++ err = au_dcsub_pages(&dpages, root, NULL, NULL); ++ if (unlikely(err)) ++ goto out_dpages; ++ ++ sigen = au_sigen(sb); ++ sbinfo = au_sbi(sb); ++ for (i = 0; i < dpages.ndpage; i++) { ++ dpage = dpages.dpages + i; ++ dentries = dpage->dentries; ++ ndentry = dpage->ndentry; ++ for (j = 0; j < ndentry; j++) { ++ d = dentries[j]; ++ e = au_do_refresh_d(d, sigen, sbinfo, dir_flags, ++ do_idop); ++ if (unlikely(e && !err)) ++ err = e; ++ /* go on even err */ ++ } ++ } ++ ++out_dpages: ++ au_dpages_free(&dpages); ++out: ++ return err; ++} ++ ++static int au_refresh_i(struct super_block *sb, unsigned int do_idop) ++{ ++ int err, e; ++ unsigned int sigen; ++ unsigned long long max, ull; ++ struct inode *inode, **array; ++ ++ array = au_iarray_alloc(sb, &max); ++ err = PTR_ERR(array); ++ if (IS_ERR(array)) ++ goto out; ++ ++ err = 0; ++ sigen = au_sigen(sb); ++ for (ull = 0; ull < max; ull++) { ++ inode = array[ull]; ++ if (unlikely(!inode)) ++ break; ++ ++ e = 0; ++ ii_write_lock_child(inode); ++ if (au_iigen(inode, NULL) != sigen) { ++ e = au_refresh_hinode_self(inode); ++ if (unlikely(e)) { ++ au_refresh_iop(inode, /*force_getattr*/1); ++ pr_err("error %d, i%lu\n", e, inode->i_ino); ++ if (!err) ++ err = e; ++ /* go on even if err */ ++ } ++ } ++ if (!e && do_idop) ++ au_refresh_iop(inode, /*force_getattr*/0); ++ ii_write_unlock(inode); ++ } ++ ++ au_iarray_free(array, max); ++ ++out: ++ return err; ++} ++ ++void au_remount_refresh(struct super_block *sb, unsigned int do_idop) ++{ ++ int err, e; ++ unsigned int udba; ++ aufs_bindex_t bindex, bbot; ++ struct dentry *root; ++ struct inode *inode; ++ struct au_branch *br; ++ struct au_sbinfo *sbi; ++ ++ au_sigen_inc(sb); ++ sbi = au_sbi(sb); ++ au_fclr_si(sbi, FAILED_REFRESH_DIR); ++ ++ root = sb->s_root; ++ DiMustNoWaiters(root); ++ inode = d_inode(root); ++ IiMustNoWaiters(inode); ++ ++ udba = au_opt_udba(sb); ++ bbot = au_sbbot(sb); ++ for (bindex = 0; bindex <= bbot; bindex++) { ++ br = au_sbr(sb, bindex); ++ err = au_hnotify_reset_br(udba, br, br->br_perm); ++ if (unlikely(err)) ++ AuIOErr("hnotify failed on br %d, %d, ignored\n", ++ bindex, err); ++ /* go on even if err */ ++ } ++ au_hn_reset(inode, au_hi_flags(inode, /*isdir*/1)); ++ ++ if (do_idop) { ++ if (au_ftest_si(sbi, NO_DREVAL)) { ++ AuDebugOn(sb->s_d_op == &aufs_dop_noreval); ++ sb->s_d_op = &aufs_dop_noreval; ++ AuDebugOn(sbi->si_iop_array == aufs_iop_nogetattr); ++ sbi->si_iop_array = aufs_iop_nogetattr; ++ } else { ++ AuDebugOn(sb->s_d_op == &aufs_dop); ++ sb->s_d_op = &aufs_dop; ++ AuDebugOn(sbi->si_iop_array == aufs_iop); ++ sbi->si_iop_array = aufs_iop; ++ } ++ pr_info("reset to %ps and %ps\n", ++ sb->s_d_op, sbi->si_iop_array); ++ } ++ ++ di_write_unlock(root); ++ err = au_refresh_d(sb, do_idop); ++ e = au_refresh_i(sb, do_idop); ++ if (unlikely(e && !err)) ++ err = e; ++ /* aufs_write_lock() calls ..._child() */ ++ di_write_lock_child(root); ++ ++ au_cpup_attr_all(inode, /*force*/1); ++ ++ if (unlikely(err)) ++ AuIOErr("refresh failed, ignored, %d\n", err); ++} ++ ++const struct super_operations aufs_sop = { ++ .alloc_inode = aufs_alloc_inode, ++ .destroy_inode = aufs_destroy_inode, ++ .free_inode = aufs_free_inode, ++ /* always deleting, no clearing */ ++ .drop_inode = generic_delete_inode, ++ .show_options = aufs_show_options, ++ .statfs = aufs_statfs, ++ .put_super = aufs_put_super, ++ .sync_fs = aufs_sync_fs ++}; ++ ++/* ---------------------------------------------------------------------- */ ++ ++int au_alloc_root(struct super_block *sb) ++{ ++ int err; ++ struct inode *inode; ++ struct dentry *root; ++ ++ err = -ENOMEM; ++ inode = au_iget_locked(sb, AUFS_ROOT_INO); ++ err = PTR_ERR(inode); ++ if (IS_ERR(inode)) ++ goto out; ++ ++ inode->i_op = aufs_iop + AuIop_DIR; /* with getattr by default */ ++ inode->i_fop = &aufs_dir_fop; ++ inode->i_mode = S_IFDIR; ++ set_nlink(inode, 2); ++ unlock_new_inode(inode); ++ ++ root = d_make_root(inode); ++ if (unlikely(!root)) ++ goto out; ++ err = PTR_ERR(root); ++ if (IS_ERR(root)) ++ goto out; ++ ++ err = au_di_init(root); ++ if (!err) { ++ sb->s_root = root; ++ return 0; /* success */ ++ } ++ dput(root); ++ ++out: ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static void aufs_kill_sb(struct super_block *sb) ++{ ++ struct au_sbinfo *sbinfo; ++ struct dentry *root; ++ ++ sbinfo = au_sbi(sb); ++ if (!sbinfo) ++ goto out; ++ ++ au_sbilist_del(sb); ++ ++ root = sb->s_root; ++ if (root) ++ aufs_write_lock(root); ++ else ++ __si_write_lock(sb); ++ ++ au_fhsm_fin(sb); ++ if (sbinfo->si_wbr_create_ops->fin) ++ sbinfo->si_wbr_create_ops->fin(sb); ++ if (au_opt_test(sbinfo->si_mntflags, UDBA_HNOTIFY)) { ++ au_opt_set_udba(sbinfo->si_mntflags, UDBA_NONE); ++ au_remount_refresh(sb, /*do_idop*/0); ++ } ++ if (au_opt_test(sbinfo->si_mntflags, PLINK)) ++ au_plink_put(sb, /*verbose*/1); ++ au_xino_clr(sb); ++ if (root) ++ au_dr_opt_flush(sb); ++ ++ if (root) ++ aufs_write_unlock(root); ++ else ++ __si_write_unlock(sb); ++ ++ sbinfo->si_sb = NULL; ++ au_nwt_flush(&sbinfo->si_nowait); ++ ++out: ++ kill_anon_super(sb); ++} ++ ++struct file_system_type aufs_fs_type = { ++ .name = AUFS_FSTYPE, ++ /* a race between rename and others */ ++ .fs_flags = FS_RENAME_DOES_D_MOVE ++ /* untested */ ++ /*| FS_ALLOW_IDMAP*/ ++ , ++ .init_fs_context = aufs_fsctx_init, ++ .parameters = aufs_fsctx_paramspec, ++ .kill_sb = aufs_kill_sb, ++ /* no need to __module_get() and module_put(). */ ++ .owner = THIS_MODULE, ++}; +diff --git a/fs/aufs/super.h b/fs/aufs/super.h +new file mode 100644 +index 000000000000..f1d9aedcbca4 +--- /dev/null ++++ b/fs/aufs/super.h +@@ -0,0 +1,592 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * super_block operations ++ */ ++ ++#ifndef __AUFS_SUPER_H__ ++#define __AUFS_SUPER_H__ ++ ++#ifdef __KERNEL__ ++ ++#include <linux/fs.h> ++#include <linux/kobject.h> ++#include "hbl.h" ++#include "lcnt.h" ++#include "rwsem.h" ++#include "wkq.h" ++ ++/* policies to select one among multiple writable branches */ ++struct au_wbr_copyup_operations { ++ int (*copyup)(struct dentry *dentry); ++}; ++ ++#define AuWbr_DIR 1 /* target is a dir */ ++#define AuWbr_PARENT (1 << 1) /* always require a parent */ ++ ++#define au_ftest_wbr(flags, name) ((flags) & AuWbr_##name) ++#define au_fset_wbr(flags, name) { (flags) |= AuWbr_##name; } ++#define au_fclr_wbr(flags, name) { (flags) &= ~AuWbr_##name; } ++ ++struct au_wbr_create_operations { ++ int (*create)(struct dentry *dentry, unsigned int flags); ++ int (*init)(struct super_block *sb); ++ int (*fin)(struct super_block *sb); ++}; ++ ++struct au_wbr_mfs { ++ struct mutex mfs_lock; /* protect this structure */ ++ unsigned long mfs_jiffy; ++ unsigned long mfs_expire; ++ aufs_bindex_t mfs_bindex; ++ ++ unsigned long long mfsrr_bytes; ++ unsigned long long mfsrr_watermark; ++}; ++ ++#define AuPlink_NHASH 100 ++static inline int au_plink_hash(ino_t ino) ++{ ++ return ino % AuPlink_NHASH; ++} ++ ++/* File-based Hierarchical Storage Management */ ++struct au_fhsm { ++#ifdef CONFIG_AUFS_FHSM ++ /* allow only one process who can receive the notification */ ++ spinlock_t fhsm_spin; ++ pid_t fhsm_pid; ++ wait_queue_head_t fhsm_wqh; ++ atomic_t fhsm_readable; ++ ++ /* these are protected by si_rwsem */ ++ unsigned long fhsm_expire; ++ aufs_bindex_t fhsm_bottom; ++#endif ++}; ++ ++struct au_branch; ++struct au_sbinfo { ++ /* nowait tasks in the system-wide workqueue */ ++ struct au_nowait_tasks si_nowait; ++ ++ /* ++ * tried sb->s_umount, but failed due to the dependency between i_mutex. ++ * rwsem for au_sbinfo is necessary. ++ */ ++ struct au_rwsem si_rwsem; ++ ++ /* ++ * dirty approach to protect sb->sb_inodes and ->s_files (gone) from ++ * remount. ++ */ ++ au_lcnt_t si_ninodes, si_nfiles; ++ ++ /* branch management */ ++ unsigned int si_generation; ++ ++ /* see AuSi_ flags */ ++ unsigned char au_si_status; ++ ++ aufs_bindex_t si_bbot; ++ ++ /* dirty trick to keep br_id plus */ ++ unsigned int si_last_br_id : ++ sizeof(aufs_bindex_t) * BITS_PER_BYTE - 1; ++ struct au_branch **si_branch; ++ ++ /* policy to select a writable branch */ ++ unsigned char si_wbr_copyup; ++ unsigned char si_wbr_create; ++ struct au_wbr_copyup_operations *si_wbr_copyup_ops; ++ struct au_wbr_create_operations *si_wbr_create_ops; ++ ++ /* round robin */ ++ atomic_t si_wbr_rr_next; ++ ++ /* most free space */ ++ struct au_wbr_mfs si_wbr_mfs; ++ ++ /* File-based Hierarchical Storage Management */ ++ struct au_fhsm si_fhsm; ++ ++ /* mount flags */ ++ /* include/asm-ia64/siginfo.h defines a macro named si_flags */ ++ unsigned int si_mntflags; ++ ++ /* external inode number (bitmap and translation table) */ ++ loff_t si_ximaxent; /* max entries in a xino */ ++ ++ struct file *si_xib; ++ struct mutex si_xib_mtx; /* protect xib members */ ++ unsigned long *si_xib_buf; ++ unsigned long si_xib_last_pindex; ++ int si_xib_next_bit; ++ ++ unsigned long si_xino_jiffy; ++ unsigned long si_xino_expire; ++ /* reserved for future use */ ++ /* unsigned long long si_xib_limit; */ /* Max xib file size */ ++ ++#ifdef CONFIG_AUFS_EXPORT ++ /* i_generation */ ++ /* todo: make xigen file an array to support many inode numbers */ ++ struct file *si_xigen; ++ atomic_t si_xigen_next; ++#endif ++ ++ /* dirty trick to support atomic_open */ ++ struct hlist_bl_head si_aopen; ++ ++ /* vdir parameters */ ++ unsigned long si_rdcache; /* max cache time in jiffies */ ++ unsigned int si_rdblk; /* deblk size */ ++ unsigned int si_rdhash; /* hash size */ ++ ++ /* ++ * If the number of whiteouts are larger than si_dirwh, leave all of ++ * them after au_whtmp_ren to reduce the cost of rmdir(2). ++ * future fsck.aufs or kernel thread will remove them later. ++ * Otherwise, remove all whiteouts and the dir in rmdir(2). ++ */ ++ unsigned int si_dirwh; ++ ++ /* pseudo_link list */ ++ struct hlist_bl_head si_plink[AuPlink_NHASH]; ++ wait_queue_head_t si_plink_wq; ++ spinlock_t si_plink_maint_lock; ++ pid_t si_plink_maint_pid; ++ ++ /* file list */ ++ struct hlist_bl_head si_files; ++ ++ /* with/without getattr, brother of sb->s_d_op */ ++ const struct inode_operations *si_iop_array; ++ ++ /* ++ * sysfs and lifetime management. ++ * this is not a small structure and it may be a waste of memory in case ++ * of sysfs is disabled, particularly when many aufs-es are mounted. ++ * but using sysfs is majority. ++ */ ++ struct kobject si_kobj; ++#ifdef CONFIG_DEBUG_FS ++ struct dentry *si_dbgaufs; ++ struct dentry *si_dbgaufs_plink; ++ struct dentry *si_dbgaufs_xib; ++#ifdef CONFIG_AUFS_EXPORT ++ struct dentry *si_dbgaufs_xigen; ++#endif ++#endif ++ ++#ifdef CONFIG_AUFS_SBILIST ++ struct hlist_bl_node si_list; ++#endif ++ ++ /* dirty, necessary for unmounting, sysfs and sysrq */ ++ struct super_block *si_sb; ++}; ++ ++/* sbinfo status flags */ ++/* ++ * set true when refresh_dirs() failed at remount time. ++ * then try refreshing dirs at access time again. ++ * if it is false, refreshing dirs at access time is unnecessary ++ */ ++#define AuSi_FAILED_REFRESH_DIR 1 ++#define AuSi_FHSM (1 << 1) /* fhsm is active now */ ++#define AuSi_NO_DREVAL (1 << 2) /* disable all d_revalidate */ ++ ++#ifndef CONFIG_AUFS_FHSM ++#undef AuSi_FHSM ++#define AuSi_FHSM 0 ++#endif ++ ++static inline unsigned char au_do_ftest_si(struct au_sbinfo *sbi, ++ unsigned int flag) ++{ ++ AuRwMustAnyLock(&sbi->si_rwsem); ++ return sbi->au_si_status & flag; ++} ++#define au_ftest_si(sbinfo, name) au_do_ftest_si(sbinfo, AuSi_##name) ++#define au_fset_si(sbinfo, name) do { \ ++ AuRwMustWriteLock(&(sbinfo)->si_rwsem); \ ++ (sbinfo)->au_si_status |= AuSi_##name; \ ++} while (0) ++#define au_fclr_si(sbinfo, name) do { \ ++ AuRwMustWriteLock(&(sbinfo)->si_rwsem); \ ++ (sbinfo)->au_si_status &= ~AuSi_##name; \ ++} while (0) ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* policy to select one among writable branches */ ++#define AuWbrCopyup(sbinfo, ...) \ ++ ((sbinfo)->si_wbr_copyup_ops->copyup(__VA_ARGS__)) ++#define AuWbrCreate(sbinfo, ...) \ ++ ((sbinfo)->si_wbr_create_ops->create(__VA_ARGS__)) ++ ++/* flags for si_read_lock()/aufs_read_lock()/di_read_lock() */ ++#define AuLock_DW 1 /* write-lock dentry */ ++#define AuLock_IR (1 << 1) /* read-lock inode */ ++#define AuLock_IW (1 << 2) /* write-lock inode */ ++#define AuLock_FLUSH (1 << 3) /* wait for 'nowait' tasks */ ++#define AuLock_DIRS (1 << 4) /* target is a pair of dirs */ ++ /* except RENAME_EXCHANGE */ ++#define AuLock_NOPLM (1 << 5) /* return err in plm mode */ ++#define AuLock_NOPLMW (1 << 6) /* wait for plm mode ends */ ++#define AuLock_GEN (1 << 7) /* test digen/iigen */ ++#define au_ftest_lock(flags, name) ((flags) & AuLock_##name) ++#define au_fset_lock(flags, name) \ ++ do { (flags) |= AuLock_##name; } while (0) ++#define au_fclr_lock(flags, name) \ ++ do { (flags) &= ~AuLock_##name; } while (0) ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* super.c */ ++struct inode *au_iget_locked(struct super_block *sb, ino_t ino); ++ ++typedef unsigned long long (*au_arraycb_t)(struct super_block *sb, void *array, ++ unsigned long long max, void *arg); ++void *au_array_alloc(unsigned long long *hint, au_arraycb_t cb, ++ struct super_block *sb, void *arg); ++struct inode **au_iarray_alloc(struct super_block *sb, unsigned long long *max); ++void au_iarray_free(struct inode **a, unsigned long long max); ++ ++void au_remount_refresh(struct super_block *sb, unsigned int do_idop); ++extern const struct super_operations aufs_sop; ++int au_alloc_root(struct super_block *sb); ++extern struct file_system_type aufs_fs_type; ++ ++/* sbinfo.c */ ++void au_si_free(struct kobject *kobj); ++struct au_sbinfo *au_si_alloc(struct super_block *sb); ++int au_sbr_realloc(struct au_sbinfo *sbinfo, int nbr, int may_shrink); ++ ++unsigned int au_sigen_inc(struct super_block *sb); ++aufs_bindex_t au_new_br_id(struct super_block *sb); ++ ++int si_read_lock(struct super_block *sb, int flags); ++int si_write_lock(struct super_block *sb, int flags); ++int aufs_read_lock(struct dentry *dentry, int flags); ++void aufs_read_unlock(struct dentry *dentry, int flags); ++void aufs_write_lock(struct dentry *dentry); ++void aufs_write_unlock(struct dentry *dentry); ++int aufs_read_and_write_lock2(struct dentry *d1, struct dentry *d2, int flags); ++void aufs_read_and_write_unlock2(struct dentry *d1, struct dentry *d2); ++ ++/* wbr_policy.c */ ++extern struct au_wbr_copyup_operations au_wbr_copyup_ops[]; ++extern struct au_wbr_create_operations au_wbr_create_ops[]; ++int au_cpdown_dirs(struct dentry *dentry, aufs_bindex_t bdst); ++int au_wbr_nonopq(struct dentry *dentry, aufs_bindex_t bindex); ++int au_wbr_do_copyup_bu(struct dentry *dentry, aufs_bindex_t btop); ++ ++/* mvdown.c */ ++int au_mvdown(struct dentry *dentry, struct aufs_mvdown __user *arg); ++ ++#ifdef CONFIG_AUFS_FHSM ++/* fhsm.c */ ++ ++static inline pid_t au_fhsm_pid(struct au_fhsm *fhsm) ++{ ++ pid_t pid; ++ ++ spin_lock(&fhsm->fhsm_spin); ++ pid = fhsm->fhsm_pid; ++ spin_unlock(&fhsm->fhsm_spin); ++ ++ return pid; ++} ++ ++void au_fhsm_wrote(struct super_block *sb, aufs_bindex_t bindex, int force); ++void au_fhsm_wrote_all(struct super_block *sb, int force); ++int au_fhsm_fd(struct super_block *sb, int oflags); ++int au_fhsm_br_alloc(struct au_branch *br); ++void au_fhsm_set_bottom(struct super_block *sb, aufs_bindex_t bindex); ++void au_fhsm_fin(struct super_block *sb); ++void au_fhsm_init(struct au_sbinfo *sbinfo); ++void au_fhsm_set(struct au_sbinfo *sbinfo, unsigned int sec); ++void au_fhsm_show(struct seq_file *seq, struct au_sbinfo *sbinfo); ++#else ++AuStubVoid(au_fhsm_wrote, struct super_block *sb, aufs_bindex_t bindex, ++ int force) ++AuStubVoid(au_fhsm_wrote_all, struct super_block *sb, int force) ++AuStub(int, au_fhsm_fd, return -EOPNOTSUPP, struct super_block *sb, int oflags) ++AuStub(pid_t, au_fhsm_pid, return 0, struct au_fhsm *fhsm) ++AuStubInt0(au_fhsm_br_alloc, struct au_branch *br) ++AuStubVoid(au_fhsm_set_bottom, struct super_block *sb, aufs_bindex_t bindex) ++AuStubVoid(au_fhsm_fin, struct super_block *sb) ++AuStubVoid(au_fhsm_init, struct au_sbinfo *sbinfo) ++AuStubVoid(au_fhsm_set, struct au_sbinfo *sbinfo, unsigned int sec) ++AuStubVoid(au_fhsm_show, struct seq_file *seq, struct au_sbinfo *sbinfo) ++#endif ++ ++/* ---------------------------------------------------------------------- */ ++ ++static inline struct au_sbinfo *au_sbi(struct super_block *sb) ++{ ++ return sb->s_fs_info; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++#ifdef CONFIG_AUFS_EXPORT ++int au_test_nfsd(void); ++void au_export_init(struct super_block *sb); ++void au_xigen_inc(struct inode *inode); ++int au_xigen_new(struct inode *inode); ++int au_xigen_set(struct super_block *sb, struct path *path); ++void au_xigen_clr(struct super_block *sb); ++ ++static inline int au_busy_or_stale(void) ++{ ++ if (!au_test_nfsd()) ++ return -EBUSY; ++ return -ESTALE; ++} ++#else ++AuStubInt0(au_test_nfsd, void) ++AuStubVoid(au_export_init, struct super_block *sb) ++AuStubVoid(au_xigen_inc, struct inode *inode) ++AuStubInt0(au_xigen_new, struct inode *inode) ++AuStubInt0(au_xigen_set, struct super_block *sb, struct path *path) ++AuStubVoid(au_xigen_clr, struct super_block *sb) ++AuStub(int, au_busy_or_stale, return -EBUSY, void) ++#endif /* CONFIG_AUFS_EXPORT */ ++ ++/* ---------------------------------------------------------------------- */ ++ ++#ifdef CONFIG_AUFS_SBILIST ++/* module.c */ ++extern struct hlist_bl_head au_sbilist; ++ ++static inline void au_sbilist_init(void) ++{ ++ INIT_HLIST_BL_HEAD(&au_sbilist); ++} ++ ++static inline void au_sbilist_add(struct super_block *sb) ++{ ++ au_hbl_add(&au_sbi(sb)->si_list, &au_sbilist); ++} ++ ++static inline void au_sbilist_del(struct super_block *sb) ++{ ++ au_hbl_del(&au_sbi(sb)->si_list, &au_sbilist); ++} ++ ++#ifdef CONFIG_AUFS_MAGIC_SYSRQ ++static inline void au_sbilist_lock(void) ++{ ++ hlist_bl_lock(&au_sbilist); ++} ++ ++static inline void au_sbilist_unlock(void) ++{ ++ hlist_bl_unlock(&au_sbilist); ++} ++#define AuGFP_SBILIST GFP_ATOMIC ++#else ++AuStubVoid(au_sbilist_lock, void) ++AuStubVoid(au_sbilist_unlock, void) ++#define AuGFP_SBILIST GFP_NOFS ++#endif /* CONFIG_AUFS_MAGIC_SYSRQ */ ++#else ++AuStubVoid(au_sbilist_init, void) ++AuStubVoid(au_sbilist_add, struct super_block *sb) ++AuStubVoid(au_sbilist_del, struct super_block *sb) ++AuStubVoid(au_sbilist_lock, void) ++AuStubVoid(au_sbilist_unlock, void) ++#define AuGFP_SBILIST GFP_NOFS ++#endif ++ ++/* ---------------------------------------------------------------------- */ ++ ++static inline void dbgaufs_si_null(struct au_sbinfo *sbinfo) ++{ ++ /* ++ * This function is a dynamic '__init' function actually, ++ * so the tiny check for si_rwsem is unnecessary. ++ */ ++ /* AuRwMustWriteLock(&sbinfo->si_rwsem); */ ++#ifdef CONFIG_DEBUG_FS ++ sbinfo->si_dbgaufs = NULL; ++ sbinfo->si_dbgaufs_plink = NULL; ++ sbinfo->si_dbgaufs_xib = NULL; ++#ifdef CONFIG_AUFS_EXPORT ++ sbinfo->si_dbgaufs_xigen = NULL; ++#endif ++#endif ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* current->atomic_flags */ ++/* this value should never corrupt the ones defined in linux/sched.h */ ++#define PFA_AUFS 0x10 ++ ++TASK_PFA_TEST(AUFS, test_aufs) /* task_test_aufs */ ++TASK_PFA_SET(AUFS, aufs) /* task_set_aufs */ ++TASK_PFA_CLEAR(AUFS, aufs) /* task_clear_aufs */ ++ ++static inline int si_pid_test(struct super_block *sb) ++{ ++ return !!task_test_aufs(current); ++} ++ ++static inline void si_pid_clr(struct super_block *sb) ++{ ++ AuDebugOn(!task_test_aufs(current)); ++ task_clear_aufs(current); ++} ++ ++static inline void si_pid_set(struct super_block *sb) ++{ ++ AuDebugOn(task_test_aufs(current)); ++ task_set_aufs(current); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* lock superblock. mainly for entry point functions */ ++#define __si_read_lock(sb) au_rw_read_lock(&au_sbi(sb)->si_rwsem) ++#define __si_write_lock(sb) au_rw_write_lock(&au_sbi(sb)->si_rwsem) ++#define __si_read_trylock(sb) au_rw_read_trylock(&au_sbi(sb)->si_rwsem) ++#define __si_write_trylock(sb) au_rw_write_trylock(&au_sbi(sb)->si_rwsem) ++/* ++#define __si_read_trylock_nested(sb) \ ++ au_rw_read_trylock_nested(&au_sbi(sb)->si_rwsem) ++#define __si_write_trylock_nested(sb) \ ++ au_rw_write_trylock_nested(&au_sbi(sb)->si_rwsem) ++*/ ++ ++#define __si_read_unlock(sb) au_rw_read_unlock(&au_sbi(sb)->si_rwsem) ++#define __si_write_unlock(sb) au_rw_write_unlock(&au_sbi(sb)->si_rwsem) ++#define __si_downgrade_lock(sb) au_rw_dgrade_lock(&au_sbi(sb)->si_rwsem) ++ ++#define SiMustNoWaiters(sb) AuRwMustNoWaiters(&au_sbi(sb)->si_rwsem) ++#define SiMustAnyLock(sb) AuRwMustAnyLock(&au_sbi(sb)->si_rwsem) ++#define SiMustWriteLock(sb) AuRwMustWriteLock(&au_sbi(sb)->si_rwsem) ++ ++static inline void si_noflush_read_lock(struct super_block *sb) ++{ ++ __si_read_lock(sb); ++ si_pid_set(sb); ++} ++ ++static inline int si_noflush_read_trylock(struct super_block *sb) ++{ ++ int locked; ++ ++ locked = __si_read_trylock(sb); ++ if (locked) ++ si_pid_set(sb); ++ return locked; ++} ++ ++static inline void si_noflush_write_lock(struct super_block *sb) ++{ ++ __si_write_lock(sb); ++ si_pid_set(sb); ++} ++ ++static inline int si_noflush_write_trylock(struct super_block *sb) ++{ ++ int locked; ++ ++ locked = __si_write_trylock(sb); ++ if (locked) ++ si_pid_set(sb); ++ return locked; ++} ++ ++#if 0 /* reserved */ ++static inline int si_read_trylock(struct super_block *sb, int flags) ++{ ++ if (au_ftest_lock(flags, FLUSH)) ++ au_nwt_flush(&au_sbi(sb)->si_nowait); ++ return si_noflush_read_trylock(sb); ++} ++#endif ++ ++static inline void si_read_unlock(struct super_block *sb) ++{ ++ si_pid_clr(sb); ++ __si_read_unlock(sb); ++} ++ ++#if 0 /* reserved */ ++static inline int si_write_trylock(struct super_block *sb, int flags) ++{ ++ if (au_ftest_lock(flags, FLUSH)) ++ au_nwt_flush(&au_sbi(sb)->si_nowait); ++ return si_noflush_write_trylock(sb); ++} ++#endif ++ ++static inline void si_write_unlock(struct super_block *sb) ++{ ++ si_pid_clr(sb); ++ __si_write_unlock(sb); ++} ++ ++#if 0 /* reserved */ ++static inline void si_downgrade_lock(struct super_block *sb) ++{ ++ __si_downgrade_lock(sb); ++} ++#endif ++ ++/* ---------------------------------------------------------------------- */ ++ ++static inline aufs_bindex_t au_sbbot(struct super_block *sb) ++{ ++ SiMustAnyLock(sb); ++ return au_sbi(sb)->si_bbot; ++} ++ ++static inline unsigned int au_mntflags(struct super_block *sb) ++{ ++ SiMustAnyLock(sb); ++ return au_sbi(sb)->si_mntflags; ++} ++ ++static inline unsigned int au_sigen(struct super_block *sb) ++{ ++ SiMustAnyLock(sb); ++ return au_sbi(sb)->si_generation; ++} ++ ++static inline struct au_branch *au_sbr(struct super_block *sb, ++ aufs_bindex_t bindex) ++{ ++ SiMustAnyLock(sb); ++ return au_sbi(sb)->si_branch[0 + bindex]; ++} ++ ++static inline loff_t au_xi_maxent(struct super_block *sb) ++{ ++ SiMustAnyLock(sb); ++ return au_sbi(sb)->si_ximaxent; ++} ++ ++#endif /* __KERNEL__ */ ++#endif /* __AUFS_SUPER_H__ */ +diff --git a/fs/aufs/sysaufs.c b/fs/aufs/sysaufs.c +new file mode 100644 +index 000000000000..e3f3489c7570 +--- /dev/null ++++ b/fs/aufs/sysaufs.c +@@ -0,0 +1,94 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * sysfs interface and lifetime management ++ * they are necessary regardless sysfs is disabled. ++ */ ++ ++#include <linux/random.h> ++#include "aufs.h" ++ ++unsigned long sysaufs_si_mask; ++struct kset *sysaufs_kset; ++ ++#define AuSiAttr(_name) { \ ++ .attr = { .name = __stringify(_name), .mode = 0444 }, \ ++ .show = sysaufs_si_##_name, \ ++} ++ ++static struct sysaufs_si_attr sysaufs_si_attr_xi_path = AuSiAttr(xi_path); ++struct attribute *sysaufs_si_attrs[] = { ++ &sysaufs_si_attr_xi_path.attr, ++ NULL, ++}; ++ATTRIBUTE_GROUPS(sysaufs_si); ++ ++static const struct sysfs_ops au_sbi_ops = { ++ .show = sysaufs_si_show ++}; ++ ++static struct kobj_type au_sbi_ktype = { ++ .release = au_si_free, ++ .sysfs_ops = &au_sbi_ops, ++ .default_groups = sysaufs_si_groups ++}; ++ ++/* ---------------------------------------------------------------------- */ ++ ++int sysaufs_si_init(struct au_sbinfo *sbinfo) ++{ ++ int err; ++ ++ sbinfo->si_kobj.kset = sysaufs_kset; ++ /* cf. sysaufs_name() */ ++ err = kobject_init_and_add ++ (&sbinfo->si_kobj, &au_sbi_ktype, /*&sysaufs_kset->kobj*/NULL, ++ SysaufsSiNamePrefix "%lx", sysaufs_si_id(sbinfo)); ++ ++ return err; ++} ++ ++void sysaufs_fin(void) ++{ ++ sysfs_remove_group(&sysaufs_kset->kobj, sysaufs_attr_group); ++ kset_unregister(sysaufs_kset); ++} ++ ++int __init sysaufs_init(void) ++{ ++ int err; ++ ++ do { ++ get_random_bytes(&sysaufs_si_mask, sizeof(sysaufs_si_mask)); ++ } while (!sysaufs_si_mask); ++ ++ err = -EINVAL; ++ sysaufs_kset = kset_create_and_add(AUFS_NAME, NULL, fs_kobj); ++ if (unlikely(!sysaufs_kset)) ++ goto out; ++ err = PTR_ERR(sysaufs_kset); ++ if (IS_ERR(sysaufs_kset)) ++ goto out; ++ err = sysfs_create_group(&sysaufs_kset->kobj, sysaufs_attr_group); ++ if (unlikely(err)) ++ kset_unregister(sysaufs_kset); ++ ++out: ++ return err; ++} +diff --git a/fs/aufs/sysaufs.h b/fs/aufs/sysaufs.h +new file mode 100644 +index 000000000000..3f7efd4510be +--- /dev/null ++++ b/fs/aufs/sysaufs.h +@@ -0,0 +1,102 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * sysfs interface and mount lifetime management ++ */ ++ ++#ifndef __SYSAUFS_H__ ++#define __SYSAUFS_H__ ++ ++#ifdef __KERNEL__ ++ ++#include <linux/sysfs.h> ++#include "module.h" ++ ++struct super_block; ++struct au_sbinfo; ++ ++struct sysaufs_si_attr { ++ struct attribute attr; ++ int (*show)(struct seq_file *seq, struct super_block *sb); ++}; ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* sysaufs.c */ ++extern unsigned long sysaufs_si_mask; ++extern struct kset *sysaufs_kset; ++extern struct attribute *sysaufs_si_attrs[]; ++int sysaufs_si_init(struct au_sbinfo *sbinfo); ++int __init sysaufs_init(void); ++void sysaufs_fin(void); ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* some people doesn't like to show a pointer in kernel */ ++static inline unsigned long sysaufs_si_id(struct au_sbinfo *sbinfo) ++{ ++ return sysaufs_si_mask ^ (unsigned long)sbinfo; ++} ++ ++#define SysaufsSiNamePrefix "si_" ++#define SysaufsSiNameLen (sizeof(SysaufsSiNamePrefix) + 16) ++static inline void sysaufs_name(struct au_sbinfo *sbinfo, char *name) ++{ ++ snprintf(name, SysaufsSiNameLen, SysaufsSiNamePrefix "%lx", ++ sysaufs_si_id(sbinfo)); ++} ++ ++struct au_branch; ++#ifdef CONFIG_SYSFS ++/* sysfs.c */ ++extern struct attribute_group *sysaufs_attr_group; ++ ++int sysaufs_si_xi_path(struct seq_file *seq, struct super_block *sb); ++ssize_t sysaufs_si_show(struct kobject *kobj, struct attribute *attr, ++ char *buf); ++long au_brinfo_ioctl(struct file *file, unsigned long arg); ++#ifdef CONFIG_COMPAT ++long au_brinfo_compat_ioctl(struct file *file, unsigned long arg); ++#endif ++ ++void sysaufs_br_init(struct au_branch *br); ++void sysaufs_brs_add(struct super_block *sb, aufs_bindex_t bindex); ++void sysaufs_brs_del(struct super_block *sb, aufs_bindex_t bindex); ++ ++#define sysaufs_brs_init() do {} while (0) ++ ++#else ++#define sysaufs_attr_group NULL ++ ++AuStubInt0(sysaufs_si_xi_path, struct seq_file *seq, struct super_block *sb) ++AuStub(ssize_t, sysaufs_si_show, return 0, struct kobject *kobj, ++ struct attribute *attr, char *buf) ++AuStubVoid(sysaufs_br_init, struct au_branch *br) ++AuStubVoid(sysaufs_brs_add, struct super_block *sb, aufs_bindex_t bindex) ++AuStubVoid(sysaufs_brs_del, struct super_block *sb, aufs_bindex_t bindex) ++ ++static inline void sysaufs_brs_init(void) ++{ ++ sysaufs_brs = 0; ++} ++ ++#endif /* CONFIG_SYSFS */ ++ ++#endif /* __KERNEL__ */ ++#endif /* __SYSAUFS_H__ */ +diff --git a/fs/aufs/sysfs.c b/fs/aufs/sysfs.c +new file mode 100644 +index 000000000000..4e8a4cfa9faa +--- /dev/null ++++ b/fs/aufs/sysfs.c +@@ -0,0 +1,374 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * sysfs interface ++ */ ++ ++#include <linux/compat.h> ++#include <linux/seq_file.h> ++#include "aufs.h" ++ ++#ifdef CONFIG_AUFS_FS_MODULE ++/* this entry violates the "one line per file" policy of sysfs */ ++static ssize_t config_show(struct kobject *kobj, struct kobj_attribute *attr, ++ char *buf) ++{ ++ ssize_t err; ++ static char *conf = ++/* this file is generated at compiling */ ++#include "conf.str" ++ ; ++ ++ err = snprintf(buf, PAGE_SIZE, conf); ++ if (unlikely(err >= PAGE_SIZE)) ++ err = -EFBIG; ++ return err; ++} ++ ++static struct kobj_attribute au_config_attr = __ATTR_RO(config); ++#endif ++ ++static struct attribute *au_attr[] = { ++#ifdef CONFIG_AUFS_FS_MODULE ++ &au_config_attr.attr, ++#endif ++ NULL, /* need to NULL terminate the list of attributes */ ++}; ++ ++static struct attribute_group sysaufs_attr_group_body = { ++ .attrs = au_attr ++}; ++ ++struct attribute_group *sysaufs_attr_group = &sysaufs_attr_group_body; ++ ++/* ---------------------------------------------------------------------- */ ++ ++int sysaufs_si_xi_path(struct seq_file *seq, struct super_block *sb) ++{ ++ int err; ++ ++ SiMustAnyLock(sb); ++ ++ err = 0; ++ if (au_opt_test(au_mntflags(sb), XINO)) { ++ err = au_xino_path(seq, au_sbi(sb)->si_xib); ++ seq_putc(seq, '\n'); ++ } ++ return err; ++} ++ ++/* ++ * the lifetime of branch is independent from the entry under sysfs. ++ * sysfs handles the lifetime of the entry, and never call ->show() after it is ++ * unlinked. ++ */ ++static int sysaufs_si_br(struct seq_file *seq, struct super_block *sb, ++ aufs_bindex_t bindex, int idx) ++{ ++ int err; ++ struct path path; ++ struct dentry *root; ++ struct au_branch *br; ++ au_br_perm_str_t perm; ++ ++ AuDbg("b%d\n", bindex); ++ ++ err = 0; ++ root = sb->s_root; ++ di_read_lock_parent(root, !AuLock_IR); ++ br = au_sbr(sb, bindex); ++ ++ switch (idx) { ++ case AuBrSysfs_BR: ++ path.mnt = au_br_mnt(br); ++ path.dentry = au_h_dptr(root, bindex); ++ err = au_seq_path(seq, &path); ++ if (!err) { ++ au_optstr_br_perm(&perm, br->br_perm); ++ seq_printf(seq, "=%s\n", perm.a); ++ } ++ break; ++ case AuBrSysfs_BRID: ++ seq_printf(seq, "%d\n", br->br_id); ++ break; ++ } ++ di_read_unlock(root, !AuLock_IR); ++ if (unlikely(err || seq_has_overflowed(seq))) ++ err = -E2BIG; ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static struct seq_file *au_seq(char *p, ssize_t len) ++{ ++ struct seq_file *seq; ++ ++ seq = kzalloc(sizeof(*seq), GFP_NOFS); ++ if (seq) { ++ /* mutex_init(&seq.lock); */ ++ seq->buf = p; ++ seq->size = len; ++ return seq; /* success */ ++ } ++ ++ seq = ERR_PTR(-ENOMEM); ++ return seq; ++} ++ ++#define SysaufsBr_PREFIX "br" ++#define SysaufsBrid_PREFIX "brid" ++ ++/* todo: file size may exceed PAGE_SIZE */ ++ssize_t sysaufs_si_show(struct kobject *kobj, struct attribute *attr, ++ char *buf) ++{ ++ ssize_t err; ++ int idx; ++ long l; ++ aufs_bindex_t bbot; ++ struct au_sbinfo *sbinfo; ++ struct super_block *sb; ++ struct seq_file *seq; ++ char *name; ++ struct attribute **cattr; ++ ++ sbinfo = container_of(kobj, struct au_sbinfo, si_kobj); ++ sb = sbinfo->si_sb; ++ ++ /* ++ * prevent a race condition between sysfs and aufs. ++ * for instance, sysfs_file_read() calls sysfs_get_active_two() which ++ * prohibits maintaining the sysfs entries. ++ * hew we acquire read lock after sysfs_get_active_two(). ++ * on the other hand, the remount process may maintain the sysfs/aufs ++ * entries after acquiring write lock. ++ * it can cause a deadlock. ++ * simply we gave up processing read here. ++ */ ++ err = -EBUSY; ++ if (unlikely(!si_noflush_read_trylock(sb))) ++ goto out; ++ ++ seq = au_seq(buf, PAGE_SIZE); ++ err = PTR_ERR(seq); ++ if (IS_ERR(seq)) ++ goto out_unlock; ++ ++ name = (void *)attr->name; ++ cattr = sysaufs_si_attrs; ++ while (*cattr) { ++ if (!strcmp(name, (*cattr)->name)) { ++ err = container_of(*cattr, struct sysaufs_si_attr, attr) ++ ->show(seq, sb); ++ goto out_seq; ++ } ++ cattr++; ++ } ++ ++ if (!strncmp(name, SysaufsBrid_PREFIX, ++ sizeof(SysaufsBrid_PREFIX) - 1)) { ++ idx = AuBrSysfs_BRID; ++ name += sizeof(SysaufsBrid_PREFIX) - 1; ++ } else if (!strncmp(name, SysaufsBr_PREFIX, ++ sizeof(SysaufsBr_PREFIX) - 1)) { ++ idx = AuBrSysfs_BR; ++ name += sizeof(SysaufsBr_PREFIX) - 1; ++ } else ++ BUG(); ++ ++ err = kstrtol(name, 10, &l); ++ if (!err) { ++ bbot = au_sbbot(sb); ++ if (l <= bbot) ++ err = sysaufs_si_br(seq, sb, (aufs_bindex_t)l, idx); ++ else ++ err = -ENOENT; ++ } ++ ++out_seq: ++ if (!err) { ++ err = seq->count; ++ /* sysfs limit */ ++ if (unlikely(err == PAGE_SIZE)) ++ err = -EFBIG; ++ } ++ au_kfree_rcu(seq); ++out_unlock: ++ si_read_unlock(sb); ++out: ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int au_brinfo(struct super_block *sb, union aufs_brinfo __user *arg) ++{ ++ int err; ++ int16_t brid; ++ aufs_bindex_t bindex, bbot; ++ size_t sz; ++ char *buf; ++ struct seq_file *seq; ++ struct au_branch *br; ++ ++ si_read_lock(sb, AuLock_FLUSH); ++ bbot = au_sbbot(sb); ++ err = bbot + 1; ++ if (!arg) ++ goto out; ++ ++ err = -ENOMEM; ++ buf = (void *)__get_free_page(GFP_NOFS); ++ if (unlikely(!buf)) ++ goto out; ++ ++ seq = au_seq(buf, PAGE_SIZE); ++ err = PTR_ERR(seq); ++ if (IS_ERR(seq)) ++ goto out_buf; ++ ++ sz = sizeof(*arg) - offsetof(union aufs_brinfo, path); ++ for (bindex = 0; bindex <= bbot; bindex++, arg++) { ++ /* VERIFY_WRITE */ ++ err = !access_ok(arg, sizeof(*arg)); ++ if (unlikely(err)) ++ break; ++ ++ br = au_sbr(sb, bindex); ++ brid = br->br_id; ++ BUILD_BUG_ON(sizeof(brid) != sizeof(arg->id)); ++ err = __put_user(brid, &arg->id); ++ if (unlikely(err)) ++ break; ++ ++ BUILD_BUG_ON(sizeof(br->br_perm) != sizeof(arg->perm)); ++ err = __put_user(br->br_perm, &arg->perm); ++ if (unlikely(err)) ++ break; ++ ++ err = au_seq_path(seq, &br->br_path); ++ if (unlikely(err)) ++ break; ++ seq_putc(seq, '\0'); ++ if (!seq_has_overflowed(seq)) { ++ err = copy_to_user(arg->path, seq->buf, seq->count); ++ seq->count = 0; ++ if (unlikely(err)) ++ break; ++ } else { ++ err = -E2BIG; ++ goto out_seq; ++ } ++ } ++ if (unlikely(err)) ++ err = -EFAULT; ++ ++out_seq: ++ au_kfree_rcu(seq); ++out_buf: ++ free_page((unsigned long)buf); ++out: ++ si_read_unlock(sb); ++ return err; ++} ++ ++long au_brinfo_ioctl(struct file *file, unsigned long arg) ++{ ++ return au_brinfo(file->f_path.dentry->d_sb, (void __user *)arg); ++} ++ ++#ifdef CONFIG_COMPAT ++long au_brinfo_compat_ioctl(struct file *file, unsigned long arg) ++{ ++ return au_brinfo(file->f_path.dentry->d_sb, compat_ptr(arg)); ++} ++#endif ++ ++/* ---------------------------------------------------------------------- */ ++ ++void sysaufs_br_init(struct au_branch *br) ++{ ++ int i; ++ struct au_brsysfs *br_sysfs; ++ struct attribute *attr; ++ ++ br_sysfs = br->br_sysfs; ++ for (i = 0; i < ARRAY_SIZE(br->br_sysfs); i++) { ++ attr = &br_sysfs->attr; ++ sysfs_attr_init(attr); ++ attr->name = br_sysfs->name; ++ attr->mode = 0444; ++ br_sysfs++; ++ } ++} ++ ++void sysaufs_brs_del(struct super_block *sb, aufs_bindex_t bindex) ++{ ++ struct au_branch *br; ++ struct kobject *kobj; ++ struct au_brsysfs *br_sysfs; ++ int i; ++ aufs_bindex_t bbot; ++ ++ if (!sysaufs_brs) ++ return; ++ ++ kobj = &au_sbi(sb)->si_kobj; ++ bbot = au_sbbot(sb); ++ for (; bindex <= bbot; bindex++) { ++ br = au_sbr(sb, bindex); ++ br_sysfs = br->br_sysfs; ++ for (i = 0; i < ARRAY_SIZE(br->br_sysfs); i++) { ++ sysfs_remove_file(kobj, &br_sysfs->attr); ++ br_sysfs++; ++ } ++ } ++} ++ ++void sysaufs_brs_add(struct super_block *sb, aufs_bindex_t bindex) ++{ ++ int err, i; ++ aufs_bindex_t bbot; ++ struct kobject *kobj; ++ struct au_branch *br; ++ struct au_brsysfs *br_sysfs; ++ ++ if (!sysaufs_brs) ++ return; ++ ++ kobj = &au_sbi(sb)->si_kobj; ++ bbot = au_sbbot(sb); ++ for (; bindex <= bbot; bindex++) { ++ br = au_sbr(sb, bindex); ++ br_sysfs = br->br_sysfs; ++ snprintf(br_sysfs[AuBrSysfs_BR].name, sizeof(br_sysfs->name), ++ SysaufsBr_PREFIX "%d", bindex); ++ snprintf(br_sysfs[AuBrSysfs_BRID].name, sizeof(br_sysfs->name), ++ SysaufsBrid_PREFIX "%d", bindex); ++ for (i = 0; i < ARRAY_SIZE(br->br_sysfs); i++) { ++ err = sysfs_create_file(kobj, &br_sysfs->attr); ++ if (unlikely(err)) ++ pr_warn("failed %s under sysfs(%d)\n", ++ br_sysfs->name, err); ++ br_sysfs++; ++ } ++ } ++} +diff --git a/fs/aufs/sysrq.c b/fs/aufs/sysrq.c +new file mode 100644 +index 000000000000..d4bdeafe2fe3 +--- /dev/null ++++ b/fs/aufs/sysrq.c +@@ -0,0 +1,149 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * magic sysrq handler ++ */ ++ ++/* #include <linux/sysrq.h> */ ++#include <linux/writeback.h> ++#include "aufs.h" ++ ++/* ---------------------------------------------------------------------- */ ++ ++static void sysrq_sb(struct super_block *sb) ++{ ++ char *plevel; ++ struct au_sbinfo *sbinfo; ++ struct file *file; ++ struct hlist_bl_head *files; ++ struct hlist_bl_node *pos; ++ struct au_finfo *finfo; ++ struct inode *i; ++ ++ plevel = au_plevel; ++ au_plevel = KERN_WARNING; ++ ++ /* since we define pr_fmt, call printk directly */ ++#define pr(str) printk(KERN_WARNING AUFS_NAME ": " str) ++ ++ sbinfo = au_sbi(sb); ++ printk(KERN_WARNING "si=%lx\n", sysaufs_si_id(sbinfo)); ++ pr("superblock\n"); ++ au_dpri_sb(sb); ++ ++#if 0 /* reserved */ ++ do { ++ int err, i, j, ndentry; ++ struct au_dcsub_pages dpages; ++ struct au_dpage *dpage; ++ ++ err = au_dpages_init(&dpages, GFP_ATOMIC); ++ if (unlikely(err)) ++ break; ++ err = au_dcsub_pages(&dpages, sb->s_root, NULL, NULL); ++ if (!err) ++ for (i = 0; i < dpages.ndpage; i++) { ++ dpage = dpages.dpages + i; ++ ndentry = dpage->ndentry; ++ for (j = 0; j < ndentry; j++) ++ au_dpri_dentry(dpage->dentries[j]); ++ } ++ au_dpages_free(&dpages); ++ } while (0); ++#endif ++ ++ pr("isolated inode\n"); ++ spin_lock(&sb->s_inode_list_lock); ++ list_for_each_entry(i, &sb->s_inodes, i_sb_list) { ++ spin_lock(&i->i_lock); ++ if (hlist_empty(&i->i_dentry)) ++ au_dpri_inode(i); ++ spin_unlock(&i->i_lock); ++ } ++ spin_unlock(&sb->s_inode_list_lock); ++ ++ pr("files\n"); ++ files = &au_sbi(sb)->si_files; ++ hlist_bl_lock(files); ++ hlist_bl_for_each_entry(finfo, pos, files, fi_hlist) { ++ umode_t mode; ++ ++ file = finfo->fi_file; ++ mode = file_inode(file)->i_mode; ++ if (!special_file(mode)) ++ au_dpri_file(file); ++ } ++ hlist_bl_unlock(files); ++ pr("done\n"); ++ ++#undef pr ++ au_plevel = plevel; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* module parameter */ ++static char *aufs_sysrq_key = "a"; ++module_param_named(sysrq, aufs_sysrq_key, charp, 0444); ++MODULE_PARM_DESC(sysrq, "MagicSysRq key for " AUFS_NAME); ++ ++static void au_sysrq(int key __maybe_unused) ++{ ++ struct au_sbinfo *sbinfo; ++ struct hlist_bl_node *pos; ++ ++ lockdep_off(); ++ au_sbilist_lock(); ++ hlist_bl_for_each_entry(sbinfo, pos, &au_sbilist, si_list) ++ sysrq_sb(sbinfo->si_sb); ++ au_sbilist_unlock(); ++ lockdep_on(); ++} ++ ++static struct sysrq_key_op au_sysrq_op = { ++ .handler = au_sysrq, ++ .help_msg = "Aufs", ++ .action_msg = "Aufs", ++ .enable_mask = SYSRQ_ENABLE_DUMP ++}; ++ ++/* ---------------------------------------------------------------------- */ ++ ++int __init au_sysrq_init(void) ++{ ++ int err; ++ char key; ++ ++ err = -1; ++ key = *aufs_sysrq_key; ++ if ('a' <= key && key <= 'z') ++ err = register_sysrq_key(key, &au_sysrq_op); ++ if (unlikely(err)) ++ pr_err("err %d, sysrq=%c\n", err, key); ++ return err; ++} ++ ++void au_sysrq_fin(void) ++{ ++ int err; ++ ++ err = unregister_sysrq_key(*aufs_sysrq_key, &au_sysrq_op); ++ if (unlikely(err)) ++ pr_err("err %d (ignored)\n", err); ++} +diff --git a/fs/aufs/vdir.c b/fs/aufs/vdir.c +new file mode 100644 +index 000000000000..fdf7644049c5 +--- /dev/null ++++ b/fs/aufs/vdir.c +@@ -0,0 +1,896 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * virtual or vertical directory ++ */ ++ ++#include <linux/iversion.h> ++#include "aufs.h" ++ ++static unsigned int calc_size(int nlen) ++{ ++ return ALIGN(sizeof(struct au_vdir_de) + nlen, sizeof(ino_t)); ++} ++ ++static int set_deblk_end(union au_vdir_deblk_p *p, ++ union au_vdir_deblk_p *deblk_end) ++{ ++ if (calc_size(0) <= deblk_end->deblk - p->deblk) { ++ p->de->de_str.len = 0; ++ /* smp_mb(); */ ++ return 0; ++ } ++ return -1; /* error */ ++} ++ ++/* returns true or false */ ++static int is_deblk_end(union au_vdir_deblk_p *p, ++ union au_vdir_deblk_p *deblk_end) ++{ ++ if (calc_size(0) <= deblk_end->deblk - p->deblk) ++ return !p->de->de_str.len; ++ return 1; ++} ++ ++static unsigned char *last_deblk(struct au_vdir *vdir) ++{ ++ return vdir->vd_deblk[vdir->vd_nblk - 1]; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* estimate the appropriate size for name hash table */ ++unsigned int au_rdhash_est(loff_t sz) ++{ ++ unsigned int n; ++ ++ n = UINT_MAX; ++ sz >>= 10; ++ if (sz < n) ++ n = sz; ++ if (sz < AUFS_RDHASH_DEF) ++ n = AUFS_RDHASH_DEF; ++ /* pr_info("n %u\n", n); */ ++ return n; ++} ++ ++/* ++ * the allocated memory has to be freed by ++ * au_nhash_wh_free() or au_nhash_de_free(). ++ */ ++int au_nhash_alloc(struct au_nhash *nhash, unsigned int num_hash, gfp_t gfp) ++{ ++ struct hlist_head *head; ++ unsigned int u; ++ size_t sz; ++ ++ sz = sizeof(*nhash->nh_head) * num_hash; ++ head = kmalloc(sz, gfp); ++ if (head) { ++ nhash->nh_num = num_hash; ++ nhash->nh_head = head; ++ for (u = 0; u < num_hash; u++) ++ INIT_HLIST_HEAD(head++); ++ return 0; /* success */ ++ } ++ ++ return -ENOMEM; ++} ++ ++static void nhash_count(struct hlist_head *head) ++{ ++#if 0 /* debugging */ ++ unsigned long n; ++ struct hlist_node *pos; ++ ++ n = 0; ++ hlist_for_each(pos, head) ++ n++; ++ pr_info("%lu\n", n); ++#endif ++} ++ ++static void au_nhash_wh_do_free(struct hlist_head *head) ++{ ++ struct au_vdir_wh *pos; ++ struct hlist_node *node; ++ ++ hlist_for_each_entry_safe(pos, node, head, wh_hash) ++ au_kfree_rcu(pos); ++} ++ ++static void au_nhash_de_do_free(struct hlist_head *head) ++{ ++ struct au_vdir_dehstr *pos; ++ struct hlist_node *node; ++ ++ hlist_for_each_entry_safe(pos, node, head, hash) ++ au_cache_free_vdir_dehstr(pos); ++} ++ ++static void au_nhash_do_free(struct au_nhash *nhash, ++ void (*free)(struct hlist_head *head)) ++{ ++ unsigned int n; ++ struct hlist_head *head; ++ ++ n = nhash->nh_num; ++ if (!n) ++ return; ++ ++ head = nhash->nh_head; ++ while (n-- > 0) { ++ nhash_count(head); ++ free(head++); ++ } ++ au_kfree_try_rcu(nhash->nh_head); ++} ++ ++void au_nhash_wh_free(struct au_nhash *whlist) ++{ ++ au_nhash_do_free(whlist, au_nhash_wh_do_free); ++} ++ ++static void au_nhash_de_free(struct au_nhash *delist) ++{ ++ au_nhash_do_free(delist, au_nhash_de_do_free); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++int au_nhash_test_longer_wh(struct au_nhash *whlist, aufs_bindex_t btgt, ++ int limit) ++{ ++ int num; ++ unsigned int u, n; ++ struct hlist_head *head; ++ struct au_vdir_wh *pos; ++ ++ num = 0; ++ n = whlist->nh_num; ++ head = whlist->nh_head; ++ for (u = 0; u < n; u++, head++) ++ hlist_for_each_entry(pos, head, wh_hash) ++ if (pos->wh_bindex == btgt && ++num > limit) ++ return 1; ++ return 0; ++} ++ ++static struct hlist_head *au_name_hash(struct au_nhash *nhash, ++ unsigned char *name, ++ unsigned int len) ++{ ++ unsigned int v; ++ /* const unsigned int magic_bit = 12; */ ++ ++ AuDebugOn(!nhash->nh_num || !nhash->nh_head); ++ ++ v = 0; ++ if (len > 8) ++ len = 8; ++ while (len--) ++ v += *name++; ++ /* v = hash_long(v, magic_bit); */ ++ v %= nhash->nh_num; ++ return nhash->nh_head + v; ++} ++ ++static int au_nhash_test_name(struct au_vdir_destr *str, const char *name, ++ int nlen) ++{ ++ return str->len == nlen && !memcmp(str->name, name, nlen); ++} ++ ++/* returns found or not */ ++int au_nhash_test_known_wh(struct au_nhash *whlist, char *name, int nlen) ++{ ++ struct hlist_head *head; ++ struct au_vdir_wh *pos; ++ struct au_vdir_destr *str; ++ ++ head = au_name_hash(whlist, name, nlen); ++ hlist_for_each_entry(pos, head, wh_hash) { ++ str = &pos->wh_str; ++ AuDbg("%.*s\n", str->len, str->name); ++ if (au_nhash_test_name(str, name, nlen)) ++ return 1; ++ } ++ return 0; ++} ++ ++/* returns found(true) or not */ ++static int test_known(struct au_nhash *delist, char *name, int nlen) ++{ ++ struct hlist_head *head; ++ struct au_vdir_dehstr *pos; ++ struct au_vdir_destr *str; ++ ++ head = au_name_hash(delist, name, nlen); ++ hlist_for_each_entry(pos, head, hash) { ++ str = pos->str; ++ AuDbg("%.*s\n", str->len, str->name); ++ if (au_nhash_test_name(str, name, nlen)) ++ return 1; ++ } ++ return 0; ++} ++ ++static void au_shwh_init_wh(struct au_vdir_wh *wh, ino_t ino, ++ unsigned char d_type) ++{ ++#ifdef CONFIG_AUFS_SHWH ++ wh->wh_ino = ino; ++ wh->wh_type = d_type; ++#endif ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++int au_nhash_append_wh(struct au_nhash *whlist, char *name, int nlen, ino_t ino, ++ unsigned int d_type, aufs_bindex_t bindex, ++ unsigned char shwh) ++{ ++ int err; ++ struct au_vdir_destr *str; ++ struct au_vdir_wh *wh; ++ ++ AuDbg("%.*s\n", nlen, name); ++ AuDebugOn(!whlist->nh_num || !whlist->nh_head); ++ ++ err = -ENOMEM; ++ wh = kmalloc(sizeof(*wh) + nlen, GFP_NOFS); ++ if (unlikely(!wh)) ++ goto out; ++ ++ err = 0; ++ wh->wh_bindex = bindex; ++ if (shwh) ++ au_shwh_init_wh(wh, ino, d_type); ++ str = &wh->wh_str; ++ str->len = nlen; ++ memcpy(str->name, name, nlen); ++ hlist_add_head(&wh->wh_hash, au_name_hash(whlist, name, nlen)); ++ /* smp_mb(); */ ++ ++out: ++ return err; ++} ++ ++static int append_deblk(struct au_vdir *vdir) ++{ ++ int err; ++ unsigned long ul; ++ const unsigned int deblk_sz = vdir->vd_deblk_sz; ++ union au_vdir_deblk_p p, deblk_end; ++ unsigned char **o; ++ ++ err = -ENOMEM; ++ o = au_krealloc(vdir->vd_deblk, sizeof(*o) * (vdir->vd_nblk + 1), ++ GFP_NOFS, /*may_shrink*/0); ++ if (unlikely(!o)) ++ goto out; ++ ++ vdir->vd_deblk = o; ++ p.deblk = kmalloc(deblk_sz, GFP_NOFS); ++ if (p.deblk) { ++ ul = vdir->vd_nblk++; ++ vdir->vd_deblk[ul] = p.deblk; ++ vdir->vd_last.ul = ul; ++ vdir->vd_last.p.deblk = p.deblk; ++ deblk_end.deblk = p.deblk + deblk_sz; ++ err = set_deblk_end(&p, &deblk_end); ++ } ++ ++out: ++ return err; ++} ++ ++static int append_de(struct au_vdir *vdir, char *name, int nlen, ino_t ino, ++ unsigned int d_type, struct au_nhash *delist) ++{ ++ int err; ++ unsigned int sz; ++ const unsigned int deblk_sz = vdir->vd_deblk_sz; ++ union au_vdir_deblk_p p, *room, deblk_end; ++ struct au_vdir_dehstr *dehstr; ++ ++ p.deblk = last_deblk(vdir); ++ deblk_end.deblk = p.deblk + deblk_sz; ++ room = &vdir->vd_last.p; ++ AuDebugOn(room->deblk < p.deblk || deblk_end.deblk <= room->deblk ++ || !is_deblk_end(room, &deblk_end)); ++ ++ sz = calc_size(nlen); ++ if (unlikely(sz > deblk_end.deblk - room->deblk)) { ++ err = append_deblk(vdir); ++ if (unlikely(err)) ++ goto out; ++ ++ p.deblk = last_deblk(vdir); ++ deblk_end.deblk = p.deblk + deblk_sz; ++ /* smp_mb(); */ ++ AuDebugOn(room->deblk != p.deblk); ++ } ++ ++ err = -ENOMEM; ++ dehstr = au_cache_alloc_vdir_dehstr(); ++ if (unlikely(!dehstr)) ++ goto out; ++ ++ dehstr->str = &room->de->de_str; ++ hlist_add_head(&dehstr->hash, au_name_hash(delist, name, nlen)); ++ room->de->de_ino = ino; ++ room->de->de_type = d_type; ++ room->de->de_str.len = nlen; ++ memcpy(room->de->de_str.name, name, nlen); ++ ++ err = 0; ++ room->deblk += sz; ++ if (unlikely(set_deblk_end(room, &deblk_end))) ++ err = append_deblk(vdir); ++ /* smp_mb(); */ ++ ++out: ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++void au_vdir_free(struct au_vdir *vdir) ++{ ++ unsigned char **deblk; ++ ++ deblk = vdir->vd_deblk; ++ while (vdir->vd_nblk--) ++ au_kfree_try_rcu(*deblk++); ++ au_kfree_try_rcu(vdir->vd_deblk); ++ au_cache_free_vdir(vdir); ++} ++ ++static struct au_vdir *alloc_vdir(struct file *file) ++{ ++ struct au_vdir *vdir; ++ struct super_block *sb; ++ int err; ++ ++ sb = file->f_path.dentry->d_sb; ++ SiMustAnyLock(sb); ++ ++ err = -ENOMEM; ++ vdir = au_cache_alloc_vdir(); ++ if (unlikely(!vdir)) ++ goto out; ++ ++ vdir->vd_deblk = kzalloc(sizeof(*vdir->vd_deblk), GFP_NOFS); ++ if (unlikely(!vdir->vd_deblk)) ++ goto out_free; ++ ++ vdir->vd_deblk_sz = au_sbi(sb)->si_rdblk; ++ if (!vdir->vd_deblk_sz) { ++ /* estimate the appropriate size for deblk */ ++ vdir->vd_deblk_sz = au_dir_size(file, /*dentry*/NULL); ++ /* pr_info("vd_deblk_sz %u\n", vdir->vd_deblk_sz); */ ++ } ++ vdir->vd_nblk = 0; ++ vdir->vd_version = 0; ++ vdir->vd_jiffy = 0; ++ err = append_deblk(vdir); ++ if (!err) ++ return vdir; /* success */ ++ ++ au_kfree_try_rcu(vdir->vd_deblk); ++ ++out_free: ++ au_cache_free_vdir(vdir); ++out: ++ vdir = ERR_PTR(err); ++ return vdir; ++} ++ ++static int reinit_vdir(struct au_vdir *vdir) ++{ ++ int err; ++ union au_vdir_deblk_p p, deblk_end; ++ ++ while (vdir->vd_nblk > 1) { ++ au_kfree_try_rcu(vdir->vd_deblk[vdir->vd_nblk - 1]); ++ /* vdir->vd_deblk[vdir->vd_nblk - 1] = NULL; */ ++ vdir->vd_nblk--; ++ } ++ p.deblk = vdir->vd_deblk[0]; ++ deblk_end.deblk = p.deblk + vdir->vd_deblk_sz; ++ err = set_deblk_end(&p, &deblk_end); ++ /* keep vd_dblk_sz */ ++ vdir->vd_last.ul = 0; ++ vdir->vd_last.p.deblk = vdir->vd_deblk[0]; ++ vdir->vd_version = 0; ++ vdir->vd_jiffy = 0; ++ /* smp_mb(); */ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++#define AuFillVdir_CALLED 1 ++#define AuFillVdir_WHABLE (1 << 1) ++#define AuFillVdir_SHWH (1 << 2) ++#define au_ftest_fillvdir(flags, name) ((flags) & AuFillVdir_##name) ++#define au_fset_fillvdir(flags, name) \ ++ do { (flags) |= AuFillVdir_##name; } while (0) ++#define au_fclr_fillvdir(flags, name) \ ++ do { (flags) &= ~AuFillVdir_##name; } while (0) ++ ++#ifndef CONFIG_AUFS_SHWH ++#undef AuFillVdir_SHWH ++#define AuFillVdir_SHWH 0 ++#endif ++ ++struct fillvdir_arg { ++ struct dir_context ctx; ++ struct file *file; ++ struct au_vdir *vdir; ++ struct au_nhash delist; ++ struct au_nhash whlist; ++ aufs_bindex_t bindex; ++ unsigned int flags; ++ int err; ++}; ++ ++static bool fillvdir(struct dir_context *ctx, const char *__name, int nlen, ++ loff_t offset __maybe_unused, u64 h_ino, ++ unsigned int d_type) ++{ ++ struct fillvdir_arg *arg = container_of(ctx, struct fillvdir_arg, ctx); ++ char *name = (void *)__name; ++ struct super_block *sb; ++ ino_t ino; ++ const unsigned char shwh = !!au_ftest_fillvdir(arg->flags, SHWH); ++ ++ arg->err = 0; ++ sb = arg->file->f_path.dentry->d_sb; ++ au_fset_fillvdir(arg->flags, CALLED); ++ /* smp_mb(); */ ++ if (nlen <= AUFS_WH_PFX_LEN ++ || memcmp(name, AUFS_WH_PFX, AUFS_WH_PFX_LEN)) { ++ if (test_known(&arg->delist, name, nlen) ++ || au_nhash_test_known_wh(&arg->whlist, name, nlen)) ++ goto out; /* already exists or whiteouted */ ++ ++ arg->err = au_ino(sb, arg->bindex, h_ino, d_type, &ino); ++ if (!arg->err) { ++ if (unlikely(nlen > AUFS_MAX_NAMELEN)) ++ d_type = DT_UNKNOWN; ++ arg->err = append_de(arg->vdir, name, nlen, ino, ++ d_type, &arg->delist); ++ } ++ } else if (au_ftest_fillvdir(arg->flags, WHABLE)) { ++ name += AUFS_WH_PFX_LEN; ++ nlen -= AUFS_WH_PFX_LEN; ++ if (au_nhash_test_known_wh(&arg->whlist, name, nlen)) ++ goto out; /* already whiteouted */ ++ ++ ino = 0; /* just to suppress a warning */ ++ if (shwh) ++ arg->err = au_wh_ino(sb, arg->bindex, h_ino, d_type, ++ &ino); ++ if (!arg->err) { ++ if (nlen <= AUFS_MAX_NAMELEN + AUFS_WH_PFX_LEN) ++ d_type = DT_UNKNOWN; ++ arg->err = au_nhash_append_wh ++ (&arg->whlist, name, nlen, ino, d_type, ++ arg->bindex, shwh); ++ } ++ } ++ ++out: ++ if (!arg->err) ++ arg->vdir->vd_jiffy = jiffies; ++ /* smp_mb(); */ ++ AuTraceErr(arg->err); ++ return !arg->err; ++} ++ ++static int au_handle_shwh(struct super_block *sb, struct au_vdir *vdir, ++ struct au_nhash *whlist, struct au_nhash *delist) ++{ ++#ifdef CONFIG_AUFS_SHWH ++ int err; ++ unsigned int nh, u; ++ struct hlist_head *head; ++ struct au_vdir_wh *pos; ++ struct hlist_node *n; ++ char *p, *o; ++ struct au_vdir_destr *destr; ++ ++ AuDebugOn(!au_opt_test(au_mntflags(sb), SHWH)); ++ ++ err = -ENOMEM; ++ o = p = (void *)__get_free_page(GFP_NOFS); ++ if (unlikely(!p)) ++ goto out; ++ ++ err = 0; ++ nh = whlist->nh_num; ++ memcpy(p, AUFS_WH_PFX, AUFS_WH_PFX_LEN); ++ p += AUFS_WH_PFX_LEN; ++ for (u = 0; u < nh; u++) { ++ head = whlist->nh_head + u; ++ hlist_for_each_entry_safe(pos, n, head, wh_hash) { ++ destr = &pos->wh_str; ++ memcpy(p, destr->name, destr->len); ++ err = append_de(vdir, o, destr->len + AUFS_WH_PFX_LEN, ++ pos->wh_ino, pos->wh_type, delist); ++ if (unlikely(err)) ++ break; ++ } ++ } ++ ++ free_page((unsigned long)o); ++ ++out: ++ AuTraceErr(err); ++ return err; ++#else ++ return 0; ++#endif ++} ++ ++static int au_do_read_vdir(struct fillvdir_arg *arg) ++{ ++ int err; ++ unsigned int rdhash; ++ loff_t offset; ++ aufs_bindex_t bbot, bindex, btop; ++ unsigned char shwh; ++ struct file *hf, *file; ++ struct super_block *sb; ++ ++ file = arg->file; ++ sb = file->f_path.dentry->d_sb; ++ SiMustAnyLock(sb); ++ ++ rdhash = au_sbi(sb)->si_rdhash; ++ if (!rdhash) ++ rdhash = au_rdhash_est(au_dir_size(file, /*dentry*/NULL)); ++ err = au_nhash_alloc(&arg->delist, rdhash, GFP_NOFS); ++ if (unlikely(err)) ++ goto out; ++ err = au_nhash_alloc(&arg->whlist, rdhash, GFP_NOFS); ++ if (unlikely(err)) ++ goto out_delist; ++ ++ err = 0; ++ arg->flags = 0; ++ shwh = 0; ++ if (au_opt_test(au_mntflags(sb), SHWH)) { ++ shwh = 1; ++ au_fset_fillvdir(arg->flags, SHWH); ++ } ++ btop = au_fbtop(file); ++ bbot = au_fbbot_dir(file); ++ for (bindex = btop; !err && bindex <= bbot; bindex++) { ++ hf = au_hf_dir(file, bindex); ++ if (!hf) ++ continue; ++ ++ offset = vfsub_llseek(hf, 0, SEEK_SET); ++ err = offset; ++ if (unlikely(offset)) ++ break; ++ ++ arg->bindex = bindex; ++ au_fclr_fillvdir(arg->flags, WHABLE); ++ if (shwh ++ || (bindex != bbot ++ && au_br_whable(au_sbr_perm(sb, bindex)))) ++ au_fset_fillvdir(arg->flags, WHABLE); ++ do { ++ arg->err = 0; ++ au_fclr_fillvdir(arg->flags, CALLED); ++ /* smp_mb(); */ ++ err = vfsub_iterate_dir(hf, &arg->ctx); ++ if (err >= 0) ++ err = arg->err; ++ } while (!err && au_ftest_fillvdir(arg->flags, CALLED)); ++ ++ /* ++ * dir_relax() may be good for concurrency, but aufs should not ++ * use it since it will cause a lockdep problem. ++ */ ++ } ++ ++ if (!err && shwh) ++ err = au_handle_shwh(sb, arg->vdir, &arg->whlist, &arg->delist); ++ ++ au_nhash_wh_free(&arg->whlist); ++ ++out_delist: ++ au_nhash_de_free(&arg->delist); ++out: ++ return err; ++} ++ ++static int read_vdir(struct file *file, int may_read) ++{ ++ int err; ++ unsigned long expire; ++ unsigned char do_read; ++ struct fillvdir_arg arg = { ++ .ctx = { ++ .actor = fillvdir ++ } ++ }; ++ struct inode *inode; ++ struct au_vdir *vdir, *allocated; ++ ++ err = 0; ++ inode = file_inode(file); ++ IMustLock(inode); ++ IiMustWriteLock(inode); ++ SiMustAnyLock(inode->i_sb); ++ ++ allocated = NULL; ++ do_read = 0; ++ expire = au_sbi(inode->i_sb)->si_rdcache; ++ vdir = au_ivdir(inode); ++ if (!vdir) { ++ do_read = 1; ++ vdir = alloc_vdir(file); ++ err = PTR_ERR(vdir); ++ if (IS_ERR(vdir)) ++ goto out; ++ err = 0; ++ allocated = vdir; ++ } else if (may_read ++ && (!inode_eq_iversion(inode, vdir->vd_version) ++ || time_after(jiffies, vdir->vd_jiffy + expire))) { ++ do_read = 1; ++ err = reinit_vdir(vdir); ++ if (unlikely(err)) ++ goto out; ++ } ++ ++ if (!do_read) ++ return 0; /* success */ ++ ++ arg.file = file; ++ arg.vdir = vdir; ++ err = au_do_read_vdir(&arg); ++ if (!err) { ++ /* file->f_pos = 0; */ /* todo: ctx->pos? */ ++ vdir->vd_version = inode_query_iversion(inode); ++ vdir->vd_last.ul = 0; ++ vdir->vd_last.p.deblk = vdir->vd_deblk[0]; ++ if (allocated) ++ au_set_ivdir(inode, allocated); ++ } else if (allocated) ++ au_vdir_free(allocated); ++ ++out: ++ return err; ++} ++ ++static int copy_vdir(struct au_vdir *tgt, struct au_vdir *src) ++{ ++ int err, rerr; ++ unsigned long ul, n; ++ const unsigned int deblk_sz = src->vd_deblk_sz; ++ ++ AuDebugOn(tgt->vd_nblk != 1); ++ ++ err = -ENOMEM; ++ if (tgt->vd_nblk < src->vd_nblk) { ++ unsigned char **p; ++ ++ p = au_krealloc(tgt->vd_deblk, sizeof(*p) * src->vd_nblk, ++ GFP_NOFS, /*may_shrink*/0); ++ if (unlikely(!p)) ++ goto out; ++ tgt->vd_deblk = p; ++ } ++ ++ if (tgt->vd_deblk_sz != deblk_sz) { ++ unsigned char *p; ++ ++ tgt->vd_deblk_sz = deblk_sz; ++ p = au_krealloc(tgt->vd_deblk[0], deblk_sz, GFP_NOFS, ++ /*may_shrink*/1); ++ if (unlikely(!p)) ++ goto out; ++ tgt->vd_deblk[0] = p; ++ } ++ memcpy(tgt->vd_deblk[0], src->vd_deblk[0], deblk_sz); ++ tgt->vd_version = src->vd_version; ++ tgt->vd_jiffy = src->vd_jiffy; ++ ++ n = src->vd_nblk; ++ for (ul = 1; ul < n; ul++) { ++ tgt->vd_deblk[ul] = kmemdup(src->vd_deblk[ul], deblk_sz, ++ GFP_NOFS); ++ if (unlikely(!tgt->vd_deblk[ul])) ++ goto out; ++ tgt->vd_nblk++; ++ } ++ tgt->vd_nblk = n; ++ tgt->vd_last.ul = tgt->vd_last.ul; ++ tgt->vd_last.p.deblk = tgt->vd_deblk[tgt->vd_last.ul]; ++ tgt->vd_last.p.deblk += src->vd_last.p.deblk ++ - src->vd_deblk[src->vd_last.ul]; ++ /* smp_mb(); */ ++ return 0; /* success */ ++ ++out: ++ rerr = reinit_vdir(tgt); ++ BUG_ON(rerr); ++ return err; ++} ++ ++int au_vdir_init(struct file *file) ++{ ++ int err; ++ struct inode *inode; ++ struct au_vdir *vdir_cache, *allocated; ++ ++ /* test file->f_pos here instead of ctx->pos */ ++ err = read_vdir(file, !file->f_pos); ++ if (unlikely(err)) ++ goto out; ++ ++ allocated = NULL; ++ vdir_cache = au_fvdir_cache(file); ++ if (!vdir_cache) { ++ vdir_cache = alloc_vdir(file); ++ err = PTR_ERR(vdir_cache); ++ if (IS_ERR(vdir_cache)) ++ goto out; ++ allocated = vdir_cache; ++ } else if (!file->f_pos && vdir_cache->vd_version != file->f_version) { ++ /* test file->f_pos here instead of ctx->pos */ ++ err = reinit_vdir(vdir_cache); ++ if (unlikely(err)) ++ goto out; ++ } else ++ return 0; /* success */ ++ ++ inode = file_inode(file); ++ err = copy_vdir(vdir_cache, au_ivdir(inode)); ++ if (!err) { ++ file->f_version = inode_query_iversion(inode); ++ if (allocated) ++ au_set_fvdir_cache(file, allocated); ++ } else if (allocated) ++ au_vdir_free(allocated); ++ ++out: ++ return err; ++} ++ ++static loff_t calc_offset(struct au_vdir *vdir) ++{ ++ loff_t offset; ++ union au_vdir_deblk_p p; ++ ++ p.deblk = vdir->vd_deblk[vdir->vd_last.ul]; ++ offset = vdir->vd_last.p.deblk - p.deblk; ++ offset += vdir->vd_deblk_sz * vdir->vd_last.ul; ++ return offset; ++} ++ ++/* returns true or false */ ++static int seek_vdir(struct file *file, struct dir_context *ctx) ++{ ++ int valid; ++ unsigned int deblk_sz; ++ unsigned long ul, n; ++ loff_t offset; ++ union au_vdir_deblk_p p, deblk_end; ++ struct au_vdir *vdir_cache; ++ ++ valid = 1; ++ vdir_cache = au_fvdir_cache(file); ++ offset = calc_offset(vdir_cache); ++ AuDbg("offset %lld\n", offset); ++ if (ctx->pos == offset) ++ goto out; ++ ++ vdir_cache->vd_last.ul = 0; ++ vdir_cache->vd_last.p.deblk = vdir_cache->vd_deblk[0]; ++ if (!ctx->pos) ++ goto out; ++ ++ valid = 0; ++ deblk_sz = vdir_cache->vd_deblk_sz; ++ ul = div64_u64(ctx->pos, deblk_sz); ++ AuDbg("ul %lu\n", ul); ++ if (ul >= vdir_cache->vd_nblk) ++ goto out; ++ ++ n = vdir_cache->vd_nblk; ++ for (; ul < n; ul++) { ++ p.deblk = vdir_cache->vd_deblk[ul]; ++ deblk_end.deblk = p.deblk + deblk_sz; ++ offset = ul; ++ offset *= deblk_sz; ++ while (!is_deblk_end(&p, &deblk_end) && offset < ctx->pos) { ++ unsigned int l; ++ ++ l = calc_size(p.de->de_str.len); ++ offset += l; ++ p.deblk += l; ++ } ++ if (!is_deblk_end(&p, &deblk_end)) { ++ valid = 1; ++ vdir_cache->vd_last.ul = ul; ++ vdir_cache->vd_last.p = p; ++ break; ++ } ++ } ++ ++out: ++ /* smp_mb(); */ ++ if (!valid) ++ AuDbg("valid %d\n", !valid); ++ return valid; ++} ++ ++int au_vdir_fill_de(struct file *file, struct dir_context *ctx) ++{ ++ unsigned int l, deblk_sz; ++ union au_vdir_deblk_p deblk_end; ++ struct au_vdir *vdir_cache; ++ struct au_vdir_de *de; ++ ++ if (!seek_vdir(file, ctx)) ++ return 0; ++ ++ vdir_cache = au_fvdir_cache(file); ++ deblk_sz = vdir_cache->vd_deblk_sz; ++ while (1) { ++ deblk_end.deblk = vdir_cache->vd_deblk[vdir_cache->vd_last.ul]; ++ deblk_end.deblk += deblk_sz; ++ while (!is_deblk_end(&vdir_cache->vd_last.p, &deblk_end)) { ++ de = vdir_cache->vd_last.p.de; ++ AuDbg("%.*s, off%lld, i%lu, dt%d\n", ++ de->de_str.len, de->de_str.name, ctx->pos, ++ (unsigned long)de->de_ino, de->de_type); ++ if (unlikely(!dir_emit(ctx, de->de_str.name, ++ de->de_str.len, de->de_ino, ++ de->de_type))) { ++ /* todo: ignore the error caused by udba? */ ++ /* return err; */ ++ return 0; ++ } ++ ++ l = calc_size(de->de_str.len); ++ vdir_cache->vd_last.p.deblk += l; ++ ctx->pos += l; ++ } ++ if (vdir_cache->vd_last.ul < vdir_cache->vd_nblk - 1) { ++ vdir_cache->vd_last.ul++; ++ vdir_cache->vd_last.p.deblk ++ = vdir_cache->vd_deblk[vdir_cache->vd_last.ul]; ++ ctx->pos = deblk_sz * vdir_cache->vd_last.ul; ++ continue; ++ } ++ break; ++ } ++ ++ /* smp_mb(); */ ++ return 0; ++} +diff --git a/fs/aufs/vfsub.c b/fs/aufs/vfsub.c +new file mode 100644 +index 000000000000..2fb5f1ac0b31 +--- /dev/null ++++ b/fs/aufs/vfsub.c +@@ -0,0 +1,918 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * sub-routines for VFS ++ */ ++ ++#include <linux/mnt_namespace.h> ++#include <linux/nsproxy.h> ++#include <linux/security.h> ++#include <linux/splice.h> ++#include "aufs.h" ++ ++#ifdef CONFIG_AUFS_BR_FUSE ++int vfsub_test_mntns(struct vfsmount *mnt, struct super_block *h_sb) ++{ ++ if (!au_test_fuse(h_sb) || !au_userns) ++ return 0; ++ ++ return is_current_mnt_ns(mnt) ? 0 : -EACCES; ++} ++#endif ++ ++int vfsub_sync_filesystem(struct super_block *h_sb) ++{ ++ int err; ++ ++ lockdep_off(); ++ down_read(&h_sb->s_umount); ++ err = sync_filesystem(h_sb); ++ up_read(&h_sb->s_umount); ++ lockdep_on(); ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++int vfsub_update_h_iattr(struct path *h_path, int *did) ++{ ++ int err; ++ struct kstat st; ++ struct super_block *h_sb; ++ ++ /* ++ * Always needs h_path->mnt for LSM or FUSE branch. ++ */ ++ AuDebugOn(!h_path->mnt); ++ ++ /* for remote fs, leave work for its getattr or d_revalidate */ ++ /* for bad i_attr fs, handle them in aufs_getattr() */ ++ /* still some fs may acquire i_mutex. we need to skip them */ ++ err = 0; ++ if (!did) ++ did = &err; ++ h_sb = h_path->dentry->d_sb; ++ *did = (!au_test_fs_remote(h_sb) && au_test_fs_refresh_iattr(h_sb)); ++ if (*did) ++ err = vfsub_getattr(h_path, &st); ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++struct file *vfsub_dentry_open(struct path *path, int flags) ++{ ++ return dentry_open(path, flags /* | __FMODE_NONOTIFY */, ++ current_cred()); ++} ++ ++struct file *vfsub_filp_open(const char *path, int oflags, int mode) ++{ ++ struct file *file; ++ ++ lockdep_off(); ++ file = filp_open(path, ++ oflags /* | __FMODE_NONOTIFY */, ++ mode); ++ lockdep_on(); ++ if (IS_ERR(file)) ++ goto out; ++ vfsub_update_h_iattr(&file->f_path, /*did*/NULL); /*ignore*/ ++ ++out: ++ return file; ++} ++ ++/* ++ * Ideally this function should call VFS:do_last() in order to keep all its ++ * checkings. But it is very hard for aufs to regenerate several VFS internal ++ * structure such as nameidata. This is a second (or third) best approach. ++ * cf. linux/fs/namei.c:do_last(), lookup_open() and atomic_open(). ++ */ ++int vfsub_atomic_open(struct inode *dir, struct dentry *dentry, ++ struct vfsub_aopen_args *args) ++{ ++ int err; ++ struct au_branch *br = args->br; ++ struct file *file = args->file; ++ /* copied from linux/fs/namei.c:atomic_open() */ ++ struct dentry *const DENTRY_NOT_SET = (void *)-1UL; ++ ++ IMustLock(dir); ++ AuDebugOn(!dir->i_op->atomic_open); ++ ++ err = au_br_test_oflag(args->open_flag, br); ++ if (unlikely(err)) ++ goto out; ++ ++ au_lcnt_inc(&br->br_nfiles); ++ file->f_path.dentry = DENTRY_NOT_SET; ++ file->f_path.mnt = au_br_mnt(br); ++ AuDbg("%ps\n", dir->i_op->atomic_open); ++ err = dir->i_op->atomic_open(dir, dentry, file, args->open_flag, ++ args->create_mode); ++ if (unlikely(err < 0)) { ++ au_lcnt_dec(&br->br_nfiles); ++ goto out; ++ } ++ ++ /* temporary workaround for nfsv4 branch */ ++ if (au_test_nfs(dir->i_sb)) ++ nfs_mark_for_revalidate(dir); ++ ++ if (file->f_mode & FMODE_CREATED) ++ fsnotify_create(dir, dentry); ++ if (!(file->f_mode & FMODE_OPENED)) { ++ au_lcnt_dec(&br->br_nfiles); ++ goto out; ++ } ++ ++ /* todo: call VFS:may_open() here */ ++ /* todo: ima_file_check() too? */ ++ if (!err && (args->open_flag & __FMODE_EXEC)) ++ err = deny_write_access(file); ++ if (!err) ++ fsnotify_open(file); ++ else ++ au_lcnt_dec(&br->br_nfiles); ++ /* note that the file is created and still opened */ ++ ++out: ++ return err; ++} ++ ++int vfsub_kern_path(const char *name, unsigned int flags, struct path *path) ++{ ++ int err; ++ ++ err = kern_path(name, flags, path); ++ if (!err && d_is_positive(path->dentry)) ++ vfsub_update_h_iattr(path, /*did*/NULL); /*ignore*/ ++ return err; ++} ++ ++struct dentry *vfsub_lookup_one_len_unlocked(const char *name, ++ struct path *ppath, int len) ++{ ++ struct path path; ++ ++ path.dentry = lookup_one_len_unlocked(name, ppath->dentry, len); ++ if (IS_ERR(path.dentry)) ++ goto out; ++ if (d_is_positive(path.dentry)) { ++ path.mnt = ppath->mnt; ++ vfsub_update_h_iattr(&path, /*did*/NULL); /*ignore*/ ++ } ++ ++out: ++ AuTraceErrPtr(path.dentry); ++ return path.dentry; ++} ++ ++struct dentry *vfsub_lookup_one_len(const char *name, struct path *ppath, ++ int len) ++{ ++ struct path path; ++ ++ /* VFS checks it too, but by WARN_ON_ONCE() */ ++ IMustLock(d_inode(ppath->dentry)); ++ ++ path.dentry = lookup_one_len(name, ppath->dentry, len); ++ if (IS_ERR(path.dentry)) ++ goto out; ++ if (d_is_positive(path.dentry)) { ++ path.mnt = ppath->mnt; ++ vfsub_update_h_iattr(&path, /*did*/NULL); /*ignore*/ ++ } ++ ++out: ++ AuTraceErrPtr(path.dentry); ++ return path.dentry; ++} ++ ++void vfsub_call_lkup_one(void *args) ++{ ++ struct vfsub_lkup_one_args *a = args; ++ *a->errp = vfsub_lkup_one(a->name, a->ppath); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++struct dentry *vfsub_lock_rename(struct dentry *d1, struct au_hinode *hdir1, ++ struct dentry *d2, struct au_hinode *hdir2) ++{ ++ struct dentry *d; ++ ++ lockdep_off(); ++ d = lock_rename(d1, d2); ++ lockdep_on(); ++ au_hn_suspend(hdir1); ++ if (hdir1 != hdir2) ++ au_hn_suspend(hdir2); ++ ++ return d; ++} ++ ++void vfsub_unlock_rename(struct dentry *d1, struct au_hinode *hdir1, ++ struct dentry *d2, struct au_hinode *hdir2) ++{ ++ au_hn_resume(hdir1); ++ if (hdir1 != hdir2) ++ au_hn_resume(hdir2); ++ lockdep_off(); ++ unlock_rename(d1, d2); ++ lockdep_on(); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++int vfsub_create(struct inode *dir, struct path *path, int mode, bool want_excl) ++{ ++ int err; ++ struct dentry *d; ++ struct mnt_idmap *idmap; ++ ++ IMustLock(dir); ++ ++ d = path->dentry; ++ path->dentry = d->d_parent; ++ err = security_path_mknod(path, d, mode, 0); ++ path->dentry = d; ++ if (unlikely(err)) ++ goto out; ++ idmap = mnt_idmap(path->mnt); ++ ++ lockdep_off(); ++ err = vfs_create(idmap, dir, path->dentry, mode, want_excl); ++ lockdep_on(); ++ if (!err) { ++ struct path tmp = *path; ++ int did; ++ ++ vfsub_update_h_iattr(&tmp, &did); ++ if (did) { ++ tmp.dentry = path->dentry->d_parent; ++ vfsub_update_h_iattr(&tmp, /*did*/NULL); ++ } ++ /*ignore*/ ++ } ++ ++out: ++ return err; ++} ++ ++int vfsub_symlink(struct inode *dir, struct path *path, const char *symname) ++{ ++ int err; ++ struct dentry *d; ++ struct mnt_idmap *idmap; ++ ++ IMustLock(dir); ++ ++ d = path->dentry; ++ path->dentry = d->d_parent; ++ err = security_path_symlink(path, d, symname); ++ path->dentry = d; ++ if (unlikely(err)) ++ goto out; ++ idmap = mnt_idmap(path->mnt); ++ ++ lockdep_off(); ++ err = vfs_symlink(idmap, dir, path->dentry, symname); ++ lockdep_on(); ++ if (!err) { ++ struct path tmp = *path; ++ int did; ++ ++ vfsub_update_h_iattr(&tmp, &did); ++ if (did) { ++ tmp.dentry = path->dentry->d_parent; ++ vfsub_update_h_iattr(&tmp, /*did*/NULL); ++ } ++ /*ignore*/ ++ } ++ ++out: ++ return err; ++} ++ ++int vfsub_mknod(struct inode *dir, struct path *path, int mode, dev_t dev) ++{ ++ int err; ++ struct dentry *d; ++ struct mnt_idmap *idmap; ++ ++ IMustLock(dir); ++ ++ d = path->dentry; ++ path->dentry = d->d_parent; ++ err = security_path_mknod(path, d, mode, new_encode_dev(dev)); ++ path->dentry = d; ++ if (unlikely(err)) ++ goto out; ++ idmap = mnt_idmap(path->mnt); ++ ++ lockdep_off(); ++ err = vfs_mknod(idmap, dir, path->dentry, mode, dev); ++ lockdep_on(); ++ if (!err) { ++ struct path tmp = *path; ++ int did; ++ ++ vfsub_update_h_iattr(&tmp, &did); ++ if (did) { ++ tmp.dentry = path->dentry->d_parent; ++ vfsub_update_h_iattr(&tmp, /*did*/NULL); ++ } ++ /*ignore*/ ++ } ++ ++out: ++ return err; ++} ++ ++static int au_test_nlink(struct inode *inode) ++{ ++ const unsigned int link_max = UINT_MAX >> 1; /* rough margin */ ++ ++ if (!au_test_fs_no_limit_nlink(inode->i_sb) ++ || inode->i_nlink < link_max) ++ return 0; ++ return -EMLINK; ++} ++ ++int vfsub_link(struct dentry *src_dentry, struct inode *dir, struct path *path, ++ struct inode **delegated_inode) ++{ ++ int err; ++ struct dentry *d; ++ struct mnt_idmap *idmap; ++ ++ IMustLock(dir); ++ ++ err = au_test_nlink(d_inode(src_dentry)); ++ if (unlikely(err)) ++ return err; ++ ++ /* we don't call may_linkat() */ ++ d = path->dentry; ++ path->dentry = d->d_parent; ++ err = security_path_link(src_dentry, path, d); ++ path->dentry = d; ++ if (unlikely(err)) ++ goto out; ++ idmap = mnt_idmap(path->mnt); ++ ++ lockdep_off(); ++ err = vfs_link(src_dentry, idmap, dir, path->dentry, delegated_inode); ++ lockdep_on(); ++ if (!err) { ++ struct path tmp = *path; ++ int did; ++ ++ /* fuse has different memory inode for the same inumber */ ++ vfsub_update_h_iattr(&tmp, &did); ++ if (did) { ++ tmp.dentry = path->dentry->d_parent; ++ vfsub_update_h_iattr(&tmp, /*did*/NULL); ++ tmp.dentry = src_dentry; ++ vfsub_update_h_iattr(&tmp, /*did*/NULL); ++ } ++ /*ignore*/ ++ } ++ ++out: ++ return err; ++} ++ ++int vfsub_rename(struct inode *src_dir, struct dentry *src_dentry, ++ struct inode *dir, struct path *path, ++ struct inode **delegated_inode, unsigned int flags) ++{ ++ int err; ++ struct renamedata rd; ++ struct path tmp = { ++ .mnt = path->mnt ++ }; ++ struct dentry *d; ++ ++ IMustLock(dir); ++ IMustLock(src_dir); ++ ++ d = path->dentry; ++ path->dentry = d->d_parent; ++ tmp.dentry = src_dentry->d_parent; ++ err = security_path_rename(&tmp, src_dentry, path, d, /*flags*/0); ++ path->dentry = d; ++ if (unlikely(err)) ++ goto out; ++ ++ rd.old_mnt_idmap = mnt_idmap(path->mnt); ++ rd.old_dir = src_dir; ++ rd.old_dentry = src_dentry; ++ rd.new_mnt_idmap = rd.old_mnt_idmap; ++ rd.new_dir = dir; ++ rd.new_dentry = path->dentry; ++ rd.delegated_inode = delegated_inode; ++ rd.flags = flags; ++ lockdep_off(); ++ err = vfs_rename(&rd); ++ lockdep_on(); ++ if (!err) { ++ int did; ++ ++ tmp.dentry = d->d_parent; ++ vfsub_update_h_iattr(&tmp, &did); ++ if (did) { ++ tmp.dentry = src_dentry; ++ vfsub_update_h_iattr(&tmp, /*did*/NULL); ++ tmp.dentry = src_dentry->d_parent; ++ vfsub_update_h_iattr(&tmp, /*did*/NULL); ++ } ++ /*ignore*/ ++ } ++ ++out: ++ return err; ++} ++ ++int vfsub_mkdir(struct inode *dir, struct path *path, int mode) ++{ ++ int err; ++ struct dentry *d; ++ struct mnt_idmap *idmap; ++ ++ IMustLock(dir); ++ ++ d = path->dentry; ++ path->dentry = d->d_parent; ++ err = security_path_mkdir(path, d, mode); ++ path->dentry = d; ++ if (unlikely(err)) ++ goto out; ++ idmap = mnt_idmap(path->mnt); ++ ++ lockdep_off(); ++ err = vfs_mkdir(idmap, dir, path->dentry, mode); ++ lockdep_on(); ++ if (!err) { ++ struct path tmp = *path; ++ int did; ++ ++ vfsub_update_h_iattr(&tmp, &did); ++ if (did) { ++ tmp.dentry = path->dentry->d_parent; ++ vfsub_update_h_iattr(&tmp, /*did*/NULL); ++ } ++ /*ignore*/ ++ } ++ ++out: ++ return err; ++} ++ ++int vfsub_rmdir(struct inode *dir, struct path *path) ++{ ++ int err; ++ struct dentry *d; ++ struct mnt_idmap *idmap; ++ ++ IMustLock(dir); ++ ++ d = path->dentry; ++ path->dentry = d->d_parent; ++ err = security_path_rmdir(path, d); ++ path->dentry = d; ++ if (unlikely(err)) ++ goto out; ++ idmap = mnt_idmap(path->mnt); ++ ++ lockdep_off(); ++ err = vfs_rmdir(idmap, dir, path->dentry); ++ lockdep_on(); ++ if (!err) { ++ struct path tmp = { ++ .dentry = path->dentry->d_parent, ++ .mnt = path->mnt ++ }; ++ ++ vfsub_update_h_iattr(&tmp, /*did*/NULL); /*ignore*/ ++ } ++ ++out: ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* todo: support mmap_sem? */ ++ssize_t vfsub_read_u(struct file *file, char __user *ubuf, size_t count, ++ loff_t *ppos) ++{ ++ ssize_t err; ++ ++ lockdep_off(); ++ err = vfs_read(file, ubuf, count, ppos); ++ lockdep_on(); ++ if (err >= 0) ++ vfsub_update_h_iattr(&file->f_path, /*did*/NULL); /*ignore*/ ++ return err; ++} ++ ++ssize_t vfsub_read_k(struct file *file, void *kbuf, size_t count, ++ loff_t *ppos) ++{ ++ ssize_t err; ++ ++ lockdep_off(); ++ err = kernel_read(file, kbuf, count, ppos); ++ lockdep_on(); ++ AuTraceErr(err); ++ if (err >= 0) ++ vfsub_update_h_iattr(&file->f_path, /*did*/NULL); /*ignore*/ ++ return err; ++} ++ ++ssize_t vfsub_write_u(struct file *file, const char __user *ubuf, size_t count, ++ loff_t *ppos) ++{ ++ ssize_t err; ++ ++ lockdep_off(); ++ err = vfs_write(file, ubuf, count, ppos); ++ lockdep_on(); ++ if (err >= 0) ++ vfsub_update_h_iattr(&file->f_path, /*did*/NULL); /*ignore*/ ++ return err; ++} ++ ++ssize_t vfsub_write_k(struct file *file, void *kbuf, size_t count, loff_t *ppos) ++{ ++ ssize_t err; ++ ++ lockdep_off(); ++ err = kernel_write(file, kbuf, count, ppos); ++ lockdep_on(); ++ if (err >= 0) ++ vfsub_update_h_iattr(&file->f_path, /*did*/NULL); /*ignore*/ ++ return err; ++} ++ ++int vfsub_flush(struct file *file, fl_owner_t id) ++{ ++ int err; ++ ++ err = 0; ++ if (file->f_op->flush) { ++ if (!au_test_nfs(file->f_path.dentry->d_sb)) ++ err = file->f_op->flush(file, id); ++ else { ++ lockdep_off(); ++ err = file->f_op->flush(file, id); ++ lockdep_on(); ++ } ++ if (!err) ++ vfsub_update_h_iattr(&file->f_path, /*did*/NULL); ++ /*ignore*/ ++ } ++ return err; ++} ++ ++int vfsub_iterate_dir(struct file *file, struct dir_context *ctx) ++{ ++ int err; ++ ++ AuDbg("%pD, ctx{%ps, %llu}\n", file, ctx->actor, ctx->pos); ++ ++ lockdep_off(); ++ err = iterate_dir(file, ctx); ++ lockdep_on(); ++ if (err >= 0) ++ vfsub_update_h_iattr(&file->f_path, /*did*/NULL); /*ignore*/ ++ ++ return err; ++} ++ ++long vfsub_splice_read(struct file *in, loff_t *ppos, ++ struct pipe_inode_info *pipe, size_t len, ++ unsigned int flags) ++{ ++ long err; ++ ++ lockdep_off(); ++ err = vfs_splice_read(in, ppos, pipe, len, flags); ++ lockdep_on(); ++ file_accessed(in); ++ if (err >= 0) ++ vfsub_update_h_iattr(&in->f_path, /*did*/NULL); /*ignore*/ ++ return err; ++} ++ ++long vfsub_splice_from(struct pipe_inode_info *pipe, struct file *out, ++ loff_t *ppos, size_t len, unsigned int flags) ++{ ++ long err; ++ ++ lockdep_off(); ++ err = do_splice_from(pipe, out, ppos, len, flags); ++ lockdep_on(); ++ if (err >= 0) ++ vfsub_update_h_iattr(&out->f_path, /*did*/NULL); /*ignore*/ ++ return err; ++} ++ ++int vfsub_fsync(struct file *file, struct path *path, int datasync) ++{ ++ int err; ++ ++ /* file can be NULL */ ++ lockdep_off(); ++ err = vfs_fsync(file, datasync); ++ lockdep_on(); ++ if (!err) { ++ if (!path) { ++ AuDebugOn(!file); ++ path = &file->f_path; ++ } ++ vfsub_update_h_iattr(path, /*did*/NULL); /*ignore*/ ++ } ++ return err; ++} ++ ++/* cf. open.c:do_sys_truncate() and do_sys_ftruncate() */ ++int vfsub_trunc(struct path *h_path, loff_t length, unsigned int attr, ++ struct file *h_file) ++{ ++ int err; ++ struct inode *h_inode; ++ struct super_block *h_sb; ++ struct mnt_idmap *h_idmap; ++ ++ if (!h_file) { ++ err = vfsub_truncate(h_path, length); ++ goto out; ++ } ++ ++ h_inode = d_inode(h_path->dentry); ++ h_sb = h_inode->i_sb; ++ lockdep_off(); ++ sb_start_write(h_sb); ++ lockdep_on(); ++ err = security_file_truncate(h_file); ++ if (!err) { ++ h_idmap = mnt_idmap(h_path->mnt); ++ lockdep_off(); ++ err = do_truncate(h_idmap, h_path->dentry, length, attr, ++ h_file); ++ lockdep_on(); ++ } ++ lockdep_off(); ++ sb_end_write(h_sb); ++ lockdep_on(); ++ ++out: ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++struct au_vfsub_mkdir_args { ++ int *errp; ++ struct inode *dir; ++ struct path *path; ++ int mode; ++}; ++ ++static void au_call_vfsub_mkdir(void *args) ++{ ++ struct au_vfsub_mkdir_args *a = args; ++ *a->errp = vfsub_mkdir(a->dir, a->path, a->mode); ++} ++ ++int vfsub_sio_mkdir(struct inode *dir, struct path *path, int mode) ++{ ++ int err, do_sio, wkq_err; ++ struct mnt_idmap *idmap; ++ ++ idmap = mnt_idmap(path->mnt); ++ do_sio = au_test_h_perm_sio(idmap, dir, MAY_EXEC | MAY_WRITE); ++ if (!do_sio) { ++ lockdep_off(); ++ err = vfsub_mkdir(dir, path, mode); ++ lockdep_on(); ++ } else { ++ struct au_vfsub_mkdir_args args = { ++ .errp = &err, ++ .dir = dir, ++ .path = path, ++ .mode = mode ++ }; ++ wkq_err = au_wkq_wait(au_call_vfsub_mkdir, &args); ++ if (unlikely(wkq_err)) ++ err = wkq_err; ++ } ++ ++ return err; ++} ++ ++struct au_vfsub_rmdir_args { ++ int *errp; ++ struct inode *dir; ++ struct path *path; ++}; ++ ++static void au_call_vfsub_rmdir(void *args) ++{ ++ struct au_vfsub_rmdir_args *a = args; ++ *a->errp = vfsub_rmdir(a->dir, a->path); ++} ++ ++int vfsub_sio_rmdir(struct inode *dir, struct path *path) ++{ ++ int err, do_sio, wkq_err; ++ struct mnt_idmap *idmap; ++ ++ idmap = mnt_idmap(path->mnt); ++ do_sio = au_test_h_perm_sio(idmap, dir, MAY_EXEC | MAY_WRITE); ++ if (!do_sio) { ++ lockdep_off(); ++ err = vfsub_rmdir(dir, path); ++ lockdep_on(); ++ } else { ++ struct au_vfsub_rmdir_args args = { ++ .errp = &err, ++ .dir = dir, ++ .path = path ++ }; ++ wkq_err = au_wkq_wait(au_call_vfsub_rmdir, &args); ++ if (unlikely(wkq_err)) ++ err = wkq_err; ++ } ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++struct notify_change_args { ++ int *errp; ++ struct path *path; ++ struct iattr *ia; ++ struct inode **delegated_inode; ++}; ++ ++static void call_notify_change(void *args) ++{ ++ struct notify_change_args *a = args; ++ struct inode *h_inode; ++ struct mnt_idmap *idmap; ++ ++ h_inode = d_inode(a->path->dentry); ++ IMustLock(h_inode); ++ ++ *a->errp = -EPERM; ++ if (!IS_IMMUTABLE(h_inode) && !IS_APPEND(h_inode)) { ++ idmap = mnt_idmap(a->path->mnt); ++ lockdep_off(); ++ *a->errp = notify_change(idmap, a->path->dentry, a->ia, ++ a->delegated_inode); ++ lockdep_on(); ++ if (!*a->errp) ++ vfsub_update_h_iattr(a->path, /*did*/NULL); /*ignore*/ ++ } ++ AuTraceErr(*a->errp); ++} ++ ++int vfsub_notify_change(struct path *path, struct iattr *ia, ++ struct inode **delegated_inode) ++{ ++ int err; ++ struct notify_change_args args = { ++ .errp = &err, ++ .path = path, ++ .ia = ia, ++ .delegated_inode = delegated_inode ++ }; ++ ++ call_notify_change(&args); ++ ++ return err; ++} ++ ++int vfsub_sio_notify_change(struct path *path, struct iattr *ia, ++ struct inode **delegated_inode) ++{ ++ int err, wkq_err; ++ struct notify_change_args args = { ++ .errp = &err, ++ .path = path, ++ .ia = ia, ++ .delegated_inode = delegated_inode ++ }; ++ ++ wkq_err = au_wkq_wait(call_notify_change, &args); ++ if (unlikely(wkq_err)) ++ err = wkq_err; ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++struct unlink_args { ++ int *errp; ++ struct inode *dir; ++ struct path *path; ++ struct inode **delegated_inode; ++}; ++ ++static void call_unlink(void *args) ++{ ++ struct unlink_args *a = args; ++ struct dentry *d = a->path->dentry; ++ struct inode *h_inode; ++ struct mnt_idmap *idmap; ++ const int stop_sillyrename = (au_test_nfs(d->d_sb) ++ && au_dcount(d) == 1); ++ ++ IMustLock(a->dir); ++ ++ a->path->dentry = d->d_parent; ++ *a->errp = security_path_unlink(a->path, d); ++ a->path->dentry = d; ++ if (unlikely(*a->errp)) ++ return; ++ ++ if (!stop_sillyrename) ++ dget(d); ++ h_inode = NULL; ++ if (d_is_positive(d)) { ++ h_inode = d_inode(d); ++ ihold(h_inode); ++ } ++ ++ idmap = mnt_idmap(a->path->mnt); ++ lockdep_off(); ++ *a->errp = vfs_unlink(idmap, a->dir, d, a->delegated_inode); ++ lockdep_on(); ++ if (!*a->errp) { ++ struct path tmp = { ++ .dentry = d->d_parent, ++ .mnt = a->path->mnt ++ }; ++ vfsub_update_h_iattr(&tmp, /*did*/NULL); /*ignore*/ ++ } ++ ++ if (!stop_sillyrename) ++ dput(d); ++ if (h_inode) ++ iput(h_inode); ++ ++ AuTraceErr(*a->errp); ++} ++ ++/* ++ * @dir: must be locked. ++ * @dentry: target dentry. ++ */ ++int vfsub_unlink(struct inode *dir, struct path *path, ++ struct inode **delegated_inode, int force) ++{ ++ int err; ++ struct unlink_args args = { ++ .errp = &err, ++ .dir = dir, ++ .path = path, ++ .delegated_inode = delegated_inode ++ }; ++ ++ if (!force) ++ call_unlink(&args); ++ else { ++ int wkq_err; ++ ++ wkq_err = au_wkq_wait(call_unlink, &args); ++ if (unlikely(wkq_err)) ++ err = wkq_err; ++ } ++ ++ return err; ++} +diff --git a/fs/aufs/vfsub.h b/fs/aufs/vfsub.h +new file mode 100644 +index 000000000000..928c463620c1 +--- /dev/null ++++ b/fs/aufs/vfsub.h +@@ -0,0 +1,404 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * sub-routines for VFS ++ */ ++ ++#ifndef __AUFS_VFSUB_H__ ++#define __AUFS_VFSUB_H__ ++ ++#ifdef __KERNEL__ ++ ++#include <linux/fs.h> ++#include <linux/mount.h> ++#include <linux/posix_acl.h> ++#include <linux/xattr.h> ++#include "debug.h" ++ ++/* copied from linux/fs/internal.h */ ++/* todo: BAD approach!! */ ++extern void __mnt_drop_write(struct vfsmount *); ++extern struct file *alloc_empty_file(int, const struct cred *); ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* lock subclass for lower inode */ ++/* default MAX_LOCKDEP_SUBCLASSES(8) is not enough */ ++/* reduce? gave up. */ ++enum { ++ AuLsc_I_Begin = I_MUTEX_PARENT2, /* 5 */ ++ AuLsc_I_PARENT, /* lower inode, parent first */ ++ AuLsc_I_PARENT2, /* copyup dirs */ ++ AuLsc_I_PARENT3, /* copyup wh */ ++ AuLsc_I_CHILD, ++ AuLsc_I_CHILD2, ++ AuLsc_I_End ++}; ++ ++/* to debug easier, do not make them inlined functions */ ++#define MtxMustLock(mtx) AuDebugOn(!mutex_is_locked(mtx)) ++#define IMustLock(i) AuDebugOn(!inode_is_locked(i)) ++ ++/* ---------------------------------------------------------------------- */ ++ ++static inline void vfsub_drop_nlink(struct inode *inode) ++{ ++ AuDebugOn(!inode->i_nlink); ++ drop_nlink(inode); ++} ++ ++static inline void vfsub_dead_dir(struct inode *inode) ++{ ++ AuDebugOn(!S_ISDIR(inode->i_mode)); ++ inode->i_flags |= S_DEAD; ++ clear_nlink(inode); ++} ++ ++static inline int vfsub_native_ro(struct inode *inode) ++{ ++ return sb_rdonly(inode->i_sb) ++ || IS_RDONLY(inode) ++ /* || IS_APPEND(inode) */ ++ || IS_IMMUTABLE(inode); ++} ++ ++#ifdef CONFIG_AUFS_BR_FUSE ++int vfsub_test_mntns(struct vfsmount *mnt, struct super_block *h_sb); ++#else ++AuStubInt0(vfsub_test_mntns, struct vfsmount *mnt, struct super_block *h_sb); ++#endif ++ ++int vfsub_sync_filesystem(struct super_block *h_sb); ++ ++/* ---------------------------------------------------------------------- */ ++ ++int vfsub_update_h_iattr(struct path *h_path, int *did); ++struct file *vfsub_dentry_open(struct path *path, int flags); ++struct file *vfsub_filp_open(const char *path, int oflags, int mode); ++struct au_branch; ++struct vfsub_aopen_args { ++ struct file *file; ++ unsigned int open_flag; ++ umode_t create_mode; ++ struct au_branch *br; ++}; ++int vfsub_atomic_open(struct inode *dir, struct dentry *dentry, ++ struct vfsub_aopen_args *args); ++int vfsub_kern_path(const char *name, unsigned int flags, struct path *path); ++ ++struct dentry *vfsub_lookup_one_len_unlocked(const char *name, ++ struct path *ppath, int len); ++struct dentry *vfsub_lookup_one_len(const char *name, struct path *ppath, ++ int len); ++ ++struct vfsub_lkup_one_args { ++ struct dentry **errp; ++ struct qstr *name; ++ struct path *ppath; ++}; ++ ++static inline struct dentry *vfsub_lkup_one(struct qstr *name, ++ struct path *ppath) ++{ ++ return vfsub_lookup_one_len(name->name, ppath, name->len); ++} ++ ++void vfsub_call_lkup_one(void *args); ++ ++/* ---------------------------------------------------------------------- */ ++ ++static inline int vfsub_mnt_want_write(struct vfsmount *mnt) ++{ ++ int err; ++ ++ lockdep_off(); ++ err = mnt_want_write(mnt); ++ lockdep_on(); ++ return err; ++} ++ ++static inline void vfsub_mnt_drop_write(struct vfsmount *mnt) ++{ ++ lockdep_off(); ++ mnt_drop_write(mnt); ++ lockdep_on(); ++} ++ ++#if 0 /* reserved */ ++static inline void vfsub_mnt_drop_write_file(struct file *file) ++{ ++ lockdep_off(); ++ mnt_drop_write_file(file); ++ lockdep_on(); ++} ++#endif ++ ++static inline void vfsub_file_start_write(struct file *file) ++{ ++ lockdep_off(); ++ file_start_write(file); ++ lockdep_on(); ++} ++ ++static inline void vfsub_file_end_write(struct file *file) ++{ ++ lockdep_off(); ++ file_end_write(file); ++ lockdep_on(); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++struct au_hinode; ++struct dentry *vfsub_lock_rename(struct dentry *d1, struct au_hinode *hdir1, ++ struct dentry *d2, struct au_hinode *hdir2); ++void vfsub_unlock_rename(struct dentry *d1, struct au_hinode *hdir1, ++ struct dentry *d2, struct au_hinode *hdir2); ++ ++int vfsub_create(struct inode *dir, struct path *path, int mode, ++ bool want_excl); ++int vfsub_symlink(struct inode *dir, struct path *path, ++ const char *symname); ++int vfsub_mknod(struct inode *dir, struct path *path, int mode, dev_t dev); ++int vfsub_link(struct dentry *src_dentry, struct inode *dir, ++ struct path *path, struct inode **delegated_inode); ++int vfsub_rename(struct inode *src_hdir, struct dentry *src_dentry, ++ struct inode *hdir, struct path *path, ++ struct inode **delegated_inode, unsigned int flags); ++int vfsub_mkdir(struct inode *dir, struct path *path, int mode); ++int vfsub_rmdir(struct inode *dir, struct path *path); ++ ++/* ---------------------------------------------------------------------- */ ++ ++ssize_t vfsub_read_u(struct file *file, char __user *ubuf, size_t count, ++ loff_t *ppos); ++ssize_t vfsub_read_k(struct file *file, void *kbuf, size_t count, ++ loff_t *ppos); ++ssize_t vfsub_write_u(struct file *file, const char __user *ubuf, size_t count, ++ loff_t *ppos); ++ssize_t vfsub_write_k(struct file *file, void *kbuf, size_t count, ++ loff_t *ppos); ++int vfsub_flush(struct file *file, fl_owner_t id); ++int vfsub_iterate_dir(struct file *file, struct dir_context *ctx); ++ ++static inline loff_t vfsub_f_size_read(struct file *file) ++{ ++ return i_size_read(file_inode(file)); ++} ++ ++static inline unsigned int vfsub_file_flags(struct file *file) ++{ ++ unsigned int flags; ++ ++ spin_lock(&file->f_lock); ++ flags = file->f_flags; ++ spin_unlock(&file->f_lock); ++ ++ return flags; ++} ++ ++static inline int vfsub_file_execed(struct file *file) ++{ ++ /* todo: direct access f_flags */ ++ return !!(vfsub_file_flags(file) & __FMODE_EXEC); ++} ++ ++#if 0 /* reserved */ ++static inline void vfsub_file_accessed(struct file *h_file) ++{ ++ file_accessed(h_file); ++ vfsub_update_h_iattr(&h_file->f_path, /*did*/NULL); /*ignore*/ ++} ++#endif ++ ++#if 0 /* reserved */ ++static inline void vfsub_touch_atime(struct vfsmount *h_mnt, ++ struct dentry *h_dentry) ++{ ++ struct path h_path = { ++ .dentry = h_dentry, ++ .mnt = h_mnt ++ }; ++ touch_atime(&h_path); ++ vfsub_update_h_iattr(&h_path, /*did*/NULL); /*ignore*/ ++} ++#endif ++ ++static inline int vfsub_update_time(struct inode *h_inode, ++ struct timespec64 *ts, int flags) ++{ ++ return inode_update_time(h_inode, ts, flags); ++ /* no vfsub_update_h_iattr() since we don't have struct path */ ++} ++ ++#ifdef CONFIG_FS_POSIX_ACL ++static inline int vfsub_acl_chmod(struct mnt_idmap *h_idmap, ++ struct dentry *h_dentry, umode_t h_mode) ++{ ++ int err; ++ ++ err = posix_acl_chmod(h_idmap, h_dentry, h_mode); ++ if (err == -EOPNOTSUPP) ++ err = 0; ++ return err; ++} ++#else ++AuStubInt0(vfsub_acl_chmod, struct mnt_idmap *h_idmap, ++ struct dentry *h_dentry, umode_t h_mode); ++#endif ++ ++long vfsub_splice_read(struct file *in, loff_t *ppos, ++ struct pipe_inode_info *pipe, size_t len, ++ unsigned int flags); ++long vfsub_splice_from(struct pipe_inode_info *pipe, struct file *out, ++ loff_t *ppos, size_t len, unsigned int flags); ++ ++static inline long vfsub_truncate(struct path *path, loff_t length) ++{ ++ long err; ++ ++ lockdep_off(); ++ err = vfs_truncate(path, length); ++ lockdep_on(); ++ return err; ++} ++ ++int vfsub_trunc(struct path *h_path, loff_t length, unsigned int attr, ++ struct file *h_file); ++int vfsub_fsync(struct file *file, struct path *path, int datasync); ++ ++/* ++ * re-use branch fs's ioctl(FICLONE) while aufs itself doesn't support such ++ * ioctl. ++ */ ++static inline loff_t vfsub_clone_file_range(struct file *src, struct file *dst, ++ loff_t len) ++{ ++ loff_t err; ++ ++ lockdep_off(); ++ err = vfs_clone_file_range(src, 0, dst, 0, len, /*remap_flags*/0); ++ lockdep_on(); ++ ++ return err; ++} ++ ++/* copy_file_range(2) is a systemcall */ ++static inline ssize_t vfsub_copy_file_range(struct file *src, loff_t src_pos, ++ struct file *dst, loff_t dst_pos, ++ size_t len, unsigned int flags) ++{ ++ ssize_t ssz; ++ ++ lockdep_off(); ++ ssz = vfs_copy_file_range(src, src_pos, dst, dst_pos, len, flags); ++ lockdep_on(); ++ ++ return ssz; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static inline loff_t vfsub_llseek(struct file *file, loff_t offset, int origin) ++{ ++ loff_t err; ++ ++ lockdep_off(); ++ err = vfs_llseek(file, offset, origin); ++ lockdep_on(); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++int vfsub_sio_mkdir(struct inode *dir, struct path *path, int mode); ++int vfsub_sio_rmdir(struct inode *dir, struct path *path); ++int vfsub_sio_notify_change(struct path *path, struct iattr *ia, ++ struct inode **delegated_inode); ++int vfsub_notify_change(struct path *path, struct iattr *ia, ++ struct inode **delegated_inode); ++int vfsub_unlink(struct inode *dir, struct path *path, ++ struct inode **delegated_inode, int force); ++ ++static inline int vfsub_getattr(const struct path *path, struct kstat *st) ++{ ++ return vfs_getattr(path, st, STATX_BASIC_STATS, AT_STATX_SYNC_AS_STAT); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static inline int vfsub_setxattr(struct mnt_idmap *idmap, ++ struct dentry *dentry, const char *name, ++ const void *value, size_t size, int flags) ++{ ++ int err; ++ ++ lockdep_off(); ++ err = vfs_setxattr(idmap, dentry, name, value, size, flags); ++ lockdep_on(); ++ ++ return err; ++} ++ ++static inline int vfsub_removexattr(struct mnt_idmap *idmap, ++ struct dentry *dentry, const char *name) ++{ ++ int err; ++ ++ lockdep_off(); ++ err = vfs_removexattr(idmap, dentry, name); ++ lockdep_on(); ++ ++ return err; ++} ++ ++#ifdef CONFIG_FS_POSIX_ACL ++static inline int vfsub_set_acl(struct mnt_idmap *idmap, ++ struct dentry *dentry, const char *name, ++ struct posix_acl *acl) ++{ ++ int err; ++ ++ lockdep_off(); ++ err = vfs_set_acl(idmap, dentry, name, acl); ++ lockdep_on(); ++ ++ return err; ++} ++ ++static inline int vfsub_remove_acl(struct mnt_idmap *idmap, ++ struct dentry *dentry, const char *name) ++{ ++ int err; ++ ++ lockdep_off(); ++ err = vfs_remove_acl(idmap, dentry, name); ++ lockdep_on(); ++ ++ return err; ++} ++#else ++AuStubInt0(vfsub_set_acl, struct mnt_idmap *idmap, struct dentry *dentry, ++ const char *name, struct posix_acl *acl); ++AuStubInt0(vfsub_remove_acl, struct mnt_idmap *idmap, ++ struct dentry *dentry, const char *name); ++#endif ++ ++#endif /* __KERNEL__ */ ++#endif /* __AUFS_VFSUB_H__ */ +diff --git a/fs/aufs/wbr_policy.c b/fs/aufs/wbr_policy.c +new file mode 100644 +index 000000000000..c726f96b7bd5 +--- /dev/null ++++ b/fs/aufs/wbr_policy.c +@@ -0,0 +1,830 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * policies for selecting one among multiple writable branches ++ */ ++ ++#include <linux/statfs.h> ++#include "aufs.h" ++ ++/* subset of cpup_attr() */ ++static noinline_for_stack ++int au_cpdown_attr(struct path *h_path, struct dentry *h_src) ++{ ++ int err, sbits; ++ struct iattr ia; ++ struct inode *h_isrc; ++ ++ h_isrc = d_inode(h_src); ++ ia.ia_valid = ATTR_FORCE | ATTR_MODE | ATTR_UID | ATTR_GID; ++ ia.ia_mode = h_isrc->i_mode; ++ ia.ia_uid = h_isrc->i_uid; ++ ia.ia_gid = h_isrc->i_gid; ++ sbits = !!(ia.ia_mode & (S_ISUID | S_ISGID)); ++ au_cpup_attr_flags(d_inode(h_path->dentry), h_isrc->i_flags); ++ /* no delegation since it is just created */ ++ err = vfsub_sio_notify_change(h_path, &ia, /*delegated*/NULL); ++ ++ /* is this nfs only? */ ++ if (!err && sbits && au_test_nfs(h_path->dentry->d_sb)) { ++ ia.ia_valid = ATTR_FORCE | ATTR_MODE; ++ ia.ia_mode = h_isrc->i_mode; ++ err = vfsub_sio_notify_change(h_path, &ia, /*delegated*/NULL); ++ } ++ ++ return err; ++} ++ ++#define AuCpdown_PARENT_OPQ 1 ++#define AuCpdown_WHED (1 << 1) ++#define AuCpdown_MADE_DIR (1 << 2) ++#define AuCpdown_DIROPQ (1 << 3) ++#define au_ftest_cpdown(flags, name) ((flags) & AuCpdown_##name) ++#define au_fset_cpdown(flags, name) \ ++ do { (flags) |= AuCpdown_##name; } while (0) ++#define au_fclr_cpdown(flags, name) \ ++ do { (flags) &= ~AuCpdown_##name; } while (0) ++ ++static int au_cpdown_dir_opq(struct dentry *dentry, aufs_bindex_t bdst, ++ unsigned int *flags) ++{ ++ int err; ++ struct dentry *opq_dentry; ++ ++ opq_dentry = au_diropq_create(dentry, bdst); ++ err = PTR_ERR(opq_dentry); ++ if (IS_ERR(opq_dentry)) ++ goto out; ++ dput(opq_dentry); ++ au_fset_cpdown(*flags, DIROPQ); ++ ++out: ++ return err; ++} ++ ++static int au_cpdown_dir_wh(struct dentry *dentry, struct dentry *h_parent, ++ struct inode *dir, aufs_bindex_t bdst) ++{ ++ int err; ++ struct path h_path; ++ struct au_branch *br; ++ ++ br = au_sbr(dentry->d_sb, bdst); ++ h_path.dentry = au_wh_lkup(h_parent, &dentry->d_name, br); ++ err = PTR_ERR(h_path.dentry); ++ if (IS_ERR(h_path.dentry)) ++ goto out; ++ ++ err = 0; ++ if (d_is_positive(h_path.dentry)) { ++ h_path.mnt = au_br_mnt(br); ++ err = au_wh_unlink_dentry(au_h_iptr(dir, bdst), &h_path, ++ dentry); ++ } ++ dput(h_path.dentry); ++ ++out: ++ return err; ++} ++ ++static int au_cpdown_dir(struct dentry *dentry, aufs_bindex_t bdst, ++ struct au_pin *pin, ++ struct dentry *h_parent, void *arg) ++{ ++ int err, rerr; ++ aufs_bindex_t bopq, btop; ++ struct path h_path; ++ struct dentry *parent; ++ struct inode *h_dir, *h_inode, *inode, *dir; ++ unsigned int *flags = arg; ++ ++ btop = au_dbtop(dentry); ++ /* dentry is di-locked */ ++ parent = dget_parent(dentry); ++ dir = d_inode(parent); ++ h_dir = d_inode(h_parent); ++ AuDebugOn(h_dir != au_h_iptr(dir, bdst)); ++ IMustLock(h_dir); ++ ++ err = au_lkup_neg(dentry, bdst, /*wh*/0); ++ if (unlikely(err < 0)) ++ goto out; ++ h_path.dentry = au_h_dptr(dentry, bdst); ++ h_path.mnt = au_sbr_mnt(dentry->d_sb, bdst); ++ err = vfsub_sio_mkdir(au_h_iptr(dir, bdst), &h_path, 0755); ++ if (unlikely(err)) ++ goto out_put; ++ au_fset_cpdown(*flags, MADE_DIR); ++ ++ bopq = au_dbdiropq(dentry); ++ au_fclr_cpdown(*flags, WHED); ++ au_fclr_cpdown(*flags, DIROPQ); ++ if (au_dbwh(dentry) == bdst) ++ au_fset_cpdown(*flags, WHED); ++ if (!au_ftest_cpdown(*flags, PARENT_OPQ) && bopq <= bdst) ++ au_fset_cpdown(*flags, PARENT_OPQ); ++ h_inode = d_inode(h_path.dentry); ++ inode_lock_nested(h_inode, AuLsc_I_CHILD); ++ if (au_ftest_cpdown(*flags, WHED)) { ++ err = au_cpdown_dir_opq(dentry, bdst, flags); ++ if (unlikely(err)) { ++ inode_unlock(h_inode); ++ goto out_dir; ++ } ++ } ++ ++ err = au_cpdown_attr(&h_path, au_h_dptr(dentry, btop)); ++ inode_unlock(h_inode); ++ if (unlikely(err)) ++ goto out_opq; ++ ++ if (au_ftest_cpdown(*flags, WHED)) { ++ err = au_cpdown_dir_wh(dentry, h_parent, dir, bdst); ++ if (unlikely(err)) ++ goto out_opq; ++ } ++ ++ inode = d_inode(dentry); ++ if (au_ibbot(inode) < bdst) ++ au_set_ibbot(inode, bdst); ++ au_set_h_iptr(inode, bdst, au_igrab(h_inode), ++ au_hi_flags(inode, /*isdir*/1)); ++ au_fhsm_wrote(dentry->d_sb, bdst, /*force*/0); ++ goto out; /* success */ ++ ++ /* revert */ ++out_opq: ++ if (au_ftest_cpdown(*flags, DIROPQ)) { ++ inode_lock_nested(h_inode, AuLsc_I_CHILD); ++ rerr = au_diropq_remove(dentry, bdst); ++ inode_unlock(h_inode); ++ if (unlikely(rerr)) { ++ AuIOErr("failed removing diropq for %pd b%d (%d)\n", ++ dentry, bdst, rerr); ++ err = -EIO; ++ goto out; ++ } ++ } ++out_dir: ++ if (au_ftest_cpdown(*flags, MADE_DIR)) { ++ rerr = vfsub_sio_rmdir(au_h_iptr(dir, bdst), &h_path); ++ if (unlikely(rerr)) { ++ AuIOErr("failed removing %pd b%d (%d)\n", ++ dentry, bdst, rerr); ++ err = -EIO; ++ } ++ } ++out_put: ++ au_set_h_dptr(dentry, bdst, NULL); ++ if (au_dbbot(dentry) == bdst) ++ au_update_dbbot(dentry); ++out: ++ dput(parent); ++ return err; ++} ++ ++int au_cpdown_dirs(struct dentry *dentry, aufs_bindex_t bdst) ++{ ++ int err; ++ unsigned int flags; ++ ++ flags = 0; ++ err = au_cp_dirs(dentry, bdst, au_cpdown_dir, &flags); ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* policies for create */ ++ ++int au_wbr_nonopq(struct dentry *dentry, aufs_bindex_t bindex) ++{ ++ int err, i, j, ndentry; ++ aufs_bindex_t bopq; ++ struct au_dcsub_pages dpages; ++ struct au_dpage *dpage; ++ struct dentry **dentries, *parent, *d; ++ ++ err = au_dpages_init(&dpages, GFP_NOFS); ++ if (unlikely(err)) ++ goto out; ++ parent = dget_parent(dentry); ++ err = au_dcsub_pages_rev_aufs(&dpages, parent, /*do_include*/0); ++ if (unlikely(err)) ++ goto out_free; ++ ++ err = bindex; ++ for (i = 0; i < dpages.ndpage; i++) { ++ dpage = dpages.dpages + i; ++ dentries = dpage->dentries; ++ ndentry = dpage->ndentry; ++ for (j = 0; j < ndentry; j++) { ++ d = dentries[j]; ++ di_read_lock_parent2(d, !AuLock_IR); ++ bopq = au_dbdiropq(d); ++ di_read_unlock(d, !AuLock_IR); ++ if (bopq >= 0 && bopq < err) ++ err = bopq; ++ } ++ } ++ ++out_free: ++ dput(parent); ++ au_dpages_free(&dpages); ++out: ++ return err; ++} ++ ++static int au_wbr_bu(struct super_block *sb, aufs_bindex_t bindex) ++{ ++ for (; bindex >= 0; bindex--) ++ if (!au_br_rdonly(au_sbr(sb, bindex))) ++ return bindex; ++ return -EROFS; ++} ++ ++/* top down parent */ ++static int au_wbr_create_tdp(struct dentry *dentry, ++ unsigned int flags __maybe_unused) ++{ ++ int err; ++ aufs_bindex_t btop, bindex; ++ struct super_block *sb; ++ struct dentry *parent, *h_parent; ++ ++ sb = dentry->d_sb; ++ btop = au_dbtop(dentry); ++ err = btop; ++ if (!au_br_rdonly(au_sbr(sb, btop))) ++ goto out; ++ ++ err = -EROFS; ++ parent = dget_parent(dentry); ++ for (bindex = au_dbtop(parent); bindex < btop; bindex++) { ++ h_parent = au_h_dptr(parent, bindex); ++ if (!h_parent || d_is_negative(h_parent)) ++ continue; ++ ++ if (!au_br_rdonly(au_sbr(sb, bindex))) { ++ err = bindex; ++ break; ++ } ++ } ++ dput(parent); ++ ++ /* bottom up here */ ++ if (unlikely(err < 0)) { ++ err = au_wbr_bu(sb, btop - 1); ++ if (err >= 0) ++ err = au_wbr_nonopq(dentry, err); ++ } ++ ++out: ++ AuDbg("b%d\n", err); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* an exception for the policy other than tdp */ ++static int au_wbr_create_exp(struct dentry *dentry) ++{ ++ int err; ++ aufs_bindex_t bwh, bdiropq; ++ struct dentry *parent; ++ ++ err = -1; ++ bwh = au_dbwh(dentry); ++ parent = dget_parent(dentry); ++ bdiropq = au_dbdiropq(parent); ++ if (bwh >= 0) { ++ if (bdiropq >= 0) ++ err = min(bdiropq, bwh); ++ else ++ err = bwh; ++ AuDbg("%d\n", err); ++ } else if (bdiropq >= 0) { ++ err = bdiropq; ++ AuDbg("%d\n", err); ++ } ++ dput(parent); ++ ++ if (err >= 0) ++ err = au_wbr_nonopq(dentry, err); ++ ++ if (err >= 0 && au_br_rdonly(au_sbr(dentry->d_sb, err))) ++ err = -1; ++ ++ AuDbg("%d\n", err); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* round robin */ ++static int au_wbr_create_init_rr(struct super_block *sb) ++{ ++ int err; ++ ++ err = au_wbr_bu(sb, au_sbbot(sb)); ++ atomic_set(&au_sbi(sb)->si_wbr_rr_next, -err); /* less important */ ++ /* smp_mb(); */ ++ ++ AuDbg("b%d\n", err); ++ return err; ++} ++ ++static int au_wbr_create_rr(struct dentry *dentry, unsigned int flags) ++{ ++ int err, nbr; ++ unsigned int u; ++ aufs_bindex_t bindex, bbot; ++ struct super_block *sb; ++ atomic_t *next; ++ ++ err = au_wbr_create_exp(dentry); ++ if (err >= 0) ++ goto out; ++ ++ sb = dentry->d_sb; ++ next = &au_sbi(sb)->si_wbr_rr_next; ++ bbot = au_sbbot(sb); ++ nbr = bbot + 1; ++ for (bindex = 0; bindex <= bbot; bindex++) { ++ if (!au_ftest_wbr(flags, DIR)) { ++ err = atomic_dec_return(next) + 1; ++ /* modulo for 0 is meaningless */ ++ if (unlikely(!err)) ++ err = atomic_dec_return(next) + 1; ++ } else ++ err = atomic_read(next); ++ AuDbg("%d\n", err); ++ u = err; ++ err = u % nbr; ++ AuDbg("%d\n", err); ++ if (!au_br_rdonly(au_sbr(sb, err))) ++ break; ++ err = -EROFS; ++ } ++ ++ if (err >= 0) ++ err = au_wbr_nonopq(dentry, err); ++ ++out: ++ AuDbg("%d\n", err); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* most free space */ ++static void au_mfs(struct dentry *dentry, struct dentry *parent) ++{ ++ struct super_block *sb; ++ struct au_branch *br; ++ struct au_wbr_mfs *mfs; ++ struct dentry *h_parent; ++ aufs_bindex_t bindex, bbot; ++ int err; ++ unsigned long long b, bavail; ++ struct path h_path; ++ /* reduce the stack usage */ ++ struct kstatfs *st; ++ ++ st = kmalloc(sizeof(*st), GFP_NOFS); ++ if (unlikely(!st)) { ++ AuWarn1("failed updating mfs(%d), ignored\n", -ENOMEM); ++ return; ++ } ++ ++ bavail = 0; ++ sb = dentry->d_sb; ++ mfs = &au_sbi(sb)->si_wbr_mfs; ++ MtxMustLock(&mfs->mfs_lock); ++ mfs->mfs_bindex = -EROFS; ++ mfs->mfsrr_bytes = 0; ++ if (!parent) { ++ bindex = 0; ++ bbot = au_sbbot(sb); ++ } else { ++ bindex = au_dbtop(parent); ++ bbot = au_dbtaildir(parent); ++ } ++ ++ for (; bindex <= bbot; bindex++) { ++ if (parent) { ++ h_parent = au_h_dptr(parent, bindex); ++ if (!h_parent || d_is_negative(h_parent)) ++ continue; ++ } ++ br = au_sbr(sb, bindex); ++ if (au_br_rdonly(br)) ++ continue; ++ ++ /* sb->s_root for NFS is unreliable */ ++ h_path.mnt = au_br_mnt(br); ++ h_path.dentry = h_path.mnt->mnt_root; ++ err = vfs_statfs(&h_path, st); ++ if (unlikely(err)) { ++ AuWarn1("failed statfs, b%d, %d\n", bindex, err); ++ continue; ++ } ++ ++ /* when the available size is equal, select the lower one */ ++ BUILD_BUG_ON(sizeof(b) < sizeof(st->f_bavail) ++ || sizeof(b) < sizeof(st->f_bsize)); ++ b = st->f_bavail * st->f_bsize; ++ br->br_wbr->wbr_bytes = b; ++ if (b >= bavail) { ++ bavail = b; ++ mfs->mfs_bindex = bindex; ++ mfs->mfs_jiffy = jiffies; ++ } ++ } ++ ++ mfs->mfsrr_bytes = bavail; ++ AuDbg("b%d\n", mfs->mfs_bindex); ++ au_kfree_rcu(st); ++} ++ ++static int au_wbr_create_mfs(struct dentry *dentry, unsigned int flags) ++{ ++ int err; ++ struct dentry *parent; ++ struct super_block *sb; ++ struct au_wbr_mfs *mfs; ++ ++ err = au_wbr_create_exp(dentry); ++ if (err >= 0) ++ goto out; ++ ++ sb = dentry->d_sb; ++ parent = NULL; ++ if (au_ftest_wbr(flags, PARENT)) ++ parent = dget_parent(dentry); ++ mfs = &au_sbi(sb)->si_wbr_mfs; ++ mutex_lock(&mfs->mfs_lock); ++ if (time_after(jiffies, mfs->mfs_jiffy + mfs->mfs_expire) ++ || mfs->mfs_bindex < 0 ++ || au_br_rdonly(au_sbr(sb, mfs->mfs_bindex))) ++ au_mfs(dentry, parent); ++ mutex_unlock(&mfs->mfs_lock); ++ err = mfs->mfs_bindex; ++ dput(parent); ++ ++ if (err >= 0) ++ err = au_wbr_nonopq(dentry, err); ++ ++out: ++ AuDbg("b%d\n", err); ++ return err; ++} ++ ++static int au_wbr_create_init_mfs(struct super_block *sb) ++{ ++ struct au_wbr_mfs *mfs; ++ ++ mfs = &au_sbi(sb)->si_wbr_mfs; ++ mutex_init(&mfs->mfs_lock); ++ mfs->mfs_jiffy = 0; ++ mfs->mfs_bindex = -EROFS; ++ ++ return 0; ++} ++ ++static int au_wbr_create_fin_mfs(struct super_block *sb __maybe_unused) ++{ ++ mutex_destroy(&au_sbi(sb)->si_wbr_mfs.mfs_lock); ++ return 0; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* top down regardless parent, and then mfs */ ++static int au_wbr_create_tdmfs(struct dentry *dentry, ++ unsigned int flags __maybe_unused) ++{ ++ int err; ++ aufs_bindex_t bwh, btail, bindex, bfound, bmfs; ++ unsigned long long watermark; ++ struct super_block *sb; ++ struct au_wbr_mfs *mfs; ++ struct au_branch *br; ++ struct dentry *parent; ++ ++ sb = dentry->d_sb; ++ mfs = &au_sbi(sb)->si_wbr_mfs; ++ mutex_lock(&mfs->mfs_lock); ++ if (time_after(jiffies, mfs->mfs_jiffy + mfs->mfs_expire) ++ || mfs->mfs_bindex < 0) ++ au_mfs(dentry, /*parent*/NULL); ++ watermark = mfs->mfsrr_watermark; ++ bmfs = mfs->mfs_bindex; ++ mutex_unlock(&mfs->mfs_lock); ++ ++ /* another style of au_wbr_create_exp() */ ++ bwh = au_dbwh(dentry); ++ parent = dget_parent(dentry); ++ btail = au_dbtaildir(parent); ++ if (bwh >= 0 && bwh < btail) ++ btail = bwh; ++ ++ err = au_wbr_nonopq(dentry, btail); ++ if (unlikely(err < 0)) ++ goto out; ++ btail = err; ++ bfound = -1; ++ for (bindex = 0; bindex <= btail; bindex++) { ++ br = au_sbr(sb, bindex); ++ if (au_br_rdonly(br)) ++ continue; ++ if (br->br_wbr->wbr_bytes > watermark) { ++ bfound = bindex; ++ break; ++ } ++ } ++ err = bfound; ++ if (err < 0) ++ err = bmfs; ++ ++out: ++ dput(parent); ++ AuDbg("b%d\n", err); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* most free space and then round robin */ ++static int au_wbr_create_mfsrr(struct dentry *dentry, unsigned int flags) ++{ ++ int err; ++ struct au_wbr_mfs *mfs; ++ ++ err = au_wbr_create_mfs(dentry, flags); ++ if (err >= 0) { ++ mfs = &au_sbi(dentry->d_sb)->si_wbr_mfs; ++ mutex_lock(&mfs->mfs_lock); ++ if (mfs->mfsrr_bytes < mfs->mfsrr_watermark) ++ err = au_wbr_create_rr(dentry, flags); ++ mutex_unlock(&mfs->mfs_lock); ++ } ++ ++ AuDbg("b%d\n", err); ++ return err; ++} ++ ++static int au_wbr_create_init_mfsrr(struct super_block *sb) ++{ ++ int err; ++ ++ au_wbr_create_init_mfs(sb); /* ignore */ ++ err = au_wbr_create_init_rr(sb); ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* top down parent and most free space */ ++static int au_wbr_create_pmfs(struct dentry *dentry, unsigned int flags) ++{ ++ int err, e2; ++ unsigned long long b; ++ aufs_bindex_t bindex, btop, bbot; ++ struct super_block *sb; ++ struct dentry *parent, *h_parent; ++ struct au_branch *br; ++ ++ err = au_wbr_create_tdp(dentry, flags); ++ if (unlikely(err < 0)) ++ goto out; ++ parent = dget_parent(dentry); ++ btop = au_dbtop(parent); ++ bbot = au_dbtaildir(parent); ++ if (btop == bbot) ++ goto out_parent; /* success */ ++ ++ e2 = au_wbr_create_mfs(dentry, flags); ++ if (e2 < 0) ++ goto out_parent; /* success */ ++ ++ /* when the available size is equal, select upper one */ ++ sb = dentry->d_sb; ++ br = au_sbr(sb, err); ++ b = br->br_wbr->wbr_bytes; ++ AuDbg("b%d, %llu\n", err, b); ++ ++ for (bindex = btop; bindex <= bbot; bindex++) { ++ h_parent = au_h_dptr(parent, bindex); ++ if (!h_parent || d_is_negative(h_parent)) ++ continue; ++ ++ br = au_sbr(sb, bindex); ++ if (!au_br_rdonly(br) && br->br_wbr->wbr_bytes > b) { ++ b = br->br_wbr->wbr_bytes; ++ err = bindex; ++ AuDbg("b%d, %llu\n", err, b); ++ } ++ } ++ ++ if (err >= 0) ++ err = au_wbr_nonopq(dentry, err); ++ ++out_parent: ++ dput(parent); ++out: ++ AuDbg("b%d\n", err); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * - top down parent ++ * - most free space with parent ++ * - most free space round-robin regardless parent ++ */ ++static int au_wbr_create_pmfsrr(struct dentry *dentry, unsigned int flags) ++{ ++ int err; ++ unsigned long long watermark; ++ struct super_block *sb; ++ struct au_branch *br; ++ struct au_wbr_mfs *mfs; ++ ++ err = au_wbr_create_pmfs(dentry, flags | AuWbr_PARENT); ++ if (unlikely(err < 0)) ++ goto out; ++ ++ sb = dentry->d_sb; ++ br = au_sbr(sb, err); ++ mfs = &au_sbi(sb)->si_wbr_mfs; ++ mutex_lock(&mfs->mfs_lock); ++ watermark = mfs->mfsrr_watermark; ++ mutex_unlock(&mfs->mfs_lock); ++ if (br->br_wbr->wbr_bytes < watermark) ++ /* regardless the parent dir */ ++ err = au_wbr_create_mfsrr(dentry, flags); ++ ++out: ++ AuDbg("b%d\n", err); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* policies for copyup */ ++ ++/* top down parent */ ++static int au_wbr_copyup_tdp(struct dentry *dentry) ++{ ++ return au_wbr_create_tdp(dentry, /*flags, anything is ok*/0); ++} ++ ++/* bottom up parent */ ++static int au_wbr_copyup_bup(struct dentry *dentry) ++{ ++ int err; ++ aufs_bindex_t bindex, btop; ++ struct dentry *parent, *h_parent; ++ struct super_block *sb; ++ ++ err = -EROFS; ++ sb = dentry->d_sb; ++ parent = dget_parent(dentry); ++ btop = au_dbtop(parent); ++ for (bindex = au_dbtop(dentry); bindex >= btop; bindex--) { ++ h_parent = au_h_dptr(parent, bindex); ++ if (!h_parent || d_is_negative(h_parent)) ++ continue; ++ ++ if (!au_br_rdonly(au_sbr(sb, bindex))) { ++ err = bindex; ++ break; ++ } ++ } ++ dput(parent); ++ ++ /* bottom up here */ ++ if (unlikely(err < 0)) ++ err = au_wbr_bu(sb, btop - 1); ++ ++ AuDbg("b%d\n", err); ++ return err; ++} ++ ++/* bottom up */ ++int au_wbr_do_copyup_bu(struct dentry *dentry, aufs_bindex_t btop) ++{ ++ int err; ++ ++ err = au_wbr_bu(dentry->d_sb, btop); ++ AuDbg("b%d\n", err); ++ if (err > btop) ++ err = au_wbr_nonopq(dentry, err); ++ ++ AuDbg("b%d\n", err); ++ return err; ++} ++ ++static int au_wbr_copyup_bu(struct dentry *dentry) ++{ ++ int err; ++ aufs_bindex_t btop; ++ ++ btop = au_dbtop(dentry); ++ err = au_wbr_do_copyup_bu(dentry, btop); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++struct au_wbr_copyup_operations au_wbr_copyup_ops[] = { ++ [AuWbrCopyup_TDP] = { ++ .copyup = au_wbr_copyup_tdp ++ }, ++ [AuWbrCopyup_BUP] = { ++ .copyup = au_wbr_copyup_bup ++ }, ++ [AuWbrCopyup_BU] = { ++ .copyup = au_wbr_copyup_bu ++ } ++}; ++ ++struct au_wbr_create_operations au_wbr_create_ops[] = { ++ [AuWbrCreate_TDP] = { ++ .create = au_wbr_create_tdp ++ }, ++ [AuWbrCreate_RR] = { ++ .create = au_wbr_create_rr, ++ .init = au_wbr_create_init_rr ++ }, ++ [AuWbrCreate_MFS] = { ++ .create = au_wbr_create_mfs, ++ .init = au_wbr_create_init_mfs, ++ .fin = au_wbr_create_fin_mfs ++ }, ++ [AuWbrCreate_MFSV] = { ++ .create = au_wbr_create_mfs, ++ .init = au_wbr_create_init_mfs, ++ .fin = au_wbr_create_fin_mfs ++ }, ++ [AuWbrCreate_MFSRR] = { ++ .create = au_wbr_create_mfsrr, ++ .init = au_wbr_create_init_mfsrr, ++ .fin = au_wbr_create_fin_mfs ++ }, ++ [AuWbrCreate_MFSRRV] = { ++ .create = au_wbr_create_mfsrr, ++ .init = au_wbr_create_init_mfsrr, ++ .fin = au_wbr_create_fin_mfs ++ }, ++ [AuWbrCreate_TDMFS] = { ++ .create = au_wbr_create_tdmfs, ++ .init = au_wbr_create_init_mfs, ++ .fin = au_wbr_create_fin_mfs ++ }, ++ [AuWbrCreate_TDMFSV] = { ++ .create = au_wbr_create_tdmfs, ++ .init = au_wbr_create_init_mfs, ++ .fin = au_wbr_create_fin_mfs ++ }, ++ [AuWbrCreate_PMFS] = { ++ .create = au_wbr_create_pmfs, ++ .init = au_wbr_create_init_mfs, ++ .fin = au_wbr_create_fin_mfs ++ }, ++ [AuWbrCreate_PMFSV] = { ++ .create = au_wbr_create_pmfs, ++ .init = au_wbr_create_init_mfs, ++ .fin = au_wbr_create_fin_mfs ++ }, ++ [AuWbrCreate_PMFSRR] = { ++ .create = au_wbr_create_pmfsrr, ++ .init = au_wbr_create_init_mfsrr, ++ .fin = au_wbr_create_fin_mfs ++ }, ++ [AuWbrCreate_PMFSRRV] = { ++ .create = au_wbr_create_pmfsrr, ++ .init = au_wbr_create_init_mfsrr, ++ .fin = au_wbr_create_fin_mfs ++ } ++}; +diff --git a/fs/aufs/whout.c b/fs/aufs/whout.c +new file mode 100644 +index 000000000000..7bd0392eeb87 +--- /dev/null ++++ b/fs/aufs/whout.c +@@ -0,0 +1,1072 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * whiteout for logical deletion and opaque directory ++ */ ++ ++#include "aufs.h" ++ ++#define WH_MASK 0444 ++ ++/* ++ * If a directory contains this file, then it is opaque. We start with the ++ * .wh. flag so that it is blocked by lookup. ++ */ ++static struct qstr diropq_name = QSTR_INIT(AUFS_WH_DIROPQ, ++ sizeof(AUFS_WH_DIROPQ) - 1); ++ ++/* ++ * generate whiteout name, which is NOT terminated by NULL. ++ * @name: original d_name.name ++ * @len: original d_name.len ++ * @wh: whiteout qstr ++ * returns zero when succeeds, otherwise error. ++ * succeeded value as wh->name should be freed by kfree(). ++ */ ++int au_wh_name_alloc(struct qstr *wh, const struct qstr *name) ++{ ++ char *p; ++ ++ if (unlikely(name->len > PATH_MAX - AUFS_WH_PFX_LEN)) ++ return -ENAMETOOLONG; ++ ++ wh->len = name->len + AUFS_WH_PFX_LEN; ++ p = kmalloc(wh->len, GFP_NOFS); ++ wh->name = p; ++ if (p) { ++ memcpy(p, AUFS_WH_PFX, AUFS_WH_PFX_LEN); ++ memcpy(p + AUFS_WH_PFX_LEN, name->name, name->len); ++ /* smp_mb(); */ ++ return 0; ++ } ++ return -ENOMEM; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * test if the @wh_name exists under @h_ppath. ++ * @try_sio specifies the necessary of super-io. ++ */ ++int au_wh_test(struct mnt_idmap *h_idmap, struct path *h_ppath, ++ struct qstr *wh_name, int try_sio) ++{ ++ int err; ++ struct dentry *wh_dentry; ++ ++ if (!try_sio) ++ wh_dentry = vfsub_lkup_one(wh_name, h_ppath); ++ else ++ wh_dentry = au_sio_lkup_one(h_idmap, wh_name, h_ppath); ++ err = PTR_ERR(wh_dentry); ++ if (IS_ERR(wh_dentry)) { ++ if (err == -ENAMETOOLONG) ++ err = 0; ++ goto out; ++ } ++ ++ err = 0; ++ if (d_is_negative(wh_dentry)) ++ goto out_wh; /* success */ ++ ++ err = 1; ++ if (d_is_reg(wh_dentry)) ++ goto out_wh; /* success */ ++ ++ err = -EIO; ++ AuIOErr("%pd Invalid whiteout entry type 0%o.\n", ++ wh_dentry, d_inode(wh_dentry)->i_mode); ++ ++out_wh: ++ dput(wh_dentry); ++out: ++ return err; ++} ++ ++/* ++ * test if the @h_path->dentry sets opaque or not. ++ */ ++int au_diropq_test(struct mnt_idmap *h_idmap, struct path *h_path) ++{ ++ int err; ++ struct inode *h_dir; ++ ++ h_dir = d_inode(h_path->dentry); ++ err = au_wh_test(h_idmap, h_path, &diropq_name, ++ au_test_h_perm_sio(h_idmap, h_dir, MAY_EXEC)); ++ return err; ++} ++ ++/* ++ * returns a negative dentry whose name is unique and temporary. ++ */ ++struct dentry *au_whtmp_lkup(struct dentry *h_parent, struct au_branch *br, ++ struct qstr *prefix) ++{ ++ struct dentry *dentry; ++ int i; ++ char defname[NAME_MAX - AUFS_MAX_NAMELEN + DNAME_INLINE_LEN + 1], ++ *name, *p; ++ /* strict atomic_t is unnecessary here */ ++ static unsigned short cnt; ++ struct qstr qs; ++ struct path h_ppath; ++ struct mnt_idmap *h_idmap; ++ ++ BUILD_BUG_ON(sizeof(cnt) * 2 > AUFS_WH_TMP_LEN); ++ ++ name = defname; ++ qs.len = sizeof(defname) - DNAME_INLINE_LEN + prefix->len - 1; ++ if (unlikely(prefix->len > DNAME_INLINE_LEN)) { ++ dentry = ERR_PTR(-ENAMETOOLONG); ++ if (unlikely(qs.len > NAME_MAX)) ++ goto out; ++ dentry = ERR_PTR(-ENOMEM); ++ name = kmalloc(qs.len + 1, GFP_NOFS); ++ if (unlikely(!name)) ++ goto out; ++ } ++ ++ /* doubly whiteout-ed */ ++ memcpy(name, AUFS_WH_PFX AUFS_WH_PFX, AUFS_WH_PFX_LEN * 2); ++ p = name + AUFS_WH_PFX_LEN * 2; ++ memcpy(p, prefix->name, prefix->len); ++ p += prefix->len; ++ *p++ = '.'; ++ AuDebugOn(name + qs.len + 1 - p <= AUFS_WH_TMP_LEN); ++ ++ h_ppath.dentry = h_parent; ++ h_ppath.mnt = au_br_mnt(br); ++ h_idmap = au_br_idmap(br); ++ qs.name = name; ++ for (i = 0; i < 3; i++) { ++ sprintf(p, "%.*x", AUFS_WH_TMP_LEN, cnt++); ++ dentry = au_sio_lkup_one(h_idmap, &qs, &h_ppath); ++ if (IS_ERR(dentry) || d_is_negative(dentry)) ++ goto out_name; ++ dput(dentry); ++ } ++ /* pr_warn("could not get random name\n"); */ ++ dentry = ERR_PTR(-EEXIST); ++ AuDbg("%.*s\n", AuLNPair(&qs)); ++ BUG(); ++ ++out_name: ++ if (name != defname) ++ au_kfree_try_rcu(name); ++out: ++ AuTraceErrPtr(dentry); ++ return dentry; ++} ++ ++/* ++ * rename the @h_dentry on @br to the whiteouted temporary name. ++ */ ++int au_whtmp_ren(struct dentry *h_dentry, struct au_branch *br) ++{ ++ int err; ++ struct path h_path = { ++ .mnt = au_br_mnt(br) ++ }; ++ struct inode *h_dir, *delegated; ++ struct dentry *h_parent; ++ ++ h_parent = h_dentry->d_parent; /* dir inode is locked */ ++ h_dir = d_inode(h_parent); ++ IMustLock(h_dir); ++ ++ h_path.dentry = au_whtmp_lkup(h_parent, br, &h_dentry->d_name); ++ err = PTR_ERR(h_path.dentry); ++ if (IS_ERR(h_path.dentry)) ++ goto out; ++ ++ /* under the same dir, no need to lock_rename() */ ++ delegated = NULL; ++ err = vfsub_rename(h_dir, h_dentry, h_dir, &h_path, &delegated, ++ /*flags*/0); ++ AuTraceErr(err); ++ if (unlikely(err == -EWOULDBLOCK)) { ++ pr_warn("cannot retry for NFSv4 delegation" ++ " for an internal rename\n"); ++ iput(delegated); ++ } ++ dput(h_path.dentry); ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++/* ++ * functions for removing a whiteout ++ */ ++ ++static int do_unlink_wh(struct inode *h_dir, struct path *h_path) ++{ ++ int err, force; ++ struct inode *delegated; ++ ++ /* ++ * forces superio when the dir has a sticky bit. ++ * this may be a violation of unix fs semantics. ++ */ ++ force = (h_dir->i_mode & S_ISVTX) ++ && !uid_eq(current_fsuid(), d_inode(h_path->dentry)->i_uid); ++ delegated = NULL; ++ err = vfsub_unlink(h_dir, h_path, &delegated, force); ++ if (unlikely(err == -EWOULDBLOCK)) { ++ pr_warn("cannot retry for NFSv4 delegation" ++ " for an internal unlink\n"); ++ iput(delegated); ++ } ++ return err; ++} ++ ++int au_wh_unlink_dentry(struct inode *h_dir, struct path *h_path, ++ struct dentry *dentry) ++{ ++ int err; ++ ++ err = do_unlink_wh(h_dir, h_path); ++ if (!err && dentry) ++ au_set_dbwh(dentry, -1); ++ ++ return err; ++} ++ ++static int unlink_wh_name(struct path *h_ppath, struct qstr *wh) ++{ ++ int err; ++ struct path h_path; ++ ++ err = 0; ++ h_path.dentry = vfsub_lkup_one(wh, h_ppath); ++ if (IS_ERR(h_path.dentry)) ++ err = PTR_ERR(h_path.dentry); ++ else { ++ if (d_is_reg(h_path.dentry)) { ++ h_path.mnt = h_ppath->mnt; ++ err = do_unlink_wh(d_inode(h_ppath->dentry), &h_path); ++ } ++ dput(h_path.dentry); ++ } ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++/* ++ * initialize/clean whiteout for a branch ++ */ ++ ++static void au_wh_clean(struct inode *h_dir, struct path *whpath, ++ const int isdir) ++{ ++ int err; ++ struct inode *delegated; ++ ++ if (d_is_negative(whpath->dentry)) ++ return; ++ ++ if (isdir) ++ err = vfsub_rmdir(h_dir, whpath); ++ else { ++ delegated = NULL; ++ err = vfsub_unlink(h_dir, whpath, &delegated, /*force*/0); ++ if (unlikely(err == -EWOULDBLOCK)) { ++ pr_warn("cannot retry for NFSv4 delegation" ++ " for an internal unlink\n"); ++ iput(delegated); ++ } ++ } ++ if (unlikely(err)) ++ pr_warn("failed removing %pd (%d), ignored.\n", ++ whpath->dentry, err); ++} ++ ++static int test_linkable(struct dentry *h_root) ++{ ++ struct inode *h_dir = d_inode(h_root); ++ ++ if (h_dir->i_op->link) ++ return 0; ++ ++ pr_err("%pd (%s) doesn't support link(2), use noplink and rw+nolwh\n", ++ h_root, au_sbtype(h_root->d_sb)); ++ return -ENOSYS; /* the branch doesn't have its ->link() */ ++} ++ ++/* todo: should this mkdir be done in /sbin/mount.aufs helper? */ ++static int au_whdir(struct inode *h_dir, struct path *path) ++{ ++ int err; ++ ++ err = -EEXIST; ++ if (d_is_negative(path->dentry)) { ++ int mode = 0700; ++ ++ if (au_test_nfs(path->dentry->d_sb)) ++ mode |= 0111; ++ err = vfsub_mkdir(h_dir, path, mode); ++ } else if (d_is_dir(path->dentry)) ++ err = 0; ++ else ++ pr_err("unknown %pd exists\n", path->dentry); ++ ++ return err; ++} ++ ++struct au_wh_base { ++ const struct qstr *name; ++ struct dentry *dentry; ++}; ++ ++static void au_wh_init_ro(struct inode *h_dir, struct au_wh_base base[], ++ struct path *h_path) ++{ ++ h_path->dentry = base[AuBrWh_BASE].dentry; ++ au_wh_clean(h_dir, h_path, /*isdir*/0); ++ h_path->dentry = base[AuBrWh_PLINK].dentry; ++ au_wh_clean(h_dir, h_path, /*isdir*/1); ++ h_path->dentry = base[AuBrWh_ORPH].dentry; ++ au_wh_clean(h_dir, h_path, /*isdir*/1); ++} ++ ++/* ++ * returns tri-state, ++ * minus: error, caller should print the message ++ * zero: success ++ * plus: error, caller should NOT print the message ++ */ ++static int au_wh_init_rw_nolink(struct dentry *h_root, struct au_wbr *wbr, ++ int do_plink, struct au_wh_base base[], ++ struct path *h_path) ++{ ++ int err; ++ struct inode *h_dir; ++ ++ h_dir = d_inode(h_root); ++ h_path->dentry = base[AuBrWh_BASE].dentry; ++ au_wh_clean(h_dir, h_path, /*isdir*/0); ++ h_path->dentry = base[AuBrWh_PLINK].dentry; ++ if (do_plink) { ++ err = test_linkable(h_root); ++ if (unlikely(err)) { ++ err = 1; ++ goto out; ++ } ++ ++ err = au_whdir(h_dir, h_path); ++ if (unlikely(err)) ++ goto out; ++ wbr->wbr_plink = dget(base[AuBrWh_PLINK].dentry); ++ } else ++ au_wh_clean(h_dir, h_path, /*isdir*/1); ++ h_path->dentry = base[AuBrWh_ORPH].dentry; ++ err = au_whdir(h_dir, h_path); ++ if (unlikely(err)) ++ goto out; ++ wbr->wbr_orph = dget(base[AuBrWh_ORPH].dentry); ++ ++out: ++ return err; ++} ++ ++/* ++ * for the moment, aufs supports the branch filesystem which does not support ++ * link(2). testing on FAT which does not support i_op->setattr() fully either, ++ * copyup failed. finally, such filesystem will not be used as the writable ++ * branch. ++ * ++ * returns tri-state, see above. ++ */ ++static int au_wh_init_rw(struct dentry *h_root, struct au_wbr *wbr, ++ int do_plink, struct au_wh_base base[], ++ struct path *h_path) ++{ ++ int err; ++ struct inode *h_dir; ++ ++ WbrWhMustWriteLock(wbr); ++ ++ err = test_linkable(h_root); ++ if (unlikely(err)) { ++ err = 1; ++ goto out; ++ } ++ ++ /* ++ * todo: should this create be done in /sbin/mount.aufs helper? ++ */ ++ err = -EEXIST; ++ h_dir = d_inode(h_root); ++ if (d_is_negative(base[AuBrWh_BASE].dentry)) { ++ h_path->dentry = base[AuBrWh_BASE].dentry; ++ err = vfsub_create(h_dir, h_path, WH_MASK, /*want_excl*/true); ++ } else if (d_is_reg(base[AuBrWh_BASE].dentry)) ++ err = 0; ++ else ++ pr_err("unknown %pd2 exists\n", base[AuBrWh_BASE].dentry); ++ if (unlikely(err)) ++ goto out; ++ ++ h_path->dentry = base[AuBrWh_PLINK].dentry; ++ if (do_plink) { ++ err = au_whdir(h_dir, h_path); ++ if (unlikely(err)) ++ goto out; ++ wbr->wbr_plink = dget(base[AuBrWh_PLINK].dentry); ++ } else ++ au_wh_clean(h_dir, h_path, /*isdir*/1); ++ wbr->wbr_whbase = dget(base[AuBrWh_BASE].dentry); ++ ++ h_path->dentry = base[AuBrWh_ORPH].dentry; ++ err = au_whdir(h_dir, h_path); ++ if (unlikely(err)) ++ goto out; ++ wbr->wbr_orph = dget(base[AuBrWh_ORPH].dentry); ++ ++out: ++ return err; ++} ++ ++/* ++ * initialize the whiteout base file/dir for @br. ++ */ ++int au_wh_init(struct au_branch *br, struct super_block *sb) ++{ ++ int err, i; ++ const unsigned char do_plink ++ = !!au_opt_test(au_mntflags(sb), PLINK); ++ struct inode *h_dir; ++ struct path path = br->br_path; ++ struct dentry *h_root = path.dentry; ++ struct au_wbr *wbr = br->br_wbr; ++ static const struct qstr base_name[] = { ++ [AuBrWh_BASE] = QSTR_INIT(AUFS_BASE_NAME, ++ sizeof(AUFS_BASE_NAME) - 1), ++ [AuBrWh_PLINK] = QSTR_INIT(AUFS_PLINKDIR_NAME, ++ sizeof(AUFS_PLINKDIR_NAME) - 1), ++ [AuBrWh_ORPH] = QSTR_INIT(AUFS_ORPHDIR_NAME, ++ sizeof(AUFS_ORPHDIR_NAME) - 1) ++ }; ++ struct au_wh_base base[] = { ++ [AuBrWh_BASE] = { ++ .name = base_name + AuBrWh_BASE, ++ .dentry = NULL ++ }, ++ [AuBrWh_PLINK] = { ++ .name = base_name + AuBrWh_PLINK, ++ .dentry = NULL ++ }, ++ [AuBrWh_ORPH] = { ++ .name = base_name + AuBrWh_ORPH, ++ .dentry = NULL ++ } ++ }; ++ ++ if (wbr) ++ WbrWhMustWriteLock(wbr); ++ ++ for (i = 0; i < AuBrWh_Last; i++) { ++ /* doubly whiteouted */ ++ struct dentry *d; ++ ++ d = au_wh_lkup(h_root, (void *)base[i].name, br); ++ err = PTR_ERR(d); ++ if (IS_ERR(d)) ++ goto out; ++ ++ base[i].dentry = d; ++ AuDebugOn(wbr ++ && wbr->wbr_wh[i] ++ && wbr->wbr_wh[i] != base[i].dentry); ++ } ++ ++ if (wbr) ++ for (i = 0; i < AuBrWh_Last; i++) { ++ dput(wbr->wbr_wh[i]); ++ wbr->wbr_wh[i] = NULL; ++ } ++ ++ err = 0; ++ if (!au_br_writable(br->br_perm)) { ++ h_dir = d_inode(h_root); ++ au_wh_init_ro(h_dir, base, &path); ++ } else if (!au_br_wh_linkable(br->br_perm)) { ++ err = au_wh_init_rw_nolink(h_root, wbr, do_plink, base, &path); ++ if (err > 0) ++ goto out; ++ else if (err) ++ goto out_err; ++ } else { ++ err = au_wh_init_rw(h_root, wbr, do_plink, base, &path); ++ if (err > 0) ++ goto out; ++ else if (err) ++ goto out_err; ++ } ++ goto out; /* success */ ++ ++out_err: ++ pr_err("an error(%d) on the writable branch %pd(%s)\n", ++ err, h_root, au_sbtype(h_root->d_sb)); ++out: ++ for (i = 0; i < AuBrWh_Last; i++) ++ dput(base[i].dentry); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++/* ++ * whiteouts are all hard-linked usually. ++ * when its link count reaches a ceiling, we create a new whiteout base ++ * asynchronously. ++ */ ++ ++struct reinit_br_wh { ++ struct super_block *sb; ++ struct au_branch *br; ++}; ++ ++static void reinit_br_wh(void *arg) ++{ ++ int err; ++ aufs_bindex_t bindex; ++ struct path h_path; ++ struct reinit_br_wh *a = arg; ++ struct au_wbr *wbr; ++ struct inode *dir, *delegated; ++ struct dentry *h_root; ++ struct au_hinode *hdir; ++ ++ err = 0; ++ wbr = a->br->br_wbr; ++ /* big aufs lock */ ++ si_noflush_write_lock(a->sb); ++ if (!au_br_writable(a->br->br_perm)) ++ goto out; ++ bindex = au_br_index(a->sb, a->br->br_id); ++ if (unlikely(bindex < 0)) ++ goto out; ++ ++ di_read_lock_parent(a->sb->s_root, AuLock_IR); ++ dir = d_inode(a->sb->s_root); ++ hdir = au_hi(dir, bindex); ++ h_root = au_h_dptr(a->sb->s_root, bindex); ++ AuDebugOn(h_root != au_br_dentry(a->br)); ++ ++ au_hn_inode_lock_nested(hdir, AuLsc_I_PARENT); ++ wbr_wh_write_lock(wbr); ++ err = au_h_verify(wbr->wbr_whbase, au_opt_udba(a->sb), hdir->hi_inode, ++ h_root, a->br); ++ if (!err) { ++ h_path.dentry = wbr->wbr_whbase; ++ h_path.mnt = au_br_mnt(a->br); ++ delegated = NULL; ++ err = vfsub_unlink(hdir->hi_inode, &h_path, &delegated, ++ /*force*/0); ++ if (unlikely(err == -EWOULDBLOCK)) { ++ pr_warn("cannot retry for NFSv4 delegation" ++ " for an internal unlink\n"); ++ iput(delegated); ++ } ++ } else { ++ pr_warn("%pd is moved, ignored\n", wbr->wbr_whbase); ++ err = 0; ++ } ++ dput(wbr->wbr_whbase); ++ wbr->wbr_whbase = NULL; ++ if (!err) ++ err = au_wh_init(a->br, a->sb); ++ wbr_wh_write_unlock(wbr); ++ au_hn_inode_unlock(hdir); ++ di_read_unlock(a->sb->s_root, AuLock_IR); ++ if (!err) ++ au_fhsm_wrote(a->sb, bindex, /*force*/0); ++ ++out: ++ if (wbr) ++ atomic_dec(&wbr->wbr_wh_running); ++ au_lcnt_dec(&a->br->br_count); ++ si_write_unlock(a->sb); ++ au_nwt_done(&au_sbi(a->sb)->si_nowait); ++ au_kfree_rcu(a); ++ if (unlikely(err)) ++ AuIOErr("err %d\n", err); ++} ++ ++static void kick_reinit_br_wh(struct super_block *sb, struct au_branch *br) ++{ ++ int do_dec, wkq_err; ++ struct reinit_br_wh *arg; ++ ++ do_dec = 1; ++ if (atomic_inc_return(&br->br_wbr->wbr_wh_running) != 1) ++ goto out; ++ ++ /* ignore ENOMEM */ ++ arg = kmalloc(sizeof(*arg), GFP_NOFS); ++ if (arg) { ++ /* ++ * dec(wh_running), kfree(arg) and dec(br_count) ++ * in reinit function ++ */ ++ arg->sb = sb; ++ arg->br = br; ++ au_lcnt_inc(&br->br_count); ++ wkq_err = au_wkq_nowait(reinit_br_wh, arg, sb, /*flags*/0); ++ if (unlikely(wkq_err)) { ++ atomic_dec(&br->br_wbr->wbr_wh_running); ++ au_lcnt_dec(&br->br_count); ++ au_kfree_rcu(arg); ++ } ++ do_dec = 0; ++ } ++ ++out: ++ if (do_dec) ++ atomic_dec(&br->br_wbr->wbr_wh_running); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * create the whiteout @wh. ++ */ ++static int link_or_create_wh(struct super_block *sb, aufs_bindex_t bindex, ++ struct dentry *wh) ++{ ++ int err; ++ struct path h_path = { ++ .dentry = wh ++ }; ++ struct au_branch *br; ++ struct au_wbr *wbr; ++ struct dentry *h_parent; ++ struct inode *h_dir, *delegated; ++ ++ h_parent = wh->d_parent; /* dir inode is locked */ ++ h_dir = d_inode(h_parent); ++ IMustLock(h_dir); ++ ++ br = au_sbr(sb, bindex); ++ h_path.mnt = au_br_mnt(br); ++ wbr = br->br_wbr; ++ wbr_wh_read_lock(wbr); ++ if (wbr->wbr_whbase) { ++ delegated = NULL; ++ err = vfsub_link(wbr->wbr_whbase, h_dir, &h_path, &delegated); ++ if (unlikely(err == -EWOULDBLOCK)) { ++ pr_warn("cannot retry for NFSv4 delegation" ++ " for an internal link\n"); ++ iput(delegated); ++ } ++ if (!err || err != -EMLINK) ++ goto out; ++ ++ /* link count full. re-initialize br_whbase. */ ++ kick_reinit_br_wh(sb, br); ++ } ++ ++ /* return this error in this context */ ++ err = vfsub_create(h_dir, &h_path, WH_MASK, /*want_excl*/true); ++ if (!err) ++ au_fhsm_wrote(sb, bindex, /*force*/0); ++ ++out: ++ wbr_wh_read_unlock(wbr); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * create or remove the diropq. ++ */ ++static struct dentry *do_diropq(struct dentry *dentry, aufs_bindex_t bindex, ++ unsigned int flags) ++{ ++ struct dentry *opq_dentry; ++ struct super_block *sb; ++ struct au_branch *br; ++ struct path h_path; ++ int err; ++ ++ sb = dentry->d_sb; ++ br = au_sbr(sb, bindex); ++ h_path.dentry = au_h_dptr(dentry, bindex); ++ h_path.mnt = au_br_mnt(br); ++ opq_dentry = vfsub_lkup_one(&diropq_name, &h_path); ++ if (IS_ERR(opq_dentry)) ++ goto out; ++ ++ if (au_ftest_diropq(flags, CREATE)) { ++ err = link_or_create_wh(sb, bindex, opq_dentry); ++ if (!err) { ++ au_set_dbdiropq(dentry, bindex); ++ goto out; /* success */ ++ } ++ } else { ++ h_path.dentry = opq_dentry; ++ err = do_unlink_wh(au_h_iptr(d_inode(dentry), bindex), &h_path); ++ if (!err) ++ au_set_dbdiropq(dentry, -1); ++ } ++ dput(opq_dentry); ++ opq_dentry = ERR_PTR(err); ++ ++out: ++ return opq_dentry; ++} ++ ++struct do_diropq_args { ++ struct dentry **errp; ++ struct dentry *dentry; ++ aufs_bindex_t bindex; ++ unsigned int flags; ++}; ++ ++static void call_do_diropq(void *args) ++{ ++ struct do_diropq_args *a = args; ++ *a->errp = do_diropq(a->dentry, a->bindex, a->flags); ++} ++ ++struct dentry *au_diropq_sio(struct dentry *dentry, aufs_bindex_t bindex, ++ unsigned int flags) ++{ ++ struct dentry *diropq, *h_dentry; ++ struct mnt_idmap *h_idmap; ++ ++ h_idmap = au_sbr_idmap(dentry->d_sb, bindex); ++ h_dentry = au_h_dptr(dentry, bindex); ++ if (!au_test_h_perm_sio(h_idmap, d_inode(h_dentry), ++ MAY_EXEC | MAY_WRITE)) ++ diropq = do_diropq(dentry, bindex, flags); ++ else { ++ int wkq_err; ++ struct do_diropq_args args = { ++ .errp = &diropq, ++ .dentry = dentry, ++ .bindex = bindex, ++ .flags = flags ++ }; ++ ++ wkq_err = au_wkq_wait(call_do_diropq, &args); ++ if (unlikely(wkq_err)) ++ diropq = ERR_PTR(wkq_err); ++ } ++ ++ return diropq; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * lookup whiteout dentry. ++ * @h_parent: lower parent dentry which must exist and be locked ++ * @base_name: name of dentry which will be whiteouted ++ * returns dentry for whiteout. ++ */ ++struct dentry *au_wh_lkup(struct dentry *h_parent, struct qstr *base_name, ++ struct au_branch *br) ++{ ++ int err; ++ struct qstr wh_name; ++ struct dentry *wh_dentry; ++ struct path h_path; ++ ++ err = au_wh_name_alloc(&wh_name, base_name); ++ wh_dentry = ERR_PTR(err); ++ if (!err) { ++ h_path.dentry = h_parent; ++ h_path.mnt = au_br_mnt(br); ++ wh_dentry = vfsub_lkup_one(&wh_name, &h_path); ++ au_kfree_try_rcu(wh_name.name); ++ } ++ return wh_dentry; ++} ++ ++/* ++ * link/create a whiteout for @dentry on @bindex. ++ */ ++struct dentry *au_wh_create(struct dentry *dentry, aufs_bindex_t bindex, ++ struct dentry *h_parent) ++{ ++ struct dentry *wh_dentry; ++ struct super_block *sb; ++ int err; ++ ++ sb = dentry->d_sb; ++ wh_dentry = au_wh_lkup(h_parent, &dentry->d_name, au_sbr(sb, bindex)); ++ if (!IS_ERR(wh_dentry) && d_is_negative(wh_dentry)) { ++ err = link_or_create_wh(sb, bindex, wh_dentry); ++ if (!err) { ++ au_set_dbwh(dentry, bindex); ++ au_fhsm_wrote(sb, bindex, /*force*/0); ++ } else { ++ dput(wh_dentry); ++ wh_dentry = ERR_PTR(err); ++ } ++ } ++ ++ return wh_dentry; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* Delete all whiteouts in this directory on branch bindex. */ ++static int del_wh_children(struct path *h_path, struct au_nhash *whlist, ++ aufs_bindex_t bindex) ++{ ++ int err; ++ unsigned long ul, n; ++ struct qstr wh_name; ++ char *p; ++ struct hlist_head *head; ++ struct au_vdir_wh *pos; ++ struct au_vdir_destr *str; ++ ++ err = -ENOMEM; ++ p = (void *)__get_free_page(GFP_NOFS); ++ wh_name.name = p; ++ if (unlikely(!wh_name.name)) ++ goto out; ++ ++ err = 0; ++ memcpy(p, AUFS_WH_PFX, AUFS_WH_PFX_LEN); ++ p += AUFS_WH_PFX_LEN; ++ n = whlist->nh_num; ++ head = whlist->nh_head; ++ for (ul = 0; !err && ul < n; ul++, head++) { ++ hlist_for_each_entry(pos, head, wh_hash) { ++ if (pos->wh_bindex != bindex) ++ continue; ++ ++ str = &pos->wh_str; ++ if (str->len + AUFS_WH_PFX_LEN <= PATH_MAX) { ++ memcpy(p, str->name, str->len); ++ wh_name.len = AUFS_WH_PFX_LEN + str->len; ++ err = unlink_wh_name(h_path, &wh_name); ++ if (!err) ++ continue; ++ break; ++ } ++ AuIOErr("whiteout name too long %.*s\n", ++ str->len, str->name); ++ err = -EIO; ++ break; ++ } ++ } ++ free_page((unsigned long)wh_name.name); ++ ++out: ++ return err; ++} ++ ++struct del_wh_children_args { ++ int *errp; ++ struct path *h_path; ++ struct au_nhash *whlist; ++ aufs_bindex_t bindex; ++}; ++ ++static void call_del_wh_children(void *args) ++{ ++ struct del_wh_children_args *a = args; ++ *a->errp = del_wh_children(a->h_path, a->whlist, a->bindex); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++struct au_whtmp_rmdir *au_whtmp_rmdir_alloc(struct super_block *sb, gfp_t gfp) ++{ ++ struct au_whtmp_rmdir *whtmp; ++ int err; ++ unsigned int rdhash; ++ ++ SiMustAnyLock(sb); ++ ++ whtmp = kzalloc(sizeof(*whtmp), gfp); ++ if (unlikely(!whtmp)) { ++ whtmp = ERR_PTR(-ENOMEM); ++ goto out; ++ } ++ ++ /* no estimation for dir size */ ++ rdhash = au_sbi(sb)->si_rdhash; ++ if (!rdhash) ++ rdhash = AUFS_RDHASH_DEF; ++ err = au_nhash_alloc(&whtmp->whlist, rdhash, gfp); ++ if (unlikely(err)) { ++ au_kfree_rcu(whtmp); ++ whtmp = ERR_PTR(err); ++ } ++ ++out: ++ return whtmp; ++} ++ ++void au_whtmp_rmdir_free(struct au_whtmp_rmdir *whtmp) ++{ ++ if (whtmp->br) ++ au_lcnt_dec(&whtmp->br->br_count); ++ dput(whtmp->wh_dentry); ++ iput(whtmp->dir); ++ au_nhash_wh_free(&whtmp->whlist); ++ au_kfree_rcu(whtmp); ++} ++ ++/* ++ * rmdir the whiteouted temporary named dir @h_dentry. ++ * @whlist: whiteouted children. ++ */ ++int au_whtmp_rmdir(struct inode *dir, aufs_bindex_t bindex, ++ struct dentry *wh_dentry, struct au_nhash *whlist) ++{ ++ int err; ++ unsigned int h_nlink; ++ struct path wh_path; ++ struct inode *wh_inode, *h_dir; ++ struct au_branch *br; ++ struct mnt_idmap *h_idmap; ++ ++ h_dir = d_inode(wh_dentry->d_parent); /* dir inode is locked */ ++ IMustLock(h_dir); ++ ++ br = au_sbr(dir->i_sb, bindex); ++ wh_path.dentry = wh_dentry; ++ wh_path.mnt = au_br_mnt(br); ++ h_idmap = au_br_idmap(br); ++ wh_inode = d_inode(wh_dentry); ++ inode_lock_nested(wh_inode, AuLsc_I_CHILD); ++ ++ /* ++ * someone else might change some whiteouts while we were sleeping. ++ * it means this whlist may have an obsoleted entry. ++ */ ++ if (!au_test_h_perm_sio(h_idmap, wh_inode, MAY_EXEC | MAY_WRITE)) ++ err = del_wh_children(&wh_path, whlist, bindex); ++ else { ++ int wkq_err; ++ struct del_wh_children_args args = { ++ .errp = &err, ++ .h_path = &wh_path, ++ .whlist = whlist, ++ .bindex = bindex ++ }; ++ ++ wkq_err = au_wkq_wait(call_del_wh_children, &args); ++ if (unlikely(wkq_err)) ++ err = wkq_err; ++ } ++ inode_unlock(wh_inode); ++ ++ if (!err) { ++ h_nlink = h_dir->i_nlink; ++ err = vfsub_rmdir(h_dir, &wh_path); ++ /* some fs doesn't change the parent nlink in some cases */ ++ h_nlink -= h_dir->i_nlink; ++ } ++ ++ if (!err) { ++ if (au_ibtop(dir) == bindex) { ++ /* todo: dir->i_mutex is necessary */ ++ au_cpup_attr_timesizes(dir); ++ if (h_nlink) ++ vfsub_drop_nlink(dir); ++ } ++ return 0; /* success */ ++ } ++ ++ pr_warn("failed removing %pd(%d), ignored\n", wh_dentry, err); ++ return err; ++} ++ ++static void call_rmdir_whtmp(void *args) ++{ ++ int err; ++ aufs_bindex_t bindex; ++ struct au_whtmp_rmdir *a = args; ++ struct super_block *sb; ++ struct dentry *h_parent; ++ struct inode *h_dir; ++ struct au_hinode *hdir; ++ ++ /* rmdir by nfsd may cause deadlock with this i_mutex */ ++ /* inode_lock(a->dir); */ ++ err = -EROFS; ++ sb = a->dir->i_sb; ++ si_read_lock(sb, !AuLock_FLUSH); ++ if (!au_br_writable(a->br->br_perm)) ++ goto out; ++ bindex = au_br_index(sb, a->br->br_id); ++ if (unlikely(bindex < 0)) ++ goto out; ++ ++ err = -EIO; ++ ii_write_lock_parent(a->dir); ++ h_parent = dget_parent(a->wh_dentry); ++ h_dir = d_inode(h_parent); ++ hdir = au_hi(a->dir, bindex); ++ err = vfsub_mnt_want_write(au_br_mnt(a->br)); ++ if (unlikely(err)) ++ goto out_mnt; ++ au_hn_inode_lock_nested(hdir, AuLsc_I_PARENT); ++ err = au_h_verify(a->wh_dentry, au_opt_udba(sb), h_dir, h_parent, ++ a->br); ++ if (!err) ++ err = au_whtmp_rmdir(a->dir, bindex, a->wh_dentry, &a->whlist); ++ au_hn_inode_unlock(hdir); ++ vfsub_mnt_drop_write(au_br_mnt(a->br)); ++ ++out_mnt: ++ dput(h_parent); ++ ii_write_unlock(a->dir); ++out: ++ /* inode_unlock(a->dir); */ ++ au_whtmp_rmdir_free(a); ++ si_read_unlock(sb); ++ au_nwt_done(&au_sbi(sb)->si_nowait); ++ if (unlikely(err)) ++ AuIOErr("err %d\n", err); ++} ++ ++void au_whtmp_kick_rmdir(struct inode *dir, aufs_bindex_t bindex, ++ struct dentry *wh_dentry, struct au_whtmp_rmdir *args) ++{ ++ int wkq_err; ++ struct super_block *sb; ++ ++ IMustLock(dir); ++ ++ /* all post-process will be done in do_rmdir_whtmp(). */ ++ sb = dir->i_sb; ++ args->dir = au_igrab(dir); ++ args->br = au_sbr(sb, bindex); ++ au_lcnt_inc(&args->br->br_count); ++ args->wh_dentry = dget(wh_dentry); ++ wkq_err = au_wkq_nowait(call_rmdir_whtmp, args, sb, /*flags*/0); ++ if (unlikely(wkq_err)) { ++ pr_warn("rmdir error %pd (%d), ignored\n", wh_dentry, wkq_err); ++ au_whtmp_rmdir_free(args); ++ } ++} +diff --git a/fs/aufs/whout.h b/fs/aufs/whout.h +new file mode 100644 +index 000000000000..a7ae8702e7a5 +--- /dev/null ++++ b/fs/aufs/whout.h +@@ -0,0 +1,87 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * whiteout for logical deletion and opaque directory ++ */ ++ ++#ifndef __AUFS_WHOUT_H__ ++#define __AUFS_WHOUT_H__ ++ ++#ifdef __KERNEL__ ++ ++#include "dir.h" ++ ++/* whout.c */ ++int au_wh_name_alloc(struct qstr *wh, const struct qstr *name); ++int au_wh_test(struct mnt_idmap *h_idmap, struct path *h_ppath, ++ struct qstr *wh_name, int try_sio); ++int au_diropq_test(struct mnt_idmap *h_idmap, struct path *h_path); ++struct au_branch; ++struct dentry *au_whtmp_lkup(struct dentry *h_parent, struct au_branch *br, ++ struct qstr *prefix); ++int au_whtmp_ren(struct dentry *h_dentry, struct au_branch *br); ++int au_wh_unlink_dentry(struct inode *h_dir, struct path *h_path, ++ struct dentry *dentry); ++int au_wh_init(struct au_branch *br, struct super_block *sb); ++ ++/* diropq flags */ ++#define AuDiropq_CREATE 1 ++#define au_ftest_diropq(flags, name) ((flags) & AuDiropq_##name) ++#define au_fset_diropq(flags, name) \ ++ do { (flags) |= AuDiropq_##name; } while (0) ++#define au_fclr_diropq(flags, name) \ ++ do { (flags) &= ~AuDiropq_##name; } while (0) ++ ++struct dentry *au_diropq_sio(struct dentry *dentry, aufs_bindex_t bindex, ++ unsigned int flags); ++struct dentry *au_wh_lkup(struct dentry *h_parent, struct qstr *base_name, ++ struct au_branch *br); ++struct dentry *au_wh_create(struct dentry *dentry, aufs_bindex_t bindex, ++ struct dentry *h_parent); ++ ++/* real rmdir for the whiteout-ed dir */ ++struct au_whtmp_rmdir { ++ struct inode *dir; ++ struct au_branch *br; ++ struct dentry *wh_dentry; ++ struct au_nhash whlist; ++}; ++ ++struct au_whtmp_rmdir *au_whtmp_rmdir_alloc(struct super_block *sb, gfp_t gfp); ++void au_whtmp_rmdir_free(struct au_whtmp_rmdir *whtmp); ++int au_whtmp_rmdir(struct inode *dir, aufs_bindex_t bindex, ++ struct dentry *wh_dentry, struct au_nhash *whlist); ++void au_whtmp_kick_rmdir(struct inode *dir, aufs_bindex_t bindex, ++ struct dentry *wh_dentry, struct au_whtmp_rmdir *args); ++ ++/* ---------------------------------------------------------------------- */ ++ ++static inline struct dentry *au_diropq_create(struct dentry *dentry, ++ aufs_bindex_t bindex) ++{ ++ return au_diropq_sio(dentry, bindex, AuDiropq_CREATE); ++} ++ ++static inline int au_diropq_remove(struct dentry *dentry, aufs_bindex_t bindex) ++{ ++ return PTR_ERR(au_diropq_sio(dentry, bindex, !AuDiropq_CREATE)); ++} ++ ++#endif /* __KERNEL__ */ ++#endif /* __AUFS_WHOUT_H__ */ +diff --git a/fs/aufs/wkq.c b/fs/aufs/wkq.c +new file mode 100644 +index 000000000000..cb71ca3bf51b +--- /dev/null ++++ b/fs/aufs/wkq.c +@@ -0,0 +1,372 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * workqueue for asynchronous/super-io operations ++ * todo: try new credential scheme ++ */ ++ ++#include <linux/module.h> ++#include "aufs.h" ++ ++/* internal workqueue named AUFS_WKQ_NAME */ ++ ++static struct workqueue_struct *au_wkq; ++ ++struct au_wkinfo { ++ struct work_struct wk; ++ struct kobject *kobj; ++ ++ unsigned int flags; /* see wkq.h */ ++ ++ au_wkq_func_t func; ++ void *args; ++ ++#ifdef CONFIG_LOCKDEP ++ int dont_check; ++ struct held_lock **hlock; ++#endif ++ ++ struct completion *comp; ++}; ++ ++/* ---------------------------------------------------------------------- */ ++/* ++ * Aufs passes some operations to the workqueue such as the internal copyup. ++ * This scheme looks rather unnatural for LOCKDEP debugging feature, since the ++ * job run by workqueue depends upon the locks acquired in the other task. ++ * Delegating a small operation to the workqueue, aufs passes its lockdep ++ * information too. And the job in the workqueue restores the info in order to ++ * pretend as if it acquired those locks. This is just to make LOCKDEP work ++ * correctly and expectedly. ++ */ ++ ++#ifndef CONFIG_LOCKDEP ++AuStubInt0(au_wkq_lockdep_alloc, struct au_wkinfo *wkinfo); ++AuStubVoid(au_wkq_lockdep_free, struct au_wkinfo *wkinfo); ++AuStubVoid(au_wkq_lockdep_pre, struct au_wkinfo *wkinfo); ++AuStubVoid(au_wkq_lockdep_post, struct au_wkinfo *wkinfo); ++AuStubVoid(au_wkq_lockdep_init, struct au_wkinfo *wkinfo); ++#else ++static void au_wkq_lockdep_init(struct au_wkinfo *wkinfo) ++{ ++ wkinfo->hlock = NULL; ++ wkinfo->dont_check = 0; ++} ++ ++/* ++ * 1: matched ++ * 0: unmatched ++ */ ++static int au_wkq_lockdep_test(struct lock_class_key *key, const char *name) ++{ ++ static DEFINE_SPINLOCK(spin); ++ static struct { ++ char *name; ++ struct lock_class_key *key; ++ } a[] = { ++ { .name = "&sbinfo->si_rwsem" }, ++ { .name = "&finfo->fi_rwsem" }, ++ { .name = "&dinfo->di_rwsem" }, ++ { .name = "&iinfo->ii_rwsem" } ++ }; ++ static int set; ++ int i; ++ ++ /* lockless read from 'set.' see below */ ++ if (set == ARRAY_SIZE(a)) { ++ for (i = 0; i < ARRAY_SIZE(a); i++) ++ if (a[i].key == key) ++ goto match; ++ goto unmatch; ++ } ++ ++ spin_lock(&spin); ++ if (set) ++ for (i = 0; i < ARRAY_SIZE(a); i++) ++ if (a[i].key == key) { ++ spin_unlock(&spin); ++ goto match; ++ } ++ for (i = 0; i < ARRAY_SIZE(a); i++) { ++ if (a[i].key) { ++ if (unlikely(a[i].key == key)) { /* rare but possible */ ++ spin_unlock(&spin); ++ goto match; ++ } else ++ continue; ++ } ++ if (strstr(a[i].name, name)) { ++ /* ++ * the order of these three lines is important for the ++ * lockless read above. ++ */ ++ a[i].key = key; ++ spin_unlock(&spin); ++ set++; ++ /* AuDbg("%d, %s\n", set, name); */ ++ goto match; ++ } ++ } ++ spin_unlock(&spin); ++ goto unmatch; ++ ++match: ++ return 1; ++unmatch: ++ return 0; ++} ++ ++static int au_wkq_lockdep_alloc(struct au_wkinfo *wkinfo) ++{ ++ int err, n; ++ struct task_struct *curr; ++ struct held_lock **hl, *held_locks, *p; ++ ++ err = 0; ++ curr = current; ++ wkinfo->dont_check = lockdep_recursing(curr); ++ if (wkinfo->dont_check) ++ goto out; ++ n = curr->lockdep_depth; ++ if (!n) ++ goto out; ++ ++ err = -ENOMEM; ++ wkinfo->hlock = kmalloc_array(n + 1, sizeof(*wkinfo->hlock), GFP_NOFS); ++ if (unlikely(!wkinfo->hlock)) ++ goto out; ++ ++ err = 0; ++#if 0 /* left for debugging */ ++ if (0 && au_debug_test()) ++ lockdep_print_held_locks(curr); ++#endif ++ held_locks = curr->held_locks; ++ hl = wkinfo->hlock; ++ while (n--) { ++ p = held_locks++; ++ if (au_wkq_lockdep_test(p->instance->key, p->instance->name)) ++ *hl++ = p; ++ } ++ *hl = NULL; ++ ++out: ++ return err; ++} ++ ++static void au_wkq_lockdep_free(struct au_wkinfo *wkinfo) ++{ ++ au_kfree_try_rcu(wkinfo->hlock); ++} ++ ++static void au_wkq_lockdep_pre(struct au_wkinfo *wkinfo) ++{ ++ struct held_lock *p, **hl = wkinfo->hlock; ++ int subclass; ++ ++ if (wkinfo->dont_check) ++ lockdep_off(); ++ if (!hl) ++ return; ++ while ((p = *hl++)) { /* assignment */ ++ subclass = lockdep_hlock_class(p)->subclass; ++ /* AuDbg("%s, %d\n", p->instance->name, subclass); */ ++ if (p->read) ++ rwsem_acquire_read(p->instance, subclass, 0, ++ /*p->acquire_ip*/_RET_IP_); ++ else ++ rwsem_acquire(p->instance, subclass, 0, ++ /*p->acquire_ip*/_RET_IP_); ++ } ++} ++ ++static void au_wkq_lockdep_post(struct au_wkinfo *wkinfo) ++{ ++ struct held_lock *p, **hl = wkinfo->hlock; ++ ++ if (wkinfo->dont_check) ++ lockdep_on(); ++ if (!hl) ++ return; ++ while ((p = *hl++)) /* assignment */ ++ rwsem_release(p->instance, /*p->acquire_ip*/_RET_IP_); ++} ++#endif ++ ++static void wkq_func(struct work_struct *wk) ++{ ++ struct au_wkinfo *wkinfo = container_of(wk, struct au_wkinfo, wk); ++ ++ AuDebugOn(!uid_eq(current_fsuid(), GLOBAL_ROOT_UID)); ++ AuDebugOn(rlimit(RLIMIT_FSIZE) != RLIM_INFINITY); ++ ++ au_wkq_lockdep_pre(wkinfo); ++ wkinfo->func(wkinfo->args); ++ au_wkq_lockdep_post(wkinfo); ++ if (au_ftest_wkq(wkinfo->flags, WAIT)) ++ complete(wkinfo->comp); ++ else { ++ kobject_put(wkinfo->kobj); ++ module_put(THIS_MODULE); /* todo: ?? */ ++ au_kfree_rcu(wkinfo); ++ } ++} ++ ++/* ++ * Since struct completion is large, try allocating it dynamically. ++ */ ++#define AuWkqCompDeclare(name) struct completion *comp = NULL ++ ++static int au_wkq_comp_alloc(struct au_wkinfo *wkinfo, struct completion **comp) ++{ ++ *comp = kmalloc(sizeof(**comp), GFP_NOFS); ++ if (*comp) { ++ init_completion(*comp); ++ wkinfo->comp = *comp; ++ return 0; ++ } ++ return -ENOMEM; ++} ++ ++static void au_wkq_comp_free(struct completion *comp) ++{ ++ au_kfree_rcu(comp); ++} ++ ++static void au_wkq_run(struct au_wkinfo *wkinfo) ++{ ++ if (au_ftest_wkq(wkinfo->flags, NEST)) { ++ if (au_wkq_test()) { ++ AuWarn1("wkq from wkq, unless silly-rename on NFS," ++ " due to a dead dir by UDBA," ++ " or async xino write?\n"); ++ AuDebugOn(au_ftest_wkq(wkinfo->flags, WAIT)); ++ } ++ } else ++ au_dbg_verify_kthread(); ++ ++ if (au_ftest_wkq(wkinfo->flags, WAIT)) { ++ INIT_WORK_ONSTACK(&wkinfo->wk, wkq_func); ++ queue_work(au_wkq, &wkinfo->wk); ++ } else { ++ INIT_WORK(&wkinfo->wk, wkq_func); ++ schedule_work(&wkinfo->wk); ++ } ++} ++ ++/* ++ * Be careful. It is easy to make deadlock happen. ++ * processA: lock, wkq and wait ++ * processB: wkq and wait, lock in wkq ++ * --> deadlock ++ */ ++int au_wkq_do_wait(unsigned int flags, au_wkq_func_t func, void *args) ++{ ++ int err; ++ AuWkqCompDeclare(comp); ++ struct au_wkinfo wkinfo = { ++ .flags = flags, ++ .func = func, ++ .args = args ++ }; ++ ++ err = au_wkq_comp_alloc(&wkinfo, &comp); ++ if (unlikely(err)) ++ goto out; ++ err = au_wkq_lockdep_alloc(&wkinfo); ++ if (unlikely(err)) ++ goto out_comp; ++ if (!err) { ++ au_wkq_run(&wkinfo); ++ /* no timeout, no interrupt */ ++ wait_for_completion(wkinfo.comp); ++ } ++ au_wkq_lockdep_free(&wkinfo); ++ ++out_comp: ++ au_wkq_comp_free(comp); ++out: ++ destroy_work_on_stack(&wkinfo.wk); ++ return err; ++} ++ ++/* ++ * Note: dget/dput() in func for aufs dentries are not supported. It will be a ++ * problem in a concurrent umounting. ++ */ ++int au_wkq_nowait(au_wkq_func_t func, void *args, struct super_block *sb, ++ unsigned int flags) ++{ ++ int err; ++ struct au_wkinfo *wkinfo; ++ ++ atomic_inc(&au_sbi(sb)->si_nowait.nw_len); ++ ++ /* ++ * wkq_func() must free this wkinfo. ++ * it highly depends upon the implementation of workqueue. ++ */ ++ err = 0; ++ wkinfo = kmalloc(sizeof(*wkinfo), GFP_NOFS); ++ if (wkinfo) { ++ wkinfo->kobj = &au_sbi(sb)->si_kobj; ++ wkinfo->flags = flags & ~AuWkq_WAIT; ++ wkinfo->func = func; ++ wkinfo->args = args; ++ wkinfo->comp = NULL; ++ au_wkq_lockdep_init(wkinfo); ++ kobject_get(wkinfo->kobj); ++ __module_get(THIS_MODULE); /* todo: ?? */ ++ ++ au_wkq_run(wkinfo); ++ } else { ++ err = -ENOMEM; ++ au_nwt_done(&au_sbi(sb)->si_nowait); ++ } ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++void au_nwt_init(struct au_nowait_tasks *nwt) ++{ ++ atomic_set(&nwt->nw_len, 0); ++ /* smp_mb(); */ /* atomic_set */ ++ init_waitqueue_head(&nwt->nw_wq); ++} ++ ++void au_wkq_fin(void) ++{ ++ destroy_workqueue(au_wkq); ++} ++ ++int __init au_wkq_init(void) ++{ ++ int err; ++ ++ err = 0; ++ au_wkq = alloc_workqueue(AUFS_WKQ_NAME, 0, WQ_DFL_ACTIVE); ++ if (IS_ERR(au_wkq)) ++ err = PTR_ERR(au_wkq); ++ else if (!au_wkq) ++ err = -ENOMEM; ++ ++ return err; ++} +diff --git a/fs/aufs/wkq.h b/fs/aufs/wkq.h +new file mode 100644 +index 000000000000..f8bb8e12395e +--- /dev/null ++++ b/fs/aufs/wkq.h +@@ -0,0 +1,89 @@ ++/* SPDX-License-Identifier: GPL-2.0 */ ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * workqueue for asynchronous/super-io operations ++ * todo: try new credentials management scheme ++ */ ++ ++#ifndef __AUFS_WKQ_H__ ++#define __AUFS_WKQ_H__ ++ ++#ifdef __KERNEL__ ++ ++#include <linux/wait.h> ++ ++struct super_block; ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * in the next operation, wait for the 'nowait' tasks in system-wide workqueue ++ */ ++struct au_nowait_tasks { ++ atomic_t nw_len; ++ wait_queue_head_t nw_wq; ++}; ++ ++/* ---------------------------------------------------------------------- */ ++ ++typedef void (*au_wkq_func_t)(void *args); ++ ++/* wkq flags */ ++#define AuWkq_WAIT 1 ++#define AuWkq_NEST (1 << 1) ++#define au_ftest_wkq(flags, name) ((flags) & AuWkq_##name) ++#define au_fset_wkq(flags, name) \ ++ do { (flags) |= AuWkq_##name; } while (0) ++#define au_fclr_wkq(flags, name) \ ++ do { (flags) &= ~AuWkq_##name; } while (0) ++ ++/* wkq.c */ ++int au_wkq_do_wait(unsigned int flags, au_wkq_func_t func, void *args); ++int au_wkq_nowait(au_wkq_func_t func, void *args, struct super_block *sb, ++ unsigned int flags); ++void au_nwt_init(struct au_nowait_tasks *nwt); ++int __init au_wkq_init(void); ++void au_wkq_fin(void); ++ ++/* ---------------------------------------------------------------------- */ ++ ++static inline int au_wkq_test(void) ++{ ++ return current->flags & PF_WQ_WORKER; ++} ++ ++static inline int au_wkq_wait(au_wkq_func_t func, void *args) ++{ ++ return au_wkq_do_wait(AuWkq_WAIT, func, args); ++} ++ ++static inline void au_nwt_done(struct au_nowait_tasks *nwt) ++{ ++ if (atomic_dec_and_test(&nwt->nw_len)) ++ wake_up_all(&nwt->nw_wq); ++} ++ ++static inline int au_nwt_flush(struct au_nowait_tasks *nwt) ++{ ++ wait_event(nwt->nw_wq, !atomic_read(&nwt->nw_len)); ++ return 0; ++} ++ ++#endif /* __KERNEL__ */ ++#endif /* __AUFS_WKQ_H__ */ +diff --git a/fs/aufs/xattr.c b/fs/aufs/xattr.c +new file mode 100644 +index 000000000000..9e08665728ae +--- /dev/null ++++ b/fs/aufs/xattr.c +@@ -0,0 +1,360 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2014-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * handling xattr functions ++ */ ++ ++#include <linux/fs.h> ++#include <linux/xattr.h> ++#include "aufs.h" ++ ++static int au_xattr_ignore(int err, char *name, unsigned int ignore_flags) ++{ ++ if (!ignore_flags) ++ goto out; ++ switch (err) { ++ case -ENOMEM: ++ case -EDQUOT: ++ goto out; ++ } ++ ++ if ((ignore_flags & AuBrAttr_ICEX) == AuBrAttr_ICEX) { ++ err = 0; ++ goto out; ++ } ++ ++#define cmp(brattr, prefix) do { \ ++ if (!strncmp(name, XATTR_##prefix##_PREFIX, \ ++ XATTR_##prefix##_PREFIX_LEN)) { \ ++ if (ignore_flags & AuBrAttr_ICEX_##brattr) \ ++ err = 0; \ ++ goto out; \ ++ } \ ++ } while (0) ++ ++ cmp(SEC, SECURITY); ++ cmp(SYS, SYSTEM); ++ cmp(TR, TRUSTED); ++ cmp(USR, USER); ++#undef cmp ++ ++ if (ignore_flags & AuBrAttr_ICEX_OTH) ++ err = 0; ++ ++out: ++ return err; ++} ++ ++static const int au_xattr_out_of_list = AuBrAttr_ICEX_OTH << 1; ++ ++static int au_do_cpup_xattr(struct path *h_dst, struct path *h_src, ++ char *name, char **buf, unsigned int ignore_flags, ++ unsigned int verbose) ++{ ++ int err, is_acl; ++ ssize_t ssz; ++ struct inode *h_idst; ++ struct dentry *h_dst_dentry, *h_src_dentry; ++ struct mnt_idmap *h_dst_idmap, *h_src_idmap; ++ struct posix_acl *acl; ++ ++ is_acl = !!is_posix_acl_xattr(name); ++ h_src_idmap = mnt_idmap(h_src->mnt); ++ h_src_dentry = h_src->dentry; ++ if (is_acl) { ++ acl = vfs_get_acl(h_src_idmap, h_src_dentry, name); ++ AuDebugOn(!acl); ++ if (unlikely(IS_ERR(acl))) { ++ err = PTR_ERR(acl); ++ if (err == -ENODATA) ++ err = 0; ++ else if (err == -EOPNOTSUPP ++ && au_test_nfs_noacl(d_inode(h_src_dentry))) ++ err = 0; ++ else if (verbose || au_debug_test()) ++ pr_err("%s, err %d\n", name, err); ++ goto out; ++ } ++ } else { ++ ssz = vfs_getxattr_alloc(h_src_idmap, h_src_dentry, name, buf, ++ 0, GFP_NOFS); ++ if (unlikely(ssz <= 0)) { ++ err = ssz; ++ if (err == -ENODATA) ++ err = 0; ++ else if (err == -EOPNOTSUPP ++ && (ignore_flags & au_xattr_out_of_list)) ++ err = 0; ++ else if (err && (verbose || au_debug_test())) ++ pr_err("%s, err %d\n", name, err); ++ goto out; ++ } ++ } ++ ++ /* unlock it temporary */ ++ h_dst_idmap = mnt_idmap(h_dst->mnt); ++ h_dst_dentry = h_dst->dentry; ++ h_idst = d_inode(h_dst_dentry); ++ inode_unlock(h_idst); ++ if (is_acl) { ++ err = vfsub_set_acl(h_dst_idmap, h_dst_dentry, name, acl); ++ posix_acl_release(acl); ++ } else ++ err = vfsub_setxattr(h_dst_idmap, h_dst_dentry, name, *buf, ++ ssz, /*flags*/0); ++ inode_lock_nested(h_idst, AuLsc_I_CHILD2); ++ if (unlikely(err)) { ++ if (verbose || au_debug_test()) ++ pr_err("%s, err %d\n", name, err); ++ err = au_xattr_ignore(err, name, ignore_flags); ++ } ++ ++out: ++ return err; ++} ++ ++int au_cpup_xattr(struct path *h_dst, struct path *h_src, int ignore_flags, ++ unsigned int verbose) ++{ ++ int err, unlocked; ++ ssize_t ssz; ++ struct dentry *h_dst_dentry, *h_src_dentry; ++ struct inode *h_isrc, *h_idst; ++ char *value, *p, *o, *e; ++ ++ /* try stopping to update the source inode while we are referencing */ ++ /* there should not be the parent-child relationship between them */ ++ h_dst_dentry = h_dst->dentry; ++ h_idst = d_inode(h_dst_dentry); ++ h_src_dentry = h_src->dentry; ++ h_isrc = d_inode(h_src_dentry); ++ inode_unlock(h_idst); ++ inode_lock_shared_nested(h_isrc, AuLsc_I_CHILD); ++ inode_lock_nested(h_idst, AuLsc_I_CHILD2); ++ unlocked = 0; ++ ++ /* some filesystems don't list POSIX ACL, for example tmpfs */ ++ ssz = vfs_listxattr(h_src_dentry, NULL, 0); ++ err = ssz; ++ if (unlikely(err < 0)) { ++ AuTraceErr(err); ++ if (err == -ENODATA ++ || err == -EOPNOTSUPP) ++ err = 0; /* ignore */ ++ goto out; ++ } ++ ++ err = 0; ++ p = NULL; ++ o = NULL; ++ if (ssz) { ++ err = -ENOMEM; ++ p = kmalloc(ssz, GFP_NOFS); ++ o = p; ++ if (unlikely(!p)) ++ goto out; ++ err = vfs_listxattr(h_src_dentry, p, ssz); ++ } ++ inode_unlock_shared(h_isrc); ++ unlocked = 1; ++ AuDbg("err %d, ssz %zd\n", err, ssz); ++ if (unlikely(err < 0)) ++ goto out_free; ++ ++ err = 0; ++ e = p + ssz; ++ value = NULL; ++ ignore_flags |= au_xattr_out_of_list; ++ while (!err && p < e) { ++ err = au_do_cpup_xattr(h_dst, h_src, p, &value, ignore_flags, ++ verbose); ++ p += strlen(p) + 1; ++ } ++ au_kfree_try_rcu(value); ++ ++out_free: ++ au_kfree_try_rcu(o); ++out: ++ if (!unlocked) ++ inode_unlock_shared(h_isrc); ++ AuTraceErr(err); ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int au_smack_reentering(struct super_block *sb) ++{ ++#if IS_ENABLED(CONFIG_SECURITY_SMACK) || IS_ENABLED(CONFIG_SECURITY_SELINUX) ++ /* ++ * as a part of lookup, smack_d_instantiate() is called, and it calls ++ * i_op->getxattr(). ouch. ++ */ ++ return si_pid_test(sb); ++#else ++ return 0; ++#endif ++} ++ ++enum { ++ AU_XATTR_LIST, ++ AU_XATTR_GET ++}; ++ ++struct au_lgxattr { ++ int type; ++ union { ++ struct { ++ char *list; ++ size_t size; ++ } list; ++ struct { ++ const char *name; ++ void *value; ++ size_t size; ++ } get; ++ } u; ++}; ++ ++static ssize_t au_lgxattr(struct dentry *dentry, struct inode *inode, ++ struct au_lgxattr *arg) ++{ ++ ssize_t err; ++ int reenter; ++ struct path h_path; ++ struct super_block *sb; ++ ++ sb = dentry->d_sb; ++ reenter = au_smack_reentering(sb); ++ if (!reenter) { ++ err = si_read_lock(sb, AuLock_FLUSH | AuLock_NOPLM); ++ if (unlikely(err)) ++ goto out; ++ } ++ err = au_h_path_getattr(dentry, inode, /*force*/1, &h_path, reenter); ++ if (unlikely(err)) ++ goto out_si; ++ if (unlikely(!h_path.dentry)) ++ /* illegally overlapped or something */ ++ goto out_di; /* pretending success */ ++ ++ /* always topmost entry only */ ++ switch (arg->type) { ++ case AU_XATTR_LIST: ++ err = vfs_listxattr(h_path.dentry, ++ arg->u.list.list, arg->u.list.size); ++ break; ++ case AU_XATTR_GET: ++ AuDebugOn(d_is_negative(h_path.dentry)); ++ err = vfs_getxattr(mnt_idmap(h_path.mnt), h_path.dentry, ++ arg->u.get.name, arg->u.get.value, ++ arg->u.get.size); ++ break; ++ } ++ ++out_di: ++ if (!reenter) ++ di_read_unlock(dentry, AuLock_IR); ++out_si: ++ if (!reenter) ++ si_read_unlock(sb); ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++ssize_t aufs_listxattr(struct dentry *dentry, char *list, size_t size) ++{ ++ struct au_lgxattr arg = { ++ .type = AU_XATTR_LIST, ++ .u.list = { ++ .list = list, ++ .size = size ++ }, ++ }; ++ ++ return au_lgxattr(dentry, /*inode*/NULL, &arg); ++} ++ ++static ssize_t au_getxattr(struct dentry *dentry, struct inode *inode, ++ const char *name, void *value, size_t size) ++{ ++ struct au_lgxattr arg = { ++ .type = AU_XATTR_GET, ++ .u.get = { ++ .name = name, ++ .value = value, ++ .size = size ++ }, ++ }; ++ ++ return au_lgxattr(dentry, inode, &arg); ++} ++ ++static int au_setxattr(struct dentry *dentry, struct inode *inode, ++ const char *name, const void *value, size_t size, ++ int flags) ++{ ++ struct au_sxattr arg = { ++ .type = AU_XATTR_SET, ++ .u.set = { ++ .name = name, ++ .value = value, ++ .size = size, ++ .flags = flags ++ }, ++ }; ++ ++ return au_sxattr(dentry, inode, &arg); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int au_xattr_get(const struct xattr_handler *handler, ++ struct dentry *dentry, struct inode *inode, ++ const char *name, void *buffer, size_t size) ++{ ++ return au_getxattr(dentry, inode, name, buffer, size); ++} ++ ++static int au_xattr_set(const struct xattr_handler *handler, ++ struct mnt_idmap *idmap, ++ struct dentry *dentry, struct inode *inode, ++ const char *name, const void *value, size_t size, ++ int flags) ++{ ++ return au_setxattr(dentry, inode, name, value, size, flags); ++} ++ ++static const struct xattr_handler au_xattr_handler = { ++ .name = "", ++ .prefix = "", ++ .get = au_xattr_get, ++ .set = au_xattr_set ++}; ++ ++static const struct xattr_handler *au_xattr_handlers[] = { ++ &au_xattr_handler, /* must be last */ ++ NULL ++}; ++ ++void au_xattr_init(struct super_block *sb) ++{ ++ sb->s_xattr = au_xattr_handlers; ++} +diff --git a/fs/aufs/xino.c b/fs/aufs/xino.c +new file mode 100644 +index 000000000000..e1db09b3541d +--- /dev/null ++++ b/fs/aufs/xino.c +@@ -0,0 +1,1926 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++/* ++ * external inode number translation table and bitmap ++ * ++ * things to consider ++ * - the lifetime ++ * + au_xino object ++ * + XINO files (xino, xib, xigen) ++ * + dynamic debugfs entries (xiN) ++ * + static debugfs entries (xib, xigen) ++ * + static sysfs entry (xi_path) ++ * - several entry points to handle them. ++ * + mount(2) without xino option (default) ++ * + mount(2) with xino option ++ * + mount(2) with noxino option ++ * + umount(2) ++ * + remount with add/del branches ++ * + remount with xino/noxino options ++ */ ++ ++#include <linux/seq_file.h> ++#include <linux/statfs.h> ++#include "aufs.h" ++ ++static aufs_bindex_t sbr_find_shared(struct super_block *sb, aufs_bindex_t btop, ++ aufs_bindex_t bbot, ++ struct super_block *h_sb) ++{ ++ /* todo: try binary-search if the branches are many */ ++ for (; btop <= bbot; btop++) ++ if (h_sb == au_sbr_sb(sb, btop)) ++ return btop; ++ return -1; ++} ++ ++/* ++ * find another branch who is on the same filesystem of the specified ++ * branch{@btgt}. search until @bbot. ++ */ ++static aufs_bindex_t is_sb_shared(struct super_block *sb, aufs_bindex_t btgt, ++ aufs_bindex_t bbot) ++{ ++ aufs_bindex_t bindex; ++ struct super_block *tgt_sb; ++ ++ tgt_sb = au_sbr_sb(sb, btgt); ++ bindex = sbr_find_shared(sb, /*btop*/0, btgt - 1, tgt_sb); ++ if (bindex < 0) ++ bindex = sbr_find_shared(sb, btgt + 1, bbot, tgt_sb); ++ ++ return bindex; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * stop unnecessary notify events at creating xino files ++ */ ++ ++aufs_bindex_t au_xi_root(struct super_block *sb, struct dentry *dentry) ++{ ++ aufs_bindex_t bfound, bindex, bbot; ++ struct dentry *parent; ++ struct au_branch *br; ++ ++ bfound = -1; ++ parent = dentry->d_parent; /* safe d_parent access */ ++ bbot = au_sbbot(sb); ++ for (bindex = 0; bindex <= bbot; bindex++) { ++ br = au_sbr(sb, bindex); ++ if (au_br_dentry(br) == parent) { ++ bfound = bindex; ++ break; ++ } ++ } ++ ++ AuDbg("bfound b%d\n", bfound); ++ return bfound; ++} ++ ++struct au_xino_lock_dir { ++ struct au_hinode *hdir; ++ struct dentry *parent; ++ struct inode *dir; ++}; ++ ++static struct dentry *au_dget_parent_lock(struct dentry *dentry, ++ unsigned int lsc) ++{ ++ struct dentry *parent; ++ struct inode *dir; ++ ++ parent = dget_parent(dentry); ++ dir = d_inode(parent); ++ inode_lock_nested(dir, lsc); ++#if 0 /* it should not happen */ ++ spin_lock(&dentry->d_lock); ++ if (unlikely(dentry->d_parent != parent)) { ++ spin_unlock(&dentry->d_lock); ++ inode_unlock(dir); ++ dput(parent); ++ parent = NULL; ++ goto out; ++ } ++ spin_unlock(&dentry->d_lock); ++ ++out: ++#endif ++ return parent; ++} ++ ++static void au_xino_lock_dir(struct super_block *sb, struct path *xipath, ++ struct au_xino_lock_dir *ldir) ++{ ++ aufs_bindex_t bindex; ++ ++ ldir->hdir = NULL; ++ bindex = au_xi_root(sb, xipath->dentry); ++ if (bindex >= 0) { ++ /* rw branch root */ ++ ldir->hdir = au_hi(d_inode(sb->s_root), bindex); ++ au_hn_inode_lock_nested(ldir->hdir, AuLsc_I_PARENT); ++ } else { ++ /* other */ ++ ldir->parent = au_dget_parent_lock(xipath->dentry, ++ AuLsc_I_PARENT); ++ ldir->dir = d_inode(ldir->parent); ++ } ++} ++ ++static void au_xino_unlock_dir(struct au_xino_lock_dir *ldir) ++{ ++ if (ldir->hdir) ++ au_hn_inode_unlock(ldir->hdir); ++ else { ++ inode_unlock(ldir->dir); ++ dput(ldir->parent); ++ } ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * create and set a new xino file ++ */ ++struct file *au_xino_create(struct super_block *sb, char *fpath, int silent, ++ int wbrtop) ++{ ++ struct file *file; ++ struct dentry *h_parent, *d; ++ struct inode *h_dir, *inode; ++ int err; ++ static DEFINE_MUTEX(mtx); ++ ++ /* ++ * at mount-time, and the xino file is the default path, ++ * hnotify is disabled so we have no notify events to ignore. ++ * when a user specified the xino, we cannot get au_hdir to be ignored. ++ */ ++ if (!wbrtop) ++ mutex_lock(&mtx); ++ file = vfsub_filp_open(fpath, O_RDWR | O_CREAT | O_EXCL | O_LARGEFILE ++ /* | __FMODE_NONOTIFY */, ++ 0666); ++ if (IS_ERR(file)) { ++ if (!wbrtop) ++ mutex_unlock(&mtx); ++ if (!silent) ++ pr_err("open %s(%ld)\n", fpath, PTR_ERR(file)); ++ return file; ++ } ++ ++ /* keep file count */ ++ err = 0; ++ d = file->f_path.dentry; ++ h_parent = au_dget_parent_lock(d, AuLsc_I_PARENT); ++ if (!wbrtop) ++ mutex_unlock(&mtx); ++ /* mnt_want_write() is unnecessary here */ ++ h_dir = d_inode(h_parent); ++ inode = file_inode(file); ++ /* no delegation since it is just created */ ++ if (inode->i_nlink) ++ err = vfsub_unlink(h_dir, &file->f_path, /*delegated*/NULL, ++ /*force*/0); ++ inode_unlock(h_dir); ++ dput(h_parent); ++ if (unlikely(err)) { ++ if (!silent) ++ pr_err("unlink %s(%d)\n", fpath, err); ++ goto out; ++ } ++ ++ err = -EINVAL; ++ if (unlikely(sb && sb == d->d_sb)) { ++ if (!silent) ++ pr_err("%s must be outside\n", fpath); ++ goto out; ++ } ++ if (unlikely(au_test_fs_bad_xino(d->d_sb))) { ++ if (!silent) ++ pr_err("xino doesn't support %s(%s)\n", ++ fpath, au_sbtype(d->d_sb)); ++ goto out; ++ } ++ return file; /* success */ ++ ++out: ++ fput(file); ++ file = ERR_PTR(err); ++ return file; ++} ++ ++/* ++ * create a new xinofile at the same place/path as @base. ++ */ ++struct file *au_xino_create2(struct super_block *sb, struct path *base, ++ struct file *copy_src) ++{ ++ struct file *file; ++ struct dentry *dentry; ++ struct inode *dir, *delegated; ++ struct qstr *name; ++ struct path ppath, path; ++ int err, do_unlock; ++ struct au_xino_lock_dir ldir; ++ ++ do_unlock = 1; ++ au_xino_lock_dir(sb, base, &ldir); ++ dentry = base->dentry; ++ ppath.dentry = dentry->d_parent; /* dir inode is locked */ ++ ppath.mnt = base->mnt; ++ dir = d_inode(ppath.dentry); ++ IMustLock(dir); ++ ++ name = &dentry->d_name; ++ path.dentry = vfsub_lookup_one_len(name->name, &ppath, name->len); ++ if (IS_ERR(path.dentry)) { ++ file = (void *)path.dentry; ++ pr_err("%pd lookup err %ld\n", dentry, PTR_ERR(path.dentry)); ++ goto out; ++ } ++ ++ /* no need to mnt_want_write() since we call dentry_open() later */ ++ err = vfs_create(mnt_idmap(base->mnt), dir, path.dentry, 0666, NULL); ++ if (unlikely(err)) { ++ file = ERR_PTR(err); ++ pr_err("%pd create err %d\n", dentry, err); ++ goto out_dput; ++ } ++ ++ path.mnt = base->mnt; ++ file = vfsub_dentry_open(&path, ++ O_RDWR | O_CREAT | O_EXCL | O_LARGEFILE ++ /* | __FMODE_NONOTIFY */); ++ if (IS_ERR(file)) { ++ pr_err("%pd open err %ld\n", dentry, PTR_ERR(file)); ++ goto out_dput; ++ } ++ ++ delegated = NULL; ++ err = vfsub_unlink(dir, &file->f_path, &delegated, /*force*/0); ++ au_xino_unlock_dir(&ldir); ++ do_unlock = 0; ++ if (unlikely(err == -EWOULDBLOCK)) { ++ pr_warn("cannot retry for NFSv4 delegation" ++ " for an internal unlink\n"); ++ iput(delegated); ++ } ++ if (unlikely(err)) { ++ pr_err("%pd unlink err %d\n", dentry, err); ++ goto out_fput; ++ } ++ ++ if (copy_src) { ++ /* no one can touch copy_src xino */ ++ err = au_copy_file(file, copy_src, vfsub_f_size_read(copy_src)); ++ if (unlikely(err)) { ++ pr_err("%pd copy err %d\n", dentry, err); ++ goto out_fput; ++ } ++ } ++ goto out_dput; /* success */ ++ ++out_fput: ++ fput(file); ++ file = ERR_PTR(err); ++out_dput: ++ dput(path.dentry); ++out: ++ if (do_unlock) ++ au_xino_unlock_dir(&ldir); ++ return file; ++} ++ ++struct file *au_xino_file1(struct au_xino *xi) ++{ ++ struct file *file; ++ unsigned int u, nfile; ++ ++ file = NULL; ++ nfile = xi->xi_nfile; ++ for (u = 0; u < nfile; u++) { ++ file = xi->xi_file[u]; ++ if (file) ++ break; ++ } ++ ++ return file; ++} ++ ++static int au_xino_file_set(struct au_xino *xi, int idx, struct file *file) ++{ ++ int err; ++ struct file *f; ++ void *p; ++ ++ if (file) ++ get_file(file); ++ ++ err = 0; ++ f = NULL; ++ if (idx < xi->xi_nfile) { ++ f = xi->xi_file[idx]; ++ if (f) ++ fput(f); ++ } else { ++ p = au_kzrealloc(xi->xi_file, ++ sizeof(*xi->xi_file) * xi->xi_nfile, ++ sizeof(*xi->xi_file) * (idx + 1), ++ GFP_NOFS, /*may_shrink*/0); ++ if (p) { ++ MtxMustLock(&xi->xi_mtx); ++ xi->xi_file = p; ++ xi->xi_nfile = idx + 1; ++ } else { ++ err = -ENOMEM; ++ if (file) ++ fput(file); ++ goto out; ++ } ++ } ++ xi->xi_file[idx] = file; ++ ++out: ++ return err; ++} ++ ++/* ++ * if @xinew->xi is not set, then create new xigen file. ++ */ ++struct file *au_xi_new(struct super_block *sb, struct au_xi_new *xinew) ++{ ++ struct file *file; ++ int err; ++ ++ SiMustAnyLock(sb); ++ ++ file = au_xino_create2(sb, xinew->base, xinew->copy_src); ++ if (IS_ERR(file)) { ++ err = PTR_ERR(file); ++ pr_err("%s[%d], err %d\n", ++ xinew->xi ? "xino" : "xigen", ++ xinew->idx, err); ++ goto out; ++ } ++ ++ if (xinew->xi) ++ err = au_xino_file_set(xinew->xi, xinew->idx, file); ++ else { ++ BUG(); ++ /* todo: make xigen file an array */ ++ /* err = au_xigen_file_set(sb, xinew->idx, file); */ ++ } ++ fput(file); ++ if (unlikely(err)) ++ file = ERR_PTR(err); ++ ++out: ++ return file; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * truncate xino files ++ */ ++static int au_xino_do_trunc(struct super_block *sb, aufs_bindex_t bindex, ++ int idx, struct kstatfs *st) ++{ ++ int err; ++ blkcnt_t blocks; ++ struct file *file, *new_xino; ++ struct au_xi_new xinew = { ++ .idx = idx ++ }; ++ ++ err = 0; ++ xinew.xi = au_sbr(sb, bindex)->br_xino; ++ file = au_xino_file(xinew.xi, idx); ++ if (!file) ++ goto out; ++ ++ xinew.base = &file->f_path; ++ err = vfs_statfs(xinew.base, st); ++ if (unlikely(err)) { ++ AuErr1("statfs err %d, ignored\n", err); ++ err = 0; ++ goto out; ++ } ++ ++ blocks = file_inode(file)->i_blocks; ++ pr_info("begin truncating xino(b%d-%d), ib%llu, %llu/%llu free blks\n", ++ bindex, idx, (u64)blocks, st->f_bfree, st->f_blocks); ++ ++ xinew.copy_src = file; ++ new_xino = au_xi_new(sb, &xinew); ++ if (IS_ERR(new_xino)) { ++ err = PTR_ERR(new_xino); ++ pr_err("xino(b%d-%d), err %d, ignored\n", bindex, idx, err); ++ goto out; ++ } ++ ++ err = vfs_statfs(&new_xino->f_path, st); ++ if (!err) ++ pr_info("end truncating xino(b%d-%d), ib%llu, %llu/%llu free blks\n", ++ bindex, idx, (u64)file_inode(new_xino)->i_blocks, ++ st->f_bfree, st->f_blocks); ++ else { ++ AuErr1("statfs err %d, ignored\n", err); ++ err = 0; ++ } ++ ++out: ++ return err; ++} ++ ++int au_xino_trunc(struct super_block *sb, aufs_bindex_t bindex, int idx_begin) ++{ ++ int err, i; ++ unsigned long jiffy; ++ aufs_bindex_t bbot; ++ struct kstatfs *st; ++ struct au_branch *br; ++ struct au_xino *xi; ++ ++ err = -ENOMEM; ++ st = kmalloc(sizeof(*st), GFP_NOFS); ++ if (unlikely(!st)) ++ goto out; ++ ++ err = -EINVAL; ++ bbot = au_sbbot(sb); ++ if (unlikely(bindex < 0 || bbot < bindex)) ++ goto out_st; ++ ++ err = 0; ++ jiffy = jiffies; ++ br = au_sbr(sb, bindex); ++ xi = br->br_xino; ++ for (i = idx_begin; !err && i < xi->xi_nfile; i++) ++ err = au_xino_do_trunc(sb, bindex, i, st); ++ if (!err) ++ au_sbi(sb)->si_xino_jiffy = jiffy; ++ ++out_st: ++ au_kfree_rcu(st); ++out: ++ return err; ++} ++ ++struct xino_do_trunc_args { ++ struct super_block *sb; ++ struct au_branch *br; ++ int idx; ++}; ++ ++static void xino_do_trunc(void *_args) ++{ ++ struct xino_do_trunc_args *args = _args; ++ struct super_block *sb; ++ struct au_branch *br; ++ struct inode *dir; ++ int err, idx; ++ aufs_bindex_t bindex; ++ ++ err = 0; ++ sb = args->sb; ++ dir = d_inode(sb->s_root); ++ br = args->br; ++ idx = args->idx; ++ ++ si_noflush_write_lock(sb); ++ ii_read_lock_parent(dir); ++ bindex = au_br_index(sb, br->br_id); ++ err = au_xino_trunc(sb, bindex, idx); ++ ii_read_unlock(dir); ++ if (unlikely(err)) ++ pr_warn("err b%d, (%d)\n", bindex, err); ++ atomic_dec(&br->br_xino->xi_truncating); ++ au_lcnt_dec(&br->br_count); ++ si_write_unlock(sb); ++ au_nwt_done(&au_sbi(sb)->si_nowait); ++ au_kfree_rcu(args); ++} ++ ++/* ++ * returns the index in the xi_file array whose corresponding file is necessary ++ * to truncate, or -1 which means no need to truncate. ++ */ ++static int xino_trunc_test(struct super_block *sb, struct au_branch *br) ++{ ++ int err; ++ unsigned int u; ++ struct kstatfs st; ++ struct au_sbinfo *sbinfo; ++ struct au_xino *xi; ++ struct file *file; ++ ++ /* todo: si_xino_expire and the ratio should be customizable */ ++ sbinfo = au_sbi(sb); ++ if (time_before(jiffies, ++ sbinfo->si_xino_jiffy + sbinfo->si_xino_expire)) ++ return -1; ++ ++ /* truncation border */ ++ xi = br->br_xino; ++ for (u = 0; u < xi->xi_nfile; u++) { ++ file = au_xino_file(xi, u); ++ if (!file) ++ continue; ++ ++ err = vfs_statfs(&file->f_path, &st); ++ if (unlikely(err)) { ++ AuErr1("statfs err %d, ignored\n", err); ++ return -1; ++ } ++ if (div64_u64(st.f_bfree * 100, st.f_blocks) ++ >= AUFS_XINO_DEF_TRUNC) ++ return u; ++ } ++ ++ return -1; ++} ++ ++static void xino_try_trunc(struct super_block *sb, struct au_branch *br) ++{ ++ int idx; ++ struct xino_do_trunc_args *args; ++ int wkq_err; ++ ++ idx = xino_trunc_test(sb, br); ++ if (idx < 0) ++ return; ++ ++ if (atomic_inc_return(&br->br_xino->xi_truncating) > 1) ++ goto out; ++ ++ /* lock and kfree() will be called in trunc_xino() */ ++ args = kmalloc(sizeof(*args), GFP_NOFS); ++ if (unlikely(!args)) { ++ AuErr1("no memory\n"); ++ goto out; ++ } ++ ++ au_lcnt_inc(&br->br_count); ++ args->sb = sb; ++ args->br = br; ++ args->idx = idx; ++ wkq_err = au_wkq_nowait(xino_do_trunc, args, sb, /*flags*/0); ++ if (!wkq_err) ++ return; /* success */ ++ ++ pr_err("wkq %d\n", wkq_err); ++ au_lcnt_dec(&br->br_count); ++ au_kfree_rcu(args); ++ ++out: ++ atomic_dec(&br->br_xino->xi_truncating); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++struct au_xi_calc { ++ int idx; ++ loff_t pos; ++}; ++ ++static void au_xi_calc(struct super_block *sb, ino_t h_ino, ++ struct au_xi_calc *calc) ++{ ++ loff_t maxent; ++ ++ maxent = au_xi_maxent(sb); ++ calc->idx = div64_u64_rem(h_ino, maxent, &calc->pos); ++ calc->pos *= sizeof(ino_t); ++} ++ ++static int au_xino_do_new_async(struct super_block *sb, struct au_branch *br, ++ struct au_xi_calc *calc) ++{ ++ int err; ++ struct file *file; ++ struct au_xino *xi = br->br_xino; ++ struct au_xi_new xinew = { ++ .xi = xi ++ }; ++ ++ SiMustAnyLock(sb); ++ ++ err = 0; ++ if (!xi) ++ goto out; ++ ++ mutex_lock(&xi->xi_mtx); ++ file = au_xino_file(xi, calc->idx); ++ if (file) ++ goto out_mtx; ++ ++ file = au_xino_file(xi, /*idx*/-1); ++ AuDebugOn(!file); ++ xinew.idx = calc->idx; ++ xinew.base = &file->f_path; ++ /* xinew.copy_src = NULL; */ ++ file = au_xi_new(sb, &xinew); ++ if (IS_ERR(file)) ++ err = PTR_ERR(file); ++ ++out_mtx: ++ mutex_unlock(&xi->xi_mtx); ++out: ++ return err; ++} ++ ++struct au_xino_do_new_async_args { ++ struct super_block *sb; ++ struct au_branch *br; ++ struct au_xi_calc calc; ++ ino_t ino; ++}; ++ ++struct au_xi_writing { ++ struct hlist_bl_node node; ++ ino_t h_ino, ino; ++}; ++ ++static int au_xino_do_write(struct file *file, struct au_xi_calc *calc, ++ ino_t ino); ++ ++static void au_xino_call_do_new_async(void *args) ++{ ++ struct au_xino_do_new_async_args *a = args; ++ struct au_branch *br; ++ struct super_block *sb; ++ struct au_sbinfo *sbi; ++ struct inode *root; ++ struct file *file; ++ struct au_xi_writing *del, *p; ++ struct hlist_bl_head *hbl; ++ struct hlist_bl_node *pos; ++ int err; ++ ++ br = a->br; ++ sb = a->sb; ++ sbi = au_sbi(sb); ++ si_noflush_read_lock(sb); ++ root = d_inode(sb->s_root); ++ ii_read_lock_child(root); ++ err = au_xino_do_new_async(sb, br, &a->calc); ++ if (unlikely(err)) { ++ AuIOErr("err %d\n", err); ++ goto out; ++ } ++ ++ file = au_xino_file(br->br_xino, a->calc.idx); ++ AuDebugOn(!file); ++ err = au_xino_do_write(file, &a->calc, a->ino); ++ if (unlikely(err)) { ++ AuIOErr("err %d\n", err); ++ goto out; ++ } ++ ++ del = NULL; ++ hbl = &br->br_xino->xi_writing; ++ hlist_bl_lock(hbl); ++ au_hbl_for_each(pos, hbl) { ++ p = container_of(pos, struct au_xi_writing, node); ++ if (p->ino == a->ino) { ++ del = p; ++ hlist_bl_del(&p->node); ++ break; ++ } ++ } ++ hlist_bl_unlock(hbl); ++ au_kfree_rcu(del); ++ ++out: ++ au_lcnt_dec(&br->br_count); ++ ii_read_unlock(root); ++ si_read_unlock(sb); ++ au_nwt_done(&sbi->si_nowait); ++ au_kfree_rcu(a); ++} ++ ++/* ++ * create a new xino file asynchronously ++ */ ++static int au_xino_new_async(struct super_block *sb, struct au_branch *br, ++ struct au_xi_calc *calc, ino_t ino) ++{ ++ int err; ++ struct au_xino_do_new_async_args *arg; ++ ++ err = -ENOMEM; ++ arg = kmalloc(sizeof(*arg), GFP_NOFS); ++ if (unlikely(!arg)) ++ goto out; ++ ++ arg->sb = sb; ++ arg->br = br; ++ arg->calc = *calc; ++ arg->ino = ino; ++ au_lcnt_inc(&br->br_count); ++ err = au_wkq_nowait(au_xino_call_do_new_async, arg, sb, AuWkq_NEST); ++ if (unlikely(err)) { ++ pr_err("wkq %d\n", err); ++ au_lcnt_dec(&br->br_count); ++ au_kfree_rcu(arg); ++ } ++ ++out: ++ return err; ++} ++ ++/* ++ * read @ino from xinofile for the specified branch{@sb, @bindex} ++ * at the position of @h_ino. ++ */ ++int au_xino_read(struct super_block *sb, aufs_bindex_t bindex, ino_t h_ino, ++ ino_t *ino) ++{ ++ int err; ++ ssize_t sz; ++ struct au_xi_calc calc; ++ struct au_sbinfo *sbinfo; ++ struct file *file; ++ struct au_xino *xi; ++ struct hlist_bl_head *hbl; ++ struct hlist_bl_node *pos; ++ struct au_xi_writing *p; ++ ++ *ino = 0; ++ if (!au_opt_test(au_mntflags(sb), XINO)) ++ return 0; /* no xino */ ++ ++ err = 0; ++ au_xi_calc(sb, h_ino, &calc); ++ xi = au_sbr(sb, bindex)->br_xino; ++ file = au_xino_file(xi, calc.idx); ++ if (!file) { ++ hbl = &xi->xi_writing; ++ hlist_bl_lock(hbl); ++ au_hbl_for_each(pos, hbl) { ++ p = container_of(pos, struct au_xi_writing, node); ++ if (p->h_ino == h_ino) { ++ AuDbg("hi%llu, i%llu, found\n", ++ (u64)p->h_ino, (u64)p->ino); ++ *ino = p->ino; ++ break; ++ } ++ } ++ hlist_bl_unlock(hbl); ++ return 0; ++ } else if (vfsub_f_size_read(file) < calc.pos + sizeof(*ino)) ++ return 0; /* no xino */ ++ ++ sbinfo = au_sbi(sb); ++ sz = xino_fread(file, ino, sizeof(*ino), &calc.pos); ++ if (sz == sizeof(*ino)) ++ return 0; /* success */ ++ ++ err = sz; ++ if (unlikely(sz >= 0)) { ++ err = -EIO; ++ AuIOErr("xino read error (%zd)\n", sz); ++ } ++ return err; ++} ++ ++static int au_xino_do_write(struct file *file, struct au_xi_calc *calc, ++ ino_t ino) ++{ ++ ssize_t sz; ++ ++ sz = xino_fwrite(file, &ino, sizeof(ino), &calc->pos); ++ if (sz == sizeof(ino)) ++ return 0; /* success */ ++ ++ AuIOErr("write failed (%zd)\n", sz); ++ return -EIO; ++} ++ ++/* ++ * write @ino to the xinofile for the specified branch{@sb, @bindex} ++ * at the position of @h_ino. ++ * even if @ino is zero, it is written to the xinofile and means no entry. ++ * if the size of the xino file on a specific filesystem exceeds the watermark, ++ * try truncating it. ++ */ ++int au_xino_write(struct super_block *sb, aufs_bindex_t bindex, ino_t h_ino, ++ ino_t ino) ++{ ++ int err; ++ unsigned int mnt_flags; ++ struct au_xi_calc calc; ++ struct file *file; ++ struct au_branch *br; ++ struct au_xino *xi; ++ struct au_xi_writing *p; ++ ++ SiMustAnyLock(sb); ++ ++ mnt_flags = au_mntflags(sb); ++ if (!au_opt_test(mnt_flags, XINO)) ++ return 0; ++ ++ au_xi_calc(sb, h_ino, &calc); ++ br = au_sbr(sb, bindex); ++ xi = br->br_xino; ++ file = au_xino_file(xi, calc.idx); ++ if (!file) { ++ /* store the inum pair into the list */ ++ p = kmalloc(sizeof(*p), GFP_NOFS | __GFP_NOFAIL); ++ p->h_ino = h_ino; ++ p->ino = ino; ++ au_hbl_add(&p->node, &xi->xi_writing); ++ ++ /* create and write a new xino file asynchronously */ ++ err = au_xino_new_async(sb, br, &calc, ino); ++ if (!err) ++ return 0; /* success */ ++ goto out; ++ } ++ ++ err = au_xino_do_write(file, &calc, ino); ++ if (!err) { ++ br = au_sbr(sb, bindex); ++ if (au_opt_test(mnt_flags, TRUNC_XINO) ++ && au_test_fs_trunc_xino(au_br_sb(br))) ++ xino_try_trunc(sb, br); ++ return 0; /* success */ ++ } ++ ++out: ++ AuIOErr("write failed (%d)\n", err); ++ return -EIO; ++} ++ ++static ssize_t xino_fread_wkq(struct file *file, void *buf, size_t size, ++ loff_t *pos); ++ ++/* todo: unnecessary to support mmap_sem since kernel-space? */ ++ssize_t xino_fread(struct file *file, void *kbuf, size_t size, loff_t *pos) ++{ ++ ssize_t err; ++ int i; ++ const int prevent_endless = 10; ++ ++ i = 0; ++ do { ++ err = vfsub_read_k(file, kbuf, size, pos); ++ if (err == -EINTR ++ && !au_wkq_test() ++ && fatal_signal_pending(current)) { ++ err = xino_fread_wkq(file, kbuf, size, pos); ++ BUG_ON(err == -EINTR); ++ } ++ } while (i++ < prevent_endless ++ && (err == -EAGAIN || err == -EINTR)); ++ ++#if 0 /* reserved for future use */ ++ if (err > 0) ++ fsnotify_access(file->f_path.dentry); ++#endif ++ ++ return err; ++} ++ ++struct xino_fread_args { ++ ssize_t *errp; ++ struct file *file; ++ void *buf; ++ size_t size; ++ loff_t *pos; ++}; ++ ++static void call_xino_fread(void *args) ++{ ++ struct xino_fread_args *a = args; ++ *a->errp = xino_fread(a->file, a->buf, a->size, a->pos); ++} ++ ++static ssize_t xino_fread_wkq(struct file *file, void *buf, size_t size, ++ loff_t *pos) ++{ ++ ssize_t err; ++ int wkq_err; ++ struct xino_fread_args args = { ++ .errp = &err, ++ .file = file, ++ .buf = buf, ++ .size = size, ++ .pos = pos ++ }; ++ ++ wkq_err = au_wkq_wait(call_xino_fread, &args); ++ if (unlikely(wkq_err)) ++ err = wkq_err; ++ ++ return err; ++} ++ ++static ssize_t xino_fwrite_wkq(struct file *file, void *buf, size_t size, ++ loff_t *pos); ++ ++static ssize_t do_xino_fwrite(struct file *file, void *kbuf, size_t size, ++ loff_t *pos) ++{ ++ ssize_t err; ++ int i; ++ const int prevent_endless = 10; ++ ++ i = 0; ++ do { ++ err = vfsub_write_k(file, kbuf, size, pos); ++ if (err == -EINTR ++ && !au_wkq_test() ++ && fatal_signal_pending(current)) { ++ err = xino_fwrite_wkq(file, kbuf, size, pos); ++ BUG_ON(err == -EINTR); ++ } ++ } while (i++ < prevent_endless ++ && (err == -EAGAIN || err == -EINTR)); ++ ++#if 0 /* reserved for future use */ ++ if (err > 0) ++ fsnotify_modify(file->f_path.dentry); ++#endif ++ ++ return err; ++} ++ ++struct do_xino_fwrite_args { ++ ssize_t *errp; ++ struct file *file; ++ void *buf; ++ size_t size; ++ loff_t *pos; ++}; ++ ++static void call_do_xino_fwrite(void *args) ++{ ++ struct do_xino_fwrite_args *a = args; ++ *a->errp = do_xino_fwrite(a->file, a->buf, a->size, a->pos); ++} ++ ++static ssize_t xino_fwrite_wkq(struct file *file, void *buf, size_t size, ++ loff_t *pos) ++{ ++ ssize_t err; ++ int wkq_err; ++ struct do_xino_fwrite_args args = { ++ .errp = &err, ++ .file = file, ++ .buf = buf, ++ .size = size, ++ .pos = pos ++ }; ++ ++ /* ++ * it breaks RLIMIT_FSIZE and normal user's limit, ++ * users should care about quota and real 'filesystem full.' ++ */ ++ wkq_err = au_wkq_wait(call_do_xino_fwrite, &args); ++ if (unlikely(wkq_err)) ++ err = wkq_err; ++ ++ return err; ++} ++ ++ssize_t xino_fwrite(struct file *file, void *buf, size_t size, loff_t *pos) ++{ ++ ssize_t err; ++ ++ if (rlimit(RLIMIT_FSIZE) == RLIM_INFINITY) { ++ lockdep_off(); ++ err = do_xino_fwrite(file, buf, size, pos); ++ lockdep_on(); ++ } else { ++ lockdep_off(); ++ err = xino_fwrite_wkq(file, buf, size, pos); ++ lockdep_on(); ++ } ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * inode number bitmap ++ */ ++static const int page_bits = (int)PAGE_SIZE * BITS_PER_BYTE; ++static ino_t xib_calc_ino(unsigned long pindex, int bit) ++{ ++ ino_t ino; ++ ++ AuDebugOn(bit < 0 || page_bits <= bit); ++ ino = AUFS_FIRST_INO + pindex * page_bits + bit; ++ return ino; ++} ++ ++static void xib_calc_bit(ino_t ino, unsigned long *pindex, int *bit) ++{ ++ AuDebugOn(ino < AUFS_FIRST_INO); ++ ino -= AUFS_FIRST_INO; ++ *pindex = ino / page_bits; ++ *bit = ino % page_bits; ++} ++ ++static int xib_pindex(struct super_block *sb, unsigned long pindex) ++{ ++ int err; ++ loff_t pos; ++ ssize_t sz; ++ struct au_sbinfo *sbinfo; ++ struct file *xib; ++ unsigned long *p; ++ ++ sbinfo = au_sbi(sb); ++ MtxMustLock(&sbinfo->si_xib_mtx); ++ AuDebugOn(pindex > ULONG_MAX / PAGE_SIZE ++ || !au_opt_test(sbinfo->si_mntflags, XINO)); ++ ++ if (pindex == sbinfo->si_xib_last_pindex) ++ return 0; ++ ++ xib = sbinfo->si_xib; ++ p = sbinfo->si_xib_buf; ++ pos = sbinfo->si_xib_last_pindex; ++ pos *= PAGE_SIZE; ++ sz = xino_fwrite(xib, p, PAGE_SIZE, &pos); ++ if (unlikely(sz != PAGE_SIZE)) ++ goto out; ++ ++ pos = pindex; ++ pos *= PAGE_SIZE; ++ if (vfsub_f_size_read(xib) >= pos + PAGE_SIZE) ++ sz = xino_fread(xib, p, PAGE_SIZE, &pos); ++ else { ++ memset(p, 0, PAGE_SIZE); ++ sz = xino_fwrite(xib, p, PAGE_SIZE, &pos); ++ } ++ if (sz == PAGE_SIZE) { ++ sbinfo->si_xib_last_pindex = pindex; ++ return 0; /* success */ ++ } ++ ++out: ++ AuIOErr1("write failed (%zd)\n", sz); ++ err = sz; ++ if (sz >= 0) ++ err = -EIO; ++ return err; ++} ++ ++static void au_xib_clear_bit(struct inode *inode) ++{ ++ int err, bit; ++ unsigned long pindex; ++ struct super_block *sb; ++ struct au_sbinfo *sbinfo; ++ ++ AuDebugOn(inode->i_nlink); ++ ++ sb = inode->i_sb; ++ xib_calc_bit(inode->i_ino, &pindex, &bit); ++ AuDebugOn(page_bits <= bit); ++ sbinfo = au_sbi(sb); ++ mutex_lock(&sbinfo->si_xib_mtx); ++ err = xib_pindex(sb, pindex); ++ if (!err) { ++ clear_bit(bit, sbinfo->si_xib_buf); ++ sbinfo->si_xib_next_bit = bit; ++ } ++ mutex_unlock(&sbinfo->si_xib_mtx); ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * truncate a xino bitmap file ++ */ ++ ++/* todo: slow */ ++static int do_xib_restore(struct super_block *sb, struct file *file, void *page) ++{ ++ int err, bit; ++ ssize_t sz; ++ unsigned long pindex; ++ loff_t pos, pend; ++ struct au_sbinfo *sbinfo; ++ ino_t *ino; ++ unsigned long *p; ++ ++ err = 0; ++ sbinfo = au_sbi(sb); ++ MtxMustLock(&sbinfo->si_xib_mtx); ++ p = sbinfo->si_xib_buf; ++ pend = vfsub_f_size_read(file); ++ pos = 0; ++ while (pos < pend) { ++ sz = xino_fread(file, page, PAGE_SIZE, &pos); ++ err = sz; ++ if (unlikely(sz <= 0)) ++ goto out; ++ ++ err = 0; ++ for (ino = page; sz > 0; ino++, sz -= sizeof(ino)) { ++ if (unlikely(*ino < AUFS_FIRST_INO)) ++ continue; ++ ++ xib_calc_bit(*ino, &pindex, &bit); ++ AuDebugOn(page_bits <= bit); ++ err = xib_pindex(sb, pindex); ++ if (!err) ++ set_bit(bit, p); ++ else ++ goto out; ++ } ++ } ++ ++out: ++ return err; ++} ++ ++static int xib_restore(struct super_block *sb) ++{ ++ int err, i; ++ unsigned int nfile; ++ aufs_bindex_t bindex, bbot; ++ void *page; ++ struct au_branch *br; ++ struct au_xino *xi; ++ struct file *file; ++ ++ err = -ENOMEM; ++ page = (void *)__get_free_page(GFP_NOFS); ++ if (unlikely(!page)) ++ goto out; ++ ++ err = 0; ++ bbot = au_sbbot(sb); ++ for (bindex = 0; !err && bindex <= bbot; bindex++) ++ if (!bindex || is_sb_shared(sb, bindex, bindex - 1) < 0) { ++ br = au_sbr(sb, bindex); ++ xi = br->br_xino; ++ nfile = xi->xi_nfile; ++ for (i = 0; i < nfile; i++) { ++ file = au_xino_file(xi, i); ++ if (file) ++ err = do_xib_restore(sb, file, page); ++ } ++ } else ++ AuDbg("skip shared b%d\n", bindex); ++ free_page((unsigned long)page); ++ ++out: ++ return err; ++} ++ ++int au_xib_trunc(struct super_block *sb) ++{ ++ int err; ++ ssize_t sz; ++ loff_t pos; ++ struct au_sbinfo *sbinfo; ++ unsigned long *p; ++ struct file *file; ++ ++ SiMustWriteLock(sb); ++ ++ err = 0; ++ sbinfo = au_sbi(sb); ++ if (!au_opt_test(sbinfo->si_mntflags, XINO)) ++ goto out; ++ ++ file = sbinfo->si_xib; ++ if (vfsub_f_size_read(file) <= PAGE_SIZE) ++ goto out; ++ ++ file = au_xino_create2(sb, &sbinfo->si_xib->f_path, NULL); ++ err = PTR_ERR(file); ++ if (IS_ERR(file)) ++ goto out; ++ fput(sbinfo->si_xib); ++ sbinfo->si_xib = file; ++ ++ p = sbinfo->si_xib_buf; ++ memset(p, 0, PAGE_SIZE); ++ pos = 0; ++ sz = xino_fwrite(sbinfo->si_xib, p, PAGE_SIZE, &pos); ++ if (unlikely(sz != PAGE_SIZE)) { ++ err = sz; ++ AuIOErr("err %d\n", err); ++ if (sz >= 0) ++ err = -EIO; ++ goto out; ++ } ++ ++ mutex_lock(&sbinfo->si_xib_mtx); ++ /* mnt_want_write() is unnecessary here */ ++ err = xib_restore(sb); ++ mutex_unlock(&sbinfo->si_xib_mtx); ++ ++out: ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++struct au_xino *au_xino_alloc(unsigned int nfile) ++{ ++ struct au_xino *xi; ++ ++ xi = kzalloc(sizeof(*xi), GFP_NOFS); ++ if (unlikely(!xi)) ++ goto out; ++ xi->xi_nfile = nfile; ++ xi->xi_file = kcalloc(nfile, sizeof(*xi->xi_file), GFP_NOFS); ++ if (unlikely(!xi->xi_file)) ++ goto out_free; ++ ++ xi->xi_nondir.total = 8; /* initial size */ ++ xi->xi_nondir.array = kcalloc(xi->xi_nondir.total, sizeof(ino_t), ++ GFP_NOFS); ++ if (unlikely(!xi->xi_nondir.array)) ++ goto out_file; ++ ++ spin_lock_init(&xi->xi_nondir.spin); ++ init_waitqueue_head(&xi->xi_nondir.wqh); ++ mutex_init(&xi->xi_mtx); ++ INIT_HLIST_BL_HEAD(&xi->xi_writing); ++ atomic_set(&xi->xi_truncating, 0); ++ kref_init(&xi->xi_kref); ++ goto out; /* success */ ++ ++out_file: ++ au_kfree_try_rcu(xi->xi_file); ++out_free: ++ au_kfree_rcu(xi); ++ xi = NULL; ++out: ++ return xi; ++} ++ ++static int au_xino_init(struct au_branch *br, int idx, struct file *file) ++{ ++ int err; ++ struct au_xino *xi; ++ ++ err = 0; ++ xi = au_xino_alloc(idx + 1); ++ if (unlikely(!xi)) { ++ err = -ENOMEM; ++ goto out; ++ } ++ ++ if (file) ++ get_file(file); ++ xi->xi_file[idx] = file; ++ AuDebugOn(br->br_xino); ++ br->br_xino = xi; ++ ++out: ++ return err; ++} ++ ++static void au_xino_release(struct kref *kref) ++{ ++ struct au_xino *xi; ++ int i; ++ unsigned long ul; ++ struct hlist_bl_head *hbl; ++ struct hlist_bl_node *pos, *n; ++ struct au_xi_writing *p; ++ ++ xi = container_of(kref, struct au_xino, xi_kref); ++ for (i = 0; i < xi->xi_nfile; i++) ++ if (xi->xi_file[i]) ++ fput(xi->xi_file[i]); ++ for (i = xi->xi_nondir.total - 1; i >= 0; i--) ++ AuDebugOn(xi->xi_nondir.array[i]); ++ mutex_destroy(&xi->xi_mtx); ++ hbl = &xi->xi_writing; ++ ul = au_hbl_count(hbl); ++ if (unlikely(ul)) { ++ pr_warn("xi_writing %lu\n", ul); ++ hlist_bl_lock(hbl); ++ hlist_bl_for_each_entry_safe(p, pos, n, hbl, node) { ++ hlist_bl_del(&p->node); ++ /* kmemleak reported au_kfree_rcu() doesn't free it */ ++ kfree(p); ++ } ++ hlist_bl_unlock(hbl); ++ } ++ au_kfree_try_rcu(xi->xi_file); ++ au_kfree_try_rcu(xi->xi_nondir.array); ++ au_kfree_rcu(xi); ++} ++ ++int au_xino_put(struct au_branch *br) ++{ ++ int ret; ++ struct au_xino *xi; ++ ++ ret = 0; ++ xi = br->br_xino; ++ if (xi) { ++ br->br_xino = NULL; ++ ret = kref_put(&xi->xi_kref, au_xino_release); ++ } ++ ++ return ret; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * xino mount option handlers ++ */ ++ ++/* xino bitmap */ ++static void xino_clear_xib(struct super_block *sb) ++{ ++ struct au_sbinfo *sbinfo; ++ ++ SiMustWriteLock(sb); ++ ++ sbinfo = au_sbi(sb); ++ if (sbinfo->si_xib) ++ fput(sbinfo->si_xib); ++ sbinfo->si_xib = NULL; ++ if (sbinfo->si_xib_buf) ++ free_page((unsigned long)sbinfo->si_xib_buf); ++ sbinfo->si_xib_buf = NULL; ++} ++ ++static int au_xino_set_xib(struct super_block *sb, struct path *path) ++{ ++ int err; ++ loff_t pos; ++ struct au_sbinfo *sbinfo; ++ struct file *file; ++ struct super_block *xi_sb; ++ ++ SiMustWriteLock(sb); ++ ++ sbinfo = au_sbi(sb); ++ file = au_xino_create2(sb, path, sbinfo->si_xib); ++ err = PTR_ERR(file); ++ if (IS_ERR(file)) ++ goto out; ++ if (sbinfo->si_xib) ++ fput(sbinfo->si_xib); ++ sbinfo->si_xib = file; ++ xi_sb = file_inode(file)->i_sb; ++ sbinfo->si_ximaxent = xi_sb->s_maxbytes; ++ if (unlikely(sbinfo->si_ximaxent < PAGE_SIZE)) { ++ err = -EIO; ++ pr_err("s_maxbytes(%llu) on %s is too small\n", ++ (u64)sbinfo->si_ximaxent, au_sbtype(xi_sb)); ++ goto out_unset; ++ } ++ sbinfo->si_ximaxent /= sizeof(ino_t); ++ ++ err = -ENOMEM; ++ if (!sbinfo->si_xib_buf) ++ sbinfo->si_xib_buf = (void *)get_zeroed_page(GFP_NOFS); ++ if (unlikely(!sbinfo->si_xib_buf)) ++ goto out_unset; ++ ++ sbinfo->si_xib_last_pindex = 0; ++ sbinfo->si_xib_next_bit = 0; ++ if (vfsub_f_size_read(file) < PAGE_SIZE) { ++ pos = 0; ++ err = xino_fwrite(file, sbinfo->si_xib_buf, PAGE_SIZE, &pos); ++ if (unlikely(err != PAGE_SIZE)) ++ goto out_free; ++ } ++ err = 0; ++ goto out; /* success */ ++ ++out_free: ++ if (sbinfo->si_xib_buf) ++ free_page((unsigned long)sbinfo->si_xib_buf); ++ sbinfo->si_xib_buf = NULL; ++ if (err >= 0) ++ err = -EIO; ++out_unset: ++ fput(sbinfo->si_xib); ++ sbinfo->si_xib = NULL; ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++/* xino for each branch */ ++static void xino_clear_br(struct super_block *sb) ++{ ++ aufs_bindex_t bindex, bbot; ++ struct au_branch *br; ++ ++ bbot = au_sbbot(sb); ++ for (bindex = 0; bindex <= bbot; bindex++) { ++ br = au_sbr(sb, bindex); ++ AuDebugOn(!br); ++ au_xino_put(br); ++ } ++} ++ ++static void au_xino_set_br_shared(struct super_block *sb, struct au_branch *br, ++ aufs_bindex_t bshared) ++{ ++ struct au_branch *brshared; ++ ++ brshared = au_sbr(sb, bshared); ++ AuDebugOn(!brshared->br_xino); ++ AuDebugOn(!brshared->br_xino->xi_file); ++ if (br->br_xino != brshared->br_xino) { ++ au_xino_get(brshared); ++ au_xino_put(br); ++ br->br_xino = brshared->br_xino; ++ } ++} ++ ++struct au_xino_do_set_br { ++ struct au_branch *br; ++ ino_t h_ino; ++ aufs_bindex_t bshared; ++}; ++ ++static int au_xino_do_set_br(struct super_block *sb, struct path *path, ++ struct au_xino_do_set_br *args) ++{ ++ int err; ++ struct au_xi_calc calc; ++ struct file *file; ++ struct au_branch *br; ++ struct au_xi_new xinew = { ++ .base = path ++ }; ++ ++ br = args->br; ++ xinew.xi = br->br_xino; ++ au_xi_calc(sb, args->h_ino, &calc); ++ xinew.copy_src = au_xino_file(xinew.xi, calc.idx); ++ if (args->bshared >= 0) ++ /* shared xino */ ++ au_xino_set_br_shared(sb, br, args->bshared); ++ else if (!xinew.xi) { ++ /* new xino */ ++ err = au_xino_init(br, calc.idx, xinew.copy_src); ++ if (unlikely(err)) ++ goto out; ++ } ++ ++ /* force re-creating */ ++ xinew.xi = br->br_xino; ++ xinew.idx = calc.idx; ++ mutex_lock(&xinew.xi->xi_mtx); ++ file = au_xi_new(sb, &xinew); ++ mutex_unlock(&xinew.xi->xi_mtx); ++ err = PTR_ERR(file); ++ if (IS_ERR(file)) ++ goto out; ++ AuDebugOn(!file); ++ ++ err = au_xino_do_write(file, &calc, AUFS_ROOT_INO); ++ if (unlikely(err)) ++ au_xino_put(br); ++ ++out: ++ AuTraceErr(err); ++ return err; ++} ++ ++static int au_xino_set_br(struct super_block *sb, struct path *path) ++{ ++ int err; ++ aufs_bindex_t bindex, bbot; ++ struct au_xino_do_set_br args; ++ struct inode *inode; ++ ++ SiMustWriteLock(sb); ++ ++ bbot = au_sbbot(sb); ++ inode = d_inode(sb->s_root); ++ for (bindex = 0; bindex <= bbot; bindex++) { ++ args.h_ino = au_h_iptr(inode, bindex)->i_ino; ++ args.br = au_sbr(sb, bindex); ++ args.bshared = is_sb_shared(sb, bindex, bindex - 1); ++ err = au_xino_do_set_br(sb, path, &args); ++ if (unlikely(err)) ++ break; ++ } ++ ++ AuTraceErr(err); ++ return err; ++} ++ ++void au_xino_clr(struct super_block *sb) ++{ ++ struct au_sbinfo *sbinfo; ++ ++ au_xigen_clr(sb); ++ xino_clear_xib(sb); ++ xino_clear_br(sb); ++ dbgaufs_brs_del(sb, 0); ++ sbinfo = au_sbi(sb); ++ /* lvalue, do not call au_mntflags() */ ++ au_opt_clr(sbinfo->si_mntflags, XINO); ++} ++ ++int au_xino_set(struct super_block *sb, struct au_opt_xino *xiopt, int remount) ++{ ++ int err, skip; ++ struct dentry *dentry, *parent, *cur_dentry, *cur_parent; ++ struct qstr *dname, *cur_name; ++ struct file *cur_xino; ++ struct au_sbinfo *sbinfo; ++ struct path *path, *cur_path; ++ ++ SiMustWriteLock(sb); ++ ++ err = 0; ++ sbinfo = au_sbi(sb); ++ path = &xiopt->file->f_path; ++ dentry = path->dentry; ++ parent = dget_parent(dentry); ++ if (remount) { ++ skip = 0; ++ cur_xino = sbinfo->si_xib; ++ if (cur_xino) { ++ cur_path = &cur_xino->f_path; ++ cur_dentry = cur_path->dentry; ++ cur_parent = dget_parent(cur_dentry); ++ cur_name = &cur_dentry->d_name; ++ dname = &dentry->d_name; ++ skip = (cur_parent == parent ++ && au_qstreq(dname, cur_name)); ++ dput(cur_parent); ++ } ++ if (skip) ++ goto out; ++ } ++ ++ au_opt_set(sbinfo->si_mntflags, XINO); ++ err = au_xino_set_xib(sb, path); ++ /* si_x{read,write} are set */ ++ if (!err) ++ err = au_xigen_set(sb, path); ++ if (!err) ++ err = au_xino_set_br(sb, path); ++ if (!err) { ++ dbgaufs_brs_add(sb, 0, /*topdown*/1); ++ goto out; /* success */ ++ } ++ ++ /* reset all */ ++ AuIOErr("failed setting xino(%d).\n", err); ++ au_xino_clr(sb); ++ ++out: ++ dput(parent); ++ return err; ++} ++ ++/* ++ * create a xinofile at the default place/path. ++ */ ++struct file *au_xino_def(struct super_block *sb) ++{ ++ struct file *file; ++ char *page, *p; ++ struct au_branch *br; ++ struct super_block *h_sb; ++ struct path path; ++ aufs_bindex_t bbot, bindex, bwr; ++ ++ br = NULL; ++ bbot = au_sbbot(sb); ++ bwr = -1; ++ for (bindex = 0; bindex <= bbot; bindex++) { ++ br = au_sbr(sb, bindex); ++ if (au_br_writable(br->br_perm) ++ && !au_test_fs_bad_xino(au_br_sb(br))) { ++ bwr = bindex; ++ break; ++ } ++ } ++ ++ if (bwr >= 0) { ++ file = ERR_PTR(-ENOMEM); ++ page = (void *)__get_free_page(GFP_NOFS); ++ if (unlikely(!page)) ++ goto out; ++ path.mnt = au_br_mnt(br); ++ path.dentry = au_h_dptr(sb->s_root, bwr); ++ p = d_path(&path, page, PATH_MAX - sizeof(AUFS_XINO_FNAME)); ++ file = (void *)p; ++ if (!IS_ERR(p)) { ++ strcat(p, "/" AUFS_XINO_FNAME); ++ AuDbg("%s\n", p); ++ file = au_xino_create(sb, p, /*silent*/0, /*wbrtop*/1); ++ } ++ free_page((unsigned long)page); ++ } else { ++ file = au_xino_create(sb, AUFS_XINO_DEFPATH, /*silent*/0, ++ /*wbrtop*/0); ++ if (IS_ERR(file)) ++ goto out; ++ h_sb = file->f_path.dentry->d_sb; ++ if (unlikely(au_test_fs_bad_xino(h_sb))) { ++ pr_err("xino doesn't support %s(%s)\n", ++ AUFS_XINO_DEFPATH, au_sbtype(h_sb)); ++ fput(file); ++ file = ERR_PTR(-EINVAL); ++ } ++ } ++ ++out: ++ return file; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * initialize the xinofile for the specified branch @br ++ * at the place/path where @base_file indicates. ++ * test whether another branch is on the same filesystem or not, ++ * if found then share the xinofile with another branch. ++ */ ++int au_xino_init_br(struct super_block *sb, struct au_branch *br, ino_t h_ino, ++ struct path *base) ++{ ++ int err; ++ struct au_xino_do_set_br args = { ++ .h_ino = h_ino, ++ .br = br ++ }; ++ ++ args.bshared = sbr_find_shared(sb, /*btop*/0, au_sbbot(sb), ++ au_br_sb(br)); ++ err = au_xino_do_set_br(sb, base, &args); ++ if (unlikely(err)) ++ au_xino_put(br); ++ ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ++ * get an unused inode number from bitmap ++ */ ++ino_t au_xino_new_ino(struct super_block *sb) ++{ ++ ino_t ino; ++ unsigned long *p, pindex, ul, pend; ++ struct au_sbinfo *sbinfo; ++ struct file *file; ++ int free_bit, err; ++ ++ if (!au_opt_test(au_mntflags(sb), XINO)) ++ return iunique(sb, AUFS_FIRST_INO); ++ ++ sbinfo = au_sbi(sb); ++ mutex_lock(&sbinfo->si_xib_mtx); ++ p = sbinfo->si_xib_buf; ++ free_bit = sbinfo->si_xib_next_bit; ++ if (free_bit < page_bits && !test_bit(free_bit, p)) ++ goto out; /* success */ ++ free_bit = find_first_zero_bit(p, page_bits); ++ if (free_bit < page_bits) ++ goto out; /* success */ ++ ++ pindex = sbinfo->si_xib_last_pindex; ++ for (ul = pindex - 1; ul < ULONG_MAX; ul--) { ++ err = xib_pindex(sb, ul); ++ if (unlikely(err)) ++ goto out_err; ++ free_bit = find_first_zero_bit(p, page_bits); ++ if (free_bit < page_bits) ++ goto out; /* success */ ++ } ++ ++ file = sbinfo->si_xib; ++ pend = vfsub_f_size_read(file) / PAGE_SIZE; ++ for (ul = pindex + 1; ul <= pend; ul++) { ++ err = xib_pindex(sb, ul); ++ if (unlikely(err)) ++ goto out_err; ++ free_bit = find_first_zero_bit(p, page_bits); ++ if (free_bit < page_bits) ++ goto out; /* success */ ++ } ++ BUG(); ++ ++out: ++ set_bit(free_bit, p); ++ sbinfo->si_xib_next_bit = free_bit + 1; ++ pindex = sbinfo->si_xib_last_pindex; ++ mutex_unlock(&sbinfo->si_xib_mtx); ++ ino = xib_calc_ino(pindex, free_bit); ++ AuDbg("i%lu\n", (unsigned long)ino); ++ return ino; ++out_err: ++ mutex_unlock(&sbinfo->si_xib_mtx); ++ AuDbg("i0\n"); ++ return 0; ++} ++ ++/* for s_op->delete_inode() */ ++void au_xino_delete_inode(struct inode *inode, const int unlinked) ++{ ++ int err; ++ unsigned int mnt_flags; ++ aufs_bindex_t bindex, bbot, bi; ++ unsigned char try_trunc; ++ struct au_iinfo *iinfo; ++ struct super_block *sb; ++ struct au_hinode *hi; ++ struct inode *h_inode; ++ struct au_branch *br; ++ struct au_xi_calc calc; ++ struct file *file; ++ ++ AuDebugOn(au_is_bad_inode(inode)); ++ ++ sb = inode->i_sb; ++ mnt_flags = au_mntflags(sb); ++ if (!au_opt_test(mnt_flags, XINO) ++ || inode->i_ino == AUFS_ROOT_INO) ++ return; ++ ++ if (unlinked) { ++ au_xigen_inc(inode); ++ au_xib_clear_bit(inode); ++ } ++ ++ iinfo = au_ii(inode); ++ bindex = iinfo->ii_btop; ++ if (bindex < 0) ++ return; ++ ++ try_trunc = !!au_opt_test(mnt_flags, TRUNC_XINO); ++ hi = au_hinode(iinfo, bindex); ++ bbot = iinfo->ii_bbot; ++ for (; bindex <= bbot; bindex++, hi++) { ++ h_inode = hi->hi_inode; ++ if (!h_inode ++ || (!unlinked && h_inode->i_nlink)) ++ continue; ++ ++ /* inode may not be revalidated */ ++ bi = au_br_index(sb, hi->hi_id); ++ if (bi < 0) ++ continue; ++ ++ br = au_sbr(sb, bi); ++ au_xi_calc(sb, h_inode->i_ino, &calc); ++ file = au_xino_file(br->br_xino, calc.idx); ++ if (IS_ERR_OR_NULL(file)) ++ continue; ++ ++ err = au_xino_do_write(file, &calc, /*ino*/0); ++ if (!err && try_trunc ++ && au_test_fs_trunc_xino(au_br_sb(br))) ++ xino_try_trunc(sb, br); ++ } ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++static int au_xinondir_find(struct au_xino *xi, ino_t h_ino) ++{ ++ int found, total, i; ++ ++ found = -1; ++ total = xi->xi_nondir.total; ++ for (i = 0; i < total; i++) { ++ if (xi->xi_nondir.array[i] != h_ino) ++ continue; ++ found = i; ++ break; ++ } ++ ++ return found; ++} ++ ++static int au_xinondir_expand(struct au_xino *xi) ++{ ++ int err, sz; ++ ino_t *p; ++ ++ BUILD_BUG_ON(KMALLOC_MAX_SIZE > INT_MAX); ++ ++ err = -ENOMEM; ++ sz = xi->xi_nondir.total * sizeof(ino_t); ++ if (unlikely(sz > KMALLOC_MAX_SIZE / 2)) ++ goto out; ++ p = au_kzrealloc(xi->xi_nondir.array, sz, sz << 1, GFP_ATOMIC, ++ /*may_shrink*/0); ++ if (p) { ++ xi->xi_nondir.array = p; ++ xi->xi_nondir.total <<= 1; ++ AuDbg("xi_nondir.total %d\n", xi->xi_nondir.total); ++ err = 0; ++ } ++ ++out: ++ return err; ++} ++ ++void au_xinondir_leave(struct super_block *sb, aufs_bindex_t bindex, ++ ino_t h_ino, int idx) ++{ ++ struct au_xino *xi; ++ ++ AuDebugOn(!au_opt_test(au_mntflags(sb), XINO)); ++ xi = au_sbr(sb, bindex)->br_xino; ++ AuDebugOn(idx < 0 || xi->xi_nondir.total <= idx); ++ ++ spin_lock(&xi->xi_nondir.spin); ++ AuDebugOn(xi->xi_nondir.array[idx] != h_ino); ++ xi->xi_nondir.array[idx] = 0; ++ spin_unlock(&xi->xi_nondir.spin); ++ wake_up_all(&xi->xi_nondir.wqh); ++} ++ ++int au_xinondir_enter(struct super_block *sb, aufs_bindex_t bindex, ino_t h_ino, ++ int *idx) ++{ ++ int err, found, empty; ++ struct au_xino *xi; ++ ++ err = 0; ++ *idx = -1; ++ if (!au_opt_test(au_mntflags(sb), XINO)) ++ goto out; /* no xino */ ++ ++ xi = au_sbr(sb, bindex)->br_xino; ++ ++again: ++ spin_lock(&xi->xi_nondir.spin); ++ found = au_xinondir_find(xi, h_ino); ++ if (found == -1) { ++ empty = au_xinondir_find(xi, /*h_ino*/0); ++ if (empty == -1) { ++ empty = xi->xi_nondir.total; ++ err = au_xinondir_expand(xi); ++ if (unlikely(err)) ++ goto out_unlock; ++ } ++ xi->xi_nondir.array[empty] = h_ino; ++ *idx = empty; ++ } else { ++ spin_unlock(&xi->xi_nondir.spin); ++ wait_event(xi->xi_nondir.wqh, ++ xi->xi_nondir.array[found] != h_ino); ++ goto again; ++ } ++ ++out_unlock: ++ spin_unlock(&xi->xi_nondir.spin); ++out: ++ return err; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++int au_xino_path(struct seq_file *seq, struct file *file) ++{ ++ int err; ++ ++ err = au_seq_path(seq, &file->f_path); ++ if (unlikely(err)) ++ goto out; ++ ++#define Deleted "\\040(deleted)" ++ seq->count -= sizeof(Deleted) - 1; ++ AuDebugOn(memcmp(seq->buf + seq->count, Deleted, ++ sizeof(Deleted) - 1)); ++#undef Deleted ++ ++out: ++ return err; ++} +diff --git a/include/uapi/linux/aufs_type.h b/include/uapi/linux/aufs_type.h +new file mode 100644 +index 000000000000..83d3a5132b5a +--- /dev/null ++++ b/include/uapi/linux/aufs_type.h +@@ -0,0 +1,452 @@ ++/* SPDX-License-Identifier: GPL-2.0 WITH Linux-syscall-note */ ++/* ++ * Copyright (C) 2005-2022 Junjiro R. Okajima ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License as published by ++ * the Free Software Foundation; either version 2 of the License, or ++ * (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see <http://www.gnu.org/licenses/>. ++ */ ++ ++#ifndef __AUFS_TYPE_H__ ++#define __AUFS_TYPE_H__ ++ ++#define AUFS_NAME "aufs" ++ ++#ifdef __KERNEL__ ++/* ++ * define it before including all other headers. ++ * sched.h may use pr_* macros before defining "current", so define the ++ * no-current version first, and re-define later. ++ */ ++#define pr_fmt(fmt) AUFS_NAME " %s:%d: " fmt, __func__, __LINE__ ++#include <linux/sched.h> ++#undef pr_fmt ++#define pr_fmt(fmt) \ ++ AUFS_NAME " %s:%d:%.*s[%d]: " fmt, __func__, __LINE__, \ ++ (int)sizeof(current->comm), current->comm, current->pid ++#include <linux/limits.h> ++#else ++#include <stdint.h> ++#include <sys/types.h> ++#include <limits.h> ++#endif /* __KERNEL__ */ ++ ++#define AUFS_VERSION "6.5-20230918" ++ ++/* todo? move this to linux-2.6.19/include/magic.h */ ++#define AUFS_SUPER_MAGIC ('a' << 24 | 'u' << 16 | 'f' << 8 | 's') ++ ++/* ---------------------------------------------------------------------- */ ++ ++#ifdef __KERNEL__ ++#ifdef CONFIG_AUFS_BRANCH_MAX_127 ++typedef int8_t aufs_bindex_t; ++#define AUFS_BRANCH_MAX 127 ++#else ++typedef int16_t aufs_bindex_t; ++#ifdef CONFIG_AUFS_BRANCH_MAX_511 ++#define AUFS_BRANCH_MAX 511 ++#elif defined(CONFIG_AUFS_BRANCH_MAX_1023) ++#define AUFS_BRANCH_MAX 1023 ++#elif defined(CONFIG_AUFS_BRANCH_MAX_32767) ++#define AUFS_BRANCH_MAX 32767 ++#endif ++#endif ++ ++#ifndef AUFS_BRANCH_MAX ++#error unknown CONFIG_AUFS_BRANCH_MAX value ++#endif ++#endif /* __KERNEL__ */ ++ ++/* ---------------------------------------------------------------------- */ ++ ++#define AUFS_FSTYPE AUFS_NAME ++ ++#define AUFS_ROOT_INO 2 ++#define AUFS_FIRST_INO 11 ++ ++#define AUFS_WH_PFX ".wh." ++#define AUFS_WH_PFX_LEN ((int)sizeof(AUFS_WH_PFX) - 1) ++#define AUFS_WH_TMP_LEN 4 ++/* a limit for rmdir/rename a dir and copyup */ ++#define AUFS_MAX_NAMELEN (NAME_MAX \ ++ - AUFS_WH_PFX_LEN * 2 /* doubly whiteouted */\ ++ - 1 /* dot */\ ++ - AUFS_WH_TMP_LEN) /* hex */ ++#define AUFS_XINO_FNAME "." AUFS_NAME ".xino" ++#define AUFS_XINO_DEFPATH "/tmp/" AUFS_XINO_FNAME ++#define AUFS_XINO_DEF_SEC 30 /* seconds */ ++#define AUFS_XINO_DEF_TRUNC 45 /* percentage */ ++#define AUFS_DIRWH_DEF 3 ++#define AUFS_RDCACHE_DEF 10 /* seconds */ ++#define AUFS_RDCACHE_MAX 3600 /* seconds */ ++#define AUFS_RDBLK_DEF 512 /* bytes */ ++#define AUFS_RDHASH_DEF 32 ++#define AUFS_WKQ_NAME AUFS_NAME "d" ++#define AUFS_MFS_DEF_SEC 30 /* seconds */ ++#define AUFS_MFS_MAX_SEC 3600 /* seconds */ ++#define AUFS_FHSM_CACHE_DEF_SEC 30 /* seconds */ ++#define AUFS_PLINK_WARN 50 /* number of plinks in a single bucket */ ++ ++/* pseudo-link maintenace under /proc */ ++#define AUFS_PLINK_MAINT_NAME "plink_maint" ++#define AUFS_PLINK_MAINT_DIR "fs/" AUFS_NAME ++#define AUFS_PLINK_MAINT_PATH AUFS_PLINK_MAINT_DIR "/" AUFS_PLINK_MAINT_NAME ++ ++/* dirren, renamed dir */ ++#define AUFS_DR_INFO_PFX AUFS_WH_PFX ".dr." ++#define AUFS_DR_BRHINO_NAME AUFS_WH_PFX "hino" ++/* whiteouted doubly */ ++#define AUFS_WH_DR_INFO_PFX AUFS_WH_PFX AUFS_DR_INFO_PFX ++#define AUFS_WH_DR_BRHINO AUFS_WH_PFX AUFS_DR_BRHINO_NAME ++ ++#define AUFS_DIROPQ_NAME AUFS_WH_PFX ".opq" /* whiteouted doubly */ ++#define AUFS_WH_DIROPQ AUFS_WH_PFX AUFS_DIROPQ_NAME ++ ++#define AUFS_BASE_NAME AUFS_WH_PFX AUFS_NAME ++#define AUFS_PLINKDIR_NAME AUFS_WH_PFX "plnk" ++#define AUFS_ORPHDIR_NAME AUFS_WH_PFX "orph" ++ ++/* doubly whiteouted */ ++#define AUFS_WH_BASE AUFS_WH_PFX AUFS_BASE_NAME ++#define AUFS_WH_PLINKDIR AUFS_WH_PFX AUFS_PLINKDIR_NAME ++#define AUFS_WH_ORPHDIR AUFS_WH_PFX AUFS_ORPHDIR_NAME ++ ++/* branch permissions and attributes */ ++#define AUFS_BRPERM_RW "rw" ++#define AUFS_BRPERM_RO "ro" ++#define AUFS_BRPERM_RR "rr" ++#define AUFS_BRATTR_COO_REG "coo_reg" ++#define AUFS_BRATTR_COO_ALL "coo_all" ++#define AUFS_BRATTR_FHSM "fhsm" ++#define AUFS_BRATTR_UNPIN "unpin" ++#define AUFS_BRATTR_ICEX "icex" ++#define AUFS_BRATTR_ICEX_SEC "icexsec" ++#define AUFS_BRATTR_ICEX_SYS "icexsys" ++#define AUFS_BRATTR_ICEX_TR "icextr" ++#define AUFS_BRATTR_ICEX_USR "icexusr" ++#define AUFS_BRATTR_ICEX_OTH "icexoth" ++#define AUFS_BRRATTR_WH "wh" ++#define AUFS_BRWATTR_NLWH "nolwh" ++#define AUFS_BRWATTR_MOO "moo" ++ ++#define AuBrPerm_RW 1 /* writable, hardlinkable wh */ ++#define AuBrPerm_RO (1 << 1) /* readonly */ ++#define AuBrPerm_RR (1 << 2) /* natively readonly */ ++#define AuBrPerm_Mask (AuBrPerm_RW | AuBrPerm_RO | AuBrPerm_RR) ++ ++#define AuBrAttr_COO_REG (1 << 3) /* copy-up on open */ ++#define AuBrAttr_COO_ALL (1 << 4) ++#define AuBrAttr_COO_Mask (AuBrAttr_COO_REG | AuBrAttr_COO_ALL) ++ ++#define AuBrAttr_FHSM (1 << 5) /* file-based hsm */ ++#define AuBrAttr_UNPIN (1 << 6) /* rename-able top dir of ++ branch. meaningless since ++ linux-3.18-rc1 */ ++ ++/* ignore error in copying XATTR */ ++#define AuBrAttr_ICEX_SEC (1 << 7) ++#define AuBrAttr_ICEX_SYS (1 << 8) ++#define AuBrAttr_ICEX_TR (1 << 9) ++#define AuBrAttr_ICEX_USR (1 << 10) ++#define AuBrAttr_ICEX_OTH (1 << 11) ++#define AuBrAttr_ICEX (AuBrAttr_ICEX_SEC \ ++ | AuBrAttr_ICEX_SYS \ ++ | AuBrAttr_ICEX_TR \ ++ | AuBrAttr_ICEX_USR \ ++ | AuBrAttr_ICEX_OTH) ++ ++#define AuBrRAttr_WH (1 << 12) /* whiteout-able */ ++#define AuBrRAttr_Mask AuBrRAttr_WH ++ ++#define AuBrWAttr_NoLinkWH (1 << 13) /* un-hardlinkable whiteouts */ ++#define AuBrWAttr_MOO (1 << 14) /* move-up on open */ ++#define AuBrWAttr_Mask (AuBrWAttr_NoLinkWH | AuBrWAttr_MOO) ++ ++#define AuBrAttr_CMOO_Mask (AuBrAttr_COO_Mask | AuBrWAttr_MOO) ++ ++/* #warning test userspace */ ++#ifdef __KERNEL__ ++#ifndef CONFIG_AUFS_FHSM ++#undef AuBrAttr_FHSM ++#define AuBrAttr_FHSM 0 ++#endif ++#ifndef CONFIG_AUFS_XATTR ++#undef AuBrAttr_ICEX ++#define AuBrAttr_ICEX 0 ++#undef AuBrAttr_ICEX_SEC ++#define AuBrAttr_ICEX_SEC 0 ++#undef AuBrAttr_ICEX_SYS ++#define AuBrAttr_ICEX_SYS 0 ++#undef AuBrAttr_ICEX_TR ++#define AuBrAttr_ICEX_TR 0 ++#undef AuBrAttr_ICEX_USR ++#define AuBrAttr_ICEX_USR 0 ++#undef AuBrAttr_ICEX_OTH ++#define AuBrAttr_ICEX_OTH 0 ++#endif ++#endif ++ ++/* the longest combination */ ++/* AUFS_BRATTR_ICEX and AUFS_BRATTR_ICEX_TR don't affect here */ ++#define AuBrPermStrSz sizeof(AUFS_BRPERM_RW \ ++ "+" AUFS_BRATTR_COO_REG \ ++ "+" AUFS_BRATTR_FHSM \ ++ "+" AUFS_BRATTR_UNPIN \ ++ "+" AUFS_BRATTR_ICEX_SEC \ ++ "+" AUFS_BRATTR_ICEX_SYS \ ++ "+" AUFS_BRATTR_ICEX_USR \ ++ "+" AUFS_BRATTR_ICEX_OTH \ ++ "+" AUFS_BRWATTR_NLWH) ++ ++typedef struct { ++ char a[AuBrPermStrSz]; ++} au_br_perm_str_t; ++ ++static inline int au_br_writable(int brperm) ++{ ++ return brperm & AuBrPerm_RW; ++} ++ ++static inline int au_br_whable(int brperm) ++{ ++ return brperm & (AuBrPerm_RW | AuBrRAttr_WH); ++} ++ ++static inline int au_br_wh_linkable(int brperm) ++{ ++ return !(brperm & AuBrWAttr_NoLinkWH); ++} ++ ++static inline int au_br_cmoo(int brperm) ++{ ++ return brperm & AuBrAttr_CMOO_Mask; ++} ++ ++static inline int au_br_fhsm(int brperm) ++{ ++ return brperm & AuBrAttr_FHSM; ++} ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* ioctl */ ++enum { ++ /* readdir in userspace */ ++ AuCtl_RDU, ++ AuCtl_RDU_INO, ++ ++ AuCtl_WBR_FD, /* pathconf wrapper */ ++ AuCtl_IBUSY, /* busy inode */ ++ AuCtl_MVDOWN, /* move-down */ ++ AuCtl_BR, /* info about branches */ ++ AuCtl_FHSM_FD /* connection for fhsm */ ++}; ++ ++/* borrowed from linux/include/linux/kernel.h */ ++#ifndef ALIGN ++#ifdef _GNU_SOURCE ++#define ALIGN(x, a) __ALIGN_MASK(x, (typeof(x))(a)-1) ++#else ++#define ALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1)) ++#endif ++#define __ALIGN_MASK(x, mask) (((x)+(mask))&~(mask)) ++#endif ++ ++/* borrowed from linux/include/linux/compiler-gcc3.h */ ++#ifndef __aligned ++#define __aligned(x) __attribute__((aligned(x))) ++#endif ++ ++#ifdef __KERNEL__ ++#ifndef __packed ++#define __packed __attribute__((packed)) ++#endif ++#endif ++ ++struct au_rdu_cookie { ++ uint64_t h_pos; ++ int16_t bindex; ++ uint8_t flags; ++ uint8_t pad; ++ uint32_t generation; ++} __aligned(8); ++ ++struct au_rdu_ent { ++ uint64_t ino; ++ int16_t bindex; ++ uint8_t type; ++ uint8_t nlen; ++ uint8_t wh; ++ char name[]; ++} __aligned(8); ++ ++static inline int au_rdu_len(int nlen) ++{ ++ /* include the terminating NULL */ ++ return ALIGN(sizeof(struct au_rdu_ent) + nlen + 1, ++ sizeof(uint64_t)); ++} ++ ++union au_rdu_ent_ul { ++ struct au_rdu_ent __user *e; ++ uint64_t ul; ++}; ++ ++enum { ++ AufsCtlRduV_SZ, ++ AufsCtlRduV_End ++}; ++ ++struct aufs_rdu { ++ /* input */ ++ union { ++ uint64_t sz; /* AuCtl_RDU */ ++ uint64_t nent; /* AuCtl_RDU_INO */ ++ }; ++ union au_rdu_ent_ul ent; ++ uint16_t verify[AufsCtlRduV_End]; ++ ++ /* input/output */ ++ uint32_t blk; ++ ++ /* output */ ++ union au_rdu_ent_ul tail; ++ /* number of entries which were added in a single call */ ++ uint64_t rent; ++ uint8_t full; ++ uint8_t shwh; ++ ++ struct au_rdu_cookie cookie; ++} __aligned(8); ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* dirren. the branch is identified by the filename who contains this */ ++struct au_drinfo { ++ uint64_t ino; ++ union { ++ uint8_t oldnamelen; ++ uint64_t _padding; ++ }; ++ uint8_t oldname[]; ++} __aligned(8); ++ ++struct au_drinfo_fdata { ++ uint32_t magic; ++ struct au_drinfo drinfo; ++} __aligned(8); ++ ++#define AUFS_DRINFO_MAGIC_V1 ('a' << 24 | 'd' << 16 | 'r' << 8 | 0x01) ++/* future */ ++#define AUFS_DRINFO_MAGIC_V2 ('a' << 24 | 'd' << 16 | 'r' << 8 | 0x02) ++ ++/* ---------------------------------------------------------------------- */ ++ ++struct aufs_wbr_fd { ++ uint32_t oflags; ++ int16_t brid; ++} __aligned(8); ++ ++/* ---------------------------------------------------------------------- */ ++ ++struct aufs_ibusy { ++ uint64_t ino, h_ino; ++ int16_t bindex; ++} __aligned(8); ++ ++/* ---------------------------------------------------------------------- */ ++ ++/* error code for move-down */ ++/* the actual message strings are implemented in aufs-util.git */ ++enum { ++ EAU_MVDOWN_OPAQUE = 1, ++ EAU_MVDOWN_WHITEOUT, ++ EAU_MVDOWN_UPPER, ++ EAU_MVDOWN_BOTTOM, ++ EAU_MVDOWN_NOUPPER, ++ EAU_MVDOWN_NOLOWERBR, ++ EAU_Last ++}; ++ ++/* flags for move-down */ ++#define AUFS_MVDOWN_DMSG 1 ++#define AUFS_MVDOWN_OWLOWER (1 << 1) /* overwrite lower */ ++#define AUFS_MVDOWN_KUPPER (1 << 2) /* keep upper */ ++#define AUFS_MVDOWN_ROLOWER (1 << 3) /* do even if lower is RO */ ++#define AUFS_MVDOWN_ROLOWER_R (1 << 4) /* did on lower RO */ ++#define AUFS_MVDOWN_ROUPPER (1 << 5) /* do even if upper is RO */ ++#define AUFS_MVDOWN_ROUPPER_R (1 << 6) /* did on upper RO */ ++#define AUFS_MVDOWN_BRID_UPPER (1 << 7) /* upper brid */ ++#define AUFS_MVDOWN_BRID_LOWER (1 << 8) /* lower brid */ ++#define AUFS_MVDOWN_FHSM_LOWER (1 << 9) /* find fhsm attr for lower */ ++#define AUFS_MVDOWN_STFS (1 << 10) /* req. stfs */ ++#define AUFS_MVDOWN_STFS_FAILED (1 << 11) /* output: stfs is unusable */ ++#define AUFS_MVDOWN_BOTTOM (1 << 12) /* output: no more lowers */ ++ ++/* index for move-down */ ++enum { ++ AUFS_MVDOWN_UPPER, ++ AUFS_MVDOWN_LOWER, ++ AUFS_MVDOWN_NARRAY ++}; ++ ++/* ++ * additional info of move-down ++ * number of free blocks and inodes. ++ * subset of struct kstatfs, but smaller and always 64bit. ++ */ ++struct aufs_stfs { ++ uint64_t f_blocks; ++ uint64_t f_bavail; ++ uint64_t f_files; ++ uint64_t f_ffree; ++}; ++ ++struct aufs_stbr { ++ int16_t brid; /* optional input */ ++ int16_t bindex; /* output */ ++ struct aufs_stfs stfs; /* output when AUFS_MVDOWN_STFS set */ ++} __aligned(8); ++ ++struct aufs_mvdown { ++ uint32_t flags; /* input/output */ ++ struct aufs_stbr stbr[AUFS_MVDOWN_NARRAY]; /* input/output */ ++ int8_t au_errno; /* output */ ++} __aligned(8); ++ ++/* ---------------------------------------------------------------------- */ ++ ++union aufs_brinfo { ++ /* PATH_MAX may differ between kernel-space and user-space */ ++ char _spacer[4096]; ++ struct { ++ int16_t id; ++ int perm; ++ char path[]; ++ }; ++} __aligned(8); ++ ++/* ---------------------------------------------------------------------- */ ++ ++#define AuCtlType 'A' ++#define AUFS_CTL_RDU _IOWR(AuCtlType, AuCtl_RDU, struct aufs_rdu) ++#define AUFS_CTL_RDU_INO _IOWR(AuCtlType, AuCtl_RDU_INO, struct aufs_rdu) ++#define AUFS_CTL_WBR_FD _IOW(AuCtlType, AuCtl_WBR_FD, \ ++ struct aufs_wbr_fd) ++#define AUFS_CTL_IBUSY _IOWR(AuCtlType, AuCtl_IBUSY, struct aufs_ibusy) ++#define AUFS_CTL_MVDOWN _IOWR(AuCtlType, AuCtl_MVDOWN, \ ++ struct aufs_mvdown) ++#define AUFS_CTL_BRINFO _IOW(AuCtlType, AuCtl_BR, union aufs_brinfo) ++#define AUFS_CTL_FHSM_FD _IOW(AuCtlType, AuCtl_FHSM_FD, int) ++ ++#endif /* __AUFS_TYPE_H__ */ +-- +2.34.1 + diff --git a/features/aufs/aufs6-correct-do_splice_from-prototype.patch b/features/aufs/aufs6-correct-do_splice_from-prototype.patch new file mode 100644 index 00000000..dd83db1e --- /dev/null +++ b/features/aufs/aufs6-correct-do_splice_from-prototype.patch @@ -0,0 +1,26 @@ +From c76e5c498001148b22148fadc86611fd1874caa9 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Thu, 25 Jan 2024 11:17:19 -0500 +Subject: [PATCH] aufs6: correct do_splice_from prototype + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + include/linux/splice.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/include/linux/splice.h b/include/linux/splice.h +index 8024911403e9..727e61a98c49 100644 +--- a/include/linux/splice.h ++++ b/include/linux/splice.h +@@ -109,7 +109,7 @@ extern void splice_shrink_spd(struct splice_pipe_desc *); + extern const struct pipe_buf_operations page_cache_pipe_buf_ops; + extern const struct pipe_buf_operations default_pipe_buf_ops; + +-extern long do_splice_from(struct pipe_inode_info *pipe, struct file *out, ++extern ssize_t do_splice_from(struct pipe_inode_info *pipe, struct file *out, + loff_t *ppos, size_t len, unsigned int flags); + extern long do_splice_to(struct file *in, loff_t *ppos, + struct pipe_inode_info *pipe, size_t len, +-- +2.39.2 + diff --git a/features/aufs/aufs6-fix-magic.mk-include-path.patch b/features/aufs/aufs6-fix-magic.mk-include-path.patch new file mode 100644 index 00000000..9bb1cf43 --- /dev/null +++ b/features/aufs/aufs6-fix-magic.mk-include-path.patch @@ -0,0 +1,37 @@ +From 001144b1c29e0214cad19720e6e1c35a576b124c Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Thu, 6 Jul 2023 11:34:59 -0400 +Subject: [PATCH 7/8] aufs6: fix magic.mk include path + +commit 482d7131560c51da3ca [aufs stdalone: make it standalone] in the +aufs upstream changes the way that the .mk file is included. + +This doesn't work properly with all kernel build processes, so we +restore the use of srctree/src to locate the file. + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/aufs/Makefile | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/fs/aufs/Makefile b/fs/aufs/Makefile +index 4af8ecde3e3f..72db3cae2b92 100644 +--- a/fs/aufs/Makefile ++++ b/fs/aufs/Makefile +@@ -1,10 +1,10 @@ + # SPDX-License-Identifier: GPL-2.0 + +-include ${src}/magic.mk ++include ${srctree}/${src}/magic.mk + ifeq (${CONFIG_AUFS_FS},m) +-include ${src}/conf.mk ++include ${srctree}/${src}/conf.mk + endif +--include ${src}/priv_def.mk ++-include ${srctree}/${src}/priv_def.mk + + # cf. include/linux/kernel.h + # enable pr_debug +-- +2.34.1 + diff --git a/features/aufs/aufs6-kbuild.patch b/features/aufs/aufs6-kbuild.patch new file mode 100644 index 00000000..57532dd5 --- /dev/null +++ b/features/aufs/aufs6-kbuild.patch @@ -0,0 +1,35 @@ +From 9962a8dfbc2b485c58d9ca511ae7bdfd808f78cc Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Thu, 21 Sep 2023 17:47:14 -0400 +Subject: [PATCH 1/8] aufs6: kbuild + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/Kconfig | 1 + + fs/Makefile | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/fs/Kconfig b/fs/Kconfig +index 3800e18ad2ea..a0b5168e1ef6 100644 +--- a/fs/Kconfig ++++ b/fs/Kconfig +@@ -332,6 +332,7 @@ source "fs/sysv/Kconfig" + source "fs/ufs/Kconfig" + source "fs/erofs/Kconfig" + source "fs/vboxsf/Kconfig" ++source "fs/aufs/Kconfig" + + endif # MISC_FILESYSTEMS + +diff --git a/fs/Makefile b/fs/Makefile +index 23cc0a3852aa..d58a3f162e31 100644 +--- a/fs/Makefile ++++ b/fs/Makefile +@@ -130,3 +130,4 @@ obj-$(CONFIG_EROFS_FS) += erofs/ + obj-$(CONFIG_VBOXSF_FS) += vboxsf/ + obj-$(CONFIG_ZONEFS_FS) += zonefs/ + obj-$(CONFIG_YAFFS_FS) += yaffs2/ ++obj-$(CONFIG_AUFS_FS) += aufs/ +-- +2.34.1 + diff --git a/features/aufs/aufs6-mmap.patch b/features/aufs/aufs6-mmap.patch new file mode 100644 index 00000000..d1e5168f --- /dev/null +++ b/features/aufs/aufs6-mmap.patch @@ -0,0 +1,450 @@ +From 550fbd6a226ed0b04b497dd4dcf5e14c7cd113f1 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Thu, 21 Sep 2023 17:49:39 -0400 +Subject: [PATCH] aufs6: mmap + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/proc/base.c | 2 +- + fs/proc/nommu.c | 5 ++- + fs/proc/task_mmu.c | 6 ++- + fs/proc/task_nommu.c | 5 ++- + include/linux/mm.h | 37 +++++++++++++++++ + include/linux/mm_types.h | 6 +++ + kernel/fork.c | 2 +- + mm/Makefile | 1 + + mm/filemap.c | 2 +- + mm/mmap.c | 41 +++++++++++++++---- + mm/nommu.c | 10 ++--- + mm/prfile.c | 86 ++++++++++++++++++++++++++++++++++++++++ + 12 files changed, 184 insertions(+), 19 deletions(-) + create mode 100644 mm/prfile.c + +diff --git a/fs/proc/base.c b/fs/proc/base.c +index 98a031ac2648..9cd1d25f9fc0 100644 +--- a/fs/proc/base.c ++++ b/fs/proc/base.c +@@ -2215,7 +2215,7 @@ static int map_files_get_link(struct dentry *dentry, struct path *path) + rc = -ENOENT; + vma = find_exact_vma(mm, vm_start, vm_end); + if (vma && vma->vm_file) { +- *path = *file_user_path(vma->vm_file); ++ *path = *file_user_path(vma_pr_or_file(vma)); + path_get(path); + rc = 0; + } +diff --git a/fs/proc/nommu.c b/fs/proc/nommu.c +index c6e7ebc63756..d7ccfd909764 100644 +--- a/fs/proc/nommu.c ++++ b/fs/proc/nommu.c +@@ -39,7 +39,10 @@ static int nommu_region_show(struct seq_file *m, struct vm_region *region) + file = region->vm_file; + + if (file) { +- struct inode *inode = file_inode(region->vm_file); ++ struct inode *inode; ++ ++ file = vmr_pr_or_file(region); ++ inode = file_inode(file); + dev = inode->i_sb->s_dev; + ino = inode->i_ino; + } +diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c +index 3f78ebbb795f..32f9aaf5345e 100644 +--- a/fs/proc/task_mmu.c ++++ b/fs/proc/task_mmu.c +@@ -273,8 +273,10 @@ show_map_vma(struct seq_file *m, struct vm_area_struct *vma) + const char *name = NULL; + + if (file) { +- const struct inode *inode = file_user_inode(vma->vm_file); ++ struct inode *inode; + ++ file = vma_pr_or_file(vma); ++ inode = file_user_inode(vma->vm_file); + dev = inode->i_sb->s_dev; + ino = inode->i_ino; + pgoff = ((loff_t)vma->vm_pgoff) << PAGE_SHIFT; +@@ -2701,7 +2703,7 @@ static int show_numa_map(struct seq_file *m, void *v) + struct proc_maps_private *proc_priv = &numa_priv->proc_maps; + struct vm_area_struct *vma = v; + struct numa_maps *md = &numa_priv->md; +- struct file *file = vma->vm_file; ++ struct file *file = vma_pr_or_file(vma); + struct mm_struct *mm = vma->vm_mm; + char buffer[64]; + struct mempolicy *pol; +diff --git a/fs/proc/task_nommu.c b/fs/proc/task_nommu.c +index bce674533000..b12b5a75c799 100644 +--- a/fs/proc/task_nommu.c ++++ b/fs/proc/task_nommu.c +@@ -137,7 +137,10 @@ static int nommu_vma_show(struct seq_file *m, struct vm_area_struct *vma) + file = vma->vm_file; + + if (file) { +- struct inode *inode = file_inode(vma->vm_file); ++ struct inode *inode; ++ ++ file = vma_pr_or_file(vma); ++ inode = file_inode(file); + dev = inode->i_sb->s_dev; + ino = inode->i_ino; + pgoff = (loff_t)vma->vm_pgoff << PAGE_SHIFT; +diff --git a/include/linux/mm.h b/include/linux/mm.h +index f5a97dec5169..dc908f541ce9 100644 +--- a/include/linux/mm.h ++++ b/include/linux/mm.h +@@ -2432,6 +2432,43 @@ static inline void unmap_shared_mapping_range(struct address_space *mapping, + static inline struct vm_area_struct *vma_lookup(struct mm_struct *mm, + unsigned long addr); + ++#if 1 /* IS_ENABLED(CONFIG_AUFS_FS) */ ++extern void vma_do_file_update_time(struct vm_area_struct *, const char[], int); ++extern struct file *vma_do_pr_or_file(struct vm_area_struct *, const char[], ++ int); ++extern void vma_do_get_file(struct vm_area_struct *, const char[], int); ++extern void vma_do_fput(struct vm_area_struct *, const char[], int); ++ ++#define vma_file_update_time(vma) vma_do_file_update_time(vma, __func__, \ ++ __LINE__) ++#define vma_pr_or_file(vma) vma_do_pr_or_file(vma, __func__, \ ++ __LINE__) ++#define vma_get_file(vma) vma_do_get_file(vma, __func__, __LINE__) ++#define vma_fput(vma) vma_do_fput(vma, __func__, __LINE__) ++ ++#ifndef CONFIG_MMU ++extern struct file *vmr_do_pr_or_file(struct vm_region *, const char[], int); ++extern void vmr_do_fput(struct vm_region *, const char[], int); ++ ++#define vmr_pr_or_file(region) vmr_do_pr_or_file(region, __func__, \ ++ __LINE__) ++#define vmr_fput(region) vmr_do_fput(region, __func__, __LINE__) ++#endif /* !CONFIG_MMU */ ++ ++#else ++ ++#define vma_file_update_time(vma) file_update_time((vma)->vm_file) ++#define vma_pr_or_file(vma) (vma)->vm_file ++#define vma_get_file(vma) get_file((vma)->vm_file) ++#define vma_fput(vma) fput((vma)->vm_file) ++ ++#ifndef CONFIG_MMU ++#define vmr_pr_or_file(region) (region)->vm_file ++#define vmr_fput(region) fput((region)->vm_file) ++#endif /* !CONFIG_MMU */ ++ ++#endif /* CONFIG_AUFS_FS */ ++ + extern int access_process_vm(struct task_struct *tsk, unsigned long addr, + void *buf, int len, unsigned int gup_flags); + extern int access_remote_vm(struct mm_struct *mm, unsigned long addr, +diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h +index 8b611e13153e..f5f10bfa5b63 100644 +--- a/include/linux/mm_types.h ++++ b/include/linux/mm_types.h +@@ -527,6 +527,9 @@ struct vm_region { + unsigned long vm_top; /* region allocated to here */ + unsigned long vm_pgoff; /* the offset in vm_file corresponding to vm_start */ + struct file *vm_file; /* the backing file or NULL */ ++#if 1 /* IS_ENABLED(CONFIG_AUFS_FS) */ ++ struct file *vm_prfile; /* the virtual backing file or NULL */ ++#endif + + int vm_usage; /* region usage count (access under nommu_region_sem) */ + bool vm_icache_flushed : 1; /* true if the icache has been flushed for +@@ -691,6 +694,9 @@ struct vm_area_struct { + unsigned long vm_pgoff; /* Offset (within vm_file) in PAGE_SIZE + units */ + struct file * vm_file; /* File we map to (can be NULL). */ ++#if 1 /* IS_ENABLED(CONFIG_AUFS_FS) */ ++ struct file *vm_prfile; /* shadow of vm_file */ ++#endif + void * vm_private_data; /* was vm_pte (shared mem) */ + + #ifdef CONFIG_ANON_VMA_NAME +diff --git a/kernel/fork.c b/kernel/fork.c +index 47ff3b35352e..41a80f248514 100644 +--- a/kernel/fork.c ++++ b/kernel/fork.c +@@ -716,7 +716,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, + if (file) { + struct address_space *mapping = file->f_mapping; + +- get_file(file); ++ vma_get_file(tmp); + i_mmap_lock_write(mapping); + if (vma_is_shared_maywrite(tmp)) + mapping_allow_writable(mapping); +diff --git a/mm/Makefile b/mm/Makefile +index e4b5b75aaec9..d69ba9efb769 100644 +--- a/mm/Makefile ++++ b/mm/Makefile +@@ -134,3 +134,4 @@ obj-$(CONFIG_IO_MAPPING) += io-mapping.o + obj-$(CONFIG_HAVE_BOOTMEM_INFO_NODE) += bootmem_info.o + obj-$(CONFIG_GENERIC_IOREMAP) += ioremap.o + obj-$(CONFIG_SHRINKER_DEBUG) += shrinker_debug.o ++obj-y += prfile.o +diff --git a/mm/filemap.c b/mm/filemap.c +index 750e779c23db..b84a752ff676 100644 +--- a/mm/filemap.c ++++ b/mm/filemap.c +@@ -3587,7 +3587,7 @@ vm_fault_t filemap_page_mkwrite(struct vm_fault *vmf) + vm_fault_t ret = VM_FAULT_LOCKED; + + sb_start_pagefault(mapping->host->i_sb); +- file_update_time(vmf->vma->vm_file); ++ vma_file_update_time(vmf->vma); + folio_lock(folio); + if (folio->mapping != mapping) { + folio_unlock(folio); +diff --git a/mm/mmap.c b/mm/mmap.c +index b78e83d351d2..e2ae3999a51c 100644 +--- a/mm/mmap.c ++++ b/mm/mmap.c +@@ -140,7 +140,7 @@ static void remove_vma(struct vm_area_struct *vma, bool unreachable) + if (vma->vm_ops && vma->vm_ops->close) + vma->vm_ops->close(vma); + if (vma->vm_file) +- fput(vma->vm_file); ++ vma_fput(vma); + mpol_put(vma_policy(vma)); + if (unreachable) + __vm_area_free(vma); +@@ -554,7 +554,7 @@ static inline void vma_complete(struct vma_prepare *vp, + if (vp->file) { + uprobe_munmap(vp->remove, vp->remove->vm_start, + vp->remove->vm_end); +- fput(vp->file); ++ vma_fput(vp->vma); + } + if (vp->remove->anon_vma) + anon_vma_merge(vp->vma, vp->remove); +@@ -2355,7 +2355,7 @@ static int __split_vma(struct vma_iterator *vmi, struct vm_area_struct *vma, + goto out_free_mpol; + + if (new->vm_file) +- get_file(new->vm_file); ++ vma_get_file(new); + + if (new->vm_ops && new->vm_ops->open) + new->vm_ops->open(new); +@@ -2853,7 +2853,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, + * and cause general protection fault + * ultimately. + */ +- fput(vma->vm_file); ++ vma_fput(vma); + vm_area_free(vma); + vma = merge; + /* Update vm_flags to pick up the change. */ +@@ -2948,7 +2948,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, + + if (file || vma->vm_file) { + unmap_and_free_vma: +- fput(vma->vm_file); ++ vma_fput(vma); + vma->vm_file = NULL; + + vma_iter_set(&vmi, vma->vm_end); +@@ -3010,6 +3010,9 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, + unsigned long populate = 0; + unsigned long ret = -EINVAL; + struct file *file; ++#if 1 /* IS_ENABLED(CONFIG_AUFS_FS) */ ++ struct file *prfile; ++#endif + + pr_warn_once("%s (%d) uses deprecated remap_file_pages() syscall. See Documentation/mm/remap_file_pages.rst.\n", + current->comm, current->pid); +@@ -3068,10 +3071,34 @@ SYSCALL_DEFINE5(remap_file_pages, unsigned long, start, unsigned long, size, + if (vma->vm_flags & VM_LOCKED) + flags |= MAP_LOCKED; + ++#if 1 /* IS_ENABLED(CONFIG_AUFS_FS) */ ++ vma_get_file(vma); ++ file = vma->vm_file; ++ prfile = vma->vm_prfile; ++ ret = do_mmap(vma->vm_file, start, size, ++ prot, flags, pgoff, &populate, NULL); ++ if (!IS_ERR_VALUE(ret) && file && prfile) { ++ struct vm_area_struct *new_vma; ++ ++ new_vma = find_vma(mm, ret); ++ if (!new_vma->vm_prfile) ++ new_vma->vm_prfile = prfile; ++ if (prfile) ++ get_file(prfile); ++ } ++ /* ++ * two fput()s instead of vma_fput(vma), ++ * coz vma may not be available anymore. ++ */ ++ fput(file); ++ if (prfile) ++ fput(prfile); ++#else + file = get_file(vma->vm_file); + ret = do_mmap(vma->vm_file, start, size, + prot, flags, 0, pgoff, &populate, NULL); + fput(file); ++#endif /* CONFIG_AUFS_FS */ + out: + mmap_write_unlock(mm); + if (populate) +@@ -3418,7 +3445,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, + if (anon_vma_clone(new_vma, vma)) + goto out_free_mempol; + if (new_vma->vm_file) +- get_file(new_vma->vm_file); ++ vma_get_file(new_vma); + if (new_vma->vm_ops && new_vma->vm_ops->open) + new_vma->vm_ops->open(new_vma); + if (vma_link(mm, new_vma)) +@@ -3432,7 +3459,7 @@ struct vm_area_struct *copy_vma(struct vm_area_struct **vmap, + new_vma->vm_ops->close(new_vma); + + if (new_vma->vm_file) +- fput(new_vma->vm_file); ++ vma_fput(new_vma); + + unlink_anon_vmas(new_vma); + out_free_mempol: +diff --git a/mm/nommu.c b/mm/nommu.c +index b6dc558d3144..d96655486468 100644 +--- a/mm/nommu.c ++++ b/mm/nommu.c +@@ -523,7 +523,7 @@ static void __put_nommu_region(struct vm_region *region) + up_write(&nommu_region_sem); + + if (region->vm_file) +- fput(region->vm_file); ++ vmr_fput(region); + + /* IO memory and memory shared directly out of the pagecache + * from ramfs/tmpfs mustn't be released here */ +@@ -603,7 +603,7 @@ static void delete_vma(struct mm_struct *mm, struct vm_area_struct *vma) + if (vma->vm_ops && vma->vm_ops->close) + vma->vm_ops->close(vma); + if (vma->vm_file) +- fput(vma->vm_file); ++ vma_fput(vma); + put_nommu_region(vma->vm_region); + vm_area_free(vma); + } +@@ -1135,7 +1135,7 @@ unsigned long do_mmap(struct file *file, + goto error_just_free; + } + } +- fput(region->vm_file); ++ vmr_fput(region); + kmem_cache_free(vm_region_jar, region); + region = pregion; + result = start; +@@ -1221,10 +1221,10 @@ unsigned long do_mmap(struct file *file, + error: + vma_iter_free(&vmi); + if (region->vm_file) +- fput(region->vm_file); ++ vmr_fput(region); + kmem_cache_free(vm_region_jar, region); + if (vma->vm_file) +- fput(vma->vm_file); ++ vma_fput(vma); + vm_area_free(vma); + return ret; + +diff --git a/mm/prfile.c b/mm/prfile.c +new file mode 100644 +index 000000000000..8f820a235364 +--- /dev/null ++++ b/mm/prfile.c +@@ -0,0 +1,86 @@ ++// SPDX-License-Identifier: GPL-2.0 ++/* ++ * Mainly for aufs which mmap(2) different file and wants to print different ++ * path in /proc/PID/maps. ++ * Call these functions via macros defined in linux/mm.h. ++ * ++ * See Documentation/filesystems/aufs/design/06mmap.txt ++ * ++ * Copyright (c) 2014-2022 Junjro R. Okajima ++ * Copyright (c) 2014 Ian Campbell ++ */ ++ ++#include <linux/mm.h> ++#include <linux/file.h> ++#include <linux/fs.h> ++ ++/* #define PRFILE_TRACE */ ++static inline void prfile_trace(struct file *f, struct file *pr, ++ const char func[], int line, const char func2[]) ++{ ++#ifdef PRFILE_TRACE ++ if (pr) ++ pr_info("%s:%d: %s, %pD2\n", func, line, func2, f); ++#endif ++} ++ ++void vma_do_file_update_time(struct vm_area_struct *vma, const char func[], ++ int line) ++{ ++ struct file *f = vma->vm_file, *pr = vma->vm_prfile; ++ ++ prfile_trace(f, pr, func, line, __func__); ++ file_update_time(f); ++ if (f && pr) ++ file_update_time(pr); ++} ++ ++struct file *vma_do_pr_or_file(struct vm_area_struct *vma, const char func[], ++ int line) ++{ ++ struct file *f = vma->vm_file, *pr = vma->vm_prfile; ++ ++ prfile_trace(f, pr, func, line, __func__); ++ return (f && pr) ? pr : f; ++} ++ ++void vma_do_get_file(struct vm_area_struct *vma, const char func[], int line) ++{ ++ struct file *f = vma->vm_file, *pr = vma->vm_prfile; ++ ++ prfile_trace(f, pr, func, line, __func__); ++ get_file(f); ++ if (f && pr) ++ get_file(pr); ++} ++ ++void vma_do_fput(struct vm_area_struct *vma, const char func[], int line) ++{ ++ struct file *f = vma->vm_file, *pr = vma->vm_prfile; ++ ++ prfile_trace(f, pr, func, line, __func__); ++ fput(f); ++ if (f && pr) ++ fput(pr); ++} ++ ++#ifndef CONFIG_MMU ++struct file *vmr_do_pr_or_file(struct vm_region *region, const char func[], ++ int line) ++{ ++ struct file *f = region->vm_file, *pr = region->vm_prfile; ++ ++ prfile_trace(f, pr, func, line, __func__); ++ return (f && pr) ? pr : f; ++} ++ ++void vmr_do_fput(struct vm_region *region, const char func[], int line) ++{ ++ struct file *f = region->vm_file, *pr = region->vm_prfile; ++ ++ prfile_trace(f, pr, func, line, __func__); ++ fput(f); ++ if (f && pr) ++ fput(pr); ++} ++#endif /* !CONFIG_MMU */ +-- +2.39.2 + diff --git a/features/aufs/aufs6-standalone.patch b/features/aufs/aufs6-standalone.patch new file mode 100644 index 00000000..d7ceb50a --- /dev/null +++ b/features/aufs/aufs6-standalone.patch @@ -0,0 +1,266 @@ +From da930b7640bef946a6d703e28ec8c8d785245ab1 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Thu, 21 Sep 2023 17:50:11 -0400 +Subject: [PATCH 4/8] aufs6: standalone + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/dcache.c | 2 ++ + fs/exec.c | 1 + + fs/fcntl.c | 1 + + fs/file_table.c | 1 + + fs/namespace.c | 3 +++ + fs/notify/group.c | 1 + + fs/open.c | 1 + + fs/read_write.c | 2 ++ + fs/splice.c | 1 + + fs/xattr.c | 1 + + kernel/locking/lockdep.c | 1 + + kernel/task_work.c | 1 + + security/security.c | 8 ++++++++ + 13 files changed, 24 insertions(+) + +diff --git a/fs/dcache.c b/fs/dcache.c +index 6c930ceed526..576ad162cdec 100644 +--- a/fs/dcache.c ++++ b/fs/dcache.c +@@ -1450,6 +1450,7 @@ void d_walk(struct dentry *parent, void *data, + seq = 1; + goto again; + } ++EXPORT_SYMBOL_GPL(d_walk); + + struct check_mount { + struct vfsmount *mnt; +@@ -3051,6 +3052,7 @@ void d_exchange(struct dentry *dentry1, struct dentry *dentry2) + + write_sequnlock(&rename_lock); + } ++EXPORT_SYMBOL_GPL(d_exchange); + + /** + * d_ancestor - search for an ancestor +diff --git a/fs/exec.c b/fs/exec.c +index 6518e33ea813..b67efac6a1ad 100644 +--- a/fs/exec.c ++++ b/fs/exec.c +@@ -112,6 +112,7 @@ bool path_noexec(const struct path *path) + return (path->mnt->mnt_flags & MNT_NOEXEC) || + (path->mnt->mnt_sb->s_iflags & SB_I_NOEXEC); + } ++EXPORT_SYMBOL_GPL(path_noexec); + + #ifdef CONFIG_USELIB + /* +diff --git a/fs/fcntl.c b/fs/fcntl.c +index 84a52a8eec92..fdd334fc02fb 100644 +--- a/fs/fcntl.c ++++ b/fs/fcntl.c +@@ -87,6 +87,7 @@ int setfl(int fd, struct file *filp, unsigned int arg) + out: + return error; + } ++EXPORT_SYMBOL_GPL(setfl); + + static void f_modown(struct file *filp, struct pid *pid, enum pid_type type, + int force) +diff --git a/fs/file_table.c b/fs/file_table.c +index ee21b3da9d08..c45ac36795dd 100644 +--- a/fs/file_table.c ++++ b/fs/file_table.c +@@ -225,6 +225,7 @@ struct file *alloc_empty_file(int flags, const struct cred *cred) + } + return ERR_PTR(-ENFILE); + } ++EXPORT_SYMBOL_GPL(alloc_empty_file); + + /* + * Variant of alloc_empty_file() that doesn't check and modify nr_files. +diff --git a/fs/namespace.c b/fs/namespace.c +index 6c57487f126b..16be9ac1c734 100644 +--- a/fs/namespace.c ++++ b/fs/namespace.c +@@ -466,6 +466,7 @@ void __mnt_drop_write(struct vfsmount *mnt) + mnt_dec_writers(real_mount(mnt)); + preempt_enable(); + } ++EXPORT_SYMBOL_GPL(__mnt_drop_write); + + /** + * mnt_drop_write - give up write access to a mount +@@ -877,6 +878,7 @@ int is_current_mnt_ns(struct vfsmount *mnt) + { + return check_mnt(real_mount(mnt)); + } ++EXPORT_SYMBOL_GPL(is_current_mnt_ns); + + /* + * vfsmount lock must be held for write +@@ -2152,6 +2154,7 @@ int iterate_mounts(int (*f)(struct vfsmount *, void *), void *arg, + } + return 0; + } ++EXPORT_SYMBOL_GPL(iterate_mounts); + + static void lock_mnt_tree(struct mount *mnt) + { +diff --git a/fs/notify/group.c b/fs/notify/group.c +index 1de6631a3925..3008eb37a18d 100644 +--- a/fs/notify/group.c ++++ b/fs/notify/group.c +@@ -100,6 +100,7 @@ void fsnotify_get_group(struct fsnotify_group *group) + { + refcount_inc(&group->refcnt); + } ++EXPORT_SYMBOL_GPL(fsnotify_get_group); + + /* + * Drop a reference to a group. Free it if it's through. +diff --git a/fs/open.c b/fs/open.c +index 98f6601fbac6..8624e4ffa15b 100644 +--- a/fs/open.c ++++ b/fs/open.c +@@ -67,6 +67,7 @@ int do_truncate(struct mnt_idmap *idmap, struct dentry *dentry, + inode_unlock(dentry->d_inode); + return ret; + } ++EXPORT_SYMBOL_GPL(do_truncate); + + long vfs_truncate(const struct path *path, loff_t length) + { +diff --git a/fs/read_write.c b/fs/read_write.c +index 4771701c896b..c79270aba792 100644 +--- a/fs/read_write.c ++++ b/fs/read_write.c +@@ -477,6 +477,7 @@ ssize_t vfs_read(struct file *file, char __user *buf, size_t count, loff_t *pos) + inc_syscr(current); + return ret; + } ++EXPORT_SYMBOL_GPL(vfs_read); + + static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t len, loff_t *ppos) + { +@@ -592,6 +593,7 @@ ssize_t vfs_write(struct file *file, const char __user *buf, size_t count, loff_ + file_end_write(file); + return ret; + } ++EXPORT_SYMBOL_GPL(vfs_write); + + /* file_ppos returns &file->f_pos or NULL if file is stream */ + static inline loff_t *file_ppos(struct file *file) +diff --git a/fs/splice.c b/fs/splice.c +index 7216ef993b5f..7ce1f1bc4268 100644 +--- a/fs/splice.c ++++ b/fs/splice.c +@@ -932,6 +932,7 @@ long do_splice_from(struct pipe_inode_info *pipe, struct file *out, + return warn_unsupported(out, "write"); + return out->f_op->splice_write(pipe, out, ppos, len, flags); + } ++EXPORT_SYMBOL_GPL(do_splice_from); + + /* + * Indicate to the caller that there was a premature EOF when reading from the +diff --git a/fs/xattr.c b/fs/xattr.c +index efd4736bc94b..ce1a2c39ab23 100644 +--- a/fs/xattr.c ++++ b/fs/xattr.c +@@ -406,6 +406,7 @@ vfs_getxattr_alloc(struct mnt_idmap *idmap, struct dentry *dentry, + *xattr_value = value; + return error; + } ++EXPORT_SYMBOL_GPL(vfs_getxattr_alloc); + + ssize_t + __vfs_getxattr(struct dentry *dentry, struct inode *inode, const char *name, +diff --git a/kernel/locking/lockdep.c b/kernel/locking/lockdep.c +index db4297f60bd3..9aca18312afb 100644 +--- a/kernel/locking/lockdep.c ++++ b/kernel/locking/lockdep.c +@@ -239,6 +239,7 @@ inline struct lock_class *lockdep_hlock_class(struct held_lock *hlock) + */ + return lock_classes + class_idx; + } ++EXPORT_SYMBOL_GPL(lockdep_hlock_class); + #define hlock_class(hlock) lockdep_hlock_class(hlock) + + #ifdef CONFIG_LOCK_STAT +diff --git a/kernel/task_work.c b/kernel/task_work.c +index 065e1ef8fc8d..c623c6f0c645 100644 +--- a/kernel/task_work.c ++++ b/kernel/task_work.c +@@ -182,3 +182,4 @@ void task_work_run(void) + } while (work); + } + } ++EXPORT_SYMBOL_GPL(task_work_run); +diff --git a/security/security.c b/security/security.c +index 23b129d482a7..fca4c5707a1c 100644 +--- a/security/security.c ++++ b/security/security.c +@@ -1750,6 +1750,7 @@ int security_path_rmdir(const struct path *dir, struct dentry *dentry) + return 0; + return call_int_hook(path_rmdir, 0, dir, dentry); + } ++EXPORT_SYMBOL_GPL(security_path_rmdir); + + /** + * security_path_unlink() - Check if removing a hard link is allowed +@@ -1785,6 +1786,7 @@ int security_path_symlink(const struct path *dir, struct dentry *dentry, + return 0; + return call_int_hook(path_symlink, 0, dir, dentry, old_name); + } ++EXPORT_SYMBOL_GPL(security_path_symlink); + + /** + * security_path_link - Check if creating a hard link is allowed +@@ -1803,6 +1805,7 @@ int security_path_link(struct dentry *old_dentry, const struct path *new_dir, + return 0; + return call_int_hook(path_link, 0, old_dentry, new_dir, new_dentry); + } ++EXPORT_SYMBOL_GPL(security_path_link); + + /** + * security_path_rename() - Check if renaming a file is allowed +@@ -1864,6 +1867,7 @@ int security_path_chmod(const struct path *path, umode_t mode) + return 0; + return call_int_hook(path_chmod, 0, path, mode); + } ++EXPORT_SYMBOL_GPL(security_path_chmod); + + /** + * security_path_chown() - Check if changing the file's owner/group is allowed +@@ -1881,6 +1885,7 @@ int security_path_chown(const struct path *path, kuid_t uid, kgid_t gid) + return 0; + return call_int_hook(path_chown, 0, path, uid, gid); + } ++EXPORT_SYMBOL_GPL(security_path_chown); + + /** + * security_path_chroot() - Check if changing the root directory is allowed +@@ -2110,6 +2115,7 @@ int security_inode_permission(struct inode *inode, int mask) + return 0; + return call_int_hook(inode_permission, 0, inode, mask); + } ++EXPORT_SYMBOL_GPL(security_inode_permission); + + /** + * security_inode_setattr() - Check if setting file attributes is allowed +@@ -2588,6 +2594,7 @@ int security_file_permission(struct file *file, int mask) + + return fsnotify_perm(file, mask); + } ++EXPORT_SYMBOL_GPL(security_file_permission); + + /** + * security_file_alloc() - Allocate and init a file's LSM blob +@@ -2854,6 +2861,7 @@ int security_file_truncate(struct file *file) + { + return call_int_hook(file_truncate, 0, file); + } ++EXPORT_SYMBOL_GPL(security_file_truncate); + + /** + * security_task_alloc() - Allocate a task's LSM blob +-- +2.34.1 + diff --git a/features/bluetooth/bluetooth-vhci.cfg b/features/bluetooth/bluetooth-vhci.cfg new file mode 100644 index 00000000..3f7c7850 --- /dev/null +++ b/features/bluetooth/bluetooth-vhci.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_BT_HCIVHCI=y diff --git a/features/bluetooth/bluetooth-vhci.scc b/features/bluetooth/bluetooth-vhci.scc new file mode 100644 index 00000000..e99f33d5 --- /dev/null +++ b/features/bluetooth/bluetooth-vhci.scc @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable Bluetooth Virtual HCI device driver" +define KFEATURE_COMPATIBILITY all + +include bluetooth.scc + +kconf non-hardware bluetooth-vhci.cfg diff --git a/features/bluetooth/bluetooth.cfg b/features/bluetooth/bluetooth.cfg index 3523b601..171cbe2b 100644 --- a/features/bluetooth/bluetooth.cfg +++ b/features/bluetooth/bluetooth.cfg @@ -1,7 +1,7 @@ # SPDX-License-Identifier: MIT # Dependencies CONFIG_ISDN=y -CONFIG_ISDN_CAPI=m +CONFIG_ISDN_CAPI=y # Features CONFIG_BT=y diff --git a/features/bpf/bpf.cfg b/features/bpf/bpf.cfg index b90e87a5..50c27ceb 100644 --- a/features/bpf/bpf.cfg +++ b/features/bpf/bpf.cfg @@ -3,4 +3,5 @@ CONFIG_BPF=y CONFIG_BPF_SYSCALL=y CONFIG_BPF_JIT=y CONFIG_BPF_EVENTS=y +CONFIG_BPF_UNPRIV_DEFAULT_OFF=y CONFIG_CGROUP_BPF=y diff --git a/features/can/can.cfg b/features/can/can.cfg index a15e6061..d50e8109 100644 --- a/features/can/can.cfg +++ b/features/can/can.cfg @@ -19,8 +19,6 @@ CONFIG_CAN_GS_USB=m CONFIG_CAN_KVASER_USB=m CONFIG_CAN_PEAK_USB=m CONFIG_CAN_8DEV_USB=m -# x86 PCH -#CONFIG_PCH_CAN=m # drivers for ISA/PCI cards CONFIG_CAN_C_CAN_PCI=m # Philips/NXP SJA1000 based PCI(e) diff --git a/features/can/m_can.cfg b/features/can/m_can.cfg new file mode 100644 index 00000000..d89b23aa --- /dev/null +++ b/features/can/m_can.cfg @@ -0,0 +1,5 @@ +CONFIG_CAN=m +CONFIG_CAN_M_CAN=m +CONFIG_CAN_M_CAN_PCI=m +CONFIG_CAN_M_CAN_PLATFORM=m +CONFIG_CAN_M_CAN_TCAN4X5X=m diff --git a/features/can/m_can.scc b/features/can/m_can.scc new file mode 100644 index 00000000..9a169170 --- /dev/null +++ b/features/can/m_can.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable Bosch M_CAN controller support" +define KFEATURE_COMPATIBILITY board + +kconf hardware m_can.cfg diff --git a/features/cgroups/cgroups.cfg b/features/cgroups/cgroups.cfg index 27c78ca9..d2d0c3ea 100644 --- a/features/cgroups/cgroups.cfg +++ b/features/cgroups/cgroups.cfg @@ -1,7 +1,7 @@ # SPDX-License-Identifier: MIT # General controller group CONFIG_CGROUPS=y -CONFIG_CGROUP_DEBUG=y +CONFIG_CGROUP_DEBUG=y CONFIG_CGROUP_FREEZER=y CONFIG_CGROUP_DEVICE=y @@ -13,13 +13,11 @@ CONFIG_CGROUP_NET_PRIO=y CONFIG_CGROUP_PERF=y CONFIG_MEMCG=y -CONFIG_MEMCG_SWAP=y CONFIG_CGROUP_SCHED=y CONFIG_FAIR_GROUP_SCHED=y -CONFIG_RT_GROUP_SCHED=y CONFIG_BLK_CGROUP=y -# CONFIG_DEBUG_BLK_CGROUP is not set +CONFIG_BFQ_CGROUP_DEBUG=n # Namespace controller diff --git a/features/clear_warn_once/clear_warn_once-add-a-clear_warn_once-boot-parameter.patch b/features/clear_warn_once/clear_warn_once-add-a-clear_warn_once-boot-parameter.patch new file mode 100644 index 00000000..8016e2a6 --- /dev/null +++ b/features/clear_warn_once/clear_warn_once-add-a-clear_warn_once-boot-parameter.patch @@ -0,0 +1,75 @@ +From 9ad5defd90591efb015c9a6c59b47108fe68e961 Mon Sep 17 00:00:00 2001 +From: Paul Gortmaker <paul.gortmaker@windriver.com> +Date: Wed, 16 Dec 2020 12:22:58 -0500 +Subject: [PATCH 3/3] clear_warn_once: add a clear_warn_once= boot parameter + +In the event debugfs is not mounted, or if built with the .config +setting DEBUG_FS_ALLOW_NONE chosen, this gives the sysadmin access +to reset the WARN_ONCE() state on a periodic basis. + +Link: https://lore.kernel.org/r/20201126063029.2030-1-paul.gortmaker@windriver.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + .../admin-guide/kernel-parameters.txt | 8 +++++++ + kernel/panic.c | 21 +++++++++++++++++++ + 2 files changed, 29 insertions(+) + +diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt +index 74ba077e99e5..b0c5a7458c03 100644 +--- a/Documentation/admin-guide/kernel-parameters.txt ++++ b/Documentation/admin-guide/kernel-parameters.txt +@@ -5352,6 +5352,14 @@ + vt.underline= [VT] Default color for underlined text; 0-15. + Default: 3 = cyan. + ++ clear_warn_once= ++ [KNL] ++ Set the WARN_ONCE reset period in minutes. Normally ++ a WARN_ONCE() will only ever emit a message once per ++ boot, but for example, setting this to 60 would ++ effectively rate-limit WARN_ONCE to once per hour. ++ Default: 0 = never. ++ + watchdog timers [HW,WDT] For information on watchdog timers, + see Documentation/watchdog/watchdog-parameters.rst + or other driver-specific files in the +diff --git a/kernel/panic.c b/kernel/panic.c +index e3a462e39062..f4f3633f4f69 100644 +--- a/kernel/panic.c ++++ b/kernel/panic.c +@@ -697,10 +697,31 @@ static __init int register_warn_debugfs(void) + /* Don't care about failure */ + debugfs_create_file_unsafe("clear_warn_once", 0600, NULL, + &clear_warn_once, &clear_warn_once_fops); ++ ++ /* if a bootarg was used, set the initial timer */ ++ if (clear_warn_once) ++ warn_once_set(NULL, clear_warn_once); ++ + return 0; + } + + device_initcall(register_warn_debugfs); ++ ++static int __init warn_once_setup(char *s) ++{ ++ int r; ++ ++ if (!s) ++ return -EINVAL; ++ ++ r = kstrtoull(s, 0, &clear_warn_once); ++ if (r) ++ return r; ++ ++ return 1; ++} ++__setup("clear_warn_once=", warn_once_setup); ++ + #endif + + #ifdef CONFIG_STACKPROTECTOR +-- +2.19.1 + diff --git a/features/clear_warn_once/clear_warn_once-bind-a-timer-to-written-reset-value.patch b/features/clear_warn_once/clear_warn_once-bind-a-timer-to-written-reset-value.patch new file mode 100644 index 00000000..63053deb --- /dev/null +++ b/features/clear_warn_once/clear_warn_once-bind-a-timer-to-written-reset-value.patch @@ -0,0 +1,104 @@ +From fbda05a6df0125f733e0e28a3e0ae60bb6765d51 Mon Sep 17 00:00:00 2001 +From: Paul Gortmaker <paul.gortmaker@windriver.com> +Date: Wed, 16 Dec 2020 12:22:57 -0500 +Subject: [PATCH 2/3] clear_warn_once: bind a timer to written reset value + +Existing documentation has a write of "1" to clear/reset all the +WARN_ONCE and similar to the as-booted state, so they can possibly +be re-triggered again during debugging/testing. + +But having them auto-reset once a day, or once a week, might shed +valuable information to a sysadmin on what the system is doing while +trying to debug an issue. + +Here we extend the existing debugfs variable to bind a timer to the +written value N, so that it will reset every N minutes, for N>1. +Writing a zero will clear any previously set timer value. + +The pre-existing behaviour of writing N=1 will do a one-shot clear. + +Link: https://lore.kernel.org/r/20201126063029.2030-1-paul.gortmaker@windriver.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + .../admin-guide/clearing-warn-once.rst | 9 ++++++ + kernel/panic.c | 32 +++++++++++++++++++ + 2 files changed, 41 insertions(+) + +diff --git a/Documentation/admin-guide/clearing-warn-once.rst b/Documentation/admin-guide/clearing-warn-once.rst +index 211fd926cf00..8d058bbc0859 100644 +--- a/Documentation/admin-guide/clearing-warn-once.rst ++++ b/Documentation/admin-guide/clearing-warn-once.rst +@@ -7,3 +7,12 @@ echo 1 > /sys/kernel/debug/clear_warn_once + + clears the state and allows the warnings to print once again. + This can be useful after test suite runs to reproduce problems. ++ ++Values greater than one set a timer for a periodic state reset; e.g. ++ ++echo 60 > /sys/kernel/debug/clear_warn_once ++ ++will establish an hourly state reset, effectively turning WARN_ONCE ++into a long period rate-limited warning. ++ ++Writing a value of zero (or one) will remove any previously set timer. +diff --git a/kernel/panic.c b/kernel/panic.c +index 53088219d7df..e3a462e39062 100644 +--- a/kernel/panic.c ++++ b/kernel/panic.c +@@ -636,6 +636,7 @@ EXPORT_SYMBOL(__warn_printk); + /* Support resetting WARN*_ONCE state */ + + static u64 clear_warn_once; ++static bool warn_timer_active; + + static void do_clear_warn_once(void) + { +@@ -643,6 +644,14 @@ static void do_clear_warn_once(void) + memset(__start_once, 0, __end_once - __start_once); + } + ++static void timer_warn_once(struct timer_list *timer) ++{ ++ do_clear_warn_once(); ++ timer->expires = jiffies + clear_warn_once * HZ * 60; ++ add_timer(timer); ++} ++static DEFINE_TIMER(warn_reset_timer, timer_warn_once); ++ + static int warn_once_get(void *data, u64 *val) + { + *val = clear_warn_once; +@@ -653,6 +662,29 @@ static int warn_once_set(void *data, u64 val) + { + clear_warn_once = val; + ++ if (val > 1) { /* set/reset new timer */ ++ unsigned long expires = jiffies + val * HZ * 60; ++ ++ if (warn_timer_active) { ++ mod_timer(&warn_reset_timer, expires); ++ } else { ++ warn_timer_active = 1; ++ warn_reset_timer.expires = expires; ++ add_timer(&warn_reset_timer); ++ } ++ return 0; ++ } ++ ++ if (warn_timer_active) { ++ del_timer_sync(&warn_reset_timer); ++ warn_timer_active = 0; ++ } ++ clear_warn_once = 0; ++ ++ if (val == 0) /* cleared timer, we are done */ ++ return 0; ++ ++ /* Getting here means val == 1 ---> so clear existing data */ + do_clear_warn_once(); + return 0; + } +-- +2.19.1 + diff --git a/features/clear_warn_once/clear_warn_once-expand-debugfs-to-include-read-suppo.patch b/features/clear_warn_once/clear_warn_once-expand-debugfs-to-include-read-suppo.patch new file mode 100644 index 00000000..c1a46aa5 --- /dev/null +++ b/features/clear_warn_once/clear_warn_once-expand-debugfs-to-include-read-suppo.patch @@ -0,0 +1,77 @@ +From 2365198f516a84982bca08e7b3f862d264b7a17e Mon Sep 17 00:00:00 2001 +From: Paul Gortmaker <paul.gortmaker@windriver.com> +Date: Wed, 16 Dec 2020 12:22:56 -0500 +Subject: [PATCH 1/3] clear_warn_once: expand debugfs to include read support + +The existing clear_warn_once variable is write-only; used as per the +documentation to reset the warn_once to as-booted state with: + + echo 1 > /sys/kernel/debug/clear_warn_once + +The objective is to expand on that functionality, which requires the +debugfs variable to be read/write and not just write-only. + +Here, we deal with the debugfs boilerplate associated with converting +it from write-only to read-write, in order to factor that out for easier +review, and for what may be a possible future useful bisect point. + +Existing functionality is unchanged - the only difference is that we +have tied in a variable that lets you now read the variable and see +the last value written. + +Link: https://lore.kernel.org/r/20201126063029.2030-1-paul.gortmaker@windriver.com +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + kernel/panic.c | 25 ++++++++++++++++++++----- + 1 file changed, 20 insertions(+), 5 deletions(-) + +diff --git a/kernel/panic.c b/kernel/panic.c +index f470a038b05b..53088219d7df 100644 +--- a/kernel/panic.c ++++ b/kernel/panic.c +@@ -635,21 +635,36 @@ EXPORT_SYMBOL(__warn_printk); + + /* Support resetting WARN*_ONCE state */ + +-static int clear_warn_once_set(void *data, u64 val) ++static u64 clear_warn_once; ++ ++static void do_clear_warn_once(void) + { + generic_bug_clear_once(); + memset(__start_once, 0, __end_once - __start_once); ++} ++ ++static int warn_once_get(void *data, u64 *val) ++{ ++ *val = clear_warn_once; ++ return 0; ++} ++ ++static int warn_once_set(void *data, u64 val) ++{ ++ clear_warn_once = val; ++ ++ do_clear_warn_once(); + return 0; + } + +-DEFINE_DEBUGFS_ATTRIBUTE(clear_warn_once_fops, NULL, clear_warn_once_set, +- "%lld\n"); ++DEFINE_DEBUGFS_ATTRIBUTE(clear_warn_once_fops, warn_once_get, warn_once_set, ++ "%llu\n"); + + static __init int register_warn_debugfs(void) + { + /* Don't care about failure */ +- debugfs_create_file_unsafe("clear_warn_once", 0200, NULL, NULL, +- &clear_warn_once_fops); ++ debugfs_create_file_unsafe("clear_warn_once", 0600, NULL, ++ &clear_warn_once, &clear_warn_once_fops); + return 0; + } + +-- +2.19.1 + diff --git a/features/clear_warn_once/clear_warn_once.scc b/features/clear_warn_once/clear_warn_once.scc new file mode 100644 index 00000000..d5e0e017 --- /dev/null +++ b/features/clear_warn_once/clear_warn_once.scc @@ -0,0 +1,4 @@ +patch clear_warn_once-expand-debugfs-to-include-read-suppo.patch +patch clear_warn_once-bind-a-timer-to-written-reset-value.patch +patch clear_warn_once-add-a-clear_warn_once-boot-parameter.patch +patch sched-isolation-really-align-nohz_full-with-rcu_nocb.patch diff --git a/features/clear_warn_once/sched-isolation-really-align-nohz_full-with-rcu_nocb.patch b/features/clear_warn_once/sched-isolation-really-align-nohz_full-with-rcu_nocb.patch new file mode 100644 index 00000000..35145584 --- /dev/null +++ b/features/clear_warn_once/sched-isolation-really-align-nohz_full-with-rcu_nocb.patch @@ -0,0 +1,88 @@ +Date: Mon, 21 Feb 2022 13:20:08 -0500 +Subject: [PATCH 1/2] sched/isolation: really align nohz_full with rcu_nocbs +From: Paul Gortmaker <paul.gortmaker@windriver.com> +To: linux-kernel@vger.kernel.org, Frederic Weisbecker <fweisbec@gmail.com>, + Peter Zijlstra <peterz@infradead.org> +CC: Paul Gortmaker <paul.gortmaker@windriver.com>, Thomas Gleixner + <tglx@linutronix.de>, "Paul E . McKenney" <paulmck@kernel.org>, Ingo Molnar + <mingo@kernel.org> +X-Mailer: git-send-email 2.17.1 +MIME-Version: 1.0 +Content-Transfer-Encoding: 8bit +Content-Type: text/plain; charset=utf-8 + +At the moment it is currently possible to sneak a core into nohz_full +that lies between nr_possible and NR_CPUS - but you won't "see" it +because cpumask_pr_args() implicitly hides anything above nr_cpu_ids. + +This becomes a problem when the nohz_full CPU set doesn't contain at +least one other valid nohz CPU - in which case we end up with the +tick_nohz_full_running set and no tick core specified, which trips an +endless sequence of WARN() and renders the machine unusable. + +I inadvertently opened the door for this when fixing an overly +restrictive nohz_full conditional in the below Fixes: commit - and then +courtesy of my optimistic ACPI reporting nr_possible of 64 (the default +Kconfig for NR_CPUS) and the not-so helpful implict filtering done by +cpumask_pr_args, I unfortunately did not spot it during my testing. + +So here, I don't rely on what was printed anymore, but code exactly what +our restrictions should be in order to be aligned with rcu_nocbs - which +was the original goal. Since the checks lie in "__init" code it is largely +free for us to do this anyway. + +Building with NOHZ_FULL and NR_CPUS=128 on an otherwise defconfig, and +booting with "rcu_nocbs=8-127 nohz_full=96-127" on the same 16 core T5500 +Dell machine now results in the following (only relevant lines shown): + + smpboot: Allowing 64 CPUs, 48 hotplug CPUs + setup_percpu: NR_CPUS:128 nr_cpumask_bits:128 nr_cpu_ids:64 nr_node_ids:2 + housekeeping: kernel parameter 'nohz_full=' or 'isolcpus=' contains nonexistent CPUs. + housekeeping: kernel parameter 'nohz_full=' or 'isolcpus=' has no valid CPUs. + rcu: RCU restricting CPUs from NR_CPUS=128 to nr_cpu_ids=64. + rcu: Note: kernel parameter 'rcu_nocbs=', 'nohz_full', or 'isolcpus=' contains nonexistent CPUs. + rcu: Offload RCU callbacks from CPUs: 8-63. + +One can see both new housekeeping checks are triggered in the above. +The same invalid boot arg combination would have previously resulted in +an infinitely scrolling mix of WARN from all cores per tick on this box. + +We may need to revisit these sanity checks when nohz_full is accepted as +a stand alone keyword "enable" w/o a cpuset (see rcu/nohz d2cf0854d728). + +Fixes: 915a2bc3c6b7 ("sched/isolation: Reconcile rcu_nocbs= and nohz_full=") +Cc: Frederic Weisbecker <fweisbec@gmail.com> +Cc: Peter Zijlstra <peterz@infradead.org> +Cc: Thomas Gleixner <tglx@linutronix.de> +Cc: Paul E. McKenney <paulmck@kernel.org> +Cc: Ingo Molnar <mingo@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> +--- + kernel/sched/isolation.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/kernel/sched/isolation.c b/kernel/sched/isolation.c +index b4d10815c45a..f7d2406c1f1d 100644 +--- a/kernel/sched/isolation.c ++++ b/kernel/sched/isolation.c +@@ -126,6 +126,17 @@ static int __init housekeeping_setup(char *str, unsigned long flags) + goto free_non_housekeeping_mask; + } + ++ if (!cpumask_subset(non_housekeeping_mask, cpu_possible_mask)) { ++ pr_info("housekeeping: kernel parameter 'nohz_full=' or 'isolcpus=' contains nonexistent CPUs.\n"); ++ cpumask_and(non_housekeeping_mask, cpu_possible_mask, ++ non_housekeeping_mask); ++ } ++ ++ if (cpumask_empty(non_housekeeping_mask)) { ++ pr_info("housekeeping: kernel parameter 'nohz_full=' or 'isolcpus=' has no valid CPUs.\n"); ++ goto free_non_housekeeping_mask; ++ } ++ + alloc_bootmem_cpumask_var(&housekeeping_staging); + cpumask_andnot(housekeeping_staging, + cpu_possible_mask, non_housekeeping_mask); +-- +2.17.1 + diff --git a/features/debug/debug-btf.cfg b/features/debug/debug-btf.cfg new file mode 100644 index 00000000..59df424f --- /dev/null +++ b/features/debug/debug-btf.cfg @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT +CONFIG_DEBUG_INFO_BTF=y +CONFIG_MODULE_ALLOW_BTF_MISMATCH=y diff --git a/features/debug/debug-btf.scc b/features/debug/debug-btf.scc new file mode 100644 index 00000000..57dfb930 --- /dev/null +++ b/features/debug/debug-btf.scc @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable BTF debug" +define KFEATURE_COMPATIBILITY all + +include debug-kernel.scc +kconf non-hardware debug-btf.cfg diff --git a/features/debug/debug-kernel.cfg b/features/debug/debug-kernel.cfg index 53fcbf0a..048ed3d9 100644 --- a/features/debug/debug-kernel.cfg +++ b/features/debug/debug-kernel.cfg @@ -1,4 +1,4 @@ # SPDX-License-Identifier: MIT CONFIG_DEBUG_KERNEL=y +CONFIG_DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT=y CONFIG_DEBUG_INFO=y -CONFIG_DEBUG_PREEMPT=y diff --git a/features/debug/debug-runtime.cfg b/features/debug/debug-runtime.cfg new file mode 100644 index 00000000..344bad2f --- /dev/null +++ b/features/debug/debug-runtime.cfg @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT +CONFIG_DEBUG_KERNEL=y +CONFIG_DEBUG_PREEMPT=y +CONFIG_LOCK_DEBUGGING_SUPPORT=y +CONFIG_PROVE_LOCKING=y +CONFIG_DEBUG_TIMEKEEPING=y
\ No newline at end of file diff --git a/features/debug/debug-runtime.scc b/features/debug/debug-runtime.scc new file mode 100644 index 00000000..2db9a271 --- /dev/null +++ b/features/debug/debug-runtime.scc @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT + +define KFEATURE_DESCRIPTION "Enable kernel reuntime debugging" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware debug-runtime.cfg diff --git a/features/debug/printk.cfg b/features/debug/printk.cfg index 0df20f91..5beb425f 100644 --- a/features/debug/printk.cfg +++ b/features/debug/printk.cfg @@ -5,8 +5,5 @@ CONFIG_PRINTK=y CONFIG_PRINTK_TIME=y -CONFIG_EARLY_PRINTK=y - -CONFIG_EARLY_PRINTK_DBGP=y CONFIG_EFI_EARLYCON=y CONFIG_TTY_PRINTK=y diff --git a/features/device-mapper/dm-verity.cfg b/features/device-mapper/dm-verity.cfg index ca052267..236a9916 100644 --- a/features/device-mapper/dm-verity.cfg +++ b/features/device-mapper/dm-verity.cfg @@ -1,2 +1,4 @@ # SPDX-License-Identifier: MIT +CONFIG_MD=y +CONFIG_BLK_DEV_DM=y CONFIG_DM_VERITY=y diff --git a/features/docker/docker.scc b/features/docker/docker.scc new file mode 100644 index 00000000..2bc55019 --- /dev/null +++ b/features/docker/docker.scc @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT + +define KFEATURE_DESCRIPTION "Enable Features needed by docker in addition to LXC features" +define KFEATURE_COMPATIBILITY board + +include cfg/docker.scc diff --git a/features/drm-bochs/drm-bochs.cfg b/features/drm-bochs/drm-bochs.cfg index 1c37b67d..2d061433 100644 --- a/features/drm-bochs/drm-bochs.cfg +++ b/features/drm-bochs/drm-bochs.cfg @@ -8,11 +8,9 @@ CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y CONFIG_I2C_HELPER_AUTO=y -CONFIG_I2C_ALGOBIT=y CONFIG_DRM=y CONFIG_DRM_KMS_HELPER=y -CONFIG_DRM_KMS_FB_HELPER=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 CONFIG_DRM_TTM=y @@ -22,7 +20,7 @@ CONFIG_DRM_PANEL=y CONFIG_DRM_BRIDGE=y CONFIG_DRM_PANEL_BRIDGE=y CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y -CONFIG_FB_CMDLINE=y +CONFIG_VIDEO_CMDLINE=y CONFIG_FB_NOTIFY=y CONFIG_FB=y CONFIG_FB_CFB_FILLRECT=y diff --git a/features/drm-emgd/drm-emgd.cfg b/features/drm-emgd/drm-emgd.cfg index 13678d58..298549ad 100644 --- a/features/drm-emgd/drm-emgd.cfg +++ b/features/drm-emgd/drm-emgd.cfg @@ -5,11 +5,10 @@ CONFIG_DRM_EGD=m CONFIG_DRM_KMS_HELPER=m CONFIG_I2C=y -CONFIG_VIDEO_V4L2=m +CONFIG_VIDEO_DEV=m CONFIG_VIDEO_IVTV=y CONFIG_MEDIA_SUPPORT=m CONFIG_VIDEO_DEV=m -CONFIG_I2C_ALGOBIT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y CONFIG_FB_CFB_FILLRECT=y diff --git a/features/drm-gma500/drm-gma500.cfg b/features/drm-gma500/drm-gma500.cfg index 3e320e9f..dc26f5d1 100644 --- a/features/drm-gma500/drm-gma500.cfg +++ b/features/drm-gma500/drm-gma500.cfg @@ -1,6 +1,4 @@ # SPDX-License-Identifier: MIT CONFIG_DRM=y -CONFIG_DRM_KMS_HELPER=y +CONFIG_DRM_KMS_HELPER=m CONFIG_DRM_GMA500=m -CONFIG_DRM_GMA600=y -CONFIG_DRM_GMA3600=y diff --git a/features/drm-psb/drm-psb.cfg b/features/drm-psb/drm-psb.cfg index 86e508bd..2af3ab9c 100644 --- a/features/drm-psb/drm-psb.cfg +++ b/features/drm-psb/drm-psb.cfg @@ -3,11 +3,10 @@ CONFIG_DRM=y CONFIG_DRM_PSB=m CONFIG_I2C=y -CONFIG_VIDEO_V4L2=y +CONFIG_VIDEO_DEV=y CONFIG_VIDEO_IVTV=y CONFIG_MEDIA_SUPPORT=y CONFIG_VIDEO_DEV=y -CONFIG_I2C_ALGOBIT=y CONFIG_FB_CFB_COPYAREA=y CONFIG_FB_CFB_IMAGEBLIT=y CONFIG_FB_CFB_FILLRECT=y diff --git a/features/edac/edac-enable.scc b/features/edac/edac-enable.scc index c60d2790..17daf486 100644 --- a/features/edac/edac-enable.scc +++ b/features/edac/edac-enable.scc @@ -2,4 +2,6 @@ define KFEATURE_DESCRIPTION "Enable core EDAC functionality" define KFEATURE_COMPATIBILITY board -kconf hardware edac.cfg +if [ "$KARCH" != "mips" ] || [ "$KMACHINE" = "edgerouter" ]; then + kconf hardware edac.cfg +fi diff --git a/features/edac/edac.cfg b/features/edac/edac.cfg index 9b3d3fc5..4f75d2f8 100644 --- a/features/edac/edac.cfg +++ b/features/edac/edac.cfg @@ -15,3 +15,11 @@ CONFIG_RAS=y CONFIG_EDAC=y CONFIG_EDAC_DEBUG=y +CONFIG_EDAC_SBRIDGE=m +CONFIG_ACPI_APEI=y +CONFIG_ACPI_APEI_EINJ=m +CONFIG_ACPI_APEI_GHES=y +CONFIG_EDAC_PND2=m +CONFIG_EDAC_SKX=m +CONFIG_EDAC_I10NM=m +CONFIG_EDAC_IGEN6=m diff --git a/features/edf/edf.cfg b/features/edf/edf.cfg index 97e4b7cd..531548fb 100644 --- a/features/edf/edf.cfg +++ b/features/edf/edf.cfg @@ -2,4 +2,4 @@ CONFIG_HIGH_RES_TIMERS=y CONFIG_PREEMPT=y CONFIG_HZ_1000=y -# CONFIG_NO_HZ is not set +CONFIG_NO_HZ=n diff --git a/features/eg20t/eg20t.cfg b/features/eg20t/eg20t.cfg index 8bfff936..9c411acf 100644 --- a/features/eg20t/eg20t.cfg +++ b/features/eg20t/eg20t.cfg @@ -30,4 +30,3 @@ CONFIG_GPIO_PCH=y CONFIG_CAN=y CONFIG_CAN_DEV=y -CONFIG_PCH_CAN=y diff --git a/features/f2fs/f2fs.cfg b/features/f2fs/f2fs.cfg new file mode 100644 index 00000000..6b1e6e80 --- /dev/null +++ b/features/f2fs/f2fs.cfg @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: MIT +CONFIG_F2FS_FS=y +CONFIG_F2FS_STAT_FS=y +CONFIG_F2FS_FS_XATTR=y +CONFIG_F2FS_FS_POSIX_ACL=y +CONFIG_F2FS_FS_SECURITY=y +CONFIG_F2FS_CHECK_FS=y +CONFIG_F2FS_FAULT_INJECTION=y diff --git a/features/f2fs/f2fs.scc b/features/f2fs/f2fs.scc new file mode 100644 index 00000000..a070c6bf --- /dev/null +++ b/features/f2fs/f2fs.scc @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +kconf non-hardware f2fs.cfg diff --git a/features/firewire/firewire.cfg b/features/firewire/firewire.cfg index 5006e4f3..9dbe643c 100644 --- a/features/firewire/firewire.cfg +++ b/features/firewire/firewire.cfg @@ -3,14 +3,14 @@ CONFIG_FIREWIRE=m CONFIG_FIREWIRE_OHCI=m CONFIG_FIREWIRE_SBP2=m CONFIG_FIREWIRE_NET=m -# CONFIG_DVB_FIREDTV is not set +CONFIG_DVB_FIREDTV=n CONFIG_SND_FIREWIRE=y CONFIG_SND_FIREWIRE_LIB=m CONFIG_SND_DICE=m -# CONFIG_SND_OXFW is not set -# CONFIG_SND_ISIGHT is not set -# CONFIG_SND_FIREWORKS is not set -# CONFIG_SND_BEBOB is not set -# CONFIG_SND_FIREWIRE_DIGI00X is not set +CONFIG_SND_OXFW=n +CONFIG_SND_ISIGHT=n +CONFIG_SND_FIREWORKS=n +CONFIG_SND_BEBOB=n +CONFIG_SND_FIREWIRE_DIGI00X=n CONFIG_SND_FIREWIRE_TASCAM=m -# CONFIG_FIREWIRE_SERIAL is not set +CONFIG_FIREWIRE_SERIAL=n diff --git a/features/firmware/firmware.cfg b/features/firmware/firmware.cfg index 37c41e91..87bf6153 100644 --- a/features/firmware/firmware.cfg +++ b/features/firmware/firmware.cfg @@ -2,5 +2,8 @@ # # Generic Driver Options # -CONFIG_FW_LOADER=m + +# the dependencies of this are =y, so we can't force this +# to =m. +CONFIG_FW_LOADER=y CONFIG_EXTRA_FIRMWARE="" diff --git a/features/ftrace/ftrace-function-tracer-disable.cfg b/features/ftrace/ftrace-function-tracer-disable.cfg index e60ac8a9..e27cba4b 100644 --- a/features/ftrace/ftrace-function-tracer-disable.cfg +++ b/features/ftrace/ftrace-function-tracer-disable.cfg @@ -1,4 +1,4 @@ # SPDX-License-Identifier: MIT -# CONFIG_FUNCTION_TRACER is not set -# CONFIG_FUNCTION_GRAPH_TRACER is not set -# CONFIG_DYNAMIC_FTRACE is not set +CONFIG_FUNCTION_TRACER=n +CONFIG_FUNCTION_GRAPH_TRACER=n +CONFIG_DYNAMIC_FTRACE=n diff --git a/features/full_nohz/full_nohz.cfg b/features/full_nohz/full_nohz.cfg index fbccdad7..16db2004 100644 --- a/features/full_nohz/full_nohz.cfg +++ b/features/full_nohz/full_nohz.cfg @@ -1,3 +1,3 @@ # SPDX-License-Identifier: MIT CONFIG_NO_HZ_FULL=y -CONFIG_RCU_FAST_NO_HZ=y +CONFIG_RCU_EXPERT=y diff --git a/features/gpio/mockup.cfg b/features/gpio/mockup.cfg new file mode 100644 index 00000000..7242fdb4 --- /dev/null +++ b/features/gpio/mockup.cfg @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT +CONFIG_GPIOLIB=y +CONFIG_GPIO_MOCKUP=m diff --git a/features/gpio/mockup.scc b/features/gpio/mockup.scc new file mode 100644 index 00000000..3ba86d58 --- /dev/null +++ b/features/gpio/mockup.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable support for GPIO testing module" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware mockup.cfg diff --git a/features/gpio/sim.cfg b/features/gpio/sim.cfg new file mode 100644 index 00000000..ce76a1fe --- /dev/null +++ b/features/gpio/sim.cfg @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT + +CONFIG_GPIOLIB=y +CONFIG_GPIO_SIM=m diff --git a/features/gpio/sim.scc b/features/gpio/sim.scc new file mode 100644 index 00000000..d98952dd --- /dev/null +++ b/features/gpio/sim.scc @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT + +define KFEATURE_DESCRIPTION "Enable support for the GPIO simulator module" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware sim.cfg diff --git a/features/gre/gre.cfg b/features/gre/gre.cfg index cd436df7..c713f965 100644 --- a/features/gre/gre.cfg +++ b/features/gre/gre.cfg @@ -4,4 +4,4 @@ CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE_BROADCAST=y CONFIG_IPV6_GRE=m CONFIG_OPENVSWITCH_GRE=y -# CONFIG_PPTP is not set +CONFIG_PPTP=n diff --git a/features/grsec/grsec.cfg b/features/grsec/grsec.cfg index f984225d..b90fb86a 100644 --- a/features/grsec/grsec.cfg +++ b/features/grsec/grsec.cfg @@ -3,16 +3,16 @@ # Grsecurity # CONFIG_GRKERNSEC=y -# CONFIG_GRKERNSEC_LOW is not set -# CONFIG_GRKERNSEC_MEDIUM is not set -# CONFIG_GRKERNSEC_HIGH is not set +CONFIG_GRKERNSEC_LOW=n +CONFIG_GRKERNSEC_MEDIUM=n +CONFIG_GRKERNSEC_HIGH=n CONFIG_GRKERNSEC_CUSTOM=y CONFIG_GRKERNSEC_KMEM=y CONFIG_GRKERNSEC_PROC_MEMMAP=y CONFIG_GRKERNSEC_BRUTE=y CONFIG_GRKERNSEC_MODSTOP=y -# CONFIG_GRKERNSEC_HIDESYM is not set +CONFIG_GRKERNSEC_HIDESYM=n # # Role Based Access Control Options @@ -99,16 +99,16 @@ CONFIG_PAX_RANDKSTACK=y CONFIG_PAX_MEMORY_UDEREF=y CONFIG_GRKERNSEC_IO=y -# CONFIG_GRKERNSEC_MODHARDEN is not set -# CONFIG_GRKERNSEC_NO_RBAC is not set -# CONFIG_GRKERNSEC_ROFS is not set -# CONFIG_GRKERNSEC_AUDIT_PTRACE is not set -# CONFIG_GRKERNSEC_AUDIT_TEXTREL is not set -# CONFIG_GRKERNSEC_HARDEN_PTRACE is not set -# CONFIG_GRKERNSEC_BLACKHOLE is not set -# CONFIG_GRKERNSEC_VM86 is not set -# CONFIG_PAX_MPROTECT_ALLOW_PTRACE is not set -# CONFIG_PAX_SEGMEXEC is not set -# CONFIG_PAX_KERNEXEC is not set -# CONFIG_PAX_NOELFRELOCS is not set -# CONFIG_PAX_USERCOPY is not set +CONFIG_GRKERNSEC_MODHARDEN=n +CONFIG_GRKERNSEC_NO_RBAC=n +CONFIG_GRKERNSEC_ROFS=n +CONFIG_GRKERNSEC_AUDIT_PTRACE=n +CONFIG_GRKERNSEC_AUDIT_TEXTREL=n +CONFIG_GRKERNSEC_HARDEN_PTRACE=n +CONFIG_GRKERNSEC_BLACKHOLE=n +CONFIG_GRKERNSEC_VM86=n +CONFIG_PAX_MPROTECT_ALLOW_PTRACE=n +CONFIG_PAX_SEGMEXEC=n +CONFIG_PAX_KERNEXEC=n +CONFIG_PAX_NOELFRELOCS=n +CONFIG_PAX_USERCOPY=n diff --git a/features/grsec/pax.cfg b/features/grsec/pax.cfg index 6042947a..4ea6b0c3 100644 --- a/features/grsec/pax.cfg +++ b/features/grsec/pax.cfg @@ -7,8 +7,8 @@ CONFIG_PAX=y CONFIG_PAX_SOFTMODE=y CONFIG_PAX_EI_PAX=y CONFIG_PAX_PT_PAX_FLAGS=y -# CONFIG_PAX_NO_ACL_FLAGS is not set -# CONFIG_PAX_HAVE_ACL_FLAGS is not set +CONFIG_PAX_NO_ACL_FLAGS=n +CONFIG_PAX_HAVE_ACL_FLAGS=n CONFIG_PAX_HOOK_ACL_FLAGS=y # @@ -27,7 +27,7 @@ CONFIG_PAX_EMUPLT=y # CONFIG_PAX_ASLR=y CONFIG_PAX_RANDUSTACK=y -# CONFIG_PAX_RANDMMAP is not set +CONFIG_PAX_RANDMMAP=n # # Miscellaneous hardening features diff --git a/features/hid/hid.cfg b/features/hid/hid.cfg new file mode 100644 index 00000000..cfd84dbd --- /dev/null +++ b/features/hid/hid.cfg @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT + +CONFIG_HID_SUPPORT=y +CONFIG_HID=y diff --git a/features/hid/hid.scc b/features/hid/hid.scc new file mode 100644 index 00000000..28d242df --- /dev/null +++ b/features/hid/hid.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable base HID config" +define KFEATURE_COMPATIBILITY board + +kconf hardware hid.cfg diff --git a/features/hostapd/hostapd.scc b/features/hostapd/hostapd.scc index d03b3ce2..aedf9549 100644 --- a/features/hostapd/hostapd.scc +++ b/features/hostapd/hostapd.scc @@ -1,2 +1,2 @@ # SPDX-License-Identifier: MIT -kconf hardware hostapd.cfg +kconf non-hardware hostapd.cfg diff --git a/features/i3c/i3c.cfg b/features/i3c/i3c.cfg new file mode 100644 index 00000000..17f0ce91 --- /dev/null +++ b/features/i3c/i3c.cfg @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT +CONFIG_I3C=m +CONFIG_CDNS_I3C_MASTER=m +CONFIG_DW_I3C_MASTER=m +CONFIG_SVC_I3C_MASTER=m +CONFIG_MIPI_I3C_HCI=m diff --git a/features/i3c/i3c.scc b/features/i3c/i3c.scc new file mode 100644 index 00000000..f5615e88 --- /dev/null +++ b/features/i3c/i3c.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable I3C Support" +define KFEATURE_COMPATIBILITY board + +kconf hardware i3c.cfg diff --git a/features/i915/i915.cfg b/features/i915/i915.cfg index 8489fabb..f5e9351a 100644 --- a/features/i915/i915.cfg +++ b/features/i915/i915.cfg @@ -3,12 +3,9 @@ CONFIG_I2C=y CONFIG_I2C_BOARDINFO=y CONFIG_I2C_COMPAT=y CONFIG_I2C_HELPER_AUTO=y -CONFIG_I2C_ALGOBIT=y CONFIG_AGP=y CONFIG_AGP_INTEL=y CONFIG_DRM=y -CONFIG_DRM_KMS_HELPER=y +CONFIG_DRM_KMS_HELPER=m CONFIG_DRM_I915=m -CONFIG_DRM_KMS_FB_HELPER=y -CONFIG_DRM_I915_ALPHA_SUPPORT=y diff --git a/features/ice/ice.cfg b/features/ice/ice.cfg new file mode 100644 index 00000000..855d37ea --- /dev/null +++ b/features/ice/ice.cfg @@ -0,0 +1 @@ +CONFIG_ICE=m diff --git a/features/ice/ice.scc b/features/ice/ice.scc new file mode 100644 index 00000000..e02d0906 --- /dev/null +++ b/features/ice/ice.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Intel(R) Ethernet Connection E800 Series Support" +define KFEATURE_COMPATIBILITY board + +kconf hardware ice.cfg diff --git a/features/ieee802154/ieee802154-hwsim.cfg b/features/ieee802154/ieee802154-hwsim.cfg new file mode 100644 index 00000000..5fe6f5c6 --- /dev/null +++ b/features/ieee802154/ieee802154-hwsim.cfg @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: MIT +# dependencies +CONFIG_MAC802154=y +CONFIG_NETDEVICES=y +CONFIG_IEEE802154=y +CONFIG_IEEE802154_DRIVERS=y + +CONFIG_IEEE802154_HWSIM=y diff --git a/features/ieee802154/ieee802154-hwsim.scc b/features/ieee802154/ieee802154-hwsim.scc new file mode 100644 index 00000000..c29d43f5 --- /dev/null +++ b/features/ieee802154/ieee802154-hwsim.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable simulated radio testing tool for mac802154" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware ieee802154-hwsim.cfg diff --git a/features/igc/igc.cfg b/features/igc/igc.cfg new file mode 100644 index 00000000..946ace52 --- /dev/null +++ b/features/igc/igc.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_IGC=m diff --git a/features/igc/igc.scc b/features/igc/igc.scc new file mode 100644 index 00000000..7b26e476 --- /dev/null +++ b/features/igc/igc.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Intel Ethernet Controller I225-LM/I225-V family" +define KFEATURE_COMPATIBILITY board + +kconf hardware igc.cfg diff --git a/features/ima/ima.cfg b/features/ima/ima.cfg index 1c613636..5fd3288e 100644 --- a/features/ima/ima.cfg +++ b/features/ima/ima.cfg @@ -1,19 +1,34 @@ # SPDX-License-Identifier: MIT CONFIG_IMA=y +CONFIG_IMA_LSM_RULES=y CONFIG_IMA_MEASURE_PCR_IDX=10 -CONFIG_IMA_NG_TEMPLATE=y -CONFIG_IMA_DEFAULT_TEMPLATE="ima-ng" -CONFIG_IMA_DEFAULT_HASH_SHA1=y -CONFIG_IMA_DEFAULT_HASH="sha1" -CONFIG_IMA_APPRAISE=y -CONFIG_IMA_APPRAISE_BOOTPARAM=y -CONFIG_IMA_TRUSTED_KEYRING=y +CONFIG_IMA_SIG_TEMPLATE=y +CONFIG_IMA_DEFAULT_TEMPLATE="ima-sig" +CONFIG_IMA_DEFAULT_HASH_SHA256=y +CONFIG_IMA_DEFAULT_HASH="sha256" +CONFIG_IMA_ARCH_POLICY=y +CONFIG_IMA_APPRAISE_BUILD_POLICY=y +CONFIG_IMA_APPRAISE_REQUIRE_POLICY_SIGS=y +CONFIG_IMA_APPRAISE_SIGNED_INIT=y +CONFIG_IMA_MEASURE_ASYMMETRIC_KEYS=y +CONFIG_IMA_QUEUE_EARLY_BOOT_KEYS=y +CONFIG_IMA_SECURE_AND_OR_TRUSTED_BOOT=y +CONFIG_IMA_KEYRINGS_PERMIT_SIGNED_BY_BUILTIN_OR_SECONDARY=y CONFIG_SIGNATURE=y CONFIG_IMA_WRITE_POLICY=y CONFIG_IMA_READ_POLICY=y -CONFIG_IMA_LOAD_X509=y -CONFIG_IMA_X509_PATH="/etc/keys/x509_ima.der" - -#CONFIG_INTEGRITY_SIGNATURE=y -#CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y -#CONFIG_INTEGRITY_TRUSTED_KEYRING=y +CONFIG_INTEGRITY=y +CONFIG_INTEGRITY_SIGNATURE=y +CONFIG_INTEGRITY_ASYMMETRIC_KEYS=y +CONFIG_INTEGRITY_TRUSTED_KEYRING=y +CONFIG_EVM=y +CONFIG_KEYS=y +CONFIG_ASYMMETRIC_KEY_TYPE=y +CONFIG_SYSTEM_TRUSTED_KEYRING=y +CONFIG_SECONDARY_TRUSTED_KEYRING=y +CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y +CONFIG_X509_CERTIFICATE_PARSER=y +CONFIG_PKCS8_PRIVATE_KEY_PARSER=y +CONFIG_CRYPTO_ECDSA=y +CONFIG_SECURITY=y +CONFIG_SECURITYFS=y diff --git a/features/ima/ima_evm_root_ca.cfg b/features/ima/ima_evm_root_ca.cfg index b4392afb..0761fb28 100644 --- a/features/ima/ima_evm_root_ca.cfg +++ b/features/ima/ima_evm_root_ca.cfg @@ -1,4 +1,4 @@ # SPDX-License-Identifier: MIT -# CONFIG_IMA_APPRAISE_SIGNED_INIT is not set +CONFIG_IMA_APPRAISE_SIGNED_INIT=n CONFIG_EVM_LOAD_X509=y CONFIG_EVM_X509_PATH="/etc/keys/x509_evm.der" diff --git a/features/initramfs/initramfs-add-wrapper.patch b/features/initramfs/initramfs-add-wrapper.patch index 26468afc..29fb9220 100644 --- a/features/initramfs/initramfs-add-wrapper.patch +++ b/features/initramfs/initramfs-add-wrapper.patch @@ -1,4 +1,4 @@ -From 1975393f0ee791bb184a9acfa1108c7578648c84 Mon Sep 17 00:00:00 2001 +From e541445b92cc3750f5376a5998b57ab778f5d410 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield <bruce.ashfield@windriver.com> Date: Mon, 8 Oct 2018 13:33:11 -0400 Subject: [PATCH] initramfs: allow an optional wrapper script around initramfs @@ -15,18 +15,18 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr/Makefile b/usr/Makefile -index 748f6a60bb1e..7dfd8d858244 100644 +index c12e6b15ce72..ed29c43088aa 100644 --- a/usr/Makefile +++ b/usr/Makefile -@@ -24,7 +24,7 @@ $(obj)/initramfs_data.o: $(obj)/$(datafile_y) FORCE - # Generate the initramfs cpio archive +@@ -55,7 +55,7 @@ cpio-data := $(obj)/initramfs_data.cpio + hostprogs := gen_init_cpio - hostprogs-y := gen_init_cpio --initramfs := $(CONFIG_SHELL) $(srctree)/$(src)/gen_initramfs_list.sh -+initramfs := $(INITRAMFS_WRAPPER) $(CONFIG_SHELL) $(srctree)/$(src)/gen_initramfs_list.sh - ramfs-input := $(if $(filter-out "",$(CONFIG_INITRAMFS_SOURCE)), \ - $(shell echo $(CONFIG_INITRAMFS_SOURCE)),-d) - ramfs-args := \ + # .initramfs_data.cpio.d is used to identify all files included +-# in initramfs and to detect if any files are added/removed. ++# in initramfs $(INITRAMFS_WRAPPER) and to detect if any files are added/removed. + # Removed files are identified by directory timestamp being updated + # The dependency list is generated by gen_initramfs.sh -l + -include $(obj)/.initramfs_data.cpio.d -- -2.5.0 +2.19.1 diff --git a/features/inline/inline.scc b/features/inline/inline.scc deleted file mode 100644 index ef6dde14..00000000 --- a/features/inline/inline.scc +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: MIT -define KFEATURE_DESCRIPTION "Allow gcc to uninline functions marked 'inline'" -define KFEATURE_COMPATIBILITY all - -kconf non-hardware inline.cfg diff --git a/features/intel-dptf/intel-dptf.cfg b/features/intel-dptf/intel-dptf.cfg new file mode 100644 index 00000000..38aa260f --- /dev/null +++ b/features/intel-dptf/intel-dptf.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_DPTF_PCH_FIVR=m diff --git a/features/intel-dptf/intel-dptf.scc b/features/intel-dptf/intel-dptf.scc new file mode 100644 index 00000000..b488a2c5 --- /dev/null +++ b/features/intel-dptf/intel-dptf.scc @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable Dynamic Platform and Thermal Framework PCH FIVR Participant device support" + +kconf non-hardware intel-dptf.cfg diff --git a/features/intel-idxd/intel-idxd.cfg b/features/intel-idxd/intel-idxd.cfg new file mode 100644 index 00000000..abd30923 --- /dev/null +++ b/features/intel-idxd/intel-idxd.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_INTEL_IDXD=m diff --git a/features/intel-idxd/intel-idxd.scc b/features/intel-idxd/intel-idxd.scc new file mode 100644 index 00000000..c20a3d76 --- /dev/null +++ b/features/intel-idxd/intel-idxd.scc @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable Intel Data Accelerators support" + +kconf hardware intel-idxd.cfg diff --git a/features/intel-persistent-memory/intel-x86-64-dax.cfg b/features/intel-persistent-memory/intel-x86-64-dax.cfg index 9e887919..ca53f2de 100644 --- a/features/intel-persistent-memory/intel-x86-64-dax.cfg +++ b/features/intel-persistent-memory/intel-x86-64-dax.cfg @@ -5,4 +5,3 @@ CONFIG_DEV_DAX=m CONFIG_DEV_DAX_PMEM=m CONFIG_DEV_DAX_KMEM=m -CONFIG_DEV_DAX_PMEM_COMPAT=m diff --git a/features/intel-persistent-memory/intel-x86-64-pmem.cfg b/features/intel-persistent-memory/intel-x86-64-pmem.cfg index a0ab17e9..e7f039e9 100644 --- a/features/intel-persistent-memory/intel-x86-64-pmem.cfg +++ b/features/intel-persistent-memory/intel-x86-64-pmem.cfg @@ -16,7 +16,6 @@ CONFIG_ZONE_DEVICE=y # CONFIG_LIBNVDIMM=m CONFIG_BLK_DEV_PMEM=m -CONFIG_ND_BLK=m CONFIG_BTT=y CONFIG_NVDIMM_PFN=y CONFIG_NVDIMM_DAX=y diff --git a/features/intel-pinctrl/intel-pinctrl.cfg b/features/intel-pinctrl/intel-pinctrl.cfg index 3a8339d0..ca928504 100644 --- a/features/intel-pinctrl/intel-pinctrl.cfg +++ b/features/intel-pinctrl/intel-pinctrl.cfg @@ -1,8 +1,17 @@ # SPDX-License-Identifier: MIT CONFIG_PINCTRL_INTEL=y +CONFIG_PINCTRL_ALDERLAKE=y CONFIG_PINCTRL_BAYTRAIL=y CONFIG_PINCTRL_CHERRYVIEW=y CONFIG_PINCTRL_BROXTON=y CONFIG_PINCTRL=y CONFIG_PINCTRL_SUNRISEPOINT=y CONFIG_PINCTRL_CANNONLAKE=y +CONFIG_PINCTRL_CEDARFORK=y +CONFIG_PINCTRL_DENVERTON=y +CONFIG_PINCTRL_GEMINILAKE=y +CONFIG_PINCTRL_ICELAKE=y +CONFIG_PINCTRL_LEWISBURG=y +CONFIG_PINCTRL_LYNXPOINT=m +CONFIG_PINCTRL_TIGERLAKE=y +CONFIG_PINCTRL_ELKHARTLAKE=y diff --git a/features/intel-sgx/intel-sgx.cfg b/features/intel-sgx/intel-sgx.cfg new file mode 100644 index 00000000..35010062 --- /dev/null +++ b/features/intel-sgx/intel-sgx.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_X86_SGX=y diff --git a/features/intel-sgx/intel-sgx.scc b/features/intel-sgx/intel-sgx.scc new file mode 100644 index 00000000..2ec2ec60 --- /dev/null +++ b/features/intel-sgx/intel-sgx.scc @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable Intel Software Guard eXtensions (SGX)" + +kconf hardware intel-sgx.cfg diff --git a/features/intel-sst/intel-sst.cfg b/features/intel-sst/intel-sst.cfg new file mode 100644 index 00000000..05172701 --- /dev/null +++ b/features/intel-sst/intel-sst.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_INTEL_SPEED_SELECT_INTERFACE=m diff --git a/features/intel-sst/intel-sst.scc b/features/intel-sst/intel-sst.scc new file mode 100644 index 00000000..1ab6626b --- /dev/null +++ b/features/intel-sst/intel-sst.scc @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable Intel Speed Select Technology interface" + +kconf hardware intel-sst.cfg diff --git a/features/intel-tco/intel-tco.cfg b/features/intel-tco/intel-tco.cfg index 3310d62e..7512eb97 100644 --- a/features/intel-tco/intel-tco.cfg +++ b/features/intel-tco/intel-tco.cfg @@ -1,2 +1,2 @@ # SPDX-License-Identifier: MIT -CONFIG_ITCO_WDT=y +CONFIG_ITCO_WDT=m diff --git a/features/intel-th/intel-th.cfg b/features/intel-th/intel-th.cfg new file mode 100644 index 00000000..a74438fa --- /dev/null +++ b/features/intel-th/intel-th.cfg @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: MIT +CONFIG_INTEL_TH=m +CONFIG_INTEL_TH_PCI=m +CONFIG_INTEL_TH_ACPI=m +CONFIG_INTEL_TH_GTH=m +CONFIG_INTEL_TH_STH=m +CONFIG_INTEL_TH_MSU=m +CONFIG_INTEL_TH_PTI=m diff --git a/features/intel-th/intel-th.scc b/features/intel-th/intel-th.scc new file mode 100644 index 00000000..8b971982 --- /dev/null +++ b/features/intel-th/intel-th.scc @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Intel Trace Hub support" + +kconf hardware intel-th.cfg diff --git a/features/intel-uncore-frequency/intel-uncore-frequency.cfg b/features/intel-uncore-frequency/intel-uncore-frequency.cfg new file mode 100644 index 00000000..52d5ae13 --- /dev/null +++ b/features/intel-uncore-frequency/intel-uncore-frequency.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_INTEL_UNCORE_FREQ_CONTROL=m diff --git a/features/intel-uncore-frequency/intel-uncore-frequency.scc b/features/intel-uncore-frequency/intel-uncore-frequency.scc new file mode 100644 index 00000000..75da5a35 --- /dev/null +++ b/features/intel-uncore-frequency/intel-uncore-frequency.scc @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable Intel Uncore frequency control driver" + +kconf hardware intel-uncore-frequency.cfg diff --git a/features/iommu/iommu.cfg b/features/iommu/iommu.cfg index 4becf3eb..56221474 100644 --- a/features/iommu/iommu.cfg +++ b/features/iommu/iommu.cfg @@ -5,4 +5,4 @@ CONFIG_IOMMU_API=y CONFIG_IOMMU_IOVA=y CONFIG_INTEL_IOMMU=y CONFIG_INTEL_IOMMU_FLOPPY_WA=y -# CONFIG_INTEL_IOMMU_DEFAULT_ON is not set +CONFIG_INTEL_IOMMU_DEFAULT_ON=n diff --git a/features/iscsi/iscsi.cfg b/features/iscsi/iscsi.cfg new file mode 100644 index 00000000..7c47204b --- /dev/null +++ b/features/iscsi/iscsi.cfg @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT +CONFIG_ISCSI_TCP=m +CONFIG_ISCSI_BOOT_SYSFS=m diff --git a/features/iscsi/iscsi.scc b/features/iscsi/iscsi.scc new file mode 100644 index 00000000..4fc0cec3 --- /dev/null +++ b/features/iscsi/iscsi.scc @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "iSCSI Initiator over TCP/IP" + +kconf non-hardware iscsi.cfg diff --git a/features/kfence/kfence.cfg b/features/kfence/kfence.cfg new file mode 100644 index 00000000..6f4875c3 --- /dev/null +++ b/features/kfence/kfence.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_KFENCE=y diff --git a/features/kfence/kfence.scc b/features/kfence/kfence.scc new file mode 100644 index 00000000..741bca26 --- /dev/null +++ b/features/kfence/kfence.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "a low-overhead sampling-based memory safety error detector" +define KFEATURE_COMPATIBILITY arch + +kconf non-hardware kfence.cfg diff --git a/features/kmemcheck/kmemcheck.cfg b/features/kmemcheck/kmemcheck.cfg index 210e7e26..0e6fbef9 100644 --- a/features/kmemcheck/kmemcheck.cfg +++ b/features/kmemcheck/kmemcheck.cfg @@ -1,8 +1,8 @@ # SPDX-License-Identifier: MIT # To get more information CONFIG_DEBUG_INFO=y -# CONFIG_FUNCTION_TRACER is not set -# CONFIG_DEBUG_PAGEALLOC is not set +CONFIG_FUNCTION_TRACER=n +CONFIG_DEBUG_PAGEALLOC=n # kmemcheck related CONFIG_KMEMCHECK=y diff --git a/features/landlock/landlock.cfg b/features/landlock/landlock.cfg new file mode 100644 index 00000000..dfe9f066 --- /dev/null +++ b/features/landlock/landlock.cfg @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT +CONFIG_SECURITY_LANDLOCK=y + diff --git a/features/landlock/landlock.scc b/features/landlock/landlock.scc new file mode 100644 index 00000000..d2917123 --- /dev/null +++ b/features/landlock/landlock.scc @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable the landlock security module" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware landlock.cfg + diff --git a/features/leds/leds.cfg b/features/leds/leds.cfg index eb40627c..33f3da76 100644 --- a/features/leds/leds.cfg +++ b/features/leds/leds.cfg @@ -13,4 +13,3 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y # Include them here, but they won't be enabled unless GPIO is explicitly # enabled as well. CONFIG_LEDS_GPIO=y -CONFIG_LEDS_TRIGGER_GPIO=y diff --git a/features/lto/lto-disable.cfg b/features/lto/lto-disable.cfg index 81939aff..75bedad3 100644 --- a/features/lto/lto-disable.cfg +++ b/features/lto/lto-disable.cfg @@ -1,6 +1,6 @@ # SPDX-License-Identifier: MIT -# CONFIG_LTO_MENU is not set -# CONFIG_LTO is not set -# CONFIG_LTO_DEBUG is not set -# CONFIG_LTO_CP_CLONE is not set -# CONFIG_LTO_SLIM is not set +CONFIG_LTO_MENU=n +CONFIG_LTO=n +CONFIG_LTO_DEBUG=n +CONFIG_LTO_CP_CLONE=n +CONFIG_LTO_SLIM=n diff --git a/features/lxc/lxc-enable.scc b/features/lxc/lxc-enable.scc index 1482f6ad..1fabf96d 100644 --- a/features/lxc/lxc-enable.scc +++ b/features/lxc/lxc-enable.scc @@ -2,4 +2,4 @@ define KFEATURE_DESCRIPTION "Enable LXC support" define KFEATURE_COMPATIBILITY all -kconf non-hardware lxc.cfg +include cfg/lxc.scc diff --git a/features/lxc/lxc.cfg b/features/lxc/lxc.cfg deleted file mode 100644 index c289ddd0..00000000 --- a/features/lxc/lxc.cfg +++ /dev/null @@ -1,4 +0,0 @@ -# SPDX-License-Identifier: MIT -# Misc configs -CONFIG_VETH=y -CONFIG_MACVLAN=y diff --git a/features/mac80211/mac80211-hwsim.cfg b/features/mac80211/mac80211-hwsim.cfg new file mode 100644 index 00000000..863a041f --- /dev/null +++ b/features/mac80211/mac80211-hwsim.cfg @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT +# dependencies +CONFIG_CFG80211=y +CONFIG_MAC80211=y + +CONFIG_MAC80211_HWSIM=y diff --git a/features/mac80211/mac80211-hwsim.scc b/features/mac80211/mac80211-hwsim.scc new file mode 100644 index 00000000..71df2daf --- /dev/null +++ b/features/mac80211/mac80211-hwsim.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable simulated radio testing tool for mac80211" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware mac80211-hwsim.cfg diff --git a/features/mac80211/mac80211.scc b/features/mac80211/mac80211.scc index 5939f434..01806b6e 100644 --- a/features/mac80211/mac80211.scc +++ b/features/mac80211/mac80211.scc @@ -2,4 +2,4 @@ define KFEATURE_DESCRIPTION "Enable mac 80211 + WLAN support" define KFEATURE_COMPATIBILITY board -kconf hardware mac80211.cfg +kconf non-hardware mac80211.cfg diff --git a/features/media/media-dvb-frontends.cfg b/features/media/media-dvb-frontends.cfg index acada3df..10f02cc5 100644 --- a/features/media/media-dvb-frontends.cfg +++ b/features/media/media-dvb-frontends.cfg @@ -29,12 +29,9 @@ CONFIG_DVB_STV6110=m CONFIG_DVB_STV0900=m CONFIG_DVB_TDA8083=m CONFIG_DVB_TDA10086=m -CONFIG_DVB_TDA8261=m -CONFIG_DVB_VES1X93=m CONFIG_DVB_TUNER_ITD1000=m CONFIG_DVB_TUNER_CX24113=m CONFIG_DVB_TDA826X=m -CONFIG_DVB_TUA6100=m CONFIG_DVB_CX24116=m CONFIG_DVB_SI21XX=m CONFIG_DVB_DS3000=m @@ -44,12 +41,10 @@ CONFIG_DVB_TDA10071=m # # DVB-T (terrestrial) frontends # -CONFIG_DVB_SP8870=m CONFIG_DVB_SP887X=m CONFIG_DVB_CX22700=m CONFIG_DVB_CX22702=m CONFIG_DVB_DRXD=m -CONFIG_DVB_L64781=m CONFIG_DVB_TDA1004X=m CONFIG_DVB_NXT6000=m CONFIG_DVB_MT352=m diff --git a/features/media/media-i2c.cfg b/features/media/media-i2c.cfg index f87806a9..2069c5b2 100644 --- a/features/media/media-i2c.cfg +++ b/features/media/media-i2c.cfg @@ -9,9 +9,6 @@ CONFIG_VIDEO_IR_I2C=m CONFIG_VIDEO_TVAUDIO=m CONFIG_VIDEO_TDA7432=m -CONFIG_VIDEO_TDA9840=m -CONFIG_VIDEO_TEA6415C=m -CONFIG_VIDEO_TEA6420=m CONFIG_VIDEO_MSP3400=m CONFIG_VIDEO_CS5345=m CONFIG_VIDEO_CS53L32A=m diff --git a/features/media/media-pci-capture.cfg b/features/media/media-pci-capture.cfg index 33f1079e..fdf12149 100644 --- a/features/media/media-pci-capture.cfg +++ b/features/media/media-pci-capture.cfg @@ -11,10 +11,6 @@ CONFIG_VIDEO_IVTV=m CONFIG_VIDEO_IVTV_ALSA=m CONFIG_VIDEO_FB_IVTV=m -CONFIG_VIDEO_HEXIUM_GEMINI=m -CONFIG_VIDEO_HEXIUM_ORION=m -CONFIG_VIDEO_MXB=m - # # Media capture/analog/hybrid TV support # @@ -43,17 +39,6 @@ CONFIG_VIDEO_SAA7134_RC=y CONFIG_VIDEO_SAA7134_DVB=m CONFIG_VIDEO_SAA7164=m -# -# Media digital TV PCI Adapters -# -CONFIG_DVB_AV7110=m -CONFIG_DVB_AV7110_OSD=y -CONFIG_DVB_BUDGET_CORE=m -CONFIG_DVB_BUDGET=m -CONFIG_DVB_BUDGET_CI=m -CONFIG_DVB_BUDGET_AV=m -CONFIG_DVB_BUDGET_PATCH=m - CONFIG_DVB_B2C2_FLEXCOP_PCI=m CONFIG_DVB_PLUTO2=m diff --git a/features/media/media-platform.cfg b/features/media/media-platform.cfg index 58ad7330..135e3eeb 100644 --- a/features/media/media-platform.cfg +++ b/features/media/media-platform.cfg @@ -2,5 +2,6 @@ # # Media Platform Configuration # +CONFIG_MEDIA_PLATFORM_SUPPORT=y CONFIG_V4L_MEM2MEM_DRIVERS=y CONFIG_VIDEO_MEM2MEM_DEINTERLACE=m diff --git a/features/media/media-radio.cfg b/features/media/media-radio.cfg index 19453262..ca695abf 100644 --- a/features/media/media-radio.cfg +++ b/features/media/media-radio.cfg @@ -3,7 +3,7 @@ # Media AM/FM Radio Adapters # CONFIG_MEDIA_RADIO_SUPPORT=y -CONFIG_RADIO_ADAPTERS=y +CONFIG_RADIO_ADAPTERS=m CONFIG_RADIO_SI470X=m CONFIG_USB_SI470X=m CONFIG_I2C_SI470X=m diff --git a/features/media/media-usb-tv.cfg b/features/media/media-usb-tv.cfg index 393cf377..33e2279a 100644 --- a/features/media/media-usb-tv.cfg +++ b/features/media/media-usb-tv.cfg @@ -7,9 +7,7 @@ CONFIG_VIDEO_PVRUSB2=m CONFIG_VIDEO_PVRUSB2_SYSFS=y CONFIG_VIDEO_PVRUSB2_DVB=y CONFIG_VIDEO_HDPVR=m -CONFIG_VIDEO_USBVISION=m CONFIG_VIDEO_STK1160=m -CONFIG_VIDEO_STK1160_COMMON=m # # Analog/digital TV USB devices @@ -18,9 +16,6 @@ CONFIG_VIDEO_CX231XX=m CONFIG_VIDEO_CX231XX_RC=y CONFIG_VIDEO_CX231XX_ALSA=m CONFIG_VIDEO_CX231XX_DVB=m -CONFIG_VIDEO_TM6000=m -CONFIG_VIDEO_TM6000_ALSA=m -CONFIG_VIDEO_TM6000_DVB=m # # Digital TV USB devices diff --git a/features/media/media-usb-webcams.cfg b/features/media/media-usb-webcams.cfg index 93361188..8549b0a8 100644 --- a/features/media/media-usb-webcams.cfg +++ b/features/media/media-usb-webcams.cfg @@ -56,12 +56,5 @@ CONFIG_USB_GSPCA_ZC3XX=m CONFIG_USB_PWC=m CONFIG_USB_PWC_INPUT_EVDEV=y -# Vision's CPiA2 (Colour Processor Interface ASIC) Camera Drivers -CONFIG_VIDEO_CPIA2=m - - -# USB Syntek DC1125 Camera Support -CONFIG_USB_STKWEBCAM=m - # USB Sensoray 2255 video capture Device CONFIG_USB_S2255=m diff --git a/features/media/media.cfg b/features/media/media.cfg index 401acae6..148fa991 100644 --- a/features/media/media.cfg +++ b/features/media/media.cfg @@ -10,7 +10,6 @@ CONFIG_MEDIA_CONTROLLER=y # Enable the V4L2 core and API # CONFIG_VIDEO_DEV=m -CONFIG_VIDEO_V4L2=m CONFIG_VIDEO_V4L2_SUBDEV_API=y # @@ -19,14 +18,6 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y CONFIG_V4L2_MEM2MEM_DEV=m # -# Used by drivers that need Videobuf modules -# -CONFIG_VIDEOBUF_GEN=m -CONFIG_VIDEOBUF_DMA_SG=m -CONFIG_VIDEOBUF_DMA_CONTIG=m -CONFIG_VIDEOBUF_VMALLOC=m - -# # Used by drivers that need Videobuf2 modules # CONFIG_VIDEOBUF2_CORE=m @@ -38,7 +29,7 @@ CONFIG_VIDEOBUF2_VMALLOC=m # # Digital Video Broadcast support # -CONFIG_DVB_CORE=y +CONFIG_DVB_CORE=m CONFIG_DVB_NET=y CONFIG_DVB_MAX_ADAPTERS=8 CONFIG_DVB_DYNAMIC_MINORS=y diff --git a/features/mei/amt.cfg b/features/mei/amt.cfg index f1c7aa59..df0bf237 100644 --- a/features/mei/amt.cfg +++ b/features/mei/amt.cfg @@ -1,3 +1,4 @@ # SPDX-License-Identifier: MIT CONFIG_WATCHDOG_CORE=y +CONFIG_WATCHDOG_SYSFS=y CONFIG_INTEL_MEI_WDT=m diff --git a/features/minnow-io/minnow-io.cfg b/features/minnow-io/minnow-io.cfg index 5ca458d1..c8fe2ce3 100644 --- a/features/minnow-io/minnow-io.cfg +++ b/features/minnow-io/minnow-io.cfg @@ -4,7 +4,6 @@ CONFIG_MINNOWBOARD_GPIO=m CONFIG_MINNOWBOARD_KEYS=m # GPIO Support -CONFIG_GPIO_SYSFS=y CONFIG_GPIOLIB=y CONFIG_GPIO_GENERIC=y diff --git a/features/misc/bosch-pressure-sensor-i2c.cfg b/features/misc/bosch-pressure-sensor-i2c.cfg index 420a95f7..8594140b 100644 --- a/features/misc/bosch-pressure-sensor-i2c.cfg +++ b/features/misc/bosch-pressure-sensor-i2c.cfg @@ -1,4 +1,4 @@ # SPDX-License-Identifier: MIT -# CONFIG_BMP280 is not set +CONFIG_BMP280=n CONFIG_BMP085=m CONFIG_BMP085_I2C=m diff --git a/features/net/net.scc b/features/net/net.scc index a907e016..606aaa91 100644 --- a/features/net/net.scc +++ b/features/net/net.scc @@ -1,4 +1,3 @@ # SPDX-License-Identifier: MIT kconf hardware net.cfg -patch netfilter-Fix-remainder-of-pseudo-header-protocol-0.patch diff --git a/features/net/netfilter-Fix-remainder-of-pseudo-header-protocol-0.patch b/features/net/netfilter-Fix-remainder-of-pseudo-header-protocol-0.patch deleted file mode 100644 index d1fdbf98..00000000 --- a/features/net/netfilter-Fix-remainder-of-pseudo-header-protocol-0.patch +++ /dev/null @@ -1,92 +0,0 @@ -From b383959122e464ccdc21f6b37af88152d29cdf95 Mon Sep 17 00:00:00 2001 -From: He Zhe <zhe.he@windriver.com> -Date: Tue, 25 Jun 2019 18:15:50 +0800 -Subject: [PATCH] netfilter: Fix remainder of pseudo-header protocol 0 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Since v5.1-rc1, some types of packets do not get unreachable reply with the -following iptables setting. Fox example, - -$ iptables -A INPUT -p icmp --icmp-type 8 -j REJECT -$ ping 127.0.0.1 -c 1 -PING 127.0.0.1 (127.0.0.1) 56(84) bytes of data. -— 127.0.0.1 ping statistics — -1 packets transmitted, 0 received, 100% packet loss, time 0ms - -We should have got the following reply from command line, but we did not. -From 127.0.0.1 icmp_seq=1 Destination Port Unreachable - -Yi Zhao reported it and narrowed it down to: -7fc38225363d ("netfilter: reject: skip csum verification for protocols that don't support it"), - -This is because nf_ip_checksum still expects pseudo-header protocol type 0 for -packets that are of neither TCP or UDP, and thus ICMP packets are mistakenly -treated as TCP/UDP. - -This patch corrects the conditions in nf_ip_checksum and all other places that -still call it with protocol 0. - -Fixes: 7fc38225363d ("netfilter: reject: skip csum verification for protocols that don't support it") -Reported-by: Yi Zhao <yi.zhao@windriver.com> -Signed-off-by: He Zhe <zhe.he@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ---- - net/netfilter/nf_conntrack_proto_icmp.c | 2 +- - net/netfilter/nf_nat_proto.c | 2 +- - net/netfilter/utils.c | 5 +++-- - 3 files changed, 5 insertions(+), 4 deletions(-) - -diff --git a/net/netfilter/nf_conntrack_proto_icmp.c b/net/netfilter/nf_conntrack_proto_icmp.c -index a824367ed518..dd53e2b20f6b 100644 ---- a/net/netfilter/nf_conntrack_proto_icmp.c -+++ b/net/netfilter/nf_conntrack_proto_icmp.c -@@ -218,7 +218,7 @@ int nf_conntrack_icmpv4_error(struct nf_conn *tmpl, - /* See ip_conntrack_proto_tcp.c */ - if (state->net->ct.sysctl_checksum && - state->hook == NF_INET_PRE_ROUTING && -- nf_ip_checksum(skb, state->hook, dataoff, 0)) { -+ nf_ip_checksum(skb, state->hook, dataoff, IPPROTO_ICMP)) { - icmp_error_log(skb, state, "bad hw icmp checksum"); - return -NF_ACCEPT; - } -diff --git a/net/netfilter/nf_nat_proto.c b/net/netfilter/nf_nat_proto.c -index 07da07788f6b..83a24cc5753b 100644 ---- a/net/netfilter/nf_nat_proto.c -+++ b/net/netfilter/nf_nat_proto.c -@@ -564,7 +564,7 @@ int nf_nat_icmp_reply_translation(struct sk_buff *skb, - - if (!skb_make_writable(skb, hdrlen + sizeof(*inside))) - return 0; -- if (nf_ip_checksum(skb, hooknum, hdrlen, 0)) -+ if (nf_ip_checksum(skb, hooknum, hdrlen, IPPROTO_ICMP)) - return 0; - - inside = (void *)skb->data + hdrlen; -diff --git a/net/netfilter/utils.c b/net/netfilter/utils.c -index 06dc55590441..51b454d8fa9c 100644 ---- a/net/netfilter/utils.c -+++ b/net/netfilter/utils.c -@@ -17,7 +17,8 @@ __sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook, - case CHECKSUM_COMPLETE: - if (hook != NF_INET_PRE_ROUTING && hook != NF_INET_LOCAL_IN) - break; -- if ((protocol == 0 && !csum_fold(skb->csum)) || -+ if ((protocol != IPPROTO_TCP && protocol != IPPROTO_UDP && -+ !csum_fold(skb->csum)) || - !csum_tcpudp_magic(iph->saddr, iph->daddr, - skb->len - dataoff, protocol, - skb->csum)) { -@@ -26,7 +27,7 @@ __sum16 nf_ip_checksum(struct sk_buff *skb, unsigned int hook, - } - /* fall through */ - case CHECKSUM_NONE: -- if (protocol == 0) -+ if (protocol != IPPROTO_TCP && protocol != IPPROTO_UDP) - skb->csum = 0; - else - skb->csum = csum_tcpudp_nofold(iph->saddr, iph->daddr, --- -2.19.1 - diff --git a/features/net/xdp/xdp.cfg b/features/net/xdp/xdp.cfg new file mode 100644 index 00000000..061b65a4 --- /dev/null +++ b/features/net/xdp/xdp.cfg @@ -0,0 +1 @@ +CONFIG_XDP_SOCKETS=y diff --git a/features/net/xdp/xdp.scc b/features/net/xdp/xdp.scc new file mode 100644 index 00000000..e4df6d09 --- /dev/null +++ b/features/net/xdp/xdp.scc @@ -0,0 +1 @@ +kconf hardware xdp.cfg diff --git a/features/net_sched/net_sched.cfg b/features/net_sched/net_sched.cfg index c9714dab..137ca752 100644 --- a/features/net_sched/net_sched.cfg +++ b/features/net_sched/net_sched.cfg @@ -7,7 +7,6 @@ CONFIG_NET_SCHED=y # # Queueing/Scheduling # -CONFIG_NET_SCH_CBQ=m CONFIG_NET_SCH_HTB=m CONFIG_NET_SCH_HFSC=m CONFIG_NET_SCH_PRIO=m @@ -16,12 +15,13 @@ CONFIG_NET_SCH_SFQ=m CONFIG_NET_SCH_TEQL=m CONFIG_NET_SCH_TBF=m CONFIG_NET_SCH_GRED=m -CONFIG_NET_SCH_DSMARK=m CONFIG_NET_SCH_NETEM=m CONFIG_NET_SCH_INGRESS=m CONFIG_NET_SCH_CODEL=m CONFIG_NET_SCH_FQ_CODEL=m +CONFIG_NET_SCH_MULTIQ=m + # # Classification # @@ -31,3 +31,8 @@ CONFIG_NET_CLS_BASIC=y CONFIG_NET_CLS_CGROUP=y CONFIG_NET_CLS_U32=y CONFIG_NET_ACT_MIRRED=m +CONFIG_NET_ACT_SKBEDIT=m +CONFIG_NET_EMATCH=y + +CONFIG_NET_EMATCH_U32=y +CONFIG_NET_EMATCH_META=y diff --git a/features/netfilter/netfilter.cfg b/features/netfilter/netfilter.cfg index 4e8d1bb6..ba275be4 100644 --- a/features/netfilter/netfilter.cfg +++ b/features/netfilter/netfilter.cfg @@ -13,9 +13,9 @@ CONFIG_NETFILTER_NETLINK_QUEUE=m CONFIG_NETFILTER_NETLINK_LOG=m CONFIG_NF_CONNTRACK=m CONFIG_NF_CONNTRACK_MARK=y -CONFIG_NF_CT_PROTO_GRE=m -CONFIG_NF_CT_PROTO_SCTP=m -CONFIG_NF_CT_PROTO_UDPLITE=m +CONFIG_NF_CT_PROTO_GRE=y +CONFIG_NF_CT_PROTO_SCTP=y +CONFIG_NF_CT_PROTO_UDPLITE=y CONFIG_NF_CONNTRACK_AMANDA=m CONFIG_NF_CONNTRACK_FTP=m CONFIG_NF_CONNTRACK_H323=m @@ -29,13 +29,14 @@ CONFIG_NF_CT_NETLINK=m CONFIG_NETFILTER_XTABLES=m CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m CONFIG_NETFILTER_XT_TARGET_CONNMARK=m +CONFIG_NETFILTER_XT_TARGET_CT=m CONFIG_NETFILTER_XT_TARGET_DSCP=m CONFIG_NETFILTER_XT_TARGET_HL=m CONFIG_NETFILTER_XT_TARGET_LOG=m CONFIG_NETFILTER_XT_TARGET_MARK=m CONFIG_NETFILTER_XT_TARGET_NFLOG=m CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m -CONFIG_NETFILTER_XT_TARGET_NOTRACK=m +# CONFIG_NETFILTER_XT_TARGET_NOTRACK is not set CONFIG_NETFILTER_XT_TARGET_TRACE=m CONFIG_NETFILTER_XT_TARGET_TCPMSS=m CONFIG_NETFILTER_XT_MATCH_COMMENT=m @@ -91,7 +92,6 @@ CONFIG_NF_NAT_PPTP=m CONFIG_NF_NAT_H323=m CONFIG_NF_NAT_SIP=m CONFIG_IP_NF_MANGLE=m -CONFIG_IP_NF_TARGET_CLUSTERIP=m CONFIG_IP_NF_TARGET_ECN=m CONFIG_IP_NF_TARGET_TTL=m CONFIG_IP_NF_RAW=m diff --git a/features/nf_tables/nf_tables.cfg b/features/nf_tables/nf_tables.cfg index afb13964..5b0f28df 100644 --- a/features/nf_tables/nf_tables.cfg +++ b/features/nf_tables/nf_tables.cfg @@ -1,32 +1,24 @@ # SPDX-License-Identifier: MIT -CONFIG_NF_TABLES=m -CONFIG_NF_TABLES_INET=m -CONFIG_NFT_EXTHDR=m -CONFIG_NFT_META=m +CONFIG_NF_TABLES=y +CONFIG_NF_TABLES_INET=y +CONFIG_NF_TABLES_NETDEV=y CONFIG_NFT_CT=m -CONFIG_NFT_SET_RBTREE=m -CONFIG_NFT_SET_HASH=m -CONFIG_NFT_RBTREE=m CONFIG_NFT_HASH=m -CONFIG_NFT_COUNTER=m CONFIG_NFT_MASQ=m -CONFIG_NFT_MASQ_IPV4=m CONFIG_NFT_REDIR=m -CONFIG_NFT_REDIR_IPV4=m CONFIG_NFT_LOG=m CONFIG_NFT_LIMIT=m +CONFIG_NFT_CONNLIMIT=m +CONFIG_NFT_TUNNEL=m CONFIG_NFT_NAT=m CONFIG_NFT_QUEUE=m CONFIG_NFT_REJECT=m CONFIG_NFT_REJECT_INET=m CONFIG_NFT_COMPAT=m -CONFIG_NF_TABLES_IPV4=m -CONFIG_NFT_CHAIN_ROUTE_IPV4=m -CONFIG_NFT_CHAIN_NAT_IPV4=m +CONFIG_NF_TABLES_IPV4=y CONFIG_NFT_REJECT_IPV4=m CONFIG_NFT_REJECT_IPV6=m -CONFIG_NF_TABLES_ARP=m -CONFIG_NF_TABLES_IPV6=m -CONFIG_NFT_CHAIN_ROUTE_IPV6=m -CONFIG_NFT_REJECT_IPV6=m +CONFIG_NF_TABLES_ARP=y +CONFIG_NF_TABLES_IPV6=y CONFIG_NF_TABLES_BRIDGE=m +CONFIG_NFT_SOCKET=m diff --git a/features/nf_tables/nft_test.cfg b/features/nf_tables/nft_test.cfg new file mode 100644 index 00000000..0a959d0e --- /dev/null +++ b/features/nf_tables/nft_test.cfg @@ -0,0 +1,13 @@ +CONFIG_NF_CONNTRACK_TIMEOUT=y +CONFIG_NF_FLOW_TABLE_INET=m +CONFIG_NF_FLOW_TABLE=m +CONFIG_NFT_FIB_INET=y +CONFIG_NFT_FIB_IPV4=y +CONFIG_NFT_FIB_IPV6=y +CONFIG_NFT_FLOW_OFFLOAD=m +CONFIG_NFT_NUMGEN=m +CONFIG_NFT_OSF=m +CONFIG_NFT_QUOTA=m +CONFIG_NFT_SYNPROXY=m +CONFIG_NFT_XFRM=m +CONFIG_VETH=y diff --git a/features/nf_tables/nft_test.scc b/features/nf_tables/nft_test.scc new file mode 100644 index 00000000..8181c215 --- /dev/null +++ b/features/nf_tables/nft_test.scc @@ -0,0 +1,5 @@ +define KFEATURE_DESCRIPTION "Add extra nftables modules" +define KFEATURE_COMPATIBILITY all + +include nf_tables.cfg +include nft_test.cfg diff --git a/features/nfsd/nfsd.cfg b/features/nfsd/nfsd.cfg index ff94b98c..8cd76e3c 100644 --- a/features/nfsd/nfsd.cfg +++ b/features/nfsd/nfsd.cfg @@ -1,6 +1,4 @@ # SPDX-License-Identifier: MIT CONFIG_NFSD=m -CONFIG_NFSD_V3=y -# CONFIG_NFSD_V3_ACL is not set +CONFIG_NFSD_V3_ACL=n CONFIG_NFSD_V4=y -# CONFIG_NFSD_FAULT_INJECTION is not set diff --git a/features/numa/numa.cfg b/features/numa/numa.cfg index 351c5d97..2cf4bae2 100644 --- a/features/numa/numa.cfg +++ b/features/numa/numa.cfg @@ -1,9 +1,9 @@ # SPDX-License-Identifier: MIT CONFIG_NUMA=y +CONFIG_NUMA_BALANCING=y +CONFIG_NUMA_BALANCING_DEFAULT_ENABLED=y CONFIG_X86_64_ACPI_NUMA=y -CONFIG_NODES_SPAN_OTHER_NODES=y CONFIG_NUMA_EMU=y CONFIG_NODES_SHIFT=6 -CONFIG_NEED_MULTIPLE_NODES=y CONFIG_USE_PERCPU_NUMA_NODE_ID=y CONFIG_ACPI_NUMA=y diff --git a/features/ocicontainer/cgroup.scc b/features/ocicontainer/cgroup.scc new file mode 100644 index 00000000..4bfbccef --- /dev/null +++ b/features/ocicontainer/cgroup.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Enable cgroups needed to run containerd" +define KFEATURE_COMPATIBILITY board + +kconf non-hardware features/cgroups/cgroups.cfg diff --git a/features/ocicontainer/ebtables.cfg b/features/ocicontainer/ebtables.cfg new file mode 100644 index 00000000..a3c514e1 --- /dev/null +++ b/features/ocicontainer/ebtables.cfg @@ -0,0 +1,2 @@ +CONFIG_BRIDGE_NF_EBTABLES=m +CONFIG_BRIDGE_EBT_T_NAT=m diff --git a/features/ocicontainer/ebtables.scc b/features/ocicontainer/ebtables.scc new file mode 100644 index 00000000..b3895e58 --- /dev/null +++ b/features/ocicontainer/ebtables.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Enable ebtables support" +define KFEATURE_COMPATIBILITY board + +kconf non-hardware ebtables.cfg diff --git a/features/ocicontainer/ocicontainer.scc b/features/ocicontainer/ocicontainer.scc new file mode 100644 index 00000000..d18e9dfc --- /dev/null +++ b/features/ocicontainer/ocicontainer.scc @@ -0,0 +1,7 @@ +include xt-checksum.scc +include ebtables.scc +include features/vswitch/vswitch.scc +include features/lxc/lxc-enable.scc +include features/docker/docker.scc +include cgroup.scc + diff --git a/features/ocicontainer/xt-checksum.cfg b/features/ocicontainer/xt-checksum.cfg new file mode 100644 index 00000000..58afbff6 --- /dev/null +++ b/features/ocicontainer/xt-checksum.cfg @@ -0,0 +1 @@ +CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m diff --git a/features/ocicontainer/xt-checksum.scc b/features/ocicontainer/xt-checksum.scc new file mode 100644 index 00000000..d3804f0c --- /dev/null +++ b/features/ocicontainer/xt-checksum.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Add extra iptables modules" +define KFEATURE_COMPATIBILITY board + +kconf non-hardware xt-checksum.cfg diff --git a/features/optee/optee.cfg b/features/optee/optee.cfg new file mode 100644 index 00000000..3aa27f0a --- /dev/null +++ b/features/optee/optee.cfg @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT +CONFIG_TEE=y +CONFIG_OPTEE=y diff --git a/features/optee/optee.scc b/features/optee/optee.scc new file mode 100644 index 00000000..db4c19e5 --- /dev/null +++ b/features/optee/optee.scc @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable optee support" + +kconf hardware optee.cfg diff --git a/features/pci/pci-of-generic.cfg b/features/pci/pci-of-generic.cfg new file mode 100644 index 00000000..67a3ccff --- /dev/null +++ b/features/pci/pci-of-generic.cfg @@ -0,0 +1,3 @@ +# Support a simple generic PCI host controller, such as the one emulated by kvmtool +CONFIG_PCI_HOST_GENERIC=y + diff --git a/features/pci/pci-of-generic.scc b/features/pci/pci-of-generic.scc new file mode 100644 index 00000000..cc76fb88 --- /dev/null +++ b/features/pci/pci-of-generic.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable Generic PCI OF device" +define KFEATURE_COMPATIBILITY board + +kconf hardware pci-of-generic.cfg diff --git a/features/pci/pci.cfg b/features/pci/pci.cfg index f3c57c54..3ed13b59 100644 --- a/features/pci/pci.cfg +++ b/features/pci/pci.cfg @@ -1,12 +1,8 @@ # SPDX-License-Identifier: MIT CONFIG_PCI=y -CONFIG_PCI_MMCONFIG=y CONFIG_PCI_MSI=y CONFIG_PCIEPORTBUS=y CONFIG_HOTPLUG_PCI=y -# CONFIG_HOTPLUG_PCI_PCIE is not set - - - +CONFIG_HOTPLUG_PCI_PCIE=n diff --git a/features/perf/libbpf-Fix-build-warning-on-ref_ctr_off.patch b/features/perf/libbpf-Fix-build-warning-on-ref_ctr_off.patch new file mode 100644 index 00000000..10ed1460 --- /dev/null +++ b/features/perf/libbpf-Fix-build-warning-on-ref_ctr_off.patch @@ -0,0 +1,46 @@ +From a41f5bda3e72b4f2bcdbe84cd65190121e3cc3ff Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 4 Dec 2022 18:23:47 -0800 +Subject: [PATCH] libbpf: Fix build warning on ref_ctr_off + +Clang warns on 32-bit ARM on this comparision + +libbpf.c:10497:18: error: result of comparison of constant 4294967296 with expression of type 'size_t' (aka 'unsigned int') is always false [-Werror,-Wtautological-constant-out-of-range-compare] + if (ref_ctr_off >= (1ULL << PERF_UPROBE_REF_CTR_OFFSET_BITS)) + ~~~~~~~~~~~ ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Check for platform long int to be larger than 32-bits before enabling +this check, it false on 32bit anyways. + +Cc: Alexei Starovoitov <ast@kernel.org> +Cc: Daniel Borkmann <daniel@iogearbox.net> +Cc: Song Liu <song@kernel.org> +Cc: Yonghong Song <yhs@fb.com> +Cc: Jiri Olsa <jolsa@kernel.org> +Cc: Paul Walmsley <paul.walmsley@sifive.com> +Cc: Palmer Dabbelt <palmer@dabbelt.com> +Cc: Nathan Chancellor <nathan@kernel.org> +Cc: Nick Desaulniers <ndesaulniers@google.com> + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + tools/lib/bpf/libbpf.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c +index 05c4db355f28..23991e0d21a9 100644 +--- a/tools/lib/bpf/libbpf.c ++++ b/tools/lib/bpf/libbpf.c +@@ -9867,7 +9867,7 @@ static int perf_event_open_probe(bool uprobe, bool retprobe, const char *name, + char errmsg[STRERR_BUFSIZE]; + int type, pfd; + +- if ((__u64)ref_ctr_off >= (1ULL << PERF_UPROBE_REF_CTR_OFFSET_BITS)) ++ if (BITS_PER_LONG > 32 && (__u64)ref_ctr_off >= (1ULL << PERF_UPROBE_REF_CTR_OFFSET_BITS)) + return -EINVAL; + + memset(&attr, 0, attr_sz); +-- +2.34.1 + diff --git a/features/perf/perf-annotate-replace-expand-with-equivalent-sed-exp.patch b/features/perf/perf-annotate-replace-expand-with-equivalent-sed-exp.patch deleted file mode 100644 index b26f7d12..00000000 --- a/features/perf/perf-annotate-replace-expand-with-equivalent-sed-exp.patch +++ /dev/null @@ -1,30 +0,0 @@ -From a049d8aa0105dbe7f060095f05a6023d94458c3f Mon Sep 17 00:00:00 2001 -From: Tom Zanussi <tom.zanussi@intel.com> -Date: Fri, 5 Oct 2012 11:35:26 -0500 -Subject: [PATCH] perf annotate: replace 'expand' with equivalent sed - expression - -We don't have 'expand' in our userspace so we need to accomplish the -same thing using 'sed', which we do have. - -Signed-off-by: Tom Zanussi <tom.zanussi@intel.com> ---- - tools/perf/util/annotate.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c -index 0b8573fd9b05..ff57a390377e 100644 ---- a/tools/perf/util/annotate.c -+++ b/tools/perf/util/annotate.c -@@ -1886,7 +1886,7 @@ static int symbol__disassemble(struct symbol *sym, struct annotate_args *args) - err = asprintf(&command, - "%s %s%s --start-address=0x%016" PRIx64 - " --stop-address=0x%016" PRIx64 -- " -l -d %s %s -C \"$1\" 2>/dev/null|grep -v \"$1:\"|expand", -+ " -l -d %s %s -C \"$1\" 2>/dev/null|grep -v \"$1:\"|sed 's/\t/ /g'", - opts->objdump_path ?: "objdump", - opts->disassembler_style ? "-M " : "", - opts->disassembler_style ?: "", --- -2.19.1 - diff --git a/features/perf/perf-perf-can-not-parser-the-backtrace-of-app-in-the.patch b/features/perf/perf-perf-can-not-parser-the-backtrace-of-app-in-the.patch new file mode 100644 index 00000000..91ab18c5 --- /dev/null +++ b/features/perf/perf-perf-can-not-parser-the-backtrace-of-app-in-the.patch @@ -0,0 +1,33 @@ +From 4b69a5a32098d3abcd0800f6d24fa29451a82c3a Mon Sep 17 00:00:00 2001 +From: Jiping Ma <jiping.ma2@windriver.com> +Date: Thu, 30 Apr 2020 09:35:06 +0800 +Subject: [PATCH] perf: perf can not parser the backtrace of app in the 32bit + system and 64bit kernel. + +Record PC value from regs[15], it should be regs[32], which cause perf +parser the backtrace failed. + +Signed-off-by: Jiping Ma <jiping.ma2@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + arch/arm64/kernel/perf_regs.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/arch/arm64/kernel/perf_regs.c b/arch/arm64/kernel/perf_regs.c +index 0bbac612146e..04088e6b6092 100644 +--- a/arch/arm64/kernel/perf_regs.c ++++ b/arch/arm64/kernel/perf_regs.c +@@ -32,6 +32,10 @@ u64 perf_reg_value(struct pt_regs *regs, int idx) + if ((u32)idx == PERF_REG_ARM64_PC) + return regs->pc; + ++ if (perf_reg_abi(current) == PERF_SAMPLE_REGS_ABI_32 ++ && idx == 15) ++ return regs->regs[PERF_REG_ARM64_PC]; ++ + return regs->regs[idx]; + } + +-- +2.19.1 + diff --git a/features/perf/perf.scc b/features/perf/perf.scc index 80168806..dc9de471 100644 --- a/features/perf/perf.scc +++ b/features/perf/perf.scc @@ -6,7 +6,9 @@ patch perf-change-root-to-prefix-for-python-install.patch patch perf-add-sgidefs.h-to-for-mips-builds.patch patch perf-add-SLANG_INC-for-slang.h.patch # patch perf-tools-Fix-parallel-build.patch -patch perf-annotate-replace-expand-with-equivalent-sed-exp.patch patch perf-fix-bench-numa-compilation.patch patch perf-mips64-Convert-__u64-to-unsigned-long-long.patch patch perf-x86-32-explicitly-include-errno.h.patch +patch perf-perf-can-not-parser-the-backtrace-of-app-in-the.patch +patch libbpf-Fix-build-warning-on-ref_ctr_off.patch +patch tools-Remove-some-options-from-CLANG_CROSS_FLAGS.patch diff --git a/features/perf/tools-Remove-some-options-from-CLANG_CROSS_FLAGS.patch b/features/perf/tools-Remove-some-options-from-CLANG_CROSS_FLAGS.patch new file mode 100644 index 00000000..31008bfa --- /dev/null +++ b/features/perf/tools-Remove-some-options-from-CLANG_CROSS_FLAGS.patch @@ -0,0 +1,37 @@ +From 2c720c18adae3422b022c2c88fb91379b1f3e2c6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sun, 4 Dec 2022 18:33:48 -0800 +Subject: [PATCH 3/3] tools: Remove some options from CLANG_CROSS_FLAGS + +These options are not needed with OE/Yocto since compiler is already +passing these options via TOOLCHAIN_OPTIONS, having these options infact +regressed OE builds because build time --sysroot on OE cross compiler is +/not/exist and that creates problems where clang can no more find system +headers anymore during compilation + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + tools/scripts/Makefile.include | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/tools/scripts/Makefile.include b/tools/scripts/Makefile.include +index 0efb8f2b33ce..3d206d772cc2 100644 +--- a/tools/scripts/Makefile.include ++++ b/tools/scripts/Makefile.include +@@ -101,9 +101,9 @@ ifeq ($(CLANG_CROSS_FLAGS),) + CLANG_CROSS_FLAGS := --target=$(notdir $(CROSS_COMPILE:%-=%)) + GCC_TOOLCHAIN_DIR := $(dir $(shell which $(CROSS_COMPILE)gcc 2>/dev/null)) + ifneq ($(GCC_TOOLCHAIN_DIR),) +-CLANG_CROSS_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)$(notdir $(CROSS_COMPILE)) +-CLANG_CROSS_FLAGS += --sysroot=$(shell $(CROSS_COMPILE)gcc -print-sysroot) +-CLANG_CROSS_FLAGS += --gcc-toolchain=$(realpath $(GCC_TOOLCHAIN_DIR)/..) ++#CLANG_CROSS_FLAGS += --prefix=$(GCC_TOOLCHAIN_DIR)$(notdir $(CROSS_COMPILE)) ++#CLANG_CROSS_FLAGS += --sysroot=$(shell $(CROSS_COMPILE)gcc -print-sysroot) ++#CLANG_CROSS_FLAGS += --gcc-toolchain=$(realpath $(GCC_TOOLCHAIN_DIR)/..) + endif # GCC_TOOLCHAIN_DIR + endif # CLANG_CROSS_FLAGS + CFLAGS += $(CLANG_CROSS_FLAGS) +-- +2.19.1 + diff --git a/features/profiling/profiling.cfg b/features/profiling/profiling.cfg index 3c28606c..9728b889 100644 --- a/features/profiling/profiling.cfg +++ b/features/profiling/profiling.cfg @@ -1,6 +1,5 @@ # SPDX-License-Identifier: MIT # for oprofile and powertop CONFIG_PROFILING=y -CONFIG_OPROFILE=y CONFIG_FRAME_POINTER=y CONFIG_X86_LOCAL_APIC=y diff --git a/features/qat/qat.cfg b/features/qat/qat.cfg index 2dc36225..5f138f1f 100644 --- a/features/qat/qat.cfg +++ b/features/qat/qat.cfg @@ -10,3 +10,5 @@ CONFIG_CRYPTO_VMAC=m CONFIG_CRYPTO_CTS=m CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_DH=y +CONFIG_PCIEAER=y +CONFIG_RAS=y diff --git a/features/qat/y_or_m_enabled.cfg b/features/qat/y_or_m_enabled.cfg new file mode 100644 index 00000000..357efc5a --- /dev/null +++ b/features/qat/y_or_m_enabled.cfg @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT +CONFIG_CRYPTO_CCM +CONFIG_CRYPTO_GCM diff --git a/features/random/random.scc b/features/random/random.scc deleted file mode 100644 index 0fd6584c..00000000 --- a/features/random/random.scc +++ /dev/null @@ -1,5 +0,0 @@ -# SPDX-License-Identifier: MIT -define KFEATURE_DESCRIPTION "Trust CPU's random number generator for initializing kernel's CRNG" -define KFEATURE_COMPATIBILITY arch - -kconf hardware random.cfg diff --git a/features/reproducibility/reproducibility.cfg b/features/reproducibility/reproducibility.cfg new file mode 100644 index 00000000..97e7462c --- /dev/null +++ b/features/reproducibility/reproducibility.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_IKHEADERS=m diff --git a/features/reproducibility/reproducibility.scc b/features/reproducibility/reproducibility.scc new file mode 100644 index 00000000..e8b069cd --- /dev/null +++ b/features/reproducibility/reproducibility.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable kernel build reproducibility options" +define KFEATURE_COMPATIBILITY arch + +kconf non-hardware reproducibility.cfg diff --git a/features/rt/rt.scc b/features/rt/rt.scc index 548d2d44..4cc0cb9a 100644 --- a/features/rt/rt.scc +++ b/features/rt/rt.scc @@ -1 +1,3 @@ # SPDX-License-Identifier: MIT +# + diff --git a/features/scsi/scsi-debug.cfg b/features/scsi/scsi-debug.cfg index 11dc381f..90e6aa4b 100644 --- a/features/scsi/scsi-debug.cfg +++ b/features/scsi/scsi-debug.cfg @@ -1,2 +1,3 @@ # SPDX-License-Identifier: MIT +CONFIG_SCSI_LOWLEVEL=y CONFIG_SCSI_DEBUG=m diff --git a/features/scsi/scsi-debug.scc b/features/scsi/scsi-debug.scc index 2032872a..f591db62 100644 --- a/features/scsi/scsi-debug.scc +++ b/features/scsi/scsi-debug.scc @@ -5,5 +5,6 @@ define KFEATURE_COMPATIBILITY board # if we are turning on debug support, we need to be sure that core scsi # support is enabled. include scsi.scc +include disk.scc kconf hardware scsi-debug.cfg diff --git a/features/security/security-arm64.cfg b/features/security/security-arm64.cfg new file mode 100644 index 00000000..5222afb3 --- /dev/null +++ b/features/security/security-arm64.cfg @@ -0,0 +1,29 @@ +# SPDX-License-Identifier: MIT + +# Make sure PAN emulation is enabled. +CONFIG_ARM64_SW_TTBR0_PAN=y + +# Enable Kernel Page Table Isolation to remove an entire class of cache timing side-channels. +CONFIG_UNMAP_KERNEL_AT_EL0=y + +# Software Shadow Stack or PAC +CONFIG_SHADOW_CALL_STACK=y + +# Pointer authentication (ARMv8.3 and later). If hardware actually supports it, one can +# turn off CONFIG_STACKPROTECTOR_STRONG with this enabled. +CONFIG_ARM64_PTR_AUTH=y +CONFIG_ARM64_PTR_AUTH_KERNEL=y + +# Available in ARMv8.5 and later. +CONFIG_ARM64_BTI=y +CONFIG_ARM64_BTI_KERNEL=y +CONFIG_ARM64_MTE=y +CONFIG_KASAN_HW_TAGS=y +CONFIG_ARM64_E0PD=y + +# Available in ARMv8.7 and later. +CONFIG_ARM64_EPAN=y + +# Enable Control Flow Integrity +CONFIG_CFI_CLANG=y +# CONFIG_CFI_PERMISSIVE is not set diff --git a/features/security/security-x86_64.cfg b/features/security/security-x86_64.cfg new file mode 100644 index 00000000..1c12034a --- /dev/null +++ b/features/security/security-x86_64.cfg @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT +# Modern libc no longer needs a fixed-position mapping in userspace, remove it as a possible target. +CONFIG_LEGACY_VSYSCALL_NONE=y diff --git a/features/security/security.cfg b/features/security/security.cfg index 0486eb1a..336adcc4 100644 --- a/features/security/security.cfg +++ b/features/security/security.cfg @@ -1,7 +1,6 @@ # SPDX-License-Identifier: MIT # Protect against ioctl buffer overflows CONFIG_HARDENED_USERCOPY=y -# CONFIG_HARDENED_USERCOPY_FALLBACK is not set # Check for memory copies that might overflow a structure in str*() and mem*() # functions both at build-time and run-time @@ -15,31 +14,24 @@ CONFIG_SLAB_FREELIST_HARDENED=y CONFIG_STACKPROTECTOR=y CONFIG_STACKPROTECTOR_STRONG=y -# Perform extensive checks on reference counting -CONFIG_REFCOUNT_FULL=y - # Disable to ensure random heap placement to make exploits harder -# CONFIG_COMPAT_BRK is not set +CONFIG_COMPAT_BRK=n # Disable; exposes kernel text image layout -# CONFIG_PROC_KCORE is not set +CONFIG_PROC_KCORE=n # Increases the low-level kernel attack surface. Disable it instead. # Removes the modify_ldt system call. CONFIG_EXPERT=y CONFIG_MODIFY_LDT_SYSCALL=n -# Modern libc no longer needs a fixed-position mapping in userspace, remove it as a possible target. -# CONFIG_LEGACY_VSYSCALL_EMULATE is not set -CONFIG_LEGACY_VSYSCALL_NONE=y - # Prior to v4.1, assists heap memory attacks; best to keep interface disabled. -# CONFIG_INET_DIAG is not set +CONFIG_INET_DIAG=n # Do not allow direct physical memory access (enable only STRICT mode...) # Note that drivers like uvesafb/v86d depending on direct physical memory # access would be affected. -# CONFIG_DEVMEM is not set +CONFIG_DEVMEM=y CONFIG_STRICT_DEVMEM=y CONFIG_IO_STRICT_DEVMEM=y @@ -48,7 +40,6 @@ CONFIG_SCHED_STACK_END_CHECK=y CONFIG_DEBUG_LIST=y CONFIG_DEBUG_SG=y CONFIG_DEBUG_NOTIFIERS=y -CONFIG_DEBUG_CREDENTIALS=y # Information exposure CONFIG_PAGE_POISONING=y @@ -64,3 +55,15 @@ CONFIG_STRICT_MODULE_RWX=y # Meltdown and Spectre CONFIG_PAGE_TABLE_ISOLATION=y CONFIG_RETPOLINE=y + +# Exposing the TPM's Random Number Generator as a hwrng device. +CONFIG_HW_RANDOM_TPM=y + +# Warn on W+X mappings at boot +CONFIG_DEBUG_WX=y + +# Restrict unprivileged access to the kernel syslog +CONFIG_SECURITY_DMESG_RESTRICT=y + +# The kernel will automatically load the module of any line dicipline that is asked for. +CONFIG_LDISC_AUTOLOAD=n diff --git a/features/security/security.scc b/features/security/security.scc index 4abdf457..f3a651c0 100644 --- a/features/security/security.scc +++ b/features/security/security.scc @@ -3,3 +3,11 @@ define KFEATURE_DESCRIPTION "Enable/disable configurations that impact kernel se define KFEATURE_COMPATIBILITY all kconf non-hardware security.cfg + +if [ "$KARCH" = "x86_64" ]; then + kconf non-hardware security-x86_64.cfg +fi + +if [ "$KARCH" = "arm64" ]; then + kconf non-hardware security-arm64.cfg +fi diff --git a/features/soc/baytrail/baytrail.cfg b/features/soc/baytrail/baytrail.cfg index 5f182456..c1b1120a 100644 --- a/features/soc/baytrail/baytrail.cfg +++ b/features/soc/baytrail/baytrail.cfg @@ -3,7 +3,6 @@ CONFIG_PCI=y CONFIG_SND_SOC=m -CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_CLASS_DEVICE=y # SATA Support @@ -15,7 +14,6 @@ CONFIG_X86_INTEL_LPSS=y # GPIO Support CONFIG_GPIOLIB=y -CONFIG_GPIO_SYSFS=y CONFIG_SERIAL_8250_DW=y diff --git a/features/soc/broxton/broxton.cfg b/features/soc/broxton/broxton.cfg index b62b895c..4a760f6b 100644 --- a/features/soc/broxton/broxton.cfg +++ b/features/soc/broxton/broxton.cfg @@ -15,10 +15,9 @@ CONFIG_DMA_VIRTUAL_CHANNELS=y CONFIG_INTEL_IDMA64=y # GPIO support -CONFIG_GPIO_SYSFS=y CONFIG_GPIO_GENERIC=y CONFIG_GPIO_GENERIC_PLATFORM=y # ACPI operation region support for BXT WhiskeyCove PMIC -CONFIG_INTEL_SOC_PMIC_BXTWC=y +CONFIG_INTEL_SOC_PMIC_BXTWC=m CONFIG_BXT_WC_PMIC_OPREGION=y diff --git a/features/soc/skylake/skylake.cfg b/features/soc/skylake/skylake.cfg index b2140b05..a1641a09 100644 --- a/features/soc/skylake/skylake.cfg +++ b/features/soc/skylake/skylake.cfg @@ -16,7 +16,6 @@ CONFIG_SENSORS_I5500=m CONFIG_SND_HDA_I915=y CONFIG_SND_SOC_INTEL_SKL_RT286_MACH=m CONFIG_SND_SOC_INTEL_SST=m -CONFIG_SND_SOC_INTEL_SST_ACPI=m CONFIG_SND_DYNAMIC_MINORS=y CONFIG_CRC8=m @@ -24,7 +23,6 @@ CONFIG_CRC8=m CONFIG_BT_HCIUART=m CONFIG_BT_HCIUART_INTEL=y CONFIG_USB_EHCI_PCI=y -CONFIG_GPIO_LYNXPOINT=m # Other misc support CONFIG_INTEL_MEI_TXE=m diff --git a/features/sound/intel-snd-sof.cfg b/features/sound/intel-snd-sof.cfg new file mode 100644 index 00000000..5efcd0c8 --- /dev/null +++ b/features/sound/intel-snd-sof.cfg @@ -0,0 +1,12 @@ +# SPDX-License-Identifier: MIT +CONFIG_SOUNDWIRE=m +CONFIG_SND_SOC=m +CONFIG_SND_SOC_SOF_TOPLEVEL=y +CONFIG_SND_SOC_SOF_INTEL_TOPLEVEL=y +CONFIG_SND_SOC_SOF_PCI=m +CONFIG_SND_SOC_SOF_ALDERLAKE=m +CONFIG_SND_SOC_SOF_INTEL_SOUNDWIRE=m +CONFIG_SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES=y +CONFIG_SND_SOC_INTEL_SOUNDWIRE_SOF_MACH=m +CONFIG_SND_SOC_SOF_HDA_LINK=y +CONFIG_SND_SOC_SOF_HDA_AUDIO_CODEC=y diff --git a/features/sound/intel-snd-sof.scc b/features/sound/intel-snd-sof.scc new file mode 100644 index 00000000..85632930 --- /dev/null +++ b/features/sound/intel-snd-sof.scc @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable Intel Sound Open Firmware(SOF) support for Intel audio DSPs" + +kconf hardware intel-snd-sof.cfg diff --git a/features/stm/stm.cfg b/features/stm/stm.cfg new file mode 100644 index 00000000..83fe45a9 --- /dev/null +++ b/features/stm/stm.cfg @@ -0,0 +1,7 @@ +CONFIG_STM=m +CONFIG_STM_PROTO_BASIC=m +CONFIG_STM_PROTO_SYS_T=m +CONFIG_STM_DUMMY=m +CONFIG_STM_SOURCE_CONSOLE=m +CONFIG_STM_SOURCE_HEARTBEAT=m +CONFIG_STM_SOURCE_FTRACE=m diff --git a/features/stm/stm.scc b/features/stm/stm.scc new file mode 100644 index 00000000..1e340623 --- /dev/null +++ b/features/stm/stm.scc @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "A System Trace Module support" + +kconf hardware stm.cfg diff --git a/features/telemetry/intel-telemetry.cfg b/features/telemetry/intel-telemetry.cfg index dd07fe91..9372aa17 100644 --- a/features/telemetry/intel-telemetry.cfg +++ b/features/telemetry/intel-telemetry.cfg @@ -3,8 +3,8 @@ CONFIG_X86_64=y # Other dependencies -CONFIG_INTEL_PMC_IPC=y +CONFIG_MFD_INTEL_PMC_BXT=m CONFIG_INTEL_PUNIT_IPC=y # The feature -CONFIG_INTEL_TELEMETRY=y +CONFIG_INTEL_TELEMETRY=m diff --git a/features/thermal/coretemp-x86_64.cfg b/features/thermal/coretemp-x86_64.cfg new file mode 100644 index 00000000..4a34163a --- /dev/null +++ b/features/thermal/coretemp-x86_64.cfg @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +# ACPI INT340X thermal drivers +CONFIG_INT340X_THERMAL=m + diff --git a/features/thermal/coretemp.cfg b/features/thermal/coretemp.cfg index 85e2d58b..1b89b549 100644 --- a/features/thermal/coretemp.cfg +++ b/features/thermal/coretemp.cfg @@ -8,12 +8,10 @@ CONFIG_SENSORS_CORETEMP=m # Intel SoCs DTS thermal driver CONFIG_INTEL_SOC_DTS_THERMAL=m -# ACPI INT340X thermal drivers -CONFIG_INT340X_THERMAL=m - # Intel PowerClamp idle injection driver CONFIG_INTEL_POWERCLAMP=m # Intel PMIC thermal driver +CONFIG_MFD_INTEL_PMC_BXT=m CONFIG_INTEL_SOC_PMIC_BXTWC=m CONFIG_INTEL_BXT_PMIC_THERMAL=m diff --git a/features/thermal/coretemp.scc b/features/thermal/coretemp.scc index 272d5578..ded07295 100644 --- a/features/thermal/coretemp.scc +++ b/features/thermal/coretemp.scc @@ -3,3 +3,7 @@ define KFEATURE_DESCRIPTION "Coretemp support for Intel platforms" define KFEATURE_COMPATIBILITY board kconf hardware coretemp.cfg +if [ "$KARCH" = "x86_64" ] ; then + kconf hardware coretemp-x86_64.cfg +fi + diff --git a/features/thunderbolt/thunderbolt.cfg b/features/thunderbolt/thunderbolt.cfg new file mode 100644 index 00000000..b110f956 --- /dev/null +++ b/features/thunderbolt/thunderbolt.cfg @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +CONFIG_USB4=m +CONFIG_INTEL_WMI_THUNDERBOLT=m +CONFIG_USB4_NET=m diff --git a/features/thunderbolt/thunderbolt.scc b/features/thunderbolt/thunderbolt.scc new file mode 100644 index 00000000..4216e9b6 --- /dev/null +++ b/features/thunderbolt/thunderbolt.scc @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Thunderbolt support" + +kconf hardware thunderbolt.cfg diff --git a/features/tpm/tpm-1.2.cfg b/features/tpm/tpm-1.2.cfg new file mode 100644 index 00000000..d1fcf98c --- /dev/null +++ b/features/tpm/tpm-1.2.cfg @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: MIT +# Enable TPM 1.2 device drivers. +CONFIG_TCG_TIS_I2C_ATMEL=y +CONFIG_TCG_TIS_I2C_INFINEON=y +CONFIG_TCG_TIS_I2C_NUVOTON=y +CONFIG_TCG_NSC=y +CONFIG_TCG_ATMEL=y +CONFIG_TCG_INFINEON=y +CONFIG_TCG_TIS_ST33ZP24=y +CONFIG_TCG_TIS_ST33ZP24_I2C=y +CONFIG_TCG_TIS_ST33ZP24_SPI=y
\ No newline at end of file diff --git a/features/tpm/tpm-1.2.scc b/features/tpm/tpm-1.2.scc new file mode 100644 index 00000000..74900486 --- /dev/null +++ b/features/tpm/tpm-1.2.scc @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable TCG TPM (Trusted Computing Group Trusted Platform Module) 1.2 drivers" +define KFEATURE_COMPATIBILITY board + +include tpm-common.scc + +kconf hardware tpm-1.2.cfg diff --git a/features/tpm/tpm-2.0-crb.cfg b/features/tpm/tpm-2.0-crb.cfg new file mode 100644 index 00000000..27a1ba25 --- /dev/null +++ b/features/tpm/tpm-2.0-crb.cfg @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT +# Enable TPM device drivers. +CONFIG_TCG_CRB=y diff --git a/features/tpm/tpm-2.0-crb.scc b/features/tpm/tpm-2.0-crb.scc new file mode 100644 index 00000000..1274b3c7 --- /dev/null +++ b/features/tpm/tpm-2.0-crb.scc @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable TCG CRB TPM (Trusted Computing Group Command Response Buffer Trusted Platform Module) 2.0 driver" +define KFEATURE_COMPATIBILITY board + +include tpm-common.scc + +kconf hardware tpm-2.0-crb.cfg diff --git a/features/tpm/tpm-2.0.cfg b/features/tpm/tpm-2.0.cfg new file mode 100644 index 00000000..9f427afa --- /dev/null +++ b/features/tpm/tpm-2.0.cfg @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +# Enable TPM device drivers. +CONFIG_SPI=y +CONFIG_TCG_TIS_SPI=y diff --git a/features/tpm/tpm-2.0.scc b/features/tpm/tpm-2.0.scc new file mode 100644 index 00000000..83440f8b --- /dev/null +++ b/features/tpm/tpm-2.0.scc @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable TCG TPM (Trusted Computing Group Trusted Platform Module) 2.0 drivers" +define KFEATURE_COMPATIBILITY board + +include tpm-common.scc + +kconf hardware tpm-2.0.cfg diff --git a/features/tpm/tpm-common.cfg b/features/tpm/tpm-common.cfg new file mode 100644 index 00000000..7e2ea6c1 --- /dev/null +++ b/features/tpm/tpm-common.cfg @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: MIT +# Enable TPM hardware support. +CONFIG_TCG_TPM=y +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_TPM=y +CONFIG_TCG_TIS_CORE=y +CONFIG_TCG_TIS=y diff --git a/features/tpm/tpm-common.scc b/features/tpm/tpm-common.scc new file mode 100644 index 00000000..31a070c0 --- /dev/null +++ b/features/tpm/tpm-common.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable common TCG TPM (Trusted Computing Group Trusted Platform Module) features" +define KFEATURE_COMPATIBILITY board + +kconf hardware tpm-common.cfg diff --git a/features/tpm/tpm.cfg b/features/tpm/tpm.cfg deleted file mode 100644 index ea10c1fb..00000000 --- a/features/tpm/tpm.cfg +++ /dev/null @@ -1,20 +0,0 @@ -# SPDX-License-Identifier: MIT -# Enable TPM device drivers. -CONFIG_TCG_TPM=y -CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_TPM=y -CONFIG_TCG_TIS_CORE=y -CONFIG_TCG_TIS=y -CONFIG_SPI=y -CONFIG_TCG_TIS_SPI=y -CONFIG_TCG_TIS_I2C_ATMEL=y -CONFIG_TCG_TIS_I2C_INFINEON=y -CONFIG_TCG_TIS_I2C_NUVOTON=y -CONFIG_TCG_NSC=y -CONFIG_TCG_ATMEL=y -CONFIG_TCG_INFINEON=y -CONFIG_TCG_CRB=y -CONFIG_TCG_VTPM_PROXY=y -CONFIG_TCG_TIS_ST33ZP24=y -CONFIG_TCG_TIS_ST33ZP24_I2C=y -CONFIG_TCG_TIS_ST33ZP24_SPI=y diff --git a/features/tpm/tpm.scc b/features/tpm/tpm.scc index a1435480..1f3ba9cf 100644 --- a/features/tpm/tpm.scc +++ b/features/tpm/tpm.scc @@ -1,5 +1,9 @@ # SPDX-License-Identifier: MIT -define KFEATURE_DESCRIPTION "Enable TCG TPM driver (Trusted Computing Group Trusted Platform Module)" +define KFEATURE_DESCRIPTION "Enable TCG TPM (Trusted Computing Group Trusted Platform Module) drivers" define KFEATURE_COMPATIBILITY board -kconf hardware tpm.cfg +include tpm-common.scc +include tpm-1.2.scc +include tpm-2.0.scc +include tpm-2.0-crb.scc +include vtpm.scc diff --git a/features/tpm/vtpm.cfg b/features/tpm/vtpm.cfg new file mode 100644 index 00000000..eeb58e96 --- /dev/null +++ b/features/tpm/vtpm.cfg @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT +# Enable vTPM device drivers. +CONFIG_TCG_VTPM_PROXY=y diff --git a/features/tpm/vtpm.scc b/features/tpm/vtpm.scc new file mode 100644 index 00000000..e927ffb6 --- /dev/null +++ b/features/tpm/vtpm.scc @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable virtual TCG TPM (Trusted Computing Group Trusted Platform Module) proxy driver" +define KFEATURE_COMPATIBILITY board + +include tpm-common.scc + +kconf hardware vtpm.cfg diff --git a/bsp/intel-x86/intel-x86-hugepage.cfg b/features/transparent-hugepage/transparent-hugepage.cfg index 1367b519..5079bf3f 100644 --- a/bsp/intel-x86/intel-x86-hugepage.cfg +++ b/features/transparent-hugepage/transparent-hugepage.cfg @@ -1,3 +1,6 @@ # SPDX-License-Identifier: MIT +# +# Memory Management options +# CONFIG_TRANSPARENT_HUGEPAGE=y CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y diff --git a/features/transparent-hugepage/transparent-hugepage.scc b/features/transparent-hugepage/transparent-hugepage.scc new file mode 100644 index 00000000..3cad4b3a --- /dev/null +++ b/features/transparent-hugepage/transparent-hugepage.scc @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Transparent Hugepage Support" + +kconf hardware transparent-hugepage.cfg diff --git a/features/tsn/tsn.cfg b/features/tsn/tsn.cfg new file mode 100644 index 00000000..c0cac7db --- /dev/null +++ b/features/tsn/tsn.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +CONFIG_NET_SCH_ETF=m +CONFIG_NET_SCH_CBS=m +CONFIG_NET_SCH_MQPRIO=m +CONFIG_NET_SCH_TAPRIO=m diff --git a/features/tsn/tsn.scc b/features/tsn/tsn.scc new file mode 100644 index 00000000..0f33451e --- /dev/null +++ b/features/tsn/tsn.scc @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable Time-Sensitive Networking support" +kconf non-hardware tsn.cfg diff --git a/features/tun/tun.cfg b/features/tun/tun.cfg new file mode 100644 index 00000000..b45d3e9b --- /dev/null +++ b/features/tun/tun.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +# dependency +CONFIG_INET=y + +CONFIG_TUN=y diff --git a/features/tun/tun.scc b/features/tun/tun.scc new file mode 100644 index 00000000..5a4cc3bc --- /dev/null +++ b/features/tun/tun.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable universal TUN/TAP device driver support" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware tun.cfg diff --git a/features/uptime/uptime-allow-the-optional-limiting-of-kernel-runtime.patch b/features/uptime/uptime-allow-the-optional-limiting-of-kernel-runtime.patch deleted file mode 100644 index aa143059..00000000 --- a/features/uptime/uptime-allow-the-optional-limiting-of-kernel-runtime.patch +++ /dev/null @@ -1,251 +0,0 @@ -From a21e483b57c8c31beaa5063268ec35da375daf04 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@windriver.com> -Date: Tue, 12 Jul 2011 10:26:50 -0400 -Subject: [PATCH] uptime: allow the optional limiting of kernel runtime - -Introduce the ability to limit the limit the uptime of a kernel. -When enabled, these options set a maximum uptime on the kernel, and -(optionally) trigger a clean reboot at expiration. - -This functionality may appear to be very close to the softdog watchdog -implementation. It is. But can't be the softdog for several reasons: - - - The soft watchdog should be available while this functionality is active - - The duration range is different between this and the softdog. The - timeout available here is potentially quite a bit longer. - - At expiration, there are different expiration requirements and actions. - - This functionality is specific to a particular use case and should - not impact mainline functionality - -To cleanly restart the kernel after one minute of uptime, the following -config items would be required: - - CONFIG_UPTIME_LIMITED_KERNEL=y - CONFIG_UPTIME_LIMIT_DURATION=1 - CONFIG_UPTIME_LIMIT_KERNEL_REBOOT=y - -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> - -diff --git a/init/Kconfig b/init/Kconfig -index cac3f096050d..77d6d5fa1b1d 100644 ---- a/init/Kconfig -+++ b/init/Kconfig -@@ -1376,6 +1376,31 @@ menuconfig EXPERT - environments which can tolerate a "non-standard" kernel. - Only use this if you really know what you are doing. - -+config UPTIME_LIMITED_KERNEL -+ bool "Create a kernel with uptime limitations" -+ default n -+ help -+ Limit the amount of time a kernel can run. The associated UPTIME_LIMIT* -+ kernel config options should be used to tune the behaviour. -+ -+config UPTIME_LIMIT_DURATION -+ int "Kernel uptime limit in minutes" -+ depends on UPTIME_LIMITED_KERNEL -+ range 0 14400 -+ default 0 -+ help -+ Define the uptime limitation on a kernel in minutes. Once -+ the defined time expires the kernel will emit a warning, cease -+ to be usable and eventually restart. The valid range is 0 (disable) -+ to 14400 (10 days) -+ -+config UPTIME_LIMIT_KERNEL_REBOOT -+ bool "Reboot a time limited kernel at expiration" -+ depends on UPTIME_LIMITED_KERNEL -+ default y -+ help -+ Reboot an uptime limited kernel at expiration. -+ - config UID16 - bool "Enable 16-bit UID system calls" if EXPERT - depends on HAVE_UID16 && MULTIUSER -diff --git a/kernel/Makefile b/kernel/Makefile -index e2ec54e2b952..6b7bdddd624b 100644 ---- a/kernel/Makefile -+++ b/kernel/Makefile -@@ -45,6 +45,7 @@ obj-$(CONFIG_FREEZER) += freezer.o - obj-$(CONFIG_PROFILING) += profile.o - obj-$(CONFIG_STACKTRACE) += stacktrace.o - obj-y += time/ -+obj-$(CONFIG_UPTIME_LIMITED_KERNEL) += uptime_limit.o - obj-$(CONFIG_FUTEX) += futex.o - ifeq ($(CONFIG_COMPAT),y) - obj-$(CONFIG_FUTEX) += futex_compat.o -diff --git a/kernel/uptime_limit.c b/kernel/uptime_limit.c -new file mode 100644 -index 000000000000..b6a1a5e4f9d9 ---- /dev/null -+++ b/kernel/uptime_limit.c -@@ -0,0 +1,166 @@ -+/* -+ * uptime_limit.c -+ * -+ * This file contains the functions which can limit kernel uptime -+ * -+ * Copyright (C) 2011 Bruce Ashfield (bruce.ashfield@windriver.com) -+ * -+ * This program is free software; you can redistribute it and/or modify -+ * it under the terms of the GNU General Public License as published by -+ * the Free Software Foundation; either version 2 of the License, or -+ * (at your option) any later version. -+ * -+ * This program is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * You should have received a copy of the GNU General Public License -+ * along with this program; if not, write to the Free Software -+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -+ * -+ * -+ * This functionality is somewhat close to the softdog watchdog -+ * implementation, but it cannot be used directly for several reasons: -+ * -+ * - The soft watchdog should be available while this functionality is active -+ * - The duration range is different between this and the softdog. The -+ * timeout available here is potentially quite a bit longer. -+ * - At expiration, there are different expiration requirements and actions. -+ * - This functionality is specific to a particular use case and should -+ * not impact mainline functionality -+ * -+ */ -+#include <linux/kernel.h> -+#include <linux/reboot.h> -+#include <linux/timer.h> -+#include <linux/delay.h> -+#include <linux/kthread.h> -+ -+#define UPTIME_LIMIT_IN_SECONDS (CONFIG_UPTIME_LIMIT_DURATION * 60) -+#define MIN(X, Y) ((X) <= (Y) ? (X) : (Y)) -+#define TEN_MINUTES_IN_SECONDS 600 -+ -+enum uptime_expiration_type { -+ uptime_no_action, -+ uptime_reboot -+}; -+ -+static enum uptime_expiration_type uptime_expiration_action = uptime_no_action; -+static struct timer_list timelimit_timer; -+static struct task_struct *uptime_worker_task; -+ -+static void timelimit_expire(unsigned long timeout_seconds) -+{ -+ char msg[128]; -+ int msglen = 127; -+ -+ if (timeout_seconds) { -+ if (timeout_seconds >= 60) -+ snprintf(msg, msglen, -+ "Uptime: kernel validity duration has %d %s remaining\n", -+ (int) timeout_seconds / 60, "minute(s)"); -+ else -+ snprintf(msg, msglen, -+ "Uptime: kernel validity duration has %d %s remaining\n", -+ (int) timeout_seconds, "seconds"); -+ -+ printk(KERN_CRIT "%s", msg); -+ -+ timelimit_timer.expires = jiffies + timeout_seconds * HZ; -+ timelimit_timer.data = 0; -+ add_timer_on(&timelimit_timer, cpumask_first(cpu_online_mask)); -+ } else { -+ printk(KERN_CRIT "Uptime: Kernel validity timeout has expired\n"); -+#ifdef CONFIG_UPTIME_LIMIT_KERNEL_REBOOT -+ uptime_expiration_action = uptime_reboot; -+ wake_up_process(uptime_worker_task); -+ } -+#endif -+} -+ -+/* -+ * This thread starts and then immediately goes to sleep. When it is woken -+ * up, it carries out the instructions left in uptime_expiration_action. If -+ * no action was specified it simply goes back to sleep. -+ */ -+static int uptime_worker(void *unused) -+{ -+ set_current_state(TASK_INTERRUPTIBLE); -+ -+ while (!kthread_should_stop()) { -+ schedule(); -+ -+ if (kthread_should_stop()) -+ break; -+ -+ if (uptime_expiration_action == uptime_reboot) { -+ printk(KERN_CRIT "Uptime: restarting machine\n"); -+ kernel_restart(NULL); -+ } -+ -+ set_current_state(TASK_INTERRUPTIBLE); -+ } -+ __set_current_state(TASK_RUNNING); -+ -+ return 0; -+} -+ -+static int timeout_enable(int cpu) -+{ -+ int err = 0; -+ int warning_limit; -+ -+ /* -+ * Create an uptime worker thread. This thread is required since the -+ * safe version of kernel restart cannot be called from a -+ * non-interruptible context. Which means we cannot call it directly -+ * from a timer callback. So we arrange for the timer expiration to -+ * wakeup a thread, which performs the action. -+ */ -+ uptime_worker_task = kthread_create(uptime_worker, -+ (void *)(unsigned long)cpu, -+ "uptime_worker/%d", cpu); -+ if (IS_ERR(uptime_worker_task)) { -+ printk(KERN_ERR "Uptime: task for cpu %i failed\n", cpu); -+ err = PTR_ERR(uptime_worker_task); -+ goto out; -+ } -+ /* bind to cpu0 to avoid migration and hot plug nastiness */ -+ kthread_bind(uptime_worker_task, cpu); -+ wake_up_process(uptime_worker_task); -+ -+ /* Create the timer that will wake the uptime thread at expiration */ -+ init_timer(&timelimit_timer); -+ timelimit_timer.function = timelimit_expire; -+ /* -+ * Fire two timers. One warning timeout and the final timer -+ * which will carry out the expiration action. The warning timer will -+ * expire at the minimum of half the original time or ten minutes. -+ */ -+ warning_limit = MIN(UPTIME_LIMIT_IN_SECONDS/2, TEN_MINUTES_IN_SECONDS); -+ timelimit_timer.expires = jiffies + warning_limit * HZ; -+ timelimit_timer.data = UPTIME_LIMIT_IN_SECONDS - warning_limit; -+ -+ add_timer_on(&timelimit_timer, cpumask_first(cpu_online_mask)); -+out: -+ return err; -+} -+ -+static int __init timelimit_init(void) -+{ -+ int err = 0; -+ -+ printk(KERN_INFO "Uptime: system uptime restrictions enabled\n"); -+ -+ /* -+ * Enable the timeout thread for cpu 0 only, assuming that the -+ * uptime limit is non-zero, to protect against any cpu -+ * migration issues. -+ */ -+ if (UPTIME_LIMIT_IN_SECONDS) -+ err = timeout_enable(0); -+ -+ return err; -+} -+device_initcall(timelimit_init); --- -2.10.1 - diff --git a/features/uptime/uptime.scc b/features/uptime/uptime.scc deleted file mode 100644 index 4f8a58ba..00000000 --- a/features/uptime/uptime.scc +++ /dev/null @@ -1,2 +0,0 @@ -# SPDX-License-Identifier: MIT -patch uptime-allow-the-optional-limiting-of-kernel-runtime.patch diff --git a/features/usb/usb-dummy-hcd.cfg b/features/usb/usb-dummy-hcd.cfg new file mode 100644 index 00000000..ab7c2143 --- /dev/null +++ b/features/usb/usb-dummy-hcd.cfg @@ -0,0 +1,2 @@ +# SPDX-License-Identifier: MIT +CONFIG_USB_DUMMY_HCD=y diff --git a/features/usb/usb-dummy-hcd.scc b/features/usb/usb-dummy-hcd.scc new file mode 100644 index 00000000..6684ed9c --- /dev/null +++ b/features/usb/usb-dummy-hcd.scc @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable emulated USB host and device support (dummy HCD)" +define KFEATURE_COMPATIBILITY all + +include usb-base.scc + +kconf non-hardware usb-dummy-hcd.cfg diff --git a/features/usb/usb-raw-gadget.cfg b/features/usb/usb-raw-gadget.cfg new file mode 100644 index 00000000..6e169ab5 --- /dev/null +++ b/features/usb/usb-raw-gadget.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +# dependency +CONFIG_USB_GADGET=y + +CONFIG_USB_RAW_GADGET=y diff --git a/features/usb/usb-raw-gadget.scc b/features/usb/usb-raw-gadget.scc new file mode 100644 index 00000000..9f0c2eb8 --- /dev/null +++ b/features/usb/usb-raw-gadget.scc @@ -0,0 +1,7 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable USB raw gadget" +define KFEATURE_COMPATIBILITY all + +include usb-base.scc + +kconf non-hardware usb-raw-gadget.cfg diff --git a/features/usb/usb-typec.cfg b/features/usb/usb-typec.cfg index f8cef1d3..3c5a2312 100644 --- a/features/usb/usb-typec.cfg +++ b/features/usb/usb-typec.cfg @@ -3,7 +3,9 @@ CONFIG_TYPEC=m CONFIG_TYPEC_TCPM=m # Dependencies -CONFIG_INTEL_PMC_IPC=y +CONFIG_MFD_INTEL_PMC_BXT=m # Intel WhiskeyCove PMIC USB Type-C PHY driver CONFIG_TYPEC_WCOVE=m + +CONFIG_TYPEC_TCPCI=m diff --git a/features/vdso/vdso.cfg b/features/vdso/vdso.cfg index 9b1cdd3d..ba84655b 100644 --- a/features/vdso/vdso.cfg +++ b/features/vdso/vdso.cfg @@ -1,2 +1,2 @@ # SPDX-License-Identifier: MIT -# CONFIG_COMPAT_VDSO is not set +CONFIG_COMPAT_VDSO=n diff --git a/features/vfat/fat-Replace-prandom_u32-with-get_random_u32.patch b/features/vfat/fat-Replace-prandom_u32-with-get_random_u32.patch new file mode 100644 index 00000000..3d4b8092 --- /dev/null +++ b/features/vfat/fat-Replace-prandom_u32-with-get_random_u32.patch @@ -0,0 +1,40 @@ +From 0b07d2478b6baf627d000f7f1901b148f2a6dfc2 Mon Sep 17 00:00:00 2001 +From: Kevin Hao <kexin.hao@windriver.com> +Date: Fri, 7 Apr 2023 21:03:41 +0800 +Subject: [PATCH] fat: Replace prandom_u32() with get_random_u32() + +The prandom_u32() is just wrapper of get_random_u32() and has been +removed by commit de492c83cae0 ("prandom: remove unused functions"). +So use get_random_u32() directly. + +Signed-off-by: Kevin Hao <kexin.hao@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/fat/namei_vfat.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/fs/fat/namei_vfat.c b/fs/fat/namei_vfat.c +index ef5cf74789ca..ef79a242751d 100644 +--- a/fs/fat/namei_vfat.c ++++ b/fs/fat/namei_vfat.c +@@ -616,7 +616,7 @@ static void vfat_build_dummy_83_buffer(struct inode *dir, char *msdos_name, + 0x1B, 0x1C, 0x1D, 0x1E, 0x1F, 0x22, 0x2a, + 0x3a, 0x3c, 0x3e, 0x3f, 0x5b, 0x5d, 0x7c }; + int i, tilde_pos, slash_pos; +- u32 rand_num = prandom_u32(); ++ u32 rand_num = get_random_u32(); + + /* We need a '~' in the prefix to make Win98 happy. */ + tilde_pos = rand_num % 8; +@@ -651,7 +651,7 @@ static void vfat_build_dummy_83_buffer(struct inode *dir, char *msdos_name, + invalidchar[rand_num % sizeof(invalidchar)]; + rand_num /= sizeof(invalidchar); + if (rand_num < sizeof(invalidchar)) +- rand_num = prandom_u32(); ++ rand_num = get_random_u32(); + } + } + } +-- +2.34.1 + diff --git a/features/vfat/vfat.scc b/features/vfat/vfat.scc index cfe1c7d9..24ec7dfd 100644 --- a/features/vfat/vfat.scc +++ b/features/vfat/vfat.scc @@ -3,3 +3,4 @@ patch FAT-Add-CONFIG_VFAT_FS_NO_DUALNAMES-option.patch patch FAT-Add-CONFIG_VFAT_NO_CREATE_WITH_LONGNAMES-option.patch patch FAT-Added-FAT_NO_83NAME.patch patch fat-don-t-use-obsolete-random32-call-in-namei_vfat.patch +patch fat-Replace-prandom_u32-with-get_random_u32.patch diff --git a/features/vfio/vfio.cfg b/features/vfio/vfio.cfg index 267fbaf8..94991365 100644 --- a/features/vfio/vfio.cfg +++ b/features/vfio/vfio.cfg @@ -1,6 +1,5 @@ # SPDX-License-Identifier: MIT CONFIG_VFIO_IOMMU_TYPE1=m -CONFIG_VFIO_VIRQFD=m CONFIG_VFIO=m CONFIG_VFIO_PCI=m CONFIG_VFIO_PCI_VGA=y diff --git a/features/vswitch/vswitch.cfg b/features/vswitch/vswitch.cfg new file mode 100644 index 00000000..7e39b558 --- /dev/null +++ b/features/vswitch/vswitch.cfg @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +# Misc configs +CONFIG_OPENVSWITCH=m +CONFIG_NET_SCH_INGRESS=m +CONFIG_NET_ACT_POLICE=m diff --git a/features/vswitch/vswitch.scc b/features/vswitch/vswitch.scc new file mode 100644 index 00000000..12c6affb --- /dev/null +++ b/features/vswitch/vswitch.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable in kernel OpenvSwitch module" +define KFEATURE_COMPATIBILITY board + +kconf non-hardware vswitch.cfg diff --git a/features/wifi/ralink-pci.cfg b/features/wifi/ralink-pci.cfg index b4639ea0..c7e95040 100644 --- a/features/wifi/ralink-pci.cfg +++ b/features/wifi/ralink-pci.cfg @@ -10,7 +10,7 @@ CONFIG_RT2500PCI=m CONFIG_RT61PCI=m CONFIG_RT2800PCI=m CONFIG_RT2800PCI_RT33XX=y -config RT2800PCI_RT35XX=y -config RT2800PCI_RT53XX=y -config RT2800PCI_RT3290=y +CONFIG_RT2800PCI_RT35XX=y +CONFIG_RT2800PCI_RT53XX=y +CONFIG_RT2800PCI_RT3290=y diff --git a/features/x2apic/x2apic.cfg b/features/x2apic/x2apic.cfg index ca91dc0d..8efa10f8 100644 --- a/features/x2apic/x2apic.cfg +++ b/features/x2apic/x2apic.cfg @@ -1,3 +1,5 @@ # SPDX-License-Identifier: MIT + +CONFIG_IOMMU_SUPPORT=y CONFIG_IRQ_REMAP=y CONFIG_X86_X2APIC=y diff --git a/features/xen/xen-x86.cfg b/features/xen/xen-x86.cfg new file mode 100644 index 00000000..69fcd731 --- /dev/null +++ b/features/xen/xen-x86.cfg @@ -0,0 +1,11 @@ +# SPDX-License-Identifier: MIT + +CONFIG_HYPERVISOR_GUEST=y +CONFIG_PCI_XEN=y +CONFIG_XEN_ACPI_PROCESSOR=m +CONFIG_XEN_DEBUG_FS=n +CONFIG_XEN_MCE_LOG=y +CONFIG_XEN_PCIDEV_BACKEND=m +CONFIG_XEN_PCIDEV_FRONTEND=y +CONFIG_XEN_PVHVM=y +CONFIG_XEN_SAVE_RESTORE=y diff --git a/features/xen/xen.cfg b/features/xen/xen.cfg new file mode 100644 index 00000000..7da87825 --- /dev/null +++ b/features/xen/xen.cfg @@ -0,0 +1,38 @@ +CONFIG_PARAVIRT=y +CONFIG_XEN=y +CONFIG_XEN_DOM0=y +CONFIG_MMU_NOTIFIER=y +CONFIG_HIBERNATE_CALLBACKS=y +CONFIG_SYS_HYPERVISOR=y +CONFIG_XEN_BLKDEV_FRONTEND=y +CONFIG_XEN_BLKDEV_BACKEND=m +CONFIG_XEN_SCSI_FRONTEND=m +CONFIG_XEN_NETDEV_FRONTEND=y +CONFIG_XEN_NETDEV_BACKEND=m +CONFIG_INPUT_MISC=y +CONFIG_INPUT_XEN_KBDDEV_FRONTEND=y +CONFIG_HVC_IRQ=y +CONFIG_HVC_XEN=y +CONFIG_HVC_XEN_FRONTEND=y +CONFIG_XEN_WDT=m +CONFIG_FB_SYS_FILLRECT=y +CONFIG_FB_SYS_COPYAREA=y +CONFIG_FB_SYS_IMAGEBLIT=y +CONFIG_FB_SYS_FOPS=y +CONFIG_FB_DEFERRED_IO=y +CONFIG_XEN_FBDEV_FRONTEND=y +CONFIG_XEN_BALLOON=y +CONFIG_XEN_SCRUB_PAGES_DEFAULT=y +CONFIG_XEN_DEV_EVTCHN=y +CONFIG_XEN_BACKEND=y +CONFIG_XENFS=y +CONFIG_XEN_COMPAT_XENFS=y +CONFIG_XEN_SYS_HYPERVISOR=y +CONFIG_XEN_XENBUS_FRONTEND=y +CONFIG_XEN_GNTDEV=m +CONFIG_XEN_GRANT_DEV_ALLOC=m +CONFIG_SWIOTLB_XEN=y +CONFIG_XEN_PRIVCMD=y +CONFIG_XEN_HAVE_PVMMU=y +CONFIG_XEN_PVCALLS_FRONTEND=y +CONFIG_XEN_PVCALLS_BACKEND=y diff --git a/features/xen/xen.scc b/features/xen/xen.scc new file mode 100644 index 00000000..e7c85a1b --- /dev/null +++ b/features/xen/xen.scc @@ -0,0 +1,8 @@ +define KFEATURE_DESCRIPTION "Xen Kernel Support" +define KFEATURE_COMPATIBILITY arch + +kconf non-hardware xen.cfg + +if [ "$KARCH" = "x86_64" ] || [ "$KARCH" = "i386" ]; then + kconf non-hardware xen-x86.cfg +fi diff --git a/features/xilinx/hdmi-module/hdmi-module.cfg b/features/xilinx/hdmi-module/hdmi-module.cfg new file mode 100644 index 00000000..b0117515 --- /dev/null +++ b/features/xilinx/hdmi-module/hdmi-module.cfg @@ -0,0 +1,224 @@ +# SPDX-License-Identifier: MIT +CONFIG_VIDEO_TDA1997X=n +CONFIG_SOUND=y +CONFIG_SND=y +CONFIG_SND_TIMER=y +CONFIG_SND_PCM=y +CONFIG_SND_JACK=y +CONFIG_SND_JACK_INPUT_DEV=y +CONFIG_SND_OSSEMUL=n +CONFIG_SND_PCM_TIMER=y +CONFIG_SND_HRTIMER=n +CONFIG_SND_DYNAMIC_MINORS=n +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_PROC_FS=y +CONFIG_SND_VERBOSE_PROCFS=y +CONFIG_SND_VERBOSE_PRINTK=n +CONFIG_SND_DEBUG=n +CONFIG_SND_SEQUENCER=n +CONFIG_SND_DRIVERS=y +CONFIG_SND_DUMMY=n +CONFIG_SND_ALOOP=n +CONFIG_SND_MTPAV=n +CONFIG_SND_SERIAL_U16550=n +CONFIG_SND_MPU401=n + +# +# HD-Audio +# +# end of HD-Audio + +CONFIG_SND_HDA_PREALLOC_SIZE=64 +CONFIG_SND_SPI=y +CONFIG_SND_USB=y +CONFIG_SND_USB_AUDIO=n +CONFIG_SND_USB_UA101=n +CONFIG_SND_USB_CAIAQ=n +CONFIG_SND_USB_6FIRE=n +CONFIG_SND_USB_HIFACE=n +CONFIG_SND_BCD2000=n +CONFIG_SND_USB_POD=n +CONFIG_SND_USB_PODHD=n +CONFIG_SND_USB_TONEPORT=n +CONFIG_SND_USB_VARIAX=n +CONFIG_SND_SOC=y +CONFIG_SND_SOC_AMD_ACP=n +CONFIG_SND_ATMEL_SOC=n +CONFIG_SND_DESIGNWARE_I2S=n + +# +# SoC Audio for Freescale CPUs +# + +# +# Common SoC Audio options for Freescale CPUs: +# +CONFIG_SND_SOC_FSL_ASRC=n +CONFIG_SND_SOC_FSL_SAI=n +CONFIG_SND_SOC_FSL_AUDMIX=n +CONFIG_SND_SOC_FSL_SSI=n +CONFIG_SND_SOC_FSL_SPDIF=n +CONFIG_SND_SOC_FSL_ESAI=n +CONFIG_SND_SOC_FSL_MICFIL=n +CONFIG_SND_SOC_IMX_AUDMUX=n +# end of SoC Audio for Freescale CPUs + +CONFIG_SND_I2S_HI6210_I2S=n +CONFIG_SND_SOC_IMG=n +CONFIG_SND_SOC_MTK_BTCVSD=n +CONFIG_SND_SOC_SOF_TOPLEVEL=n + +# +# STMicroelectronics STM32 SOC audio support +# +# end of STMicroelectronics STM32 SOC audio support + +CONFIG_SND_SOC_XILINX_DP=n +CONFIG_SND_SOC_XILINX_AUDIO_FORMATTER=n +CONFIG_SND_SOC_XILINX_SDI=n +CONFIG_SND_SOC_XILINX_I2S=n +CONFIG_SND_SOC_XILINX_SPDIF=n +CONFIG_SND_SOC_XTFPGA_I2S=n +CONFIG_ZX_TDM=n +CONFIG_SND_SOC_I2C_AND_SPI=y + +# +# CODEC drivers +# +CONFIG_SND_SOC_AC97_CODEC=n +CONFIG_SND_SOC_ADAU1701=n +CONFIG_SND_SOC_ADAU1761_I2C=n +CONFIG_SND_SOC_ADAU1761_SPI=n +CONFIG_SND_SOC_ADAU7002=n +CONFIG_SND_SOC_AK4104=n +CONFIG_SND_SOC_AK4118=n +CONFIG_SND_SOC_AK4458=n +CONFIG_SND_SOC_AK4554=n +CONFIG_SND_SOC_AK4613=n +CONFIG_SND_SOC_AK4642=n +CONFIG_SND_SOC_AK5386=n +CONFIG_SND_SOC_AK5558=n +CONFIG_SND_SOC_ALC5623=n +CONFIG_SND_SOC_BD28623=n +CONFIG_SND_SOC_BT_SCO=n +CONFIG_SND_SOC_CS35L32=n +CONFIG_SND_SOC_CS35L33=n +CONFIG_SND_SOC_CS35L34=n +CONFIG_SND_SOC_CS35L35=n +CONFIG_SND_SOC_CS35L36=n +CONFIG_SND_SOC_CS42L42=n +CONFIG_SND_SOC_CS42L51_I2C=n +CONFIG_SND_SOC_CS42L52=n +CONFIG_SND_SOC_CS42L56=n +CONFIG_SND_SOC_CS42L73=n +CONFIG_SND_SOC_CS4265=n +CONFIG_SND_SOC_CS4270=n +CONFIG_SND_SOC_CS4271_I2C=n +CONFIG_SND_SOC_CS4271_SPI=n +CONFIG_SND_SOC_CS42XX8_I2C=n +CONFIG_SND_SOC_CS43130=n +CONFIG_SND_SOC_CS4341=n +CONFIG_SND_SOC_CS4349=n +CONFIG_SND_SOC_CS53L30=n +CONFIG_SND_SOC_CX2072X=n +CONFIG_SND_SOC_DMIC=n +CONFIG_SND_SOC_ES7134=n +CONFIG_SND_SOC_ES7241=n +CONFIG_SND_SOC_ES8316=n +CONFIG_SND_SOC_ES8328_I2C=n +CONFIG_SND_SOC_ES8328_SPI=n +CONFIG_SND_SOC_GTM601=n +CONFIG_SND_SOC_INNO_RK3036=n +CONFIG_SND_SOC_MAX98088=n +CONFIG_SND_SOC_MAX98357A=n +CONFIG_SND_SOC_MAX98504=n +CONFIG_SND_SOC_MAX9867=n +CONFIG_SND_SOC_MAX98927=n +CONFIG_SND_SOC_MAX98373=n +CONFIG_SND_SOC_MAX9860=n +CONFIG_SND_SOC_MSM8916_WCD_DIGITAL=n +CONFIG_SND_SOC_PCM1681=n +CONFIG_SND_SOC_PCM1789_I2C=n +CONFIG_SND_SOC_PCM179X_I2C=n +CONFIG_SND_SOC_PCM179X_SPI=n +CONFIG_SND_SOC_PCM186X_I2C=n +CONFIG_SND_SOC_PCM186X_SPI=n +CONFIG_SND_SOC_PCM3060_I2C=n +CONFIG_SND_SOC_PCM3060_SPI=n +CONFIG_SND_SOC_PCM3168A_I2C=n +CONFIG_SND_SOC_PCM3168A_SPI=n +CONFIG_SND_SOC_PCM512x_I2C=n +CONFIG_SND_SOC_PCM512x_SPI=n +CONFIG_SND_SOC_RK3328=n +CONFIG_SND_SOC_RT5616=n +CONFIG_SND_SOC_RT5631=n +CONFIG_SND_SOC_SGTL5000=n +CONFIG_SND_SOC_SIMPLE_AMPLIFIER=n +CONFIG_SND_SOC_SIRF_AUDIO_CODEC=n +CONFIG_SND_SOC_SPDIF=n +CONFIG_SND_SOC_SSM2305=n +CONFIG_SND_SOC_SSM2602_SPI=n +CONFIG_SND_SOC_SSM2602_I2C=n +CONFIG_SND_SOC_SSM4567=n +CONFIG_SND_SOC_STA32X=n +CONFIG_SND_SOC_STA350=n +CONFIG_SND_SOC_STI_SAS=n +CONFIG_SND_SOC_TAS2552=n +CONFIG_SND_SOC_TAS5086=n +CONFIG_SND_SOC_TAS571X=n +CONFIG_SND_SOC_TAS5720=n +CONFIG_SND_SOC_TAS6424=n +CONFIG_SND_SOC_TDA7419=n +CONFIG_SND_SOC_TFA9879=n +CONFIG_SND_SOC_TLV320AIC23_I2C=n +CONFIG_SND_SOC_TLV320AIC23_SPI=n +CONFIG_SND_SOC_TLV320AIC31XX=n +CONFIG_SND_SOC_TLV320AIC32X4_I2C=n +CONFIG_SND_SOC_TLV320AIC32X4_SPI=n +CONFIG_SND_SOC_TLV320AIC3X=n +CONFIG_SND_SOC_TS3A227E=n +CONFIG_SND_SOC_TSCS42XX=n +CONFIG_SND_SOC_TSCS454=n +CONFIG_SND_SOC_UDA1334=n +CONFIG_SND_SOC_WM8510=n +CONFIG_SND_SOC_WM8523=n +CONFIG_SND_SOC_WM8524=n +CONFIG_SND_SOC_WM8580=n +CONFIG_SND_SOC_WM8711=n +CONFIG_SND_SOC_WM8728=n +CONFIG_SND_SOC_WM8731=n +CONFIG_SND_SOC_WM8737=n +CONFIG_SND_SOC_WM8741=n +CONFIG_SND_SOC_WM8750=n +CONFIG_SND_SOC_WM8753=n +CONFIG_SND_SOC_WM8770=n +CONFIG_SND_SOC_WM8776=n +CONFIG_SND_SOC_WM8782=n +CONFIG_SND_SOC_WM8804_I2C=n +CONFIG_SND_SOC_WM8804_SPI=n +CONFIG_SND_SOC_WM8903=n +CONFIG_SND_SOC_WM8904=n +CONFIG_SND_SOC_WM8960=n +CONFIG_SND_SOC_WM8962=n +CONFIG_SND_SOC_WM8974=n +CONFIG_SND_SOC_WM8978=n +CONFIG_SND_SOC_WM8985=n +CONFIG_SND_SOC_ZX_AUD96P22=n +CONFIG_SND_SOC_MAX9759=n +CONFIG_SND_SOC_MT6351=n +CONFIG_SND_SOC_MT6358=n +CONFIG_SND_SOC_NAU8540=n +CONFIG_SND_SOC_NAU8810=n +CONFIG_SND_SOC_NAU8822=n +CONFIG_SND_SOC_NAU8824=n +CONFIG_SND_SOC_TPA6130A2=n +# end of CODEC drivers + +CONFIG_SND_SIMPLE_CARD=n +CONFIG_SND_AUDIO_GRAPH_CARD=n +CONFIG_SND_XEN_FRONTEND=n +CONFIG_HID_PRODIKEYS=n +CONFIG_USB_CONFIGFS_F_UAC1=n +CONFIG_USB_CONFIGFS_F_UAC1_LEGACY=n +CONFIG_USB_CONFIGFS_F_UAC2=n +CONFIG_USB_CONFIGFS_F_MIDI=n diff --git a/features/xilinx/hdmi-module/hdmi-module.scc b/features/xilinx/hdmi-module/hdmi-module.scc new file mode 100644 index 00000000..d248e936 --- /dev/null +++ b/features/xilinx/hdmi-module/hdmi-module.scc @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Kernel Config for hdmi module " +define KFEATURE_COMPATIBILITY board + +kconf hardware hdmi-module.cfg + diff --git a/features/xilinx/overlay_of/overlay_of.cfg b/features/xilinx/overlay_of/overlay_of.cfg new file mode 100644 index 00000000..901d4786 --- /dev/null +++ b/features/xilinx/overlay_of/overlay_of.cfg @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: MIT +# Device Tree support +CONFIG_OF_CONFIGFS=y +CONFIG_OF_OVERLAY=y diff --git a/features/xilinx/overlay_of/overlay_of.scc b/features/xilinx/overlay_of/overlay_of.scc new file mode 100644 index 00000000..1e61bb37 --- /dev/null +++ b/features/xilinx/overlay_of/overlay_of.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable overlay" +define KFEATURE_COMPATIBILITY board + +kconfig hardware overlay_of.cfg diff --git a/features/xilinx/v4l2/v4l2.cfg b/features/xilinx/v4l2/v4l2.cfg new file mode 100644 index 00000000..32a948a3 --- /dev/null +++ b/features/xilinx/v4l2/v4l2.cfg @@ -0,0 +1,23 @@ +# SPDX-License-Identifier: MIT +# Media support +CONFIG_MEDIA_SUPPORT=y +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_CONTROLLER=y + +# V4L +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_VIDEO_DEV=y +CONFIG_VIDEO_V4L2_SUBDEV_API=y + +# Xilinx Video drivers +CONFIG_VIDEO_XILINX=y +CONFIG_VIDEO_XILINX_CFA=y +CONFIG_VIDEO_XILINX_CRESAMPLE=y +CONFIG_VIDEO_XILINX_HLS=y +CONFIG_VIDEO_XILINX_REMAPPER=y +CONFIG_VIDEO_XILINX_RGB2YUV=y +CONFIG_VIDEO_XILINX_SCALER=y +CONFIG_VIDEO_XILINX_SWITCH=y +CONFIG_VIDEO_XILINX_TPG=y +CONFIG_VIDEO_XILINX_VTC=y + diff --git a/features/xilinx/v4l2/v4l2.scc b/features/xilinx/v4l2/v4l2.scc new file mode 100644 index 00000000..bd1201e8 --- /dev/null +++ b/features/xilinx/v4l2/v4l2.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Enable Xilinx V4L2 support" +define KFEATURE_COMPATIBILITY board + +kconfig hardware v4l2.cfg diff --git a/features/yaffs2/0001-yaffs2-convert-read_page-readfolio.patch b/features/yaffs2/0001-yaffs2-convert-read_page-readfolio.patch new file mode 100644 index 00000000..78a5c311 --- /dev/null +++ b/features/yaffs2/0001-yaffs2-convert-read_page-readfolio.patch @@ -0,0 +1,76 @@ +From a10fa57649a96e7cd87ec4b93badc2b441b06ec5 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Wed, 29 Jun 2022 10:51:56 -0400 +Subject: [PATCH] yaffs2: convert read_page -> readfolio + +This is a first pass of changing yaffs2 to use the new read_folio, +versus readpage routines. We also adjust writepage to no longer use +flags, which have been dropped in 5.19+ + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_vfs.c | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) + +diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c +index 8ceb66c0d070..52f2d13c7126 100644 +--- a/fs/yaffs2/yaffs_vfs.c ++++ b/fs/yaffs2/yaffs_vfs.c +@@ -367,13 +367,13 @@ static int yaffs_readpage_unlock(struct file *f, struct page *pg) + return ret; + } + +-static int yaffs_readpage(struct file *f, struct page *pg) ++static int yaffs_read_folio(struct file *f, struct folio *folio) + { + int ret; + +- yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage"); +- ret = yaffs_readpage_unlock(f, pg); +- yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage done"); ++ yaffs_trace(YAFFS_TRACE_OS, "yaffs_read_folio"); ++ ret = yaffs_readpage_unlock(f, &folio->page); ++ yaffs_trace(YAFFS_TRACE_OS, "yaffs_read_folio done"); + return ret; + } + +@@ -548,9 +548,16 @@ static void yaffs_release_space(struct file *f) + } + + #if (YAFFS_USE_WRITE_BEGIN_END > 0) ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0) ++static int yaffs_write_begin(struct file *filp, struct address_space *mapping, ++ loff_t pos, unsigned len, ++ struct page **pagep, void **fsdata) ++#else + static int yaffs_write_begin(struct file *filp, struct address_space *mapping, + loff_t pos, unsigned len, unsigned flags, + struct page **pagep, void **fsdata) ++#endif + { + struct page *pg = NULL; + pgoff_t index = pos >> PAGE_CACHE_SHIFT; +@@ -559,7 +566,9 @@ static int yaffs_write_begin(struct file *filp, struct address_space *mapping, + int space_held = 0; + + /* Get a page */ +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 19, 0) ++ pg = grab_cache_page_write_begin(mapping, index); ++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) + pg = grab_cache_page_write_begin(mapping, index, flags); + #else + pg = __grab_cache_page(mapping, index); +@@ -748,7 +757,7 @@ static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset, + #endif + + static struct address_space_operations yaffs_file_address_operations = { +- .readpage = yaffs_readpage, ++ .read_folio = yaffs_read_folio, + .writepage = yaffs_writepage, + #if (YAFFS_USE_WRITE_BEGIN_END > 0) + .write_begin = yaffs_write_begin, +-- +2.19.1 + diff --git a/features/yaffs2/0001-yaffs2-replace-bdevname-call-with-sprintf.patch b/features/yaffs2/0001-yaffs2-replace-bdevname-call-with-sprintf.patch new file mode 100644 index 00000000..b3c829ab --- /dev/null +++ b/features/yaffs2/0001-yaffs2-replace-bdevname-call-with-sprintf.patch @@ -0,0 +1,34 @@ +From ae1445c1cc1cec47fa51f7831cd9110ecd5b2a55 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Mon, 3 Oct 2022 15:16:27 -0400 +Subject: [PATCH] yaffs2: replace bdevname call with sprintf + +commit 900d156bac2bc474cf7c7bee4efbc6c83ec5ae58 [block: remove bdevname] +removed this function, we follow the pattern and use sprintf as a +replacement. + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_vfs.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c +index 52f2d13c7126..140f7aa7a1a1 100644 +--- a/fs/yaffs2/yaffs_vfs.c ++++ b/fs/yaffs2/yaffs_vfs.c +@@ -117,7 +117,11 @@ + #define Page_Uptodate(page) test_bit(PG_uptodate, &(page)->flags) + + /* FIXME: use sb->s_id instead ? */ +-#define yaffs_devname(sb, buf) bdevname(sb->s_bdev, buf) ++//#define yaffs_devname(sb, buf) bdevname(sb->s_bdev, buf) ++static inline char* yaffs_devname(struct super_block *sb, char *buf) { ++ snprintf(buf, sizeof(buf), "%pg", sb->s_bdev); ++ return buf; ++} + + #else + +-- +2.19.1 + diff --git a/features/yaffs2/0001-yaffs2-update-VFS-ctime-operations-to-6.6.patch b/features/yaffs2/0001-yaffs2-update-VFS-ctime-operations-to-6.6.patch new file mode 100644 index 00000000..9ea1aa07 --- /dev/null +++ b/features/yaffs2/0001-yaffs2-update-VFS-ctime-operations-to-6.6.patch @@ -0,0 +1,64 @@ +From 70f40841c195a81a8ef8290862adeb86fe264b24 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Thu, 21 Sep 2023 17:04:31 -0400 +Subject: [PATCH] yaffs2: update VFS ctime operations to 6.6+ + +In 6.6+ kernels the inode ctime is hidden, and should only +be accessed through accesor routines. We convert one of our +calls to the accesor, but the other, we use the new "hidden" +__ctime. + +We also convert the interator to use the shared iterator and +iterator wrap routines. + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_vfs.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) + +diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c +index 04abeee99ff5..8a9738de8906 100644 +--- a/fs/yaffs2/yaffs_vfs.c ++++ b/fs/yaffs2/yaffs_vfs.c +@@ -282,7 +282,7 @@ MODULE_PARM(yaffs_gc_control, "i"); + } while (0) + #else + #define update_dir_time(dir) do {\ +- (dir)->i_ctime = (dir)->i_mtime = current_time(dir); \ ++ (dir)->i_mtime = inode_set_ctime_to_ts( dir, current_time(dir) ); \ + } while (0) + #endif + +@@ -1901,7 +1901,7 @@ static int yaffs_iterate(struct file *f, struct dir_context *dc) + + return ret_val; + } +- ++WRAP_DIR_ITER(yaffs_iterate) + #else + + static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) +@@ -2018,7 +2018,7 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) + static const struct file_operations yaffs_dir_operations = { + .read = generic_read_dir, + #ifdef YAFFS_USE_DIR_ITERATE +- .iterate = yaffs_iterate, ++ .iterate_shared = shared_yaffs_iterate, + #else + .readdir = yaffs_readdir, + #endif +@@ -2079,8 +2079,9 @@ static void yaffs_fill_inode_from_obj(struct inode *inode, + inode->i_atime.tv_nsec = 0; + inode->i_mtime.tv_sec = (time64_t) obj->yst_mtime; + inode->i_mtime.tv_nsec = 0; +- inode->i_ctime.tv_sec = (time64_t) obj->yst_ctime; +- inode->i_ctime.tv_nsec = 0; ++ //inode->i_ctime.tv_sec = (time64_t) obj->yst_ctime; ++ inode->__i_ctime.tv_sec = (time64_t) obj->yst_ctime; ++ inode->__i_ctime.tv_nsec = 0; + #else + inode->i_rdev = obj->yst_rdev; + inode->i_atime = obj->yst_atime; +-- +2.34.1 + diff --git a/features/yaffs2/0001-yaffs2-v5.12-build-fixups-not-runtime-tested.patch b/features/yaffs2/0001-yaffs2-v5.12-build-fixups-not-runtime-tested.patch new file mode 100644 index 00000000..13bbba8a --- /dev/null +++ b/features/yaffs2/0001-yaffs2-v5.12-build-fixups-not-runtime-tested.patch @@ -0,0 +1,105 @@ +From d16f6eab238d58479a7140507a2eb32573c1a106 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Fri, 19 Mar 2021 12:13:36 -0400 +Subject: [PATCH] yaffs2: v5.12+ build fixups (not runtime tested) + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_vfs.c | 21 +++++++++++---------- + 1 file changed, 11 insertions(+), 10 deletions(-) + +diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c +index a9cf8edc2245..ee9d6955ed79 100644 +--- a/fs/yaffs2/yaffs_vfs.c ++++ b/fs/yaffs2/yaffs_vfs.c +@@ -897,7 +897,7 @@ static int yaffs_vfs_setsize(struct inode *inode, loff_t newsize) + static int yaffs_vfs_setattr(struct inode *inode, struct iattr *attr) + { + #ifdef YAFFS_USE_SETATTR_COPY +- setattr_copy(inode, attr); ++ setattr_copy(&init_user_ns,inode, attr); + return 0; + #else + return inode_setattr(inode, attr); +@@ -905,7 +905,7 @@ static int yaffs_vfs_setattr(struct inode *inode, struct iattr *attr) + + } + +-static int yaffs_setattr(struct dentry *dentry, struct iattr *attr) ++static int yaffs_setattr(struct user_namespace *ns, struct dentry *dentry, struct iattr *attr) + { + struct inode *inode = dentry->d_inode; + int error = 0; +@@ -921,7 +921,7 @@ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr) + #endif + + if (error == 0) +- error = setattr_prepare(dentry, attr); ++ error = setattr_prepare(&init_user_ns,dentry, attr); + if (error == 0) { + int result; + if (!error) { +@@ -1339,7 +1339,7 @@ struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev, + + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) +-static int yaffs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, ++static int yaffs_mknod(struct user_namespace *ns, struct inode *dir, struct dentry *dentry, umode_t mode, + dev_t rdev) + #elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) + static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, +@@ -1433,20 +1433,20 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, + } + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) +-static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) ++static int yaffs_mkdir(struct user_namespace *ns, struct inode *dir, struct dentry *dentry, umode_t mode) + #else + static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode) + #endif + { + int ret_val; + yaffs_trace(YAFFS_TRACE_OS, "yaffs_mkdir"); +- ret_val = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0); ++ ret_val = yaffs_mknod(ns, dir, dentry, mode | S_IFDIR, 0); + return ret_val; + } + + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) +-static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode, ++static int yaffs_create(struct user_namespace *ns, struct inode *dir, struct dentry *dentry, umode_t mode, + bool dummy) + #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) + static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode, +@@ -1459,7 +1459,7 @@ static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode) + #endif + { + yaffs_trace(YAFFS_TRACE_OS, "yaffs_create"); +- return yaffs_mknod(dir, dentry, mode | S_IFREG, 0); ++ return yaffs_mknod(ns, dir, dentry, mode | S_IFREG, 0); + } + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) +@@ -1551,7 +1551,8 @@ static int yaffs_link(struct dentry *old_dentry, struct inode *dir, + return -EPERM; + } + +-static int yaffs_symlink(struct inode *dir, struct dentry *dentry, ++static int yaffs_symlink(struct user_namespace *ns, ++ struct inode *dir, struct dentry *dentry, + const char *symname) + { + struct yaffs_obj *obj; +@@ -1597,7 +1598,7 @@ static int yaffs_symlink(struct inode *dir, struct dentry *dentry, + * NB: POSIX says you can rename an object over an old object of the same name + */ + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)) +-static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry, ++static int yaffs_rename(struct user_namespace *ns, struct inode *old_dir, struct dentry *old_dentry, + struct inode *new_dir, struct dentry *new_dentry, unsigned int unused) + #else + static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry, +-- +2.19.1 + diff --git a/features/yaffs2/Yaffs-check-oob-size-before-auto-selecting-Yaffs1.patch b/features/yaffs2/Yaffs-check-oob-size-before-auto-selecting-Yaffs1.patch index 0fc31e23..1703029f 100644 --- a/features/yaffs2/Yaffs-check-oob-size-before-auto-selecting-Yaffs1.patch +++ b/features/yaffs2/Yaffs-check-oob-size-before-auto-selecting-Yaffs1.patch @@ -1,7 +1,7 @@ -From ccb011a6c94b98c55bc95a55b3eb88f0c0756df3 Mon Sep 17 00:00:00 2001 +From d6913ff1d8bc6eee0d8b075637040f00042d3ad2 Mon Sep 17 00:00:00 2001 From: Jiang Lu <lu.jiang@windriver.com> Date: Fri, 13 Dec 2013 11:18:18 +0800 -Subject: [PATCH] Yaffs:check oob size before auto selecting Yaffs1 +Subject: [PATCH 2/7] Yaffs:check oob size before auto selecting Yaffs1 Yaffs will select Yaffs1 for deives with 512 byte writing size. Moreover, it will enable inband_tags automatically for devices with @@ -15,10 +15,10 @@ Signed-off-by: Jiang Lu <lu.jiang@windriver.com> 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index 568cef421e0f..c3b73681c826 100644 +index c1c80f7a33a0..f4c5ba95d51d 100644 --- a/fs/yaffs2/yaffs_vfs.c +++ b/fs/yaffs2/yaffs_vfs.c -@@ -2708,17 +2708,17 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, +@@ -2963,17 +2963,17 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, yaffs_version = 2; } @@ -42,5 +42,5 @@ index 568cef421e0f..c3b73681c826 100644 return NULL; -- -1.8.1.2 +2.19.1 diff --git a/features/yaffs2/fs-yaffs2-adjust-to-the-change-of-inode_change_ok.patch b/features/yaffs2/fs-yaffs2-adjust-to-the-change-of-inode_change_ok.patch deleted file mode 100644 index 13a116f3..00000000 --- a/features/yaffs2/fs-yaffs2-adjust-to-the-change-of-inode_change_ok.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 102082f3c245270a597ba5c55d0fb07217133bf3 Mon Sep 17 00:00:00 2001 -From: Kevin Hao <kexin.hao@windriver.com> -Date: Thu, 26 Jan 2017 13:50:39 +0800 -Subject: [PATCH] fs/yaffs2: adjust to the change of inode_change_ok() - -In commit cb8e1eef351b ("fs: Give dentry to inode_change_ok() instead -of inode") the inode_change_ok() has been rename to setattr_prepare(), -and one of the argument was also changed from inode to dentry. We -adjust the invocation of inode_change_ok() in Yaffs2 according to -this change. - -Signed-off-by: Kevin Hao <kexin.hao@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - fs/yaffs2/yaffs_vfs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index 5a9c295aecc8..e5e0c650baca 100644 ---- a/fs/yaffs2/yaffs_vfs.c -+++ b/fs/yaffs2/yaffs_vfs.c -@@ -885,7 +885,7 @@ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr) - #endif - - if (error == 0) -- error = inode_change_ok(inode, attr); -+ error = setattr_prepare(dentry, attr); - if (error == 0) { - int result; - if (!error) { --- -2.5.0 - diff --git a/features/yaffs2/fs-yaffs2-fix-the-prototype-of-function-yaffs_rename.patch b/features/yaffs2/fs-yaffs2-fix-the-prototype-of-function-yaffs_rename.patch deleted file mode 100644 index cf1ad35a..00000000 --- a/features/yaffs2/fs-yaffs2-fix-the-prototype-of-function-yaffs_rename.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 4700f2f8b9dbaad5ae441b682d04b09e811135fc Mon Sep 17 00:00:00 2001 -From: Kevin Hao <kexin.hao@windriver.com> -Date: Tue, 31 Jan 2017 16:24:26 +0800 -Subject: [PATCH 2/2] fs: yaffs2: fix the prototype of function yaffs_rename() - -The "rename2" of i_op has been renamed to "rename" in commit -2773bf00aeb9("fs: rename "rename2" i_op to "rename""). We do what we -have done in commit 1cd66c93ba8c("fs: make remaining filesystems use .rename2") -for yaffs2 according to this change. - -Signed-off-by: Kevin Hao <kexin.hao@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - fs/yaffs2/yaffs_vfs.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index efcb118d2ba1..c9dea27a4a78 100644 ---- a/fs/yaffs2/yaffs_vfs.c -+++ b/fs/yaffs2/yaffs_vfs.c -@@ -1487,12 +1487,16 @@ static int yaffs_symlink(struct inode *dir, struct dentry *dentry, - * NB: POSIX says you can rename an object over an old object of the same name - */ - static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry, -- struct inode *new_dir, struct dentry *new_dentry) -+ struct inode *new_dir, struct dentry *new_dentry, -+ unsigned int flags) - { - struct yaffs_dev *dev; - int ret_val = YAFFS_FAIL; - struct yaffs_obj *target; - -+ if (flags) -+ return -EINVAL; -+ - yaffs_trace(YAFFS_TRACE_OS, "yaffs_rename"); - dev = yaffs_inode_to_obj(old_dir)->my_dev; - --- -2.5.0 - diff --git a/features/yaffs2/fs-yaffs2-fix-the-wrong-check-of-return-value-of-dir.patch b/features/yaffs2/fs-yaffs2-fix-the-wrong-check-of-return-value-of-dir.patch deleted file mode 100644 index ce18b23d..00000000 --- a/features/yaffs2/fs-yaffs2-fix-the-wrong-check-of-return-value-of-dir.patch +++ /dev/null @@ -1,32 +0,0 @@ -From d1abef02a9577d2df4be397dfa856d3fb46f94c6 Mon Sep 17 00:00:00 2001 -From: Kevin Hao <kexin.hao@windriver.com> -Date: Tue, 20 Sep 2016 19:54:44 +0800 -Subject: [PATCH 5/5] fs: yaffs2: fix the wrong check of return value of - dir_emit() - -Fix the following build warning: -fs/yaffs2/yaffs_vfs.c:1788:34: warning: comparison of constant '0' with boolean expression is always false [-Wbool-compare] - this_inode, this_type) < 0) { - -Signed-off-by: Kevin Hao <kexin.hao@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - fs/yaffs2/yaffs_vfs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index f3efeb0ad4e0..5a9c295aecc8 100644 ---- a/fs/yaffs2/yaffs_vfs.c -+++ b/fs/yaffs2/yaffs_vfs.c -@@ -1785,7 +1785,7 @@ static int yaffs_readdir(struct file *file, struct dir_context *ctx) - yaffs_gross_unlock(dev); - - if (!dir_emit(ctx, name, strlen(name), -- this_inode, this_type) < 0) { -+ this_inode, this_type)) { - yaffs_gross_lock(dev); - goto out; - } --- -2.5.0 - diff --git a/features/yaffs2/fs-yaffs2-includes-the-missing-header-file.patch b/features/yaffs2/fs-yaffs2-includes-the-missing-header-file.patch deleted file mode 100644 index 5fbadaff..00000000 --- a/features/yaffs2/fs-yaffs2-includes-the-missing-header-file.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 084d8ae2f349a7621e1e51c81b4494b123f3c09a Mon Sep 17 00:00:00 2001 -From: Kevin Hao <kexin.hao@windriver.com> -Date: Fri, 25 Aug 2017 14:58:35 +0800 -Subject: [PATCH 2/2] fs: yaffs2: includes the missing header file - -To fix the following build error: - fs/yaffs2/yaffs_vfs.c: In function 'yaffs_mknod': - fs/yaffs2/yaffs_vfs.c:1252:2: error: implicit declaration of function 'current_fsuid' [-Werror=implicit-function-declaration] - uid_t uid = YCRED_FSUID(); - ^ - -Signed-off-by: Kevin Hao <kexin.hao@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - fs/yaffs2/yaffs_vfs.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index 8b2019fe3c2c..c7be4cddd1de 100644 ---- a/fs/yaffs2/yaffs_vfs.c -+++ b/fs/yaffs2/yaffs_vfs.c -@@ -167,6 +167,7 @@ static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size) - - #include <linux/uaccess.h> - #include <linux/mtd/mtd.h> -+#include <linux/cred.h> - - #include "yportenv.h" - #include "yaffs_trace.h" --- -2.5.0 - diff --git a/features/yaffs2/fs-yaffs2-kill-PAGE_CACHE_-and-page_cache_-get-relea.patch b/features/yaffs2/fs-yaffs2-kill-PAGE_CACHE_-and-page_cache_-get-relea.patch deleted file mode 100644 index 171fe30a..00000000 --- a/features/yaffs2/fs-yaffs2-kill-PAGE_CACHE_-and-page_cache_-get-relea.patch +++ /dev/null @@ -1,158 +0,0 @@ -From 5d59d7575bd858ad43480545d998945a5988f18c Mon Sep 17 00:00:00 2001 -From: Kevin Hao <kexin.hao@windriver.com> -Date: Tue, 20 Sep 2016 19:54:40 +0800 -Subject: [PATCH 1/5] fs: yaffs2: kill PAGE_CACHE_* and page_cache_{get, - release} macros - -As what we have done in commit 09cbfeaf1a5a ("mm, fs: get rid of -PAGE_CACHE_* and page_cache_{get,release} macros"). - -Signed-off-by: Kevin Hao <kexin.hao@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - fs/yaffs2/yaffs_vfs.c | 38 +++++++++++++++++++------------------- - 1 file changed, 19 insertions(+), 19 deletions(-) - -diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index 1494c8f33d20..9aa007d9ded6 100644 ---- a/fs/yaffs2/yaffs_vfs.c -+++ b/fs/yaffs2/yaffs_vfs.c -@@ -266,13 +266,13 @@ static int yaffs_readpage_nolock(struct file *f, struct page *pg) - struct yaffs_obj *obj; - unsigned char *pg_buf; - int ret; -- loff_t pos = ((loff_t) pg->index) << PAGE_CACHE_SHIFT; -+ loff_t pos = ((loff_t) pg->index) << PAGE_SHIFT; - struct yaffs_dev *dev; - - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_readpage_nolock at %lld, size %08x", - (long long)pos, -- (unsigned)PAGE_CACHE_SIZE); -+ (unsigned)PAGE_SIZE); - - obj = yaffs_dentry_to_obj(f->f_path.dentry); - -@@ -290,7 +290,7 @@ static int yaffs_readpage_nolock(struct file *f, struct page *pg) - - yaffs_gross_lock(dev); - -- ret = yaffs_file_rd(obj, pg_buf, pos, PAGE_CACHE_SIZE); -+ ret = yaffs_file_rd(obj, pg_buf, pos, PAGE_SIZE); - - yaffs_gross_unlock(dev); - -@@ -400,22 +400,22 @@ static int yaffs_writepage(struct page *page) - BUG(); - i_size = i_size_read(inode); - -- end_index = i_size >> PAGE_CACHE_SHIFT; -+ end_index = i_size >> PAGE_SHIFT; - - if (page->index < end_index) -- n_bytes = PAGE_CACHE_SIZE; -+ n_bytes = PAGE_SIZE; - else { -- n_bytes = i_size & (PAGE_CACHE_SIZE - 1); -+ n_bytes = i_size & (PAGE_SIZE - 1); - - if (page->index > end_index || !n_bytes) { - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_writepage at %lld, inode size = %lld!!", -- ((loff_t)page->index) << PAGE_CACHE_SHIFT, -+ ((loff_t)page->index) << PAGE_SHIFT, - inode->i_size); - yaffs_trace(YAFFS_TRACE_OS, - " -> don't care!!"); - -- zero_user_segment(page, 0, PAGE_CACHE_SIZE); -+ zero_user_segment(page, 0, PAGE_SIZE); - set_page_writeback(page); - unlock_page(page); - end_page_writeback(page); -@@ -423,8 +423,8 @@ static int yaffs_writepage(struct page *page) - } - } - -- if (n_bytes != PAGE_CACHE_SIZE) -- zero_user_segment(page, n_bytes, PAGE_CACHE_SIZE); -+ if (n_bytes != PAGE_SIZE) -+ zero_user_segment(page, n_bytes, PAGE_SIZE); - - get_page(page); - -@@ -436,13 +436,13 @@ static int yaffs_writepage(struct page *page) - - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_writepage at %lld, size %08x", -- ((loff_t)page->index) << PAGE_CACHE_SHIFT, n_bytes); -+ ((loff_t)page->index) << PAGE_SHIFT, n_bytes); - yaffs_trace(YAFFS_TRACE_OS, - "writepag0: obj = %lld, ino = %lld", - obj->variant.file_variant.file_size, inode->i_size); - - n_written = yaffs_wr_file(obj, buffer, -- ((loff_t)page->index) << PAGE_CACHE_SHIFT, n_bytes, 0); -+ ((loff_t)page->index) << PAGE_SHIFT, n_bytes, 0); - - yaffs_set_super_dirty(dev); - -@@ -505,7 +505,7 @@ static int yaffs_write_begin(struct file *filp, struct address_space *mapping, - struct page **pagep, void **fsdata) - { - struct page *pg = NULL; -- pgoff_t index = pos >> PAGE_CACHE_SHIFT; -+ pgoff_t index = pos >> PAGE_SHIFT; - - int ret = 0; - int space_held = 0; -@@ -554,7 +554,7 @@ out: - yaffs_release_space(filp); - if (pg) { - unlock_page(pg); -- page_cache_release(pg); -+ put_page(pg); - } - return ret; - } -@@ -638,7 +638,7 @@ static int yaffs_write_end(struct file *filp, struct address_space *mapping, - { - int ret = 0; - void *addr, *kva; -- uint32_t offset_into_page = pos & (PAGE_CACHE_SIZE - 1); -+ uint32_t offset_into_page = pos & (PAGE_SIZE - 1); - - kva = kmap(pg); - addr = kva + offset_into_page; -@@ -660,7 +660,7 @@ static int yaffs_write_end(struct file *filp, struct address_space *mapping, - - yaffs_release_space(filp); - unlock_page(pg); -- page_cache_release(pg); -+ put_page(pg); - return ret; - } - #else -@@ -670,7 +670,7 @@ static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset, - { - void *addr, *kva; - -- loff_t pos = (((loff_t) pg->index) << PAGE_CACHE_SHIFT) + offset; -+ loff_t pos = (((loff_t) pg->index) << PAGE_SHIFT) + offset; - int n_bytes = to - offset; - int n_written; - -@@ -2836,8 +2836,8 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, - return NULL; - } - -- sb->s_blocksize = PAGE_CACHE_SIZE; -- sb->s_blocksize_bits = PAGE_CACHE_SHIFT; -+ sb->s_blocksize = PAGE_SIZE; -+ sb->s_blocksize_bits = PAGE_SHIFT; - - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_read_super: Using yaffs%d", yaffs_version); --- -2.5.0 - diff --git a/features/yaffs2/fs-yaffs2-kill-put_link.patch b/features/yaffs2/fs-yaffs2-kill-put_link.patch deleted file mode 100644 index 8b90b0d5..00000000 --- a/features/yaffs2/fs-yaffs2-kill-put_link.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 80aab05debcd3ee129f8ee68df08e8236bf0a3a6 Mon Sep 17 00:00:00 2001 -From: Kevin Hao <kexin.hao@windriver.com> -Date: Tue, 20 Sep 2016 19:54:43 +0800 -Subject: [PATCH 4/5] fs: yaffs2: kill ->put_link() - -As What we have done in commit fceef393a538 ("switch ->get_link() -to delayed_call, kill ->put_link()") - -Signed-off-by: Kevin Hao <kexin.hao@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - fs/yaffs2/yaffs_vfs.c | 12 ++---------- - 1 file changed, 2 insertions(+), 10 deletions(-) - -diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index b57d612808de..f3efeb0ad4e0 100644 ---- a/fs/yaffs2/yaffs_vfs.c -+++ b/fs/yaffs2/yaffs_vfs.c -@@ -1060,7 +1060,7 @@ static int yaffs_readlink(struct dentry *dentry, char __user * buffer, - - #if (YAFFS_NEW_FOLLOW_LINK == 1) - static const char *yaffs_get_link(struct dentry *dentry, struct inode *inode, -- void **cookie) -+ struct delayed_call *done) - { - void *ret; - #else -@@ -1086,7 +1086,7 @@ static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd) - goto out; - } - #if (YAFFS_NEW_FOLLOW_LINK == 1) -- *cookie = alias; -+ set_delayed_call(done, kfree_link, alias); - ret = alias; - out: - if (ret_int) -@@ -1117,18 +1117,10 @@ static void yaffs_put_inode(struct inode *inode) - } - #endif - --#if (YAFFS_NEW_FOLLOW_LINK == 1) --void yaffs_put_link(struct inode *inode, void *cookie) --{ -- kfree(cookie); --} --#endif -- - static const struct inode_operations yaffs_symlink_inode_operations = { - .readlink = yaffs_readlink, - #if (YAFFS_NEW_FOLLOW_LINK == 1) - .get_link = yaffs_get_link, -- .put_link = yaffs_put_link, - #else - .follow_link = yaffs_follow_link, - #endif --- -2.5.0 - diff --git a/features/yaffs2/fs-yaffs2-replace-CURRENT_TIME-by-other-appropriate-.patch b/features/yaffs2/fs-yaffs2-replace-CURRENT_TIME-by-other-appropriate-.patch index e715dd80..9cbcbced 100644 --- a/features/yaffs2/fs-yaffs2-replace-CURRENT_TIME-by-other-appropriate-.patch +++ b/features/yaffs2/fs-yaffs2-replace-CURRENT_TIME-by-other-appropriate-.patch @@ -1,7 +1,7 @@ -From 595f7d1759d94b951a602c1f81c1352e05d05c29 Mon Sep 17 00:00:00 2001 +From bed6e7dc3e9af951f3844d263a9cf35c6b202a41 Mon Sep 17 00:00:00 2001 From: Kevin Hao <kexin.hao@windriver.com> Date: Fri, 25 Aug 2017 14:58:34 +0800 -Subject: [PATCH 1/2] fs: yaffs2: replace CURRENT_TIME by other appropriate +Subject: [PATCH 1/7] fs: yaffs2: replace CURRENT_TIME by other appropriate apis The macro CURRENT_TIME has already been deleted by commit bfe1c566453a @@ -12,36 +12,48 @@ times, and ktime_get_* function for others. Signed-off-by: Kevin Hao <kexin.hao@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> --- - fs/yaffs2/yaffs_vfs.c | 2 +- - fs/yaffs2/yportenv.h | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) + fs/yaffs2/yaffs_vfs.c | 4 ++-- + fs/yaffs2/yportenv.h | 4 ++-- + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index c9dea27a4a78..8b2019fe3c2c 100644 +index 34cdc58339a8..c1c80f7a33a0 100644 --- a/fs/yaffs2/yaffs_vfs.c +++ b/fs/yaffs2/yaffs_vfs.c -@@ -238,7 +238,7 @@ MODULE_PARM(yaffs_gc_control, "i"); - +@@ -268,7 +268,7 @@ MODULE_PARM(yaffs_gc_control, "i"); + #if (LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0)) + #define update_dir_time(dir) do {\ +- (dir)->i_ctime = (dir)->i_mtime = CURRENT_TIME; \ ++ (dir)->i_ctime = (dir)->i_mtime = current_time(dir); \ + } while (0) + #elif (LINUX_VERSION_CODE < KERNEL_VERSION(4,18,0)) + #define update_dir_time(dir) do {\ +@@ -276,7 +276,7 @@ MODULE_PARM(yaffs_gc_control, "i"); + } while (0) + #else #define update_dir_time(dir) do {\ -- (dir)->i_ctime = (dir)->i_mtime = CURRENT_TIME; \ -+ (dir)->i_ctime = (dir)->i_mtime = current_time(dir); \ - } while (0) +- (dir)->i_ctime = (dir)->i_mtime = current_kernel_time64(); \ ++ (dir)->i_ctime = (dir)->i_mtime = current_time(dir); \ + } while (0) + #endif - static void yaffs_fill_inode_from_obj(struct inode *inode, diff --git a/fs/yaffs2/yportenv.h b/fs/yaffs2/yportenv.h -index 8975af331ea1..0e4e64e45f47 100644 +index 68c239c07435..0185985cc8fc 100644 --- a/fs/yaffs2/yportenv.h +++ b/fs/yaffs2/yportenv.h -@@ -62,7 +62,7 @@ - #define YAFFS_LOSTNFOUND_MODE 0700 +@@ -62,9 +62,9 @@ #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) + #if (LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0)) -#define Y_CURRENT_TIME CURRENT_TIME.tv_sec +#define Y_CURRENT_TIME ktime_get_real_seconds() + #else +-#define Y_CURRENT_TIME current_kernel_time().tv_sec ++#define Y_CURRENT_TIME ktime_get_real_seconds() + #endif #define Y_TIME_CONVERT(x) (x).tv_sec #else - #define Y_CURRENT_TIME CURRENT_TIME -- -2.5.0 +2.19.1 diff --git a/features/yaffs2/fs-yaffs2-replace-follow_link-with-get_link.patch b/features/yaffs2/fs-yaffs2-replace-follow_link-with-get_link.patch deleted file mode 100644 index 5a2cf606..00000000 --- a/features/yaffs2/fs-yaffs2-replace-follow_link-with-get_link.patch +++ /dev/null @@ -1,58 +0,0 @@ -From fd70fa9b7012e86709840147f7a9149e45f665d4 Mon Sep 17 00:00:00 2001 -From: Kevin Hao <kexin.hao@windriver.com> -Date: Tue, 20 Sep 2016 19:54:42 +0800 -Subject: [PATCH 3/5] fs: yaffs2: replace ->follow_link() with -->get_link() - -As what we done in commit 6b2553918d8b ("replace ->follow_link() -with new method that could stay in RCU mode"). - -Signed-off-by: Kevin Hao <kexin.hao@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - fs/yaffs2/yaffs_vfs.c | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index cd387d7abfa2..b57d612808de 100644 ---- a/fs/yaffs2/yaffs_vfs.c -+++ b/fs/yaffs2/yaffs_vfs.c -@@ -1059,7 +1059,8 @@ static int yaffs_readlink(struct dentry *dentry, char __user * buffer, - } - - #if (YAFFS_NEW_FOLLOW_LINK == 1) --static const char *yaffs_follow_link(struct dentry *dentry, void **cookie) -+static const char *yaffs_get_link(struct dentry *dentry, struct inode *inode, -+ void **cookie) - { - void *ret; - #else -@@ -1069,8 +1070,12 @@ static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd) - #endif - unsigned char *alias; - int ret_int = 0; -- struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev; -+ struct yaffs_dev *dev; -+ -+ if (!dentry) -+ return ERR_PTR(-ECHILD); - -+ dev = yaffs_dentry_to_obj(dentry)->my_dev; - yaffs_gross_lock(dev); - - alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry)); -@@ -1121,9 +1126,11 @@ void yaffs_put_link(struct inode *inode, void *cookie) - - static const struct inode_operations yaffs_symlink_inode_operations = { - .readlink = yaffs_readlink, -- .follow_link = yaffs_follow_link, - #if (YAFFS_NEW_FOLLOW_LINK == 1) -+ .get_link = yaffs_get_link, - .put_link = yaffs_put_link, -+#else -+ .follow_link = yaffs_follow_link, - #endif - .setattr = yaffs_setattr, - .setxattr = yaffs_setxattr, --- -2.5.0 - diff --git a/features/yaffs2/fs-yaffs2-switch-to-the-generic-xattr-handler.patch b/features/yaffs2/fs-yaffs2-switch-to-the-generic-xattr-handler.patch deleted file mode 100644 index 4e29ed03..00000000 --- a/features/yaffs2/fs-yaffs2-switch-to-the-generic-xattr-handler.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 56e654cab1db61f535c637b2c43dce30ce76ed20 Mon Sep 17 00:00:00 2001 -From: Kevin Hao <kexin.hao@windriver.com> -Date: Tue, 31 Jan 2017 16:24:25 +0800 -Subject: [PATCH 1/2] fs: yaffs2: switch to the generic xattr handler - -The {get, set, remove}xattr inode operations have been already removed -in commit fd50ecaddf83("vfs: Remove {get,set,remove}xattr inode operations"). -Adjust the yaffs2 to use the generic xattr handler. - -Signed-off-by: Kevin Hao <kexin.hao@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - fs/yaffs2/yaffs_vfs.c | 37 ++++++++++++++++++++++++++++--------- - 1 file changed, 28 insertions(+), 9 deletions(-) - -diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index e5e0c650baca..efcb118d2ba1 100644 ---- a/fs/yaffs2/yaffs_vfs.c -+++ b/fs/yaffs2/yaffs_vfs.c -@@ -1029,10 +1029,7 @@ static ssize_t yaffs_listxattr(struct dentry * dentry, char *buff, size_t size) - - static const struct inode_operations yaffs_file_inode_operations = { - .setattr = yaffs_setattr, -- .setxattr = yaffs_setxattr, -- .getxattr = yaffs_getxattr, - .listxattr = yaffs_listxattr, -- .removexattr = yaffs_removexattr, - }; - - -@@ -1125,10 +1122,7 @@ static const struct inode_operations yaffs_symlink_inode_operations = { - .follow_link = yaffs_follow_link, - #endif - .setattr = yaffs_setattr, -- .setxattr = yaffs_setxattr, -- .getxattr = yaffs_getxattr, - .listxattr = yaffs_listxattr, -- .removexattr = yaffs_removexattr, - }; - - #ifdef YAFFS_USE_OWN_IGET -@@ -1581,10 +1575,7 @@ static const struct inode_operations yaffs_dir_inode_operations = { - .mknod = yaffs_mknod, - .rename = yaffs_rename, - .setattr = yaffs_setattr, -- .setxattr = yaffs_setxattr, -- .getxattr = yaffs_getxattr, - .listxattr = yaffs_listxattr, -- .removexattr = yaffs_removexattr, - }; - - /*-----------------------------------------------------------------*/ -@@ -2771,7 +2762,34 @@ static struct dentry *yaffs_make_root(struct inode *inode) - } - - -+static int yaffs_xattr_get(const struct xattr_handler *handler, -+ struct dentry *dentry, struct inode *inode, -+ const char *name, void *buff, size_t size) -+{ -+ return yaffs_getxattr(dentry, inode, name, buff, size); -+} - -+static int yaffs_xattr_set(const struct xattr_handler *handler, -+ struct dentry *dentry, struct inode *inode, -+ const char *name, const void *value, size_t size, -+ int flags) -+{ -+ if (value) -+ return yaffs_setxattr(dentry, inode, name, value, size, flags); -+ else -+ return yaffs_removexattr(dentry, name); -+} -+ -+static const struct xattr_handler yaffs_xattr_handler = { -+ .prefix = "", /* match anything */ -+ .get = yaffs_xattr_get, -+ .set = yaffs_xattr_set, -+}; -+ -+static const struct xattr_handler *yaffs_xattr_handlers[] = { -+ &yaffs_xattr_handler, -+ NULL -+}; - - static struct super_block *yaffs_internal_read_super(int yaffs_version, - struct super_block *sb, -@@ -2805,6 +2823,7 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, - - sb->s_magic = YAFFS_MAGIC; - sb->s_op = &yaffs_super_ops; -+ sb->s_xattr = yaffs_xattr_handlers; - sb->s_flags |= MS_NOATIME; - - read_only = ((sb->s_flags & MS_RDONLY) != 0); --- -2.5.0 - diff --git a/features/yaffs2/fs-yaffs2-switch-to-the-new-prototype-for-set-getxat.patch b/features/yaffs2/fs-yaffs2-switch-to-the-new-prototype-for-set-getxat.patch deleted file mode 100644 index 48465e50..00000000 --- a/features/yaffs2/fs-yaffs2-switch-to-the-new-prototype-for-set-getxat.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 1d2694763ecec095a1358b46e50b54fea8a98469 Mon Sep 17 00:00:00 2001 -From: Kevin Hao <kexin.hao@windriver.com> -Date: Tue, 20 Sep 2016 19:54:41 +0800 -Subject: [PATCH 2/5] fs: yaffs2: switch to the new prototype for - ->set/getxattr() - -Since commit 3767e255b390 ("switch ->setxattr() to passing dentry and -inode separately") and commit ce23e6401334 ("->getxattr(): pass dentry -and inode as separate arguments"), a new inode argument has been added -for these two functions. Adjust these two functions to accommodate to -this change. - -Signed-off-by: Kevin Hao <kexin.hao@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - fs/yaffs2/yaffs_vfs.c | 11 +++++------ - 1 file changed, 5 insertions(+), 6 deletions(-) - -diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index 9aa007d9ded6..cd387d7abfa2 100644 ---- a/fs/yaffs2/yaffs_vfs.c -+++ b/fs/yaffs2/yaffs_vfs.c -@@ -919,10 +919,10 @@ static int yaffs_setattr(struct dentry *dentry, struct iattr *attr) - return error; - } - --static int yaffs_setxattr(struct dentry *dentry, const char *name, -- const void *value, size_t size, int flags) -+static int yaffs_setxattr(struct dentry *dentry, struct inode *inode, -+ const char *name, const void *value, size_t size, -+ int flags) - { -- struct inode *inode = dentry->d_inode; - int error = 0; - struct yaffs_dev *dev; - struct yaffs_obj *obj = yaffs_inode_to_obj(inode); -@@ -952,10 +952,9 @@ static int yaffs_setxattr(struct dentry *dentry, const char *name, - return error; - } - --static ssize_t yaffs_getxattr(struct dentry * dentry, const char *name, -- void *buff, size_t size) -+static ssize_t yaffs_getxattr(struct dentry * dentry, struct inode *inode, -+ const char *name, void *buff, size_t size) - { -- struct inode *inode = dentry->d_inode; - int error = 0; - struct yaffs_dev *dev; - struct yaffs_obj *obj = yaffs_inode_to_obj(inode); --- -2.5.0 - diff --git a/features/yaffs2/yaffs-Avoid-setting-any-ACL-releated-xattr.patch b/features/yaffs2/yaffs-Avoid-setting-any-ACL-releated-xattr.patch index ffd65e8e..c738d0b4 100644 --- a/features/yaffs2/yaffs-Avoid-setting-any-ACL-releated-xattr.patch +++ b/features/yaffs2/yaffs-Avoid-setting-any-ACL-releated-xattr.patch @@ -1,7 +1,7 @@ -From bbce9607f33732862e8314da880f14ce9d3b4ffc Mon Sep 17 00:00:00 2001 +From 2ee5199a51c48eb4441431de9634d681cc7f2022 Mon Sep 17 00:00:00 2001 From: Zhang Xiao <xiao.zhang@windriver.com> Date: Wed, 27 Aug 2014 13:34:15 +0800 -Subject: [PATCH 1/2] yaffs: Avoid setting any ACL releated xattr +Subject: [PATCH 3/7] yaffs: Avoid setting any ACL releated xattr YAFFS doesn't sopport ACL yet, it must refuse any related settings. @@ -12,10 +12,10 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> 1 file changed, 6 insertions(+) diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index 13de856f545a..d372a4e1d9bf 100644 +index f4c5ba95d51d..611ef43d9825 100644 --- a/fs/yaffs2/yaffs_vfs.c +++ b/fs/yaffs2/yaffs_vfs.c -@@ -931,6 +931,12 @@ static int yaffs_setxattr(struct dentry *dentry, const char *name, +@@ -970,6 +970,12 @@ static int yaffs_setxattr(struct dentry *dentry, const char *name, yaffs_trace(YAFFS_TRACE_OS, "yaffs_setxattr of object %d", obj->obj_id); @@ -29,5 +29,5 @@ index 13de856f545a..d372a4e1d9bf 100644 int result; dev = obj->my_dev; -- -1.8.1.2 +2.19.1 diff --git a/features/yaffs2/yaffs-Fix-build-failure-by-handling-inode-i_version-.patch b/features/yaffs2/yaffs-Fix-build-failure-by-handling-inode-i_version-.patch index 64617049..873f65de 100644 --- a/features/yaffs2/yaffs-Fix-build-failure-by-handling-inode-i_version-.patch +++ b/features/yaffs2/yaffs-Fix-build-failure-by-handling-inode-i_version-.patch @@ -1,7 +1,7 @@ -From 0b74398a4524d493e2b6423a9b3654163b24e33f Mon Sep 17 00:00:00 2001 +From 1e3cbcac4ca9ff35b35bb557b24c4d3d2a95f826 Mon Sep 17 00:00:00 2001 From: He Zhe <zhe.he@windriver.com> Date: Tue, 19 Jun 2018 00:58:17 -0700 -Subject: [PATCH 1/2] yaffs: Fix build failure by handling inode i_version with +Subject: [PATCH 5/7] yaffs: Fix build failure by handling inode i_version with proper atomic API i_version in struct inode has changed to atomic64_t in mainline kernel. @@ -14,40 +14,40 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index c99acf08a0d8..b029b8d4276e 100644 +index b0e3fd977c4a..1ddc85b3200d 100644 --- a/fs/yaffs2/yaffs_vfs.c +++ b/fs/yaffs2/yaffs_vfs.c -@@ -1558,7 +1558,7 @@ static int yaffs_unlink(struct inode *dir, struct dentry *dentry) - - if (ret_val == YAFFS_OK) { - inode_dec_link_count(dentry->d_inode); +@@ -1669,7 +1669,7 @@ static int yaffs_unlink(struct inode *dir, struct dentry *dentry) + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)) + inode_inc_iversion(dir); + #else - dir->i_version++; + atomic64_inc(&dir->i_version); + #endif yaffs_gross_unlock(dev); update_dir_time(dir); - return 0; -@@ -1710,6 +1710,7 @@ static int yaffs_readdir(struct file *file, struct dir_context *ctx) +@@ -1826,6 +1826,7 @@ static int yaffs_iterate(struct file *f, struct dir_context *dc) int ret_val = 0; char name[YAFFS_MAX_NAME_LENGTH + 1]; + u64 i_version; - obj = yaffs_dentry_to_obj(file->f_path.dentry); + obj = yaffs_dentry_to_obj(Y_GET_DENTRY(f)); dev = obj->my_dev; -@@ -1760,10 +1761,11 @@ static int yaffs_readdir(struct file *file, struct dir_context *ctx) +@@ -1951,10 +1952,11 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) /* If the directory has changed since the open or last call to readdir, rewind to after the 2 canned entries. */ -- if (file->f_version != inode->i_version) { +- if (f->f_version != inode->i_version) { + i_version = atomic64_read(&inode->i_version); -+ if (file->f_version != i_version) { ++ if (f->f_version != i_version) { offset = 2; - ctx->pos = offset; -- file->f_version = inode->i_version; -+ file->f_version = i_version; + f->f_pos = offset; +- f->f_version = inode->i_version; ++ f->f_version = i_version; } while (sc->next_return) { -- -2.5.0 +2.19.1 diff --git a/features/yaffs2/yaffs-Fix-build-failure-by-removing-unused-members-o.patch b/features/yaffs2/yaffs-Fix-build-failure-by-removing-unused-members-o.patch deleted file mode 100644 index b25ddf3c..00000000 --- a/features/yaffs2/yaffs-Fix-build-failure-by-removing-unused-members-o.patch +++ /dev/null @@ -1,60 +0,0 @@ -From c6ab08b6734b877f73bf4acf7dcdae4320b6ce9b Mon Sep 17 00:00:00 2001 -From: He Zhe <zhe.he@windriver.com> -Date: Tue, 19 Jun 2018 00:58:18 -0700 -Subject: [PATCH 2/2] yaffs: Fix build failure by removing unused members of - erase_info - -A few members of struct erase_info have been removed and no longer -used in mainline by the following commits. This patches removes -related useless initialization. - -8f347c4232d5fc097599b711a3385722a6834005 -"mtd: Unconditionally update ->fail_addr and ->addr in part_erase()" - -884cfd9023ce6afe8bcf181ec988d8516eb32bf0 -"mtd: Stop assuming mtd_erase() is asynchronous" - -dcba51bbb9e0cc7f80d36eb20a033a4dff2ce9cc -"mtd: Get rid of unused fields in struct erase_info" - -Signed-off-by: He Zhe <zhe.he@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - fs/yaffs2/yaffs_mtdif.c | 10 ---------- - 1 file changed, 10 deletions(-) - -diff --git a/fs/yaffs2/yaffs_mtdif.c b/fs/yaffs2/yaffs_mtdif.c -index 03a3d9c24e4c..4ff5741f3983 100644 ---- a/fs/yaffs2/yaffs_mtdif.c -+++ b/fs/yaffs2/yaffs_mtdif.c -@@ -54,13 +54,8 @@ int nandmtd_erase_block(struct yaffs_dev *dev, int block_no) - struct erase_info ei; - int retval = 0; - -- ei.mtd = mtd; - ei.addr = addr; - ei.len = dev->param.total_bytes_per_chunk * dev->param.chunks_per_block; -- ei.time = 1000; -- ei.retries = 2; -- ei.callback = NULL; -- ei.priv = (u_long) dev; - - retval = mtd_erase(mtd, &ei); - -@@ -183,13 +178,8 @@ static int yaffs_mtd_erase(struct yaffs_dev *dev, int block_no) - dev->param.chunks_per_block; - addr = ((loff_t) block_no) * block_size; - -- ei.mtd = mtd; - ei.addr = addr; - ei.len = block_size; -- ei.time = 1000; -- ei.retries = 2; -- ei.callback = NULL; -- ei.priv = (u_long) dev; - - retval = mtd_erase(mtd, &ei); - --- -2.5.0 - diff --git a/features/yaffs2/yaffs-add-strict-check-when-call-yaffs_internal_read.patch b/features/yaffs2/yaffs-add-strict-check-when-call-yaffs_internal_read.patch new file mode 100644 index 00000000..19c37c0d --- /dev/null +++ b/features/yaffs2/yaffs-add-strict-check-when-call-yaffs_internal_read.patch @@ -0,0 +1,146 @@ +From 75410fafe78ec0bf2b662fef64dbd788c6d82c4c Mon Sep 17 00:00:00 2001 +From: Quanyang Wang <quanyang.wang@windriver.com> +Date: Tue, 3 Dec 2019 17:01:18 +0800 +Subject: [PATCH 7/7] yaffs: add strict check when call + yaffs_internal_read_super + +When kernel booting, mount_block_root will be called to judge +the filesystem type of root device. Then .mount function in file_system_type +structure will do the check operation. But yaffs filesystem has a +relaxed examination because as a filesystem for NAND Flash, it doesn't +examinate whether the root device is the MTD NAND device. This results +that yaffs filesystem will do mount operation even though the root device +is a MMC card with a btrfs filesystem, and will crash kernel after +mounting failed. The crash log is as below: + +md: Waiting for all devices to be available before autodetect +md: If you don't use raid, use raid=noautodetect +md: Autodetecting RAID arrays. +md: autorun ... +md: ... autorun DONE. +yaffs: dev is 187695107 name is "mmcblk0p3" rw +yaffs: passed flags "" +yaffs: dev is 187695107 name is "mmcblk0p3" rw +yaffs: passed flags "" +------------[ cut here ]------------ +kernel BUG at fs/yaffs2/yaffs_getblockinfo.h:30! +Internal error: Oops - BUG: 0 [#1] PREEMPT SMP +Modules linked in: +CPU: 3 PID: 1 Comm: swapper/0 Not tainted 5.2.24-yocto-standard+ #250 +Hardware name: ZynqMP ZCU102 Rev1.0 (DT) +pstate: 80000005 (Nzcv daif -PAN -UAO) +pc : yaffs_rd_chunk_tags_nand+0xf0/0x110 +lr : yaffs_rd_chunk_tags_nand+0x108/0x110 +sp : ffffff801003b770 +x29: ffffff801003b770 x28: ffffffc876fe8000 +x27: 00000000000c0000 x26: 0000000000000000 +x25: 00000000ffffffe1 x24: 0000000000010000 +x23: 0000000000000000 x22: ffffff8011228000 +x21: 000000000000005f x20: ffffff801003b890 +x19: ffffffc876fe8000 x18: ffffffffffffffff +x17: 0000000000000000 x16: 0000000000000000 +x15: ffffff80112285c8 x14: ffffff801137d228 +x13: ffffff801137ce74 x12: ffffff8011246000 +x11: 0000000000000000 x10: ffffff801137c000 +x9 : 0000000000000000 x8 : 0000000000000007 +x7 : 000000000000015c x6 : ffffff801137c490 +x5 : 0000000000000000 x4 : 0000000000000000 +x3 : 00000000ffffffff x2 : 50c80792e0663400 +x1 : 0000000000000000 x0 : 0000000000000037 +Call trace: + yaffs_rd_chunk_tags_nand+0xf0/0x110 + yaffs_summary_read+0x10c/0x2e0 + yaffs2_scan_backwards+0x28c/0xf58 + yaffs_guts_initialise+0x71c/0x7a0 + yaffs_internal_read_super.isra.20+0x4ec/0x838 + yaffs2_internal_read_super_mtd+0x2c/0x48 + mount_bdev+0x1a4/0x1e0 + yaffs2_mount+0x44/0x58 + legacy_get_tree+0x34/0x60 + vfs_get_tree+0x34/0x120 + do_mount+0x708/0x980 + ksys_mount+0x9c/0x110 + mount_block_root+0x128/0x29c + mount_root+0x148/0x17c + prepare_namespace+0x178/0x1c0 + kernel_init_freeable+0x370/0x390 + kernel_init+0x18/0x110 + ret_from_fork+0x10/0x1c +Code: d65f03c0 f00069c0 b9440400 37f00060 (d4210000) +---[ end trace 68aa0995bdf59f76 ]--- +BUG: sleeping function called from invalid context at ./include/linux/percpu-rwsem.h:34 +in_atomic(): 1, irqs_disabled(): 128, pid: 1, name: swapper/0 +Preemption disabled at: +[<ffffff80100a4598>] debug_exception_enter+0x30/0x40 +CPU: 3 PID: 1 Comm: swapper/0 Tainted: G D 5.2.24-yocto-standard+ #250 +Hardware name: ZynqMP ZCU102 Rev1.0 (DT) +Call trace: + dump_backtrace+0x0/0x148 + show_stack+0x24/0x30 + dump_stack+0x98/0xbc + ___might_sleep+0x130/0x188 + __might_sleep+0x58/0x90 + exit_signals+0x44/0x258 + do_exit+0xb4/0xa38 + die+0x1bc/0x1e0 + bug_handler+0x48/0x98 + call_break_hook+0x7c/0xa8 + brk_handler+0x28/0x68 + do_debug_exception+0xc4/0x188 + el1_dbg+0x18/0x8c + yaffs_rd_chunk_tags_nand+0xf0/0x110 + yaffs_summary_read+0x10c/0x2e0 + yaffs2_scan_backwards+0x28c/0xf58 + yaffs_guts_initialise+0x71c/0x7a0 + yaffs_internal_read_super.isra.20+0x4ec/0x838 + yaffs2_internal_read_super_mtd+0x2c/0x48 + mount_bdev+0x1a4/0x1e0 + yaffs2_mount+0x44/0x58 + legacy_get_tree+0x34/0x60 + vfs_get_tree+0x34/0x120 + do_mount+0x708/0x980 + ksys_mount+0x9c/0x110 + mount_block_root+0x128/0x29c + mount_root+0x148/0x17c + prepare_namespace+0x178/0x1c0 + kernel_init_freeable+0x370/0x390 + kernel_init+0x18/0x110 + ret_from_fork+0x10/0x1c +note: swapper/0[1] exited with preempt_count 1 +Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b +SMP: stopping secondary CPUs +Kernel Offset: disabled +CPU features: 0x0002,20002004 +Memory Limit: none +---[ end Kernel panic - not syncing: Attempted to kill init! exitcode=0x0000000b ]--- + +Use yaffs_get_mtd_device to add strict check. + +Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_vfs.c | 7 ++----- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c +index 1ddc85b3200d..d3f89e07401b 100644 +--- a/fs/yaffs2/yaffs_vfs.c ++++ b/fs/yaffs2/yaffs_vfs.c +@@ -2960,12 +2960,9 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, + MAJOR(sb->s_dev), MINOR(sb->s_dev), + yaffs_devname(sb, devname_buf)); + +- /* Get the device */ +- mtd = get_mtd_device(NULL, MINOR(sb->s_dev)); ++ ++ mtd = yaffs_get_mtd_device(sb->s_dev); + if (IS_ERR(mtd)) { +- yaffs_trace(YAFFS_TRACE_ALWAYS, +- "yaffs: MTD device %u either not valid or unavailable", +- MINOR(sb->s_dev)); + return NULL; + } + +-- +2.19.1 + diff --git a/features/yaffs2/yaffs-fix-Wstringop-overread-compile-warning-in-yaff.patch b/features/yaffs2/yaffs-fix-Wstringop-overread-compile-warning-in-yaff.patch new file mode 100644 index 00000000..7a47c4a5 --- /dev/null +++ b/features/yaffs2/yaffs-fix-Wstringop-overread-compile-warning-in-yaff.patch @@ -0,0 +1,44 @@ +From ea777841e8ea883bfa160693e650882f86e75167 Mon Sep 17 00:00:00 2001 +From: Quanyang Wang <quanyang.wang@windriver.com> +Date: Sun, 13 Jun 2021 12:08:21 +0800 +Subject: [PATCH] yaffs: fix -Wstringop-overread compile warning in + yaffs_fix_null_name +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +In yaffs_fix_null_name, "if (strnlen(name, YAFFS_MAX_NAME_LENGTH) == 0)" +is used to judge if the "name" string is zero length. But this is wrong +when the "name" char array size is less than YAFFS_MAX_NAME_LENGTH and +this will trigger compile warnig as below: + +fs/yaffs2/yaffs_guts.c:4501:13: warning: ‘strnlen’ specified bound 255 exceeds source size 16 [-Wstringop-overread] + 4501 | if (strnlen(name, YAFFS_MAX_NAME_LENGTH) == 0) { + | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Let's use buffer_size to do this instead of YAFFS_MAX_NAME_LENGTH +because buffer_size is passed to yaffs_fix_null_name by caller with +appropriate value which is fixed to the size of "name" char array. + +Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_guts.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/yaffs2/yaffs_guts.c b/fs/yaffs2/yaffs_guts.c +index 40a5b46cf6ca..0cc794ebc347 100644 +--- a/fs/yaffs2/yaffs_guts.c ++++ b/fs/yaffs2/yaffs_guts.c +@@ -4498,7 +4498,7 @@ static void yaffs_fix_null_name(struct yaffs_obj *obj, YCHAR *name, + int buffer_size) + { + /* Create an object name if we could not find one. */ +- if (strnlen(name, YAFFS_MAX_NAME_LENGTH) == 0) { ++ if (strnlen(name, buffer_size) == 0) { + YCHAR local_name[20]; + YCHAR num_string[20]; + YCHAR *x = &num_string[19]; +-- +2.19.1 + diff --git a/features/yaffs2/yaffs-fix-misplaced-variable-declaration.patch b/features/yaffs2/yaffs-fix-misplaced-variable-declaration.patch new file mode 100644 index 00000000..b7da6b82 --- /dev/null +++ b/features/yaffs2/yaffs-fix-misplaced-variable-declaration.patch @@ -0,0 +1,40 @@ +From f28b801ca5c4853b60f16eaf5525b05b5174ab43 Mon Sep 17 00:00:00 2001 +From: Paul Gortmaker <paul.gortmaker@windriver.com> +Date: Thu, 30 Apr 2020 12:59:46 -0400 +Subject: [PATCH] yaffs: fix misplaced variable declaration + +A variable declaration landed one function higher than intended, +leading to an unused variable warning for configurations with +YAFFS_USE_DIR_ITERATE=y and a build failure for configurations +with the same being unset. + +Fixes: "yaffs: Fix build failure by handling inode i_version with proper atomic API" +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_vfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c +index 598ecd57a0ed..3ffdc0129637 100644 +--- a/fs/yaffs2/yaffs_vfs.c ++++ b/fs/yaffs2/yaffs_vfs.c +@@ -1826,7 +1826,6 @@ static int yaffs_iterate(struct file *f, struct dir_context *dc) + int ret_val = 0; + + char name[YAFFS_MAX_NAME_LENGTH + 1]; +- u64 i_version; + + obj = yaffs_dentry_to_obj(Y_GET_DENTRY(f)); + dev = obj->my_dev; +@@ -1898,6 +1897,7 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) + unsigned long offset, curoffs; + struct yaffs_obj *l; + int ret_val = 0; ++ u64 i_version; + + char name[YAFFS_MAX_NAME_LENGTH + 1]; + +-- +2.19.1 + diff --git a/features/yaffs2/yaffs-fix-mtime-itime-field-access.patch b/features/yaffs2/yaffs-fix-mtime-itime-field-access.patch new file mode 100644 index 00000000..482312a0 --- /dev/null +++ b/features/yaffs2/yaffs-fix-mtime-itime-field-access.patch @@ -0,0 +1,65 @@ +From 7614fa80bc6abefd1450b5c4c3839386ac2b92cc Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Wed, 22 Nov 2023 12:04:28 -0500 +Subject: [PATCH] yaffs: fix mtime/itime field access + +Adapting our inode field access to the following upstream +commit: + + commit 12cd44023651666bd44baa36a5c999698890debb + Author: Jeff Layton <jlayton@kernel.org> + Date: Fri Sep 29 09:05:52 2023 -0400 + + fs: rename inode i_atime and i_mtime fields + + Rename these two fields to discourage direct access (and to help ensure + that we mop up any leftover direct accesses). + + Signed-off-by: Jeff Layton <jlayton@kernel.org> + Signed-off-by: Christian Brauner <brauner@kernel.org> + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_vfs.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c +index 8a9738de8906..ec4016cfeedf 100644 +--- a/fs/yaffs2/yaffs_vfs.c ++++ b/fs/yaffs2/yaffs_vfs.c +@@ -282,7 +282,7 @@ MODULE_PARM(yaffs_gc_control, "i"); + } while (0) + #else + #define update_dir_time(dir) do {\ +- (dir)->i_mtime = inode_set_ctime_to_ts( dir, current_time(dir) ); \ ++ (dir)->__i_mtime = inode_set_ctime_to_ts( dir, current_time(dir) ); \ + } while (0) + #endif + +@@ -2075,17 +2075,17 @@ static void yaffs_fill_inode_from_obj(struct inode *inode, + #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) + + inode->i_rdev = old_decode_dev(obj->yst_rdev); +- inode->i_atime.tv_sec = (time64_t) (obj->yst_atime); +- inode->i_atime.tv_nsec = 0; +- inode->i_mtime.tv_sec = (time64_t) obj->yst_mtime; +- inode->i_mtime.tv_nsec = 0; ++ inode->__i_atime.tv_sec = (time64_t) (obj->yst_atime); ++ inode->__i_atime.tv_nsec = 0; ++ inode->__i_mtime.tv_sec = (time64_t) obj->yst_mtime; ++ inode->__i_mtime.tv_nsec = 0; + //inode->i_ctime.tv_sec = (time64_t) obj->yst_ctime; + inode->__i_ctime.tv_sec = (time64_t) obj->yst_ctime; + inode->__i_ctime.tv_nsec = 0; + #else + inode->i_rdev = obj->yst_rdev; +- inode->i_atime = obj->yst_atime; +- inode->i_mtime = obj->yst_mtime; ++ inode->__i_atime = obj->yst_atime; ++ inode->__i_mtime = obj->yst_mtime; + inode->i_ctime = obj->yst_ctime; + #endif + inode->i_size = yaffs_get_obj_length(obj); +-- +2.34.1 + diff --git a/features/yaffs2/yaffs-fix-yaffs_vfs.c-warnings.patch b/features/yaffs2/yaffs-fix-yaffs_vfs.c-warnings.patch deleted file mode 100644 index 007fc2cd..00000000 --- a/features/yaffs2/yaffs-fix-yaffs_vfs.c-warnings.patch +++ /dev/null @@ -1,54 +0,0 @@ -From de4232c81899959e9f0e8e93af3a8511deb1dd0e Mon Sep 17 00:00:00 2001 -From: Zhang Xiao <xiao.zhang@windriver.com> -Date: Wed, 27 Aug 2014 13:34:16 +0800 -Subject: [PATCH 2/2] yaffs: fix yaffs_vfs.c warnings. - -fs/yaffs2/yaffs_vfs.c:3036:14: warning: 'yaffs_dump_dev_part0' defined but not used [-Wunused-function] -fs/yaffs2/yaffs_vfs.c:3074:14: warning: 'yaffs_dump_dev_part1' defined but not used [-Wunused-function] -fs/yaffs2/yaffs_vfs.c:3192:3: warning: 'mask_flags' defined but not used [-Wunused-variable] - -Signed-off-by: Zhang Xiao <xiao.zhang@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - fs/yaffs2/yaffs_vfs.c | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index d372a4e1d9bf..2abb12706eb6 100644 ---- a/fs/yaffs2/yaffs_vfs.c -+++ b/fs/yaffs2/yaffs_vfs.c -@@ -3140,7 +3140,6 @@ static DECLARE_FSTYPE(yaffs2_fs_type, "yaffs2", yaffs2_read_super, - - #if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)) - static struct proc_dir_entry *my_proc_entry; --#endif - - static char *yaffs_dump_dev_part0(char *buf, struct yaffs_dev *dev) - { -@@ -3229,7 +3228,6 @@ static char *yaffs_dump_dev_part1(char *buf, struct yaffs_dev *dev) - return buf; - } - --#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)) - static int yaffs_proc_read(char *page, - char **start, - off_t offset, int count, int *eof, void *data) -@@ -3285,7 +3283,6 @@ static int yaffs_proc_read(char *page, - - return buf - page < count ? buf - page : count; - } --#endif - - /** - * Set the verbosity of the warnings and error messages. -@@ -3328,7 +3325,6 @@ static struct { - {NULL, 0}, - }; - --#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)) - #define MAX_MASK_NAME_LENGTH 40 - static int yaffs_proc_write_trace_options(struct file *file, const char *buf, - unsigned long count, void *data) --- -1.8.1.2 - diff --git a/features/yaffs2/yaffs-include-blkdev.h.patch b/features/yaffs2/yaffs-include-blkdev.h.patch new file mode 100644 index 00000000..e75911de --- /dev/null +++ b/features/yaffs2/yaffs-include-blkdev.h.patch @@ -0,0 +1,28 @@ +From a07a378f2bbfc640c6b76abfa3ef2a32a86cbfa2 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Sat, 29 Aug 2020 10:25:04 -0400 +Subject: [PATCH] yaffs: include blkdev.h + +The definition of BDEVNAME_SIZE has moved, so we add the new .h + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_vfs.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c +index 3ffdc0129637..a9cf8edc2245 100644 +--- a/fs/yaffs2/yaffs_vfs.c ++++ b/fs/yaffs2/yaffs_vfs.c +@@ -74,6 +74,8 @@ + #include <linux/config.h> + #endif + ++#include <linux/blkdev.h> ++ + #include <linux/kernel.h> + #include <linux/module.h> + #include <linux/slab.h> +-- +2.19.1 + diff --git a/features/yaffs2/yaffs-repair-yaffs_get_mtd_device.patch b/features/yaffs2/yaffs-repair-yaffs_get_mtd_device.patch new file mode 100644 index 00000000..893e5ed4 --- /dev/null +++ b/features/yaffs2/yaffs-repair-yaffs_get_mtd_device.patch @@ -0,0 +1,52 @@ +From 0a1709f766bbc8a143e3ee9098327e815ea7e47d Mon Sep 17 00:00:00 2001 +From: Quanyang Wang <quanyang.wang@windriver.com> +Date: Tue, 3 Dec 2019 17:01:17 +0800 +Subject: [PATCH 6/7] yaffs: repair yaffs_get_mtd_device + +The function yaffs_get_mtd_device use wrong function to retrieve +mtd_info structure (using yaffs_get_mtd_device itself will cause +dead loop). + +Use get_mtd_device to do this. + +Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_mtdif.c | 12 ++++++++++-- + 1 file changed, 10 insertions(+), 2 deletions(-) + +diff --git a/fs/yaffs2/yaffs_mtdif.c b/fs/yaffs2/yaffs_mtdif.c +index 2d34b017d08e..ecc53f6814b6 100644 +--- a/fs/yaffs2/yaffs_mtdif.c ++++ b/fs/yaffs2/yaffs_mtdif.c +@@ -256,17 +256,25 @@ struct mtd_info * yaffs_get_mtd_device(dev_t sdev) + { + struct mtd_info *mtd; + +- mtd = yaffs_get_mtd_device(sdev); +- + /* Check it's an mtd device..... */ + if (MAJOR(sdev) != MTD_BLOCK_MAJOR) + return NULL; /* This isn't an mtd device */ + ++ /* Get the device */ ++ mtd = get_mtd_device(NULL, MINOR(sdev)); ++ if (IS_ERR_OR_NULL(mtd)) { ++ yaffs_trace(YAFFS_TRACE_ALWAYS, ++ "yaffs: MTD device %u either not valid or unavailable", ++ MINOR(sdev)); ++ return NULL; ++ } ++ + /* Check it's NAND */ + if (mtd->type != MTD_NANDFLASH) { + yaffs_trace(YAFFS_TRACE_ALWAYS, + "yaffs: MTD device is not NAND it's type %d", + mtd->type); ++ put_mtd_device(mtd); + return NULL; + } + +-- +2.19.1 + diff --git a/features/yaffs2/yaffs-replace-IS_ERR-with-IS_ERR_OR_NULL-to-check-bo.patch b/features/yaffs2/yaffs-replace-IS_ERR-with-IS_ERR_OR_NULL-to-check-bo.patch new file mode 100644 index 00000000..4956ff5e --- /dev/null +++ b/features/yaffs2/yaffs-replace-IS_ERR-with-IS_ERR_OR_NULL-to-check-bo.patch @@ -0,0 +1,49 @@ +From f3ffb6a61225aa0a89d0edfeb7cdd99b9963faa0 Mon Sep 17 00:00:00 2001 +From: Meng Li <Meng.Li@windriver.com> +Date: Thu, 21 Oct 2021 09:27:20 +0800 +Subject: [PATCH] yaffs: replace IS_ERR with IS_ERR_OR_NULL to check both ERR + and NULL + +When run below command to mount a yaffs2 FS to nor flash, there +is kernel panic as below: +Unable to handle kernel NULL pointer dereference at virtual address 0000000000000020 +...... +Internal error: Oops: 96000004 [#1] PREEMPT SMP +Modules linked in: +CPU: 1 PID: 335 Comm: mount Not tainted 5.10.73-yocto-standard #1 +...... +Call trace: + yaffs_internal_read_super.constprop.0+0x24c/0x6fc + yaffs2_internal_read_super_mtd+0x28/0x40 + mount_bdev+0x1cc/0x200 + ...... + el0_sync_handler+0x1a4/0x1b0 + el0_sync+0x180/0x1c0 +Because in function yaffs_get_mtd_device(), it check the type of +mtd device. If it is not NAND flash, NULL will be returned. This +causes kernel panic if the ret value is not checked whether it +is NULL or not. So, replace IS_ERR with IS_ERR_OR_NULL to check +both ERR and NULL. + +Signed-off-by: Meng Li <Meng.Li@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_vfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c +index ee9d6955ed79..8ceb66c0d070 100644 +--- a/fs/yaffs2/yaffs_vfs.c ++++ b/fs/yaffs2/yaffs_vfs.c +@@ -2965,7 +2965,7 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, + + + mtd = yaffs_get_mtd_device(sb->s_dev); +- if (IS_ERR(mtd)) { ++ if (IS_ERR_OR_NULL(mtd)) { + return NULL; + } + +-- +2.19.1 + diff --git a/features/yaffs2/yaffs2-Adjust-the-timer-callback-and-init-functions.patch b/features/yaffs2/yaffs2-Adjust-the-timer-callback-and-init-functions.patch deleted file mode 100644 index cf39dd9f..00000000 --- a/features/yaffs2/yaffs2-Adjust-the-timer-callback-and-init-functions.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 9f9649fffac97603862fdc90530e0b3ff038eed1 Mon Sep 17 00:00:00 2001 -From: Kevin Hao <kexin.hao@windriver.com> -Date: Fri, 23 Feb 2018 13:32:51 +0800 -Subject: [PATCH 2/2] yaffs2: Adjust the timer callback and init functions - -The timer callback argument type has been changed by commit 354b46b1a0ad -("timer: Switch callback prototype to take struct timer_list * -argument") and init_timer_on_stack() is also removed by commit -9c6c273aa424 ("timer: Remove init_timer_on_stack() in favor of -timer_setup_on_stack()"). Adjust the codes in yaffs2 according to -these changes. - -Signed-off-by: Kevin Hao <kexin.hao@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - fs/yaffs2/yaffs_vfs.c | 26 ++++++++++++++++---------- - 1 file changed, 16 insertions(+), 10 deletions(-) - -diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index c7be4cddd1de..c99acf08a0d8 100644 ---- a/fs/yaffs2/yaffs_vfs.c -+++ b/fs/yaffs2/yaffs_vfs.c -@@ -136,7 +136,7 @@ - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)) - #define Y_INIT_TIMER(a) init_timer(a) - #else --#define Y_INIT_TIMER(a) init_timer_on_stack(a) -+#define Y_INIT_TIMER(a) timer_setup_on_stack(a, NULL, 0) - #endif - - #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 27)) -@@ -2065,10 +2065,16 @@ static unsigned yaffs_bg_gc_urgency(struct yaffs_dev *dev) - } - - #ifdef YAFFS_COMPILE_BACKGROUND -+struct yaffs_timer { -+ struct timer_list timer; -+ struct task_struct *tsk; -+}; - --void yaffs_background_waker(unsigned long data) -+void yaffs_background_waker(struct timer_list *t) - { -- wake_up_process((struct task_struct *)data); -+ struct yaffs_timer *yt = from_timer(yt, t, timer); -+ -+ wake_up_process(yt->tsk); - } - - static int yaffs_bg_thread_fn(void *data) -@@ -2082,7 +2088,7 @@ static int yaffs_bg_thread_fn(void *data) - unsigned int urgency; - - int gc_result; -- struct timer_list timer; -+ struct yaffs_timer yt; - - yaffs_trace(YAFFS_TRACE_BACKGROUND, - "yaffs_background starting for dev %p", (void *)dev); -@@ -2135,15 +2141,15 @@ static int yaffs_bg_thread_fn(void *data) - if (time_before(expires, now)) - expires = now + HZ; - -- Y_INIT_TIMER(&timer); -- timer.expires = expires + 1; -- timer.data = (unsigned long)current; -- timer.function = yaffs_background_waker; -+ Y_INIT_TIMER(&yt.timer); -+ yt.timer.function = yaffs_background_waker; -+ yt.timer.expires = expires + 1; -+ yt.tsk = current; - - set_current_state(TASK_INTERRUPTIBLE); -- add_timer(&timer); -+ add_timer(&yt.timer); - schedule(); -- del_timer_sync(&timer); -+ del_timer_sync(&yt.timer); - #else - msleep(10); - #endif --- -2.5.0 - diff --git a/features/yaffs2/yaffs2-Fix-miscalculation-of-devname-buffer-length.patch b/features/yaffs2/yaffs2-Fix-miscalculation-of-devname-buffer-length.patch new file mode 100644 index 00000000..79deb483 --- /dev/null +++ b/features/yaffs2/yaffs2-Fix-miscalculation-of-devname-buffer-length.patch @@ -0,0 +1,65 @@ +From dded404c66bb87f08216afd1e3c9d84359e80012 Mon Sep 17 00:00:00 2001 +From: He Zhe <zhe.he@windriver.com> +Date: Wed, 31 May 2023 14:01:07 +0800 +Subject: [PATCH] yaffs2: Fix miscalculation of devname buffer length + +The following build warning helps us find a real mishandling of array length. + +fs/yaffs2/yaffs_vfs.c:122:29: warning: argument to 'sizeof' in 'snprintf' call +is the same expression as the destination; did you mean to provide an explicit +length? [-Wsizeof-pointer-memaccess] + +If an array is passed as a function parameter it'll be treated as a simple +pointer and thus sizeof will return the length of a pointer rather than the +length of the array. + +Add and pass the buffer length to make it work correctly. + +Signed-off-by: He Zhe <zhe.he@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_vfs.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c +index 140f7aa7a1a1..e9e29a41a680 100644 +--- a/fs/yaffs2/yaffs_vfs.c ++++ b/fs/yaffs2/yaffs_vfs.c +@@ -118,8 +118,8 @@ + + /* FIXME: use sb->s_id instead ? */ + //#define yaffs_devname(sb, buf) bdevname(sb->s_bdev, buf) +-static inline char* yaffs_devname(struct super_block *sb, char *buf) { +- snprintf(buf, sizeof(buf), "%pg", sb->s_bdev); ++static inline char* yaffs_devname(struct super_block *sb, char *buf, unsigned long len) { ++ snprintf(buf, len, "%pg", sb->s_bdev); + return buf; + } + +@@ -2944,12 +2944,12 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, + + if (!sb->s_dev) + printk(KERN_INFO "yaffs: sb->s_dev is NULL\n"); +- else if (!yaffs_devname(sb, devname_buf)) ++ else if (!yaffs_devname(sb, devname_buf, sizeof(devname_buf))) + printk(KERN_INFO "yaffs: devname is NULL\n"); + else + printk(KERN_INFO "yaffs: dev is %d name is \"%s\" %s\n", + sb->s_dev, +- yaffs_devname(sb, devname_buf), read_only ? "ro" : "rw"); ++ yaffs_devname(sb, devname_buf, sizeof(devname_buf)), read_only ? "ro" : "rw"); + + if (!data_str) + data_str = ""; +@@ -2974,7 +2974,7 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, + yaffs_trace(YAFFS_TRACE_ALWAYS, + "yaffs: Attempting MTD mount of %u.%u,\"%s\"", + MAJOR(sb->s_dev), MINOR(sb->s_dev), +- yaffs_devname(sb, devname_buf)); ++ yaffs_devname(sb, devname_buf, sizeof(devname_buf))); + + + mtd = yaffs_get_mtd_device(sb->s_dev); +-- +2.34.1 + diff --git a/features/yaffs2/yaffs2-NULL-read-write.patch b/features/yaffs2/yaffs2-NULL-read-write.patch deleted file mode 100644 index a02ef24a..00000000 --- a/features/yaffs2/yaffs2-NULL-read-write.patch +++ /dev/null @@ -1,32 +0,0 @@ -From da1c7fd61d13a590ee9b0262d76c81db3753dda3 Mon Sep 17 00:00:00 2001 -From: Kevin Hao <kexin.hao@windriver.com> -Date: Wed, 24 Feb 2016 14:37:12 +0800 -Subject: [PATCH 2/3] yaffs2: NULL ->read/->write - -As stated in commit 5d5d56897530 ("make new_sync_{read,write}() static"), -we shouldn't use new_sync_{read_write} for ->read/->write. We should -NULL ->read/->write with non-NULL ->{read,write}_iter will do the -right thing. - -Signed-off-by: Kevin Hao <kexin.hao@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - fs/yaffs2/yaffs_vfs.c | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index fbbf31303537..0a3e9dabe1aa 100644 ---- a/fs/yaffs2/yaffs_vfs.c -+++ b/fs/yaffs2/yaffs_vfs.c -@@ -794,8 +794,6 @@ static int yaffs_sync_object(struct file *file, struct dentry *dentry, - - #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22)) - static const struct file_operations yaffs_file_operations = { -- .read = new_sync_read, -- .write = new_sync_write, - .read_iter = generic_file_read_iter, - .write_iter = generic_file_write_iter, - .mmap = generic_file_mmap, --- -2.5.0 - diff --git a/features/yaffs2/yaffs2-adjust-to-new-location-of-MS_RDONLY-define.patch b/features/yaffs2/yaffs2-adjust-to-new-location-of-MS_RDONLY-define.patch deleted file mode 100644 index 288f7638..00000000 --- a/features/yaffs2/yaffs2-adjust-to-new-location-of-MS_RDONLY-define.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 6c361abfc4a47a67f2f40a2ce0b92c11ae5fa4ef Mon Sep 17 00:00:00 2001 -From: OpenEmbedded <oe.patch@oe> -Date: Wed, 23 Jan 2019 14:50:26 +0000 -Subject: [PATCH] yaffs2: adjust to new location of MS_RDONLY define - -Signed-off-by: OpenEmbedded <oe.patch@oe> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - fs/yaffs2/yaffs_vfs.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index b029b8d4276e..61ac4e4c45d1 100644 ---- a/fs/yaffs2/yaffs_vfs.c -+++ b/fs/yaffs2/yaffs_vfs.c -@@ -169,6 +169,8 @@ static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size) - #include <linux/mtd/mtd.h> - #include <linux/cred.h> - -+#include <uapi/linux/mount.h> -+ - #include "yportenv.h" - #include "yaffs_trace.h" - #include "yaffs_guts.h" --- -2.19.1 - diff --git a/features/yaffs2/yaffs2-adjust-to-proper-location-of-MS_RDONLY.patch b/features/yaffs2/yaffs2-adjust-to-proper-location-of-MS_RDONLY.patch new file mode 100644 index 00000000..683c1ad1 --- /dev/null +++ b/features/yaffs2/yaffs2-adjust-to-proper-location-of-MS_RDONLY.patch @@ -0,0 +1,26 @@ +From ca8626eb7ae99fc212704196242b05b1bf2c2663 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Tue, 14 Jan 2020 13:53:11 -0500 +Subject: [PATCH 1/2] yaffs2: adjust to proper location of MS_RDONLY + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_vfs.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c +index a36d9bfaa9d2..34cdc58339a8 100644 +--- a/fs/yaffs2/yaffs_vfs.c ++++ b/fs/yaffs2/yaffs_vfs.c +@@ -173,6 +173,8 @@ static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size) + #include <linux/uaccess.h> + #include <linux/mtd/mtd.h> + ++#include <uapi/linux/mount.h> ++ + #include "yportenv.h" + #include "yaffs_trace.h" + #include "yaffs_guts.h" +-- +2.19.1 + diff --git a/features/yaffs2/yaffs2-convert-to-kuid_t-and-kgid_t.patch b/features/yaffs2/yaffs2-convert-to-kuid_t-and-kgid_t.patch deleted file mode 100644 index a332667e..00000000 --- a/features/yaffs2/yaffs2-convert-to-kuid_t-and-kgid_t.patch +++ /dev/null @@ -1,187 +0,0 @@ -From 0c6fdced777c33c7869c059c30e3359a08644bd9 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@windriver.com> -Date: Sat, 31 Aug 2013 23:41:50 -0400 -Subject: [PATCH 2/3] yaffs2: convert to kuid_t and kgid_t - -Based on the openwrt patch: - - https://dev.openwrt.org/export/37617/trunk/target/linux/generic/patches-3.10/512-yaffs-3.5-convert-to-use-kuid_t-kgid_t.patch - -To fix compliation issues, we convert the latest yaffs2 to use kuid_t and -kgid_t for kernels greater than 3.9. - -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> - -empty message aborts the commit. ---- - fs/yaffs2/yaffs_attribs.c | 8 ++++---- - fs/yaffs2/yaffs_attribs.h | 43 +++++++++++++++++++++++++++++++++++++++++++ - fs/yaffs2/yaffs_vfs.c | 44 +++++++++++++++++++++++++++++++++++--------- - 3 files changed, 82 insertions(+), 13 deletions(-) - -diff --git a/fs/yaffs2/yaffs_attribs.c b/fs/yaffs2/yaffs_attribs.c -index 3d778f2..fdc7f21 100644 ---- a/fs/yaffs2/yaffs_attribs.c -+++ b/fs/yaffs2/yaffs_attribs.c -@@ -77,9 +77,9 @@ int yaffs_set_attribs(struct yaffs_obj *obj, struct iattr *attr) - if (valid & ATTR_MODE) - obj->yst_mode = attr->ia_mode; - if (valid & ATTR_UID) -- obj->yst_uid = attr->ia_uid; -+ obj->yst_uid = ia_uid_read(attr); - if (valid & ATTR_GID) -- obj->yst_gid = attr->ia_gid; -+ obj->yst_gid = ia_gid_read(attr); - - if (valid & ATTR_ATIME) - obj->yst_atime = Y_TIME_CONVERT(attr->ia_atime); -@@ -103,9 +103,9 @@ int yaffs_get_attribs(struct yaffs_obj *obj, struct iattr *attr) - - attr->ia_mode = obj->yst_mode; - valid |= ATTR_MODE; -- attr->ia_uid = obj->yst_uid; -+ ia_uid_write( attr, obj->yst_uid ); - valid |= ATTR_UID; -- attr->ia_gid = obj->yst_gid; -+ ia_gid_write( attr, obj->yst_gid ); - valid |= ATTR_GID; - - Y_TIME_CONVERT(attr->ia_atime) = obj->yst_atime; -diff --git a/fs/yaffs2/yaffs_attribs.h b/fs/yaffs2/yaffs_attribs.h -index 5b21b08..121d99d 100644 ---- a/fs/yaffs2/yaffs_attribs.h -+++ b/fs/yaffs2/yaffs_attribs.h -@@ -25,4 +25,47 @@ void yaffs_load_current_time(struct yaffs_obj *obj, int do_a, int do_c); - int yaffs_set_attribs(struct yaffs_obj *obj, struct iattr *attr); - int yaffs_get_attribs(struct yaffs_obj *obj, struct iattr *attr); - -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)) -+static inline uid_t ia_uid_read(const struct iattr *iattr) -+{ -+ return from_kuid(&init_user_ns, iattr->ia_uid); -+} -+ -+static inline gid_t ia_gid_read(const struct iattr *iattr) -+{ -+ return from_kgid(&init_user_ns, iattr->ia_gid); -+} -+ -+static inline void ia_uid_write(struct iattr *iattr, uid_t uid) -+{ -+ iattr->ia_uid = make_kuid(&init_user_ns, uid); -+} -+ -+static inline void ia_gid_write(struct iattr *iattr, gid_t gid) -+{ -+ iattr->ia_gid = make_kgid(&init_user_ns, gid); -+} -+#else -+static inline uid_t ia_uid_read(const struct iattr *iattr) -+{ -+ return iattr->ia_uid; -+} -+ -+static inline gid_t ia_gid_read(const struct iattr *inode) -+{ -+ return iattr->ia_gid; -+} -+ -+static inline void ia_uid_write(struct iattr *iattr, uid_t uid) -+{ -+ iattr->ia_uid = uid; -+} -+ -+static inline void ia_gid_write(struct iattr *iattr, gid_t gid) -+{ -+ iattr->ia_gid = gid; -+} -+#endif -+ - #endif -diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index 67050d4..929c2e9 100644 ---- a/fs/yaffs2/yaffs_vfs.c -+++ b/fs/yaffs2/yaffs_vfs.c -@@ -711,6 +711,33 @@ static struct address_space_operations yaffs_file_address_operations = { - #endif - }; - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)) -+#define YCRED_FSUID() from_kuid(&init_user_ns, current_fsuid()) -+#define YCRED_FSGID() from_kgid(&init_user_ns, current_fsgid()) -+#else -+#define YCRED_FSUID() YCRED(current)->fsuid -+#define YCRED_FSGID() YCRED(current)->fsgid -+ -+static inline uid_t i_uid_read(const struct inode *inode) -+{ -+ return inode->i_uid; -+} -+ -+static inline gid_t i_gid_read(const struct inode *inode) -+{ -+ return inode->i_gid; -+} -+ -+static inline void i_uid_write(struct inode *inode, uid_t uid) -+{ -+ inode->i_uid = uid; -+} -+ -+static inline void i_gid_write(struct inode *inode, gid_t gid) -+{ -+ inode->i_gid = gid; -+} -+#endif - - #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) - static int yaffs_file_flush(struct file *file, fl_owner_t id) -@@ -1225,9 +1252,9 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, - struct yaffs_obj *parent = yaffs_inode_to_obj(dir); - - int error = -ENOSPC; -- uid_t uid = YCRED(current)->fsuid; -- gid_t gid = -- (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid; -+ -+ uid_t uid = YCRED_FSUID(); -+ gid_t gid = (dir->i_mode & S_ISGID) ? i_gid_read(dir) : YCRED_FSGID(); - - if ((dir->i_mode & S_ISGID) && S_ISDIR(mode)) - mode |= S_ISGID; -@@ -1424,9 +1451,8 @@ static int yaffs_symlink(struct inode *dir, struct dentry *dentry, - { - struct yaffs_obj *obj; - struct yaffs_dev *dev; -- uid_t uid = YCRED(current)->fsuid; -- gid_t gid = -- (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid; -+ uid_t uid = YCRED_FSUID(); -+ gid_t gid = (dir->i_mode & S_ISGID) ? i_gid_read(dir) : YCRED_FSGID(); - - yaffs_trace(YAFFS_TRACE_OS, "yaffs_symlink"); - -@@ -1829,8 +1855,8 @@ static void yaffs_fill_inode_from_obj(struct inode *inode, - - inode->i_ino = obj->obj_id; - inode->i_mode = obj->yst_mode; -- inode->i_uid = obj->yst_uid; -- inode->i_gid = obj->yst_gid; -+ i_uid_write(inode, obj->yst_uid); -+ i_gid_write(inode, obj->yst_gid); - #if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)) - inode->i_blksize = inode->i_sb->s_blocksize; - #endif -@@ -1856,7 +1882,7 @@ static void yaffs_fill_inode_from_obj(struct inode *inode, - - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_fill_inode mode %x uid %d gid %d size %lld count %d", -- inode->i_mode, inode->i_uid, inode->i_gid, -+ inode->i_mode, i_uid_read(inode), i_gid_read(inode), - inode->i_size, atomic_read(&inode->i_count)); - - switch (obj->yst_mode & S_IFMT) { --- -1.7.10.4 - diff --git a/features/yaffs2/yaffs2-convert-user_namespace-to-mnt_idmap.patch b/features/yaffs2/yaffs2-convert-user_namespace-to-mnt_idmap.patch new file mode 100644 index 00000000..1a67540b --- /dev/null +++ b/features/yaffs2/yaffs2-convert-user_namespace-to-mnt_idmap.patch @@ -0,0 +1,96 @@ +From 5440769b1bbff51e64557c2a981a6cdfece8adec Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Fri, 17 Mar 2023 22:31:42 -0400 +Subject: [PATCH] yaffs2: convert user_namespace to mnt_idmap + +commit c1632a0f11209338fc300c66252bcc4686e609e8 [fs: port ->setattr() to +pass mnt_idmap] changes the parameters to attr operations to a +mnt_idmap. + +yaffs2 isn't using the user namespace directly, so we switch to the +default map. + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_vfs.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c +index 140f7aa7a1a1..3844d542608e 100644 +--- a/fs/yaffs2/yaffs_vfs.c ++++ b/fs/yaffs2/yaffs_vfs.c +@@ -910,7 +910,7 @@ static int yaffs_vfs_setsize(struct inode *inode, loff_t newsize) + static int yaffs_vfs_setattr(struct inode *inode, struct iattr *attr) + { + #ifdef YAFFS_USE_SETATTR_COPY +- setattr_copy(&init_user_ns,inode, attr); ++ setattr_copy(&nop_mnt_idmap,inode, attr); + return 0; + #else + return inode_setattr(inode, attr); +@@ -918,7 +918,7 @@ static int yaffs_vfs_setattr(struct inode *inode, struct iattr *attr) + + } + +-static int yaffs_setattr(struct user_namespace *ns, struct dentry *dentry, struct iattr *attr) ++static int yaffs_setattr(struct mnt_idmap *ns, struct dentry *dentry, struct iattr *attr) + { + struct inode *inode = dentry->d_inode; + int error = 0; +@@ -934,7 +934,7 @@ static int yaffs_setattr(struct user_namespace *ns, struct dentry *dentry, struc + #endif + + if (error == 0) +- error = setattr_prepare(&init_user_ns,dentry, attr); ++ error = setattr_prepare(&nop_mnt_idmap,dentry, attr); + if (error == 0) { + int result; + if (!error) { +@@ -1352,7 +1352,7 @@ struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev, + + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) +-static int yaffs_mknod(struct user_namespace *ns, struct inode *dir, struct dentry *dentry, umode_t mode, ++static int yaffs_mknod(struct mnt_idmap *ns, struct inode *dir, struct dentry *dentry, umode_t mode, + dev_t rdev) + #elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) + static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, +@@ -1446,7 +1446,7 @@ static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, + } + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) +-static int yaffs_mkdir(struct user_namespace *ns, struct inode *dir, struct dentry *dentry, umode_t mode) ++static int yaffs_mkdir(struct mnt_idmap *ns, struct inode *dir, struct dentry *dentry, umode_t mode) + #else + static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode) + #endif +@@ -1459,7 +1459,7 @@ static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode) + + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) +-static int yaffs_create(struct user_namespace *ns, struct inode *dir, struct dentry *dentry, umode_t mode, ++static int yaffs_create(struct mnt_idmap *ns, struct inode *dir, struct dentry *dentry, umode_t mode, + bool dummy) + #elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) + static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode, +@@ -1564,7 +1564,7 @@ static int yaffs_link(struct dentry *old_dentry, struct inode *dir, + return -EPERM; + } + +-static int yaffs_symlink(struct user_namespace *ns, ++static int yaffs_symlink(struct mnt_idmap *ns, + struct inode *dir, struct dentry *dentry, + const char *symname) + { +@@ -1611,7 +1611,7 @@ static int yaffs_symlink(struct user_namespace *ns, + * NB: POSIX says you can rename an object over an old object of the same name + */ + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)) +-static int yaffs_rename(struct user_namespace *ns, struct inode *old_dir, struct dentry *old_dentry, ++static int yaffs_rename(struct mnt_idmap *ns, struct inode *old_dir, struct dentry *old_dentry, + struct inode *new_dir, struct dentry *new_dentry, unsigned int unused) + #else + static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry, +-- +2.34.1 + diff --git a/features/yaffs2/yaffs2-disable-procfs-support.patch b/features/yaffs2/yaffs2-disable-procfs-support.patch deleted file mode 100644 index bc4dca0d..00000000 --- a/features/yaffs2/yaffs2-disable-procfs-support.patch +++ /dev/null @@ -1,100 +0,0 @@ -From ed4ece78297c02669bd5950401b486f2ea5586ad Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@windriver.com> -Date: Sun, 1 Sep 2013 00:02:18 -0400 -Subject: [PATCH 3/3] yaffs2: disable procfs support - -The proc interfaces in the 3.10 kernel have changed in a manner that is not -compatible with yaffs2. As discussed in the following thread: - - http://www.aleph1.co.uk/lurker/message/20130724.003329.c28842f5.en.html - -The solution is to temporarily remove procfs support, which allows the FS to -continue to be used. - -Based on this patch: - - https://dev.openwrt.org/export/37617/trunk/target/linux/generic/patches-3.10/515-yaffs-3.10-disable-proc-entry.patch - -We disable procfs for any kernel greater than 3.9 - -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - fs/yaffs2/yaffs_vfs.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index 929c2e9..568cef4 100644 ---- a/fs/yaffs2/yaffs_vfs.c -+++ b/fs/yaffs2/yaffs_vfs.c -@@ -3023,8 +3023,9 @@ static DECLARE_FSTYPE(yaffs2_fs_type, "yaffs2", yaffs2_read_super, - FS_REQUIRES_DEV); - #endif - -- -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)) - static struct proc_dir_entry *my_proc_entry; -+#endif - - static char *yaffs_dump_dev_part0(char *buf, struct yaffs_dev *dev) - { -@@ -3113,6 +3114,7 @@ static char *yaffs_dump_dev_part1(char *buf, struct yaffs_dev *dev) - return buf; - } - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)) - static int yaffs_proc_read(char *page, - char **start, - off_t offset, int count, int *eof, void *data) -@@ -3170,6 +3172,7 @@ static int yaffs_proc_read(char *page, - - return buf - page < count ? buf - page : count; - } -+#endif - - /** - * Set the verbosity of the warnings and error messages. -@@ -3212,6 +3215,7 @@ static struct { - {NULL, 0}, - }; - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)) - #define MAX_MASK_NAME_LENGTH 40 - static int yaffs_proc_write_trace_options(struct file *file, const char *buf, - unsigned long count, void *data) -@@ -3397,6 +3401,7 @@ static int yaffs_proc_write(struct file *file, const char *buf, - return yaffs_proc_debug_write(file, buf, count, data); - return yaffs_proc_write_trace_options(file, buf, count, data); - } -+#endif - - /* Stuff to handle installation of file systems */ - struct file_system_to_install { -@@ -3420,6 +3425,7 @@ static int __init init_yaffs_fs(void) - - mutex_init(&yaffs_context_lock); - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)) - /* Install the proc_fs entries */ - my_proc_entry = create_proc_entry("yaffs", - S_IRUGO | S_IFREG, YPROC_ROOT); -@@ -3431,6 +3437,7 @@ static int __init init_yaffs_fs(void) - } else { - return -ENOMEM; - } -+#endif - - /* Now add the file system entries */ - -@@ -3467,7 +3474,9 @@ static void __exit exit_yaffs_fs(void) - yaffs_trace(YAFFS_TRACE_ALWAYS, - "yaffs built " __DATE__ " " __TIME__ " removing."); - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)) - remove_proc_entry("yaffs", YPROC_ROOT); -+#endif - - fsinst = fs_to_install; - --- -1.7.10.4 - diff --git a/features/yaffs2/yaffs2-fix-3.12-compilation-issues.patch b/features/yaffs2/yaffs2-fix-3.12-compilation-issues.patch deleted file mode 100644 index 1c81ca98..00000000 --- a/features/yaffs2/yaffs2-fix-3.12-compilation-issues.patch +++ /dev/null @@ -1,147 +0,0 @@ -From 9d3d65f1398ba63e6a2828ebdefbb76af9423df9 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@windriver.com> -Date: Mon, 20 Jan 2014 00:10:44 -0500 -Subject: [PATCH 1/2] yaffs2: fix 3.12+ compilation issues - -Update yaffs2 to the latest from ssh://www.aleph1.co.uk/home/aleph1/git/yaffs2, -to fix build issues with recent kernels. - -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - fs/yaffs2/yaffs_vfs.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 109 insertions(+) - -diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index c3b73681c826..894e185aa7b7 100644 ---- a/fs/yaffs2/yaffs_vfs.c -+++ b/fs/yaffs2/yaffs_vfs.c -@@ -1700,6 +1700,110 @@ static void yaffs_remove_obj_callback(struct yaffs_obj *obj) - - /*-----------------------------------------------------------------*/ - -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0)) -+static int yaffs_readdir(struct file *file, struct dir_context *ctx) -+{ -+ struct yaffs_obj *obj; -+ struct yaffs_dev *dev; -+ struct yaffs_search_context *sc; -+ struct inode *inode = file->f_dentry->d_inode; -+ unsigned long offset, curoffs; -+ struct yaffs_obj *l; -+ int ret_val = 0; -+ -+ char name[YAFFS_MAX_NAME_LENGTH + 1]; -+ -+ obj = yaffs_dentry_to_obj(file->f_dentry); -+ dev = obj->my_dev; -+ -+ yaffs_gross_lock(dev); -+ -+ yaffs_dev_to_lc(dev)->readdir_process = current; -+ -+ offset = ctx->pos; -+ -+ sc = yaffs_new_search(obj); -+ if (!sc) { -+ ret_val = -ENOMEM; -+ goto out; -+ } -+ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_readdir: starting at %d", (int)offset); -+ -+ if (offset == 0) { -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_readdir: entry . ino %d", -+ (int)inode->i_ino); -+ yaffs_gross_unlock(dev); -+ if (!dir_emit_dot(file, ctx)) { -+ yaffs_gross_lock(dev); -+ goto out; -+ } -+ yaffs_gross_lock(dev); -+ offset++; -+ ctx->pos++; -+ } -+ if (offset == 1) { -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_readdir: entry .. ino %d", -+ (int)file->f_dentry->d_parent->d_inode->i_ino); -+ yaffs_gross_unlock(dev); -+ if (!dir_emit_dotdot(file, ctx)) { -+ yaffs_gross_lock(dev); -+ goto out; -+ } -+ yaffs_gross_lock(dev); -+ offset++; -+ ctx->pos++; -+ } -+ -+ curoffs = 1; -+ -+ /* If the directory has changed since the open or last call to -+ readdir, rewind to after the 2 canned entries. */ -+ if (file->f_version != inode->i_version) { -+ offset = 2; -+ ctx->pos = offset; -+ file->f_version = inode->i_version; -+ } -+ -+ while (sc->next_return) { -+ curoffs++; -+ l = sc->next_return; -+ if (curoffs >= offset) { -+ int this_inode = yaffs_get_obj_inode(l); -+ int this_type = yaffs_get_obj_type(l); -+ -+ yaffs_get_obj_name(l, name, YAFFS_MAX_NAME_LENGTH + 1); -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_readdir: %s inode %d", -+ name, yaffs_get_obj_inode(l)); -+ -+ yaffs_gross_unlock(dev); -+ -+ if (!dir_emit(ctx, name, strlen(name), -+ this_inode, this_type) < 0) { -+ yaffs_gross_lock(dev); -+ goto out; -+ } -+ -+ yaffs_gross_lock(dev); -+ -+ offset++; -+ ctx->pos++; -+ } -+ yaffs_search_advance(sc); -+ } -+ -+out: -+ yaffs_search_end(sc); -+ yaffs_dev_to_lc(dev)->readdir_process = NULL; -+ yaffs_gross_unlock(dev); -+ -+ return ret_val; -+} -+#else - static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) - { - struct yaffs_obj *obj; -@@ -1806,10 +1910,15 @@ out: - - return ret_val; - } -+#endif - - static const struct file_operations yaffs_dir_operations = { - .read = generic_read_dir, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0)) -+ .iterate = yaffs_readdir, -+#else - .readdir = yaffs_readdir, -+#endif - .fsync = yaffs_sync_object, - .llseek = generic_file_llseek, - }; --- -1.8.1.2 - diff --git a/features/yaffs2/yaffs2-fix-MTD_BLOCK_MAJOR-compilation-error.patch b/features/yaffs2/yaffs2-fix-MTD_BLOCK_MAJOR-compilation-error.patch deleted file mode 100644 index e0983691..00000000 --- a/features/yaffs2/yaffs2-fix-MTD_BLOCK_MAJOR-compilation-error.patch +++ /dev/null @@ -1,31 +0,0 @@ -From dddd1d5160f8b0ae68b2f75d5566849219acc110 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@windriver.com> -Date: Mon, 20 Jan 2014 00:24:01 -0500 -Subject: [PATCH 2/2] yaffs2: fix MTD_BLOCK_MAJOR compilation error - -Without including major.h, yaffs2 fails to build with: - -linux/fs/yaffs2/yaffs_mtdif.c:256:21: error: 'MTD_BLOCK_MAJOR' undeclared (first use in this function) - if (MAJOR(sdev) != MTD_BLOCK_MAJOR) - ^ -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - fs/yaffs2/yaffs_mtdif.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/fs/yaffs2/yaffs_mtdif.c b/fs/yaffs2/yaffs_mtdif.c -index 7ae63c54a903..fa4b99834570 100644 ---- a/fs/yaffs2/yaffs_mtdif.c -+++ b/fs/yaffs2/yaffs_mtdif.c -@@ -23,6 +23,8 @@ - #include "linux/version.h" - #include "linux/types.h" - -+#include "uapi/linux/major.h" -+ - #include "yaffs_trace.h" - #include "yaffs_guts.h" - #include "yaffs_linux.h" --- -1.8.1.2 - diff --git a/features/yaffs2/yaffs2-fix-compile-fails-due-to-undefined-vfs_readli.patch b/features/yaffs2/yaffs2-fix-compile-fails-due-to-undefined-vfs_readli.patch deleted file mode 100644 index 99563c65..00000000 --- a/features/yaffs2/yaffs2-fix-compile-fails-due-to-undefined-vfs_readli.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 2814a7144d59f50b90ab9990e49f7b3ed272efe9 Mon Sep 17 00:00:00 2001 -From: Paul Gortmaker <paul.gortmaker@windriver.com> -Date: Mon, 29 Sep 2014 14:28:38 -0400 -Subject: [PATCH 1/4] yaffs2: fix compile fails due to undefined vfs_readlink - -Upstream 5d826c847b34de6415b4f1becd88a57ff619af50 ("new helper: -readlink_copy()") deletes the vfs_readlink(). - -Use a portion of upstream yaffs2 4e188b08c5531f99f73383a85251e03a1e667b2 -("Update to support Linux 3.14/3.15") from the yaffs2 repo at: -http://www.aleph1.co.uk/gitweb?p=yaffs2.git to replace it with -an updated call. - -We don't take the whole commit, since it has a bunch of stuff -dependent on LINUX_VERSION_CODE that is not relevant to 3.17. - -Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> ---- - fs/yaffs2/yaffs_vfs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index 2abb12706eb6..d2c9de20a218 100644 ---- a/fs/yaffs2/yaffs_vfs.c -+++ b/fs/yaffs2/yaffs_vfs.c -@@ -1056,7 +1056,7 @@ static int yaffs_readlink(struct dentry *dentry, char __user * buffer, - if (!alias) - return -ENOMEM; - -- ret = vfs_readlink(dentry, buffer, buflen, alias); -+ ret = readlink_copy(buffer, buflen, alias); - kfree(alias); - return ret; - } --- -1.8.1.2 - diff --git a/features/yaffs2/yaffs2-fix-memory-leak-in-mount-umount.patch b/features/yaffs2/yaffs2-fix-memory-leak-in-mount-umount.patch index c69dda13..63b6452e 100644 --- a/features/yaffs2/yaffs2-fix-memory-leak-in-mount-umount.patch +++ b/features/yaffs2/yaffs2-fix-memory-leak-in-mount-umount.patch @@ -1,7 +1,7 @@ -From fcbb3d24110a91a867a83a6404b318ad9de1ac89 Mon Sep 17 00:00:00 2001 +From f9bda02740198b18f283c8f59a41843fe97320b6 Mon Sep 17 00:00:00 2001 From: czou <cao.zou@windriver.com> Date: Mon, 13 Jul 2015 09:48:03 +0800 -Subject: [PATCH] yaffs2: fix memory leak in mount/umount +Subject: [PATCH 4/7] yaffs2: fix memory leak in mount/umount when using yaffs2 filesystem, after umounting, yaffs_put_super function doesn't free the context_os memory, it is malloced in @@ -31,10 +31,10 @@ Signed-off-by: czou <cao.zou@windriver.com> 1 file changed, 3 insertions(+) diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index 0038cc17fbff..1d39956f07a9 100644 +index 611ef43d9825..b0e3fd977c4a 100644 --- a/fs/yaffs2/yaffs_vfs.c +++ b/fs/yaffs2/yaffs_vfs.c -@@ -2273,6 +2273,9 @@ static void yaffs_put_super(struct super_block *sb) +@@ -2380,6 +2380,9 @@ static void yaffs_put_super(struct super_block *sb) yaffs_dev_to_lc(dev)->spare_buffer = NULL; } @@ -45,5 +45,5 @@ index 0038cc17fbff..1d39956f07a9 100644 yaffs_put_mtd_device(mtd); -- -2.1.0 +2.19.1 diff --git a/features/yaffs2/yaffs2-fix-memory-leak-when-proc-yaffs-is-read.patch b/features/yaffs2/yaffs2-fix-memory-leak-when-proc-yaffs-is-read.patch new file mode 100644 index 00000000..23c0ee48 --- /dev/null +++ b/features/yaffs2/yaffs2-fix-memory-leak-when-proc-yaffs-is-read.patch @@ -0,0 +1,38 @@ +From e64f1a1d9447f4def5e36c9278b433b19eec1798 Mon Sep 17 00:00:00 2001 +From: Charles Manning <cdhmanning@gmail.com> +Date: Mon, 16 Mar 2020 16:52:51 +0800 +Subject: [PATCH] yaffs2: fix memory leak when /proc/yaffs is read + +commit 27f18203551940abf35826a66978daf1b8124c6b from +git://www.aleph1.co.uk/yaffs2 + +Thanks to Jisheng Zhang <Jisheng.Zhang@synaptics.com> for supplying this patch + +There is a kernel memory leak observed when the proc file /proc/yaffs +is read. This reason is that in yaffs_proc_open, single_open is called +and the respective release function is not called during release. + +Fix with correct release function - single_release(). + +Signed-off-by: Jisheng Zhang <Jisheng.Zhang@synaptics.com> +Signed-off-by: Quanyang Wang <quanyang.wang@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_vfs.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c +index d3f89e07401b..4fbd0a42ff3d 100644 +--- a/fs/yaffs2/yaffs_vfs.c ++++ b/fs/yaffs2/yaffs_vfs.c +@@ -3697,6 +3697,7 @@ static struct file_operations procfs_ops = { + .open = yaffs_proc_open, + .read = seq_read, + .write = yaffs_proc_write, ++ .release = single_release, + }; + + static int yaffs_procfs_init(void) +-- +2.19.1 + diff --git a/features/yaffs2/yaffs2-fix-missing-checkpoint-on-yaffs.patch b/features/yaffs2/yaffs2-fix-missing-checkpoint-on-yaffs.patch deleted file mode 100644 index cd7cc582..00000000 --- a/features/yaffs2/yaffs2-fix-missing-checkpoint-on-yaffs.patch +++ /dev/null @@ -1,85 +0,0 @@ -From fcdadf7cdb9659c76808ff5fc2f105c56436e6a8 Mon Sep 17 00:00:00 2001 -From: He Zhe <zhe.he@windriver.com> -Date: Wed, 2 Dec 2015 01:31:31 -0500 -Subject: [PATCH] fs/yaffs2: fix missing checkpoint on yaffs - -For yaffs file system, the mode of reading or writing is restricted at -four pointer where are mnt->mnt_flags,mnt->mnt_sb->s_flags,mtd->flags -and dev->read_only,the first three is used handle file and file -system(eg,remount) operation, and last one(dev->read_only) almost is used -handle checkpoint of yaffs2. However, in current code, the dev->read_only -only can be changed at first time when the yaffs2 file system is mounted, -later it can't be changed again(eg,mount -o remount), the result is that -the checkpoint's saving operation always can't succeed if you set readonly -mode for yaffs2 file system when it is mounted at the first time. - -To fix this issue, we implement yaffs_remount_fs() which allows the -rootfs to be remounted as r/w. - -Signed-off-by: Wenlin Kang <wenlin.kang@windriver.com> -Signed-off-by: He Zhe <zhe.he@windriver.com> ---- - fs/yaffs2/yaffs_vfs.c | 39 +++++++++++++++++++++++++++++++++++++++ - 1 file changed, 39 insertions(+) - -diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index 52177c1..16251d5 100644 ---- a/fs/yaffs2/yaffs_vfs.c -+++ b/fs/yaffs2/yaffs_vfs.c -@@ -2614,7 +2614,45 @@ static int yaffs_sync_fs(struct super_block *sb) - return 0; - } - -+/* the function only is used to change dev->read_only when this file system -+ * is remounted. -+ */ -+static int yaffs_remount_fs(struct super_block *sb, int *flags, char *data) -+{ -+ int read_only = 0; -+ struct mtd_info *mtd; -+ struct yaffs_dev *dev = 0; -+ -+ /* Get the device */ -+ mtd = get_mtd_device(NULL, MINOR(sb->s_dev)); -+ if (!mtd) { -+ yaffs_trace(YAFFS_TRACE_ALWAYS, -+ "MTD device #%u doesn't appear to exist", -+ MINOR(sb->s_dev)); -+ return 1; -+ } - -+ /* Check it's NAND */ -+ if (mtd->type != MTD_NANDFLASH) { -+ yaffs_trace(YAFFS_TRACE_ALWAYS, -+ "MTD device is not NAND it's type %d", -+ mtd->type); -+ return 1; -+ } -+ -+ read_only = ((*flags & MS_RDONLY) != 0); -+ if (!read_only && !(mtd->flags & MTD_WRITEABLE)) { -+ read_only = 1; -+ printk(KERN_INFO -+ "yaffs: mtd is read only, setting superblock read only"); -+ *flags |= MS_RDONLY; -+ } -+ -+ dev = sb->s_fs_info; -+ dev->read_only = read_only; -+ -+ return 0; -+} - - static const struct super_operations yaffs_super_ops = { - .statfs = yaffs_statfs, -@@ -2636,6 +2674,7 @@ static const struct super_operations yaffs_super_ops = { - #ifdef YAFFS_HAS_WRITE_SUPER - .write_super = yaffs_write_super, - #endif -+ .remount_fs = yaffs_remount_fs, - }; - - struct yaffs_options { --- -1.9.1 - diff --git a/features/yaffs2/yaffs2-implement-splice_write-via-write_iter.patch b/features/yaffs2/yaffs2-implement-splice_write-via-write_iter.patch deleted file mode 100644 index 567a6a52..00000000 --- a/features/yaffs2/yaffs2-implement-splice_write-via-write_iter.patch +++ /dev/null @@ -1,30 +0,0 @@ -From de322e053ffead2504fb9e0810680f52b1de11b6 Mon Sep 17 00:00:00 2001 -From: Paul Gortmaker <paul.gortmaker@windriver.com> -Date: Mon, 29 Sep 2014 15:10:01 -0400 -Subject: [PATCH 4/4] yaffs2: implement ->splice_write() via ->write_iter() - -A parallel of mainline 8d0207652cbe27d1f962050737848e5ad4671958 -("->splice_write() via ->write_iter()") changes for the out of -tree yaffs2. - -Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> ---- - fs/yaffs2/yaffs_vfs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index f391145cdf71..0038cc17fbff 100644 ---- a/fs/yaffs2/yaffs_vfs.c -+++ b/fs/yaffs2/yaffs_vfs.c -@@ -802,7 +802,7 @@ static const struct file_operations yaffs_file_operations = { - .flush = yaffs_file_flush, - .fsync = yaffs_sync_object, - .splice_read = generic_file_splice_read, -- .splice_write = generic_file_splice_write, -+ .splice_write = iter_file_splice_write, - .llseek = generic_file_llseek, - }; - --- -1.8.1.2 - diff --git a/features/yaffs2/yaffs2-import-2013-git-3a8580.patch b/features/yaffs2/yaffs2-import-git-revision-b4ce1bb-jan-2020.patch index c7834e04..ef8109c8 100644 --- a/features/yaffs2/yaffs2-import-2013-git-3a8580.patch +++ b/features/yaffs2/yaffs2-import-git-revision-b4ce1bb-jan-2020.patch @@ -1,57 +1,56 @@ -From c252ed684a23cacaa9c2fc52d116d2d3341f3887 Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@windriver.com> -Date: Tue, 20 Aug 2013 23:42:26 -0400 -Subject: [PATCH] yaffs2: import 2013-git-3a8580 +From 5fd0c1a67df759fe4d214f645c6bbdfb72e95518 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Mon, 13 Jan 2020 12:19:30 -0500 +Subject: [PATCH] yaffs2: import git revision b4ce1bb (jan, 2020) -Importing yaffs2 support from git://www.aleph1.co.uk/yaffs2 commit -ID 3a8580e503eed62cebb7b1b4fc3f3f4211010466. - -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> --- fs/Kconfig | 1 + fs/Makefile | 1 + - fs/yaffs2/Kconfig | 30 + - fs/yaffs2/Makefile | 18 + - fs/yaffs2/yaffs_allocator.c | 357 +++ - fs/yaffs2/yaffs_allocator.h | 30 + - fs/yaffs2/yaffs_attribs.c | 124 + - fs/yaffs2/yaffs_attribs.h | 28 + - fs/yaffs2/yaffs_bitmap.c | 97 + - fs/yaffs2/yaffs_bitmap.h | 33 + - fs/yaffs2/yaffs_checkptrw.c | 474 ++++ - fs/yaffs2/yaffs_checkptrw.h | 33 + - fs/yaffs2/yaffs_ecc.c | 281 +++ - fs/yaffs2/yaffs_ecc.h | 44 + + fs/yaffs2/Kconfig | 171 ++ + fs/yaffs2/Makefile | 19 + + fs/yaffs2/yaffs_allocator.c | 356 +++ + fs/yaffs2/yaffs_allocator.h | 29 + + fs/yaffs2/yaffs_attribs.c | 135 + + fs/yaffs2/yaffs_attribs.h | 27 + + fs/yaffs2/yaffs_bitmap.c | 98 + + fs/yaffs2/yaffs_bitmap.h | 32 + + fs/yaffs2/yaffs_checkptrw.c | 480 +++ + fs/yaffs2/yaffs_checkptrw.h | 32 + + fs/yaffs2/yaffs_ecc.c | 280 ++ + fs/yaffs2/yaffs_ecc.h | 43 + + fs/yaffs2/yaffs_endian.c | 105 + + fs/yaffs2/yaffs_endian.h | 54 + fs/yaffs2/yaffs_getblockinfo.h | 35 + - fs/yaffs2/yaffs_guts.c | 5082 ++++++++++++++++++++++++++++++++++++++++ - fs/yaffs2/yaffs_guts.h | 1003 ++++++++ - fs/yaffs2/yaffs_linux.h | 48 + - fs/yaffs2/yaffs_mtdif.c | 212 ++ - fs/yaffs2/yaffs_mtdif.h | 25 + - fs/yaffs2/yaffs_nameval.c | 208 ++ - fs/yaffs2/yaffs_nameval.h | 28 + - fs/yaffs2/yaffs_nand.c | 122 + - fs/yaffs2/yaffs_nand.h | 39 + - fs/yaffs2/yaffs_packedtags1.c | 56 + - fs/yaffs2/yaffs_packedtags1.h | 39 + - fs/yaffs2/yaffs_packedtags2.c | 197 ++ - fs/yaffs2/yaffs_packedtags2.h | 47 + - fs/yaffs2/yaffs_summary.c | 313 +++ - fs/yaffs2/yaffs_summary.h | 37 + - fs/yaffs2/yaffs_tagscompat.c | 381 +++ - fs/yaffs2/yaffs_tagscompat.h | 44 + - fs/yaffs2/yaffs_tagsmarshall.c | 199 ++ - fs/yaffs2/yaffs_tagsmarshall.h | 22 + - fs/yaffs2/yaffs_trace.h | 57 + - fs/yaffs2/yaffs_verify.c | 529 +++++ - fs/yaffs2/yaffs_verify.h | 43 + - fs/yaffs2/yaffs_vfs.c | 2568 ++++++++++++++++++++ - fs/yaffs2/yaffs_yaffs1.c | 422 ++++ - fs/yaffs2/yaffs_yaffs1.h | 22 + - fs/yaffs2/yaffs_yaffs2.c | 1532 ++++++++++++ - fs/yaffs2/yaffs_yaffs2.h | 39 + - fs/yaffs2/yportenv.h | 65 + - 43 files changed, 14965 insertions(+) + fs/yaffs2/yaffs_guts.c | 5212 ++++++++++++++++++++++++++++++++ + fs/yaffs2/yaffs_guts.h | 1069 +++++++ + fs/yaffs2/yaffs_linux.h | 47 + + fs/yaffs2/yaffs_mtdif.c | 313 ++ + fs/yaffs2/yaffs_mtdif.h | 24 + + fs/yaffs2/yaffs_nameval.c | 229 ++ + fs/yaffs2/yaffs_nameval.h | 32 + + fs/yaffs2/yaffs_nand.c | 121 + + fs/yaffs2/yaffs_nand.h | 38 + + fs/yaffs2/yaffs_packedtags1.c | 54 + + fs/yaffs2/yaffs_packedtags1.h | 38 + + fs/yaffs2/yaffs_packedtags2.c | 207 ++ + fs/yaffs2/yaffs_packedtags2.h | 50 + + fs/yaffs2/yaffs_summary.c | 309 ++ + fs/yaffs2/yaffs_summary.h | 36 + + fs/yaffs2/yaffs_tagscompat.c | 399 +++ + fs/yaffs2/yaffs_tagscompat.h | 43 + + fs/yaffs2/yaffs_tagsmarshall.c | 205 ++ + fs/yaffs2/yaffs_tagsmarshall.h | 21 + + fs/yaffs2/yaffs_trace.h | 56 + + fs/yaffs2/yaffs_verify.c | 539 ++++ + fs/yaffs2/yaffs_verify.h | 42 + + fs/yaffs2/yaffs_vfs.c | 3796 +++++++++++++++++++++++ + fs/yaffs2/yaffs_yaffs1.c | 423 +++ + fs/yaffs2/yaffs_yaffs1.h | 21 + + fs/yaffs2/yaffs_yaffs2.c | 1711 +++++++++++ + fs/yaffs2/yaffs_yaffs2.h | 38 + + fs/yaffs2/yportenv.h | 92 + + 45 files changed, 17063 insertions(+) create mode 100644 fs/yaffs2/Kconfig create mode 100644 fs/yaffs2/Makefile create mode 100644 fs/yaffs2/yaffs_allocator.c @@ -64,6 +63,8 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> create mode 100644 fs/yaffs2/yaffs_checkptrw.h create mode 100644 fs/yaffs2/yaffs_ecc.c create mode 100644 fs/yaffs2/yaffs_ecc.h + create mode 100644 fs/yaffs2/yaffs_endian.c + create mode 100644 fs/yaffs2/yaffs_endian.h create mode 100644 fs/yaffs2/yaffs_getblockinfo.h create mode 100644 fs/yaffs2/yaffs_guts.c create mode 100644 fs/yaffs2/yaffs_guts.h @@ -95,10 +96,10 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> create mode 100644 fs/yaffs2/yportenv.h diff --git a/fs/Kconfig b/fs/Kconfig -index c229f82..232a693 100644 +index 708ba336e689..fe77c48345ac 100644 --- a/fs/Kconfig +++ b/fs/Kconfig -@@ -193,6 +193,7 @@ source "fs/hfsplus/Kconfig" +@@ -249,6 +249,7 @@ source "fs/hfsplus/Kconfig" source "fs/befs/Kconfig" source "fs/bfs/Kconfig" source "fs/efs/Kconfig" @@ -107,20 +108,20 @@ index c229f82..232a693 100644 # UBIFS File system configuration source "fs/ubifs/Kconfig" diff --git a/fs/Makefile b/fs/Makefile -index 4fe6df3..6f3b09b 100644 +index 505e51166973..4b7b6634e2ae 100644 --- a/fs/Makefile +++ b/fs/Makefile -@@ -126,3 +126,4 @@ obj-y += exofs/ # Multiple modules - obj-$(CONFIG_CEPH_FS) += ceph/ - obj-$(CONFIG_PSTORE) += pstore/ - obj-$(CONFIG_EFIVAR_FS) += efivarfs/ +@@ -135,3 +135,4 @@ obj-$(CONFIG_EFIVAR_FS) += efivarfs/ + obj-$(CONFIG_EROFS_FS) += erofs/ + obj-$(CONFIG_VBOXSF_FS) += vboxsf/ + obj-$(CONFIG_ZONEFS_FS) += zonefs/ +obj-$(CONFIG_YAFFS_FS) += yaffs2/ diff --git a/fs/yaffs2/Kconfig b/fs/yaffs2/Kconfig new file mode 100644 -index 0000000..bd6e8df +index 000000000000..408570fc7a5e --- /dev/null +++ b/fs/yaffs2/Kconfig -@@ -0,0 +1,30 @@ +@@ -0,0 +1,171 @@ +# +# yaffs file system configurations +# @@ -143,20 +144,161 @@ index 0000000..bd6e8df + Further information on yaffs2 is available at + <http://www.aleph1.co.uk/yaffs/>. + -+config YAFFS_DEBUG -+ bool "Enable yaffs debugging" ++config YAFFS_YAFFS1 ++ bool "512 byte / page devices" ++ depends on YAFFS_FS ++ default y ++ help ++ Enable yaffs1 support -- yaffs for 512 byte / page devices ++ ++ Not needed for 2K-page devices. ++ ++ If unsure, say Y. ++ ++config YAFFS_9BYTE_TAGS ++ bool "Use older-style on-NAND data format with pageStatus byte" ++ depends on YAFFS_YAFFS1 ++ default n ++ help ++ ++ Older-style on-NAND data format has a "pageStatus" byte to record ++ chunk/page state. This byte is zero when the page is discarded. ++ Choose this option if you have existing on-NAND data using this ++ format that you need to continue to support. New data written ++ also uses the older-style format. Note: Use of this option ++ generally requires that MTD's oob layout be adjusted to use the ++ older-style format. See notes on tags formats and MTD versions ++ in yaffs_mtdif1.c. ++ ++ If unsure, say N. ++ ++config YAFFS_DOES_ECC ++ bool "Lets yaffs do its own ECC" ++ depends on YAFFS_FS && YAFFS_YAFFS1 && !YAFFS_9BYTE_TAGS ++ default n ++ help ++ This enables yaffs to use its own ECC functions instead of using ++ the ones from the generic MTD-NAND driver. ++ ++ If unsure, say N. ++ ++config YAFFS_ECC_WRONG_ORDER ++ bool "Use the same ecc byte order as Steven Hill's nand_ecc.c" ++ depends on YAFFS_FS && YAFFS_DOES_ECC && !YAFFS_9BYTE_TAGS ++ default n ++ help ++ This makes yaffs_ecc.c use the same ecc byte order as Steven ++ Hill's nand_ecc.c. If not set, then you get the same ecc byte ++ order as SmartMedia. ++ ++ If unsure, say N. ++ ++config YAFFS_YAFFS2 ++ bool "2048 byte (or larger) / page devices" ++ depends on YAFFS_FS ++ default y ++ help ++ Enable yaffs2 support -- yaffs for >= 2K bytes per page devices ++ ++ If unsure, say Y. ++ ++config YAFFS_AUTO_YAFFS2 ++ bool "Autoselect yaffs2 format" ++ depends on YAFFS_YAFFS2 ++ default y ++ help ++ Without this, you need to explicitely use yaffs2 as the file ++ system type. With this, you can say "yaffs" and yaffs or yaffs2 ++ will be used depending on the device page size (yaffs on ++ 512-byte page devices, yaffs2 on 2K page devices). ++ ++ If unsure, say Y. ++ ++config YAFFS_DISABLE_TAGS_ECC ++ bool "Disable yaffs from doing ECC on tags by default" ++ depends on YAFFS_FS && YAFFS_YAFFS2 ++ default n ++ help ++ This defaults yaffs to using its own ECC calculations on tags instead of ++ just relying on the MTD. ++ This behavior can also be overridden with tags_ecc_on and ++ tags_ecc_off mount options. ++ ++ If unsure, say N. ++ ++config YAFFS_ALWAYS_CHECK_CHUNK_ERASED ++ bool "Force chunk erase check" + depends on YAFFS_FS + default n + help -+ Enable the yaffs debugging tracing. ++ Normally yaffs only checks chunks before writing until an erased ++ chunk is found. This helps to detect any partially written ++ chunks that might have happened due to power loss. ++ ++ Enabling this forces on the test that chunks are erased in flash ++ before writing to them. This takes more time but is potentially ++ a bit more secure. ++ ++ Suggest setting Y during development and ironing out driver ++ issues etc. Suggest setting to N if you want faster writing. ++ ++ If unsure, say Y. ++ ++config YAFFS_EMPTY_LOST_AND_FOUND ++ bool "Empty lost and found on boot" ++ depends on YAFFS_FS ++ default n ++ help ++ If this is enabled then the contents of lost and found is ++ automatically dumped at mount. ++ ++ If unsure, say N. ++ ++config YAFFS_DISABLE_BLOCK_REFRESHING ++ bool "Disable yaffs2 block refreshing" ++ depends on YAFFS_FS ++ default n ++ help ++ If this is set, then block refreshing is disabled. ++ Block refreshing infrequently refreshes the oldest block in ++ a yaffs2 file system. This mechanism helps to refresh flash to ++ mitigate against data loss. This is particularly useful for MLC. + + If unsure, say N. ++ ++config YAFFS_DISABLE_BACKGROUND ++ bool "Disable yaffs2 background processing" ++ depends on YAFFS_FS ++ default n ++ help ++ If this is set, then background processing is disabled. ++ Background processing makes many foreground activities faster. ++ ++ If unsure, say N. ++ ++config YAFFS_DISABLE_BAD_BLOCK_MARKING ++ bool "Disable yaffs2 bad block marking" ++ depends on YAFFS_FS ++ default n ++ help ++ Useful during early flash bring up to prevent problems causing ++ lots of bad block marking. ++ ++ If unsure, say N. ++ ++config YAFFS_XATTR ++ bool "Enable yaffs2 xattr support" ++ depends on YAFFS_FS ++ default y ++ help ++ If this is set then yaffs2 will provide xattr support. ++ If unsure, say Y. diff --git a/fs/yaffs2/Makefile b/fs/yaffs2/Makefile new file mode 100644 -index 0000000..f9a9fb1 +index 000000000000..c05239594827 --- /dev/null +++ b/fs/yaffs2/Makefile -@@ -0,0 +1,18 @@ +@@ -0,0 +1,19 @@ +# +# Makefile for the linux YAFFS filesystem routines. +# @@ -166,6 +308,7 @@ index 0000000..f9a9fb1 +yaffs-y := yaffs_ecc.o yaffs_vfs.o yaffs_guts.o yaffs_checkptrw.o +yaffs-y += yaffs_packedtags1.o yaffs_packedtags2.o yaffs_nand.o +yaffs-y += yaffs_tagscompat.o yaffs_tagsmarshall.o ++yaffs-y += yaffs_endian.o +yaffs-y += yaffs_mtdif.o +yaffs-y += yaffs_nameval.o yaffs_attribs.o +yaffs-y += yaffs_allocator.o @@ -177,15 +320,14 @@ index 0000000..f9a9fb1 + diff --git a/fs/yaffs2/yaffs_allocator.c b/fs/yaffs2/yaffs_allocator.c new file mode 100644 -index 0000000..c8f2861 +index 000000000000..be27833ad497 --- /dev/null +++ b/fs/yaffs2/yaffs_allocator.c -@@ -0,0 +1,357 @@ +@@ -0,0 +1,356 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -540,15 +682,14 @@ index 0000000..c8f2861 + diff --git a/fs/yaffs2/yaffs_allocator.h b/fs/yaffs2/yaffs_allocator.h new file mode 100644 -index 0000000..a8cc322 +index 000000000000..0dacd9f75b5e --- /dev/null +++ b/fs/yaffs2/yaffs_allocator.h -@@ -0,0 +1,30 @@ +@@ -0,0 +1,29 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -576,15 +717,14 @@ index 0000000..a8cc322 +#endif diff --git a/fs/yaffs2/yaffs_attribs.c b/fs/yaffs2/yaffs_attribs.c new file mode 100644 -index 0000000..3d778f2 +index 000000000000..a9ced27250aa --- /dev/null +++ b/fs/yaffs2/yaffs_attribs.c -@@ -0,0 +1,124 @@ +@@ -0,0 +1,135 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -596,6 +736,18 @@ index 0000000..3d778f2 +#include "yaffs_guts.h" +#include "yaffs_attribs.h" + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0)) ++#define IATTR_UID ia_uid ++#define IATTR_GID ia_gid ++#else ++#define IATTR_UID ia_uid.val ++#define IATTR_GID ia_gid.val ++#endif ++ ++/* ++ * Loading attibs from/to object header assumes the object header ++ * is in cpu endian. ++ */ +void yaffs_load_attribs(struct yaffs_obj *obj, struct yaffs_obj_hdr *oh) +{ + obj->yst_uid = oh->yst_uid; @@ -659,9 +811,9 @@ index 0000000..3d778f2 + if (valid & ATTR_MODE) + obj->yst_mode = attr->ia_mode; + if (valid & ATTR_UID) -+ obj->yst_uid = attr->ia_uid; ++ obj->yst_uid = attr->IATTR_UID; + if (valid & ATTR_GID) -+ obj->yst_gid = attr->ia_gid; ++ obj->yst_gid = attr->IATTR_GID; + + if (valid & ATTR_ATIME) + obj->yst_atime = Y_TIME_CONVERT(attr->ia_atime); @@ -685,9 +837,9 @@ index 0000000..3d778f2 + + attr->ia_mode = obj->yst_mode; + valid |= ATTR_MODE; -+ attr->ia_uid = obj->yst_uid; ++ attr->IATTR_UID = obj->yst_uid; + valid |= ATTR_UID; -+ attr->ia_gid = obj->yst_gid; ++ attr->IATTR_GID = obj->yst_gid; + valid |= ATTR_GID; + + Y_TIME_CONVERT(attr->ia_atime) = obj->yst_atime; @@ -706,15 +858,14 @@ index 0000000..3d778f2 +} diff --git a/fs/yaffs2/yaffs_attribs.h b/fs/yaffs2/yaffs_attribs.h new file mode 100644 -index 0000000..5b21b08 +index 000000000000..4ce6550c3d9c --- /dev/null +++ b/fs/yaffs2/yaffs_attribs.h -@@ -0,0 +1,28 @@ +@@ -0,0 +1,27 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -740,15 +891,14 @@ index 0000000..5b21b08 +#endif diff --git a/fs/yaffs2/yaffs_bitmap.c b/fs/yaffs2/yaffs_bitmap.c new file mode 100644 -index 0000000..4440e93 +index 000000000000..481558041ddf --- /dev/null +++ b/fs/yaffs2/yaffs_bitmap.c -@@ -0,0 +1,97 @@ +@@ -0,0 +1,98 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -765,7 +915,8 @@ index 0000000..4440e93 + +static inline u8 *yaffs_block_bits(struct yaffs_dev *dev, int blk) +{ -+ if (blk < dev->internal_start_block || blk > dev->internal_end_block) { ++ if (blk < (int)dev->internal_start_block || ++ blk > (int)dev->internal_end_block) { + yaffs_trace(YAFFS_TRACE_ERROR, + "BlockBits block %d is not valid", + blk); @@ -777,8 +928,9 @@ index 0000000..4440e93 + +void yaffs_verify_chunk_bit_id(struct yaffs_dev *dev, int blk, int chunk) +{ -+ if (blk < dev->internal_start_block || blk > dev->internal_end_block || -+ chunk < 0 || chunk >= dev->param.chunks_per_block) { ++ if (blk < (int)dev->internal_start_block || ++ blk > (int)dev->internal_end_block || ++ chunk < 0 || chunk >= (int)dev->param.chunks_per_block) { + yaffs_trace(YAFFS_TRACE_ERROR, + "Chunk Id (%d:%d) invalid", + blk, chunk); @@ -843,15 +995,14 @@ index 0000000..4440e93 +} diff --git a/fs/yaffs2/yaffs_bitmap.h b/fs/yaffs2/yaffs_bitmap.h new file mode 100644 -index 0000000..e26b37d +index 000000000000..30bbd3bbb1e0 --- /dev/null +++ b/fs/yaffs2/yaffs_bitmap.h -@@ -0,0 +1,33 @@ +@@ -0,0 +1,32 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -882,15 +1033,14 @@ index 0000000..e26b37d +#endif diff --git a/fs/yaffs2/yaffs_checkptrw.c b/fs/yaffs2/yaffs_checkptrw.c new file mode 100644 -index 0000000..e739fb4 +index 000000000000..53688b5c34d9 --- /dev/null +++ b/fs/yaffs2/yaffs_checkptrw.c -@@ -0,0 +1,474 @@ +@@ -0,0 +1,480 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -901,6 +1051,7 @@ index 0000000..e739fb4 + +#include "yaffs_checkptrw.h" +#include "yaffs_getblockinfo.h" ++#include "yaffs_endian.h" + +struct yaffs_checkpt_chunk_hdr { + int version; @@ -920,6 +1071,18 @@ index 0000000..e739fb4 + return block - dev->block_offset; +} + ++ ++static void yaffs2_do_endian_hdr(struct yaffs_dev *dev, ++ struct yaffs_checkpt_chunk_hdr *hdr) ++{ ++ if (!dev->swap_endian) ++ return; ++ hdr->version = swap_s32(hdr->version); ++ hdr->seq = swap_s32(hdr->seq); ++ hdr->sum = swap_u32(hdr->sum); ++ hdr->xor = swap_u32(hdr->xor); ++} ++ +static void yaffs2_checkpt_init_chunk_hdr(struct yaffs_dev *dev) +{ + struct yaffs_checkpt_chunk_hdr hdr; @@ -931,6 +1094,7 @@ index 0000000..e739fb4 + + dev->checkpt_byte_offs = sizeof(hdr); + ++ yaffs2_do_endian_hdr(dev, &hdr); + memcpy(dev->checkpt_buffer, &hdr, sizeof(hdr)); +} + @@ -939,6 +1103,7 @@ index 0000000..e739fb4 + struct yaffs_checkpt_chunk_hdr hdr; + + memcpy(&hdr, dev->checkpt_buffer, sizeof(hdr)); ++ yaffs2_do_endian_hdr(dev, &hdr); + + dev->checkpt_byte_offs = sizeof(hdr); + @@ -960,7 +1125,7 @@ index 0000000..e739fb4 + +static int yaffs_checkpt_erase(struct yaffs_dev *dev) +{ -+ int i; ++ u32 i; + + if (!dev->drv.drv_erase_fn) + return 0; @@ -999,7 +1164,7 @@ index 0000000..e739fb4 + +static void yaffs2_checkpt_find_erased_block(struct yaffs_dev *dev) +{ -+ int i; ++ u32 i; + int blocks_avail = dev->n_erased_blocks - dev->param.n_reserved_blocks; + + yaffs_trace(YAFFS_TRACE_CHECKPOINT, @@ -1008,7 +1173,7 @@ index 0000000..e739fb4 + blocks_avail, dev->checkpt_next_block); + + if (dev->checkpt_next_block >= 0 && -+ dev->checkpt_next_block <= dev->internal_end_block && ++ dev->checkpt_next_block <= (int)dev->internal_end_block && + blocks_avail > 0) { + + for (i = dev->checkpt_next_block; i <= dev->internal_end_block; @@ -1033,7 +1198,7 @@ index 0000000..e739fb4 + +static void yaffs2_checkpt_find_block(struct yaffs_dev *dev) +{ -+ int i; ++ u32 i; + struct yaffs_ext_tags tags; + + yaffs_trace(YAFFS_TRACE_CHECKPOINT, @@ -1083,7 +1248,7 @@ index 0000000..e739fb4 + +int yaffs2_checkpt_open(struct yaffs_dev *dev, int writing) +{ -+ int i; ++ u32 i; + + dev->checkpt_open_write = writing; + @@ -1125,8 +1290,9 @@ index 0000000..e739fb4 + dev->blocks_in_checkpt = 0; + dev->checkpt_max_blocks = + (dev->internal_end_block - dev->internal_start_block) / 16 + 2; -+ dev->checkpt_block_list = -+ kmalloc(sizeof(int) * dev->checkpt_max_blocks, GFP_NOFS); ++ if (!dev->checkpt_block_list) ++ dev->checkpt_block_list = ++ kmalloc(sizeof(int) * dev->checkpt_max_blocks, GFP_NOFS); + + if (!dev->checkpt_block_list) + return 0; @@ -1191,7 +1357,7 @@ index 0000000..e739fb4 + dev->checkpt_buffer, &tags); + dev->checkpt_page_seq++; + dev->checkpt_cur_chunk++; -+ if (dev->checkpt_cur_chunk >= dev->param.chunks_per_block) { ++ if (dev->checkpt_cur_chunk >= (int)dev->param.chunks_per_block) { + dev->checkpt_cur_chunk = 0; + dev->checkpt_cur_block = -1; + } @@ -1226,7 +1392,7 @@ index 0000000..e739fb4 + dev->checkpt_byte_count++; + + if (dev->checkpt_byte_offs < 0 || -+ dev->checkpt_byte_offs >= dev->data_bytes_per_chunk) ++ dev->checkpt_byte_offs >= (int)dev->data_bytes_per_chunk) + ok = yaffs2_checkpt_flush_buffer(dev); + } + @@ -1236,7 +1402,6 @@ index 0000000..e739fb4 +int yaffs2_checkpt_rd(struct yaffs_dev *dev, void *data, int n_bytes) +{ + int i = 0; -+ int ok = 1; + struct yaffs_ext_tags tags; + int chunk; + int offset_chunk; @@ -1248,20 +1413,19 @@ index 0000000..e739fb4 + if (dev->checkpt_open_write) + return -1; + -+ while (i < n_bytes && ok) { ++ while (i < n_bytes) { + + if (dev->checkpt_byte_offs < 0 || -+ dev->checkpt_byte_offs >= dev->data_bytes_per_chunk) { ++ dev->checkpt_byte_offs >= (int)dev->data_bytes_per_chunk) { + + if (dev->checkpt_cur_block < 0) { + yaffs2_checkpt_find_block(dev); + dev->checkpt_cur_chunk = 0; + } + -+ if (dev->checkpt_cur_block < 0) { -+ ok = 0; ++ /* Bail out if we can't find a checpoint block */ ++ if (dev->checkpt_cur_block < 0) + break; -+ } + + chunk = dev->checkpt_cur_block * + dev->param.chunks_per_block + @@ -1270,28 +1434,27 @@ index 0000000..e739fb4 + offset_chunk = apply_chunk_offset(dev, chunk); + dev->n_page_reads++; + -+ /* read in the next chunk */ ++ /* Read in the next chunk */ + dev->tagger.read_chunk_tags_fn(dev, + offset_chunk, + dev->checkpt_buffer, + &tags); + -+ if (tags.chunk_id != (dev->checkpt_page_seq + 1) || ++ /* Bail out if the chunk is corrupted. */ ++ if (tags.chunk_id != (u32)(dev->checkpt_page_seq + 1) || + tags.ecc_result > YAFFS_ECC_RESULT_FIXED || -+ tags.seq_number != YAFFS_SEQUENCE_CHECKPOINT_DATA) { -+ ok = 0; ++ tags.seq_number != YAFFS_SEQUENCE_CHECKPOINT_DATA) + break; -+ } -+ if(!yaffs2_checkpt_check_chunk_hdr(dev)) { -+ ok = 0; ++ ++ /* Bail out if it is not a checkpoint chunk. */ ++ if(!yaffs2_checkpt_check_chunk_hdr(dev)) + break; -+ } + + dev->checkpt_page_seq++; + dev->checkpt_cur_chunk++; + + if (dev->checkpt_cur_chunk >= -+ dev->param.chunks_per_block) ++ (int)dev->param.chunks_per_block) + dev->checkpt_cur_block = -1; + + } @@ -1305,12 +1468,12 @@ index 0000000..e739fb4 + dev->checkpt_byte_count++; + } + -+ return i; ++ return i; /* Number of bytes read */ +} + +int yaffs_checkpt_close(struct yaffs_dev *dev) +{ -+ int i; ++ u32 i; + + if (dev->checkpt_open_write) { + if (dev->checkpt_byte_offs != @@ -1323,14 +1486,12 @@ index 0000000..e739fb4 + int blk = dev->checkpt_block_list[i]; + struct yaffs_block_info *bi = NULL; + -+ if (dev->internal_start_block <= blk && -+ blk <= dev->internal_end_block) ++ if ((int)dev->internal_start_block <= blk && ++ blk <= (int)dev->internal_end_block) + bi = yaffs_get_block_info(dev, blk); + if (bi && bi->block_state == YAFFS_BLOCK_STATE_EMPTY) + bi->block_state = YAFFS_BLOCK_STATE_CHECKPOINT; + } -+ kfree(dev->checkpt_block_list); -+ dev->checkpt_block_list = NULL; + } + + dev->n_free_chunks -= @@ -1340,14 +1501,10 @@ index 0000000..e739fb4 + yaffs_trace(YAFFS_TRACE_CHECKPOINT, "checkpoint byte count %d", + dev->checkpt_byte_count); + -+ if (dev->checkpt_buffer) { -+ /* free the buffer */ -+ kfree(dev->checkpt_buffer); -+ dev->checkpt_buffer = NULL; ++ if (dev->checkpt_buffer) + return 1; -+ } else { ++ else + return 0; -+ } +} + +int yaffs2_checkpt_invalidate_stream(struct yaffs_dev *dev) @@ -1362,15 +1519,14 @@ index 0000000..e739fb4 +} diff --git a/fs/yaffs2/yaffs_checkptrw.h b/fs/yaffs2/yaffs_checkptrw.h new file mode 100644 -index 0000000..cdbaba7 +index 000000000000..4820fb09519c --- /dev/null +++ b/fs/yaffs2/yaffs_checkptrw.h -@@ -0,0 +1,33 @@ +@@ -0,0 +1,32 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -1401,15 +1557,14 @@ index 0000000..cdbaba7 +#endif diff --git a/fs/yaffs2/yaffs_ecc.c b/fs/yaffs2/yaffs_ecc.c new file mode 100644 -index 0000000..9294107 +index 000000000000..911f8f79a064 --- /dev/null +++ b/fs/yaffs2/yaffs_ecc.c -@@ -0,0 +1,281 @@ +@@ -0,0 +1,280 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -1688,15 +1843,14 @@ index 0000000..9294107 +} diff --git a/fs/yaffs2/yaffs_ecc.h b/fs/yaffs2/yaffs_ecc.h new file mode 100644 -index 0000000..17d47bd +index 000000000000..1dc64416895b --- /dev/null +++ b/fs/yaffs2/yaffs_ecc.h -@@ -0,0 +1,44 @@ +@@ -0,0 +1,43 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -1736,17 +1890,187 @@ index 0000000..17d47bd + struct yaffs_ecc_other *read_ecc, + const struct yaffs_ecc_other *test_ecc); +#endif +diff --git a/fs/yaffs2/yaffs_endian.c b/fs/yaffs2/yaffs_endian.c +new file mode 100644 +index 000000000000..6103f4ebb0c2 +--- /dev/null ++++ b/fs/yaffs2/yaffs_endian.c +@@ -0,0 +1,105 @@ ++/* ++ * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. ++ * ++ * Copyright (C) 2002-2018 Aleph One Ltd. ++ * ++ * Created by Charles Manning <charles@aleph1.co.uk> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU General Public License version 2 as ++ * published by the Free Software Foundation. ++ * ++ * Endian processing functions. ++ */ ++ ++#include "yaffs_endian.h" ++#include "yaffs_guts.h" ++ ++ ++void yaffs_do_endian_u32(struct yaffs_dev *dev, u32 *val) ++{ ++ if (!dev->swap_endian) ++ return; ++ *val = swap_u32(*val); ++} ++ ++void yaffs_do_endian_s32(struct yaffs_dev *dev, s32 *val) ++{ ++ if (!dev->swap_endian) ++ return; ++ *val = swap_s32(*val); ++} ++ ++void yaffs_do_endian_oh(struct yaffs_dev *dev, struct yaffs_obj_hdr *oh) ++{ ++ if (!dev->swap_endian) ++ return; ++ /* Change every field */ ++ oh->type = swap_u32(oh->type); ++ oh->parent_obj_id = swap_u32(oh->parent_obj_id); ++ ++ oh->yst_mode = swap_u32(oh->yst_mode); ++ ++ oh->yst_uid = swap_u32(oh->yst_uid); ++ oh->yst_gid = swap_u32(oh->yst_gid); ++ oh->yst_atime = swap_u32(oh->yst_atime); ++ oh->yst_mtime = swap_u32(oh->yst_mtime); ++ oh->yst_ctime = swap_u32(oh->yst_ctime); ++ ++ oh->file_size_low = swap_u32(oh->file_size_low); ++ ++ oh->equiv_id = swap_u32(oh->equiv_id); ++ ++ oh->yst_rdev = swap_u32(oh->yst_rdev); ++ ++ oh->win_ctime[0] = swap_u32(oh->win_ctime[0]); ++ oh->win_ctime[1] = swap_u32(oh->win_ctime[1]); ++ oh->win_atime[0] = swap_u32(oh->win_atime[0]); ++ oh->win_atime[1] = swap_u32(oh->win_atime[1]); ++ oh->win_mtime[0] = swap_u32(oh->win_mtime[0]); ++ oh->win_mtime[1] = swap_u32(oh->win_mtime[1]); ++ ++ oh->inband_shadowed_obj_id = swap_u32(oh->inband_shadowed_obj_id); ++ oh->inband_is_shrink = swap_u32(oh->inband_is_shrink); ++ ++ oh->file_size_high = swap_u32(oh->file_size_high); ++ oh->reserved[0] = swap_u32(oh->reserved[0]); ++ oh->shadows_obj = swap_s32(oh->shadows_obj); ++ ++ oh->is_shrink = swap_u32(oh->is_shrink); ++} ++ ++ ++void yaffs_do_endian_packed_tags2(struct yaffs_dev *dev, ++ struct yaffs_packed_tags2_tags_only *ptt) ++{ ++ if (!dev->swap_endian) ++ return; ++ ptt->seq_number = swap_u32(ptt->seq_number); ++ ptt->obj_id = swap_u32(ptt->obj_id); ++ ptt->chunk_id = swap_u32(ptt->chunk_id); ++ ptt->n_bytes = swap_u32(ptt->n_bytes); ++} ++ ++void yaffs_endian_config(struct yaffs_dev *dev) ++{ ++ u32 x = 1; ++ ++ if (dev->tnode_size < 1) ++ BUG(); ++ ++ dev->swap_endian = 0; ++ ++ if (((char *)&x)[0] == 1) { ++ /* Little Endian. */ ++ if (dev->param.stored_endian == 2 /* big endian */) ++ dev->swap_endian = 1; ++ } else { ++ /* Big Endian. */ ++ if (dev->param.stored_endian == 1 /* little endian */) ++ dev->swap_endian = 1; ++ } ++ ++ if (dev->swap_endian) ++ dev->tn_swap_buffer = kmalloc(dev->tnode_size, GFP_NOFS); ++} +diff --git a/fs/yaffs2/yaffs_endian.h b/fs/yaffs2/yaffs_endian.h +new file mode 100644 +index 000000000000..8c271891a019 +--- /dev/null ++++ b/fs/yaffs2/yaffs_endian.h +@@ -0,0 +1,54 @@ ++/* ++ * YAFFS: Yet another Flash File System . A NAND-flash specific file system. ++ * ++ * Copyright (C) 2002-2018 Aleph One Ltd. ++ * ++ * Created by Charles Manning <charles@aleph1.co.uk> ++ * ++ * This program is free software; you can redistribute it and/or modify ++ * it under the terms of the GNU Lesser General Public License version 2.1 as ++ * published by the Free Software Foundation. ++ * ++ * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL. ++ */ ++ ++#ifndef __YAFFS_ENDIAN_H__ ++#define __YAFFS_ENDIAN_H__ ++#include "yaffs_guts.h" ++#include "yaffs_packedtags2.h" ++ ++static inline u32 swap_u32(u32 val) ++{ ++ return ((val >>24) & 0x000000ff) | ++ ((val >> 8) & 0x0000ff00) | ++ ((val << 8) & 0x00ff0000) | ++ ((val <<24) & 0xff000000); ++} ++ ++#define swap_s32(val) \ ++ (s32)(swap_u32((u32)(val))) ++ ++static inline loff_t swap_loff_t(loff_t lval) ++{ ++ u32 vall = swap_u32(FSIZE_LOW(lval)); ++ u32 valh; ++ ++ if (sizeof(loff_t) == sizeof(u32)) ++ return (loff_t) vall; ++ ++ valh = swap_u32(FSIZE_HIGH(lval)); ++ ++ return FSIZE_COMBINE(vall, valh); /*NB: h and l are swapped. */ ++} ++ ++ ++ ++struct yaffs_dev; ++void yaffs_do_endian_s32(struct yaffs_dev *dev, s32 *val); ++void yaffs_do_endian_u32(struct yaffs_dev *dev, u32 *val); ++void yaffs_do_endian_oh(struct yaffs_dev *dev, struct yaffs_obj_hdr *oh); ++void yaffs_do_endian_packed_tags2(struct yaffs_dev *dev, ++ struct yaffs_packed_tags2_tags_only *ptt); ++void yaffs_endian_config(struct yaffs_dev *dev); ++ ++#endif diff --git a/fs/yaffs2/yaffs_getblockinfo.h b/fs/yaffs2/yaffs_getblockinfo.h new file mode 100644 -index 0000000..8fd0802 +index 000000000000..e84ccf8812db --- /dev/null +++ b/fs/yaffs2/yaffs_getblockinfo.h @@ -0,0 +1,35 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -1767,7 +2091,8 @@ index 0000000..8fd0802 +static inline struct yaffs_block_info *yaffs_get_block_info(struct yaffs_dev + *dev, int blk) +{ -+ if (blk < dev->internal_start_block || blk > dev->internal_end_block) { ++ if (blk < (int)dev->internal_start_block || ++ blk > (int)dev->internal_end_block) { + yaffs_trace(YAFFS_TRACE_ERROR, + "**>> yaffs: get_block_info block %d is not valid", + blk); @@ -1779,15 +2104,14 @@ index 0000000..8fd0802 +#endif diff --git a/fs/yaffs2/yaffs_guts.c b/fs/yaffs2/yaffs_guts.c new file mode 100644 -index 0000000..1fd464d +index 000000000000..40a5b46cf6ca --- /dev/null +++ b/fs/yaffs2/yaffs_guts.c -@@ -0,0 +1,5082 @@ +@@ -0,0 +1,5212 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -1800,6 +2124,7 @@ index 0000000..1fd464d +#include "yaffs_trace.h" + +#include "yaffs_guts.h" ++#include "yaffs_endian.h" +#include "yaffs_getblockinfo.h" +#include "yaffs_tagscompat.h" +#include "yaffs_tagsmarshall.h" @@ -2087,7 +2412,8 @@ index 0000000..1fd464d + + result = yaffs_rd_chunk_tags_nand(dev, nand_chunk, data, &tags); + -+ if (tags.ecc_result > YAFFS_ECC_RESULT_NO_ERROR) ++ if (result == YAFFS_FAIL || ++ tags.ecc_result > YAFFS_ECC_RESULT_NO_ERROR) + retval = YAFFS_FAIL; + + if (!yaffs_check_ff(data, dev->data_bytes_per_chunk) || @@ -2114,7 +2440,8 @@ index 0000000..1fd464d + int result; + + result = yaffs_rd_chunk_tags_nand(dev, nand_chunk, buffer, &temp_tags); -+ if (memcmp(buffer, data, dev->data_bytes_per_chunk) || ++ if (result == YAFFS_FAIL || ++ memcmp(buffer, data, dev->data_bytes_per_chunk) || + temp_tags.obj_id != tags->obj_id || + temp_tags.chunk_id != tags->chunk_id || + temp_tags.n_bytes != tags->n_bytes) @@ -2142,7 +2469,7 @@ index 0000000..1fd464d + +static int yaffs_find_alloc_block(struct yaffs_dev *dev) +{ -+ int i; ++ u32 i; + struct yaffs_block_info *bi; + + if (dev->n_erased_blocks < 1) { @@ -2159,8 +2486,8 @@ index 0000000..1fd464d + + for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) { + dev->alloc_block_finder++; -+ if (dev->alloc_block_finder < dev->internal_start_block -+ || dev->alloc_block_finder > dev->internal_end_block) { ++ if (dev->alloc_block_finder < (int)dev->internal_start_block ++ || dev->alloc_block_finder > (int)dev->internal_end_block) { + dev->alloc_block_finder = dev->internal_start_block; + } + @@ -2203,7 +2530,7 @@ index 0000000..1fd464d + return -1; + } + -+ if (dev->n_erased_blocks < dev->param.n_reserved_blocks ++ if (dev->n_erased_blocks < (int)dev->param.n_reserved_blocks + && dev->alloc_page == 0) + yaffs_trace(YAFFS_TRACE_ALLOCATE, "Allocating reserve"); + @@ -2272,7 +2599,7 @@ index 0000000..1fd464d + const u8 *data, + struct yaffs_ext_tags *tags, int use_reserver) +{ -+ int attempts = 0; ++ u32 attempts = 0; + int write_ok = 0; + int chunk; + @@ -2353,7 +2680,7 @@ index 0000000..1fd464d + yaffs_handle_chunk_wr_ok(dev, chunk, data, tags); + + } while (write_ok != YAFFS_OK && -+ (yaffs_wr_attempts <= 0 || attempts <= yaffs_wr_attempts)); ++ (yaffs_wr_attempts == 0 || attempts <= yaffs_wr_attempts)); + + if (!write_ok) + chunk = -1; @@ -2416,6 +2743,78 @@ index 0000000..1fd464d + +/*---------------- Name handling functions ------------*/ + ++static void yaffs_load_name_from_oh(struct yaffs_dev *dev, YCHAR *name, ++ const YCHAR *oh_name, int buff_size) ++{ ++#ifdef CONFIG_YAFFS_AUTO_UNICODE ++ if (dev->param.auto_unicode) { ++ if (*oh_name) { ++ /* It is an ASCII name, do an ASCII to ++ * unicode conversion */ ++ const char *ascii_oh_name = (const char *)oh_name; ++ int n = buff_size - 1; ++ while (n > 0 && *ascii_oh_name) { ++ *name = *ascii_oh_name; ++ name++; ++ ascii_oh_name++; ++ n--; ++ } ++ } else { ++ strncpy(name, oh_name + 1, buff_size - 1); ++ } ++ } else { ++#else ++ (void) dev; ++ { ++#endif ++ strncpy(name, oh_name, buff_size - 1); ++ } ++} ++ ++static void yaffs_load_oh_from_name(struct yaffs_dev *dev, YCHAR *oh_name, ++ const YCHAR *name) ++{ ++#ifdef CONFIG_YAFFS_AUTO_UNICODE ++ ++ int is_ascii; ++ const YCHAR *w; ++ ++ if (dev->param.auto_unicode) { ++ ++ is_ascii = 1; ++ w = name; ++ ++ /* Figure out if the name will fit in ascii character set */ ++ while (is_ascii && *w) { ++ if ((*w) & 0xff00) ++ is_ascii = 0; ++ w++; ++ } ++ ++ if (is_ascii) { ++ /* It is an ASCII name, so convert unicode to ascii */ ++ char *ascii_oh_name = (char *)oh_name; ++ int n = YAFFS_MAX_NAME_LENGTH - 1; ++ while (n > 0 && *name) { ++ *ascii_oh_name = *name; ++ name++; ++ ascii_oh_name++; ++ n--; ++ } ++ } else { ++ /* Unicode name, so save starting at the second YCHAR */ ++ *oh_name = 0; ++ strncpy(oh_name + 1, name, YAFFS_MAX_NAME_LENGTH - 2); ++ } ++ } else { ++#else ++ dev = dev; ++ { ++#endif ++ strncpy(oh_name, name, YAFFS_MAX_NAME_LENGTH - 1); ++ } ++} ++ +static u16 yaffs_calc_name_sum(const YCHAR *name) +{ + u16 sum = 0; @@ -2468,7 +2867,7 @@ index 0000000..1fd464d + +loff_t yaffs_max_file_size(struct yaffs_dev *dev) +{ -+ if(sizeof(loff_t) < 8) ++ if (sizeof(loff_t) < 8) + return YAFFS_MAX_FILE_SIZE_32; + else + return ((loff_t) YAFFS_MAX_CHUNK_ID) * dev->data_bytes_per_chunk; @@ -2731,8 +3130,8 @@ index 0000000..1fd464d +static int yaffs_tags_match(const struct yaffs_ext_tags *tags, int obj_id, + int chunk_obj) +{ -+ return (tags->chunk_id == chunk_obj && -+ tags->obj_id == obj_id && ++ return (tags->chunk_id == (u32)chunk_obj && ++ tags->obj_id == (u32)obj_id && + !tags->is_deleted) ? 1 : 0; + +} @@ -3162,56 +3561,49 @@ index 0000000..1fd464d + return 0; +} + -+static void yaffs_flush_file_cache(struct yaffs_obj *obj) ++static void yaffs_flush_single_cache(struct yaffs_cache *cache, int discard) ++{ ++ ++ if (!cache || cache->locked) ++ return; ++ ++ /* Write it out and free it up if need be.*/ ++ if (cache->dirty) { ++ yaffs_wr_data_obj(cache->object, ++ cache->chunk_id, ++ cache->data, ++ cache->n_bytes, ++ 1); ++ ++ cache->dirty = 0; ++ } ++ ++ if (discard) ++ cache->object = NULL; ++} ++ ++static void yaffs_flush_file_cache(struct yaffs_obj *obj, int discard) +{ + struct yaffs_dev *dev = obj->my_dev; -+ int lowest = -99; /* Stop compiler whining. */ + int i; + struct yaffs_cache *cache; -+ int chunk_written = 0; + int n_caches = obj->my_dev->param.n_caches; + + if (n_caches < 1) + return; -+ do { -+ cache = NULL; -+ -+ /* Find the lowest dirty chunk for this object */ -+ for (i = 0; i < n_caches; i++) { -+ if (dev->cache[i].object == obj && -+ dev->cache[i].dirty) { -+ if (!cache || -+ dev->cache[i].chunk_id < lowest) { -+ cache = &dev->cache[i]; -+ lowest = cache->chunk_id; -+ } -+ } -+ } + -+ if (cache && !cache->locked) { -+ /* Write it out and free it up */ -+ chunk_written = -+ yaffs_wr_data_obj(cache->object, -+ cache->chunk_id, -+ cache->data, -+ cache->n_bytes, 1); -+ cache->dirty = 0; -+ cache->object = NULL; -+ } -+ } while (cache && chunk_written > 0); + -+ if (cache) -+ /* Hoosterman, disk full while writing cache out. */ -+ yaffs_trace(YAFFS_TRACE_ERROR, -+ "yaffs tragedy: no space during cache write"); ++ /* Find the chunks for this object and flush them. */ ++ for (i = 0; i < n_caches; i++) { ++ cache = &dev->cache[i]; ++ if (cache->object == obj) ++ yaffs_flush_single_cache(cache, discard); ++ } ++ +} + -+/*yaffs_flush_whole_cache(dev) -+ * -+ * -+ */ + -+void yaffs_flush_whole_cache(struct yaffs_dev *dev) ++void yaffs_flush_whole_cache(struct yaffs_dev *dev, int discard) +{ + struct yaffs_obj *obj; + int n_caches = dev->param.n_caches; @@ -3227,19 +3619,19 @@ index 0000000..1fd464d + obj = dev->cache[i].object; + } + if (obj) -+ yaffs_flush_file_cache(obj); ++ yaffs_flush_file_cache(obj, discard); + } while (obj); + +} + -+/* Grab us a cache chunk for use. ++/* Grab us an unused cache chunk for use. + * First look for an empty one. + * Then look for the least recently used non-dirty one. + * Then look for the least recently used dirty one...., flush and look again. + */ +static struct yaffs_cache *yaffs_grab_chunk_worker(struct yaffs_dev *dev) +{ -+ int i; ++ u32 i; + + if (dev->param.n_caches > 0) { + for (i = 0; i < dev->param.n_caches; i++) { @@ -3247,56 +3639,50 @@ index 0000000..1fd464d + return &dev->cache[i]; + } + } ++ + return NULL; +} + +static struct yaffs_cache *yaffs_grab_chunk_cache(struct yaffs_dev *dev) +{ + struct yaffs_cache *cache; -+ struct yaffs_obj *the_obj; + int usage; -+ int i; -+ int pushout; ++ u32 i; + + if (dev->param.n_caches < 1) + return NULL; + -+ /* Try find a non-dirty one... */ ++ /* First look for an unused cache */ + + cache = yaffs_grab_chunk_worker(dev); + -+ if (!cache) { -+ /* They were all dirty, find the LRU object and flush -+ * its cache, then find again. -+ * NB what's here is not very accurate, -+ * we actually flush the object with the LRU chunk. -+ */ ++ if (cache) ++ return cache; ++ ++ /* ++ * Thery were all in use. ++ * Find the LRU cache and flush it if it is dirty. ++ */ + -+ /* With locking we can't assume we can use entry zero, -+ * Set the_obj to a valid pointer for Coverity. */ -+ the_obj = dev->cache[0].object; -+ usage = -1; -+ cache = NULL; -+ pushout = -1; ++ usage = -1; ++ cache = NULL; + -+ for (i = 0; i < dev->param.n_caches; i++) { -+ if (dev->cache[i].object && -+ !dev->cache[i].locked && -+ (dev->cache[i].last_use < usage || -+ !cache)) { ++ for (i = 0; i < dev->param.n_caches; i++) { ++ if (dev->cache[i].object && ++ !dev->cache[i].locked && ++ (dev->cache[i].last_use < usage || !cache)) { + usage = dev->cache[i].last_use; -+ the_obj = dev->cache[i].object; + cache = &dev->cache[i]; -+ pushout = i; -+ } -+ } -+ -+ if (!cache || cache->dirty) { -+ /* Flush and try again */ -+ yaffs_flush_file_cache(the_obj); -+ cache = yaffs_grab_chunk_worker(dev); + } + } ++ ++#if 1 ++ yaffs_flush_single_cache(cache, 1); ++#else ++ yaffs_flush_file_cache(cache->object, 1); ++ cache = yaffs_grab_chunk_worker(dev); ++#endif ++ + return cache; +} + @@ -3305,7 +3691,7 @@ index 0000000..1fd464d + int chunk_id) +{ + struct yaffs_dev *dev = obj->my_dev; -+ int i; ++ u32 i; + + if (dev->param.n_caches < 1) + return NULL; @@ -3325,7 +3711,7 @@ index 0000000..1fd464d +static void yaffs_use_cache(struct yaffs_dev *dev, struct yaffs_cache *cache, + int is_write) +{ -+ int i; ++ u32 i; + + if (dev->param.n_caches < 1) + return; @@ -3366,7 +3752,7 @@ index 0000000..1fd464d + */ +static void yaffs_invalidate_whole_cache(struct yaffs_obj *in) +{ -+ int i; ++ u32 i; + struct yaffs_dev *dev = in->my_dev; + + if (dev->param.n_caches > 0) { @@ -3648,21 +4034,18 @@ index 0000000..1fd464d + struct list_head *i; + u32 n = (u32) bucket; + -+ /* Now find an object value that has not already been taken -+ * by scanning the list. ++ /* ++ * Now find an object value that has not already been taken ++ * by scanning the list, incrementing each time by number of buckets. + */ -+ + while (!found) { + found = 1; + n += YAFFS_NOBJECT_BUCKETS; -+ if (1 || dev->obj_bucket[bucket].count > 0) { -+ list_for_each(i, &dev->obj_bucket[bucket].list) { -+ /* If there is already one in the list */ -+ if (i && list_entry(i, struct yaffs_obj, -+ hash_link)->obj_id == n) { -+ found = 0; -+ } -+ } ++ list_for_each(i, &dev->obj_bucket[bucket].list) { ++ /* Check if this value is already taken. */ ++ if (i && list_entry(i, struct yaffs_obj, ++ hash_link)->obj_id == n) ++ found = 0; + } + } + return n; @@ -3730,7 +4113,7 @@ index 0000000..1fd464d + switch (type) { + case YAFFS_OBJECT_TYPE_FILE: + the_obj->variant.file_variant.file_size = 0; -+ the_obj->variant.file_variant.scanned_size = 0; ++ the_obj->variant.file_variant.stored_size = 0; + the_obj->variant.file_variant.shrink_size = + yaffs_max_file_size(dev); + the_obj->variant.file_variant.top_level = 0; @@ -4092,7 +4475,7 @@ index 0000000..1fd464d +{ + struct yaffs_block_info *bi = yaffs_get_block_info(dev, block_no); + int erased_ok = 0; -+ int i; ++ u32 i; + + /* If the block is still healthy erase it and mark as clean. + * If the block has had a data failure, then retire it. @@ -4108,12 +4491,12 @@ index 0000000..1fd464d + bi->block_state = YAFFS_BLOCK_STATE_DIRTY; + + /* If this is the block being garbage collected then stop gc'ing */ -+ if (block_no == dev->gc_block) ++ if (block_no == (int)dev->gc_block) + dev->gc_block = 0; + + /* If this block is currently the best candidate for gc + * then drop as a candidate */ -+ if (block_no == dev->gc_dirtiest) { ++ if (block_no == (int)dev->gc_dirtiest) { + dev->gc_dirtiest = 0; + dev->gc_pages_in_use = 0; + } @@ -4258,12 +4641,14 @@ index 0000000..1fd464d + + if (tags.chunk_id == 0) { + /* It is an object Id, -+ * We need to nuke the -+ * shrinkheader flags since its ++ * We need to nuke the shrinkheader flags since its + * work is done. -+ * Also need to clean up -+ * shadowing. ++ * Also need to clean up shadowing. ++ * NB We don't want to do all the work of translating ++ * object header endianism back and forth so we leave ++ * the oh endian in its stored order. + */ ++ + struct yaffs_obj_hdr *oh; + oh = (struct yaffs_obj_hdr *) buffer; + @@ -4275,10 +4660,10 @@ index 0000000..1fd464d + + /* Update file size */ + if (object->variant_type == YAFFS_OBJECT_TYPE_FILE) { -+ yaffs_oh_size_load(oh, -+ object->variant.file_variant.file_size); ++ yaffs_oh_size_load(dev, oh, ++ object->variant.file_variant.stored_size, 1); + tags.extra_file_size = -+ object->variant.file_variant.file_size; ++ object->variant.file_variant.stored_size; + } + + yaffs_verify_oh(object, oh, &tags, 1); @@ -4315,7 +4700,7 @@ index 0000000..1fd464d +{ + int old_chunk; + int ret_val = YAFFS_OK; -+ int i; ++ u32 i; + int is_checkpt_block; + int max_copies; + int chunks_before = yaffs_get_erased_chunks(dev); @@ -4420,13 +4805,13 @@ index 0000000..1fd464d +static unsigned yaffs_find_gc_block(struct yaffs_dev *dev, + int aggressive, int background) +{ -+ int i; -+ int iterations; -+ unsigned selected = 0; ++ u32 i; ++ u32 iterations; ++ u32 selected = 0; + int prioritised = 0; + int prioritised_exist = 0; + struct yaffs_block_info *bi; -+ int threshold; ++ u32 threshold; + + /* First let's see if we need to grab a prioritised block */ + if (dev->has_pending_prioritised_gc && !aggressive) { @@ -4467,14 +4852,14 @@ index 0000000..1fd464d + */ + + if (!selected) { -+ int pages_used; ++ u32 pages_used; + int n_blocks = + dev->internal_end_block - dev->internal_start_block + 1; + if (aggressive) { + threshold = dev->param.chunks_per_block; + iterations = n_blocks; + } else { -+ int max_threshold; ++ u32 max_threshold; + + if (background) + max_threshold = dev->param.chunks_per_block / 2; @@ -4660,14 +5045,14 @@ index 0000000..1fd464d + gc_ok = yaffs_gc_block(dev, dev->gc_block, aggressive); + } + -+ if (dev->n_erased_blocks < (dev->param.n_reserved_blocks) && ++ if (dev->n_erased_blocks < (int)dev->param.n_reserved_blocks && + dev->gc_block > 0) { + yaffs_trace(YAFFS_TRACE_GC, + "yaffs: GC !!!no reclaim!!! n_erased_blocks %d after try %d block %d", + dev->n_erased_blocks, max_tries, + dev->gc_block); + } -+ } while ((dev->n_erased_blocks < dev->param.n_reserved_blocks) && ++ } while ((dev->n_erased_blocks < (int)dev->param.n_reserved_blocks) && + (dev->gc_block > 0) && (max_tries < 2)); + + return aggressive ? gc_ok : YAFFS_OK; @@ -4779,6 +5164,7 @@ index 0000000..1fd464d + int new_chunk_id; + struct yaffs_ext_tags new_tags; + struct yaffs_dev *dev = in->my_dev; ++ loff_t endpos; + + yaffs_check_gc(dev, 0); + @@ -4800,13 +5186,24 @@ index 0000000..1fd464d + (prev_chunk_id > 0) ? prev_tags.serial_number + 1 : 1; + new_tags.n_bytes = n_bytes; + -+ if (n_bytes < 1 || n_bytes > dev->param.total_bytes_per_chunk) { ++ if (n_bytes < 1 || n_bytes > (int)dev->data_bytes_per_chunk) { + yaffs_trace(YAFFS_TRACE_ERROR, + "Writing %d bytes to chunk!!!!!!!!!", + n_bytes); + BUG(); + } + ++ /* ++ * If this is a data chunk and the write goes past the end of the stored ++ * size then update the stored_size. ++ */ ++ if (inode_chunk > 0) { ++ endpos = (inode_chunk - 1) * dev->data_bytes_per_chunk + ++ n_bytes; ++ if (in->variant.file_variant.stored_size < endpos) ++ in->variant.file_variant.stored_size = endpos; ++ } ++ + new_chunk_id = + yaffs_write_new_chunk(dev, buffer, &new_tags, use_reserve); + @@ -4819,7 +5216,6 @@ index 0000000..1fd464d + yaffs_verify_file_sane(in); + } + return new_chunk_id; -+ +} + + @@ -4857,12 +5253,12 @@ index 0000000..1fd464d + + if (xmod->set) + retval = -+ nval_set(x_buffer, x_size, xmod->name, xmod->data, ++ nval_set(dev, x_buffer, x_size, xmod->name, xmod->data, + xmod->size, xmod->flags); + else -+ retval = nval_del(x_buffer, x_size, xmod->name); ++ retval = nval_del(dev, x_buffer, x_size, xmod->name); + -+ obj->has_xattr = nval_hasvalues(x_buffer, x_size); ++ obj->has_xattr = nval_hasvalues(dev, x_buffer, x_size); + obj->xattr_known = 1; + xmod->result = retval; + @@ -4907,14 +5303,15 @@ index 0000000..1fd464d + x_buffer = buffer + x_offs; + + if (!obj->xattr_known) { -+ obj->has_xattr = nval_hasvalues(x_buffer, x_size); ++ obj->has_xattr = nval_hasvalues(dev, x_buffer, x_size); + obj->xattr_known = 1; + } + + if (name) -+ retval = nval_get(x_buffer, x_size, name, value, size); ++ retval = nval_get(dev, x_buffer, x_size, ++ name, value, size); + else -+ retval = nval_list(x_buffer, x_size, value, size); ++ retval = nval_list(dev, x_buffer, x_size, value, size); + } + yaffs_release_temp_buffer(dev, (u8 *) buffer); + return retval; @@ -4949,106 +5346,47 @@ index 0000000..1fd464d + struct yaffs_dev *dev; + struct yaffs_ext_tags tags; + int result; -+ int alloc_failed = 0; + + if (!in || !in->lazy_loaded || in->hdr_chunk < 1) + return; + + dev = in->my_dev; -+ in->lazy_loaded = 0; + buf = yaffs_get_temp_buffer(dev); + + result = yaffs_rd_chunk_tags_nand(dev, in->hdr_chunk, buf, &tags); ++ ++ if (result == YAFFS_FAIL) ++ return; ++ + oh = (struct yaffs_obj_hdr *)buf; + ++ yaffs_do_endian_oh(dev, oh); ++ ++ in->lazy_loaded = 0; + in->yst_mode = oh->yst_mode; + yaffs_load_attribs(in, oh); + yaffs_set_obj_name_from_oh(in, oh); + -+ if (in->variant_type == YAFFS_OBJECT_TYPE_SYMLINK) { ++ if (in->variant_type == YAFFS_OBJECT_TYPE_SYMLINK) + in->variant.symlink_variant.alias = + yaffs_clone_str(oh->alias); -+ if (!in->variant.symlink_variant.alias) -+ alloc_failed = 1; /* Not returned */ -+ } + yaffs_release_temp_buffer(dev, buf); +} + -+static void yaffs_load_name_from_oh(struct yaffs_dev *dev, YCHAR *name, -+ const YCHAR *oh_name, int buff_size) -+{ -+#ifdef CONFIG_YAFFS_AUTO_UNICODE -+ if (dev->param.auto_unicode) { -+ if (*oh_name) { -+ /* It is an ASCII name, do an ASCII to -+ * unicode conversion */ -+ const char *ascii_oh_name = (const char *)oh_name; -+ int n = buff_size - 1; -+ while (n > 0 && *ascii_oh_name) { -+ *name = *ascii_oh_name; -+ name++; -+ ascii_oh_name++; -+ n--; -+ } -+ } else { -+ strncpy(name, oh_name + 1, buff_size - 1); -+ } -+ } else { -+#else -+ (void) dev; -+ { -+#endif -+ strncpy(name, oh_name, buff_size - 1); -+ } -+} -+ -+static void yaffs_load_oh_from_name(struct yaffs_dev *dev, YCHAR *oh_name, -+ const YCHAR *name) -+{ -+#ifdef CONFIG_YAFFS_AUTO_UNICODE -+ -+ int is_ascii; -+ YCHAR *w; -+ -+ if (dev->param.auto_unicode) { -+ -+ is_ascii = 1; -+ w = name; -+ -+ /* Figure out if the name will fit in ascii character set */ -+ while (is_ascii && *w) { -+ if ((*w) & 0xff00) -+ is_ascii = 0; -+ w++; -+ } -+ -+ if (is_ascii) { -+ /* It is an ASCII name, so convert unicode to ascii */ -+ char *ascii_oh_name = (char *)oh_name; -+ int n = YAFFS_MAX_NAME_LENGTH - 1; -+ while (n > 0 && *name) { -+ *ascii_oh_name = *name; -+ name++; -+ ascii_oh_name++; -+ n--; -+ } -+ } else { -+ /* Unicode name, so save starting at the second YCHAR */ -+ *oh_name = 0; -+ strncpy(oh_name + 1, name, YAFFS_MAX_NAME_LENGTH - 2); -+ } -+ } else { -+#else -+ dev = dev; -+ { -+#endif -+ strncpy(oh_name, name, YAFFS_MAX_NAME_LENGTH - 1); -+ } -+} -+ +/* UpdateObjectHeader updates the header on NAND for an object. + * If name is not NULL, then that new name is used. ++ * ++ * We're always creating the obj header from scratch (except reading ++ * the old name) so first set up in cpu endianness then run it through ++ * endian fixing at the end. ++ * ++ * However, a twist: If there are xattribs we leave them as they were. ++ * ++ * Careful! The buffer holds the whole chunk. Part of the chunk holds the ++ * object header and the rest holds the xattribs, therefore we use a buffer ++ * pointer and an oh pointer to point to the same memory. + */ ++ +int yaffs_update_oh(struct yaffs_obj *in, const YCHAR *name, int force, + int is_shrink, int shadows, struct yaffs_xattr_mod *xmod) +{ @@ -5081,12 +5419,19 @@ index 0000000..1fd464d + prev_chunk_id = in->hdr_chunk; + + if (prev_chunk_id > 0) { ++ /* Access the old obj header just to read the name. */ + result = yaffs_rd_chunk_tags_nand(dev, prev_chunk_id, + buffer, &old_tags); -+ -+ yaffs_verify_oh(in, oh, &old_tags, 0); -+ memcpy(old_name, oh->name, sizeof(oh->name)); -+ memset(buffer, 0xff, sizeof(struct yaffs_obj_hdr)); ++ if (result == YAFFS_OK) { ++ yaffs_verify_oh(in, oh, &old_tags, 0); ++ memcpy(old_name, oh->name, sizeof(oh->name)); ++ ++ /* ++ * NB We only wipe the object header area because the rest of ++ * the buffer might contain xattribs. ++ */ ++ memset(oh, 0xff, sizeof(*oh)); ++ } + } else { + memset(buffer, 0xff, dev->data_bytes_per_chunk); + } @@ -5120,8 +5465,8 @@ index 0000000..1fd464d + case YAFFS_OBJECT_TYPE_FILE: + if (oh->parent_obj_id != YAFFS_OBJECTID_DELETED && + oh->parent_obj_id != YAFFS_OBJECTID_UNLINKED) -+ file_size = in->variant.file_variant.file_size; -+ yaffs_oh_size_load(oh, file_size); ++ file_size = in->variant.file_variant.stored_size; ++ yaffs_oh_size_load(dev, oh, file_size, 0); + break; + case YAFFS_OBJECT_TYPE_HARDLINK: + oh->equiv_id = in->variant.hardlink_variant.equiv_id; @@ -5160,6 +5505,10 @@ index 0000000..1fd464d + new_tags.extra_equiv_id = oh->equiv_id; + new_tags.extra_shadows = (oh->shadows_obj > 0) ? 1 : 0; + new_tags.extra_obj_type = in->variant_type; ++ ++ /* Now endian swizzle the oh if needed. */ ++ yaffs_do_endian_oh(dev, oh); ++ + yaffs_verify_oh(in, oh, &new_tags, 1); + + /* Create new chunk in NAND */ @@ -5234,7 +5583,7 @@ index 0000000..1fd464d + * a whole chunk or we're using inband tags then use the cache + * (if there is caching) else bypass the cache. + */ -+ if (cache || n_copy != dev->data_bytes_per_chunk || ++ if (cache || n_copy != (int)dev->data_bytes_per_chunk || + dev->param.inband_tags) { + if (dev->param.n_caches > 0) { + @@ -5309,7 +5658,7 @@ index 0000000..1fd464d + start >= dev->data_bytes_per_chunk) { + yaffs_trace(YAFFS_TRACE_ERROR, + "AddrToChunk of offset %lld gives chunk %d start %d", -+ offset, chunk, start); ++ (long long)offset, chunk, start); + } + chunk++; /* File pos to chunk in file offset */ + @@ -5344,7 +5693,7 @@ index 0000000..1fd464d + (start + n)) ? n_bytes_read : (start + n); + + if (n_writeback < 0 || -+ n_writeback > dev->data_bytes_per_chunk) ++ n_writeback > (int)dev->data_bytes_per_chunk) + BUG(); + + } else { @@ -5352,7 +5701,7 @@ index 0000000..1fd464d + n_writeback = dev->data_bytes_per_chunk; + } + -+ if (n_copy != dev->data_bytes_per_chunk || ++ if (n_copy != (int)dev->data_bytes_per_chunk || + !dev->param.cache_bypass_aligned || + dev->param.inband_tags) { + /* An incomplete start or end chunk (or maybe both @@ -5500,9 +5849,9 @@ index 0000000..1fd464d + if (chunk_id < 1) + continue; + -+ if (chunk_id < ++ if ((u32)chunk_id < + (dev->internal_start_block * dev->param.chunks_per_block) || -+ chunk_id >= ++ (u32)chunk_id >= + ((dev->internal_end_block + 1) * + dev->param.chunks_per_block)) { + yaffs_trace(YAFFS_TRACE_ALWAYS, @@ -5541,6 +5890,7 @@ index 0000000..1fd464d + } + + obj->variant.file_variant.file_size = new_size; ++ obj->variant.file_variant.stored_size = new_size; + + yaffs_prune_tree(dev, &obj->variant.file_variant); +} @@ -5550,7 +5900,7 @@ index 0000000..1fd464d + struct yaffs_dev *dev = in->my_dev; + loff_t old_size = in->variant.file_variant.file_size; + -+ yaffs_flush_file_cache(in); ++ yaffs_flush_file_cache(in, 1); + yaffs_invalidate_whole_cache(in); + + yaffs_check_gc(dev, 0); @@ -5583,12 +5933,15 @@ index 0000000..1fd464d + return YAFFS_OK; +} + -+int yaffs_flush_file(struct yaffs_obj *in, int update_time, int data_sync) ++int yaffs_flush_file(struct yaffs_obj *in, ++ int update_time, ++ int data_sync, ++ int discard_cache) +{ + if (!in->dirty) + return YAFFS_OK; + -+ yaffs_flush_file_cache(in); ++ yaffs_flush_file_cache(in, discard_cache); + + if (data_sync) + return YAFFS_OK; @@ -5735,6 +6088,70 @@ index 0000000..1fd464d + return ret_val; +} + ++ ++static void yaffs_empty_dir_to_dir(struct yaffs_obj *from_dir, ++ struct yaffs_obj *to_dir) ++{ ++ struct yaffs_obj *obj; ++ struct list_head *lh; ++ struct list_head *n; ++ ++ list_for_each_safe(lh, n, &from_dir->variant.dir_variant.children) { ++ obj = list_entry(lh, struct yaffs_obj, siblings); ++ yaffs_add_obj_to_dir(to_dir, obj); ++ } ++} ++ ++struct yaffs_obj *yaffs_retype_obj(struct yaffs_obj *obj, ++ enum yaffs_obj_type type) ++{ ++ /* Tear down the old variant */ ++ switch (obj->variant_type) { ++ case YAFFS_OBJECT_TYPE_FILE: ++ /* Nuke file data */ ++ yaffs_resize_file(obj, 0); ++ yaffs_free_tnode(obj->my_dev, obj->variant.file_variant.top); ++ obj->variant.file_variant.top = NULL; ++ break; ++ case YAFFS_OBJECT_TYPE_DIRECTORY: ++ /* Put the children in lost and found. */ ++ yaffs_empty_dir_to_dir(obj, obj->my_dev->lost_n_found); ++ if (!list_empty(&obj->variant.dir_variant.dirty)) ++ list_del_init(&obj->variant.dir_variant.dirty); ++ break; ++ case YAFFS_OBJECT_TYPE_SYMLINK: ++ /* Nuke symplink data */ ++ kfree(obj->variant.symlink_variant.alias); ++ obj->variant.symlink_variant.alias = NULL; ++ break; ++ case YAFFS_OBJECT_TYPE_HARDLINK: ++ list_del_init(&obj->hard_links); ++ break; ++ default: ++ break; ++ } ++ ++ memset(&obj->variant, 0, sizeof(obj->variant)); ++ ++ /*Set up new variant if the memset is not enough. */ ++ switch (type) { ++ case YAFFS_OBJECT_TYPE_DIRECTORY: ++ INIT_LIST_HEAD(&obj->variant.dir_variant.children); ++ INIT_LIST_HEAD(&obj->variant.dir_variant.dirty); ++ break; ++ case YAFFS_OBJECT_TYPE_FILE: ++ case YAFFS_OBJECT_TYPE_SYMLINK: ++ case YAFFS_OBJECT_TYPE_HARDLINK: ++ default: ++ break; ++ } ++ ++ obj->variant_type = type; ++ ++ return obj; ++ ++} ++ +static int yaffs_unlink_worker(struct yaffs_obj *obj) +{ + int del_now = 0; @@ -5814,7 +6231,7 @@ index 0000000..1fd464d + } +} + -+static int yaffs_unlink_obj(struct yaffs_obj *obj) ++int yaffs_unlink_obj(struct yaffs_obj *obj) +{ + if (obj && obj->unlink_allowed) + return yaffs_unlink_worker(obj); @@ -6227,12 +6644,11 @@ index 0000000..1fd464d + + if (obj->hdr_chunk > 0) { + result = yaffs_rd_chunk_tags_nand(obj->my_dev, -+ obj->hdr_chunk, -+ buffer, NULL); ++ obj->hdr_chunk, buffer, NULL); ++ if (result == YAFFS_OK) ++ yaffs_load_name_from_oh(obj->my_dev, name, ++ oh->name, buffer_size); + } -+ yaffs_load_name_from_oh(obj->my_dev, name, oh->name, -+ buffer_size); -+ + yaffs_release_temp_buffer(obj->my_dev, buffer); + } + @@ -6357,8 +6773,11 @@ index 0000000..1fd464d +static int yaffs_create_initial_dir(struct yaffs_dev *dev) +{ + /* Initialise the unlinked, deleted, root and lost+found directories */ -+ dev->lost_n_found = dev->root_dir = NULL; -+ dev->unlinked_dir = dev->del_dir = NULL; ++ dev->lost_n_found = NULL; ++ dev->root_dir = NULL; ++ dev->unlinked_dir = NULL; ++ dev->del_dir = NULL; ++ + dev->unlinked_dir = + yaffs_create_fake_dir(dev, YAFFS_OBJECTID_UNLINKED, S_IFDIR); + dev->del_dir = @@ -6370,9 +6789,15 @@ index 0000000..1fd464d + yaffs_create_fake_dir(dev, YAFFS_OBJECTID_LOSTNFOUND, + YAFFS_LOSTNFOUND_MODE | S_IFDIR); + -+ if (dev->lost_n_found && dev->root_dir && dev->unlinked_dir -+ && dev->del_dir) { -+ yaffs_add_obj_to_dir(dev->root_dir, dev->lost_n_found); ++ if (dev->lost_n_found && ++ dev->root_dir && ++ dev->unlinked_dir && ++ dev->del_dir) { ++ /* If lost-n-found is hidden then yank it out of the directory tree. */ ++ if (dev->param.hide_lost_n_found) ++ list_del_init(&dev->lost_n_found->siblings); ++ else ++ yaffs_add_obj_to_dir(dev->root_dir, dev->lost_n_found); + return YAFFS_OK; + } + return YAFFS_FAIL; @@ -6463,9 +6888,9 @@ index 0000000..1fd464d +} + + -+int yaffs_format_dev(struct yaffs_dev *dev) ++int yaffs_guts_format_dev(struct yaffs_dev *dev) +{ -+ int i; ++ u32 i; + enum yaffs_block_state state; + u32 dummy; + @@ -6488,8 +6913,8 @@ index 0000000..1fd464d +int yaffs_guts_initialise(struct yaffs_dev *dev) +{ + int init_failed = 0; -+ unsigned x; -+ int bits; ++ u32 x; ++ u32 bits; + + if(yaffs_guts_ll_init(dev) != YAFFS_OK) + return YAFFS_FAIL; @@ -6585,12 +7010,14 @@ index 0000000..1fd464d + dev->n_erase_failures = 0; + dev->n_erased_blocks = 0; + dev->gc_disable = 0; -+ dev->has_pending_prioritised_gc = 1; -+ /* Assume the worst for now, will get fixed on first GC */ ++ dev->has_pending_prioritised_gc = 1; /* Assume the worst for now, ++ * will get fixed on first GC */ + INIT_LIST_HEAD(&dev->dirty_dirs); + dev->oldest_dirty_seq = 0; + dev->oldest_dirty_block = 0; + ++ yaffs_endian_config(dev); ++ + /* Initialise temporary buffers and caches. */ + if (!yaffs_init_tmp_buffers(dev)) + init_failed = 1; @@ -6599,9 +7026,9 @@ index 0000000..1fd464d + dev->gc_cleanup_list = NULL; + + if (!init_failed && dev->param.n_caches > 0) { -+ int i; ++ u32 i; + void *buf; -+ int cache_bytes = ++ u32 cache_bytes = + dev->param.n_caches * sizeof(struct yaffs_cache); + + if (dev->param.n_caches > YAFFS_MAX_SHORT_OP_CACHES) @@ -6734,7 +7161,7 @@ index 0000000..1fd464d +void yaffs_deinitialise(struct yaffs_dev *dev) +{ + if (dev->is_mounted) { -+ int i; ++ u32 i; + + yaffs_deinit_blocks(dev); + yaffs_deinit_tnodes_and_objs(dev); @@ -6753,8 +7180,15 @@ index 0000000..1fd464d + + kfree(dev->gc_cleanup_list); + -+ for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) ++ for (i = 0; i < YAFFS_N_TEMP_BUFFERS; i++) { + kfree(dev->temp_buffer[i].buffer); ++ dev->temp_buffer[i].buffer = NULL; ++ } ++ ++ kfree(dev->checkpt_buffer); ++ dev->checkpt_buffer = NULL; ++ kfree(dev->checkpt_block_list); ++ dev->checkpt_block_list = NULL; + + dev->is_mounted = 0; + @@ -6765,7 +7199,7 @@ index 0000000..1fd464d +int yaffs_count_free_chunks(struct yaffs_dev *dev) +{ + int n_free = 0; -+ int b; ++ u32 b; + struct yaffs_block_info *blk; + + blk = dev->block_info; @@ -6793,7 +7227,7 @@ index 0000000..1fd464d + int n_free; + int n_dirty_caches; + int blocks_for_checkpt; -+ int i; ++ u32 i; + + n_free = dev->n_free_chunks; + n_free += dev->n_deleted_files; @@ -6822,26 +7256,47 @@ index 0000000..1fd464d +} + + -+ +/* + * Marshalling functions to get loff_t file sizes into and out of + * object headers. + */ -+void yaffs_oh_size_load(struct yaffs_obj_hdr *oh, loff_t fsize) ++void yaffs_oh_size_load(struct yaffs_dev *dev, ++ struct yaffs_obj_hdr *oh, ++ loff_t fsize, ++ int do_endian) +{ -+ oh->file_size_low = (fsize & 0xFFFFFFFF); -+ oh->file_size_high = ((fsize >> 32) & 0xFFFFFFFF); ++ oh->file_size_low = FSIZE_LOW(fsize); ++ ++ oh->file_size_high = FSIZE_HIGH(fsize); ++ ++ if (do_endian) { ++ yaffs_do_endian_u32(dev, &oh->file_size_low); ++ yaffs_do_endian_u32(dev, &oh->file_size_high); ++ } +} + -+loff_t yaffs_oh_to_size(struct yaffs_obj_hdr *oh) ++loff_t yaffs_oh_to_size(struct yaffs_dev *dev, struct yaffs_obj_hdr *oh, ++ int do_endian) +{ + loff_t retval; + -+ if (sizeof(loff_t) >= 8 && ~(oh->file_size_high)) -+ retval = (((loff_t) oh->file_size_high) << 32) | -+ (((loff_t) oh->file_size_low) & 0xFFFFFFFF); -+ else -+ retval = (loff_t) oh->file_size_low; ++ ++ if (sizeof(loff_t) >= 8 && ~(oh->file_size_high)) { ++ u32 low = oh->file_size_low; ++ u32 high = oh->file_size_high; ++ ++ if (do_endian) { ++ yaffs_do_endian_u32 (dev, &low); ++ yaffs_do_endian_u32 (dev, &high); ++ } ++ retval = FSIZE_COMBINE(high, low); ++ } else { ++ u32 low = oh->file_size_low; ++ ++ if (do_endian) ++ yaffs_do_endian_u32(dev, &low); ++ retval = (loff_t)low; ++ } + + return retval; +} @@ -6849,7 +7304,7 @@ index 0000000..1fd464d + +void yaffs_count_blocks_by_state(struct yaffs_dev *dev, int bs[10]) +{ -+ int i; ++ u32 i; + struct yaffs_block_info *bi; + int s; + @@ -6867,15 +7322,14 @@ index 0000000..1fd464d +} diff --git a/fs/yaffs2/yaffs_guts.h b/fs/yaffs2/yaffs_guts.h new file mode 100644 -index 0000000..0578536 +index 000000000000..5ebc3787b4d4 --- /dev/null +++ b/fs/yaffs2/yaffs_guts.h -@@ -0,0 +1,1003 @@ +@@ -0,0 +1,1069 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -6952,7 +7406,6 @@ index 0000000..0578536 + +/* Binary data version stamps */ +#define YAFFS_SUMMARY_VERSION 1 -+#define YAFFS_CHECKPOINT_VERSION 7 + +#ifdef CONFIG_YAFFS_UNICODE +#define YAFFS_MAX_NAME_LENGTH 127 @@ -7017,17 +7470,18 @@ index 0000000..0578536 + */ + +struct yaffs_tags { -+ unsigned chunk_id:20; -+ unsigned serial_number:2; -+ unsigned n_bytes_lsb:10; -+ unsigned obj_id:18; -+ unsigned ecc:12; -+ unsigned n_bytes_msb:2; ++ u32 chunk_id:20; ++ u32 serial_number:2; ++ u32 n_bytes_lsb:10; ++ u32 obj_id:18; ++ u32 ecc:12; ++ u32 n_bytes_msb:2; +}; + +union yaffs_tags_union { + struct yaffs_tags as_tags; -+ u8 as_bytes[8]; ++ u8 as_bytes[8]; ++ u32 as_u32[2]; +}; + + @@ -7040,6 +7494,12 @@ index 0000000..0578536 + YAFFS_ECC_RESULT_UNFIXED +}; + ++/* ++ * Object type enum: ++ * When this is stored in flash we store it as a u32 instead ++ * to prevent any alignment change issues as compiler variants change. ++ */ ++ +enum yaffs_obj_type { + YAFFS_OBJECT_TYPE_UNKNOWN, + YAFFS_OBJECT_TYPE_FILE, @@ -7160,9 +7620,9 @@ index 0000000..0578536 + +struct yaffs_block_info { + -+ int soft_del_pages:10; /* number of soft deleted pages */ -+ int pages_in_use:10; /* number of pages in use */ -+ unsigned block_state:4; /* One of the above block states. */ ++ s32 soft_del_pages:10; /* number of soft deleted pages */ ++ s32 pages_in_use:10; /* number of pages in use */ ++ u32 block_state:4; /* One of the above block states. */ + /* NB use unsigned because enum is sometimes + * an int */ + u32 needs_retiring:1; /* Data has failed on this block, */ @@ -7179,14 +7639,19 @@ index 0000000..0578536 + +}; + ++union yaffs_block_info_union { ++ struct yaffs_block_info bi; ++ u32 as_u32[2]; ++}; ++ +/* -------------------------- Object structure -------------------------------*/ +/* This is the object structure as stored on NAND */ + +struct yaffs_obj_hdr { -+ enum yaffs_obj_type type; ++ u32 type; /* enum yaffs_obj_type */ + + /* Apply to everything */ -+ int parent_obj_id; ++ u32 parent_obj_id; + u16 sum_no_longer_used; /* checksum of name. No longer used */ + YCHAR name[YAFFS_MAX_NAME_LENGTH + 1]; + @@ -7241,9 +7706,19 @@ index 0000000..0578536 + * - a hard link + */ + ++/* The file variant has three file sizes: ++ * - file_size : size of file as written into Yaffs - including data in cache. ++ * - stored_size - size of file as stored on media. ++ * - shrink_size - size of file that has been shrunk back to. ++ * ++ * The stored_size and file_size might be different because the data written ++ * into the cache will increase the file_size but the stored_size will only ++ * change when the data is actually stored. ++ * ++ */ +struct yaffs_file_var { + loff_t file_size; -+ loff_t scanned_size; ++ loff_t stored_size; + loff_t shrink_size; + int top_level; + struct yaffs_tnode *top; @@ -7343,7 +7818,7 @@ index 0000000..0578536 + + void *my_inode; + -+ enum yaffs_obj_type variant_type; ++ u32 variant_type; /* enum yaffs_object_type */ + + union yaffs_obj_var variant; + @@ -7354,26 +7829,6 @@ index 0000000..0578536 + int count; +}; + -+/* yaffs_checkpt_obj holds the definition of an object as dumped -+ * by checkpointing. -+ */ -+ -+struct yaffs_checkpt_obj { -+ int struct_type; -+ u32 obj_id; -+ u32 parent_id; -+ int hdr_chunk; -+ enum yaffs_obj_type variant_type:3; -+ u8 deleted:1; -+ u8 soft_del:1; -+ u8 unlinked:1; -+ u8 fake:1; -+ u8 rename_allowed:1; -+ u8 unlink_allowed:1; -+ u8 serial; -+ int n_data_chunks; -+ loff_t size_or_equiv_obj; -+}; + +/*--------------------- Temporary buffers ---------------- + * @@ -7399,14 +7854,14 @@ index 0000000..0578536 + int inband_tags; /* Use unband tags */ + u32 total_bytes_per_chunk; /* Should be >= 512, does not need to + be a power of 2 */ -+ int chunks_per_block; /* does not need to be a power of 2 */ -+ int spare_bytes_per_chunk; /* spare area size */ -+ int start_block; /* Start block we're allowed to use */ -+ int end_block; /* End block we're allowed to use */ -+ int n_reserved_blocks; /* Tuneable so that we can reduce ++ u32 chunks_per_block; /* does not need to be a power of 2 */ ++ u32 spare_bytes_per_chunk; /* spare area size */ ++ u32 start_block; /* Start block we're allowed to use */ ++ u32 end_block; /* End block we're allowed to use */ ++ u32 n_reserved_blocks; /* Tuneable so that we can reduce + * reserved blocks on NOR and RAM. */ + -+ int n_caches; /* If <= 0, then short op caching is disabled, ++ u32 n_caches; /* If == 0, then short op caching is disabled, + * else the number of short op caches. + */ + int cache_bypass_aligned; /* If non-zero then bypass the cache for @@ -7436,6 +7891,10 @@ index 0000000..0578536 + * 0 = no limit. + */ + ++ int hide_lost_n_found; /* Set non-zero to hide the lost-n-found dir. */ ++ ++ int stored_endian; /* 0=cpu endian, 1=little endian, 2=big endian */ ++ + /* The remove_obj_fn function must be supplied by OS flavours that + * need it. + * yaffs direct uses it to implement the faster readdir. @@ -7512,7 +7971,7 @@ index 0000000..0578536 + + int ll_init; + /* Runtime parameters. Set up by YAFFS. */ -+ int data_bytes_per_chunk; ++ u32 data_bytes_per_chunk; + + /* Non-wide tnode stuff */ + u16 chunk_grp_bits; /* Number of bits that need to be resolved if @@ -7520,6 +7979,8 @@ index 0000000..0578536 + */ + u16 chunk_grp_size; /* == 2^^chunk_grp_bits */ + ++ struct yaffs_tnode *tn_swap_buffer; ++ + /* Stuff to support wide tnodes */ + u32 tnode_width; + u32 tnode_mask; @@ -7533,10 +7994,11 @@ index 0000000..0578536 + int is_mounted; + int read_only; + int is_checkpointed; ++ int swap_endian; /* Stored endian needs endian swap. */ + + /* Stuff to support block offsetting to support start block zero */ -+ int internal_start_block; -+ int internal_end_block; ++ u32 internal_start_block; ++ u32 internal_end_block; + int block_offset; + int chunk_offset; + @@ -7546,12 +8008,12 @@ index 0000000..0578536 + int checkpt_byte_offs; + u8 *checkpt_buffer; + int checkpt_open_write; -+ int blocks_in_checkpt; ++ u32 blocks_in_checkpt; + int checkpt_cur_chunk; + int checkpt_cur_block; + int checkpt_next_block; + int *checkpt_block_list; -+ int checkpt_max_blocks; ++ u32 checkpt_max_blocks; + u32 checkpt_sum; + u32 checkpt_xor; + @@ -7561,8 +8023,8 @@ index 0000000..0578536 + /* Block Info */ + struct yaffs_block_info *block_info; + u8 *chunk_bits; /* bitmap of chunks in use */ -+ unsigned block_info_alt:1; /* allocated using alternative alloc */ -+ unsigned chunk_bits_alt:1; /* allocated using alternative alloc */ ++ u8 block_info_alt:1; /* allocated using alternative alloc */ ++ u8 chunk_bits_alt:1; /* allocated using alternative alloc */ + int chunk_bit_stride; /* Number of bytes of chunk_bits per block. + * Must be consistent with chunks_per_block. + */ @@ -7649,6 +8111,7 @@ index 0000000..0578536 + u32 n_page_writes; + u32 n_page_reads; + u32 n_erasures; ++ u32 n_bad_queries; + u32 n_bad_markings; + u32 n_erase_failures; + u32 n_gc_copies; @@ -7672,6 +8135,37 @@ index 0000000..0578536 + +}; + ++/* ++ * Checkpointing definitions. ++ */ ++ ++#define YAFFS_CHECKPOINT_VERSION 8 ++ ++/* yaffs_checkpt_obj holds the definition of an object as dumped ++ * by checkpointing. ++ */ ++ ++ ++/* Checkpint object bits in bitfield: offset, length */ ++#define CHECKPOINT_VARIANT_BITS 0, 3 ++#define CHECKPOINT_DELETED_BITS 3, 1 ++#define CHECKPOINT_SOFT_DEL_BITS 4, 1 ++#define CHECKPOINT_UNLINKED_BITS 5, 1 ++#define CHECKPOINT_FAKE_BITS 6, 1 ++#define CHECKPOINT_RENAME_ALLOWED_BITS 7, 1 ++#define CHECKPOINT_UNLINK_ALLOWED_BITS 8, 1 ++#define CHECKPOINT_SERIAL_BITS 9, 8 ++ ++struct yaffs_checkpt_obj { ++ int struct_type; ++ u32 obj_id; ++ u32 parent_id; ++ int hdr_chunk; ++ u32 bit_field; ++ int n_data_chunks; ++ loff_t size_or_equiv_obj; ++}; ++ +/* The CheckpointDevice structure holds the device information that changes + *at runtime and must be preserved over unmount/mount cycles. + */ @@ -7725,8 +8219,13 @@ index 0000000..0578536 +int yaffs_rename_obj(struct yaffs_obj *old_dir, const YCHAR * old_name, + struct yaffs_obj *new_dir, const YCHAR * new_name); + ++int yaffs_unlink_obj(struct yaffs_obj *obj); ++ +int yaffs_unlinker(struct yaffs_obj *dir, const YCHAR * name); +int yaffs_del_obj(struct yaffs_obj *obj); ++struct yaffs_obj *yaffs_retype_obj(struct yaffs_obj *obj, ++ enum yaffs_obj_type type); ++ + +int yaffs_get_obj_name(struct yaffs_obj *obj, YCHAR * name, int buffer_size); +loff_t yaffs_get_obj_length(struct yaffs_obj *obj); @@ -7745,10 +8244,13 @@ index 0000000..0578536 + const YCHAR *name, u32 mode, u32 uid, + u32 gid); + -+int yaffs_flush_file(struct yaffs_obj *obj, int update_time, int data_sync); ++int yaffs_flush_file(struct yaffs_obj *in, ++ int update_time, ++ int data_sync, ++ int discard_cache); + +/* Flushing and checkpointing */ -+void yaffs_flush_whole_cache(struct yaffs_dev *dev); ++void yaffs_flush_whole_cache(struct yaffs_dev *dev, int discard); + +int yaffs_checkpoint_save(struct yaffs_dev *dev); +int yaffs_checkpoint_restore(struct yaffs_dev *dev); @@ -7851,16 +8353,18 @@ index 0000000..0578536 + +int yaffs_is_non_empty_dir(struct yaffs_obj *obj); + -+int yaffs_format_dev(struct yaffs_dev *dev); ++int yaffs_guts_format_dev(struct yaffs_dev *dev); + +void yaffs_addr_to_chunk(struct yaffs_dev *dev, loff_t addr, + int *chunk_out, u32 *offset_out); +/* -+ * Marshalling functions to get loff_t file sizes into aand out of ++ * Marshalling functions to get loff_t file sizes into and out of + * object headers. + */ -+void yaffs_oh_size_load(struct yaffs_obj_hdr *oh, loff_t fsize); -+loff_t yaffs_oh_to_size(struct yaffs_obj_hdr *oh); ++void yaffs_oh_size_load(struct yaffs_dev *dev, struct yaffs_obj_hdr *oh, ++ loff_t fsize, int do_endian); ++loff_t yaffs_oh_to_size(struct yaffs_dev *dev, struct yaffs_obj_hdr *oh, ++ int do_endian); +loff_t yaffs_max_file_size(struct yaffs_dev *dev); + +/* @@ -7873,18 +8377,34 @@ index 0000000..0578536 +int yaffs_find_chunk_in_file(struct yaffs_obj *in, int inode_chunk, + struct yaffs_ext_tags *tags); + ++/* ++ * Define LOFF_T_32_BIT if a 32-bit LOFF_T is being used. ++ * Not serious if you get this wrong - you might just get some warnings. ++*/ ++ ++#ifdef LOFF_T_32_BIT ++#define FSIZE_LOW(fsize) (fsize) ++#define FSIZE_HIGH(fsize) 0 ++#define FSIZE_COMBINE(high, low) (low) ++#else ++#define FSIZE_LOW(fsize) ((fsize) & 0xffffffff) ++#define FSIZE_HIGH(fsize)(((fsize) >> 32) & 0xffffffff) ++#define FSIZE_COMBINE(high, low) ((((loff_t) (high)) << 32) | \ ++ (((loff_t) (low)) & 0xFFFFFFFF)) ++#endif ++ ++ +#endif diff --git a/fs/yaffs2/yaffs_linux.h b/fs/yaffs2/yaffs_linux.h new file mode 100644 -index 0000000..c20ab14 +index 000000000000..68e33f10c3f0 --- /dev/null +++ b/fs/yaffs2/yaffs_linux.h -@@ -0,0 +1,48 @@ +@@ -0,0 +1,47 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -7930,15 +8450,14 @@ index 0000000..c20ab14 +#endif diff --git a/fs/yaffs2/yaffs_mtdif.c b/fs/yaffs2/yaffs_mtdif.c new file mode 100644 -index 0000000..7b2ac36 +index 000000000000..2d34b017d08e --- /dev/null +++ b/fs/yaffs2/yaffs_mtdif.c -@@ -0,0 +1,212 @@ +@@ -0,0 +1,313 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -7954,34 +8473,55 @@ index 0000000..7b2ac36 +#include "linux/mtd/mtd.h" +#include "linux/types.h" +#include "linux/time.h" ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)) +#include "linux/mtd/nand.h" ++#else ++#include "linux/mtd/rawnand.h" ++#endif +#include "linux/kernel.h" +#include "linux/version.h" +#include "linux/types.h" ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 14, 0)) ++#include "uapi/linux/major.h" ++#endif + +#include "yaffs_trace.h" +#include "yaffs_guts.h" +#include "yaffs_linux.h" ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)) ++#define MTD_OPS_AUTO_OOB MTD_OOB_AUTO ++#endif + + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)) ++#define mtd_erase(m, ei) (m)->erase(m, ei) ++#define mtd_write_oob(m, addr, pops) (m)->write_oob(m, addr, pops) ++#define mtd_read_oob(m, addr, pops) (m)->read_oob(m, addr, pops) ++#define mtd_block_isbad(m, offs) (m)->block_isbad(m, offs) ++#define mtd_block_markbad(m, offs) (m)->block_markbad(m, offs) ++#endif ++ +int nandmtd_erase_block(struct yaffs_dev *dev, int block_no) +{ + struct mtd_info *mtd = yaffs_dev_to_mtd(dev); -+ u32 addr = -+ ((loff_t) block_no) * dev->param.total_bytes_per_chunk * -+ dev->param.chunks_per_block; ++ u32 addr = ((loff_t) block_no) * dev->param.total_bytes_per_chunk * ++ dev->param.chunks_per_block; + struct erase_info ei; + int retval = 0; + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)) + ei.mtd = mtd; ++#endif + ei.addr = addr; + ei.len = dev->param.total_bytes_per_chunk * dev->param.chunks_per_block; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)) + ei.time = 1000; + ei.retries = 2; + ei.callback = NULL; + ei.priv = (u_long) dev; ++#endif + -+ retval = mtd->erase(mtd, &ei); ++ retval = mtd_erase(mtd, &ei); + + if (retval == 0) + return YAFFS_OK; @@ -7989,16 +8529,29 @@ index 0000000..7b2ac36 + return YAFFS_FAIL; +} + -+ -+static int yaffs_mtd_write(struct yaffs_dev *dev, int nand_chunk, -+ const u8 *data, int data_len, -+ const u8 *oob, int oob_len) ++static int yaffs_mtd_write(struct yaffs_dev *dev, int nand_chunk, ++ const u8 *data, int data_len, ++ const u8 *oob, int oob_len) +{ + struct mtd_info *mtd = yaffs_dev_to_mtd(dev); + loff_t addr; + struct mtd_oob_ops ops; + int retval; + ++ yaffs_trace(YAFFS_TRACE_MTD, ++ "yaffs_mtd_write(%p, %d, %p, %d, %p, %d)\n", ++ dev, nand_chunk, data, data_len, oob, oob_len); ++ ++ if (!data || !data_len) { ++ data = NULL; ++ data_len = 0; ++ } ++ ++ if (!oob || !oob_len) { ++ oob = NULL; ++ oob_len = 0; ++ } ++ + addr = ((loff_t) nand_chunk) * dev->param.total_bytes_per_chunk; + memset(&ops, 0, sizeof(ops)); + ops.mode = MTD_OPS_AUTO_OOB; @@ -8007,7 +8560,7 @@ index 0000000..7b2ac36 + ops.datbuf = (u8 *)data; + ops.oobbuf = (u8 *)oob; + -+ retval = mtd->write_oob(mtd, addr, &ops); ++ retval = mtd_write_oob(mtd, addr, &ops); + if (retval) { + yaffs_trace(YAFFS_TRACE_MTD, + "write_oob failed, chunk %d, mtd error %d", @@ -8026,7 +8579,7 @@ index 0000000..7b2ac36 + struct mtd_oob_ops ops; + int retval; + -+ addr = ((loff_t) nand_chunk) * dev->data_bytes_per_chunk; ++ addr = ((loff_t) nand_chunk) * dev->param.total_bytes_per_chunk; + memset(&ops, 0, sizeof(ops)); + ops.mode = MTD_OPS_AUTO_OOB; + ops.len = (data) ? data_len : 0; @@ -8034,10 +8587,16 @@ index 0000000..7b2ac36 + ops.datbuf = data; + ops.oobbuf = oob; + ++#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 20)) ++ /* In MTD 2.6.18 to 2.6.19 nand_base.c:nand_do_read_oob() has a bug; ++ * help it out with ops.len = ops.ooblen when ops.datbuf == NULL. ++ */ ++ ops.len = (ops.datbuf) ? ops.len : ops.ooblen; ++#endif + /* Read page and oob using MTD. + * Check status and determine ECC result. + */ -+ retval = mtd->read_oob(mtd, addr, &ops); ++ retval = mtd_read_oob(mtd, addr, &ops); + if (retval) + yaffs_trace(YAFFS_TRACE_MTD, + "read_oob failed, chunk %d, mtd error %d", @@ -8069,7 +8628,7 @@ index 0000000..7b2ac36 + return YAFFS_OK; +} + -+static int yaffs_mtd_erase(struct yaffs_dev *dev, int block_no) ++static int yaffs_mtd_erase(struct yaffs_dev *dev, int block_no) +{ + struct mtd_info *mtd = yaffs_dev_to_mtd(dev); + @@ -8082,15 +8641,19 @@ index 0000000..7b2ac36 + dev->param.chunks_per_block; + addr = ((loff_t) block_no) * block_size; + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)) + ei.mtd = mtd; ++#endif + ei.addr = addr; + ei.len = block_size; ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 17, 0)) + ei.time = 1000; + ei.retries = 2; + ei.callback = NULL; + ei.priv = (u_long) dev; ++#endif + -+ retval = mtd->erase(mtd, &ei); ++ retval = mtd_erase(mtd, &ei); + + if (retval == 0) + return YAFFS_OK; @@ -8101,24 +8664,24 @@ index 0000000..7b2ac36 +static int yaffs_mtd_mark_bad(struct yaffs_dev *dev, int block_no) +{ + struct mtd_info *mtd = yaffs_dev_to_mtd(dev); -+ int blocksize = dev->param.chunks_per_block * dev->data_bytes_per_chunk; ++ int blocksize = dev->param.chunks_per_block * dev->param.total_bytes_per_chunk; + int retval; + + yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad", block_no); + -+ retval = mtd->block_markbad(mtd, (loff_t) blocksize * block_no); ++ retval = mtd_block_markbad(mtd, (loff_t) blocksize * block_no); + return (retval) ? YAFFS_FAIL : YAFFS_OK; +} + +static int yaffs_mtd_check_bad(struct yaffs_dev *dev, int block_no) +{ + struct mtd_info *mtd = yaffs_dev_to_mtd(dev); -+ int blocksize = dev->param.chunks_per_block * dev->data_bytes_per_chunk; ++ int blocksize = dev->param.chunks_per_block * dev->param.total_bytes_per_chunk; + int retval; + -+ yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "checking block %d bad", block_no); ++ yaffs_trace(YAFFS_TRACE_MTD, "checking block %d bad", block_no); + -+ retval = mtd->block_isbad(mtd, (loff_t) blocksize * block_no); ++ retval = mtd_block_isbad(mtd, (loff_t) blocksize * block_no); + return (retval) ? YAFFS_FAIL : YAFFS_OK; +} + @@ -8132,8 +8695,6 @@ index 0000000..7b2ac36 + return YAFFS_OK; +} + -+ -+ +void yaffs_mtd_drv_install(struct yaffs_dev *dev) +{ + struct yaffs_driver *drv = &dev->drv; @@ -8146,17 +8707,76 @@ index 0000000..7b2ac36 + drv->drv_initialise_fn = yaffs_mtd_initialise; + drv->drv_deinitialise_fn = yaffs_mtd_deinitialise; +} ++ ++struct mtd_info * yaffs_get_mtd_device(dev_t sdev) ++{ ++ struct mtd_info *mtd; ++ ++ mtd = yaffs_get_mtd_device(sdev); ++ ++ /* Check it's an mtd device..... */ ++ if (MAJOR(sdev) != MTD_BLOCK_MAJOR) ++ return NULL; /* This isn't an mtd device */ ++ ++ /* Check it's NAND */ ++ if (mtd->type != MTD_NANDFLASH) { ++ yaffs_trace(YAFFS_TRACE_ALWAYS, ++ "yaffs: MTD device is not NAND it's type %d", ++ mtd->type); ++ return NULL; ++ } ++ ++ yaffs_trace(YAFFS_TRACE_OS, " %s %d", WRITE_SIZE_STR, WRITE_SIZE(mtd)); ++ yaffs_trace(YAFFS_TRACE_OS, " oobsize %d", mtd->oobsize); ++ yaffs_trace(YAFFS_TRACE_OS, " erasesize %d", mtd->erasesize); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) ++ yaffs_trace(YAFFS_TRACE_OS, " size %u", mtd->size); ++#else ++ yaffs_trace(YAFFS_TRACE_OS, " size %lld", mtd->size); ++#endif ++ ++ return mtd; ++} ++ ++int yaffs_verify_mtd(struct mtd_info *mtd, int yaffs_version, int inband_tags) ++{ ++ if (yaffs_version == 2) { ++ if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE || ++ mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) && ++ !inband_tags) { ++ yaffs_trace(YAFFS_TRACE_ALWAYS, ++ "MTD device does not have the right page sizes" ++ ); ++ return -1; ++ } ++ } else { ++ if (WRITE_SIZE(mtd) < YAFFS_BYTES_PER_CHUNK || ++ mtd->oobsize != YAFFS_BYTES_PER_SPARE) { ++ yaffs_trace(YAFFS_TRACE_ALWAYS, ++ "MTD device does not support have the right page sizes" ++ ); ++ return -1; ++ } ++ } ++ ++ return 0; ++} ++ ++void yaffs_put_mtd_device(struct mtd_info *mtd) ++{ ++ if (mtd) ++ put_mtd_device(mtd); ++} diff --git a/fs/yaffs2/yaffs_mtdif.h b/fs/yaffs2/yaffs_mtdif.h new file mode 100644 -index 0000000..9cff224 +index 000000000000..54d0d62b0cde --- /dev/null +++ b/fs/yaffs2/yaffs_mtdif.h -@@ -0,0 +1,25 @@ +@@ -0,0 +1,24 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -8179,15 +8799,14 @@ index 0000000..9cff224 +#endif diff --git a/fs/yaffs2/yaffs_nameval.c b/fs/yaffs2/yaffs_nameval.c new file mode 100644 -index 0000000..4bdf4ed +index 000000000000..b85536522ebe --- /dev/null +++ b/fs/yaffs2/yaffs_nameval.c -@@ -0,0 +1,208 @@ +@@ -0,0 +1,229 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -8201,7 +8820,7 @@ index 0000000..4bdf4ed +* values and fits into a small finite buffer. + * + * Each attribute is stored as a record: -+ * sizeof(int) bytes record size. ++ * sizeof(size) bytes record size. + * strnlen+1 bytes name null terminated. + * nbytes value. + * ---------- @@ -8211,27 +8830,33 @@ index 0000000..4bdf4ed + */ + +#include "yaffs_nameval.h" -+ ++#include "yaffs_guts.h" +#include "yportenv.h" ++#include "yaffs_endian.h" + -+static int nval_find(const char *xb, int xb_size, const YCHAR *name, ++static int nval_find(struct yaffs_dev *dev, ++ const char *xb, int xb_size, const YCHAR *name, + int *exist_size) +{ + int pos = 0; -+ int size; ++ s32 size; ++ ++ memcpy(&size, xb, sizeof(size)); ++ yaffs_do_endian_s32(dev, &size); + -+ memcpy(&size, xb, sizeof(int)); + while (size > 0 && (size < xb_size) && (pos + size < xb_size)) { -+ if (!strncmp((YCHAR *) (xb + pos + sizeof(int)), ++ if (!strncmp((YCHAR *) (xb + pos + sizeof(size)), + name, size)) { + if (exist_size) + *exist_size = size; + return pos; + } + pos += size; -+ if (pos < xb_size - sizeof(int)) -+ memcpy(&size, xb + pos, sizeof(int)); -+ else ++ if (pos < (int)(xb_size - sizeof(size))) { ++ memcpy(&size, xb + pos, sizeof(size)); ++ yaffs_do_endian_s32(dev, &size); ++ ++ } else + size = 0; + } + if (exist_size) @@ -8239,89 +8864,101 @@ index 0000000..4bdf4ed + return -ENODATA; +} + -+static int nval_used(const char *xb, int xb_size) ++static int nval_used(struct yaffs_dev *dev, const char *xb, int xb_size) +{ + int pos = 0; -+ int size; ++ s32 size; ++ ++ memcpy(&size, xb + pos, sizeof(size)); ++ yaffs_do_endian_s32(dev, &size); + -+ memcpy(&size, xb + pos, sizeof(int)); + while (size > 0 && (size < xb_size) && (pos + size < xb_size)) { + pos += size; -+ if (pos < xb_size - sizeof(int)) -+ memcpy(&size, xb + pos, sizeof(int)); -+ else ++ if (pos < (int)(xb_size - sizeof(size))) { ++ memcpy(&size, xb + pos, sizeof(size)); ++ yaffs_do_endian_s32(dev, &size); ++ } else + size = 0; + } + return pos; +} + -+int nval_del(char *xb, int xb_size, const YCHAR *name) ++int nval_del(struct yaffs_dev *dev, char *xb, int xb_size, const YCHAR *name) +{ -+ int pos = nval_find(xb, xb_size, name, NULL); -+ int size; ++ int pos = nval_find(dev, xb, xb_size, name, NULL); ++ s32 size; + + if (pos < 0 || pos >= xb_size) + return -ENODATA; + + /* Find size, shift rest over this record, + * then zero out the rest of buffer */ -+ memcpy(&size, xb + pos, sizeof(int)); ++ memcpy(&size, xb + pos, sizeof(size)); ++ yaffs_do_endian_s32(dev, &size); ++ + memcpy(xb + pos, xb + pos + size, xb_size - (pos + size)); + memset(xb + (xb_size - size), 0, size); + return 0; +} + -+int nval_set(char *xb, int xb_size, const YCHAR *name, const char *buf, -+ int bsize, int flags) ++int nval_set(struct yaffs_dev *dev, ++ char *xb, int xb_size, const YCHAR *name, const char *buf, ++ int bsize, int flags) +{ + int pos; + int namelen = strnlen(name, xb_size); -+ int reclen; + int size_exist = 0; + int space; + int start; ++ s32 reclen; ++ s32 reclen_endianised; + -+ pos = nval_find(xb, xb_size, name, &size_exist); ++ pos = nval_find(dev, xb, xb_size, name, &size_exist); + + if (flags & XATTR_CREATE && pos >= 0) + return -EEXIST; + if (flags & XATTR_REPLACE && pos < 0) + return -ENODATA; + -+ start = nval_used(xb, xb_size); ++ start = nval_used(dev, xb, xb_size); + space = xb_size - start + size_exist; + -+ reclen = (sizeof(int) + namelen + 1 + bsize); ++ reclen = (sizeof(reclen) + namelen + 1 + bsize); + + if (reclen > space) + return -ENOSPC; + + if (pos >= 0) { -+ nval_del(xb, xb_size, name); -+ start = nval_used(xb, xb_size); ++ /* Exists, so delete it. */ ++ nval_del(dev, xb, xb_size, name); ++ start = nval_used(dev, xb, xb_size); + } + + pos = start; + -+ memcpy(xb + pos, &reclen, sizeof(int)); -+ pos += sizeof(int); ++ reclen_endianised = reclen; ++ yaffs_do_endian_s32(dev, &reclen_endianised); ++ memcpy(xb + pos, &reclen_endianised, sizeof(reclen_endianised)); ++ pos += sizeof(reclen_endianised); + strncpy((YCHAR *) (xb + pos), name, reclen); + pos += (namelen + 1); + memcpy(xb + pos, buf, bsize); + return 0; +} + -+int nval_get(const char *xb, int xb_size, const YCHAR * name, char *buf, ++int nval_get(struct yaffs_dev *dev, ++ const char *xb, int xb_size, const YCHAR * name, char *buf, + int bsize) +{ -+ int pos = nval_find(xb, xb_size, name, NULL); -+ int size; ++ int pos = nval_find(dev, xb, xb_size, name, NULL); ++ s32 size; + + if (pos >= 0 && pos < xb_size) { + -+ memcpy(&size, xb + pos, sizeof(int)); -+ pos += sizeof(int); /* advance past record length */ -+ size -= sizeof(int); ++ memcpy(&size, xb + pos, sizeof(size)); ++ yaffs_do_endian_s32(dev, &size); ++ pos += sizeof(size); /* advance past record length */ ++ size -= sizeof(size); + + /* Advance over name string */ + while (xb[pos] && size > 0 && pos < xb_size) { @@ -8349,21 +8986,23 @@ index 0000000..4bdf4ed + return -ENODATA; +} + -+int nval_list(const char *xb, int xb_size, char *buf, int bsize) ++int nval_list(struct yaffs_dev *dev, const char *xb, int xb_size, char *buf, int bsize) +{ + int pos = 0; -+ int size; ++ s32 size; + int name_len; + int ncopied = 0; + int filled = 0; + -+ memcpy(&size, xb + pos, sizeof(int)); -+ while (size > sizeof(int) && ++ memcpy(&size, xb + pos, sizeof(size)); ++ yaffs_do_endian_s32(dev, &size); ++ ++ while (size > (int)(sizeof(size)) && + size <= xb_size && + (pos + size) < xb_size && + !filled) { -+ pos += sizeof(int); -+ size -= sizeof(int); ++ pos += sizeof(size); ++ size -= sizeof(size); + name_len = strnlen((YCHAR *) (xb + pos), size); + if (ncopied + name_len + 1 < bsize) { + memcpy(buf, xb + pos, name_len * sizeof(YCHAR)); @@ -8379,29 +9018,30 @@ index 0000000..4bdf4ed + filled = 1; + } + pos += size; -+ if (pos < xb_size - sizeof(int)) -+ memcpy(&size, xb + pos, sizeof(int)); ++ if (pos < (int)(xb_size - sizeof(size))) { ++ memcpy(&size, xb + pos, sizeof(size)); ++ yaffs_do_endian_s32(dev, &size); ++ } + else + size = 0; + } + return ncopied; +} + -+int nval_hasvalues(const char *xb, int xb_size) ++int nval_hasvalues(struct yaffs_dev *dev, const char *xb, int xb_size) +{ -+ return nval_used(xb, xb_size) > 0; ++ return nval_used(dev, xb, xb_size) > 0; +} diff --git a/fs/yaffs2/yaffs_nameval.h b/fs/yaffs2/yaffs_nameval.h new file mode 100644 -index 0000000..951e64f +index 000000000000..7dbdbb68aa2d --- /dev/null +++ b/fs/yaffs2/yaffs_nameval.h -@@ -0,0 +1,28 @@ +@@ -0,0 +1,32 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -8417,25 +9057,29 @@ index 0000000..951e64f + +#include "yportenv.h" + -+int nval_del(char *xb, int xb_size, const YCHAR * name); -+int nval_set(char *xb, int xb_size, const YCHAR * name, const char *buf, ++struct yaffs_dev; ++ ++int nval_del(struct yaffs_dev *dev, char *xb, int xb_size, const YCHAR * name); ++int nval_set(struct yaffs_dev *dev, ++ char *xb, int xb_size, const YCHAR * name, const char *buf, + int bsize, int flags); -+int nval_get(const char *xb, int xb_size, const YCHAR * name, char *buf, ++int nval_get(struct yaffs_dev *dev, ++ const char *xb, int xb_size, const YCHAR * name, char *buf, + int bsize); -+int nval_list(const char *xb, int xb_size, char *buf, int bsize); -+int nval_hasvalues(const char *xb, int xb_size); ++int nval_list(struct yaffs_dev *dev, ++ const char *xb, int xb_size, char *buf, int bsize); ++int nval_hasvalues(struct yaffs_dev *dev, const char *xb, int xb_size); +#endif diff --git a/fs/yaffs2/yaffs_nand.c b/fs/yaffs2/yaffs_nand.c new file mode 100644 -index 0000000..0d8499b +index 000000000000..fe1219095c52 --- /dev/null +++ b/fs/yaffs2/yaffs_nand.c -@@ -0,0 +1,122 @@ +@@ -0,0 +1,121 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -8555,15 +9199,14 @@ index 0000000..0d8499b +} diff --git a/fs/yaffs2/yaffs_nand.h b/fs/yaffs2/yaffs_nand.h new file mode 100644 -index 0000000..804e97a +index 000000000000..8964db0a8fdb --- /dev/null +++ b/fs/yaffs2/yaffs_nand.h -@@ -0,0 +1,39 @@ +@@ -0,0 +1,38 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -8600,15 +9243,14 @@ index 0000000..804e97a +#endif diff --git a/fs/yaffs2/yaffs_packedtags1.c b/fs/yaffs2/yaffs_packedtags1.c new file mode 100644 -index 0000000..dd9a331 +index 000000000000..fab4fc14e3e6 --- /dev/null +++ b/fs/yaffs2/yaffs_packedtags1.c -@@ -0,0 +1,56 @@ +@@ -0,0 +1,54 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -8644,7 +9286,6 @@ index 0000000..dd9a331 +void yaffs_unpack_tags1(struct yaffs_ext_tags *t, + const struct yaffs_packed_tags1 *pt) +{ -+ + if (memcmp(all_ff, pt, sizeof(struct yaffs_packed_tags1))) { + t->block_bad = 0; + if (pt->should_be_ff != 0xffffffff) @@ -8662,15 +9303,14 @@ index 0000000..dd9a331 +} diff --git a/fs/yaffs2/yaffs_packedtags1.h b/fs/yaffs2/yaffs_packedtags1.h new file mode 100644 -index 0000000..b80f0a5 +index 000000000000..aef36d910479 --- /dev/null +++ b/fs/yaffs2/yaffs_packedtags1.h -@@ -0,0 +1,39 @@ +@@ -0,0 +1,38 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -8689,13 +9329,13 @@ index 0000000..b80f0a5 +#include "yaffs_guts.h" + +struct yaffs_packed_tags1 { -+ unsigned chunk_id:20; -+ unsigned serial_number:2; -+ unsigned n_bytes:10; -+ unsigned obj_id:18; -+ unsigned ecc:12; -+ unsigned deleted:1; -+ unsigned unused_stuff:1; ++ u32 chunk_id:20; ++ u32 serial_number:2; ++ u32 n_bytes:10; ++ u32 obj_id:18; ++ u32 ecc:12; ++ u32 deleted:1; ++ u32 unused_stuff:1; + unsigned should_be_ff; + +}; @@ -8707,15 +9347,14 @@ index 0000000..b80f0a5 +#endif diff --git a/fs/yaffs2/yaffs_packedtags2.c b/fs/yaffs2/yaffs_packedtags2.c new file mode 100644 -index 0000000..e1d18cc +index 000000000000..e8fd94578e95 --- /dev/null +++ b/fs/yaffs2/yaffs_packedtags2.c -@@ -0,0 +1,197 @@ +@@ -0,0 +1,207 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -8727,6 +9366,7 @@ index 0000000..e1d18cc +#include "yaffs_packedtags2.h" +#include "yportenv.h" +#include "yaffs_trace.h" ++#include "yaffs_endian.h" + +/* This code packs a set of extended tags into a binary structure for + * NAND storage @@ -8785,7 +9425,8 @@ index 0000000..e1d18cc + return 1; +} + -+void yaffs_pack_tags2_tags_only(struct yaffs_packed_tags2_tags_only *ptt, ++void yaffs_pack_tags2_tags_only(struct yaffs_dev *dev, ++ struct yaffs_packed_tags2_tags_only *ptt, + const struct yaffs_ext_tags *t) +{ + ptt->chunk_id = t->chunk_id; @@ -8819,12 +9460,14 @@ index 0000000..e1d18cc + + yaffs_dump_packed_tags2_tags_only(ptt); + yaffs_dump_tags2(t); ++ yaffs_do_endian_packed_tags2(dev, ptt); +} + -+void yaffs_pack_tags2(struct yaffs_packed_tags2 *pt, ++void yaffs_pack_tags2(struct yaffs_dev *dev, ++ struct yaffs_packed_tags2 *pt, + const struct yaffs_ext_tags *t, int tags_ecc) +{ -+ yaffs_pack_tags2_tags_only(&pt->t, t); ++ yaffs_pack_tags2_tags_only(dev, &pt->t, t); + + if (tags_ecc) + yaffs_ecc_calc_other((unsigned char *)&pt->t, @@ -8832,45 +9475,52 @@ index 0000000..e1d18cc + &pt->ecc); +} + -+void yaffs_unpack_tags2_tags_only(struct yaffs_ext_tags *t, -+ struct yaffs_packed_tags2_tags_only *ptt) ++void yaffs_unpack_tags2_tags_only(struct yaffs_dev *dev, ++ struct yaffs_ext_tags *t, ++ struct yaffs_packed_tags2_tags_only *ptt_ptr) +{ ++ struct yaffs_packed_tags2_tags_only ptt_copy = *ptt_ptr; ++ + memset(t, 0, sizeof(struct yaffs_ext_tags)); + -+ if (ptt->seq_number == 0xffffffff) ++ if (ptt_copy.seq_number == 0xffffffff) + return; + ++ yaffs_do_endian_packed_tags2(dev, &ptt_copy); ++ + t->block_bad = 0; + t->chunk_used = 1; -+ t->obj_id = ptt->obj_id; -+ t->chunk_id = ptt->chunk_id; -+ t->n_bytes = ptt->n_bytes; ++ t->obj_id = ptt_copy.obj_id; ++ t->chunk_id = ptt_copy.chunk_id; ++ t->n_bytes = ptt_copy.n_bytes; + t->is_deleted = 0; + t->serial_number = 0; -+ t->seq_number = ptt->seq_number; ++ t->seq_number = ptt_copy.seq_number; + + /* Do extra header info stuff */ -+ if (ptt->chunk_id & EXTRA_HEADER_INFO_FLAG) { ++ if (ptt_copy.chunk_id & EXTRA_HEADER_INFO_FLAG) { + t->chunk_id = 0; + t->n_bytes = 0; + + t->extra_available = 1; -+ t->extra_parent_id = ptt->chunk_id & (~(ALL_EXTRA_FLAGS)); -+ t->extra_is_shrink = ptt->chunk_id & EXTRA_SHRINK_FLAG ? 1 : 0; -+ t->extra_shadows = ptt->chunk_id & EXTRA_SHADOWS_FLAG ? 1 : 0; -+ t->extra_obj_type = ptt->obj_id >> EXTRA_OBJECT_TYPE_SHIFT; ++ t->extra_parent_id = ptt_copy.chunk_id & (~(ALL_EXTRA_FLAGS)); ++ t->extra_is_shrink = ptt_copy.chunk_id & EXTRA_SHRINK_FLAG ? 1 : 0; ++ t->extra_shadows = ptt_copy.chunk_id & EXTRA_SHADOWS_FLAG ? 1 : 0; ++ t->extra_obj_type = ptt_copy.obj_id >> EXTRA_OBJECT_TYPE_SHIFT; + t->obj_id &= ~EXTRA_OBJECT_TYPE_MASK; + + if (t->extra_obj_type == YAFFS_OBJECT_TYPE_HARDLINK) -+ t->extra_equiv_id = ptt->n_bytes; ++ t->extra_equiv_id = ptt_copy.n_bytes; + else -+ t->extra_file_size = ptt->n_bytes; ++ t->extra_file_size = ptt_copy.n_bytes; + } -+ yaffs_dump_packed_tags2_tags_only(ptt); ++ yaffs_dump_packed_tags2_tags_only(ptt_ptr); + yaffs_dump_tags2(t); +} + -+void yaffs_unpack_tags2(struct yaffs_ext_tags *t, struct yaffs_packed_tags2 *pt, ++void yaffs_unpack_tags2(struct yaffs_dev *dev, ++ struct yaffs_ext_tags *t, ++ struct yaffs_packed_tags2 *pt, + int tags_ecc) +{ + enum yaffs_ecc_result ecc_result = YAFFS_ECC_RESULT_NO_ERROR; @@ -8901,7 +9551,7 @@ index 0000000..e1d18cc + ecc_result = YAFFS_ECC_RESULT_UNKNOWN; + } + } -+ yaffs_unpack_tags2_tags_only(t, &pt->t); ++ yaffs_unpack_tags2_tags_only(dev, t, &pt->t); + + t->ecc_result = ecc_result; + @@ -8910,15 +9560,14 @@ index 0000000..e1d18cc +} diff --git a/fs/yaffs2/yaffs_packedtags2.h b/fs/yaffs2/yaffs_packedtags2.h new file mode 100644 -index 0000000..675e719 +index 000000000000..598032601f78 --- /dev/null +++ b/fs/yaffs2/yaffs_packedtags2.h -@@ -0,0 +1,47 @@ +@@ -0,0 +1,50 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -8950,28 +9599,31 @@ index 0000000..675e719 +}; + +/* Full packed tags with ECC, used for oob tags */ -+void yaffs_pack_tags2(struct yaffs_packed_tags2 *pt, ++void yaffs_pack_tags2(struct yaffs_dev *dev, ++ struct yaffs_packed_tags2 *pt, + const struct yaffs_ext_tags *t, int tags_ecc); -+void yaffs_unpack_tags2(struct yaffs_ext_tags *t, struct yaffs_packed_tags2 *pt, ++void yaffs_unpack_tags2(struct yaffs_dev *dev, ++ struct yaffs_ext_tags *t, struct yaffs_packed_tags2 *pt, + int tags_ecc); + +/* Only the tags part (no ECC for use with inband tags */ -+void yaffs_pack_tags2_tags_only(struct yaffs_packed_tags2_tags_only *pt, ++void yaffs_pack_tags2_tags_only(struct yaffs_dev *dev, ++ struct yaffs_packed_tags2_tags_only *pt, + const struct yaffs_ext_tags *t); -+void yaffs_unpack_tags2_tags_only(struct yaffs_ext_tags *t, ++void yaffs_unpack_tags2_tags_only(struct yaffs_dev *dev, ++ struct yaffs_ext_tags *t, + struct yaffs_packed_tags2_tags_only *pt); +#endif diff --git a/fs/yaffs2/yaffs_summary.c b/fs/yaffs2/yaffs_summary.c new file mode 100644 -index 0000000..6f3c783 +index 000000000000..50a6919aa97a --- /dev/null +++ b/fs/yaffs2/yaffs_summary.c -@@ -0,0 +1,313 @@ +@@ -0,0 +1,309 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -9152,7 +9804,7 @@ index 0000000..6f3c783 + u8 *buffer; + u8 *sum_buffer = (u8 *)st; + int n_bytes; -+ int chunk_id; ++ u32 chunk_id; + int chunk_in_nand; + int chunk_in_block; + int result; @@ -9160,10 +9812,7 @@ index 0000000..6f3c783 + struct yaffs_summary_header hdr; + struct yaffs_block_info *bi = yaffs_get_block_info(dev, blk); + int sum_bytes_per_chunk = dev->data_bytes_per_chunk - sizeof(hdr); -+ int sum_tags_bytes; + -+ sum_tags_bytes = sizeof(struct yaffs_summary_tags) * -+ dev->chunks_per_summary; + buffer = yaffs_get_temp_buffer(dev); + n_bytes = sizeof(struct yaffs_summary_tags) * dev->chunks_per_summary; + chunk_in_block = dev->chunks_per_summary; @@ -9204,7 +9853,6 @@ index 0000000..6f3c783 + if (result == YAFFS_OK) { + /* Verify header */ + if (hdr.version != YAFFS_SUMMARY_VERSION || -+ hdr.block != blk || + hdr.seq != bi->seq_number || + hdr.sum != yaffs_summary_sum(dev)) + result = YAFFS_FAIL; @@ -9229,8 +9877,9 @@ index 0000000..6f3c783 + return YAFFS_OK; + + if (chunk_in_block >= 0 && chunk_in_block < dev->chunks_per_summary) { -+ yaffs_pack_tags2_tags_only(&tags_only, tags); ++ yaffs_pack_tags2_tags_only(dev, &tags_only, tags); + sum_tags = &dev->sum_tags[chunk_in_block]; ++ + sum_tags->chunk_id = tags_only.chunk_id; + sum_tags->n_bytes = tags_only.n_bytes; + sum_tags->obj_id = tags_only.obj_id; @@ -9256,7 +9905,7 @@ index 0000000..6f3c783 + tags_only.chunk_id = sum_tags->chunk_id; + tags_only.n_bytes = sum_tags->n_bytes; + tags_only.obj_id = sum_tags->obj_id; -+ yaffs_unpack_tags2_tags_only(tags, &tags_only); ++ yaffs_unpack_tags2_tags_only(dev, tags, &tags_only); + return YAFFS_OK; + } + return YAFFS_FAIL; @@ -9265,7 +9914,7 @@ index 0000000..6f3c783 +void yaffs_summary_gc(struct yaffs_dev *dev, int blk) +{ + struct yaffs_block_info *bi = yaffs_get_block_info(dev, blk); -+ int i; ++ u32 i; + + if (!bi->has_summary) + return; @@ -9282,15 +9931,14 @@ index 0000000..6f3c783 +} diff --git a/fs/yaffs2/yaffs_summary.h b/fs/yaffs2/yaffs_summary.h new file mode 100644 -index 0000000..be141d0 +index 000000000000..0d0a26a9713f --- /dev/null +++ b/fs/yaffs2/yaffs_summary.h -@@ -0,0 +1,37 @@ +@@ -0,0 +1,36 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -9325,21 +9973,23 @@ index 0000000..be141d0 +#endif diff --git a/fs/yaffs2/yaffs_tagscompat.c b/fs/yaffs2/yaffs_tagscompat.c new file mode 100644 -index 0000000..092430b +index 000000000000..14532b9483b6 --- /dev/null +++ b/fs/yaffs2/yaffs_tagscompat.c -@@ -0,0 +1,381 @@ +@@ -0,0 +1,399 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. ++ * ++ * This file handles yaffs1-style tags to allow compatibility with Yaffs1 style ++ * flash layouts. + */ + +#include "yaffs_guts.h" @@ -9347,13 +9997,13 @@ index 0000000..092430b +#include "yaffs_ecc.h" +#include "yaffs_getblockinfo.h" +#include "yaffs_trace.h" ++#include "yaffs_endian.h" + +static void yaffs_handle_rd_data_error(struct yaffs_dev *dev, int nand_chunk); + + +/********** Tags ECC calculations *********/ + -+ +void yaffs_calc_tags_ecc(struct yaffs_tags *tags) +{ + /* Calculate an ecc */ @@ -9404,21 +10054,30 @@ index 0000000..092430b + +/********** Tags **********/ + -+static void yaffs_load_tags_to_spare(struct yaffs_spare *spare_ptr, ++/* ++ * During tags storing/retireval we use a copy of the tags so that ++ * we can modify the endian etc without damaging the previous structure. ++ */ ++static void yaffs_load_tags_to_spare(struct yaffs_dev *dev, ++ struct yaffs_spare *spare_ptr, + struct yaffs_tags *tags_ptr) +{ -+ union yaffs_tags_union *tu = (union yaffs_tags_union *)tags_ptr; ++ union yaffs_tags_union *tu_ptr = (union yaffs_tags_union *)tags_ptr; ++ union yaffs_tags_union tags_stored = *tu_ptr; ++ ++ yaffs_calc_tags_ecc(&tags_stored.as_tags); + -+ yaffs_calc_tags_ecc(tags_ptr); ++ yaffs_do_endian_u32(dev, &tags_stored.as_u32[0]); ++ yaffs_do_endian_u32(dev, &tags_stored.as_u32[1]); + -+ spare_ptr->tb0 = tu->as_bytes[0]; -+ spare_ptr->tb1 = tu->as_bytes[1]; -+ spare_ptr->tb2 = tu->as_bytes[2]; -+ spare_ptr->tb3 = tu->as_bytes[3]; -+ spare_ptr->tb4 = tu->as_bytes[4]; -+ spare_ptr->tb5 = tu->as_bytes[5]; -+ spare_ptr->tb6 = tu->as_bytes[6]; -+ spare_ptr->tb7 = tu->as_bytes[7]; ++ spare_ptr->tb0 = tags_stored.as_bytes[0]; ++ spare_ptr->tb1 = tags_stored.as_bytes[1]; ++ spare_ptr->tb2 = tags_stored.as_bytes[2]; ++ spare_ptr->tb3 = tags_stored.as_bytes[3]; ++ spare_ptr->tb4 = tags_stored.as_bytes[4]; ++ spare_ptr->tb5 = tags_stored.as_bytes[5]; ++ spare_ptr->tb6 = tags_stored.as_bytes[6]; ++ spare_ptr->tb7 = tags_stored.as_bytes[7]; +} + +static void yaffs_get_tags_from_spare(struct yaffs_dev *dev, @@ -9426,16 +10085,22 @@ index 0000000..092430b + struct yaffs_tags *tags_ptr) +{ + union yaffs_tags_union *tu = (union yaffs_tags_union *)tags_ptr; ++ union yaffs_tags_union tags_stored; + int result; + -+ tu->as_bytes[0] = spare_ptr->tb0; -+ tu->as_bytes[1] = spare_ptr->tb1; -+ tu->as_bytes[2] = spare_ptr->tb2; -+ tu->as_bytes[3] = spare_ptr->tb3; -+ tu->as_bytes[4] = spare_ptr->tb4; -+ tu->as_bytes[5] = spare_ptr->tb5; -+ tu->as_bytes[6] = spare_ptr->tb6; -+ tu->as_bytes[7] = spare_ptr->tb7; ++ tags_stored.as_bytes[0] = spare_ptr->tb0; ++ tags_stored.as_bytes[1] = spare_ptr->tb1; ++ tags_stored.as_bytes[2] = spare_ptr->tb2; ++ tags_stored.as_bytes[3] = spare_ptr->tb3; ++ tags_stored.as_bytes[4] = spare_ptr->tb4; ++ tags_stored.as_bytes[5] = spare_ptr->tb5; ++ tags_stored.as_bytes[6] = spare_ptr->tb6; ++ tags_stored.as_bytes[7] = spare_ptr->tb7; ++ ++ yaffs_do_endian_u32(dev, &tags_stored.as_u32[0]); ++ yaffs_do_endian_u32(dev, &tags_stored.as_u32[1]); ++ ++ *tu = tags_stored; + + result = yaffs_check_tags_ecc(tags_ptr); + if (result > 0) @@ -9594,7 +10259,7 @@ index 0000000..092430b + yaffs_ecc_calc(&data[256], spare.ecc2); + } + -+ yaffs_load_tags_to_spare(&spare, &tags); ++ yaffs_load_tags_to_spare(dev, &spare, &tags); + } + return yaffs_wr_nand(dev, nand_chunk, data, &spare); +} @@ -9634,6 +10299,7 @@ index 0000000..092430b + + if (ext_tags->chunk_used) { + yaffs_get_tags_from_spare(dev, &spare, &tags); ++ + ext_tags->obj_id = tags.obj_id; + ext_tags->chunk_id = tags.chunk_id; + ext_tags->n_bytes = tags.n_bytes_lsb; @@ -9712,15 +10378,14 @@ index 0000000..092430b +} diff --git a/fs/yaffs2/yaffs_tagscompat.h b/fs/yaffs2/yaffs_tagscompat.h new file mode 100644 -index 0000000..92d298a +index 000000000000..a3cbf8dbc2fa --- /dev/null +++ b/fs/yaffs2/yaffs_tagscompat.h -@@ -0,0 +1,44 @@ +@@ -0,0 +1,43 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -9762,21 +10427,24 @@ index 0000000..92d298a +#endif diff --git a/fs/yaffs2/yaffs_tagsmarshall.c b/fs/yaffs2/yaffs_tagsmarshall.c new file mode 100644 -index 0000000..44a83b1 +index 000000000000..cded165b367c --- /dev/null +++ b/fs/yaffs2/yaffs_tagsmarshall.c -@@ -0,0 +1,199 @@ +@@ -0,0 +1,205 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. ++ * ++ * This file handles the marshalling (ie internal<-->external structure ++ * translation between the internal tags and the stored tags in Yaffs2-style ++ * tags storage. + */ + +#include "yaffs_guts.h" @@ -9811,9 +10479,9 @@ index 0000000..44a83b1 + (struct yaffs_packed_tags2_tags_only *)(data + + dev-> + data_bytes_per_chunk); -+ yaffs_pack_tags2_tags_only(pt2tp, tags); ++ yaffs_pack_tags2_tags_only(dev, pt2tp, tags); + } else { -+ yaffs_pack_tags2(&pt, tags, !dev->param.no_tags_ecc); ++ yaffs_pack_tags2(dev, &pt, tags, !dev->param.no_tags_ecc); + } + + retval = dev->drv.drv_write_chunk_fn(dev, nand_chunk, @@ -9865,17 +10533,20 @@ index 0000000..44a83b1 + BUG(); + + ++ if (retval == YAFFS_FAIL) ++ return YAFFS_FAIL; ++ + if (dev->param.inband_tags) { + if (tags) { + struct yaffs_packed_tags2_tags_only *pt2tp; + pt2tp = + (struct yaffs_packed_tags2_tags_only *) + &data[dev->data_bytes_per_chunk]; -+ yaffs_unpack_tags2_tags_only(tags, pt2tp); ++ yaffs_unpack_tags2_tags_only(dev, tags, pt2tp); + } + } else if (tags) { + memcpy(packed_tags_ptr, spare_buffer, packed_tags_size); -+ yaffs_unpack_tags2(tags, &pt, !dev->param.no_tags_ecc); ++ yaffs_unpack_tags2(dev, tags, &pt, !dev->param.no_tags_ecc); + } + + if (local_data) @@ -9886,7 +10557,7 @@ index 0000000..44a83b1 + dev->n_ecc_unfixed++; + } + -+ if (tags && ecc_result == -YAFFS_ECC_RESULT_FIXED) { ++ if (tags && ecc_result == YAFFS_ECC_RESULT_FIXED) { + if (tags->ecc_result <= YAFFS_ECC_RESULT_NO_ERROR) + tags->ecc_result = YAFFS_ECC_RESULT_FIXED; + dev->n_ecc_fixed++; @@ -9967,15 +10638,14 @@ index 0000000..44a83b1 +} diff --git a/fs/yaffs2/yaffs_tagsmarshall.h b/fs/yaffs2/yaffs_tagsmarshall.h new file mode 100644 -index 0000000..bf3e68a +index 000000000000..e6c0ef652452 --- /dev/null +++ b/fs/yaffs2/yaffs_tagsmarshall.h -@@ -0,0 +1,22 @@ +@@ -0,0 +1,21 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -9995,15 +10665,14 @@ index 0000000..bf3e68a +#endif diff --git a/fs/yaffs2/yaffs_trace.h b/fs/yaffs2/yaffs_trace.h new file mode 100644 -index 0000000..fd26054 +index 000000000000..5a6aeed23cfb --- /dev/null +++ b/fs/yaffs2/yaffs_trace.h -@@ -0,0 +1,57 @@ +@@ -0,0 +1,56 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -10058,15 +10727,14 @@ index 0000000..fd26054 +#endif diff --git a/fs/yaffs2/yaffs_verify.c b/fs/yaffs2/yaffs_verify.c new file mode 100644 -index 0000000..e8f2f0a +index 000000000000..9141eb5dbd2d --- /dev/null +++ b/fs/yaffs2/yaffs_verify.c -@@ -0,0 +1,529 @@ +@@ -0,0 +1,539 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -10141,10 +10809,10 @@ index 0000000..e8f2f0a + actually_used = bi->pages_in_use - bi->soft_del_pages; + + if (bi->pages_in_use < 0 || -+ bi->pages_in_use > dev->param.chunks_per_block || ++ bi->pages_in_use > (int)dev->param.chunks_per_block || + bi->soft_del_pages < 0 || -+ bi->soft_del_pages > dev->param.chunks_per_block || -+ actually_used < 0 || actually_used > dev->param.chunks_per_block) ++ bi->soft_del_pages > (int)dev->param.chunks_per_block || ++ actually_used < 0 || actually_used > (int)dev->param.chunks_per_block) + yaffs_trace(YAFFS_TRACE_VERIFY, + "Block %d has illegal values pages_in_used %d soft_del_pages %d", + n, bi->pages_in_use, bi->soft_del_pages); @@ -10174,8 +10842,8 @@ index 0000000..e8f2f0a + +void yaffs_verify_blocks(struct yaffs_dev *dev) +{ -+ int i; -+ int state_count[YAFFS_NUMBER_OF_BLOCK_STATES]; ++ u32 i; ++ u32 state_count[YAFFS_NUMBER_OF_BLOCK_STATES]; + int illegal_states = 0; + + if (yaffs_skip_verification(dev)) @@ -10213,7 +10881,7 @@ index 0000000..e8f2f0a + dev->blocks_in_checkpt, + state_count[YAFFS_BLOCK_STATE_CHECKPOINT]); + -+ if (dev->n_erased_blocks != state_count[YAFFS_BLOCK_STATE_EMPTY]) ++ if (dev->n_erased_blocks != (int)state_count[YAFFS_BLOCK_STATE_EMPTY]) + yaffs_trace(YAFFS_TRACE_VERIFY, + "Erased block count wrong dev %d count %d", + dev->n_erased_blocks, @@ -10265,7 +10933,7 @@ index 0000000..e8f2f0a + tags->obj_id, oh->parent_obj_id); + + if (parent_check && obj->parent && -+ oh->parent_obj_id != obj->parent->obj_id && ++ oh->parent_obj_id != obj->parent->obj_id && + (oh->parent_obj_id != YAFFS_OBJECTID_UNLINKED || + obj->parent->obj_id != YAFFS_OBJECTID_DELETED)) + yaffs_trace(YAFFS_TRACE_VERIFY, @@ -10288,12 +10956,11 @@ index 0000000..e8f2f0a +{ + u32 x; + int required_depth; -+ int actual_depth; + int last_chunk; + u32 offset_in_chunk; + u32 the_chunk; + -+ u32 i; ++ int i; + struct yaffs_dev *dev; + struct yaffs_ext_tags tags; + struct yaffs_tnode *tn; @@ -10320,8 +10987,6 @@ index 0000000..e8f2f0a + required_depth++; + } + -+ actual_depth = obj->variant.file_variant.top_level; -+ + /* Check that the chunks in the tnode tree are all correct. + * We do this by scanning through the tnode tree and + * checking the tags for every chunk match. @@ -10340,7 +11005,7 @@ index 0000000..e8f2f0a + if (the_chunk > 0) { + yaffs_rd_chunk_tags_nand(dev, the_chunk, NULL, + &tags); -+ if (tags.obj_id != obj_id || tags.chunk_id != i) ++ if (tags.obj_id != obj_id || tags.chunk_id != (u32)i) + yaffs_trace(YAFFS_TRACE_VERIFY, + "Object %d chunk_id %d NAND mismatch chunk %d tags (%d:%d)", + obj_id, i, the_chunk, @@ -10534,12 +11199,26 @@ index 0000000..e8f2f0a +{ + struct list_head *lh; + struct yaffs_obj *list_obj; ++ struct yaffs_dev *dev; + + if (!directory) { + BUG(); + return; + } + ++ dev = directory->my_dev; ++ ++ if (!dev) { ++ BUG(); ++ return; ++ } ++ ++ if (directory == dev->root_dir || ++ directory == dev->lost_n_found || ++ directory == dev->unlinked_dir || ++ directory == dev->del_dir) ++ return; ++ + if (yaffs_skip_full_verification(directory->my_dev)) + return; + @@ -10593,15 +11272,14 @@ index 0000000..e8f2f0a +} diff --git a/fs/yaffs2/yaffs_verify.h b/fs/yaffs2/yaffs_verify.h new file mode 100644 -index 0000000..4f4af8d +index 000000000000..7571201a8616 --- /dev/null +++ b/fs/yaffs2/yaffs_verify.h -@@ -0,0 +1,43 @@ +@@ -0,0 +1,42 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -10642,15 +11320,14 @@ index 0000000..4f4af8d +#endif diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c new file mode 100644 -index 0000000..145517b +index 000000000000..a36d9bfaa9d2 --- /dev/null +++ b/fs/yaffs2/yaffs_vfs.c -@@ -0,0 +1,2568 @@ +@@ -0,0 +1,3796 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * Acknowledgements: @@ -10680,28 +11357,145 @@ index 0000000..145517b + */ + +/* -+ * NB There are two variants of Linux VFS glue code. This variant supports -+ * a single version and should not include any multi-version code. ++ * There are two variants of the VFS glue code. This variant should compile ++ * for any version of Linux. + */ +#include <linux/version.h> ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)) ++#include <linux/iversion.h> ++#endif ++ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10)) ++#define YAFFS_COMPILE_BACKGROUND ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23)) ++#define YAFFS_COMPILE_FREEZER ++#endif ++#endif ++ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)) ++#define YAFFS_COMPILE_EXPORTFS ++#endif ++ ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) ++#define YAFFS_USE_SETATTR_COPY ++#define YAFFS_USE_TRUNCATE_SETSIZE ++#endif ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) ++#define YAFFS_HAS_EVICT_INODE ++#endif ++ ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13)) && \ ++ (LINUX_VERSION_CODE < KERNEL_VERSION(4, 8, 0)) ++#define YAFFS_NEW_FOLLOW_LINK 1 ++#else ++#define YAFFS_NEW_FOLLOW_LINK 0 ++#endif ++ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)) ++#define YAFFS_HAS_WRITE_SUPER ++#endif ++ ++ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)) ++#include <linux/config.h> ++#endif ++ +#include <linux/kernel.h> +#include <linux/module.h> +#include <linux/slab.h> +#include <linux/init.h> +#include <linux/fs.h> +#include <linux/proc_fs.h> ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)) ++#include <linux/smp_lock.h> ++#endif +#include <linux/pagemap.h> +#include <linux/mtd/mtd.h> +#include <linux/interrupt.h> +#include <linux/string.h> +#include <linux/ctype.h> ++ ++#if (YAFFS_NEW_FOLLOW_LINK == 1) +#include <linux/namei.h> ++#endif ++ ++#ifdef YAFFS_COMPILE_EXPORTFS +#include <linux/exportfs.h> ++#endif ++ ++#ifdef YAFFS_COMPILE_BACKGROUND +#include <linux/kthread.h> +#include <linux/delay.h> ++#endif ++#ifdef YAFFS_COMPILE_FREEZER +#include <linux/freezer.h> ++#endif ++ +#include <asm/div64.h> ++ ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) ++ +#include <linux/statfs.h> ++ ++#define UnlockPage(p) unlock_page(p) ++#define Page_Uptodate(page) test_bit(PG_uptodate, &(page)->flags) ++ ++/* FIXME: use sb->s_id instead ? */ ++#define yaffs_devname(sb, buf) bdevname(sb->s_bdev, buf) ++ ++#else ++ ++#include <linux/locks.h> ++#define BDEVNAME_SIZE 0 ++#define yaffs_devname(sb, buf) kdevname(sb->s_dev) ++ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)) ++/* added NCB 26/5/2006 for 2.4.25-vrs2-tcl1 kernel */ ++#define __user ++#endif ++ ++#endif ++ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)) ++#define YPROC_ROOT (&proc_root) ++#else ++#define YPROC_ROOT NULL ++#endif ++ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)) ++#define Y_INIT_TIMER(a) init_timer(a) ++#elif LINUX_VERSION_CODE < KERNEL_VERSION(4, 15, 0) ++#define Y_INIT_TIMER(a) init_timer_on_stack(a) ++#else ++#define Y_INIT_TIMER(a,cb) timer_setup_on_stack(a,cb,0) ++#endif ++ ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 27)) ++#define YAFFS_USE_WRITE_BEGIN_END 1 ++#else ++#define YAFFS_USE_WRITE_BEGIN_END 0 ++#endif ++ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)) ++#define YAFFS_SUPER_HAS_DIRTY ++#endif ++ ++ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)) ++#define set_nlink(inode, count) do { (inode)->i_nlink = (count); } while(0) ++#endif ++ ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28)) ++static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size) ++{ ++ uint64_t result = partition_size; ++ do_div(result, block_size); ++ return (uint32_t) result; ++} ++#else ++#define YCALCBLOCKS(s, b) ((s)/(b)) ++#endif ++ +#include <linux/uaccess.h> +#include <linux/mtd/mtd.h> + @@ -10711,49 +11505,115 @@ index 0000000..145517b +#include "yaffs_attribs.h" +#include "yaffs_linux.h" +#include "yaffs_mtdif.h" -+#include "yaffs_mtdif1.h" -+#include "yaffs_mtdif2.h" ++#include "yaffs_packedtags2.h" ++#include "yaffs_getblockinfo.h" + -+unsigned int yaffs_trace_mask = YAFFS_TRACE_BAD_BLOCKS | YAFFS_TRACE_ALWAYS; ++unsigned int yaffs_trace_mask = YAFFS_TRACE_BAD_BLOCKS | YAFFS_TRACE_ALWAYS | 0; +unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS; +unsigned int yaffs_auto_checkpoint = 1; +unsigned int yaffs_gc_control = 1; +unsigned int yaffs_bg_enable = 1; +unsigned int yaffs_auto_select = 1; -+ +/* Module Parameters */ ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) +module_param(yaffs_trace_mask, uint, 0644); +module_param(yaffs_wr_attempts, uint, 0644); +module_param(yaffs_auto_checkpoint, uint, 0644); +module_param(yaffs_gc_control, uint, 0644); +module_param(yaffs_bg_enable, uint, 0644); -+module_param(yaffs_auto_select, uint, 0644); ++#else ++MODULE_PARM(yaffs_trace_mask, "i"); ++MODULE_PARM(yaffs_wr_attempts, "i"); ++MODULE_PARM(yaffs_auto_checkpoint, "i"); ++MODULE_PARM(yaffs_gc_control, "i"); ++#endif + -+#define yaffs_devname(sb, buf) bdevname(sb->s_bdev, buf) ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)) ++/* use iget and read_inode */ ++#define Y_IGET(sb, inum) iget((sb), (inum)) + -+static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size) -+{ -+ uint64_t result = partition_size; ++#else ++/* Call local equivalent */ ++#define YAFFS_USE_OWN_IGET ++#define Y_IGET(sb, inum) yaffs_iget((sb), (inum)) + -+ do_div(result, block_size); -+ return (uint32_t) result; -+} ++#endif + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18)) +#define yaffs_inode_to_obj_lv(iptr) ((iptr)->i_private) -+#define yaffs_inode_to_obj(iptr)\ ++#else ++#define yaffs_inode_to_obj_lv(iptr) ((iptr)->u.generic_ip) ++#endif ++ ++#define yaffs_inode_to_obj(iptr) \ + ((struct yaffs_obj *)(yaffs_inode_to_obj_lv(iptr))) +#define yaffs_dentry_to_obj(dptr) yaffs_inode_to_obj((dptr)->d_inode) ++ ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) +#define yaffs_super_to_dev(sb) ((struct yaffs_dev *)sb->s_fs_info) ++#else ++#define yaffs_super_to_dev(sb) ((struct yaffs_dev *)sb->u.generic_sbp) ++#endif + -+#define update_dir_time(dir) do {\ -+ (dir)->i_ctime = (dir)->i_mtime = CURRENT_TIME; \ -+ } while (0) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)) ++#define Y_CLEAR_INODE(i) clear_inode(i) ++#else ++#define Y_CLEAR_INODE(i) end_writeback(i) ++#endif + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 12, 0)) ++#define YAFFS_USE_DIR_ITERATE ++#endif + -+static unsigned yaffs_gc_control_callback(struct yaffs_dev *dev) ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)) ++#define YAFFS_USE_XATTR ++#endif ++ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,12,0)) ++#define YAFFS_NEW_PROCFS ++#include <linux/seq_file.h> ++#endif ++ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 4, 0)) ++#define PAGE_CACHE_SIZE PAGE_SIZE ++#define PAGE_CACHE_SHIFT PAGE_SHIFT ++#define Y_GET_DENTRY(f) ((f)->f_path.dentry) ++#define YAFFS_NEW_XATTR 1 ++#define YAFFS_NEW_GET_LINK 1 ++#else ++#define Y_GET_DENTRY(f) ((f)->f_dentry) ++#define YAFFS_NEW_XATTR 0 ++#define YAFFS_NEW_GET_LINK 0 ++#endif ++ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 8, 0)) ++#define page_cache_release put_page ++#endif ++ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0)) ++#define update_dir_time(dir) do {\ ++ (dir)->i_ctime = (dir)->i_mtime = CURRENT_TIME; \ ++ } while (0) ++#elif (LINUX_VERSION_CODE < KERNEL_VERSION(4,18,0)) ++#define update_dir_time(dir) do {\ ++ (dir)->i_ctime = (dir)->i_mtime = current_kernel_time(); \ ++ } while (0) ++#else ++#define update_dir_time(dir) do {\ ++ (dir)->i_ctime = (dir)->i_mtime = current_kernel_time64(); \ ++ } while (0) ++#endif ++ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4, 9, 0)) ++static inline int setattr_prepare(struct dentry *dentry, struct iattr *attr) +{ -+ return yaffs_gc_control; ++ return inode_change_ok(dentry->d_inode, attr); +} ++#endif ++ ++static void yaffs_fill_inode_from_obj(struct inode *inode, ++ struct yaffs_obj *obj); ++ + +static void yaffs_gross_lock(struct yaffs_dev *dev) +{ @@ -10768,8 +11628,912 @@ index 0000000..145517b + mutex_unlock(&(yaffs_dev_to_lc(dev)->gross_lock)); +} + -+static void yaffs_fill_inode_from_obj(struct inode *inode, -+ struct yaffs_obj *obj); ++ ++static int yaffs_readpage_nolock(struct file *f, struct page *pg) ++{ ++ /* Lifted from jffs2 */ ++ ++ struct yaffs_obj *obj; ++ unsigned char *pg_buf; ++ int ret; ++ loff_t pos = ((loff_t) pg->index) << PAGE_SHIFT; ++ struct yaffs_dev *dev; ++ ++ yaffs_trace(YAFFS_TRACE_OS, ++ "yaffs_readpage_nolock at %lld, size %08x", ++ (long long)pos, ++ (unsigned)PAGE_SIZE); ++ ++ obj = yaffs_dentry_to_obj(Y_GET_DENTRY(f)); ++ ++ dev = obj->my_dev; ++ ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) ++ BUG_ON(!PageLocked(pg)); ++#else ++ if (!PageLocked(pg)) ++ PAGE_BUG(pg); ++#endif ++ ++ pg_buf = kmap(pg); ++ /* FIXME: Can kmap fail? */ ++ ++ yaffs_gross_lock(dev); ++ ++ ret = yaffs_file_rd(obj, pg_buf, pos, PAGE_CACHE_SIZE); ++ ++ yaffs_gross_unlock(dev); ++ ++ if (ret >= 0) ++ ret = 0; ++ ++ if (ret) { ++ ClearPageUptodate(pg); ++ SetPageError(pg); ++ } else { ++ SetPageUptodate(pg); ++ ClearPageError(pg); ++ } ++ ++ flush_dcache_page(pg); ++ kunmap(pg); ++ ++ yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage_nolock done"); ++ return ret; ++} ++ ++static int yaffs_readpage_unlock(struct file *f, struct page *pg) ++{ ++ int ret = yaffs_readpage_nolock(f, pg); ++ UnlockPage(pg); ++ return ret; ++} ++ ++static int yaffs_readpage(struct file *f, struct page *pg) ++{ ++ int ret; ++ ++ yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage"); ++ ret = yaffs_readpage_unlock(f, pg); ++ yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage done"); ++ return ret; ++} ++ ++ ++static void yaffs_set_super_dirty_val(struct yaffs_dev *dev, int val) ++{ ++ struct yaffs_linux_context *lc = yaffs_dev_to_lc(dev); ++ ++ if (lc) ++ lc->dirty = val; ++ ++# ifdef YAFFS_SUPER_HAS_DIRTY ++ { ++ struct super_block *sb = lc->super; ++ ++ if (sb) ++ sb->s_dirt = val; ++ } ++#endif ++ ++} ++ ++static void yaffs_set_super_dirty(struct yaffs_dev *dev) ++{ ++ yaffs_set_super_dirty_val(dev, 1); ++} ++ ++static void yaffs_clear_super_dirty(struct yaffs_dev *dev) ++{ ++ yaffs_set_super_dirty_val(dev, 0); ++} ++ ++static int yaffs_check_super_dirty(struct yaffs_dev *dev) ++{ ++ struct yaffs_linux_context *lc = yaffs_dev_to_lc(dev); ++ ++ if (lc && lc->dirty) ++ return 1; ++ ++# ifdef YAFFS_SUPER_HAS_DIRTY ++ { ++ struct super_block *sb = lc->super; ++ ++ if (sb && sb->s_dirt) ++ return 1; ++ } ++#endif ++ return 0; ++ ++} ++ ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) ++static int yaffs_writepage(struct page *page, struct writeback_control *wbc) ++#else ++static int yaffs_writepage(struct page *page) ++#endif ++{ ++ struct yaffs_dev *dev; ++ struct address_space *mapping = page->mapping; ++ struct inode *inode; ++ unsigned long end_index; ++ char *buffer; ++ struct yaffs_obj *obj; ++ int n_written = 0; ++ unsigned n_bytes; ++ loff_t i_size; ++ ++ if (!mapping) ++ BUG(); ++ inode = mapping->host; ++ if (!inode) ++ BUG(); ++ i_size = i_size_read(inode); ++ ++ end_index = i_size >> PAGE_CACHE_SHIFT; ++ ++ if (page->index < end_index) ++ n_bytes = PAGE_CACHE_SIZE; ++ else { ++ n_bytes = i_size & (PAGE_CACHE_SIZE - 1); ++ ++ if (page->index > end_index || !n_bytes) { ++ yaffs_trace(YAFFS_TRACE_OS, ++ "yaffs_writepage at %lld, inode size = %lld!!", ++ ((loff_t)page->index) << PAGE_CACHE_SHIFT, ++ inode->i_size); ++ yaffs_trace(YAFFS_TRACE_OS, ++ " -> don't care!!"); ++ ++ zero_user_segment(page, 0, PAGE_CACHE_SIZE); ++ set_page_writeback(page); ++ unlock_page(page); ++ end_page_writeback(page); ++ return 0; ++ } ++ } ++ ++ if (n_bytes != PAGE_CACHE_SIZE) ++ zero_user_segment(page, n_bytes, PAGE_CACHE_SIZE); ++ ++ get_page(page); ++ ++ buffer = kmap(page); ++ ++ obj = yaffs_inode_to_obj(inode); ++ dev = obj->my_dev; ++ yaffs_gross_lock(dev); ++ ++ yaffs_trace(YAFFS_TRACE_OS, ++ "yaffs_writepage at %lld, size %08x", ++ ((loff_t)page->index) << PAGE_CACHE_SHIFT, n_bytes); ++ yaffs_trace(YAFFS_TRACE_OS, ++ "writepag0: obj = %lld, ino = %lld", ++ obj->variant.file_variant.file_size, inode->i_size); ++ ++ n_written = yaffs_wr_file(obj, buffer, ++ ((loff_t)page->index) << PAGE_CACHE_SHIFT, n_bytes, 0); ++ ++ yaffs_set_super_dirty(dev); ++ ++ yaffs_trace(YAFFS_TRACE_OS, ++ "writepag1: obj = %lld, ino = %lld", ++ obj->variant.file_variant.file_size, inode->i_size); ++ ++ yaffs_gross_unlock(dev); ++ ++ kunmap(page); ++ set_page_writeback(page); ++ unlock_page(page); ++ end_page_writeback(page); ++ put_page(page); ++ ++ return (n_written == n_bytes) ? 0 : -ENOSPC; ++} ++ ++/* Space holding and freeing is done to ensure we have space available for write_begin/end */ ++/* For now we just assume few parallel writes and check against a small number. */ ++/* Todo: need to do this with a counter to handle parallel reads better */ ++ ++static ssize_t yaffs_hold_space(struct file *f) ++{ ++ struct yaffs_obj *obj; ++ struct yaffs_dev *dev; ++ ++ int n_free_chunks; ++ ++ obj = yaffs_dentry_to_obj(Y_GET_DENTRY(f)); ++ ++ dev = obj->my_dev; ++ ++ yaffs_gross_lock(dev); ++ ++ n_free_chunks = yaffs_get_n_free_chunks(dev); ++ ++ yaffs_gross_unlock(dev); ++ ++ return (n_free_chunks > 20) ? 1 : 0; ++} ++ ++static void yaffs_release_space(struct file *f) ++{ ++ struct yaffs_obj *obj; ++ struct yaffs_dev *dev; ++ ++ obj = yaffs_dentry_to_obj(Y_GET_DENTRY(f)); ++ ++ dev = obj->my_dev; ++ ++ yaffs_gross_lock(dev); ++ ++ yaffs_gross_unlock(dev); ++} ++ ++#if (YAFFS_USE_WRITE_BEGIN_END > 0) ++static int yaffs_write_begin(struct file *filp, struct address_space *mapping, ++ loff_t pos, unsigned len, unsigned flags, ++ struct page **pagep, void **fsdata) ++{ ++ struct page *pg = NULL; ++ pgoff_t index = pos >> PAGE_CACHE_SHIFT; ++ ++ int ret = 0; ++ int space_held = 0; ++ ++ /* Get a page */ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) ++ pg = grab_cache_page_write_begin(mapping, index, flags); ++#else ++ pg = __grab_cache_page(mapping, index); ++#endif ++ ++ *pagep = pg; ++ if (!pg) { ++ ret = -ENOMEM; ++ goto out; ++ } ++ yaffs_trace(YAFFS_TRACE_OS, ++ "start yaffs_write_begin index %d(%x) uptodate %d", ++ (int)index, (int)index, Page_Uptodate(pg) ? 1 : 0); ++ ++ /* Get fs space */ ++ space_held = yaffs_hold_space(filp); ++ ++ if (!space_held) { ++ ret = -ENOSPC; ++ goto out; ++ } ++ ++ /* Update page if required */ ++ ++ if (!Page_Uptodate(pg)) ++ ret = yaffs_readpage_nolock(filp, pg); ++ ++ if (ret) ++ goto out; ++ ++ /* Happy path return */ ++ yaffs_trace(YAFFS_TRACE_OS, "end yaffs_write_begin - ok"); ++ ++ return 0; ++ ++out: ++ yaffs_trace(YAFFS_TRACE_OS, ++ "end yaffs_write_begin fail returning %d", ret); ++ if (space_held) ++ yaffs_release_space(filp); ++ if (pg) { ++ unlock_page(pg); ++ page_cache_release(pg); ++ } ++ return ret; ++} ++ ++#else ++ ++static int yaffs_prepare_write(struct file *f, struct page *pg, ++ unsigned offset, unsigned to) ++{ ++ yaffs_trace(YAFFS_TRACE_OS, "yaffs_prepair_write"); ++ ++ if (!Page_Uptodate(pg)) ++ return yaffs_readpage_nolock(f, pg); ++ return 0; ++} ++#endif ++ ++ ++static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, ++ loff_t * pos) ++{ ++ struct yaffs_obj *obj; ++ int n_written; ++ loff_t ipos; ++ struct inode *inode; ++ struct yaffs_dev *dev; ++ ++ obj = yaffs_dentry_to_obj(Y_GET_DENTRY(f)); ++ ++ if (!obj) { ++ yaffs_trace(YAFFS_TRACE_OS, ++ "yaffs_file_write: hey obj is null!"); ++ return -EINVAL; ++ } ++ ++ dev = obj->my_dev; ++ ++ yaffs_gross_lock(dev); ++ ++ inode = Y_GET_DENTRY(f)->d_inode; ++ ++ if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND) ++ ipos = inode->i_size; ++ else ++ ipos = *pos; ++ ++ yaffs_trace(YAFFS_TRACE_OS, ++ "yaffs_file_write about to write writing %u(%x) bytes to object %d at %lld", ++ (unsigned)n, (unsigned)n, obj->obj_id, ipos); ++ ++ n_written = yaffs_wr_file(obj, buf, ipos, n, 0); ++ ++ yaffs_set_super_dirty(dev); ++ ++ yaffs_trace(YAFFS_TRACE_OS, ++ "yaffs_file_write: %d(%x) bytes written", ++ (unsigned)n, (unsigned)n); ++ ++ if (n_written > 0) { ++ ipos += n_written; ++ *pos = ipos; ++ if (ipos > inode->i_size) { ++ inode->i_size = ipos; ++ inode->i_blocks = (ipos + 511) >> 9; ++ ++ yaffs_trace(YAFFS_TRACE_OS, ++ "yaffs_file_write size updated to %lld bytes, %d blocks", ++ ipos, (int)(inode->i_blocks)); ++ } ++ ++ } ++ yaffs_gross_unlock(dev); ++ return (n_written == 0) && (n > 0) ? -ENOSPC : n_written; ++} ++ ++ ++#if (YAFFS_USE_WRITE_BEGIN_END > 0) ++static int yaffs_write_end(struct file *filp, struct address_space *mapping, ++ loff_t pos, unsigned len, unsigned copied, ++ struct page *pg, void *fsdadata) ++{ ++ int ret = 0; ++ void *addr, *kva; ++ uint32_t offset_into_page = pos & (PAGE_CACHE_SIZE - 1); ++ ++ kva = kmap(pg); ++ addr = kva + offset_into_page; ++ ++ yaffs_trace(YAFFS_TRACE_OS, ++ "yaffs_write_end addr %p pos %lld n_bytes %d", ++ addr, pos, copied); ++ ++ ret = yaffs_file_write(filp, addr, copied, &pos); ++ ++ if (ret != copied) { ++ yaffs_trace(YAFFS_TRACE_OS, ++ "yaffs_write_end not same size ret %d copied %d", ++ ret, copied); ++ SetPageError(pg); ++ } ++ ++ kunmap(pg); ++ ++ yaffs_release_space(filp); ++ unlock_page(pg); ++ page_cache_release(pg); ++ return ret; ++} ++#else ++ ++static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset, ++ unsigned to) ++{ ++ void *addr, *kva; ++ ++ loff_t pos = (((loff_t) pg->index) << PAGE_CACHE_SHIFT) + offset; ++ int n_bytes = to - offset; ++ int n_written; ++ ++ kva = kmap(pg); ++ addr = kva + offset; ++ ++ yaffs_trace(YAFFS_TRACE_OS, ++ "yaffs_commit_write addr %p pos %lld n_bytes %d", ++ addr, pos, n_bytes); ++ ++ n_written = yaffs_file_write(f, addr, n_bytes, &pos); ++ ++ if (n_written != n_bytes) { ++ yaffs_trace(YAFFS_TRACE_OS, ++ "yaffs_commit_write not same size n_written %d n_bytes %d", ++ n_written, n_bytes); ++ SetPageError(pg); ++ } ++ kunmap(pg); ++ ++ yaffs_trace(YAFFS_TRACE_OS, ++ "yaffs_commit_write returning %d", ++ n_written == n_bytes ? 0 : n_written); ++ ++ return n_written == n_bytes ? 0 : n_written; ++} ++#endif ++ ++static struct address_space_operations yaffs_file_address_operations = { ++ .readpage = yaffs_readpage, ++ .writepage = yaffs_writepage, ++#if (YAFFS_USE_WRITE_BEGIN_END > 0) ++ .write_begin = yaffs_write_begin, ++ .write_end = yaffs_write_end, ++#else ++ .prepare_write = yaffs_prepare_write, ++ .commit_write = yaffs_commit_write, ++#endif ++}; ++ ++ ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) ++static int yaffs_file_flush(struct file *file, fl_owner_t id) ++#else ++static int yaffs_file_flush(struct file *file) ++#endif ++{ ++ struct yaffs_obj *obj = yaffs_dentry_to_obj(Y_GET_DENTRY(file)); ++ ++ struct yaffs_dev *dev = obj->my_dev; ++ ++ yaffs_trace(YAFFS_TRACE_OS, ++ "yaffs_file_flush object %d (%s)", ++ obj->obj_id, ++ obj->dirty ? "dirty" : "clean"); ++ ++ yaffs_gross_lock(dev); ++ ++ yaffs_flush_file(obj, 1, 0, 0); ++ ++ yaffs_gross_unlock(dev); ++ ++ return 0; ++} ++ ++ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) ++static int yaffs_sync_object(struct file *file, loff_t start, loff_t end, int datasync) ++#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34)) ++static int yaffs_sync_object(struct file *file, int datasync) ++#else ++static int yaffs_sync_object(struct file *file, struct dentry *dentry, ++ int datasync) ++#endif ++{ ++ struct yaffs_obj *obj; ++ struct yaffs_dev *dev; ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34)) ++ struct dentry *dentry = file->f_path.dentry; ++#endif ++ ++ obj = yaffs_dentry_to_obj(dentry); ++ ++ dev = obj->my_dev; ++ ++ yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC, ++ "yaffs_sync_object"); ++ yaffs_gross_lock(dev); ++ yaffs_flush_file(obj, 1, datasync, 0); ++ yaffs_gross_unlock(dev); ++ return 0; ++} ++ ++ ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22)) ++static const struct file_operations yaffs_file_operations = { ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0) ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 4, 0) ++ .read = new_sync_read, ++ .write = new_sync_write, ++#endif ++ .read_iter = generic_file_read_iter, ++ .write_iter = generic_file_write_iter, ++#else ++ .read = do_sync_read, ++ .write = do_sync_write, ++ .aio_read = generic_file_aio_read, ++ .aio_write = generic_file_aio_write, ++#endif ++ .mmap = generic_file_mmap, ++ .flush = yaffs_file_flush, ++ .fsync = yaffs_sync_object, ++ .splice_read = generic_file_splice_read, ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0) ++ .splice_write = iter_file_splice_write, ++#else ++ .splice_write = generic_file_splice_write, ++#endif ++ .llseek = generic_file_llseek, ++}; ++ ++#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18)) ++ ++static const struct file_operations yaffs_file_operations = { ++ .read = do_sync_read, ++ .write = do_sync_write, ++ .aio_read = generic_file_aio_read, ++ .aio_write = generic_file_aio_write, ++ .mmap = generic_file_mmap, ++ .flush = yaffs_file_flush, ++ .fsync = yaffs_sync_object, ++ .sendfile = generic_file_sendfile, ++}; ++ ++#else ++ ++static const struct file_operations yaffs_file_operations = { ++ .read = generic_file_read, ++ .write = generic_file_write, ++ .mmap = generic_file_mmap, ++ .flush = yaffs_file_flush, ++ .fsync = yaffs_sync_object, ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) ++ .sendfile = generic_file_sendfile, ++#endif ++}; ++#endif ++ ++ ++ ++ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)) ++static void zero_user_segment(struct page *page, unsigned start, unsigned end) ++{ ++ void *kaddr = kmap_atomic(page, KM_USER0); ++ memset(kaddr + start, 0, end - start); ++ kunmap_atomic(kaddr, KM_USER0); ++ flush_dcache_page(page); ++} ++#endif ++ ++ ++static int yaffs_vfs_setsize(struct inode *inode, loff_t newsize) ++{ ++#ifdef YAFFS_USE_TRUNCATE_SETSIZE ++ truncate_setsize(inode, newsize); ++ return 0; ++#else ++ truncate_inode_pages(&inode->i_data, newsize); ++ return 0; ++#endif ++ ++} ++ ++ ++static int yaffs_vfs_setattr(struct inode *inode, struct iattr *attr) ++{ ++#ifdef YAFFS_USE_SETATTR_COPY ++ setattr_copy(inode, attr); ++ return 0; ++#else ++ return inode_setattr(inode, attr); ++#endif ++ ++} ++ ++static int yaffs_setattr(struct dentry *dentry, struct iattr *attr) ++{ ++ struct inode *inode = dentry->d_inode; ++ int error = 0; ++ struct yaffs_dev *dev; ++ ++ yaffs_trace(YAFFS_TRACE_OS, ++ "yaffs_setattr of object %d", ++ yaffs_inode_to_obj(inode)->obj_id); ++#if 0 ++ /* Fail if a requested resize >= 2GB */ ++ if (attr->ia_valid & ATTR_SIZE && (attr->ia_size >> 31)) ++ error = -EINVAL; ++#endif ++ ++ if (error == 0) ++ error = setattr_prepare(dentry, attr); ++ if (error == 0) { ++ int result; ++ if (!error) { ++ error = yaffs_vfs_setattr(inode, attr); ++ yaffs_trace(YAFFS_TRACE_OS, "inode_setattr called"); ++ if (attr->ia_valid & ATTR_SIZE) { ++ yaffs_vfs_setsize(inode, attr->ia_size); ++ inode->i_blocks = (inode->i_size + 511) >> 9; ++ } ++ } ++ dev = yaffs_inode_to_obj(inode)->my_dev; ++ if (attr->ia_valid & ATTR_SIZE) { ++ yaffs_trace(YAFFS_TRACE_OS, ++ "resize to %d(%x)", ++ (int)(attr->ia_size), ++ (int)(attr->ia_size)); ++ } ++ yaffs_gross_lock(dev); ++ result = yaffs_set_attribs(yaffs_inode_to_obj(inode), attr); ++ if (result == YAFFS_OK) { ++ error = 0; ++ } else { ++ error = -EPERM; ++ } ++ yaffs_gross_unlock(dev); ++ ++ } ++ ++ yaffs_trace(YAFFS_TRACE_OS, "yaffs_setattr done returning %d", error); ++ ++ return error; ++} ++ ++#ifdef YAFFS_USE_XATTR ++#if (YAFFS_NEW_XATTR > 0) ++static int yaffs_setxattr(struct dentry *dentry, struct inode *inode, ++ const char *name, const void *value, size_t size, int flags) ++{ ++#else ++static int yaffs_setxattr(struct dentry *dentry, const char *name, ++ const void *value, size_t size, int flags) ++{ ++ struct inode *inode = dentry->d_inode; ++#endif ++ int error = 0; ++ struct yaffs_dev *dev; ++ struct yaffs_obj *obj = yaffs_inode_to_obj(inode); ++ ++ yaffs_trace(YAFFS_TRACE_OS, "yaffs_setxattr of object %d", obj->obj_id); ++ ++ if (error == 0) { ++ int result; ++ dev = obj->my_dev; ++ yaffs_gross_lock(dev); ++ result = yaffs_set_xattrib(obj, name, value, size, flags); ++ if (result == YAFFS_OK) ++ error = 0; ++ else if (result < 0) ++ error = result; ++ yaffs_gross_unlock(dev); ++ ++ } ++ yaffs_trace(YAFFS_TRACE_OS, "yaffs_setxattr done returning %d", error); ++ ++ return error; ++} ++ ++#if (YAFFS_NEW_XATTR > 0) ++static ssize_t yaffs_getxattr(struct dentry * dentry, struct inode *inode, ++ const char *name, void *buff, size_t size) ++{ ++#else ++static ssize_t yaffs_getxattr(struct dentry * dentry, const char *name, ++ void *buff, size_t size) ++{ ++ struct inode *inode = dentry->d_inode; ++#endif ++ int error = 0; ++ struct yaffs_dev *dev; ++ struct yaffs_obj *obj = yaffs_inode_to_obj(inode); ++ ++ yaffs_trace(YAFFS_TRACE_OS, ++ "yaffs_getxattr \"%s\" from object %d", ++ name, obj->obj_id); ++ ++ if (error == 0) { ++ dev = obj->my_dev; ++ yaffs_gross_lock(dev); ++ error = yaffs_get_xattrib(obj, name, buff, size); ++ yaffs_gross_unlock(dev); ++ ++ } ++ yaffs_trace(YAFFS_TRACE_OS, "yaffs_getxattr done returning %d", error); ++ ++ return error; ++} ++ ++static int yaffs_removexattr(struct dentry *dentry, const char *name) ++{ ++ struct inode *inode = dentry->d_inode; ++ int error = 0; ++ struct yaffs_dev *dev; ++ struct yaffs_obj *obj = yaffs_inode_to_obj(inode); ++ ++ yaffs_trace(YAFFS_TRACE_OS, ++ "yaffs_removexattr of object %d", obj->obj_id); ++ ++ if (error == 0) { ++ int result; ++ dev = obj->my_dev; ++ yaffs_gross_lock(dev); ++ result = yaffs_remove_xattrib(obj, name); ++ if (result == YAFFS_OK) ++ error = 0; ++ else if (result < 0) ++ error = result; ++ yaffs_gross_unlock(dev); ++ ++ } ++ yaffs_trace(YAFFS_TRACE_OS, ++ "yaffs_removexattr done returning %d", error); ++ ++ return error; ++} ++#endif ++ ++static ssize_t yaffs_listxattr(struct dentry * dentry, char *buff, size_t size) ++{ ++ struct inode *inode = dentry->d_inode; ++ int error = 0; ++ struct yaffs_dev *dev; ++ struct yaffs_obj *obj = yaffs_inode_to_obj(inode); ++ ++ yaffs_trace(YAFFS_TRACE_OS, ++ "yaffs_listxattr of object %d", obj->obj_id); ++ ++ if (error == 0) { ++ dev = obj->my_dev; ++ yaffs_gross_lock(dev); ++ error = yaffs_list_xattrib(obj, buff, size); ++ yaffs_gross_unlock(dev); ++ ++ } ++ yaffs_trace(YAFFS_TRACE_OS, ++ "yaffs_listxattr done returning %d", error); ++ ++ return error; ++} ++ ++ ++static const struct inode_operations yaffs_file_inode_operations = { ++ .setattr = yaffs_setattr, ++#ifdef YAFFS_USE_XATTR ++ .setxattr = yaffs_setxattr, ++ .getxattr = yaffs_getxattr, ++ .removexattr = yaffs_removexattr, ++#endif ++ .listxattr = yaffs_listxattr, ++}; ++ ++ ++static int yaffs_readlink(struct dentry *dentry, char __user * buffer, ++ int buflen) ++{ ++ unsigned char *alias; ++ int ret; ++ ++ struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev; ++ ++ yaffs_gross_lock(dev); ++ ++ alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry)); ++ ++ yaffs_gross_unlock(dev); ++ ++ if (!alias) ++ return -ENOMEM; ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 15, 0) ++ ret = vfs_readlink(dentry, buffer, buflen, alias); ++#else ++ ret = readlink_copy(buffer, buflen, alias); ++#endif ++ kfree(alias); ++ return ret; ++} ++ ++#if (YAFFS_NEW_GET_LINK == 0) ++#if (YAFFS_NEW_FOLLOW_LINK == 1) ++static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd) ++{ ++ void *ret; ++#else ++static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd) ++{ ++ int ret ++#endif ++ unsigned char *alias; ++ int ret_int = 0; ++ struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev; ++ ++ yaffs_gross_lock(dev); ++ ++ alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry)); ++ yaffs_gross_unlock(dev); ++ ++ if (!alias) { ++ ret_int = -ENOMEM; ++ goto out; ++ } ++#if (YAFFS_NEW_FOLLOW_LINK == 1) ++ nd_set_link(nd, alias); ++ ret = alias; ++out: ++ if (ret_int) ++ ret = ERR_PTR(ret_int); ++ return ret; ++#else ++ ret = vfs_follow_link(nd, alias); ++ kfree(alias); ++out: ++ if (ret_int) ++ ret = ret_int; ++ return ret; ++#endif ++} ++#else ++static const char *yaffs_get_link(struct dentry *dentry, struct inode *inode, struct delayed_call *done) ++{ ++ unsigned char *alias; ++ struct yaffs_dev *dev; ++ ++ if (!dentry) ++ return ERR_PTR(-ECHILD); ++ ++ dev = yaffs_dentry_to_obj(dentry)->my_dev; ++ ++ yaffs_gross_lock(dev); ++ ++ alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry)); ++ yaffs_gross_unlock(dev); ++ ++ if (!alias) ++ return ERR_PTR(-ENOMEM); ++ set_delayed_call(done, kfree_link, alias); ++ return alias; ++} ++#endif ++ ++#ifdef YAFFS_HAS_PUT_INODE ++ ++/* For now put inode is just for debugging ++ * Put inode is called when the inode **structure** is put. ++ */ ++static void yaffs_put_inode(struct inode *inode) ++{ ++ yaffs_trace(YAFFS_TRACE_OS, ++ "yaffs_put_inode: ino %d, count %d"), ++ (int)inode->i_ino, atomic_read(&inode->i_count); ++ ++} ++#endif ++ ++#if (YAFFS_NEW_FOLLOW_LINK == 1) ++void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias) ++{ ++ kfree(alias); ++} ++#endif ++ ++static const struct inode_operations yaffs_symlink_inode_operations = { ++ .readlink = yaffs_readlink, ++#if (YAFFS_NEW_GET_LINK == 1) ++ .get_link = yaffs_get_link, ++#else ++ .follow_link = yaffs_follow_link, ++#endif ++#if (YAFFS_NEW_FOLLOW_LINK == 1) ++ .put_link = yaffs_put_link, ++#endif ++ .setattr = yaffs_setattr, ++#ifdef YAFFS_USE_XATTR ++ .setxattr = yaffs_setxattr, ++ .getxattr = yaffs_getxattr, ++ .removexattr = yaffs_removexattr, ++#endif ++ .listxattr = yaffs_listxattr, ++}; ++ ++#ifdef YAFFS_USE_OWN_IGET + +static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino) +{ @@ -10793,6 +12557,7 @@ index 0000000..145517b + yaffs_gross_lock(dev); + + obj = yaffs_find_by_number(dev, inode->i_ino); ++ + yaffs_fill_inode_from_obj(inode, obj); + + yaffs_gross_unlock(dev); @@ -10801,6 +12566,36 @@ index 0000000..145517b + return inode; +} + ++#else ++ ++static void yaffs_read_inode(struct inode *inode) ++{ ++ /* NB This is called as a side effect of other functions, but ++ * we had to release the lock to prevent deadlocks, so ++ * need to lock again. ++ */ ++ ++ struct yaffs_obj *obj; ++ struct yaffs_dev *dev = yaffs_super_to_dev(inode->i_sb); ++ ++ yaffs_trace(YAFFS_TRACE_OS, ++ "yaffs_read_inode for %d", (int)inode->i_ino); ++ ++ if (current != yaffs_dev_to_lc(dev)->readdir_process) ++ yaffs_gross_lock(dev); ++ ++ obj = yaffs_find_by_number(dev, inode->i_ino); ++ ++ yaffs_fill_inode_from_obj(inode, obj); ++ ++ if (current != yaffs_dev_to_lc(dev)->readdir_process) ++ yaffs_gross_unlock(dev); ++} ++ ++#endif ++ ++ ++ +struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev, + struct yaffs_obj *obj) +{ @@ -10821,10 +12616,9 @@ index 0000000..145517b + } + + yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_get_inode for object %d", -+ obj->obj_id); ++ "yaffs_get_inode for object %d", obj->obj_id); + -+ inode = yaffs_iget(sb, obj->obj_id); ++ inode = Y_IGET(sb, obj->obj_id); + if (IS_ERR(inode)) + return NULL; + @@ -10835,32 +12629,68 @@ index 0000000..145517b + return inode; +} + ++ ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) ++#define YCRED(x) x ++#else ++#define YCRED(x) (x->cred) ++#endif ++ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,14,0) ++#define YPROC_uid(p) (YCRED(p)->fsuid) ++#define YPROC_gid(p) (YCRED(p)->fsgid) ++#define EXTRACT_gid(x) x ++#define EXTRACT_uid(x) x ++#define MAKE_gid(x) x ++#define MAKE_uid(x) x ++#else ++#define YPROC_uid(p) from_kuid(&init_user_ns, YCRED(p)->fsuid) ++#define YPROC_gid(p) from_kgid(&init_user_ns, YCRED(p)->fsgid) ++#define EXTRACT_gid(x) from_kgid(&init_user_ns, x) ++#define EXTRACT_uid(x) from_kuid(&init_user_ns, x) ++#define MAKE_gid(x) make_kgid(&init_user_ns, x) ++#define MAKE_uid(x) make_kuid(&init_user_ns, x) ++#endif ++ ++ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) ++static int yaffs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, ++ dev_t rdev) ++#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) +static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, + dev_t rdev) ++#else ++static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, ++ int rdev) ++#endif +{ + struct inode *inode; ++ + struct yaffs_obj *obj = NULL; + struct yaffs_dev *dev; ++ + struct yaffs_obj *parent = yaffs_inode_to_obj(dir); -+ int error; -+ uid_t uid = current->cred->fsuid; ++ ++ int error = -ENOSPC; ++ uid_t uid = YPROC_uid(current); + gid_t gid = -+ (dir->i_mode & S_ISGID) ? dir->i_gid : current->cred->fsgid; ++ (dir->i_mode & S_ISGID) ? EXTRACT_gid(dir->i_gid) : YPROC_gid(current); + + if ((dir->i_mode & S_ISGID) && S_ISDIR(mode)) + mode |= S_ISGID; + -+ if (!parent) { ++ if (parent) { ++ yaffs_trace(YAFFS_TRACE_OS, ++ "yaffs_mknod: parent object %d type %d", ++ parent->obj_id, parent->variant_type); ++ } else { + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_mknod: could not get parent object"); + return -EPERM; + } + + yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_mknod: parent object %d type %d", -+ parent->obj_id, parent->variant_type); -+ -+ yaffs_trace(YAFFS_TRACE_OS, + "yaffs_mknod: making oject for %s, mode %x dev %x", + dentry->d_name.name, mode, rdev); + @@ -10868,18 +12698,19 @@ index 0000000..145517b + + yaffs_gross_lock(dev); + -+ if (yaffs_get_n_free_chunks(dev) < 1) { -+ error = -ENOSPC; -+ goto err_out; -+ } -+ + switch (mode & S_IFMT) { + default: + /* Special (socket, fifo, device...) */ + yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod: making special"); ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) + obj = + yaffs_create_special(parent, dentry->d_name.name, mode, uid, + gid, old_encode_dev(rdev)); ++#else ++ obj = ++ yaffs_create_special(parent, dentry->d_name.name, mode, uid, ++ gid, rdev); ++#endif + break; + case S_IFREG: /* file */ + yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod: making file"); @@ -10897,42 +12728,105 @@ index 0000000..145517b + break; + } + -+ if (!obj) { -+ error = -ENOMEM; -+ goto err_out; -+ } -+ + /* Can not call yaffs_get_inode() with gross lock held */ + yaffs_gross_unlock(dev); + ++ if (obj) { ++ inode = yaffs_get_inode(dir->i_sb, mode, rdev, obj); ++ d_instantiate(dentry, inode); ++ update_dir_time(dir); ++ yaffs_trace(YAFFS_TRACE_OS, ++ "yaffs_mknod created object %d count = %d", ++ obj->obj_id, atomic_read(&inode->i_count)); ++ error = 0; ++ yaffs_fill_inode_from_obj(dir, parent); ++ } else { ++ yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod failed making object"); ++ error = -ENOMEM; ++ } + -+ inode = yaffs_get_inode(dir->i_sb, mode, rdev, obj); -+ d_instantiate(dentry, inode); -+ update_dir_time(dir); -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_mknod created object %d count = %d", -+ obj->obj_id, atomic_read(&inode->i_count)); -+ yaffs_fill_inode_from_obj(dir, parent); -+ return 0; -+ -+err_out: -+ yaffs_gross_unlock(dev); -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod error %d", error); + return error; -+ +} + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) ++static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) ++#else +static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode) ++#endif +{ -+ return yaffs_mknod(dir, dentry, mode | S_IFDIR, 0); ++ int ret_val; ++ yaffs_trace(YAFFS_TRACE_OS, "yaffs_mkdir"); ++ ret_val = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0); ++ return ret_val; +} + ++ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) ++static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode, ++ bool dummy) ++#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) ++static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode, ++ struct nameidata *n) ++#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) +static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode, + struct nameidata *n) ++#else ++static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode) ++#endif +{ ++ yaffs_trace(YAFFS_TRACE_OS, "yaffs_create"); + return yaffs_mknod(dir, dentry, mode | S_IFREG, 0); +} + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) ++static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry, ++ unsigned int dummy) ++#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) ++static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry, ++ struct nameidata *n) ++#else ++static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry) ++#endif ++{ ++ struct yaffs_obj *obj; ++ struct inode *inode = NULL; /* NCB 2.5/2.6 needs NULL here */ ++ ++ struct yaffs_dev *dev = yaffs_inode_to_obj(dir)->my_dev; ++ ++ if (current != yaffs_dev_to_lc(dev)->readdir_process) ++ yaffs_gross_lock(dev); ++ ++ yaffs_trace(YAFFS_TRACE_OS, "yaffs_lookup for %d:%s", ++ yaffs_inode_to_obj(dir)->obj_id, dentry->d_name.name); ++ ++ obj = yaffs_find_by_name(yaffs_inode_to_obj(dir), dentry->d_name.name); ++ ++ obj = yaffs_get_equivalent_obj(obj); /* in case it was a hardlink */ ++ ++ /* Can't hold gross lock when calling yaffs_get_inode() */ ++ if (current != yaffs_dev_to_lc(dev)->readdir_process) ++ yaffs_gross_unlock(dev); ++ ++ if (obj) { ++ yaffs_trace(YAFFS_TRACE_OS, ++ "yaffs_lookup found %d", obj->obj_id); ++ ++ inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj); ++ } else { ++ yaffs_trace(YAFFS_TRACE_OS, "yaffs_lookup not found"); ++ ++ } ++ ++/* added NCB for 2.5/6 compatability - forces add even if inode is ++ * NULL which creates dentry hash */ ++ d_add(dentry, inode); ++ ++ return NULL; ++} ++ ++/* ++ * Create a link... ++ */ +static int yaffs_link(struct dentry *old_dentry, struct inode *dir, + struct dentry *dentry) +{ @@ -10978,10 +12872,9 @@ index 0000000..145517b +{ + struct yaffs_obj *obj; + struct yaffs_dev *dev; -+ struct inode *inode; -+ uid_t uid = current->cred->fsuid; ++ uid_t uid = YPROC_uid(current); + gid_t gid = -+ (dir->i_mode & S_ISGID) ? dir->i_gid : current->cred->fsgid; ++ (dir->i_mode & S_ISGID) ? EXTRACT_gid(dir->i_gid) : YPROC_gid(current); + + yaffs_trace(YAFFS_TRACE_OS, "yaffs_symlink"); + @@ -10999,116 +12892,33 @@ index 0000000..145517b + S_IFLNK | S_IRWXUGO, uid, gid, symname); + yaffs_gross_unlock(dev); + -+ if (!obj) { -+ yaffs_trace(YAFFS_TRACE_OS, "symlink not created"); -+ return -ENOMEM; -+ } -+ -+ inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj); -+ d_instantiate(dentry, inode); -+ update_dir_time(dir); -+ yaffs_trace(YAFFS_TRACE_OS, "symlink created OK"); -+ -+ return 0; -+} -+ -+static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry, -+ struct nameidata *n) -+{ -+ struct yaffs_obj *obj; -+ struct inode *inode = NULL; -+ struct yaffs_dev *dev = yaffs_inode_to_obj(dir)->my_dev; -+ -+ if (current != yaffs_dev_to_lc(dev)->readdir_process) -+ yaffs_gross_lock(dev); -+ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_lookup for %d:%s", -+ yaffs_inode_to_obj(dir)->obj_id, dentry->d_name.name); -+ -+ obj = yaffs_find_by_name(yaffs_inode_to_obj(dir), dentry->d_name.name); -+ -+ obj = yaffs_get_equivalent_obj(obj); /* in case it was a hardlink */ -+ -+ /* Can't hold gross lock when calling yaffs_get_inode() */ -+ if (current != yaffs_dev_to_lc(dev)->readdir_process) -+ yaffs_gross_unlock(dev); -+ + if (obj) { -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_lookup found %d", obj->obj_id); ++ struct inode *inode; + + inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj); -+ -+ if (inode) { -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_loookup dentry"); -+ d_add(dentry, inode); -+ /* return dentry; */ -+ return NULL; -+ } -+ -+ } else { -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_lookup not found"); -+ -+ } -+ -+ d_add(dentry, inode); -+ -+ return NULL; -+} -+ -+static int yaffs_unlink(struct inode *dir, struct dentry *dentry) -+{ -+ int ret_val; -+ struct yaffs_dev *dev; -+ struct yaffs_obj *obj; -+ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_unlink %d:%s", -+ (int)(dir->i_ino), dentry->d_name.name); -+ obj = yaffs_inode_to_obj(dir); -+ dev = obj->my_dev; -+ -+ yaffs_gross_lock(dev); -+ -+ ret_val = yaffs_unlinker(obj, dentry->d_name.name); -+ -+ if (ret_val == YAFFS_OK) { -+ inode_dec_link_count(dentry->d_inode); -+ dir->i_version++; -+ yaffs_gross_unlock(dev); ++ d_instantiate(dentry, inode); + update_dir_time(dir); ++ yaffs_trace(YAFFS_TRACE_OS, "symlink created OK"); + return 0; ++ } else { ++ yaffs_trace(YAFFS_TRACE_OS, "symlink not created"); + } -+ yaffs_gross_unlock(dev); -+ return -ENOTEMPTY; -+} -+ -+static int yaffs_sync_object(struct file *file, -+ loff_t start, loff_t end, int datasync) -+{ -+ -+ struct yaffs_obj *obj; -+ struct yaffs_dev *dev; -+ struct dentry *dentry = file->f_path.dentry; -+ -+ obj = yaffs_dentry_to_obj(dentry); + -+ dev = obj->my_dev; -+ -+ yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC, "yaffs_sync_object"); -+ yaffs_gross_lock(dev); -+ yaffs_flush_file(obj, 1, datasync); -+ yaffs_gross_unlock(dev); -+ return 0; ++ return -ENOMEM; +} ++ +/* + * The VFS layer already does all the dentry stuff for rename. + * + * NB: POSIX says you can rename an object over an old object of the same name + */ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 9, 0)) ++static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry, ++ struct inode *new_dir, struct dentry *new_dentry, unsigned int unused) ++#else +static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry, + struct inode *new_dir, struct dentry *new_dentry) ++#endif +{ + struct yaffs_dev *dev; + int ret_val = YAFFS_FAIL; @@ -11153,133 +12963,41 @@ index 0000000..145517b + } +} + -+static int yaffs_setattr(struct dentry *dentry, struct iattr *attr) -+{ -+ struct inode *inode = dentry->d_inode; -+ int error = 0; -+ struct yaffs_dev *dev; -+ int result; -+ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_setattr of object %d", -+ yaffs_inode_to_obj(inode)->obj_id); -+ -+ /* Fail if a requested resize >= 2GB */ -+ if (attr->ia_valid & ATTR_SIZE && (attr->ia_size >> 31)) -+ error = -EINVAL; -+ -+ if (!error) -+ error = inode_change_ok(inode, attr); + -+ if (!error) { -+ setattr_copy(inode, attr); -+ yaffs_trace(YAFFS_TRACE_OS, "inode_setattr called"); -+ if (attr->ia_valid & ATTR_SIZE) { -+ truncate_setsize(inode, attr->ia_size); -+ inode->i_blocks = (inode->i_size + 511) >> 9; -+ } -+ dev = yaffs_inode_to_obj(inode)->my_dev; -+ if (attr->ia_valid & ATTR_SIZE) { -+ yaffs_trace(YAFFS_TRACE_OS, "resize to %d(%x)", -+ (int)(attr->ia_size), -+ (int)(attr->ia_size)); -+ } + -+ yaffs_gross_lock(dev); -+ result = yaffs_set_attribs(yaffs_inode_to_obj(inode), attr); -+ if (result != YAFFS_OK) -+ error = -EPERM; -+ yaffs_gross_unlock(dev); -+ } + -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_setattr done returning %d", error); -+ -+ return error; -+} -+ -+static int yaffs_setxattr(struct dentry *dentry, const char *name, -+ const void *value, size_t size, int flags) ++static int yaffs_unlink(struct inode *dir, struct dentry *dentry) +{ -+ struct inode *inode = dentry->d_inode; -+ int error; -+ struct yaffs_dev *dev; -+ struct yaffs_obj *obj = yaffs_inode_to_obj(inode); -+ -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_setxattr of object %d", obj->obj_id); -+ -+ dev = obj->my_dev; -+ yaffs_gross_lock(dev); -+ error = yaffs_set_xattrib(obj, name, value, size, flags); -+ yaffs_gross_unlock(dev); -+ -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_setxattr done returning %d", error); -+ -+ return error; -+} ++ int ret_val; + -+static ssize_t yaffs_getxattr(struct dentry *dentry, const char *name, -+ void *buff, size_t size) -+{ -+ struct inode *inode = dentry->d_inode; -+ int error; + struct yaffs_dev *dev; -+ struct yaffs_obj *obj = yaffs_inode_to_obj(inode); -+ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_getxattr \"%s\" from object %d", -+ name, obj->obj_id); ++ struct yaffs_obj *obj; + ++ yaffs_trace(YAFFS_TRACE_OS, "yaffs_unlink %d:%s", ++ (int)(dir->i_ino), dentry->d_name.name); ++ obj = yaffs_inode_to_obj(dir); + dev = obj->my_dev; -+ yaffs_gross_lock(dev); -+ error = yaffs_get_xattrib(obj, name, buff, size); -+ yaffs_gross_unlock(dev); -+ -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_getxattr done returning %d", error); + -+ return error; -+} -+ -+static int yaffs_removexattr(struct dentry *dentry, const char *name) -+{ -+ struct inode *inode = dentry->d_inode; -+ int error; -+ struct yaffs_dev *dev; -+ struct yaffs_obj *obj = yaffs_inode_to_obj(inode); -+ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_removexattr of object %d", obj->obj_id); -+ -+ dev = obj->my_dev; + yaffs_gross_lock(dev); -+ error = yaffs_remove_xattrib(obj, name); -+ yaffs_gross_unlock(dev); -+ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_removexattr done returning %d", error); -+ -+ return error; -+} -+ -+static ssize_t yaffs_listxattr(struct dentry *dentry, char *buff, size_t size) -+{ -+ struct inode *inode = dentry->d_inode; -+ int error; -+ struct yaffs_dev *dev; -+ struct yaffs_obj *obj = yaffs_inode_to_obj(inode); + -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_listxattr of object %d", obj->obj_id); ++ ret_val = yaffs_unlinker(obj, dentry->d_name.name); + -+ dev = obj->my_dev; -+ yaffs_gross_lock(dev); -+ error = yaffs_list_xattrib(obj, buff, size); ++ if (ret_val == YAFFS_OK) { ++ inode_dec_link_count(dentry->d_inode); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 16, 0)) ++ inode_inc_iversion(dir); ++#else ++ dir->i_version++; ++#endif ++ yaffs_gross_unlock(dev); ++ update_dir_time(dir); ++ return 0; ++ } + yaffs_gross_unlock(dev); ++ return -ENOTEMPTY; ++} + -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_listxattr done returning %d", error); + -+ return error; -+} + +static const struct inode_operations yaffs_dir_inode_operations = { + .create = yaffs_create, @@ -11292,11 +13010,14 @@ index 0000000..145517b + .mknod = yaffs_mknod, + .rename = yaffs_rename, + .setattr = yaffs_setattr, ++ .listxattr = yaffs_listxattr, ++#ifdef YAFFS_USE_XATTR + .setxattr = yaffs_setxattr, + .getxattr = yaffs_getxattr, -+ .listxattr = yaffs_listxattr, + .removexattr = yaffs_removexattr, ++#endif +}; ++ +/*-----------------------------------------------------------------*/ +/* Directory search context allows us to unlock access to yaffs during + * filldir without causing problems with the directory being modified. @@ -11334,21 +13055,18 @@ index 0000000..145517b + struct yaffs_dev *dev = dir->my_dev; + struct yaffs_search_context *sc = + kmalloc(sizeof(struct yaffs_search_context), GFP_NOFS); -+ -+ if (!sc) -+ return NULL; -+ -+ sc->dir_obj = dir; -+ sc->dev = dev; -+ if (list_empty(&sc->dir_obj->variant.dir_variant.children)) -+ sc->next_return = NULL; -+ else -+ sc->next_return = -+ list_entry(dir->variant.dir_variant.children.next, -+ struct yaffs_obj, siblings); -+ INIT_LIST_HEAD(&sc->others); -+ list_add(&sc->others, &(yaffs_dev_to_lc(dev)->search_contexts)); -+ ++ if (sc) { ++ sc->dir_obj = dir; ++ sc->dev = dev; ++ if (list_empty(&sc->dir_obj->variant.dir_variant.children)) ++ sc->next_return = NULL; ++ else ++ sc->next_return = ++ list_entry(dir->variant.dir_variant.children.next, ++ struct yaffs_obj, siblings); ++ INIT_LIST_HEAD(&sc->others); ++ list_add(&sc->others, &(yaffs_dev_to_lc(dev)->search_contexts)); ++ } + return sc; +} + @@ -11412,18 +13130,95 @@ index 0000000..145517b + +} + ++ ++/*-----------------------------------------------------------------*/ ++ ++#ifdef YAFFS_USE_DIR_ITERATE ++static int yaffs_iterate(struct file *f, struct dir_context *dc) ++{ ++ struct yaffs_obj *obj; ++ struct yaffs_dev *dev; ++ struct yaffs_search_context *sc; ++ unsigned long curoffs; ++ struct yaffs_obj *l; ++ int ret_val = 0; ++ ++ char name[YAFFS_MAX_NAME_LENGTH + 1]; ++ ++ obj = yaffs_dentry_to_obj(Y_GET_DENTRY(f)); ++ dev = obj->my_dev; ++ ++ yaffs_gross_lock(dev); ++ ++ yaffs_dev_to_lc(dev)->readdir_process = current; ++ ++ sc = yaffs_new_search(obj); ++ if (!sc) { ++ ret_val = -ENOMEM; ++ goto out; ++ } ++ ++ if (!dir_emit_dots(f, dc)) { ++ yaffs_gross_unlock(dev); ++ return 0; ++ } ++ ++ curoffs = 1; ++ ++ while (sc->next_return) { ++ curoffs++; ++ l = sc->next_return; ++ if (curoffs >= dc->pos) { ++ int this_inode = yaffs_get_obj_inode(l); ++ int this_type = yaffs_get_obj_type(l); ++ ++ yaffs_get_obj_name(l, name, YAFFS_MAX_NAME_LENGTH + 1); ++ yaffs_trace(YAFFS_TRACE_OS, ++ "yaffs_readdir: %s inode %d", ++ name, yaffs_get_obj_inode(l)); ++ ++ yaffs_gross_unlock(dev); ++ ++ if (!dir_emit(dc, ++ name, ++ strlen(name), ++ this_inode, ++ this_type)) { ++ yaffs_gross_lock(dev); ++ goto out; ++ } ++ ++ yaffs_gross_lock(dev); ++ ++ dc->pos++; ++ f->f_pos++; ++ } ++ yaffs_search_advance(sc); ++ } ++ ++out: ++ yaffs_search_end(sc); ++ yaffs_dev_to_lc(dev)->readdir_process = NULL; ++ yaffs_gross_unlock(dev); ++ ++ return ret_val; ++} ++ ++#else ++ +static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) +{ + struct yaffs_obj *obj; + struct yaffs_dev *dev; + struct yaffs_search_context *sc; -+ struct inode *inode = f->f_dentry->d_inode; ++ struct inode *inode = Y_GET_DENTRY(f)->d_inode; + unsigned long offset, curoffs; + struct yaffs_obj *l; + int ret_val = 0; ++ + char name[YAFFS_MAX_NAME_LENGTH + 1]; + -+ obj = yaffs_dentry_to_obj(f->f_dentry); ++ obj = yaffs_dentry_to_obj(Y_GET_DENTRY(f)); + dev = obj->my_dev; + + yaffs_gross_lock(dev); @@ -11518,52 +13313,412 @@ index 0000000..145517b + return ret_val; +} + ++#endif ++ +static const struct file_operations yaffs_dir_operations = { + .read = generic_read_dir, ++#ifdef YAFFS_USE_DIR_ITERATE ++ .iterate = yaffs_iterate, ++#else + .readdir = yaffs_readdir, ++#endif + .fsync = yaffs_sync_object, + .llseek = generic_file_llseek, +}; + ++static void yaffs_fill_inode_from_obj(struct inode *inode, ++ struct yaffs_obj *obj) ++{ ++ if (inode && obj) { + ++ /* Check mode against the variant type and attempt to repair if broken. */ ++ u32 mode = obj->yst_mode; ++ switch (obj->variant_type) { ++ case YAFFS_OBJECT_TYPE_FILE: ++ if (!S_ISREG(mode)) { ++ obj->yst_mode &= ~S_IFMT; ++ obj->yst_mode |= S_IFREG; ++ } + -+static int yaffs_file_flush(struct file *file, fl_owner_t id) ++ break; ++ case YAFFS_OBJECT_TYPE_SYMLINK: ++ if (!S_ISLNK(mode)) { ++ obj->yst_mode &= ~S_IFMT; ++ obj->yst_mode |= S_IFLNK; ++ } ++ ++ break; ++ case YAFFS_OBJECT_TYPE_DIRECTORY: ++ if (!S_ISDIR(mode)) { ++ obj->yst_mode &= ~S_IFMT; ++ obj->yst_mode |= S_IFDIR; ++ } ++ ++ break; ++ case YAFFS_OBJECT_TYPE_UNKNOWN: ++ case YAFFS_OBJECT_TYPE_HARDLINK: ++ case YAFFS_OBJECT_TYPE_SPECIAL: ++ default: ++ /* TODO? */ ++ break; ++ } ++ ++ inode->i_flags |= S_NOATIME; ++ ++ inode->i_ino = obj->obj_id; ++ inode->i_mode = obj->yst_mode; ++ inode->i_uid = MAKE_uid(obj->yst_uid); ++ inode->i_gid = MAKE_gid(obj->yst_gid); ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)) ++ inode->i_blksize = inode->i_sb->s_blocksize; ++#endif ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) ++ ++ inode->i_rdev = old_decode_dev(obj->yst_rdev); ++ inode->i_atime.tv_sec = (time_t) (obj->yst_atime); ++ inode->i_atime.tv_nsec = 0; ++ inode->i_mtime.tv_sec = (time_t) obj->yst_mtime; ++ inode->i_mtime.tv_nsec = 0; ++ inode->i_ctime.tv_sec = (time_t) obj->yst_ctime; ++ inode->i_ctime.tv_nsec = 0; ++#else ++ inode->i_rdev = obj->yst_rdev; ++ inode->i_atime = obj->yst_atime; ++ inode->i_mtime = obj->yst_mtime; ++ inode->i_ctime = obj->yst_ctime; ++#endif ++ inode->i_size = yaffs_get_obj_length(obj); ++ inode->i_blocks = (inode->i_size + 511) >> 9; ++ ++ set_nlink(inode, yaffs_get_obj_link_count(obj)); ++ ++ yaffs_trace(YAFFS_TRACE_OS, ++ "yaffs_fill_inode mode %x uid %d gid %d size %lld count %d", ++ inode->i_mode, obj->yst_uid, obj->yst_gid, ++ inode->i_size, atomic_read(&inode->i_count)); ++ ++ switch (obj->yst_mode & S_IFMT) { ++ default: /* fifo, device or socket */ ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) ++ init_special_inode(inode, obj->yst_mode, ++ old_decode_dev(obj->yst_rdev)); ++#else ++ init_special_inode(inode, obj->yst_mode, ++ (dev_t) (obj->yst_rdev)); ++#endif ++ break; ++ case S_IFREG: /* file */ ++ inode->i_op = &yaffs_file_inode_operations; ++ inode->i_fop = &yaffs_file_operations; ++ inode->i_mapping->a_ops = ++ &yaffs_file_address_operations; ++ break; ++ case S_IFDIR: /* directory */ ++ inode->i_op = &yaffs_dir_inode_operations; ++ inode->i_fop = &yaffs_dir_operations; ++ break; ++ case S_IFLNK: /* symlink */ ++ inode->i_op = &yaffs_symlink_inode_operations; ++ break; ++ } ++ ++ yaffs_inode_to_obj_lv(inode) = obj; ++ ++ obj->my_inode = inode; ++ ++ } else { ++ yaffs_trace(YAFFS_TRACE_OS, ++ "yaffs_fill_inode invalid parameters"); ++ } ++ ++} ++ ++ ++ ++/* ++ * yaffs background thread functions . ++ * yaffs_bg_thread_fn() the thread function ++ * yaffs_bg_start() launches the background thread. ++ * yaffs_bg_stop() cleans up the background thread. ++ * ++ * NB: ++ * The thread should only run after the yaffs is initialised ++ * The thread should be stopped before yaffs is unmounted. ++ * The thread should not do any writing while the fs is in read only. ++ */ ++ ++static unsigned yaffs_bg_gc_urgency(struct yaffs_dev *dev) +{ -+ struct yaffs_obj *obj = yaffs_dentry_to_obj(file->f_dentry); -+ struct yaffs_dev *dev = obj->my_dev; ++ unsigned erased_chunks = ++ dev->n_erased_blocks * dev->param.chunks_per_block; ++ struct yaffs_linux_context *context = yaffs_dev_to_lc(dev); ++ unsigned scattered = 0; /* Free chunks not in an erased block */ + -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_file_flush object %d (%s)", -+ obj->obj_id, obj->dirty ? "dirty" : "clean"); ++ if (erased_chunks < dev->n_free_chunks) ++ scattered = (dev->n_free_chunks - erased_chunks); ++ ++ if (!context->bg_running) ++ return 0; ++ else if (scattered < (dev->param.chunks_per_block * 2)) ++ return 0; ++ else if (erased_chunks > dev->n_free_chunks / 2) ++ return 0; ++ else if (erased_chunks > dev->n_free_chunks / 4) ++ return 1; ++ else ++ return 2; ++} ++ ++#ifdef YAFFS_COMPILE_BACKGROUND ++ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)) ++struct timer_struct { ++ struct task_struct *task; ++ struct timer_list timer; ++}; ++#endif ++ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)) ++static void yaffs_background_waker(struct timer_list *t) ++{ ++ struct timer_struct *ts = from_timer(ts, t, timer); ++ ++ wake_up_process(ts->task); ++} ++#else ++void yaffs_background_waker(unsigned long data) ++{ ++ wake_up_process((struct task_struct *)data); ++} ++#endif ++ ++static int yaffs_bg_thread_fn(void *data) ++{ ++ struct yaffs_dev *dev = (struct yaffs_dev *)data; ++ struct yaffs_linux_context *context = yaffs_dev_to_lc(dev); ++ unsigned long now = jiffies; ++ unsigned long next_dir_update = now; ++ unsigned long next_gc = now; ++ unsigned long expires; ++ unsigned int urgency; ++ ++ int gc_result; ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)) ++ struct timer_struct timer; ++#else ++ struct timer_list timer; ++#endif ++ ++ yaffs_trace(YAFFS_TRACE_BACKGROUND, ++ "yaffs_background starting for dev %p", (void *)dev); ++ ++#ifdef YAFFS_COMPILE_FREEZER ++ set_freezable(); ++#endif ++ while (context->bg_running) { ++ yaffs_trace(YAFFS_TRACE_BACKGROUND, "yaffs_background"); ++ ++ if (kthread_should_stop()) ++ break; ++ ++#ifdef YAFFS_COMPILE_FREEZER ++ if (try_to_freeze()) ++ continue; ++#endif ++ yaffs_gross_lock(dev); ++ ++ now = jiffies; ++ ++ if (time_after(now, next_dir_update) && yaffs_bg_enable) { ++ yaffs_update_dirty_dirs(dev); ++ next_dir_update = now + HZ; ++ } ++ ++ if (time_after(now, next_gc) && yaffs_bg_enable) { ++ if (!dev->is_checkpointed) { ++ urgency = yaffs_bg_gc_urgency(dev); ++ gc_result = yaffs_bg_gc(dev, urgency); ++ if (urgency > 1) ++ next_gc = now + HZ / 20 + 1; ++ else if (urgency > 0) ++ next_gc = now + HZ / 10 + 1; ++ else ++ next_gc = now + HZ * 2; ++ } else { ++ /* ++ * gc not running so set to next_dir_update ++ * to cut down on wake ups ++ */ ++ next_gc = next_dir_update; ++ } ++ } ++ yaffs_gross_unlock(dev); ++ expires = next_dir_update; ++ if (time_before(next_gc, expires)) ++ expires = next_gc; ++ if (time_before(expires, now)) ++ expires = now + HZ; ++ ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)) ++ Y_INIT_TIMER(&timer.timer, yaffs_background_waker); ++ timer.timer.expires = expires + 1; ++ timer.task = current; ++#else ++ Y_INIT_TIMER(&timer); ++ timer.expires = expires + 1; ++ timer.data = (unsigned long)current; ++ timer.function = yaffs_background_waker; ++#endif ++ ++ set_current_state(TASK_INTERRUPTIBLE); ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 15, 0)) ++ add_timer(&timer.timer); ++ schedule(); ++ del_timer_sync(&timer.timer); ++#else ++ add_timer(&timer); ++ schedule(); ++ del_timer_sync(&timer); ++#endif ++ } ++ ++ return 0; ++} ++ ++static int yaffs_bg_start(struct yaffs_dev *dev) ++{ ++ int retval = 0; ++ struct yaffs_linux_context *context = yaffs_dev_to_lc(dev); ++ ++ if (dev->read_only) ++ return -1; ++ ++ context->bg_running = 1; ++ ++ context->bg_thread = kthread_run(yaffs_bg_thread_fn, ++ (void *)dev, "yaffs-bg-%d", ++ context->mount_id); ++ ++ if (IS_ERR(context->bg_thread)) { ++ retval = PTR_ERR(context->bg_thread); ++ context->bg_thread = NULL; ++ context->bg_running = 0; ++ } ++ return retval; ++} ++ ++static void yaffs_bg_stop(struct yaffs_dev *dev) ++{ ++ struct yaffs_linux_context *ctxt = yaffs_dev_to_lc(dev); ++ ++ ctxt->bg_running = 0; ++ ++ if (ctxt->bg_thread) { ++ kthread_stop(ctxt->bg_thread); ++ ctxt->bg_thread = NULL; ++ } ++} ++#else ++static int yaffs_bg_thread_fn(void *data) ++{ ++ return 0; ++} ++ ++static int yaffs_bg_start(struct yaffs_dev *dev) ++{ ++ return 0; ++} ++ ++static void yaffs_bg_stop(struct yaffs_dev *dev) ++{ ++} ++#endif ++ ++ ++static void yaffs_flush_inodes(struct super_block *sb) ++{ ++ struct inode *iptr; ++ struct yaffs_obj *obj; ++ ++ list_for_each_entry(iptr, &sb->s_inodes, i_sb_list) { ++ obj = yaffs_inode_to_obj(iptr); ++ if (obj) { ++ yaffs_trace(YAFFS_TRACE_OS, ++ "flushing obj %d", ++ obj->obj_id); ++ yaffs_flush_file(obj, 1, 0, 0); ++ } ++ } ++} ++ ++static void yaffs_flush_super(struct super_block *sb, int do_checkpoint) ++{ ++ struct yaffs_dev *dev = yaffs_super_to_dev(sb); ++ if (!dev) ++ return; ++ ++ yaffs_flush_inodes(sb); ++ yaffs_update_dirty_dirs(dev); ++ yaffs_flush_whole_cache(dev, 1); ++ if (do_checkpoint) ++ yaffs_checkpoint_save(dev); ++} ++ ++static LIST_HEAD(yaffs_context_list); ++struct mutex yaffs_context_lock; ++ ++static void yaffs_put_super(struct super_block *sb) ++{ ++ struct yaffs_dev *dev = yaffs_super_to_dev(sb); ++ struct mtd_info *mtd = yaffs_dev_to_mtd(dev); ++ ++ yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_ALWAYS, ++ "yaffs_put_super"); ++ ++ yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND, ++ "Shutting down yaffs background thread"); ++ yaffs_bg_stop(dev); ++ yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND, ++ "yaffs background thread shut down"); + + yaffs_gross_lock(dev); + -+ yaffs_flush_file(obj, 1, 0); ++ yaffs_flush_super(sb, 1); ++ ++ yaffs_deinitialise(dev); + + yaffs_gross_unlock(dev); + -+ return 0; ++ mutex_lock(&yaffs_context_lock); ++ list_del_init(&(yaffs_dev_to_lc(dev)->context_list)); ++ mutex_unlock(&yaffs_context_lock); ++ ++ if (yaffs_dev_to_lc(dev)->spare_buffer) { ++ kfree(yaffs_dev_to_lc(dev)->spare_buffer); ++ yaffs_dev_to_lc(dev)->spare_buffer = NULL; ++ } ++ ++ kfree(dev); ++ ++ yaffs_put_mtd_device(mtd); ++ ++ yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_ALWAYS, ++ "yaffs_put_super done"); +} + -+static const struct file_operations yaffs_file_operations = { -+ .read = do_sync_read, -+ .write = do_sync_write, -+ .aio_read = generic_file_aio_read, -+ .aio_write = generic_file_aio_write, -+ .mmap = generic_file_mmap, -+ .flush = yaffs_file_flush, -+ .fsync = yaffs_sync_object, -+ .splice_read = generic_file_splice_read, -+ .splice_write = generic_file_splice_write, -+ .llseek = generic_file_llseek, -+}; + ++static unsigned yaffs_gc_control_callback(struct yaffs_dev *dev) ++{ ++ return yaffs_gc_control; ++} ++ ++ ++#ifdef YAFFS_COMPILE_EXPORTFS + -+/* ExportFS support */ +static struct inode *yaffs2_nfs_get_inode(struct super_block *sb, uint64_t ino, + uint32_t generation) +{ -+ return yaffs_iget(sb, ino); ++ return Y_IGET(sb, ino); +} + +static struct dentry *yaffs2_fh_to_dentry(struct super_block *sb, @@ -11598,7 +13753,7 @@ index 0000000..145517b + parent_obj = d_obj->parent; + if (parent_obj) { + parent_ino = yaffs_get_obj_inode(parent_obj); -+ inode = yaffs_iget(sb, parent_ino); ++ inode = Y_IGET(sb, parent_ino); + + if (IS_ERR(inode)) { + parent = ERR_CAST(inode); @@ -11611,6 +13766,7 @@ index 0000000..145517b + } + } + } ++ + return parent; +} + @@ -11624,57 +13780,7 @@ index 0000000..145517b + .get_parent = yaffs2_get_parent, +}; + -+ -+/*-----------------------------------------------------------------*/ -+ -+static int yaffs_readlink(struct dentry *dentry, char __user * buffer, -+ int buflen) -+{ -+ unsigned char *alias; -+ int ret; -+ struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev; -+ -+ yaffs_gross_lock(dev); -+ -+ alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry)); -+ -+ yaffs_gross_unlock(dev); -+ -+ if (!alias) -+ return -ENOMEM; -+ -+ ret = vfs_readlink(dentry, buffer, buflen, alias); -+ kfree(alias); -+ return ret; -+} -+ -+static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd) -+{ -+ unsigned char *alias; -+ void *ret; -+ struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev; -+ -+ yaffs_gross_lock(dev); -+ -+ alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry)); -+ yaffs_gross_unlock(dev); -+ -+ if (!alias) { -+ ret = ERR_PTR(-ENOMEM); -+ goto out; -+ } -+ -+ nd_set_link(nd, alias); -+ ret = (void *)alias; -+out: -+ return ret; -+} -+ -+void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias) -+{ -+ kfree(alias); -+} -+ ++#endif + +static void yaffs_unstitch_obj(struct inode *inode, struct yaffs_obj *obj) +{ @@ -11691,6 +13797,7 @@ index 0000000..145517b + yaffs_handle_defered_free(obj); +} + ++#ifdef YAFFS_HAS_EVICT_INODE +/* yaffs_evict_inode combines into one operation what was previously done in + * yaffs_clear_inode() and yaffs_delete_inode() + * @@ -11705,14 +13812,13 @@ index 0000000..145517b + + yaffs_trace(YAFFS_TRACE_OS, + "yaffs_evict_inode: ino %d, count %d %s", -+ (int)inode->i_ino, -+ atomic_read(&inode->i_count), ++ (int)inode->i_ino, atomic_read(&inode->i_count), + obj ? "object exists" : "null object"); + + if (!inode->i_nlink && !is_bad_inode(inode)) + deleteme = 1; + truncate_inode_pages(&inode->i_data, 0); -+ end_writeback(inode); ++ Y_CLEAR_INODE(inode); + + if (deleteme && obj) { + dev = obj->my_dev; @@ -11726,354 +13832,82 @@ index 0000000..145517b + yaffs_unstitch_obj(inode, obj); + yaffs_gross_unlock(dev); + } -+ -+} -+ -+static void yaffs_touch_super(struct yaffs_dev *dev) -+{ -+ struct super_block *sb = yaffs_dev_to_lc(dev)->super; -+ -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_touch_super() sb = %p", sb); -+ if (sb) -+ sb->s_dirt = 1; -+} -+ -+static int yaffs_readpage_nolock(struct file *f, struct page *pg) -+{ -+ /* Lifted from jffs2 */ -+ -+ struct yaffs_obj *obj; -+ unsigned char *pg_buf; -+ int ret; -+ struct yaffs_dev *dev; -+ loff_t pos = ((loff_t) pg->index) << PAGE_CACHE_SHIFT; -+ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_readpage_nolock at %lld, size %08x", -+ (long long)pos, -+ (unsigned)PAGE_CACHE_SIZE); -+ -+ -+ obj = yaffs_dentry_to_obj(f->f_dentry); -+ -+ dev = obj->my_dev; -+ -+ BUG_ON(!PageLocked(pg)); -+ -+ pg_buf = kmap(pg); -+ /* FIXME: Can kmap fail? */ -+ -+ yaffs_gross_lock(dev); -+ -+ ret = yaffs_file_rd(obj, pg_buf, pos, PAGE_CACHE_SIZE); -+ -+ yaffs_gross_unlock(dev); -+ -+ if (ret >= 0) -+ ret = 0; -+ -+ if (ret) { -+ ClearPageUptodate(pg); -+ SetPageError(pg); -+ } else { -+ SetPageUptodate(pg); -+ ClearPageError(pg); -+ } -+ -+ flush_dcache_page(pg); -+ kunmap(pg); -+ -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage_nolock done"); -+ return ret; -+} -+ -+static int yaffs_readpage_unlock(struct file *f, struct page *pg) -+{ -+ int ret = yaffs_readpage_nolock(f, pg); -+ -+ unlock_page(pg); -+ return ret; -+} -+ -+static int yaffs_readpage(struct file *f, struct page *pg) -+{ -+ int ret; -+ -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage"); -+ ret = yaffs_readpage_unlock(f, pg); -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage done"); -+ return ret; -+} -+ -+/* writepage inspired by/stolen from smbfs */ -+ -+static int yaffs_writepage(struct page *page, struct writeback_control *wbc) -+{ -+ struct yaffs_dev *dev; -+ struct address_space *mapping = page->mapping; -+ struct inode *inode; -+ unsigned long end_index; -+ char *buffer; -+ struct yaffs_obj *obj; -+ int n_written = 0; -+ unsigned n_bytes; -+ loff_t i_size; -+ -+ if (!mapping) -+ BUG(); -+ inode = mapping->host; -+ if (!inode) -+ BUG(); -+ i_size = i_size_read(inode); -+ -+ end_index = i_size >> PAGE_CACHE_SHIFT; -+ -+ if (page->index < end_index) -+ n_bytes = PAGE_CACHE_SIZE; -+ else { -+ n_bytes = i_size & (PAGE_CACHE_SIZE - 1); -+ -+ if (page->index > end_index || !n_bytes) { -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_writepage at %08x, inode size = %08x!!!", -+ (unsigned)(page->index << PAGE_CACHE_SHIFT), -+ (unsigned)inode->i_size); -+ yaffs_trace(YAFFS_TRACE_OS, -+ " -> don't care!!"); -+ -+ zero_user_segment(page, 0, PAGE_CACHE_SIZE); -+ set_page_writeback(page); -+ unlock_page(page); -+ end_page_writeback(page); -+ return 0; -+ } -+ } -+ -+ if (n_bytes != PAGE_CACHE_SIZE) -+ zero_user_segment(page, n_bytes, PAGE_CACHE_SIZE); -+ -+ get_page(page); -+ -+ buffer = kmap(page); -+ -+ obj = yaffs_inode_to_obj(inode); -+ dev = obj->my_dev; -+ yaffs_gross_lock(dev); -+ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_writepage at %08x, size %08x", -+ (unsigned)(page->index << PAGE_CACHE_SHIFT), n_bytes); -+ yaffs_trace(YAFFS_TRACE_OS, -+ "writepag0: obj = %05x, ino = %05x", -+ (int)obj->variant.file_variant.file_size, (int)inode->i_size); -+ -+ n_written = yaffs_wr_file(obj, buffer, -+ ((loff_t)page->index) << PAGE_CACHE_SHIFT, -+ n_bytes, 0); -+ -+ yaffs_touch_super(dev); -+ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "writepag1: obj = %05x, ino = %05x", -+ (int)obj->variant.file_variant.file_size, (int)inode->i_size); -+ -+ yaffs_gross_unlock(dev); -+ -+ kunmap(page); -+ set_page_writeback(page); -+ unlock_page(page); -+ end_page_writeback(page); -+ put_page(page); -+ -+ return (n_written == n_bytes) ? 0 : -ENOSPC; +} ++#else + -+/* Space holding and freeing is done to ensure we have space available for -+ * write_begin/end. -+ * For now we just assume few parallel writes and check against a small -+ * number. -+ * Todo: need to do this with a counter to handle parallel reads better ++/* clear is called to tell the fs to release any per-inode data it holds. ++ * The object might still exist on disk and is just being thrown out of the cache ++ * or else the object has actually been deleted and we're being called via ++ * the chain ++ * yaffs_delete_inode() -> clear_inode()->yaffs_clear_inode() + */ + -+static ssize_t yaffs_hold_space(struct file *f) ++static void yaffs_clear_inode(struct inode *inode) +{ + struct yaffs_obj *obj; + struct yaffs_dev *dev; -+ int n_free_chunks; -+ -+ obj = yaffs_dentry_to_obj(f->f_dentry); + -+ dev = obj->my_dev; -+ -+ yaffs_gross_lock(dev); -+ -+ n_free_chunks = yaffs_get_n_free_chunks(dev); -+ -+ yaffs_gross_unlock(dev); -+ -+ return (n_free_chunks > 20) ? 1 : 0; -+} -+ -+static void yaffs_release_space(struct file *f) -+{ -+ struct yaffs_obj *obj; -+ struct yaffs_dev *dev; -+ -+ obj = yaffs_dentry_to_obj(f->f_dentry); -+ -+ dev = obj->my_dev; -+ -+ yaffs_gross_lock(dev); -+ -+ yaffs_gross_unlock(dev); -+} -+ -+static int yaffs_write_begin(struct file *filp, struct address_space *mapping, -+ loff_t pos, unsigned len, unsigned flags, -+ struct page **pagep, void **fsdata) -+{ -+ struct page *pg = NULL; -+ pgoff_t index = pos >> PAGE_CACHE_SHIFT; -+ int ret = 0; -+ int space_held = 0; -+ -+ /* Get a page */ -+ pg = grab_cache_page_write_begin(mapping, index, flags); ++ obj = yaffs_inode_to_obj(inode); + -+ *pagep = pg; -+ if (!pg) { -+ ret = -ENOMEM; -+ goto out; -+ } + yaffs_trace(YAFFS_TRACE_OS, -+ "start yaffs_write_begin index %d(%x) uptodate %d", -+ (int)index, (int)index, PageUptodate(pg) ? 1 : 0); -+ -+ /* Get fs space */ -+ space_held = yaffs_hold_space(filp); ++ "yaffs_clear_inode: ino %d, count %d %s", ++ (int)inode->i_ino, atomic_read(&inode->i_count), ++ obj ? "object exists" : "null object"); + -+ if (!space_held) { -+ ret = -ENOSPC; -+ goto out; ++ if (obj) { ++ dev = obj->my_dev; ++ yaffs_gross_lock(dev); ++ yaffs_unstitch_obj(inode, obj); ++ yaffs_gross_unlock(dev); + } + -+ /* Update page if required */ -+ -+ if (!PageUptodate(pg)) -+ ret = yaffs_readpage_nolock(filp, pg); -+ -+ if (ret) -+ goto out; -+ -+ /* Happy path return */ -+ yaffs_trace(YAFFS_TRACE_OS, "end yaffs_write_begin - ok"); -+ -+ return 0; -+ -+out: -+ yaffs_trace(YAFFS_TRACE_OS, -+ "end yaffs_write_begin fail returning %d", ret); -+ if (space_held) -+ yaffs_release_space(filp); -+ if (pg) { -+ unlock_page(pg); -+ page_cache_release(pg); -+ } -+ return ret; +} + -+static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, -+ loff_t *pos) ++/* delete is called when the link count is zero and the inode ++ * is put (ie. nobody wants to know about it anymore, time to ++ * delete the file). ++ * NB Must call clear_inode() ++ */ ++static void yaffs_delete_inode(struct inode *inode) +{ -+ struct yaffs_obj *obj; -+ int n_written, ipos; -+ struct inode *inode; ++ struct yaffs_obj *obj = yaffs_inode_to_obj(inode); + struct yaffs_dev *dev; + -+ obj = yaffs_dentry_to_obj(f->f_dentry); -+ -+ if (!obj) { -+ /* This should not happen */ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_file_write: hey obj is null!"); -+ return -EINVAL; -+ } -+ -+ dev = obj->my_dev; -+ -+ yaffs_gross_lock(dev); -+ -+ inode = f->f_dentry->d_inode; -+ -+ if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND) -+ ipos = inode->i_size; -+ else -+ ipos = *pos; -+ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_file_write about to write writing %u(%x) bytes to object %d at %d(%x)", -+ (unsigned)n, (unsigned)n, obj->obj_id, ipos, ipos); -+ -+ n_written = yaffs_wr_file(obj, buf, ipos, n, 0); -+ -+ yaffs_touch_super(dev); -+ + yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_file_write: %d(%x) bytes written", -+ (unsigned)n, (unsigned)n); -+ -+ if (n_written > 0) { -+ ipos += n_written; -+ *pos = ipos; -+ if (ipos > inode->i_size) { -+ inode->i_size = ipos; -+ inode->i_blocks = (ipos + 511) >> 9; ++ "yaffs_delete_inode: ino %d, count %d %s", ++ (int)inode->i_ino, atomic_read(&inode->i_count), ++ obj ? "object exists" : "null object"); + -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_file_write size updated to %d bytes, %d blocks", -+ ipos, (int)(inode->i_blocks)); -+ } ++ if (obj) { ++ dev = obj->my_dev; ++ yaffs_gross_lock(dev); ++ yaffs_del_obj(obj); ++ yaffs_gross_unlock(dev); + } -+ yaffs_gross_unlock(dev); -+ return (n_written == 0) && (n > 0) ? -ENOSPC : n_written; ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13)) ++ truncate_inode_pages(&inode->i_data, 0); ++#endif ++ clear_inode(inode); +} ++#endif + -+static int yaffs_write_end(struct file *filp, struct address_space *mapping, -+ loff_t pos, unsigned len, unsigned copied, -+ struct page *pg, void *fsdadata) -+{ -+ int ret = 0; -+ void *addr, *kva; -+ uint32_t offset_into_page = pos & (PAGE_CACHE_SIZE - 1); -+ -+ kva = kmap(pg); -+ addr = kva + offset_into_page; -+ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_write_end addr %p pos %x n_bytes %d", -+ addr, (unsigned)pos, copied); -+ -+ ret = yaffs_file_write(filp, addr, copied, &pos); -+ -+ if (ret != copied) { -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_write_end not same size ret %d copied %d", -+ ret, copied); -+ SetPageError(pg); -+ } + -+ kunmap(pg); + -+ yaffs_release_space(filp); -+ unlock_page(pg); -+ page_cache_release(pg); -+ return ret; -+} + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) +static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf) +{ + struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev; + struct super_block *sb = dentry->d_sb; ++#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) ++static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf) ++{ ++ struct yaffs_dev *dev = yaffs_super_to_dev(sb); ++#else ++static int yaffs_statfs(struct super_block *sb, struct statfs *buf) ++{ ++ struct yaffs_dev *dev = yaffs_super_to_dev(sb); ++#endif + + yaffs_trace(YAFFS_TRACE_OS, "yaffs_statfs"); + @@ -12091,12 +13925,11 @@ index 0000000..145517b + + bytes_in_dev = + ((uint64_t) -+ ((dev->param.end_block - dev->param.start_block + 1))) * -+ ((uint64_t) (dev->param.chunks_per_block * ++ ((dev->param.end_block - dev->param.start_block + ++ 1))) * ((uint64_t) (dev->param.chunks_per_block * + dev->data_bytes_per_chunk)); + -+ do_div(bytes_in_dev, sb->s_blocksize); -+ /* bytes_in_dev becomes the number of blocks */ ++ do_div(bytes_in_dev, sb->s_blocksize); /* bytes_in_dev becomes the number of blocks */ + buf->f_blocks = bytes_in_dev; + + bytes_free = ((uint64_t) (yaffs_get_n_free_chunks(dev))) * @@ -12134,56 +13967,7 @@ index 0000000..145517b + return 0; +} + -+static void yaffs_flush_inodes(struct super_block *sb) -+{ -+ struct inode *iptr; -+ struct yaffs_obj *obj; -+ -+ list_for_each_entry(iptr, &sb->s_inodes, i_sb_list) { -+ obj = yaffs_inode_to_obj(iptr); -+ if (obj) { -+ yaffs_trace(YAFFS_TRACE_OS, -+ "flushing obj %d", obj->obj_id); -+ yaffs_flush_file(obj, 1, 0); -+ } -+ } -+} -+ -+static void yaffs_flush_super(struct super_block *sb, int do_checkpoint) -+{ -+ struct yaffs_dev *dev = yaffs_super_to_dev(sb); -+ -+ if (!dev) -+ return; -+ -+ yaffs_flush_inodes(sb); -+ yaffs_update_dirty_dirs(dev); -+ yaffs_flush_whole_cache(dev); -+ if (do_checkpoint) -+ yaffs_checkpoint_save(dev); -+} -+ -+static unsigned yaffs_bg_gc_urgency(struct yaffs_dev *dev) -+{ -+ unsigned erased_chunks = -+ dev->n_erased_blocks * dev->param.chunks_per_block; -+ struct yaffs_linux_context *context = yaffs_dev_to_lc(dev); -+ unsigned scattered = 0; /* Free chunks not in an erased block */ -+ -+ if (erased_chunks < dev->n_free_chunks) -+ scattered = (dev->n_free_chunks - erased_chunks); + -+ if (!context->bg_running) -+ return 0; -+ else if (scattered < (dev->param.chunks_per_block * 2)) -+ return 0; -+ else if (erased_chunks > dev->n_free_chunks / 2) -+ return 0; -+ else if (erased_chunks > dev->n_free_chunks / 4) -+ return 1; -+ else -+ return 2; -+} + +static int yaffs_do_sync_fs(struct super_block *sb, int request_checkpoint) +{ @@ -12192,11 +13976,12 @@ index 0000000..145517b + unsigned int oneshot_checkpoint = (yaffs_auto_checkpoint & 4); + unsigned gc_urgent = yaffs_bg_gc_urgency(dev); + int do_checkpoint; ++ int dirty = yaffs_check_super_dirty(dev); + + yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND, + "yaffs_do_sync_fs: gc-urgency %d %s %s%s", + gc_urgent, -+ sb->s_dirt ? "dirty" : "clean", ++ dirty ? "dirty" : "clean", + request_checkpoint ? "checkpoint requested" : "no checkpoint", + oneshot_checkpoint ? " one-shot" : ""); + @@ -12204,9 +13989,9 @@ index 0000000..145517b + do_checkpoint = ((request_checkpoint && !gc_urgent) || + oneshot_checkpoint) && !dev->is_checkpointed; + -+ if (sb->s_dirt || do_checkpoint) { ++ if (dirty || do_checkpoint) { + yaffs_flush_super(sb, !dev->is_checkpointed && do_checkpoint); -+ sb->s_dirt = 0; ++ yaffs_clear_super_dirty(dev); + if (oneshot_checkpoint) + yaffs_auto_checkpoint &= ~4; + } @@ -12215,143 +14000,33 @@ index 0000000..145517b + return 0; +} + -+/* -+ * yaffs background thread functions . -+ * yaffs_bg_thread_fn() the thread function -+ * yaffs_bg_start() launches the background thread. -+ * yaffs_bg_stop() cleans up the background thread. -+ * -+ * NB: -+ * The thread should only run after the yaffs is initialised -+ * The thread should be stopped before yaffs is unmounted. -+ * The thread should not do any writing while the fs is in read only. -+ */ -+ -+void yaffs_background_waker(unsigned long data) -+{ -+ wake_up_process((struct task_struct *)data); -+} -+ -+static int yaffs_bg_thread_fn(void *data) -+{ -+ struct yaffs_dev *dev = (struct yaffs_dev *)data; -+ struct yaffs_linux_context *context = yaffs_dev_to_lc(dev); -+ unsigned long now = jiffies; -+ unsigned long next_dir_update = now; -+ unsigned long next_gc = now; -+ unsigned long expires; -+ unsigned int urgency; -+ int gc_result; -+ struct timer_list timer; -+ -+ yaffs_trace(YAFFS_TRACE_BACKGROUND, -+ "yaffs_background starting for dev %p", (void *)dev); -+ -+ set_freezable(); -+ while (context->bg_running) { -+ yaffs_trace(YAFFS_TRACE_BACKGROUND, "yaffs_background"); -+ -+ if (kthread_should_stop()) -+ break; -+ -+ if (try_to_freeze()) -+ continue; -+ -+ yaffs_gross_lock(dev); -+ -+ now = jiffies; -+ -+ if (time_after(now, next_dir_update) && yaffs_bg_enable) { -+ yaffs_update_dirty_dirs(dev); -+ next_dir_update = now + HZ; -+ } -+ -+ if (time_after(now, next_gc) && yaffs_bg_enable) { -+ if (!dev->is_checkpointed) { -+ urgency = yaffs_bg_gc_urgency(dev); -+ gc_result = yaffs_bg_gc(dev, urgency); -+ if (urgency > 1) -+ next_gc = now + HZ / 20 + 1; -+ else if (urgency > 0) -+ next_gc = now + HZ / 10 + 1; -+ else -+ next_gc = now + HZ * 2; -+ } else { -+ /* -+ * gc not running so set to next_dir_update -+ * to cut down on wake ups -+ */ -+ next_gc = next_dir_update; -+ } -+ } -+ yaffs_gross_unlock(dev); -+ expires = next_dir_update; -+ if (time_before(next_gc, expires)) -+ expires = next_gc; -+ if (time_before(expires, now)) -+ expires = now + HZ; -+ -+ init_timer_on_stack(&timer); -+ timer.expires = expires + 1; -+ timer.data = (unsigned long)current; -+ timer.function = yaffs_background_waker; -+ -+ set_current_state(TASK_INTERRUPTIBLE); -+ add_timer(&timer); -+ schedule(); -+ del_timer_sync(&timer); -+ } -+ -+ return 0; -+} -+ -+static int yaffs_bg_start(struct yaffs_dev *dev) -+{ -+ int retval = 0; -+ struct yaffs_linux_context *context = yaffs_dev_to_lc(dev); -+ -+ if (dev->read_only) -+ return -1; -+ -+ context->bg_running = 1; -+ -+ context->bg_thread = kthread_run(yaffs_bg_thread_fn, -+ (void *)dev, "yaffs-bg-%d", -+ context->mount_id); -+ -+ if (IS_ERR(context->bg_thread)) { -+ retval = PTR_ERR(context->bg_thread); -+ context->bg_thread = NULL; -+ context->bg_running = 0; -+ } -+ return retval; -+} -+ -+static void yaffs_bg_stop(struct yaffs_dev *dev) -+{ -+ struct yaffs_linux_context *ctxt = yaffs_dev_to_lc(dev); -+ -+ ctxt->bg_running = 0; -+ -+ if (ctxt->bg_thread) { -+ kthread_stop(ctxt->bg_thread); -+ ctxt->bg_thread = NULL; -+ } -+} + ++#ifdef YAFFS_HAS_WRITE_SUPER ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) +static void yaffs_write_super(struct super_block *sb) ++#else ++static int yaffs_write_super(struct super_block *sb) ++#endif +{ + unsigned request_checkpoint = (yaffs_auto_checkpoint >= 2); + + yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND, -+ "yaffs_write_super%s", ++ "yaffs_write_super %s", + request_checkpoint ? " checkpt" : ""); + + yaffs_do_sync_fs(sb, request_checkpoint); + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18)) ++ return 0; ++#endif +} ++#endif + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) +static int yaffs_sync_fs(struct super_block *sb, int wait) ++#else ++static int yaffs_sync_fs(struct super_block *sb) ++#endif +{ + unsigned request_checkpoint = (yaffs_auto_checkpoint >= 1); + @@ -12363,8 +14038,68 @@ index 0000000..145517b + return 0; +} + -+static LIST_HEAD(yaffs_context_list); -+struct mutex yaffs_context_lock; ++/* the function only is used to change dev->read_only when this file system ++ * is remounted. ++ */ ++static int yaffs_remount_fs(struct super_block *sb, int *flags, char *data) ++{ ++ int read_only = 0; ++ struct mtd_info *mtd; ++ struct yaffs_dev *dev = 0; ++ ++ /* Get the device */ ++ mtd = get_mtd_device(NULL, MINOR(sb->s_dev)); ++ if (!mtd) { ++ yaffs_trace(YAFFS_TRACE_ALWAYS, ++ "MTD device #%u doesn't appear to exist", ++ MINOR(sb->s_dev)); ++ return 1; ++ } ++ ++ /* Check it's NAND */ ++ if (mtd->type != MTD_NANDFLASH) { ++ yaffs_trace(YAFFS_TRACE_ALWAYS, ++ "MTD device is not NAND it's type %d", ++ mtd->type); ++ return 1; ++ } ++ ++ read_only = ((*flags & MS_RDONLY) != 0); ++ if (!read_only && !(mtd->flags & MTD_WRITEABLE)) { ++ read_only = 1; ++ printk(KERN_INFO ++ "yaffs: mtd is read only, setting superblock read only"); ++ *flags |= MS_RDONLY; ++ } ++ ++ dev = sb->s_fs_info; ++ dev->read_only = read_only; ++ ++ return 0; ++} ++ ++static const struct super_operations yaffs_super_ops = { ++ .statfs = yaffs_statfs, ++ ++#ifndef YAFFS_USE_OWN_IGET ++ .read_inode = yaffs_read_inode, ++#endif ++#ifdef YAFFS_HAS_PUT_INODE ++ .put_inode = yaffs_put_inode, ++#endif ++ .put_super = yaffs_put_super, ++#ifdef YAFFS_HAS_EVICT_INODE ++ .evict_inode = yaffs_evict_inode, ++#else ++ .delete_inode = yaffs_delete_inode, ++ .clear_inode = yaffs_clear_inode, ++#endif ++ .sync_fs = yaffs_sync_fs, ++#ifdef YAFFS_HAS_WRITE_SUPER ++ .write_super = yaffs_write_super, ++#endif ++ .remount_fs = yaffs_remount_fs, ++}; + +struct yaffs_options { + int inband_tags; @@ -12377,11 +14112,12 @@ index 0000000..145517b + int lazy_loading_overridden; + int empty_lost_and_found; + int empty_lost_and_found_overridden; ++ int disable_summary; +}; + +#define MAX_OPT_LEN 30 +static int yaffs_parse_options(struct yaffs_options *options, -+ const char *options_str) ++ const char *options_str) +{ + char cur_opt[MAX_OPT_LEN + 1]; + int p; @@ -12418,6 +14154,8 @@ index 0000000..145517b + } else if (!strcmp(cur_opt, "lazy-loading-on")) { + options->lazy_loading_enabled = 1; + options->lazy_loading_overridden = 1; ++ } else if (!strcmp(cur_opt, "disable-summary")) { ++ options->disable_summary = 1; + } else if (!strcmp(cur_opt, "empty-lost-and-found-off")) { + options->empty_lost_and_found = 0; + options->empty_lost_and_found_overridden = 1; @@ -12439,175 +14177,28 @@ index 0000000..145517b + error = 1; + } + } ++ + return error; +} + -+static const struct address_space_operations yaffs_file_address_operations = { -+ .readpage = yaffs_readpage, -+ .writepage = yaffs_writepage, -+ .write_begin = yaffs_write_begin, -+ .write_end = yaffs_write_end, -+}; + -+ -+ -+static const struct inode_operations yaffs_file_inode_operations = { -+ .setattr = yaffs_setattr, -+ .setxattr = yaffs_setxattr, -+ .getxattr = yaffs_getxattr, -+ .listxattr = yaffs_listxattr, -+ .removexattr = yaffs_removexattr, -+}; -+ -+static const struct inode_operations yaffs_symlink_inode_operations = { -+ .readlink = yaffs_readlink, -+ .follow_link = yaffs_follow_link, -+ .put_link = yaffs_put_link, -+ .setattr = yaffs_setattr, -+ .setxattr = yaffs_setxattr, -+ .getxattr = yaffs_getxattr, -+ .listxattr = yaffs_listxattr, -+ .removexattr = yaffs_removexattr, -+}; -+ -+static void yaffs_fill_inode_from_obj(struct inode *inode, -+ struct yaffs_obj *obj) ++static struct dentry *yaffs_make_root(struct inode *inode) +{ -+ u32 mode; -+ -+ if (!inode || !obj) { -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_fill_inode invalid parameters"); -+ return; -+ } -+ -+ /* Check mode against the variant type -+ * and attempt to repair if broken. */ -+ mode = obj->yst_mode; -+ -+ switch (obj->variant_type) { -+ case YAFFS_OBJECT_TYPE_FILE: -+ if (!S_ISREG(mode)) { -+ obj->yst_mode &= ~S_IFMT; -+ obj->yst_mode |= S_IFREG; -+ } -+ break; -+ case YAFFS_OBJECT_TYPE_SYMLINK: -+ if (!S_ISLNK(mode)) { -+ obj->yst_mode &= ~S_IFMT; -+ obj->yst_mode |= S_IFLNK; -+ } -+ break; -+ case YAFFS_OBJECT_TYPE_DIRECTORY: -+ if (!S_ISDIR(mode)) { -+ obj->yst_mode &= ~S_IFMT; -+ obj->yst_mode |= S_IFDIR; -+ } -+ break; -+ case YAFFS_OBJECT_TYPE_UNKNOWN: -+ case YAFFS_OBJECT_TYPE_HARDLINK: -+ case YAFFS_OBJECT_TYPE_SPECIAL: -+ default: -+ /* TODO? */ -+ break; -+ } ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)) ++ struct dentry *root = d_alloc_root(inode); + -+ inode->i_flags |= S_NOATIME; -+ inode->i_ino = obj->obj_id; -+ inode->i_mode = obj->yst_mode; -+ inode->i_uid = obj->yst_uid; -+ inode->i_gid = obj->yst_gid; -+ -+ inode->i_rdev = old_decode_dev(obj->yst_rdev); -+ -+ inode->i_atime.tv_sec = (time_t) (obj->yst_atime); -+ inode->i_atime.tv_nsec = 0; -+ inode->i_mtime.tv_sec = (time_t) obj->yst_mtime; -+ inode->i_mtime.tv_nsec = 0; -+ inode->i_ctime.tv_sec = (time_t) obj->yst_ctime; -+ inode->i_ctime.tv_nsec = 0; -+ inode->i_size = yaffs_get_obj_length(obj); -+ inode->i_blocks = (inode->i_size + 511) >> 9; -+ set_nlink(inode, yaffs_get_obj_link_count(obj)); -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_fill_inode mode %x uid %d gid %d size %d count %d", -+ inode->i_mode, inode->i_uid, inode->i_gid, -+ (int)inode->i_size, atomic_read(&inode->i_count)); -+ -+ switch (obj->yst_mode & S_IFMT) { -+ default: /* fifo, device or socket */ -+ init_special_inode(inode, obj->yst_mode, -+ old_decode_dev(obj->yst_rdev)); -+ break; -+ case S_IFREG: /* file */ -+ inode->i_op = &yaffs_file_inode_operations; -+ inode->i_fop = &yaffs_file_operations; -+ inode->i_mapping->a_ops = &yaffs_file_address_operations; -+ break; -+ case S_IFDIR: /* directory */ -+ inode->i_op = &yaffs_dir_inode_operations; -+ inode->i_fop = &yaffs_dir_operations; -+ break; -+ case S_IFLNK: /* symlink */ -+ inode->i_op = &yaffs_symlink_inode_operations; -+ break; -+ } ++ if (!root) ++ iput(inode); + -+ yaffs_inode_to_obj_lv(inode) = obj; -+ obj->my_inode = inode; ++ return root; ++#else ++ return d_make_root(inode); ++#endif +} + -+static void yaffs_put_super(struct super_block *sb) -+{ -+ struct yaffs_dev *dev = yaffs_super_to_dev(sb); -+ struct mtd_info *mtd = yaffs_dev_to_mtd(dev); -+ -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_put_super"); -+ -+ yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND, -+ "Shutting down yaffs background thread"); -+ yaffs_bg_stop(dev); -+ yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND, -+ "yaffs background thread shut down"); -+ -+ yaffs_gross_lock(dev); -+ -+ yaffs_flush_super(sb, 1); -+ -+ if (yaffs_dev_to_lc(dev)->put_super_fn) -+ yaffs_dev_to_lc(dev)->put_super_fn(sb); -+ -+ yaffs_deinitialise(dev); -+ -+ yaffs_gross_unlock(dev); -+ mutex_lock(&yaffs_context_lock); -+ list_del_init(&(yaffs_dev_to_lc(dev)->context_list)); -+ mutex_unlock(&yaffs_context_lock); -+ -+ if (yaffs_dev_to_lc(dev)->spare_buffer) { -+ kfree(yaffs_dev_to_lc(dev)->spare_buffer); -+ yaffs_dev_to_lc(dev)->spare_buffer = NULL; -+ } -+ -+ kfree(dev); + + + -+ if (mtd && mtd->sync) -+ mtd->sync(mtd); -+ -+ if (mtd) -+ put_mtd_device(mtd); -+} -+ -+static const struct super_operations yaffs_super_ops = { -+ .statfs = yaffs_statfs, -+ .put_super = yaffs_put_super, -+ .evict_inode = yaffs_evict_inode, -+ .sync_fs = yaffs_sync_fs, -+ .write_super = yaffs_write_super, -+}; -+ +static struct super_block *yaffs_internal_read_super(int yaffs_version, + struct super_block *sb, + void *data, int silent) @@ -12622,8 +14213,12 @@ index 0000000..145517b + char *data_str = (char *)data; + struct yaffs_linux_context *context = NULL; + struct yaffs_param *param; ++ + int read_only = 0; ++ int inband_tags = 0; ++ + struct yaffs_options options; ++ + unsigned mount_id; + int found; + struct yaffs_linux_context *context_iterator; @@ -12632,7 +14227,7 @@ index 0000000..145517b + if (!sb) { + printk(KERN_INFO "yaffs: sb is NULL\n"); + return NULL; -+ } ++ } + + sb->s_magic = YAFFS_MAGIC; + sb->s_op = &yaffs_super_ops; @@ -12640,7 +14235,9 @@ index 0000000..145517b + + read_only = ((sb->s_flags & MS_RDONLY) != 0); + ++#ifdef YAFFS_COMPILE_EXPORTFS + sb->s_export_op = &yaffs_export_ops; ++#endif + + if (!sb->s_dev) + printk(KERN_INFO "yaffs: sb->s_dev is NULL\n"); @@ -12658,9 +14255,10 @@ index 0000000..145517b + + memset(&options, 0, sizeof(options)); + -+ if (yaffs_parse_options(&options, data_str)) ++ if (yaffs_parse_options(&options, data_str)) { + /* Option parsing failed */ + return NULL; ++ } + + sb->s_blocksize = PAGE_CACHE_SIZE; + sb->s_blocksize_bits = PAGE_CACHE_SHIFT; @@ -12671,89 +14269,37 @@ index 0000000..145517b + "yaffs_read_super: block size %d", (int)(sb->s_blocksize)); + + yaffs_trace(YAFFS_TRACE_ALWAYS, -+ "Attempting MTD mount of %u.%u,\"%s\"", ++ "yaffs: Attempting MTD mount of %u.%u,\"%s\"", + MAJOR(sb->s_dev), MINOR(sb->s_dev), + yaffs_devname(sb, devname_buf)); + -+ /* Check it's an mtd device..... */ -+ if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR) -+ return NULL; /* This isn't an mtd device */ -+ + /* Get the device */ + mtd = get_mtd_device(NULL, MINOR(sb->s_dev)); -+ if (!mtd) { ++ if (IS_ERR(mtd)) { + yaffs_trace(YAFFS_TRACE_ALWAYS, -+ "MTD device #%u doesn't appear to exist", ++ "yaffs: MTD device %u either not valid or unavailable", + MINOR(sb->s_dev)); + return NULL; + } -+ /* Check it's NAND */ -+ if (mtd->type != MTD_NANDFLASH) { -+ yaffs_trace(YAFFS_TRACE_ALWAYS, -+ "MTD device is not NAND it's type %d", -+ mtd->type); -+ return NULL; -+ } + -+ yaffs_trace(YAFFS_TRACE_OS, " erase %p", mtd->erase); -+ yaffs_trace(YAFFS_TRACE_OS, " read %p", mtd->read); -+ yaffs_trace(YAFFS_TRACE_OS, " write %p", mtd->write); -+ yaffs_trace(YAFFS_TRACE_OS, " readoob %p", mtd->read_oob); -+ yaffs_trace(YAFFS_TRACE_OS, " writeoob %p", mtd->write_oob); -+ yaffs_trace(YAFFS_TRACE_OS, " block_isbad %p", mtd->block_isbad); -+ yaffs_trace(YAFFS_TRACE_OS, " block_markbad %p", mtd->block_markbad); -+ yaffs_trace(YAFFS_TRACE_OS, " writesize %d", mtd->writesize); -+ yaffs_trace(YAFFS_TRACE_OS, " oobsize %d", mtd->oobsize); -+ yaffs_trace(YAFFS_TRACE_OS, " erasesize %d", mtd->erasesize); -+ yaffs_trace(YAFFS_TRACE_OS, " size %lld", mtd->size); -+ -+ if (yaffs_auto_select && yaffs_version == 1 && mtd->writesize >= 2048) { ++ if (yaffs_auto_select && yaffs_version == 1 && WRITE_SIZE(mtd) >= 2048) { + yaffs_trace(YAFFS_TRACE_ALWAYS, "auto selecting yaffs2"); + yaffs_version = 2; + } + -+ if (yaffs_auto_select && yaffs_version == 2 && !options.inband_tags && -+ mtd->writesize == 512) { ++ /* Added NCB 26/5/2006 for completeness */ ++ if (yaffs_version == 2 && !options.inband_tags ++ && WRITE_SIZE(mtd) == 512) { + yaffs_trace(YAFFS_TRACE_ALWAYS, "auto selecting yaffs1"); + yaffs_version = 1; + } + -+ if (yaffs_version == 2) { -+ /* Check for version 2 style functions */ -+ if (!mtd->erase || -+ !mtd->block_isbad || -+ !mtd->block_markbad || -+ !mtd->read || -+ !mtd->write || !mtd->read_oob || !mtd->write_oob) { -+ yaffs_trace(YAFFS_TRACE_ALWAYS, -+ "MTD device does not support required functions"); -+ return NULL; -+ } -+ -+ if ((mtd->writesize < YAFFS_MIN_YAFFS2_CHUNK_SIZE || -+ mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) && -+ !options.inband_tags) { -+ yaffs_trace(YAFFS_TRACE_ALWAYS, -+ "MTD device does not have the right page sizes"); -+ return NULL; -+ } -+ } else { -+ /* Check for V1 style functions */ -+ if (!mtd->erase || -+ !mtd->read || -+ !mtd->write || !mtd->read_oob || !mtd->write_oob) { -+ yaffs_trace(YAFFS_TRACE_ALWAYS, -+ "MTD device does not support required functions"); -+ return NULL; -+ } ++ if (mtd->oobavail < sizeof(struct yaffs_packed_tags2) || ++ options.inband_tags) ++ inband_tags = 1; + -+ if (mtd->writesize < YAFFS_BYTES_PER_CHUNK || -+ mtd->oobsize != YAFFS_BYTES_PER_SPARE) { -+ yaffs_trace(YAFFS_TRACE_ALWAYS, -+ "MTD device does not support have the right page sizes"); -+ return NULL; -+ } -+ } ++ if(yaffs_verify_mtd(mtd, yaffs_version, inband_tags) < 0) ++ return NULL; + + /* OK, so if we got here, we have an MTD that's NAND and looks + * like it has the right capabilities @@ -12763,7 +14309,8 @@ index 0000000..145517b + if (!read_only && !(mtd->flags & MTD_WRITEABLE)) { + read_only = 1; + printk(KERN_INFO -+ "yaffs: mtd is read only, setting superblock read only"); ++ "yaffs: mtd is read only, setting superblock read only\n" ++ ); + sb->s_flags |= MS_RDONLY; + } + @@ -12775,12 +14322,11 @@ index 0000000..145517b + kfree(context); + dev = NULL; + context = NULL; -+ } + -+ if (!dev) { + /* Deep shit could not allocate device structure */ + yaffs_trace(YAFFS_TRACE_ALWAYS, -+ "yaffs_read_super failed trying to allocate yaffs_dev"); ++ "yaffs_read_super: Failed trying to allocate struct yaffs_dev." ++ ); + return NULL; + } + memset(dev, 0, sizeof(struct yaffs_dev)); @@ -12794,26 +14340,23 @@ index 0000000..145517b + + dev->read_only = read_only; + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) + sb->s_fs_info = dev; ++#else ++ sb->u.generic_sbp = dev; ++#endif ++ + + dev->driver_context = mtd; + param->name = mtd->name; + + /* Set up the memory size parameters.... */ + -+ n_blocks = -+ YCALCBLOCKS(mtd->size, -+ (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK)); + -+ param->start_block = 0; -+ param->end_block = n_blocks - 1; -+ param->chunks_per_block = YAFFS_CHUNKS_PER_BLOCK; -+ param->total_bytes_per_chunk = YAFFS_BYTES_PER_CHUNK; + param->n_reserved_blocks = 5; + param->n_caches = (options.no_cache) ? 0 : 10; -+ param->inband_tags = options.inband_tags; ++ param->inband_tags = inband_tags; + -+ param->disable_lazy_load = 1; + param->enable_xattr = 1; + if (options.lazy_loading_overridden) + param->disable_lazy_load = !options.lazy_loading_enabled; @@ -12824,42 +14367,45 @@ index 0000000..145517b + param->no_tags_ecc = !options.tags_ecc_on; + + param->empty_lost_n_found = 1; -+ + param->refresh_period = 500; ++ param->disable_summary = options.disable_summary; + ++ ++#ifdef CONFIG_YAFFS_DISABLE_BAD_BLOCK_MARKING ++ param->disable_bad_block_marking = 1; ++#endif + if (options.empty_lost_and_found_overridden) + param->empty_lost_n_found = options.empty_lost_and_found; + + /* ... and the functions. */ + if (yaffs_version == 2) { -+ param->write_chunk_tags_fn = nandmtd2_write_chunk_tags; -+ param->read_chunk_tags_fn = nandmtd2_read_chunk_tags; -+ param->bad_block_fn = nandmtd2_mark_block_bad; -+ param->query_block_fn = nandmtd2_query_block; -+ yaffs_dev_to_lc(dev)->spare_buffer = -+ kmalloc(mtd->oobsize, GFP_NOFS); + param->is_yaffs2 = 1; ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) + param->total_bytes_per_chunk = mtd->writesize; + param->chunks_per_block = mtd->erasesize / mtd->writesize; ++#else ++ param->total_bytes_per_chunk = mtd->oobblock; ++ param->chunks_per_block = mtd->erasesize / mtd->oobblock; ++#endif + n_blocks = YCALCBLOCKS(mtd->size, mtd->erasesize); + + param->start_block = 0; + param->end_block = n_blocks - 1; + } else { -+ /* use the MTD interface in yaffs_mtdif1.c */ -+ param->write_chunk_tags_fn = nandmtd1_write_chunk_tags; -+ param->read_chunk_tags_fn = nandmtd1_read_chunk_tags; -+ param->bad_block_fn = nandmtd1_mark_block_bad; -+ param->query_block_fn = nandmtd1_query_block; + param->is_yaffs2 = 0; ++ n_blocks = YCALCBLOCKS(mtd->size, ++ YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK); ++ ++ param->chunks_per_block = YAFFS_CHUNKS_PER_BLOCK; ++ param->total_bytes_per_chunk = YAFFS_BYTES_PER_CHUNK; + } -+ /* ... and common functions */ -+ param->erase_fn = nandmtd_erase_block; -+ param->initialise_flash_fn = nandmtd_initialise; + -+ yaffs_dev_to_lc(dev)->put_super_fn = yaffs_mtd_put_super; ++ param->start_block = 0; ++ param->end_block = n_blocks - 1; ++ ++ yaffs_mtd_drv_install(dev); + -+ param->sb_dirty_fn = yaffs_touch_super; ++ param->sb_dirty_fn = yaffs_set_super_dirty; + param->gc_control_fn = yaffs_gc_control_callback; + + yaffs_dev_to_lc(dev)->super = sb; @@ -12871,12 +14417,13 @@ index 0000000..145517b + + mutex_lock(&yaffs_context_lock); + /* Get a mount id */ -+ for (mount_id = 0, found = 0; !found; mount_id++) { ++ found = 0; ++ for (mount_id = 0; !found; mount_id++) { + found = 1; + list_for_each(l, &yaffs_context_list) { + context_iterator = -+ list_entry(l, struct yaffs_linux_context, -+ context_list); ++ list_entry(l, struct yaffs_linux_context, ++ context_list); + if (context_iterator->mount_id == mount_id) + found = 0; + } @@ -12924,16 +14471,15 @@ index 0000000..145517b + + yaffs_trace(YAFFS_TRACE_OS, "yaffs_read_super: got root inode"); + -+ root = d_alloc_root(inode); -+ -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_read_super: d_alloc_root done"); ++ root = yaffs_make_root(inode); + -+ if (!root) { -+ iput(inode); ++ if (!root) + return NULL; -+ } ++ + sb->s_root = root; -+ sb->s_dirt = !dev->is_checkpointed; ++ if(!dev->is_checkpointed) ++ yaffs_set_super_dirty(dev); ++ + yaffs_trace(YAFFS_TRACE_ALWAYS, + "yaffs_read_super: is_checkpointed %d", + dev->is_checkpointed); @@ -12942,48 +14488,115 @@ index 0000000..145517b + return sb; +} + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) +static int yaffs_internal_read_super_mtd(struct super_block *sb, void *data, + int silent) +{ + return yaffs_internal_read_super(1, sb, data, silent) ? 0 : -EINVAL; +} + -+static struct dentry *yaffs_mount(struct file_system_type *fs, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) ++static struct dentry *yaffs_mount(struct file_system_type *fs_type, int flags, ++ const char *dev_name, void *data) ++{ ++ return mount_bdev(fs_type, flags, dev_name, data, yaffs_internal_read_super_mtd); ++} ++#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) ++static int yaffs_read_super(struct file_system_type *fs, + int flags, const char *dev_name, -+ void *data) ++ void *data, struct vfsmount *mnt) ++{ ++ ++ return get_sb_bdev(fs, flags, dev_name, data, ++ yaffs_internal_read_super_mtd, mnt); ++} ++#else ++static struct super_block *yaffs_read_super(struct file_system_type *fs, ++ int flags, const char *dev_name, ++ void *data) +{ -+ return mount_bdev(fs, flags, dev_name, data, ++ ++ return get_sb_bdev(fs, flags, dev_name, data, + yaffs_internal_read_super_mtd); +} ++#endif + +static struct file_system_type yaffs_fs_type = { + .owner = THIS_MODULE, + .name = "yaffs", -+ .mount = yaffs_mount, -+ .kill_sb = kill_block_super, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) ++ .mount = yaffs_mount, ++#else ++ .get_sb = yaffs_read_super, ++#endif ++ .kill_sb = kill_block_super, + .fs_flags = FS_REQUIRES_DEV, +}; ++#else ++static struct super_block *yaffs_read_super(struct super_block *sb, void *data, ++ int silent) ++{ ++ return yaffs_internal_read_super(1, sb, data, silent); ++} + ++static DECLARE_FSTYPE(yaffs_fs_type, "yaffs", yaffs_read_super, ++ FS_REQUIRES_DEV); ++#endif ++ ++ ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) +static int yaffs2_internal_read_super_mtd(struct super_block *sb, void *data, + int silent) +{ + return yaffs_internal_read_super(2, sb, data, silent) ? 0 : -EINVAL; +} + -+static struct dentry *yaffs2_mount(struct file_system_type *fs, -+ int flags, const char *dev_name, void *data) ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) ++static struct dentry *yaffs2_mount(struct file_system_type *fs_type, int flags, ++ const char *dev_name, void *data) ++{ ++ return mount_bdev(fs_type, flags, dev_name, data, yaffs2_internal_read_super_mtd); ++} ++#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) ++static int yaffs2_read_super(struct file_system_type *fs, ++ int flags, const char *dev_name, void *data, ++ struct vfsmount *mnt) ++{ ++ return get_sb_bdev(fs, flags, dev_name, data, ++ yaffs2_internal_read_super_mtd, mnt); ++} ++#else ++static struct super_block *yaffs2_read_super(struct file_system_type *fs, ++ int flags, const char *dev_name, ++ void *data) +{ -+ return mount_bdev(fs, flags, dev_name, data, ++ ++ return get_sb_bdev(fs, flags, dev_name, data, + yaffs2_internal_read_super_mtd); +} ++#endif + +static struct file_system_type yaffs2_fs_type = { + .owner = THIS_MODULE, + .name = "yaffs2", -+ .mount = yaffs2_mount, -+ .kill_sb = kill_block_super, ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) ++ .mount = yaffs2_mount, ++#else ++ .get_sb = yaffs2_read_super, ++#endif ++ .kill_sb = kill_block_super, + .fs_flags = FS_REQUIRES_DEV, +}; ++#else ++static struct super_block *yaffs2_read_super(struct super_block *sb, ++ void *data, int silent) ++{ ++ return yaffs_internal_read_super(2, sb, data, silent); ++} ++ ++static DECLARE_FSTYPE(yaffs2_fs_type, "yaffs2", yaffs2_read_super, ++ FS_REQUIRES_DEV); ++#endif + + +static struct proc_dir_entry *my_proc_entry; @@ -12991,78 +14604,86 @@ index 0000000..145517b +static char *yaffs_dump_dev_part0(char *buf, struct yaffs_dev *dev) +{ + struct yaffs_param *param = &dev->param; -+ -+ buf += sprintf(buf, "start_block........... %d\n", param->start_block); -+ buf += sprintf(buf, "end_block............. %d\n", param->end_block); -+ buf += sprintf(buf, "total_bytes_per_chunk. %d\n", -+ param->total_bytes_per_chunk); -+ buf += sprintf(buf, "use_nand_ecc.......... %d\n", -+ param->use_nand_ecc); -+ buf += sprintf(buf, "no_tags_ecc........... %d\n", param->no_tags_ecc); -+ buf += sprintf(buf, "is_yaffs2............. %d\n", param->is_yaffs2); -+ buf += sprintf(buf, "inband_tags........... %d\n", param->inband_tags); -+ buf += sprintf(buf, "empty_lost_n_found.... %d\n", -+ param->empty_lost_n_found); -+ buf += sprintf(buf, "disable_lazy_load..... %d\n", -+ param->disable_lazy_load); -+ buf += sprintf(buf, "refresh_period........ %d\n", -+ param->refresh_period); -+ buf += sprintf(buf, "n_caches.............. %d\n", param->n_caches); -+ buf += sprintf(buf, "n_reserved_blocks..... %d\n", -+ param->n_reserved_blocks); -+ buf += sprintf(buf, "always_check_erased... %d\n", -+ param->always_check_erased); ++ int bs[10]; ++ ++ yaffs_count_blocks_by_state(dev,bs); ++ ++ buf += sprintf(buf, "start_block.......... %d\n", param->start_block); ++ buf += sprintf(buf, "end_block............ %d\n", param->end_block); ++ buf += sprintf(buf, "total_bytes_per_chunk %d\n", ++ param->total_bytes_per_chunk); ++ buf += sprintf(buf, "use_nand_ecc......... %d\n", param->use_nand_ecc); ++ buf += sprintf(buf, "no_tags_ecc.......... %d\n", param->no_tags_ecc); ++ buf += sprintf(buf, "is_yaffs2............ %d\n", param->is_yaffs2); ++ buf += sprintf(buf, "inband_tags.......... %d\n", param->inband_tags); ++ buf += sprintf(buf, "empty_lost_n_found... %d\n", ++ param->empty_lost_n_found); ++ buf += sprintf(buf, "disable_lazy_load.... %d\n", ++ param->disable_lazy_load); ++ buf += sprintf(buf, "disable_bad_block_mrk %d\n", ++ param->disable_bad_block_marking); ++ buf += sprintf(buf, "refresh_period....... %d\n", ++ param->refresh_period); ++ buf += sprintf(buf, "n_caches............. %d\n", param->n_caches); ++ buf += sprintf(buf, "n_reserved_blocks.... %d\n", ++ param->n_reserved_blocks); ++ buf += sprintf(buf, "always_check_erased.. %d\n", ++ param->always_check_erased); ++ buf += sprintf(buf, "\n"); ++ buf += sprintf(buf, "block count by state\n"); ++ buf += sprintf(buf, "0:%d 1:%d 2:%d 3:%d 4:%d\n", ++ bs[0], bs[1], bs[2], bs[3], bs[4]); ++ buf += sprintf(buf, "5:%d 6:%d 7:%d 8:%d 9:%d\n", ++ bs[5], bs[6], bs[7], bs[8], bs[9]); + + return buf; +} + +static char *yaffs_dump_dev_part1(char *buf, struct yaffs_dev *dev) +{ -+ buf += sprintf(buf, "max file size......... %lld\n", -+ (long long) yaffs_max_file_size(dev)); -+ buf += sprintf(buf, "data_bytes_per_chunk.. %d\n", -+ dev->data_bytes_per_chunk); -+ buf += sprintf(buf, "chunk_grp_bits........ %d\n", dev->chunk_grp_bits); -+ buf += sprintf(buf, "chunk_grp_size........ %d\n", dev->chunk_grp_size); -+ buf += -+ sprintf(buf, "n_erased_blocks....... %d\n", dev->n_erased_blocks); -+ buf += -+ sprintf(buf, "blocks_in_checkpt..... %d\n", dev->blocks_in_checkpt); ++ buf += sprintf(buf, "max file size....... %lld\n", ++ (long long) yaffs_max_file_size(dev)); ++ buf += sprintf(buf, "data_bytes_per_chunk. %d\n", ++ dev->data_bytes_per_chunk); ++ buf += sprintf(buf, "chunk_grp_bits....... %d\n", dev->chunk_grp_bits); ++ buf += sprintf(buf, "chunk_grp_size....... %d\n", dev->chunk_grp_size); ++ buf += sprintf(buf, "n_erased_blocks...... %d\n", dev->n_erased_blocks); ++ buf += sprintf(buf, "blocks_in_checkpt.... %d\n", ++ dev->blocks_in_checkpt); + buf += sprintf(buf, "\n"); -+ buf += sprintf(buf, "n_tnodes.............. %d\n", dev->n_tnodes); -+ buf += sprintf(buf, "n_obj................. %d\n", dev->n_obj); -+ buf += sprintf(buf, "n_free_chunks......... %d\n", dev->n_free_chunks); ++ buf += sprintf(buf, "n_tnodes............. %d\n", dev->n_tnodes); ++ buf += sprintf(buf, "n_obj................ %d\n", dev->n_obj); ++ buf += sprintf(buf, "n_free_chunks........ %d\n", dev->n_free_chunks); + buf += sprintf(buf, "\n"); -+ buf += sprintf(buf, "n_page_writes......... %u\n", dev->n_page_writes); -+ buf += sprintf(buf, "n_page_reads.......... %u\n", dev->n_page_reads); -+ buf += sprintf(buf, "n_erasures............ %u\n", dev->n_erasures); -+ buf += sprintf(buf, "n_gc_copies........... %u\n", dev->n_gc_copies); -+ buf += sprintf(buf, "all_gcs............... %u\n", dev->all_gcs); -+ buf += -+ sprintf(buf, "passive_gc_count...... %u\n", dev->passive_gc_count); -+ buf += -+ sprintf(buf, "oldest_dirty_gc_count. %u\n", -+ dev->oldest_dirty_gc_count); -+ buf += sprintf(buf, "n_gc_blocks........... %u\n", dev->n_gc_blocks); -+ buf += sprintf(buf, "bg_gcs................ %u\n", dev->bg_gcs); -+ buf += -+ sprintf(buf, "n_retried_writes...... %u\n", dev->n_retried_writes); -+ buf += -+ sprintf(buf, "n_retired_blocks...... %u\n", dev->n_retired_blocks); -+ buf += sprintf(buf, "n_ecc_fixed........... %u\n", dev->n_ecc_fixed); -+ buf += sprintf(buf, "n_ecc_unfixed......... %u\n", dev->n_ecc_unfixed); -+ buf += -+ sprintf(buf, "n_tags_ecc_fixed...... %u\n", dev->n_tags_ecc_fixed); -+ buf += -+ sprintf(buf, "n_tags_ecc_unfixed.... %u\n", -+ dev->n_tags_ecc_unfixed); -+ buf += sprintf(buf, "cache_hits............ %u\n", dev->cache_hits); -+ buf += -+ sprintf(buf, "n_deleted_files....... %u\n", dev->n_deleted_files); -+ buf += -+ sprintf(buf, "n_unlinked_files...... %u\n", dev->n_unlinked_files); -+ buf += sprintf(buf, "refresh_count......... %u\n", dev->refresh_count); -+ buf += sprintf(buf, "n_bg_deletions........ %u\n", dev->n_bg_deletions); ++ buf += sprintf(buf, "n_page_writes........ %u\n", dev->n_page_writes); ++ buf += sprintf(buf, "n_page_reads......... %u\n", dev->n_page_reads); ++ buf += sprintf(buf, "n_erasures........... %u\n", dev->n_erasures); ++ buf += sprintf(buf, "n_gc_copies.......... %u\n", dev->n_gc_copies); ++ buf += sprintf(buf, "all_gcs.............. %u\n", dev->all_gcs); ++ buf += sprintf(buf, "passive_gc_count..... %u\n", ++ dev->passive_gc_count); ++ buf += sprintf(buf, "oldest_dirty_gc_count %u\n", ++ dev->oldest_dirty_gc_count); ++ buf += sprintf(buf, "n_gc_blocks.......... %u\n", dev->n_gc_blocks); ++ buf += sprintf(buf, "bg_gcs............... %u\n", dev->bg_gcs); ++ buf += sprintf(buf, "n_retried_writes..... %u\n", ++ dev->n_retried_writes); ++ buf += sprintf(buf, "n_retired_blocks..... %u\n", ++ dev->n_retired_blocks); ++ buf += sprintf(buf, "n_ecc_fixed.......... %u\n", dev->n_ecc_fixed); ++ buf += sprintf(buf, "n_ecc_unfixed........ %u\n", dev->n_ecc_unfixed); ++ buf += sprintf(buf, "n_tags_ecc_fixed..... %u\n", ++ dev->n_tags_ecc_fixed); ++ buf += sprintf(buf, "n_tags_ecc_unfixed... %u\n", ++ dev->n_tags_ecc_unfixed); ++ buf += sprintf(buf, "cache_hits........... %u\n", dev->cache_hits); ++ buf += sprintf(buf, "n_deleted_files...... %u\n", dev->n_deleted_files); ++ buf += sprintf(buf, "n_unlinked_files..... %u\n", ++ dev->n_unlinked_files); ++ buf += sprintf(buf, "refresh_count........ %u\n", dev->refresh_count); ++ buf += sprintf(buf, "n_bg_deletions....... %u\n", dev->n_bg_deletions); ++ buf += sprintf(buf, "tags_used............ %u\n", dev->tags_used); ++ buf += sprintf(buf, "summary_used......... %u\n", dev->summary_used); + + return buf; +} @@ -13086,7 +14707,8 @@ index 0000000..145517b + + /* Print header first */ + if (step == 0) -+ buf += sprintf(buf, "YAFFS built:" __DATE__ " " __TIME__ "\n"); ++ buf += ++ sprintf(buf, "Multi-version YAFFS\n"); + else if (step == 1) + buf += sprintf(buf, "\n"); + else { @@ -13094,8 +14716,7 @@ index 0000000..145517b + + mutex_lock(&yaffs_context_lock); + -+ /* Locate and print the Nth entry. -+ * Order N-squared but N is small. */ ++ /* Locate and print the Nth entry. Order N-squared but N is small. */ + list_for_each(item, &yaffs_context_list) { + struct yaffs_linux_context *dc = + list_entry(item, struct yaffs_linux_context, @@ -13113,7 +14734,7 @@ index 0000000..145517b + buf = yaffs_dump_dev_part0(buf, dev); + } else { + buf = yaffs_dump_dev_part1(buf, dev); -+ } ++ } + + break; + } @@ -13123,7 +14744,238 @@ index 0000000..145517b + return buf - page < count ? buf - page : count; +} + ++/** ++ * Set the verbosity of the warnings and error messages. ++ * ++ * Note that the names can only be a..z or _ with the current code. ++ */ ++ ++static struct { ++ char *mask_name; ++ unsigned mask_bitfield; ++} mask_flags[] = { ++ {"allocate", YAFFS_TRACE_ALLOCATE}, ++ {"always", YAFFS_TRACE_ALWAYS}, ++ {"background", YAFFS_TRACE_BACKGROUND}, ++ {"bad_blocks", YAFFS_TRACE_BAD_BLOCKS}, ++ {"buffers", YAFFS_TRACE_BUFFERS}, ++ {"bug", YAFFS_TRACE_BUG}, ++ {"checkpt", YAFFS_TRACE_CHECKPOINT}, ++ {"deletion", YAFFS_TRACE_DELETION}, ++ {"erase", YAFFS_TRACE_ERASE}, ++ {"error", YAFFS_TRACE_ERROR}, ++ {"gc_detail", YAFFS_TRACE_GC_DETAIL}, ++ {"gc", YAFFS_TRACE_GC}, ++ {"lock", YAFFS_TRACE_LOCK}, ++ {"mtd", YAFFS_TRACE_MTD}, ++ {"nandaccess", YAFFS_TRACE_NANDACCESS}, ++ {"os", YAFFS_TRACE_OS}, ++ {"scan_debug", YAFFS_TRACE_SCAN_DEBUG}, ++ {"scan", YAFFS_TRACE_SCAN}, ++ {"mount", YAFFS_TRACE_MOUNT}, ++ {"tracing", YAFFS_TRACE_TRACING}, ++ {"sync", YAFFS_TRACE_SYNC}, ++ {"write", YAFFS_TRACE_WRITE}, ++ {"verify", YAFFS_TRACE_VERIFY}, ++ {"verify_nand", YAFFS_TRACE_VERIFY_NAND}, ++ {"verify_full", YAFFS_TRACE_VERIFY_FULL}, ++ {"verify_all", YAFFS_TRACE_VERIFY_ALL}, ++ {"all", 0xffffffff}, ++ {"none", 0}, ++ {NULL, 0}, ++}; ++ ++#define MAX_MASK_NAME_LENGTH 40 ++static int yaffs_proc_write_trace_options(struct file *file, const char *buf, ++ unsigned long count) ++{ ++ unsigned rg = 0, mask_bitfield; ++ char *end; ++ char *mask_name; ++ const char *x; ++ char substring[MAX_MASK_NAME_LENGTH + 1]; ++ int i; ++ int done = 0; ++ int add, len = 0; ++ int pos = 0; ++ ++ rg = yaffs_trace_mask; ++ ++ while (!done && (pos < count)) { ++ done = 1; ++ while ((pos < count) && isspace(buf[pos])) ++ pos++; ++ ++ switch (buf[pos]) { ++ case '+': ++ case '-': ++ case '=': ++ add = buf[pos]; ++ pos++; ++ break; + ++ default: ++ add = ' '; ++ break; ++ } ++ mask_name = NULL; ++ ++ mask_bitfield = simple_strtoul(buf + pos, &end, 0); ++ ++ if (end > buf + pos) { ++ mask_name = "numeral"; ++ len = end - (buf + pos); ++ pos += len; ++ done = 0; ++ } else { ++ for (x = buf + pos, i = 0; ++ (*x == '_' || (*x >= 'a' && *x <= 'z')) && ++ i < MAX_MASK_NAME_LENGTH; x++, i++, pos++) ++ substring[i] = *x; ++ substring[i] = '\0'; ++ ++ for (i = 0; mask_flags[i].mask_name != NULL; i++) { ++ if (strcmp(substring, mask_flags[i].mask_name) ++ == 0) { ++ mask_name = mask_flags[i].mask_name; ++ mask_bitfield = ++ mask_flags[i].mask_bitfield; ++ done = 0; ++ break; ++ } ++ } ++ } ++ ++ if (mask_name != NULL) { ++ done = 0; ++ switch (add) { ++ case '-': ++ rg &= ~mask_bitfield; ++ break; ++ case '+': ++ rg |= mask_bitfield; ++ break; ++ case '=': ++ rg = mask_bitfield; ++ break; ++ default: ++ rg |= mask_bitfield; ++ break; ++ } ++ } ++ } ++ ++ yaffs_trace_mask = rg | YAFFS_TRACE_ALWAYS; ++ ++ printk(KERN_DEBUG "new trace = 0x%08X\n", yaffs_trace_mask); ++ ++ if (rg & YAFFS_TRACE_ALWAYS) { ++ for (i = 0; mask_flags[i].mask_name != NULL; i++) { ++ char flag; ++ flag = ((rg & mask_flags[i].mask_bitfield) == ++ mask_flags[i].mask_bitfield) ? '+' : '-'; ++ printk(KERN_DEBUG "%c%s\n", flag, ++ mask_flags[i].mask_name); ++ } ++ } ++ ++ return count; ++} ++ ++/* Debug strings are of the form: ++ * .bnnn print info on block n ++ * .cobjn,chunkn print nand chunk id for objn:chunkn ++ */ ++ ++static int yaffs_proc_debug_write(struct file *file, const char *buf, ++ unsigned long count) ++{ ++ ++ char str[100]; ++ char *p0; ++ char *p1; ++ long p1_val; ++ long p0_val; ++ char cmd; ++ struct list_head *item; ++ ++ memset(str, 0, sizeof(str)); ++ memcpy(str, buf, min((size_t)count, sizeof(str) -1)); ++ ++ cmd = str[1]; ++ ++ p0 = str + 2; ++ ++ p1 = p0; ++ ++ while (*p1 && *p1 != ',') { ++ p1++; ++ } ++ *p1 = '\0'; ++ p1++; ++ ++ p0_val = simple_strtol(p0, NULL, 0); ++ p1_val = simple_strtol(p1, NULL, 0); ++ ++ ++ mutex_lock(&yaffs_context_lock); ++ ++ /* Locate and print the Nth entry. Order N-squared but N is small. */ ++ list_for_each(item, &yaffs_context_list) { ++ struct yaffs_linux_context *dc = ++ list_entry(item, struct yaffs_linux_context, ++ context_list); ++ struct yaffs_dev *dev = dc->dev; ++ ++ if (cmd == 'b') { ++ struct yaffs_block_info *bi; ++ ++ bi = yaffs_get_block_info(dev,p0_val); ++ ++ if(bi) { ++ printk("Block %d: state %d, retire %d, use %d, seq %d\n", ++ (int)p0_val, bi->block_state, ++ bi->needs_retiring, bi->pages_in_use, ++ bi->seq_number); ++ } ++ } else if (cmd == 'c') { ++ struct yaffs_obj *obj; ++ int nand_chunk; ++ ++ obj = yaffs_find_by_number(dev, p0_val); ++ if (!obj) ++ printk("No obj %d\n", (int)p0_val); ++ else { ++ if(p1_val == 0) ++ nand_chunk = obj->hdr_chunk; ++ else ++ nand_chunk = ++ yaffs_find_chunk_in_file(obj, ++ p1_val, NULL); ++ printk("Nand chunk for %d:%d is %d\n", ++ (int)p0_val, (int)p1_val, nand_chunk); ++ } ++ } ++ } ++ ++ mutex_unlock(&yaffs_context_lock); ++ ++ return count; ++} ++ ++ ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 14, 0)) ++static int yaffs_proc_write(struct file *file, const char *buf, ++ unsigned long count, void *ppos) ++#else ++static ssize_t yaffs_proc_write(struct file *file, const char __user *buf, ++ size_t count, loff_t *ppos) ++#endif ++{ ++ if (buf[0] == '.') ++ return yaffs_proc_debug_write(file, buf, count); ++ return yaffs_proc_write_trace_options(file, buf, count); ++} + +/* Stuff to handle installation of file systems */ +struct file_system_to_install { @@ -13137,29 +14989,83 @@ index 0000000..145517b + {NULL, 0} +}; + -+static int __init init_yaffs_fs(void) ++ ++#ifdef YAFFS_NEW_PROCFS ++static int yaffs_proc_show(struct seq_file *m, void *v) +{ -+ int error = 0; -+ struct file_system_to_install *fsinst; ++ /* FIXME: Unify in a better way? */ ++ char buffer[512]; ++ char *start; ++ int len; + -+ yaffs_trace(YAFFS_TRACE_ALWAYS, -+ "yaffs built " __DATE__ " " __TIME__ " Installing."); ++ len = yaffs_proc_read(buffer, &start, 0, sizeof(buffer), NULL, NULL); ++ seq_puts(m, buffer); ++ return 0; ++} + -+ mutex_init(&yaffs_context_lock); ++static int yaffs_proc_open(struct inode *inode, struct file *file) ++{ ++ return single_open(file, yaffs_proc_show, NULL); ++} + ++static struct file_operations procfs_ops = { ++ .owner = THIS_MODULE, ++ .open = yaffs_proc_open, ++ .read = seq_read, ++ .write = yaffs_proc_write, ++}; ++ ++static int yaffs_procfs_init(void) ++{ ++ /* Install the proc_fs entries */ ++ my_proc_entry = proc_create("yaffs", ++ S_IRUGO | S_IFREG, ++ YPROC_ROOT, ++ &procfs_ops); ++ ++ if (my_proc_entry) { ++ return 0; ++ } else { ++ return -ENOMEM; ++ } ++} ++ ++#else ++ ++ ++static int yaffs_procfs_init(void) ++{ + /* Install the proc_fs entries */ + my_proc_entry = create_proc_entry("yaffs", -+ S_IRUGO | S_IFREG, NULL); ++ S_IRUGO | S_IFREG, YPROC_ROOT); + + if (my_proc_entry) { -+ my_proc_entry->write_proc = NULL; ++ my_proc_entry->write_proc = yaffs_proc_write; + my_proc_entry->read_proc = yaffs_proc_read; + my_proc_entry->data = NULL; ++ return 0; + } else { + return -ENOMEM; + } ++} ++ ++#endif + + ++static int __init init_yaffs_fs(void) ++{ ++ int error = 0; ++ struct file_system_to_install *fsinst; ++ ++ yaffs_trace(YAFFS_TRACE_ALWAYS, ++ "yaffs Installing."); ++ ++ mutex_init(&yaffs_context_lock); ++ ++ error = yaffs_procfs_init(); ++ if (error) ++ return error; ++ + /* Now add the file system entries */ + + fsinst = fs_to_install; @@ -13193,9 +15099,9 @@ index 0000000..145517b + struct file_system_to_install *fsinst; + + yaffs_trace(YAFFS_TRACE_ALWAYS, -+ "yaffs built " __DATE__ " " __TIME__ " removing."); ++ "yaffs removing."); + -+ remove_proc_entry("yaffs", NULL); ++ remove_proc_entry("yaffs", YPROC_ROOT); + + fsinst = fs_to_install; + @@ -13216,15 +15122,14 @@ index 0000000..145517b +MODULE_LICENSE("GPL"); diff --git a/fs/yaffs2/yaffs_yaffs1.c b/fs/yaffs2/yaffs_yaffs1.c new file mode 100644 -index 0000000..d277e20 +index 000000000000..1dd4db937fcc --- /dev/null +++ b/fs/yaffs2/yaffs_yaffs1.c -@@ -0,0 +1,422 @@ +@@ -0,0 +1,423 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -13244,10 +15149,10 @@ index 0000000..d277e20 +int yaffs1_scan(struct yaffs_dev *dev) +{ + struct yaffs_ext_tags tags; -+ int blk; ++ u32 blk; + int result; + int chunk; -+ int c; ++ u32 c; + int deleted; + enum yaffs_block_state state; + LIST_HEAD(hard_list); @@ -13320,6 +15225,8 @@ index 0000000..d277e20 + result = yaffs_rd_chunk_tags_nand(dev, chunk, NULL, + &tags); + ++ if (result != YAFFS_OK) ++ continue; + /* Let's have a good look at this chunk... */ + + if (tags.ecc_result == YAFFS_ECC_RESULT_UNFIXED || @@ -13384,15 +15291,15 @@ index 0000000..d277e20 + if (in && + in->variant_type == + YAFFS_OBJECT_TYPE_FILE && -+ in->variant.file_variant.scanned_size < ++ in->variant.file_variant.stored_size < + endpos) { -+ in->variant.file_variant.scanned_size = ++ in->variant.file_variant.stored_size = + endpos; + if (!dev->param.use_header_file_size) { + in->variant. + file_variant.file_size = + in->variant. -+ file_variant.scanned_size; ++ file_variant.stored_size; + } + + } @@ -13547,7 +15454,7 @@ index 0000000..d277e20 + use_header_file_size) + in->variant. + file_variant.file_size -+ = yaffs_oh_to_size(oh); ++ = yaffs_oh_to_size(dev, oh, 0); + break; + case YAFFS_OBJECT_TYPE_HARDLINK: + in->variant. @@ -13644,15 +15551,14 @@ index 0000000..d277e20 +} diff --git a/fs/yaffs2/yaffs_yaffs1.h b/fs/yaffs2/yaffs_yaffs1.h new file mode 100644 -index 0000000..97e2fdd +index 000000000000..051e41c23e1d --- /dev/null +++ b/fs/yaffs2/yaffs_yaffs1.h -@@ -0,0 +1,22 @@ +@@ -0,0 +1,21 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -13672,15 +15578,14 @@ index 0000000..97e2fdd +#endif diff --git a/fs/yaffs2/yaffs_yaffs2.c b/fs/yaffs2/yaffs_yaffs2.c new file mode 100644 -index 0000000..f1dc972 +index 000000000000..9eb42f7ff54d --- /dev/null +++ b/fs/yaffs2/yaffs_yaffs2.c -@@ -0,0 +1,1532 @@ +@@ -0,0 +1,1711 @@ +/* + * YAFFS: Yet Another Flash File System. A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -13699,6 +15604,7 @@ index 0000000..f1dc972 +#include "yaffs_verify.h" +#include "yaffs_attribs.h" +#include "yaffs_summary.h" ++#include "yaffs_endian.h" + +/* + * Checkpoints are really no benefit on very small partitions. @@ -13719,7 +15625,7 @@ index 0000000..f1dc972 + */ +void yaffs_calc_oldest_dirty_seq(struct yaffs_dev *dev) +{ -+ int i; ++ u32 i; + unsigned seq; + unsigned block_no = 0; + struct yaffs_block_info *b; @@ -13732,7 +15638,7 @@ index 0000000..f1dc972 + b = dev->block_info; + for (i = dev->internal_start_block; i <= dev->internal_end_block; i++) { + if (b->block_state == YAFFS_BLOCK_STATE_FULL && -+ (b->pages_in_use - b->soft_del_pages) < ++ (u32)(b->pages_in_use - b->soft_del_pages) < + dev->param.chunks_per_block && + b->seq_number < seq) { + seq = b->seq_number; @@ -13926,6 +15832,18 @@ index 0000000..f1dc972 + +/*--------------------- Checkpointing --------------------*/ + ++static void yaffs2_do_endian_validity_marker(struct yaffs_dev *dev, ++ struct yaffs_checkpt_validity *v) ++{ ++ ++ if (!dev->swap_endian) ++ return; ++ v->struct_type = swap_s32(v->struct_type); ++ v->magic = swap_u32(v->magic); ++ v->version = swap_u32(v->version); ++ v->head = swap_u32(v->head); ++} ++ +static int yaffs2_wr_checkpt_validity_marker(struct yaffs_dev *dev, int head) +{ + struct yaffs_checkpt_validity cp; @@ -13937,6 +15855,8 @@ index 0000000..f1dc972 + cp.version = YAFFS_CHECKPOINT_VERSION; + cp.head = (head) ? 1 : 0; + ++ yaffs2_do_endian_validity_marker(dev, &cp); ++ + return (yaffs2_checkpt_wr(dev, &cp, sizeof(cp)) == sizeof(cp)) ? 1 : 0; +} + @@ -13946,6 +15866,7 @@ index 0000000..f1dc972 + int ok; + + ok = (yaffs2_checkpt_rd(dev, &cp, sizeof(cp)) == sizeof(cp)); ++ yaffs2_do_endian_validity_marker(dev, &cp); + + if (ok) + ok = (cp.struct_type == sizeof(cp)) && @@ -13958,6 +15879,8 @@ index 0000000..f1dc972 +static void yaffs2_dev_to_checkpt_dev(struct yaffs_checkpt_dev *cp, + struct yaffs_dev *dev) +{ ++ cp->struct_type = sizeof(*cp); ++ + cp->n_erased_blocks = dev->n_erased_blocks; + cp->alloc_block = dev->alloc_block; + cp->alloc_page = dev->alloc_page; @@ -13984,30 +15907,67 @@ index 0000000..f1dc972 + dev->seq_number = cp->seq_number; +} + ++static void yaffs2_do_endian_checkpt_dev(struct yaffs_dev *dev, ++ struct yaffs_checkpt_dev *cp) ++{ ++ if (!dev->swap_endian) ++ return; ++ cp->struct_type = swap_s32(cp->struct_type); ++ cp->n_erased_blocks = swap_s32(cp->n_erased_blocks); ++ cp->alloc_block = swap_s32(cp->alloc_block); ++ cp->alloc_page = swap_u32(cp->alloc_page); ++ cp->n_free_chunks = swap_s32(cp->n_free_chunks); ++ cp->n_deleted_files = swap_s32(cp->n_deleted_files); ++ cp->n_unlinked_files = swap_s32(cp->n_unlinked_files); ++ cp->n_bg_deletions = swap_s32(cp->n_bg_deletions); ++} ++ +static int yaffs2_wr_checkpt_dev(struct yaffs_dev *dev) +{ + struct yaffs_checkpt_dev cp; + u32 n_bytes; + u32 n_blocks = dev->internal_end_block - dev->internal_start_block + 1; + int ok; ++ u32 i; ++ union yaffs_block_info_union bu; + + /* Write device runtime values */ + yaffs2_dev_to_checkpt_dev(&cp, dev); -+ cp.struct_type = sizeof(cp); ++ yaffs2_do_endian_checkpt_dev(dev, &cp); + + ok = (yaffs2_checkpt_wr(dev, &cp, sizeof(cp)) == sizeof(cp)); + if (!ok) + return 0; + -+ /* Write block info */ -+ n_bytes = n_blocks * sizeof(struct yaffs_block_info); -+ ok = (yaffs2_checkpt_wr(dev, dev->block_info, n_bytes) == n_bytes); ++ /* Write block info. */ ++ if (!dev->swap_endian) { ++ n_bytes = n_blocks * sizeof(struct yaffs_block_info); ++ ok = (yaffs2_checkpt_wr(dev, dev->block_info, n_bytes) == ++ (int)n_bytes); ++ } else { ++ /* ++ * Need to swap the endianisms. We can't do this in place ++ * since that would damage live data, ++ * so write one block info at a time using a copy. ++ */ ++ for (i = 0; i < n_blocks && ok; i++) { ++ bu.bi = dev->block_info[i]; ++ bu.as_u32[0] = swap_u32(bu.as_u32[0]); ++ bu.as_u32[1] = swap_u32(bu.as_u32[1]); ++ ok = (yaffs2_checkpt_wr(dev, &bu, sizeof(bu)) == sizeof(bu)); ++ } ++ } ++ + if (!ok) + return 0; + -+ /* Write chunk bits */ ++ /* ++ * Write chunk bits. Chunk bits are in bytes so ++ * no endian conversion is needed. ++ */ + n_bytes = n_blocks * dev->chunk_bit_stride; -+ ok = (yaffs2_checkpt_wr(dev, dev->chunk_bits, n_bytes) == n_bytes); ++ ok = (yaffs2_checkpt_wr(dev, dev->chunk_bits, n_bytes) == ++ (int)n_bytes); + + return ok ? 1 : 0; +} @@ -14023,6 +15983,7 @@ index 0000000..f1dc972 + ok = (yaffs2_checkpt_rd(dev, &cp, sizeof(cp)) == sizeof(cp)); + if (!ok) + return 0; ++ yaffs2_do_endian_checkpt_dev(dev, &cp); + + if (cp.struct_type != sizeof(cp)) + return 0; @@ -14031,32 +15992,72 @@ index 0000000..f1dc972 + + n_bytes = n_blocks * sizeof(struct yaffs_block_info); + -+ ok = (yaffs2_checkpt_rd(dev, dev->block_info, n_bytes) == n_bytes); ++ ok = (yaffs2_checkpt_rd(dev, dev->block_info, n_bytes) == ++ (int)n_bytes); + + if (!ok) + return 0; + ++ if (dev->swap_endian) { ++ /* The block info can just be handled as a list of u32s. */ ++ u32 *as_u32 = (u32 *) dev->block_info; ++ u32 n_u32s = n_bytes/sizeof(u32); ++ u32 i; ++ ++ for (i=0; i < n_u32s; i++) ++ as_u32[i] = swap_u32(as_u32[i]); ++ } ++ + n_bytes = n_blocks * dev->chunk_bit_stride; + -+ ok = (yaffs2_checkpt_rd(dev, dev->chunk_bits, n_bytes) == n_bytes); ++ ok = (yaffs2_checkpt_rd(dev, dev->chunk_bits, n_bytes) == ++ (int)n_bytes); ++ + + return ok ? 1 : 0; +} + ++ ++static void yaffs2_checkpt_obj_bit_assign(struct yaffs_checkpt_obj *cp, ++ int bit_offset, ++ int bit_width, ++ u32 value) ++{ ++ u32 and_mask; ++ ++ and_mask = ((1<<bit_width)-1) << bit_offset; ++ ++ cp->bit_field &= ~and_mask; ++ cp->bit_field |= ((value << bit_offset) & and_mask); ++} ++ ++static u32 yaffs2_checkpt_obj_bit_get(struct yaffs_checkpt_obj *cp, ++ int bit_offset, ++ int bit_width) ++{ ++ u32 and_mask; ++ ++ and_mask = ((1<<bit_width)-1); ++ ++ return (cp->bit_field >> bit_offset) & and_mask; ++} ++ +static void yaffs2_obj_checkpt_obj(struct yaffs_checkpt_obj *cp, + struct yaffs_obj *obj) +{ + cp->obj_id = obj->obj_id; + cp->parent_id = (obj->parent) ? obj->parent->obj_id : 0; + cp->hdr_chunk = obj->hdr_chunk; -+ cp->variant_type = obj->variant_type; -+ cp->deleted = obj->deleted; -+ cp->soft_del = obj->soft_del; -+ cp->unlinked = obj->unlinked; -+ cp->fake = obj->fake; -+ cp->rename_allowed = obj->rename_allowed; -+ cp->unlink_allowed = obj->unlink_allowed; -+ cp->serial = obj->serial; ++ ++ yaffs2_checkpt_obj_bit_assign(cp, CHECKPOINT_VARIANT_BITS, obj->variant_type); ++ yaffs2_checkpt_obj_bit_assign(cp, CHECKPOINT_DELETED_BITS, obj->deleted); ++ yaffs2_checkpt_obj_bit_assign(cp, CHECKPOINT_SOFT_DEL_BITS, obj->soft_del); ++ yaffs2_checkpt_obj_bit_assign(cp, CHECKPOINT_UNLINKED_BITS, obj->unlinked); ++ yaffs2_checkpt_obj_bit_assign(cp, CHECKPOINT_FAKE_BITS, obj->fake); ++ yaffs2_checkpt_obj_bit_assign(cp, CHECKPOINT_RENAME_ALLOWED_BITS, obj->rename_allowed); ++ yaffs2_checkpt_obj_bit_assign(cp, CHECKPOINT_UNLINK_ALLOWED_BITS, obj->unlink_allowed); ++ yaffs2_checkpt_obj_bit_assign(cp, CHECKPOINT_SERIAL_BITS, obj->serial); ++ + cp->n_data_chunks = obj->n_data_chunks; + + if (obj->variant_type == YAFFS_OBJECT_TYPE_FILE) @@ -14069,11 +16070,12 @@ index 0000000..f1dc972 + struct yaffs_checkpt_obj *cp) +{ + struct yaffs_obj *parent; ++ u32 cp_variant_type = yaffs2_checkpt_obj_bit_get(cp, CHECKPOINT_VARIANT_BITS); + -+ if (obj->variant_type != cp->variant_type) { ++ if (obj->variant_type != cp_variant_type) { + yaffs_trace(YAFFS_TRACE_ERROR, + "Checkpoint read object %d type %d chunk %d does not match existing object type %d", -+ cp->obj_id, cp->variant_type, cp->hdr_chunk, ++ cp->obj_id, cp_variant_type, cp->hdr_chunk, + obj->variant_type); + return 0; + } @@ -14092,7 +16094,7 @@ index 0000000..f1dc972 + yaffs_trace(YAFFS_TRACE_ALWAYS, + "Checkpoint read object %d parent %d type %d chunk %d Parent type, %d, not directory", + cp->obj_id, cp->parent_id, -+ cp->variant_type, cp->hdr_chunk, ++ cp_variant_type, cp->hdr_chunk, + parent->variant_type); + return 0; + } @@ -14100,26 +16102,56 @@ index 0000000..f1dc972 + } + + obj->hdr_chunk = cp->hdr_chunk; -+ obj->variant_type = cp->variant_type; -+ obj->deleted = cp->deleted; -+ obj->soft_del = cp->soft_del; -+ obj->unlinked = cp->unlinked; -+ obj->fake = cp->fake; -+ obj->rename_allowed = cp->rename_allowed; -+ obj->unlink_allowed = cp->unlink_allowed; -+ obj->serial = cp->serial; ++ ++ obj->variant_type = yaffs2_checkpt_obj_bit_get(cp, CHECKPOINT_VARIANT_BITS); ++ obj->deleted = yaffs2_checkpt_obj_bit_get(cp, CHECKPOINT_DELETED_BITS); ++ obj->soft_del = yaffs2_checkpt_obj_bit_get(cp, CHECKPOINT_SOFT_DEL_BITS); ++ obj->unlinked = yaffs2_checkpt_obj_bit_get(cp, CHECKPOINT_UNLINKED_BITS); ++ obj->fake = yaffs2_checkpt_obj_bit_get(cp, CHECKPOINT_FAKE_BITS); ++ obj->rename_allowed = yaffs2_checkpt_obj_bit_get(cp, CHECKPOINT_RENAME_ALLOWED_BITS); ++ obj->unlink_allowed = yaffs2_checkpt_obj_bit_get(cp, CHECKPOINT_UNLINK_ALLOWED_BITS); ++ obj->serial = yaffs2_checkpt_obj_bit_get(cp, CHECKPOINT_SERIAL_BITS); ++ + obj->n_data_chunks = cp->n_data_chunks; + -+ if (obj->variant_type == YAFFS_OBJECT_TYPE_FILE) ++ if (obj->variant_type == YAFFS_OBJECT_TYPE_FILE) { + obj->variant.file_variant.file_size = cp->size_or_equiv_obj; -+ else if (obj->variant_type == YAFFS_OBJECT_TYPE_HARDLINK) ++ obj->variant.file_variant.stored_size = cp->size_or_equiv_obj; ++ } else if (obj->variant_type == YAFFS_OBJECT_TYPE_HARDLINK) { + obj->variant.hardlink_variant.equiv_id = cp->size_or_equiv_obj; -+ ++ } + if (obj->hdr_chunk > 0) + obj->lazy_loaded = 1; + return 1; +} + ++static void yaffs2_do_endian_tnode(struct yaffs_dev *dev, struct yaffs_tnode *tn) ++{ ++ int i; ++ u32 *as_u32 = (u32 *)tn; ++ int tnode_size_u32 = dev->tnode_size / sizeof(u32); ++ ++ if (!dev->swap_endian) ++ return; ++ /* Swap all the tnode data as u32s to fix endianisms. */ ++ for (i = 0; i<tnode_size_u32; i++) ++ as_u32[i] = swap_u32(as_u32[i]); ++} ++ ++struct yaffs_tnode *yaffs2_do_endian_tnode_copy(struct yaffs_dev *dev, ++ struct yaffs_tnode *tn) ++{ ++ if (!dev->swap_endian) ++ return tn; ++ ++ memcpy(dev->tn_swap_buffer, tn, dev->tnode_size); ++ tn = dev->tn_swap_buffer; ++ ++ yaffs2_do_endian_tnode(dev, tn); ++ ++ return tn; ++} ++ +static int yaffs2_checkpt_tnode_worker(struct yaffs_obj *in, + struct yaffs_tnode *tn, u32 level, + int chunk_offset) @@ -14147,12 +16179,20 @@ index 0000000..f1dc972 + + /* Level 0 tnode */ + base_offset = chunk_offset << YAFFS_TNODES_LEVEL0_BITS; ++ yaffs_do_endian_u32(dev, &base_offset); ++ + ok = (yaffs2_checkpt_wr(dev, &base_offset, sizeof(base_offset)) == + sizeof(base_offset)); -+ if (ok) ++ if (ok) { ++ /* ++ * NB Can't do an in-place endian swizzle since that would ++ * damage current tnode data. ++ * If a tnode endian conversion is required we do a copy. ++ */ ++ tn = yaffs2_do_endian_tnode_copy(dev, tn); + ok = (yaffs2_checkpt_wr(dev, tn, dev->tnode_size) == -+ dev->tnode_size); -+ ++ (int)dev->tnode_size); ++ } + return ok; +} + @@ -14187,14 +16227,18 @@ index 0000000..f1dc972 + ok = (yaffs2_checkpt_rd(dev, &base_chunk, sizeof(base_chunk)) == + sizeof(base_chunk)); + ++ yaffs_do_endian_u32(dev, &base_chunk); ++ + while (ok && (~base_chunk)) { + nread++; + /* Read level 0 tnode */ + + tn = yaffs_get_tnode(dev); -+ if (tn) ++ if (tn) { + ok = (yaffs2_checkpt_rd(dev, tn, dev->tnode_size) == -+ dev->tnode_size); ++ (int)dev->tnode_size); ++ yaffs2_do_endian_tnode(dev, tn); ++ } + else + ok = 0; + @@ -14203,10 +16247,13 @@ index 0000000..f1dc972 + file_stuct_ptr, + base_chunk, tn) ? 1 : 0; + -+ if (ok) ++ if (ok) { + ok = (yaffs2_checkpt_rd + (dev, &base_chunk, + sizeof(base_chunk)) == sizeof(base_chunk)); ++ yaffs_do_endian_u32(dev, &base_chunk); ++ } ++ + } + + yaffs_trace(YAFFS_TRACE_CHECKPOINT, @@ -14216,6 +16263,21 @@ index 0000000..f1dc972 + return ok ? 1 : 0; +} + ++ ++static void yaffs2_do_endian_checkpt_obj(struct yaffs_dev *dev, ++ struct yaffs_checkpt_obj *cp) ++{ ++ if (!dev->swap_endian) ++ return; ++ cp->struct_type = swap_s32(cp->struct_type); ++ cp->obj_id = swap_u32(cp->obj_id); ++ cp->parent_id = swap_u32(cp->parent_id); ++ cp->hdr_chunk = swap_s32(cp->hdr_chunk); ++ cp->bit_field = swap_u32(cp->bit_field); ++ cp->n_data_chunks = swap_s32(cp->n_data_chunks); ++ cp->size_or_equiv_obj = swap_loff_t(cp->size_or_equiv_obj); ++} ++ +static int yaffs2_wr_checkpt_objs(struct yaffs_dev *dev) +{ + struct yaffs_obj *obj; @@ -14223,6 +16285,7 @@ index 0000000..f1dc972 + int i; + int ok = 1; + struct list_head *lh; ++ u32 cp_variant_type; + + /* Iterate through the objects in each hash entry, + * dumping them to the checkpointing stream. @@ -14234,12 +16297,14 @@ index 0000000..f1dc972 + if (!obj->defered_free) { + yaffs2_obj_checkpt_obj(&cp, obj); + cp.struct_type = sizeof(cp); -+ ++ cp_variant_type = yaffs2_checkpt_obj_bit_get( ++ &cp, CHECKPOINT_VARIANT_BITS); + yaffs_trace(YAFFS_TRACE_CHECKPOINT, + "Checkpoint write object %d parent %d type %d chunk %d obj addr %p", + cp.obj_id, cp.parent_id, -+ cp.variant_type, cp.hdr_chunk, obj); ++ cp_variant_type, cp.hdr_chunk, obj); + ++ yaffs2_do_endian_checkpt_obj (dev, &cp); + ok = (yaffs2_checkpt_wr(dev, &cp, + sizeof(cp)) == sizeof(cp)); + @@ -14254,6 +16319,7 @@ index 0000000..f1dc972 + /* Dump end of list */ + memset(&cp, 0xff, sizeof(struct yaffs_checkpt_obj)); + cp.struct_type = sizeof(cp); ++ yaffs2_do_endian_checkpt_obj (dev, &cp); + + if (ok) + ok = (yaffs2_checkpt_wr(dev, &cp, sizeof(cp)) == sizeof(cp)); @@ -14267,11 +16333,14 @@ index 0000000..f1dc972 + struct yaffs_checkpt_obj cp; + int ok = 1; + int done = 0; ++ u32 cp_variant_type; + LIST_HEAD(hard_list); + + + while (ok && !done) { + ok = (yaffs2_checkpt_rd(dev, &cp, sizeof(cp)) == sizeof(cp)); ++ yaffs2_do_endian_checkpt_obj (dev, &cp); ++ + if (cp.struct_type != sizeof(cp)) { + yaffs_trace(YAFFS_TRACE_CHECKPOINT, + "struct size %d instead of %d ok %d", @@ -14279,17 +16348,19 @@ index 0000000..f1dc972 + ok = 0; + } + ++ cp_variant_type = yaffs2_checkpt_obj_bit_get( ++ &cp, CHECKPOINT_VARIANT_BITS); + yaffs_trace(YAFFS_TRACE_CHECKPOINT, + "Checkpoint read object %d parent %d type %d chunk %d ", -+ cp.obj_id, cp.parent_id, cp.variant_type, ++ cp.obj_id, cp.parent_id, cp_variant_type, + cp.hdr_chunk); + -+ if (ok && cp.obj_id == ~0) { ++ if (ok && cp.obj_id == (u32)(~0)) { + done = 1; + } else if (ok) { + obj = + yaffs_find_or_create_by_number(dev, cp.obj_id, -+ cp.variant_type); ++ cp_variant_type); + if (obj) { + ok = yaffs2_checkpt_obj_to_obj(obj, &cp); + if (!ok) @@ -14320,6 +16391,8 @@ index 0000000..f1dc972 + + yaffs2_get_checkpt_sum(dev, &checkpt_sum); + ++ yaffs_do_endian_u32(dev, &checkpt_sum); ++ + ok = (yaffs2_checkpt_wr(dev, &checkpt_sum, sizeof(checkpt_sum)) == + sizeof(checkpt_sum)); + @@ -14342,6 +16415,7 @@ index 0000000..f1dc972 + + if (!ok) + return 0; ++ yaffs_do_endian_u32(dev, &checkpt_sum1); + + if (checkpt_sum0 != checkpt_sum1) + return 0; @@ -14506,6 +16580,10 @@ index 0000000..f1dc972 + return retval; +} + ++/* End of checkpointing */ ++ ++/* Hole handling logic for truncate past end of file */ ++ +int yaffs2_handle_hole(struct yaffs_obj *obj, loff_t new_size) +{ + /* if new_size > old_file_size. @@ -14559,7 +16637,7 @@ index 0000000..f1dc972 + + while (increase > 0 && small_increase_ok) { + this_write = increase; -+ if (this_write > dev->data_bytes_per_chunk) ++ if (this_write > (int)dev->data_bytes_per_chunk) + this_write = dev->data_bytes_per_chunk; + written = + yaffs_do_file_wr(obj, local_buffer, pos, this_write, @@ -14590,6 +16668,8 @@ index 0000000..f1dc972 + return result; +} + ++/* Yaffs2 scanning */ ++ +struct yaffs_block_index { + int seq; + int block; @@ -14643,6 +16723,9 @@ index 0000000..f1dc972 + dev->summary_used++; + } + ++ if (result == YAFFS_FAIL) ++ yaffs_trace(YAFFS_TRACE_SCAN, ++ "Could not get tags for chunk %d\n", chunk); + /* Let's have a good look at this chunk... */ + + if (!tags.chunk_used) { @@ -14746,9 +16829,9 @@ index 0000000..f1dc972 + endpos = chunk_base + tags.n_bytes; + + if (!in->valid && -+ in->variant.file_variant.scanned_size < endpos) { ++ in->variant.file_variant.stored_size < endpos) { + in->variant.file_variant. -+ scanned_size = endpos; ++ stored_size = endpos; + in->variant.file_variant. + file_size = endpos; + } @@ -14799,6 +16882,8 @@ index 0000000..f1dc972 + + oh = (struct yaffs_obj_hdr *)chunk_data; + ++ yaffs_do_endian_oh(dev, oh); ++ + if (dev->param.inband_tags) { + /* Fix up the header if they got + * corrupted by inband tags */ @@ -14836,10 +16921,10 @@ index 0000000..f1dc972 + tags.extra_obj_type == YAFFS_OBJECT_TYPE_FILE) + )) { + loff_t this_size = (oh) ? -+ yaffs_oh_to_size(oh) : ++ yaffs_oh_to_size(dev, oh, 0) : + tags.extra_file_size; + u32 parent_obj_id = (oh) ? -+ oh->parent_obj_id : ++ (u32)oh->parent_obj_id : + tags.extra_parent_id; + + is_shrink = (oh) ? @@ -14871,12 +16956,14 @@ index 0000000..f1dc972 + } + + if (!in->valid && in->variant_type != -+ (oh ? oh->type : tags.extra_obj_type)) ++ (oh ? oh->type : tags.extra_obj_type)) { + yaffs_trace(YAFFS_TRACE_ERROR, -+ "yaffs tragedy: Bad object type, %d != %d, for object %d at chunk %d during scan", ++ "yaffs tragedy: Bad type, %d != %d, for object %d at chunk %d during scan", + oh ? oh->type : tags.extra_obj_type, + in->variant_type, tags.obj_id, + chunk); ++ in = yaffs_retype_obj(in, oh ? oh->type : tags.extra_obj_type); ++ } + + if (!in->valid && + (tags.obj_id == YAFFS_OBJECTID_ROOT || @@ -14911,7 +16998,7 @@ index 0000000..f1dc972 + parent = yaffs_find_or_create_by_number(dev, + oh->parent_obj_id, + YAFFS_OBJECT_TYPE_DIRECTORY); -+ file_size = yaffs_oh_to_size(oh); ++ file_size = yaffs_oh_to_size(dev, oh, 0); + is_shrink = oh->is_shrink; + equiv_id = oh->equiv_id; + } else { @@ -14975,7 +17062,7 @@ index 0000000..f1dc972 + break; + case YAFFS_OBJECT_TYPE_FILE: + file_var = &in->variant.file_variant; -+ if (file_var->scanned_size < file_size) { ++ if (file_var->stored_size < file_size) { + /* This covers the case where the file + * size is greater than the data held. + * This will happen if the file is @@ -14983,7 +17070,7 @@ index 0000000..f1dc972 + * current data extents. + */ + file_var->file_size = file_size; -+ file_var->scanned_size = file_size; ++ file_var->stored_size = file_size; + } + + if (file_var->shrink_size > file_size) @@ -15020,14 +17107,13 @@ index 0000000..f1dc972 + +int yaffs2_scan_backwards(struct yaffs_dev *dev) +{ -+ int blk; ++ u32 blk; + int block_iter; + int start_iter; + int end_iter; + int n_to_scan = 0; + enum yaffs_block_state state; + int c; -+ int deleted; + LIST_HEAD(hard_list); + struct yaffs_block_info *bi; + u32 seq_number; @@ -15117,7 +17203,7 @@ index 0000000..f1dc972 + bi++; + } + -+ yaffs_trace(YAFFS_TRACE_SCAN, "%d blocks to be sorted...", n_to_scan); ++ yaffs_trace(YAFFS_TRACE_ALWAYS, "%d blocks to be sorted...", n_to_scan); + + cond_resched(); + @@ -15145,7 +17231,6 @@ index 0000000..f1dc972 + /* get the block to scan in the correct order */ + blk = block_index[block_iter].block; + bi = yaffs_get_block_info(dev, blk); -+ deleted = 0; + + summary_available = yaffs_summary_read(dev, dev->sum_tags, blk); + @@ -15210,15 +17295,14 @@ index 0000000..f1dc972 +} diff --git a/fs/yaffs2/yaffs_yaffs2.h b/fs/yaffs2/yaffs_yaffs2.h new file mode 100644 -index 0000000..2363bfd +index 000000000000..4eaa722f272b --- /dev/null +++ b/fs/yaffs2/yaffs_yaffs2.h -@@ -0,0 +1,39 @@ +@@ -0,0 +1,38 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -15255,15 +17339,14 @@ index 0000000..2363bfd +#endif diff --git a/fs/yaffs2/yportenv.h b/fs/yaffs2/yportenv.h new file mode 100644 -index 0000000..76a7914 +index 000000000000..68c239c07435 --- /dev/null +++ b/fs/yaffs2/yportenv.h -@@ -0,0 +1,65 @@ +@@ -0,0 +1,92 @@ +/* + * YAFFS: Yet another Flash File System . A NAND-flash specific file system. + * -+ * Copyright (C) 2002-2011 Aleph One Ltd. -+ * for Toby Churchill Ltd and Brightstar Engineering ++ * Copyright (C) 2002-2018 Aleph One Ltd. + * + * Created by Charles Manning <charles@aleph1.co.uk> + * @@ -15274,9 +17357,27 @@ index 0000000..76a7914 + * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL. + */ + -+#ifndef __YPORTENV_LINUX_H__ -+#define __YPORTENV_LINUX_H__ ++#ifndef __YPORTENV_H__ ++#define __YPORTENV_H__ ++ ++/* ++ * Define the MTD version in terms of Linux Kernel versions ++ * This allows yaffs to be used independantly of the kernel ++ * as well as with it. ++ */ ++ ++#define MTD_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c)) ++ ++#ifdef YAFFS_OUT_OF_TREE ++#include "moduleconfig.h" ++#endif ++ ++#include <linux/version.h> ++#define MTD_VERSION_CODE LINUX_VERSION_CODE + ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)) ++#include <linux/config.h> ++#endif +#include <linux/version.h> +#include <linux/kernel.h> +#include <linux/mm.h> @@ -15304,26 +17405,36 @@ index 0000000..76a7914 +#define YAFFS_ROOT_MODE 0755 +#define YAFFS_LOSTNFOUND_MODE 0700 + ++#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0)) +#define Y_CURRENT_TIME CURRENT_TIME.tv_sec ++#else ++#define Y_CURRENT_TIME current_kernel_time().tv_sec ++#endif +#define Y_TIME_CONVERT(x) (x).tv_sec ++#else ++#if (LINUX_VERSION_CODE < KERNEL_VERSION(4,12,0)) ++#define Y_CURRENT_TIME CURRENT_TIME ++#else ++#define Y_CURRENT_TIME current_kernel_time() ++#endif ++#define Y_TIME_CONVERT(x) (x) ++#endif + +#define compile_time_assertion(assertion) \ + ({ int x = __builtin_choose_expr(assertion, 0, (void)0); (void) x; }) + ++ +#define yaffs_printf(msk, fmt, ...) \ + printk(KERN_DEBUG "yaffs: " fmt "\n", ##__VA_ARGS__) + -+#ifdef CONFIG_YAFFS_DEBUG +#define yaffs_trace(msk, fmt, ...) do { \ + if (yaffs_trace_mask & (msk)) \ + printk(KERN_DEBUG "yaffs: " fmt "\n", ##__VA_ARGS__); \ +} while (0) -+#else -+#define yaffs_trace(msk, fmt, ...) do { \ -+} while (0) -+#endif ++ + +#endif -- -1.7.10.4 +2.19.1 diff --git a/features/yaffs2/yaffs2-include-rawnand.h-instead-of-nand.h.patch b/features/yaffs2/yaffs2-include-rawnand.h-instead-of-nand.h.patch deleted file mode 100644 index f7edeb72..00000000 --- a/features/yaffs2/yaffs2-include-rawnand.h-instead-of-nand.h.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 0ef24a829eeedfd9986ede14ac1cfadcdcc49af0 Mon Sep 17 00:00:00 2001 -From: Kevin Hao <kexin.hao@windriver.com> -Date: Fri, 23 Feb 2018 13:31:33 +0800 -Subject: [PATCH 1/2] yaffs2: include rawnand.h instead of nand.h - -The nand.h has been renamed to rawnand.h by commit d4092d76a4a4 ("mtd: -nand: Rename nand.h into rawnand.h"), adjust the yaffs2 code according -to this change. - -Signed-off-by: Kevin Hao <kexin.hao@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - fs/yaffs2/yaffs_mtdif.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/fs/yaffs2/yaffs_mtdif.c b/fs/yaffs2/yaffs_mtdif.c -index fa4b99834570..03a3d9c24e4c 100644 ---- a/fs/yaffs2/yaffs_mtdif.c -+++ b/fs/yaffs2/yaffs_mtdif.c -@@ -18,7 +18,7 @@ - #include "linux/mtd/mtd.h" - #include "linux/types.h" - #include "linux/time.h" --#include "linux/mtd/nand.h" -+#include "linux/mtd/rawnand.h" - #include "linux/kernel.h" - #include "linux/version.h" - #include "linux/types.h" --- -2.5.0 - diff --git a/features/yaffs2/yaffs2-remove-the-using-of-macro-__DATE__-__TIME__.patch b/features/yaffs2/yaffs2-remove-the-using-of-macro-__DATE__-__TIME__.patch deleted file mode 100644 index d8ce86e6..00000000 --- a/features/yaffs2/yaffs2-remove-the-using-of-macro-__DATE__-__TIME__.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 96930820e0cb6d4b31d5e0c8f3174805f4a868b3 Mon Sep 17 00:00:00 2001 -From: Kevin Hao <kexin.hao@windriver.com> -Date: Thu, 12 Jun 2014 09:20:36 +0800 -Subject: [PATCH] yaffs2: remove the using of macro __DATE__ & __TIME__ - -Using these macros will make the build non-deterministic and -is explicitly forbidden in the kernel. - -Signed-off-by: Kevin Hao <kexin.hao@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - fs/yaffs2/yaffs_vfs.c | 10 +++------- - 1 file changed, 3 insertions(+), 7 deletions(-) - -diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index 894e185aa7b7..13de856f545a 100644 ---- a/fs/yaffs2/yaffs_vfs.c -+++ b/fs/yaffs2/yaffs_vfs.c -@@ -3244,9 +3244,7 @@ static int yaffs_proc_read(char *page, - /* Print header first */ - if (step == 0) - buf += -- sprintf(buf, -- "Multi-version YAFFS built:" __DATE__ " " __TIME__ -- "\n"); -+ sprintf(buf, "Multi-version YAFFS\n"); - else if (step == 1) - buf += sprintf(buf, "\n"); - else { -@@ -3529,8 +3527,7 @@ static int __init init_yaffs_fs(void) - int error = 0; - struct file_system_to_install *fsinst; - -- yaffs_trace(YAFFS_TRACE_ALWAYS, -- "yaffs built " __DATE__ " " __TIME__ " Installing."); -+ yaffs_trace(YAFFS_TRACE_ALWAYS, "yaffs Installing."); - - mutex_init(&yaffs_context_lock); - -@@ -3580,8 +3577,7 @@ static void __exit exit_yaffs_fs(void) - - struct file_system_to_install *fsinst; - -- yaffs_trace(YAFFS_TRACE_ALWAYS, -- "yaffs built " __DATE__ " " __TIME__ " removing."); -+ yaffs_trace(YAFFS_TRACE_ALWAYS, "yaffs removing."); - - #if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0)) - remove_proc_entry("yaffs", YPROC_ROOT); --- -1.8.1.2 - diff --git a/features/yaffs2/yaffs2-replace-f_dentry-to-f_path.dentry.patch b/features/yaffs2/yaffs2-replace-f_dentry-to-f_path.dentry.patch deleted file mode 100644 index bac4cfd0..00000000 --- a/features/yaffs2/yaffs2-replace-f_dentry-to-f_path.dentry.patch +++ /dev/null @@ -1,132 +0,0 @@ -From b4c6a6aca7e7590528efbd6562551ae5e6ba20e3 Mon Sep 17 00:00:00 2001 -From: Yang Shi <yang.shi@windriver.com> -Date: Wed, 24 Feb 2016 14:37:11 +0800 -Subject: [PATCH 1/3] yaffs2: replace f_dentry to f_path.dentry - -Upstream commit 78d28e651f97866d608d9b41f8ad291e65d47dd5 ("kill f_dentry macro") -removed f_dentry from struct file, so replace it to f_path.dentry to fix the -build failure. - -Signed-off-by: Yang Shi <yang.shi@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - fs/yaffs2/yaffs_vfs.c | 26 +++++++++++++------------- - 1 file changed, 13 insertions(+), 13 deletions(-) - -diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index a84e57eb701d..fbbf31303537 100644 ---- a/fs/yaffs2/yaffs_vfs.c -+++ b/fs/yaffs2/yaffs_vfs.c -@@ -274,7 +274,7 @@ static int yaffs_readpage_nolock(struct file *f, struct page *pg) - (long long)pos, - (unsigned)PAGE_CACHE_SIZE); - -- obj = yaffs_dentry_to_obj(f->f_dentry); -+ obj = yaffs_dentry_to_obj(f->f_path.dentry); - - dev = obj->my_dev; - -@@ -472,7 +472,7 @@ static ssize_t yaffs_hold_space(struct file *f) - - int n_free_chunks; - -- obj = yaffs_dentry_to_obj(f->f_dentry); -+ obj = yaffs_dentry_to_obj(f->f_path.dentry); - - dev = obj->my_dev; - -@@ -490,7 +490,7 @@ static void yaffs_release_space(struct file *f) - struct yaffs_obj *obj; - struct yaffs_dev *dev; - -- obj = yaffs_dentry_to_obj(f->f_dentry); -+ obj = yaffs_dentry_to_obj(f->f_path.dentry); - - dev = obj->my_dev; - -@@ -582,7 +582,7 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, - struct inode *inode; - struct yaffs_dev *dev; - -- obj = yaffs_dentry_to_obj(f->f_dentry); -+ obj = yaffs_dentry_to_obj(f->f_path.dentry); - - if (!obj) { - yaffs_trace(YAFFS_TRACE_OS, -@@ -594,7 +594,7 @@ static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, - - yaffs_gross_lock(dev); - -- inode = f->f_dentry->d_inode; -+ inode = f->f_path.dentry->d_inode; - - if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND) - ipos = inode->i_size; -@@ -745,7 +745,7 @@ static int yaffs_file_flush(struct file *file, fl_owner_t id) - static int yaffs_file_flush(struct file *file) - #endif - { -- struct yaffs_obj *obj = yaffs_dentry_to_obj(file->f_dentry); -+ struct yaffs_obj *obj = yaffs_dentry_to_obj(file->f_path.dentry); - - struct yaffs_dev *dev = obj->my_dev; - -@@ -1712,14 +1712,14 @@ static int yaffs_readdir(struct file *file, struct dir_context *ctx) - struct yaffs_obj *obj; - struct yaffs_dev *dev; - struct yaffs_search_context *sc; -- struct inode *inode = file->f_dentry->d_inode; -+ struct inode *inode = file->f_path.dentry->d_inode; - unsigned long offset, curoffs; - struct yaffs_obj *l; - int ret_val = 0; - - char name[YAFFS_MAX_NAME_LENGTH + 1]; - -- obj = yaffs_dentry_to_obj(file->f_dentry); -+ obj = yaffs_dentry_to_obj(file->f_path.dentry); - dev = obj->my_dev; - - yaffs_gross_lock(dev); -@@ -1753,7 +1753,7 @@ static int yaffs_readdir(struct file *file, struct dir_context *ctx) - if (offset == 1) { - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_readdir: entry .. ino %d", -- (int)file->f_dentry->d_parent->d_inode->i_ino); -+ (int)file->f_path.dentry->d_parent->d_inode->i_ino); - yaffs_gross_unlock(dev); - if (!dir_emit_dotdot(file, ctx)) { - yaffs_gross_lock(dev); -@@ -1815,14 +1815,14 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) - struct yaffs_obj *obj; - struct yaffs_dev *dev; - struct yaffs_search_context *sc; -- struct inode *inode = f->f_dentry->d_inode; -+ struct inode *inode = f->f_path.dentry->d_inode; - unsigned long offset, curoffs; - struct yaffs_obj *l; - int ret_val = 0; - - char name[YAFFS_MAX_NAME_LENGTH + 1]; - -- obj = yaffs_dentry_to_obj(f->f_dentry); -+ obj = yaffs_dentry_to_obj(f->f_path.dentry); - dev = obj->my_dev; - - yaffs_gross_lock(dev); -@@ -1856,10 +1856,10 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) - if (offset == 1) { - yaffs_trace(YAFFS_TRACE_OS, - "yaffs_readdir: entry .. ino %d", -- (int)f->f_dentry->d_parent->d_inode->i_ino); -+ (int)f->f_path.dentry->d_parent->d_inode->i_ino); - yaffs_gross_unlock(dev); - if (filldir(dirent, "..", 2, offset, -- f->f_dentry->d_parent->d_inode->i_ino, -+ f->f_path.dentry->d_parent->d_inode->i_ino, - DT_DIR) < 0) { - yaffs_gross_lock(dev); - goto out; --- -2.5.0 - diff --git a/features/yaffs2/yaffs2-restore-multi-kernel-version-functionality.patch b/features/yaffs2/yaffs2-restore-multi-kernel-version-functionality.patch deleted file mode 100644 index d4a83881..00000000 --- a/features/yaffs2/yaffs2-restore-multi-kernel-version-functionality.patch +++ /dev/null @@ -1,4830 +0,0 @@ -From 373ddb3524228841462f002782156c0607a22e5d Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@windriver.com> -Date: Sat, 31 Aug 2013 01:10:23 -0400 -Subject: [PATCH 1/3] yaffs2: restore multi-kernel version functionality - -The initial integration of yaffs2 was via the single kernel version variant -of the code. That code has some fundamental issues, and isn't a suitable -base. - -With this commit, we restore the multi kernel functionality and with it all -required include files. - -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - fs/yaffs2/Kconfig | 147 +- - fs/yaffs2/yaffs_mtdif.c | 118 +- - fs/yaffs2/yaffs_vfs.c | 3668 +++++++++++++++++++++++++++++------------------ - fs/yaffs2/yportenv.h | 34 +- - 4 files changed, 2559 insertions(+), 1408 deletions(-) - -diff --git a/fs/yaffs2/Kconfig b/fs/yaffs2/Kconfig -index bd6e8df..408570f 100644 ---- a/fs/yaffs2/Kconfig -+++ b/fs/yaffs2/Kconfig -@@ -20,11 +20,152 @@ config YAFFS_FS - Further information on yaffs2 is available at - <http://www.aleph1.co.uk/yaffs/>. - --config YAFFS_DEBUG -- bool "Enable yaffs debugging" -+config YAFFS_YAFFS1 -+ bool "512 byte / page devices" - depends on YAFFS_FS -+ default y -+ help -+ Enable yaffs1 support -- yaffs for 512 byte / page devices -+ -+ Not needed for 2K-page devices. -+ -+ If unsure, say Y. -+ -+config YAFFS_9BYTE_TAGS -+ bool "Use older-style on-NAND data format with pageStatus byte" -+ depends on YAFFS_YAFFS1 -+ default n -+ help -+ -+ Older-style on-NAND data format has a "pageStatus" byte to record -+ chunk/page state. This byte is zero when the page is discarded. -+ Choose this option if you have existing on-NAND data using this -+ format that you need to continue to support. New data written -+ also uses the older-style format. Note: Use of this option -+ generally requires that MTD's oob layout be adjusted to use the -+ older-style format. See notes on tags formats and MTD versions -+ in yaffs_mtdif1.c. -+ -+ If unsure, say N. -+ -+config YAFFS_DOES_ECC -+ bool "Lets yaffs do its own ECC" -+ depends on YAFFS_FS && YAFFS_YAFFS1 && !YAFFS_9BYTE_TAGS -+ default n -+ help -+ This enables yaffs to use its own ECC functions instead of using -+ the ones from the generic MTD-NAND driver. -+ -+ If unsure, say N. -+ -+config YAFFS_ECC_WRONG_ORDER -+ bool "Use the same ecc byte order as Steven Hill's nand_ecc.c" -+ depends on YAFFS_FS && YAFFS_DOES_ECC && !YAFFS_9BYTE_TAGS - default n - help -- Enable the yaffs debugging tracing. -+ This makes yaffs_ecc.c use the same ecc byte order as Steven -+ Hill's nand_ecc.c. If not set, then you get the same ecc byte -+ order as SmartMedia. - - If unsure, say N. -+ -+config YAFFS_YAFFS2 -+ bool "2048 byte (or larger) / page devices" -+ depends on YAFFS_FS -+ default y -+ help -+ Enable yaffs2 support -- yaffs for >= 2K bytes per page devices -+ -+ If unsure, say Y. -+ -+config YAFFS_AUTO_YAFFS2 -+ bool "Autoselect yaffs2 format" -+ depends on YAFFS_YAFFS2 -+ default y -+ help -+ Without this, you need to explicitely use yaffs2 as the file -+ system type. With this, you can say "yaffs" and yaffs or yaffs2 -+ will be used depending on the device page size (yaffs on -+ 512-byte page devices, yaffs2 on 2K page devices). -+ -+ If unsure, say Y. -+ -+config YAFFS_DISABLE_TAGS_ECC -+ bool "Disable yaffs from doing ECC on tags by default" -+ depends on YAFFS_FS && YAFFS_YAFFS2 -+ default n -+ help -+ This defaults yaffs to using its own ECC calculations on tags instead of -+ just relying on the MTD. -+ This behavior can also be overridden with tags_ecc_on and -+ tags_ecc_off mount options. -+ -+ If unsure, say N. -+ -+config YAFFS_ALWAYS_CHECK_CHUNK_ERASED -+ bool "Force chunk erase check" -+ depends on YAFFS_FS -+ default n -+ help -+ Normally yaffs only checks chunks before writing until an erased -+ chunk is found. This helps to detect any partially written -+ chunks that might have happened due to power loss. -+ -+ Enabling this forces on the test that chunks are erased in flash -+ before writing to them. This takes more time but is potentially -+ a bit more secure. -+ -+ Suggest setting Y during development and ironing out driver -+ issues etc. Suggest setting to N if you want faster writing. -+ -+ If unsure, say Y. -+ -+config YAFFS_EMPTY_LOST_AND_FOUND -+ bool "Empty lost and found on boot" -+ depends on YAFFS_FS -+ default n -+ help -+ If this is enabled then the contents of lost and found is -+ automatically dumped at mount. -+ -+ If unsure, say N. -+ -+config YAFFS_DISABLE_BLOCK_REFRESHING -+ bool "Disable yaffs2 block refreshing" -+ depends on YAFFS_FS -+ default n -+ help -+ If this is set, then block refreshing is disabled. -+ Block refreshing infrequently refreshes the oldest block in -+ a yaffs2 file system. This mechanism helps to refresh flash to -+ mitigate against data loss. This is particularly useful for MLC. -+ -+ If unsure, say N. -+ -+config YAFFS_DISABLE_BACKGROUND -+ bool "Disable yaffs2 background processing" -+ depends on YAFFS_FS -+ default n -+ help -+ If this is set, then background processing is disabled. -+ Background processing makes many foreground activities faster. -+ -+ If unsure, say N. -+ -+config YAFFS_DISABLE_BAD_BLOCK_MARKING -+ bool "Disable yaffs2 bad block marking" -+ depends on YAFFS_FS -+ default n -+ help -+ Useful during early flash bring up to prevent problems causing -+ lots of bad block marking. -+ -+ If unsure, say N. -+ -+config YAFFS_XATTR -+ bool "Enable yaffs2 xattr support" -+ depends on YAFFS_FS -+ default y -+ help -+ If this is set then yaffs2 will provide xattr support. -+ If unsure, say Y. -diff --git a/fs/yaffs2/yaffs_mtdif.c b/fs/yaffs2/yaffs_mtdif.c -index 7b2ac36..7ae63c5 100644 ---- a/fs/yaffs2/yaffs_mtdif.c -+++ b/fs/yaffs2/yaffs_mtdif.c -@@ -28,6 +28,21 @@ - #include "yaffs_linux.h" - - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)) -+#define MTD_OPS_AUTO_OOB MTD_OOB_AUTO -+#endif -+ -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)) -+#define mtd_erase(m, ei) (m)->erase(m, ei) -+#define mtd_write_oob(m, addr, pops) (m)->write_oob(m, addr, pops) -+#define mtd_read_oob(m, addr, pops) (m)->read_oob(m, addr, pops) -+#define mtd_block_isbad(m, offs) (m)->block_isbad(m, offs) -+#define mtd_block_markbad(m, offs) (m)->block_markbad(m, offs) -+#endif -+ -+ -+ - int nandmtd_erase_block(struct yaffs_dev *dev, int block_no) - { - struct mtd_info *mtd = yaffs_dev_to_mtd(dev); -@@ -45,7 +60,7 @@ int nandmtd_erase_block(struct yaffs_dev *dev, int block_no) - ei.callback = NULL; - ei.priv = (u_long) dev; - -- retval = mtd->erase(mtd, &ei); -+ retval = mtd_erase(mtd, &ei); - - if (retval == 0) - return YAFFS_OK; -@@ -63,6 +78,20 @@ static int yaffs_mtd_write(struct yaffs_dev *dev, int nand_chunk, - struct mtd_oob_ops ops; - int retval; - -+ yaffs_trace(YAFFS_TRACE_MTD, -+ "yaffs_mtd_write(%p, %d, %p, %d, %p, %d)\n", -+ dev, nand_chunk, data, data_len, oob, oob_len); -+ -+ if (!data || !data_len) { -+ data = NULL; -+ data_len = 0; -+ } -+ -+ if (!oob || !oob_len) { -+ oob = NULL; -+ oob_len = 0; -+ } -+ - addr = ((loff_t) nand_chunk) * dev->param.total_bytes_per_chunk; - memset(&ops, 0, sizeof(ops)); - ops.mode = MTD_OPS_AUTO_OOB; -@@ -71,7 +100,7 @@ static int yaffs_mtd_write(struct yaffs_dev *dev, int nand_chunk, - ops.datbuf = (u8 *)data; - ops.oobbuf = (u8 *)oob; - -- retval = mtd->write_oob(mtd, addr, &ops); -+ retval = mtd_write_oob(mtd, addr, &ops); - if (retval) { - yaffs_trace(YAFFS_TRACE_MTD, - "write_oob failed, chunk %d, mtd error %d", -@@ -90,7 +119,7 @@ static int yaffs_mtd_read(struct yaffs_dev *dev, int nand_chunk, - struct mtd_oob_ops ops; - int retval; - -- addr = ((loff_t) nand_chunk) * dev->data_bytes_per_chunk; -+ addr = ((loff_t) nand_chunk) * dev->param.total_bytes_per_chunk; - memset(&ops, 0, sizeof(ops)); - ops.mode = MTD_OPS_AUTO_OOB; - ops.len = (data) ? data_len : 0; -@@ -98,10 +127,16 @@ static int yaffs_mtd_read(struct yaffs_dev *dev, int nand_chunk, - ops.datbuf = data; - ops.oobbuf = oob; - -+#if (MTD_VERSION_CODE < MTD_VERSION(2, 6, 20)) -+ /* In MTD 2.6.18 to 2.6.19 nand_base.c:nand_do_read_oob() has a bug; -+ * help it out with ops.len = ops.ooblen when ops.datbuf == NULL. -+ */ -+ ops.len = (ops.datbuf) ? ops.len : ops.ooblen; -+#endif - /* Read page and oob using MTD. - * Check status and determine ECC result. - */ -- retval = mtd->read_oob(mtd, addr, &ops); -+ retval = mtd_read_oob(mtd, addr, &ops); - if (retval) - yaffs_trace(YAFFS_TRACE_MTD, - "read_oob failed, chunk %d, mtd error %d", -@@ -154,7 +189,7 @@ static int yaffs_mtd_erase(struct yaffs_dev *dev, int block_no) - ei.callback = NULL; - ei.priv = (u_long) dev; - -- retval = mtd->erase(mtd, &ei); -+ retval = mtd_erase(mtd, &ei); - - if (retval == 0) - return YAFFS_OK; -@@ -165,24 +200,24 @@ static int yaffs_mtd_erase(struct yaffs_dev *dev, int block_no) - static int yaffs_mtd_mark_bad(struct yaffs_dev *dev, int block_no) - { - struct mtd_info *mtd = yaffs_dev_to_mtd(dev); -- int blocksize = dev->param.chunks_per_block * dev->data_bytes_per_chunk; -+ int blocksize = dev->param.chunks_per_block * dev->param.total_bytes_per_chunk; - int retval; - - yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "marking block %d bad", block_no); - -- retval = mtd->block_markbad(mtd, (loff_t) blocksize * block_no); -+ retval = mtd_block_markbad(mtd, (loff_t) blocksize * block_no); - return (retval) ? YAFFS_FAIL : YAFFS_OK; - } - - static int yaffs_mtd_check_bad(struct yaffs_dev *dev, int block_no) - { - struct mtd_info *mtd = yaffs_dev_to_mtd(dev); -- int blocksize = dev->param.chunks_per_block * dev->data_bytes_per_chunk; -+ int blocksize = dev->param.chunks_per_block * dev->param.total_bytes_per_chunk; - int retval; - -- yaffs_trace(YAFFS_TRACE_BAD_BLOCKS, "checking block %d bad", block_no); -+ yaffs_trace(YAFFS_TRACE_MTD, "checking block %d bad", block_no); - -- retval = mtd->block_isbad(mtd, (loff_t) blocksize * block_no); -+ retval = mtd_block_isbad(mtd, (loff_t) blocksize * block_no); - return (retval) ? YAFFS_FAIL : YAFFS_OK; - } - -@@ -197,7 +232,6 @@ static int yaffs_mtd_deinitialise(struct yaffs_dev *dev) - } - - -- - void yaffs_mtd_drv_install(struct yaffs_dev *dev) - { - struct yaffs_driver *drv = &dev->drv; -@@ -210,3 +244,65 @@ void yaffs_mtd_drv_install(struct yaffs_dev *dev) - drv->drv_initialise_fn = yaffs_mtd_initialise; - drv->drv_deinitialise_fn = yaffs_mtd_deinitialise; - } -+ -+ -+struct mtd_info * yaffs_get_mtd_device(dev_t sdev) -+{ -+ struct mtd_info *mtd; -+ -+ mtd = yaffs_get_mtd_device(sdev); -+ -+ /* Check it's an mtd device..... */ -+ if (MAJOR(sdev) != MTD_BLOCK_MAJOR) -+ return NULL; /* This isn't an mtd device */ -+ -+ /* Check it's NAND */ -+ if (mtd->type != MTD_NANDFLASH) { -+ yaffs_trace(YAFFS_TRACE_ALWAYS, -+ "yaffs: MTD device is not NAND it's type %d", -+ mtd->type); -+ return NULL; -+ } -+ -+ yaffs_trace(YAFFS_TRACE_OS, " %s %d", WRITE_SIZE_STR, WRITE_SIZE(mtd)); -+ yaffs_trace(YAFFS_TRACE_OS, " oobsize %d", mtd->oobsize); -+ yaffs_trace(YAFFS_TRACE_OS, " erasesize %d", mtd->erasesize); -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) -+ yaffs_trace(YAFFS_TRACE_OS, " size %u", mtd->size); -+#else -+ yaffs_trace(YAFFS_TRACE_OS, " size %lld", mtd->size); -+#endif -+ -+ return mtd; -+} -+ -+int yaffs_verify_mtd(struct mtd_info *mtd, int yaffs_version, int inband_tags) -+{ -+ if (yaffs_version == 2) { -+ if ((WRITE_SIZE(mtd) < YAFFS_MIN_YAFFS2_CHUNK_SIZE || -+ mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) && -+ !inband_tags) { -+ yaffs_trace(YAFFS_TRACE_ALWAYS, -+ "MTD device does not have the right page sizes" -+ ); -+ return -1; -+ } -+ } else { -+ if (WRITE_SIZE(mtd) < YAFFS_BYTES_PER_CHUNK || -+ mtd->oobsize != YAFFS_BYTES_PER_SPARE) { -+ yaffs_trace(YAFFS_TRACE_ALWAYS, -+ "MTD device does not support have the right page sizes" -+ ); -+ return -1; -+ } -+ } -+ -+ return 0; -+} -+ -+ -+void yaffs_put_mtd_device(struct mtd_info *mtd) -+{ -+ if(mtd) -+ put_mtd_device(mtd); -+} -diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index 145517b..67050d4 100644 ---- a/fs/yaffs2/yaffs_vfs.c -+++ b/fs/yaffs2/yaffs_vfs.c -@@ -32,28 +32,139 @@ - */ - - /* -- * NB There are two variants of Linux VFS glue code. This variant supports -- * a single version and should not include any multi-version code. -+ * There are two variants of the VFS glue code. This variant should compile -+ * for any version of Linux. - */ - #include <linux/version.h> -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 10)) -+#define YAFFS_COMPILE_BACKGROUND -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 23)) -+#define YAFFS_COMPILE_FREEZER -+#endif -+#endif -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28)) -+#define YAFFS_COMPILE_EXPORTFS -+#endif -+ -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) -+#define YAFFS_USE_SETATTR_COPY -+#define YAFFS_USE_TRUNCATE_SETSIZE -+#endif -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 35)) -+#define YAFFS_HAS_EVICT_INODE -+#endif -+ -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13)) -+#define YAFFS_NEW_FOLLOW_LINK 1 -+#else -+#define YAFFS_NEW_FOLLOW_LINK 0 -+#endif -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)) -+#define YAFFS_HAS_WRITE_SUPER -+#endif -+ -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)) -+#include <linux/config.h> -+#endif -+ - #include <linux/kernel.h> - #include <linux/module.h> - #include <linux/slab.h> - #include <linux/init.h> - #include <linux/fs.h> - #include <linux/proc_fs.h> -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 39)) -+#include <linux/smp_lock.h> -+#endif - #include <linux/pagemap.h> - #include <linux/mtd/mtd.h> - #include <linux/interrupt.h> - #include <linux/string.h> - #include <linux/ctype.h> -+ -+#if (YAFFS_NEW_FOLLOW_LINK == 1) - #include <linux/namei.h> -+#endif -+ -+#ifdef YAFFS_COMPILE_EXPORTFS - #include <linux/exportfs.h> -+#endif -+ -+#ifdef YAFFS_COMPILE_BACKGROUND - #include <linux/kthread.h> - #include <linux/delay.h> -+#endif -+#ifdef YAFFS_COMPILE_FREEZER - #include <linux/freezer.h> -+#endif -+ - #include <asm/div64.h> -+ -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) -+ - #include <linux/statfs.h> -+ -+#define UnlockPage(p) unlock_page(p) -+#define Page_Uptodate(page) test_bit(PG_uptodate, &(page)->flags) -+ -+/* FIXME: use sb->s_id instead ? */ -+#define yaffs_devname(sb, buf) bdevname(sb->s_bdev, buf) -+ -+#else -+ -+#include <linux/locks.h> -+#define BDEVNAME_SIZE 0 -+#define yaffs_devname(sb, buf) kdevname(sb->s_dev) -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 5, 0)) -+/* added NCB 26/5/2006 for 2.4.25-vrs2-tcl1 kernel */ -+#define __user -+#endif -+ -+#endif -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)) -+#define YPROC_ROOT (&proc_root) -+#else -+#define YPROC_ROOT NULL -+#endif -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 26)) -+#define Y_INIT_TIMER(a) init_timer(a) -+#else -+#define Y_INIT_TIMER(a) init_timer_on_stack(a) -+#endif -+ -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 27)) -+#define YAFFS_USE_WRITE_BEGIN_END 1 -+#else -+#define YAFFS_USE_WRITE_BEGIN_END 0 -+#endif -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 6, 0)) -+#define YAFFS_SUPER_HAS_DIRTY -+#endif -+ -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 2, 0)) -+#define set_nlink(inode, count) do { (inode)->i_nlink = (count); } while(0) -+#endif -+ -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 28)) -+static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size) -+{ -+ uint64_t result = partition_size; -+ do_div(result, block_size); -+ return (uint32_t) result; -+} -+#else -+#define YCALCBLOCKS(s, b) ((s)/(b)) -+#endif -+ - #include <linux/uaccess.h> - #include <linux/mtd/mtd.h> - -@@ -61,51 +172,78 @@ - #include "yaffs_trace.h" - #include "yaffs_guts.h" - #include "yaffs_attribs.h" -+ - #include "yaffs_linux.h" -+ - #include "yaffs_mtdif.h" --#include "yaffs_mtdif1.h" --#include "yaffs_mtdif2.h" -+#include "yaffs_packedtags2.h" -+#include "yaffs_getblockinfo.h" -+ -+unsigned int yaffs_trace_mask = -+ YAFFS_TRACE_BAD_BLOCKS | -+ YAFFS_TRACE_ALWAYS | -+ 0; - --unsigned int yaffs_trace_mask = YAFFS_TRACE_BAD_BLOCKS | YAFFS_TRACE_ALWAYS; - unsigned int yaffs_wr_attempts = YAFFS_WR_ATTEMPTS; - unsigned int yaffs_auto_checkpoint = 1; - unsigned int yaffs_gc_control = 1; - unsigned int yaffs_bg_enable = 1; - unsigned int yaffs_auto_select = 1; -- - /* Module Parameters */ -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) - module_param(yaffs_trace_mask, uint, 0644); - module_param(yaffs_wr_attempts, uint, 0644); - module_param(yaffs_auto_checkpoint, uint, 0644); - module_param(yaffs_gc_control, uint, 0644); - module_param(yaffs_bg_enable, uint, 0644); --module_param(yaffs_auto_select, uint, 0644); -+#else -+MODULE_PARM(yaffs_trace_mask, "i"); -+MODULE_PARM(yaffs_wr_attempts, "i"); -+MODULE_PARM(yaffs_auto_checkpoint, "i"); -+MODULE_PARM(yaffs_gc_control, "i"); -+#endif - --#define yaffs_devname(sb, buf) bdevname(sb->s_bdev, buf) -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)) -+/* use iget and read_inode */ -+#define Y_IGET(sb, inum) iget((sb), (inum)) - --static uint32_t YCALCBLOCKS(uint64_t partition_size, uint32_t block_size) --{ -- uint64_t result = partition_size; -+#else -+/* Call local equivalent */ -+#define YAFFS_USE_OWN_IGET -+#define Y_IGET(sb, inum) yaffs_iget((sb), (inum)) - -- do_div(result, block_size); -- return (uint32_t) result; --} -+#endif - -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18)) - #define yaffs_inode_to_obj_lv(iptr) ((iptr)->i_private) --#define yaffs_inode_to_obj(iptr)\ -+#else -+#define yaffs_inode_to_obj_lv(iptr) ((iptr)->u.generic_ip) -+#endif -+ -+#define yaffs_inode_to_obj(iptr) \ - ((struct yaffs_obj *)(yaffs_inode_to_obj_lv(iptr))) - #define yaffs_dentry_to_obj(dptr) yaffs_inode_to_obj((dptr)->d_inode) -+ -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) - #define yaffs_super_to_dev(sb) ((struct yaffs_dev *)sb->s_fs_info) -+#else -+#define yaffs_super_to_dev(sb) ((struct yaffs_dev *)sb->u.generic_sbp) -+#endif -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 5, 0)) -+#define Y_CLEAR_INODE(i) clear_inode(i) -+#else -+#define Y_CLEAR_INODE(i) end_writeback(i) -+#endif -+ - - #define update_dir_time(dir) do {\ - (dir)->i_ctime = (dir)->i_mtime = CURRENT_TIME; \ - } while (0) - -+static void yaffs_fill_inode_from_obj(struct inode *inode, -+ struct yaffs_obj *obj); - --static unsigned yaffs_gc_control_callback(struct yaffs_dev *dev) --{ -- return yaffs_gc_control; --} - - static void yaffs_gross_lock(struct yaffs_dev *dev) - { -@@ -120,519 +258,1290 @@ static void yaffs_gross_unlock(struct yaffs_dev *dev) - mutex_unlock(&(yaffs_dev_to_lc(dev)->gross_lock)); - } - --static void yaffs_fill_inode_from_obj(struct inode *inode, -- struct yaffs_obj *obj); - --static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino) -+static int yaffs_readpage_nolock(struct file *f, struct page *pg) - { -- struct inode *inode; -- struct yaffs_obj *obj; -- struct yaffs_dev *dev = yaffs_super_to_dev(sb); -- -- yaffs_trace(YAFFS_TRACE_OS, "yaffs_iget for %lu", ino); -+ /* Lifted from jffs2 */ - -- inode = iget_locked(sb, ino); -- if (!inode) -- return ERR_PTR(-ENOMEM); -- if (!(inode->i_state & I_NEW)) -- return inode; -+ struct yaffs_obj *obj; -+ unsigned char *pg_buf; -+ int ret; -+ loff_t pos = ((loff_t) pg->index) << PAGE_CACHE_SHIFT; -+ struct yaffs_dev *dev; - -- /* NB This is called as a side effect of other functions, but -- * we had to release the lock to prevent deadlocks, so -- * need to lock again. -- */ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_readpage_nolock at %lld, size %08x", -+ (long long)pos, -+ (unsigned)PAGE_CACHE_SIZE); - -- yaffs_gross_lock(dev); -+ obj = yaffs_dentry_to_obj(f->f_dentry); - -- obj = yaffs_find_by_number(dev, inode->i_ino); -- yaffs_fill_inode_from_obj(inode, obj); -+ dev = obj->my_dev; - -- yaffs_gross_unlock(dev); -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) -+ BUG_ON(!PageLocked(pg)); -+#else -+ if (!PageLocked(pg)) -+ PAGE_BUG(pg); -+#endif - -- unlock_new_inode(inode); -- return inode; --} -+ pg_buf = kmap(pg); -+ /* FIXME: Can kmap fail? */ - --struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev, -- struct yaffs_obj *obj) --{ -- struct inode *inode; -+ yaffs_gross_lock(dev); - -- if (!sb) { -- yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_get_inode for NULL super_block!!"); -- return NULL; -+ ret = yaffs_file_rd(obj, pg_buf, pos, PAGE_CACHE_SIZE); - -- } -+ yaffs_gross_unlock(dev); - -- if (!obj) { -- yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_get_inode for NULL object!!"); -- return NULL; -+ if (ret >= 0) -+ ret = 0; - -+ if (ret) { -+ ClearPageUptodate(pg); -+ SetPageError(pg); -+ } else { -+ SetPageUptodate(pg); -+ ClearPageError(pg); - } - -- yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_get_inode for object %d", -- obj->obj_id); -- -- inode = yaffs_iget(sb, obj->obj_id); -- if (IS_ERR(inode)) -- return NULL; -- -- /* NB Side effect: iget calls back to yaffs_read_inode(). */ -- /* iget also increments the inode's i_count */ -- /* NB You can't be holding gross_lock or deadlock will happen! */ -+ flush_dcache_page(pg); -+ kunmap(pg); - -- return inode; -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage_nolock done"); -+ return ret; - } - --static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, -- dev_t rdev) -+static int yaffs_readpage_unlock(struct file *f, struct page *pg) - { -- struct inode *inode; -- struct yaffs_obj *obj = NULL; -- struct yaffs_dev *dev; -- struct yaffs_obj *parent = yaffs_inode_to_obj(dir); -- int error; -- uid_t uid = current->cred->fsuid; -- gid_t gid = -- (dir->i_mode & S_ISGID) ? dir->i_gid : current->cred->fsgid; -- -- if ((dir->i_mode & S_ISGID) && S_ISDIR(mode)) -- mode |= S_ISGID; -- -- if (!parent) { -- yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_mknod: could not get parent object"); -- return -EPERM; -- } -+ int ret = yaffs_readpage_nolock(f, pg); -+ UnlockPage(pg); -+ return ret; -+} - -- yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_mknod: parent object %d type %d", -- parent->obj_id, parent->variant_type); -+static int yaffs_readpage(struct file *f, struct page *pg) -+{ -+ int ret; - -- yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_mknod: making oject for %s, mode %x dev %x", -- dentry->d_name.name, mode, rdev); -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage"); -+ ret = yaffs_readpage_unlock(f, pg); -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage done"); -+ return ret; -+} - -- dev = parent->my_dev; - -- yaffs_gross_lock(dev); -+static void yaffs_set_super_dirty_val(struct yaffs_dev *dev, int val) -+{ -+ struct yaffs_linux_context *lc = yaffs_dev_to_lc(dev); - -- if (yaffs_get_n_free_chunks(dev) < 1) { -- error = -ENOSPC; -- goto err_out; -- } -+ if (lc) -+ lc->dirty = val; - -- switch (mode & S_IFMT) { -- default: -- /* Special (socket, fifo, device...) */ -- yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod: making special"); -- obj = -- yaffs_create_special(parent, dentry->d_name.name, mode, uid, -- gid, old_encode_dev(rdev)); -- break; -- case S_IFREG: /* file */ -- yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod: making file"); -- obj = yaffs_create_file(parent, dentry->d_name.name, mode, uid, -- gid); -- break; -- case S_IFDIR: /* directory */ -- yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod: making directory"); -- obj = yaffs_create_dir(parent, dentry->d_name.name, mode, -- uid, gid); -- break; -- case S_IFLNK: /* symlink */ -- yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod: making symlink"); -- obj = NULL; /* Do we ever get here? */ -- break; -- } -+# ifdef YAFFS_SUPER_HAS_DIRTY -+ { -+ struct super_block *sb = lc->super; - -- if (!obj) { -- error = -ENOMEM; -- goto err_out; -+ if (sb) -+ sb->s_dirt = val; - } -- -- /* Can not call yaffs_get_inode() with gross lock held */ -- yaffs_gross_unlock(dev); -- -- -- inode = yaffs_get_inode(dir->i_sb, mode, rdev, obj); -- d_instantiate(dentry, inode); -- update_dir_time(dir); -- yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_mknod created object %d count = %d", -- obj->obj_id, atomic_read(&inode->i_count)); -- yaffs_fill_inode_from_obj(dir, parent); -- return 0; -- --err_out: -- yaffs_gross_unlock(dev); -- yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod error %d", error); -- return error; -+#endif - - } - --static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode) -+static void yaffs_set_super_dirty(struct yaffs_dev *dev) - { -- return yaffs_mknod(dir, dentry, mode | S_IFDIR, 0); -+ yaffs_set_super_dirty_val(dev, 1); - } - --static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode, -- struct nameidata *n) -+static void yaffs_clear_super_dirty(struct yaffs_dev *dev) - { -- return yaffs_mknod(dir, dentry, mode | S_IFREG, 0); -+ yaffs_set_super_dirty_val(dev, 0); - } - --static int yaffs_link(struct dentry *old_dentry, struct inode *dir, -- struct dentry *dentry) -+static int yaffs_check_super_dirty(struct yaffs_dev *dev) - { -- struct inode *inode = old_dentry->d_inode; -- struct yaffs_obj *obj = NULL; -- struct yaffs_obj *link = NULL; -- struct yaffs_dev *dev; -- -- yaffs_trace(YAFFS_TRACE_OS, "yaffs_link"); -- -- obj = yaffs_inode_to_obj(inode); -- dev = obj->my_dev; -- -- yaffs_gross_lock(dev); -- -- if (!S_ISDIR(inode->i_mode)) /* Don't link directories */ -- link = -- yaffs_link_obj(yaffs_inode_to_obj(dir), dentry->d_name.name, -- obj); -+ struct yaffs_linux_context *lc = yaffs_dev_to_lc(dev); - -- if (link) { -- set_nlink(old_dentry->d_inode, yaffs_get_obj_link_count(obj)); -- d_instantiate(dentry, old_dentry->d_inode); -- atomic_inc(&old_dentry->d_inode->i_count); -- yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_link link count %d i_count %d", -- old_dentry->d_inode->i_nlink, -- atomic_read(&old_dentry->d_inode->i_count)); -- } -+ if (lc && lc->dirty) -+ return 1; - -- yaffs_gross_unlock(dev); -+# ifdef YAFFS_SUPER_HAS_DIRTY -+ { -+ struct super_block *sb = lc->super; - -- if (link) { -- update_dir_time(dir); -- return 0; -+ if (sb && sb->s_dirt) -+ return 1; - } -+#endif -+ return 0; - -- return -EPERM; - } - --static int yaffs_symlink(struct inode *dir, struct dentry *dentry, -- const char *symname) -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) -+static int yaffs_writepage(struct page *page, struct writeback_control *wbc) -+#else -+static int yaffs_writepage(struct page *page) -+#endif - { -- struct yaffs_obj *obj; - struct yaffs_dev *dev; -+ struct address_space *mapping = page->mapping; - struct inode *inode; -- uid_t uid = current->cred->fsuid; -- gid_t gid = -- (dir->i_mode & S_ISGID) ? dir->i_gid : current->cred->fsgid; -+ unsigned long end_index; -+ char *buffer; -+ struct yaffs_obj *obj; -+ int n_written = 0; -+ unsigned n_bytes; -+ loff_t i_size; - -- yaffs_trace(YAFFS_TRACE_OS, "yaffs_symlink"); -+ if (!mapping) -+ BUG(); -+ inode = mapping->host; -+ if (!inode) -+ BUG(); -+ i_size = i_size_read(inode); - -- if (strnlen(dentry->d_name.name, YAFFS_MAX_NAME_LENGTH + 1) > -- YAFFS_MAX_NAME_LENGTH) -- return -ENAMETOOLONG; -+ end_index = i_size >> PAGE_CACHE_SHIFT; - -- if (strnlen(symname, YAFFS_MAX_ALIAS_LENGTH + 1) > -- YAFFS_MAX_ALIAS_LENGTH) -- return -ENAMETOOLONG; -+ if (page->index < end_index) -+ n_bytes = PAGE_CACHE_SIZE; -+ else { -+ n_bytes = i_size & (PAGE_CACHE_SIZE - 1); - -- dev = yaffs_inode_to_obj(dir)->my_dev; -- yaffs_gross_lock(dev); -- obj = yaffs_create_symlink(yaffs_inode_to_obj(dir), dentry->d_name.name, -- S_IFLNK | S_IRWXUGO, uid, gid, symname); -- yaffs_gross_unlock(dev); -+ if (page->index > end_index || !n_bytes) { -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_writepage at %lld, inode size = %lld!!", -+ ((loff_t)page->index) << PAGE_CACHE_SHIFT, -+ inode->i_size); -+ yaffs_trace(YAFFS_TRACE_OS, -+ " -> don't care!!"); - -- if (!obj) { -- yaffs_trace(YAFFS_TRACE_OS, "symlink not created"); -- return -ENOMEM; -+ zero_user_segment(page, 0, PAGE_CACHE_SIZE); -+ set_page_writeback(page); -+ unlock_page(page); -+ end_page_writeback(page); -+ return 0; -+ } - } - -- inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj); -- d_instantiate(dentry, inode); -- update_dir_time(dir); -- yaffs_trace(YAFFS_TRACE_OS, "symlink created OK"); -+ if (n_bytes != PAGE_CACHE_SIZE) -+ zero_user_segment(page, n_bytes, PAGE_CACHE_SIZE); - -- return 0; --} -+ get_page(page); - --static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry, -- struct nameidata *n) --{ -- struct yaffs_obj *obj; -- struct inode *inode = NULL; -- struct yaffs_dev *dev = yaffs_inode_to_obj(dir)->my_dev; -+ buffer = kmap(page); - -- if (current != yaffs_dev_to_lc(dev)->readdir_process) -- yaffs_gross_lock(dev); -+ obj = yaffs_inode_to_obj(inode); -+ dev = obj->my_dev; -+ yaffs_gross_lock(dev); - - yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_lookup for %d:%s", -- yaffs_inode_to_obj(dir)->obj_id, dentry->d_name.name); -- -- obj = yaffs_find_by_name(yaffs_inode_to_obj(dir), dentry->d_name.name); -- -- obj = yaffs_get_equivalent_obj(obj); /* in case it was a hardlink */ -- -- /* Can't hold gross lock when calling yaffs_get_inode() */ -- if (current != yaffs_dev_to_lc(dev)->readdir_process) -- yaffs_gross_unlock(dev); -- -- if (obj) { -- yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_lookup found %d", obj->obj_id); -+ "yaffs_writepage at %lld, size %08x", -+ ((loff_t)page->index) << PAGE_CACHE_SHIFT, n_bytes); -+ yaffs_trace(YAFFS_TRACE_OS, -+ "writepag0: obj = %lld, ino = %lld", -+ obj->variant.file_variant.file_size, inode->i_size); - -- inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj); -+ n_written = yaffs_wr_file(obj, buffer, -+ ((loff_t)page->index) << PAGE_CACHE_SHIFT, n_bytes, 0); - -- if (inode) { -- yaffs_trace(YAFFS_TRACE_OS, "yaffs_loookup dentry"); -- d_add(dentry, inode); -- /* return dentry; */ -- return NULL; -- } -+ yaffs_set_super_dirty(dev); - -- } else { -- yaffs_trace(YAFFS_TRACE_OS, "yaffs_lookup not found"); -+ yaffs_trace(YAFFS_TRACE_OS, -+ "writepag1: obj = %lld, ino = %lld", -+ obj->variant.file_variant.file_size, inode->i_size); - -- } -+ yaffs_gross_unlock(dev); - -- d_add(dentry, inode); -+ kunmap(page); -+ set_page_writeback(page); -+ unlock_page(page); -+ end_page_writeback(page); -+ put_page(page); - -- return NULL; -+ return (n_written == n_bytes) ? 0 : -ENOSPC; - } - --static int yaffs_unlink(struct inode *dir, struct dentry *dentry) -+/* Space holding and freeing is done to ensure we have space available for write_begin/end */ -+/* For now we just assume few parallel writes and check against a small number. */ -+/* Todo: need to do this with a counter to handle parallel reads better */ -+ -+static ssize_t yaffs_hold_space(struct file *f) - { -- int ret_val; -- struct yaffs_dev *dev; - struct yaffs_obj *obj; -+ struct yaffs_dev *dev; -+ -+ int n_free_chunks; -+ -+ obj = yaffs_dentry_to_obj(f->f_dentry); - -- yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_unlink %d:%s", -- (int)(dir->i_ino), dentry->d_name.name); -- obj = yaffs_inode_to_obj(dir); - dev = obj->my_dev; - - yaffs_gross_lock(dev); - -- ret_val = yaffs_unlinker(obj, dentry->d_name.name); -+ n_free_chunks = yaffs_get_n_free_chunks(dev); - -- if (ret_val == YAFFS_OK) { -- inode_dec_link_count(dentry->d_inode); -- dir->i_version++; -- yaffs_gross_unlock(dev); -- update_dir_time(dir); -- return 0; -- } - yaffs_gross_unlock(dev); -- return -ENOTEMPTY; -+ -+ return (n_free_chunks > 20) ? 1 : 0; - } - --static int yaffs_sync_object(struct file *file, -- loff_t start, loff_t end, int datasync) -+static void yaffs_release_space(struct file *f) - { -- - struct yaffs_obj *obj; - struct yaffs_dev *dev; -- struct dentry *dentry = file->f_path.dentry; - -- obj = yaffs_dentry_to_obj(dentry); -+ obj = yaffs_dentry_to_obj(f->f_dentry); - - dev = obj->my_dev; - -- yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC, "yaffs_sync_object"); - yaffs_gross_lock(dev); -- yaffs_flush_file(obj, 1, datasync); -+ - yaffs_gross_unlock(dev); -- return 0; - } --/* -- * The VFS layer already does all the dentry stuff for rename. -- * -- * NB: POSIX says you can rename an object over an old object of the same name -- */ --static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry, -- struct inode *new_dir, struct dentry *new_dentry) --{ -- struct yaffs_dev *dev; -- int ret_val = YAFFS_FAIL; -- struct yaffs_obj *target; -- -- yaffs_trace(YAFFS_TRACE_OS, "yaffs_rename"); -- dev = yaffs_inode_to_obj(old_dir)->my_dev; - -- yaffs_gross_lock(dev); -- -- /* Check if the target is an existing directory that is not empty. */ -- target = yaffs_find_by_name(yaffs_inode_to_obj(new_dir), -- new_dentry->d_name.name); -- -- if (target && target->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY && -- !list_empty(&target->variant.dir_variant.children)) { -+#if (YAFFS_USE_WRITE_BEGIN_END > 0) -+static int yaffs_write_begin(struct file *filp, struct address_space *mapping, -+ loff_t pos, unsigned len, unsigned flags, -+ struct page **pagep, void **fsdata) -+{ -+ struct page *pg = NULL; -+ pgoff_t index = pos >> PAGE_CACHE_SHIFT; - -- yaffs_trace(YAFFS_TRACE_OS, "target is non-empty dir"); -+ int ret = 0; -+ int space_held = 0; - -- ret_val = YAFFS_FAIL; -- } else { -- /* Now does unlinking internally using shadowing mechanism */ -- yaffs_trace(YAFFS_TRACE_OS, "calling yaffs_rename_obj"); -+ /* Get a page */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 28) -+ pg = grab_cache_page_write_begin(mapping, index, flags); -+#else -+ pg = __grab_cache_page(mapping, index); -+#endif - -- ret_val = yaffs_rename_obj(yaffs_inode_to_obj(old_dir), -- old_dentry->d_name.name, -- yaffs_inode_to_obj(new_dir), -- new_dentry->d_name.name); -+ *pagep = pg; -+ if (!pg) { -+ ret = -ENOMEM; -+ goto out; - } -- yaffs_gross_unlock(dev); -+ yaffs_trace(YAFFS_TRACE_OS, -+ "start yaffs_write_begin index %d(%x) uptodate %d", -+ (int)index, (int)index, Page_Uptodate(pg) ? 1 : 0); - -- if (ret_val == YAFFS_OK) { -- if (target) -- inode_dec_link_count(new_dentry->d_inode); -+ /* Get fs space */ -+ space_held = yaffs_hold_space(filp); - -- update_dir_time(old_dir); -- if (old_dir != new_dir) -- update_dir_time(new_dir); -- return 0; -- } else { -- return -ENOTEMPTY; -+ if (!space_held) { -+ ret = -ENOSPC; -+ goto out; - } --} - --static int yaffs_setattr(struct dentry *dentry, struct iattr *attr) --{ -- struct inode *inode = dentry->d_inode; -- int error = 0; -- struct yaffs_dev *dev; -- int result; -+ /* Update page if required */ - -- yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_setattr of object %d", -- yaffs_inode_to_obj(inode)->obj_id); -+ if (!Page_Uptodate(pg)) -+ ret = yaffs_readpage_nolock(filp, pg); - -- /* Fail if a requested resize >= 2GB */ -- if (attr->ia_valid & ATTR_SIZE && (attr->ia_size >> 31)) -- error = -EINVAL; -+ if (ret) -+ goto out; - -- if (!error) -- error = inode_change_ok(inode, attr); -+ /* Happy path return */ -+ yaffs_trace(YAFFS_TRACE_OS, "end yaffs_write_begin - ok"); - -- if (!error) { -- setattr_copy(inode, attr); -- yaffs_trace(YAFFS_TRACE_OS, "inode_setattr called"); -- if (attr->ia_valid & ATTR_SIZE) { -- truncate_setsize(inode, attr->ia_size); -- inode->i_blocks = (inode->i_size + 511) >> 9; -- } -- dev = yaffs_inode_to_obj(inode)->my_dev; -- if (attr->ia_valid & ATTR_SIZE) { -- yaffs_trace(YAFFS_TRACE_OS, "resize to %d(%x)", -- (int)(attr->ia_size), -- (int)(attr->ia_size)); -- } -+ return 0; - -- yaffs_gross_lock(dev); -- result = yaffs_set_attribs(yaffs_inode_to_obj(inode), attr); -- if (result != YAFFS_OK) -- error = -EPERM; -- yaffs_gross_unlock(dev); -+out: -+ yaffs_trace(YAFFS_TRACE_OS, -+ "end yaffs_write_begin fail returning %d", ret); -+ if (space_held) -+ yaffs_release_space(filp); -+ if (pg) { -+ unlock_page(pg); -+ page_cache_release(pg); - } -+ return ret; -+} - -- yaffs_trace(YAFFS_TRACE_OS, "yaffs_setattr done returning %d", error); -+#else - -- return error; -+static int yaffs_prepare_write(struct file *f, struct page *pg, -+ unsigned offset, unsigned to) -+{ -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_prepair_write"); -+ -+ if (!Page_Uptodate(pg)) -+ return yaffs_readpage_nolock(f, pg); -+ return 0; - } -+#endif - --static int yaffs_setxattr(struct dentry *dentry, const char *name, -- const void *value, size_t size, int flags) -+ -+static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, -+ loff_t * pos) - { -- struct inode *inode = dentry->d_inode; -- int error; -+ struct yaffs_obj *obj; -+ int n_written; -+ loff_t ipos; -+ struct inode *inode; - struct yaffs_dev *dev; -- struct yaffs_obj *obj = yaffs_inode_to_obj(inode); - -- yaffs_trace(YAFFS_TRACE_OS, "yaffs_setxattr of object %d", obj->obj_id); -+ obj = yaffs_dentry_to_obj(f->f_dentry); -+ -+ if (!obj) { -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_file_write: hey obj is null!"); -+ return -EINVAL; -+ } - - dev = obj->my_dev; -- yaffs_gross_lock(dev); -- error = yaffs_set_xattrib(obj, name, value, size, flags); -- yaffs_gross_unlock(dev); - -- yaffs_trace(YAFFS_TRACE_OS, "yaffs_setxattr done returning %d", error); -+ yaffs_gross_lock(dev); - -- return error; --} -+ inode = f->f_dentry->d_inode; - --static ssize_t yaffs_getxattr(struct dentry *dentry, const char *name, -- void *buff, size_t size) --{ -- struct inode *inode = dentry->d_inode; -- int error; -- struct yaffs_dev *dev; -- struct yaffs_obj *obj = yaffs_inode_to_obj(inode); -+ if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND) -+ ipos = inode->i_size; -+ else -+ ipos = *pos; - - yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_getxattr \"%s\" from object %d", -- name, obj->obj_id); -+ "yaffs_file_write about to write writing %u(%x) bytes to object %d at %lld", -+ (unsigned)n, (unsigned)n, obj->obj_id, ipos); - -- dev = obj->my_dev; -- yaffs_gross_lock(dev); -- error = yaffs_get_xattrib(obj, name, buff, size); -- yaffs_gross_unlock(dev); -+ n_written = yaffs_wr_file(obj, buf, ipos, n, 0); - -- yaffs_trace(YAFFS_TRACE_OS, "yaffs_getxattr done returning %d", error); -+ yaffs_set_super_dirty(dev); -+ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_file_write: %d(%x) bytes written", -+ (unsigned)n, (unsigned)n); -+ -+ if (n_written > 0) { -+ ipos += n_written; -+ *pos = ipos; -+ if (ipos > inode->i_size) { -+ inode->i_size = ipos; -+ inode->i_blocks = (ipos + 511) >> 9; -+ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_file_write size updated to %lld bytes, %d blocks", -+ ipos, (int)(inode->i_blocks)); -+ } -+ -+ } -+ yaffs_gross_unlock(dev); -+ return (n_written == 0) && (n > 0) ? -ENOSPC : n_written; -+} -+ -+ -+#if (YAFFS_USE_WRITE_BEGIN_END > 0) -+static int yaffs_write_end(struct file *filp, struct address_space *mapping, -+ loff_t pos, unsigned len, unsigned copied, -+ struct page *pg, void *fsdadata) -+{ -+ int ret = 0; -+ void *addr, *kva; -+ uint32_t offset_into_page = pos & (PAGE_CACHE_SIZE - 1); -+ -+ kva = kmap(pg); -+ addr = kva + offset_into_page; -+ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_write_end addr %p pos %lld n_bytes %d", -+ addr, pos, copied); -+ -+ ret = yaffs_file_write(filp, addr, copied, &pos); -+ -+ if (ret != copied) { -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_write_end not same size ret %d copied %d", -+ ret, copied); -+ SetPageError(pg); -+ } -+ -+ kunmap(pg); -+ -+ yaffs_release_space(filp); -+ unlock_page(pg); -+ page_cache_release(pg); -+ return ret; -+} -+#else -+ -+static int yaffs_commit_write(struct file *f, struct page *pg, unsigned offset, -+ unsigned to) -+{ -+ void *addr, *kva; -+ -+ loff_t pos = (((loff_t) pg->index) << PAGE_CACHE_SHIFT) + offset; -+ int n_bytes = to - offset; -+ int n_written; -+ -+ kva = kmap(pg); -+ addr = kva + offset; -+ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_commit_write addr %p pos %lld n_bytes %d", -+ addr, pos, n_bytes); -+ -+ n_written = yaffs_file_write(f, addr, n_bytes, &pos); -+ -+ if (n_written != n_bytes) { -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_commit_write not same size n_written %d n_bytes %d", -+ n_written, n_bytes); -+ SetPageError(pg); -+ } -+ kunmap(pg); -+ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_commit_write returning %d", -+ n_written == n_bytes ? 0 : n_written); -+ -+ return n_written == n_bytes ? 0 : n_written; -+} -+#endif -+ -+static struct address_space_operations yaffs_file_address_operations = { -+ .readpage = yaffs_readpage, -+ .writepage = yaffs_writepage, -+#if (YAFFS_USE_WRITE_BEGIN_END > 0) -+ .write_begin = yaffs_write_begin, -+ .write_end = yaffs_write_end, -+#else -+ .prepare_write = yaffs_prepare_write, -+ .commit_write = yaffs_commit_write, -+#endif -+}; -+ -+ -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) -+static int yaffs_file_flush(struct file *file, fl_owner_t id) -+#else -+static int yaffs_file_flush(struct file *file) -+#endif -+{ -+ struct yaffs_obj *obj = yaffs_dentry_to_obj(file->f_dentry); -+ -+ struct yaffs_dev *dev = obj->my_dev; -+ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_file_flush object %d (%s)", -+ obj->obj_id, -+ obj->dirty ? "dirty" : "clean"); -+ -+ yaffs_gross_lock(dev); -+ -+ yaffs_flush_file(obj, 1, 0); -+ -+ yaffs_gross_unlock(dev); -+ -+ return 0; -+} -+ -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) -+static int yaffs_sync_object(struct file *file, loff_t start, loff_t end, int datasync) -+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34)) -+static int yaffs_sync_object(struct file *file, int datasync) -+#else -+static int yaffs_sync_object(struct file *file, struct dentry *dentry, -+ int datasync) -+#endif -+{ -+ struct yaffs_obj *obj; -+ struct yaffs_dev *dev; -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 34)) -+ struct dentry *dentry = file->f_path.dentry; -+#endif -+ -+ obj = yaffs_dentry_to_obj(dentry); -+ -+ dev = obj->my_dev; -+ -+ yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC, -+ "yaffs_sync_object"); -+ yaffs_gross_lock(dev); -+ yaffs_flush_file(obj, 1, datasync); -+ yaffs_gross_unlock(dev); -+ return 0; -+} -+ -+ -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22)) -+static const struct file_operations yaffs_file_operations = { -+ .read = do_sync_read, -+ .write = do_sync_write, -+ .aio_read = generic_file_aio_read, -+ .aio_write = generic_file_aio_write, -+ .mmap = generic_file_mmap, -+ .flush = yaffs_file_flush, -+ .fsync = yaffs_sync_object, -+ .splice_read = generic_file_splice_read, -+ .splice_write = generic_file_splice_write, -+ .llseek = generic_file_llseek, -+}; -+ -+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 18)) -+ -+static const struct file_operations yaffs_file_operations = { -+ .read = do_sync_read, -+ .write = do_sync_write, -+ .aio_read = generic_file_aio_read, -+ .aio_write = generic_file_aio_write, -+ .mmap = generic_file_mmap, -+ .flush = yaffs_file_flush, -+ .fsync = yaffs_sync_object, -+ .sendfile = generic_file_sendfile, -+}; -+ -+#else -+ -+static const struct file_operations yaffs_file_operations = { -+ .read = generic_file_read, -+ .write = generic_file_write, -+ .mmap = generic_file_mmap, -+ .flush = yaffs_file_flush, -+ .fsync = yaffs_sync_object, -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) -+ .sendfile = generic_file_sendfile, -+#endif -+}; -+#endif -+ -+ -+ -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 25)) -+static void zero_user_segment(struct page *page, unsigned start, unsigned end) -+{ -+ void *kaddr = kmap_atomic(page, KM_USER0); -+ memset(kaddr + start, 0, end - start); -+ kunmap_atomic(kaddr, KM_USER0); -+ flush_dcache_page(page); -+} -+#endif -+ -+ -+static int yaffs_vfs_setsize(struct inode *inode, loff_t newsize) -+{ -+#ifdef YAFFS_USE_TRUNCATE_SETSIZE -+ truncate_setsize(inode, newsize); -+ return 0; -+#else -+ truncate_inode_pages(&inode->i_data, newsize); -+ return 0; -+#endif -+ -+} -+ -+ -+static int yaffs_vfs_setattr(struct inode *inode, struct iattr *attr) -+{ -+#ifdef YAFFS_USE_SETATTR_COPY -+ setattr_copy(inode, attr); -+ return 0; -+#else -+ return inode_setattr(inode, attr); -+#endif -+ -+} -+ -+static int yaffs_setattr(struct dentry *dentry, struct iattr *attr) -+{ -+ struct inode *inode = dentry->d_inode; -+ int error = 0; -+ struct yaffs_dev *dev; -+ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_setattr of object %d", -+ yaffs_inode_to_obj(inode)->obj_id); -+#if 0 -+ /* Fail if a requested resize >= 2GB */ -+ if (attr->ia_valid & ATTR_SIZE && (attr->ia_size >> 31)) -+ error = -EINVAL; -+#endif -+ -+ if (error == 0) -+ error = inode_change_ok(inode, attr); -+ if (error == 0) { -+ int result; -+ if (!error) { -+ error = yaffs_vfs_setattr(inode, attr); -+ yaffs_trace(YAFFS_TRACE_OS, "inode_setattr called"); -+ if (attr->ia_valid & ATTR_SIZE) { -+ yaffs_vfs_setsize(inode, attr->ia_size); -+ inode->i_blocks = (inode->i_size + 511) >> 9; -+ } -+ } -+ dev = yaffs_inode_to_obj(inode)->my_dev; -+ if (attr->ia_valid & ATTR_SIZE) { -+ yaffs_trace(YAFFS_TRACE_OS, -+ "resize to %d(%x)", -+ (int)(attr->ia_size), -+ (int)(attr->ia_size)); -+ } -+ yaffs_gross_lock(dev); -+ result = yaffs_set_attribs(yaffs_inode_to_obj(inode), attr); -+ if (result == YAFFS_OK) { -+ error = 0; -+ } else { -+ error = -EPERM; -+ } -+ yaffs_gross_unlock(dev); -+ -+ } -+ -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_setattr done returning %d", error); -+ -+ return error; -+} -+ -+static int yaffs_setxattr(struct dentry *dentry, const char *name, -+ const void *value, size_t size, int flags) -+{ -+ struct inode *inode = dentry->d_inode; -+ int error = 0; -+ struct yaffs_dev *dev; -+ struct yaffs_obj *obj = yaffs_inode_to_obj(inode); -+ -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_setxattr of object %d", obj->obj_id); -+ -+ if (error == 0) { -+ int result; -+ dev = obj->my_dev; -+ yaffs_gross_lock(dev); -+ result = yaffs_set_xattrib(obj, name, value, size, flags); -+ if (result == YAFFS_OK) -+ error = 0; -+ else if (result < 0) -+ error = result; -+ yaffs_gross_unlock(dev); -+ -+ } -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_setxattr done returning %d", error); -+ -+ return error; -+} -+ -+static ssize_t yaffs_getxattr(struct dentry * dentry, const char *name, -+ void *buff, size_t size) -+{ -+ struct inode *inode = dentry->d_inode; -+ int error = 0; -+ struct yaffs_dev *dev; -+ struct yaffs_obj *obj = yaffs_inode_to_obj(inode); -+ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_getxattr \"%s\" from object %d", -+ name, obj->obj_id); -+ -+ if (error == 0) { -+ dev = obj->my_dev; -+ yaffs_gross_lock(dev); -+ error = yaffs_get_xattrib(obj, name, buff, size); -+ yaffs_gross_unlock(dev); -+ -+ } -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_getxattr done returning %d", error); -+ -+ return error; -+} -+ -+static int yaffs_removexattr(struct dentry *dentry, const char *name) -+{ -+ struct inode *inode = dentry->d_inode; -+ int error = 0; -+ struct yaffs_dev *dev; -+ struct yaffs_obj *obj = yaffs_inode_to_obj(inode); -+ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_removexattr of object %d", obj->obj_id); -+ -+ if (error == 0) { -+ int result; -+ dev = obj->my_dev; -+ yaffs_gross_lock(dev); -+ result = yaffs_remove_xattrib(obj, name); -+ if (result == YAFFS_OK) -+ error = 0; -+ else if (result < 0) -+ error = result; -+ yaffs_gross_unlock(dev); -+ -+ } -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_removexattr done returning %d", error); -+ -+ return error; -+} -+ -+static ssize_t yaffs_listxattr(struct dentry * dentry, char *buff, size_t size) -+{ -+ struct inode *inode = dentry->d_inode; -+ int error = 0; -+ struct yaffs_dev *dev; -+ struct yaffs_obj *obj = yaffs_inode_to_obj(inode); -+ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_listxattr of object %d", obj->obj_id); -+ -+ if (error == 0) { -+ dev = obj->my_dev; -+ yaffs_gross_lock(dev); -+ error = yaffs_list_xattrib(obj, buff, size); -+ yaffs_gross_unlock(dev); -+ -+ } -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_listxattr done returning %d", error); -+ -+ return error; -+} -+ -+ -+static const struct inode_operations yaffs_file_inode_operations = { -+ .setattr = yaffs_setattr, -+ .setxattr = yaffs_setxattr, -+ .getxattr = yaffs_getxattr, -+ .listxattr = yaffs_listxattr, -+ .removexattr = yaffs_removexattr, -+}; -+ -+ -+static int yaffs_readlink(struct dentry *dentry, char __user * buffer, -+ int buflen) -+{ -+ unsigned char *alias; -+ int ret; -+ -+ struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev; -+ -+ yaffs_gross_lock(dev); -+ -+ alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry)); -+ -+ yaffs_gross_unlock(dev); -+ -+ if (!alias) -+ return -ENOMEM; -+ -+ ret = vfs_readlink(dentry, buffer, buflen, alias); -+ kfree(alias); -+ return ret; -+} -+ -+#if (YAFFS_NEW_FOLLOW_LINK == 1) -+static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd) -+{ -+ void *ret; -+#else -+static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd) -+{ -+ int ret -+#endif -+ unsigned char *alias; -+ int ret_int = 0; -+ struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev; -+ -+ yaffs_gross_lock(dev); -+ -+ alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry)); -+ yaffs_gross_unlock(dev); -+ -+ if (!alias) { -+ ret_int = -ENOMEM; -+ goto out; -+ } -+#if (YAFFS_NEW_FOLLOW_LINK == 1) -+ nd_set_link(nd, alias); -+ ret = alias; -+out: -+ if (ret_int) -+ ret = ERR_PTR(ret_int); -+ return ret; -+#else -+ ret = vfs_follow_link(nd, alias); -+ kfree(alias); -+out: -+ if (ret_int) -+ ret = ret_int; -+ return ret; -+#endif -+} -+ -+ -+#ifdef YAFFS_HAS_PUT_INODE -+ -+/* For now put inode is just for debugging -+ * Put inode is called when the inode **structure** is put. -+ */ -+static void yaffs_put_inode(struct inode *inode) -+{ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_put_inode: ino %d, count %d"), -+ (int)inode->i_ino, atomic_read(&inode->i_count); -+ -+} -+#endif -+ -+#if (YAFFS_NEW_FOLLOW_LINK == 1) -+void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias) -+{ -+ kfree(alias); -+} -+#endif -+ -+static const struct inode_operations yaffs_symlink_inode_operations = { -+ .readlink = yaffs_readlink, -+ .follow_link = yaffs_follow_link, -+#if (YAFFS_NEW_FOLLOW_LINK == 1) -+ .put_link = yaffs_put_link, -+#endif -+ .setattr = yaffs_setattr, -+ .setxattr = yaffs_setxattr, -+ .getxattr = yaffs_getxattr, -+ .listxattr = yaffs_listxattr, -+ .removexattr = yaffs_removexattr, -+}; -+ -+#ifdef YAFFS_USE_OWN_IGET -+ -+static struct inode *yaffs_iget(struct super_block *sb, unsigned long ino) -+{ -+ struct inode *inode; -+ struct yaffs_obj *obj; -+ struct yaffs_dev *dev = yaffs_super_to_dev(sb); -+ -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_iget for %lu", ino); -+ -+ inode = iget_locked(sb, ino); -+ if (!inode) -+ return ERR_PTR(-ENOMEM); -+ if (!(inode->i_state & I_NEW)) -+ return inode; -+ -+ /* NB This is called as a side effect of other functions, but -+ * we had to release the lock to prevent deadlocks, so -+ * need to lock again. -+ */ -+ -+ yaffs_gross_lock(dev); -+ -+ obj = yaffs_find_by_number(dev, inode->i_ino); -+ -+ yaffs_fill_inode_from_obj(inode, obj); -+ -+ yaffs_gross_unlock(dev); -+ -+ unlock_new_inode(inode); -+ return inode; -+} -+ -+#else -+ -+static void yaffs_read_inode(struct inode *inode) -+{ -+ /* NB This is called as a side effect of other functions, but -+ * we had to release the lock to prevent deadlocks, so -+ * need to lock again. -+ */ -+ -+ struct yaffs_obj *obj; -+ struct yaffs_dev *dev = yaffs_super_to_dev(inode->i_sb); -+ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_read_inode for %d", (int)inode->i_ino); -+ -+ if (current != yaffs_dev_to_lc(dev)->readdir_process) -+ yaffs_gross_lock(dev); -+ -+ obj = yaffs_find_by_number(dev, inode->i_ino); -+ -+ yaffs_fill_inode_from_obj(inode, obj); -+ -+ if (current != yaffs_dev_to_lc(dev)->readdir_process) -+ yaffs_gross_unlock(dev); -+} -+ -+#endif -+ -+ -+ -+struct inode *yaffs_get_inode(struct super_block *sb, int mode, int dev, -+ struct yaffs_obj *obj) -+{ -+ struct inode *inode; -+ -+ if (!sb) { -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_get_inode for NULL super_block!!"); -+ return NULL; -+ -+ } -+ -+ if (!obj) { -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_get_inode for NULL object!!"); -+ return NULL; -+ -+ } -+ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_get_inode for object %d", obj->obj_id); -+ -+ inode = Y_IGET(sb, obj->obj_id); -+ if (IS_ERR(inode)) -+ return NULL; -+ -+ /* NB Side effect: iget calls back to yaffs_read_inode(). */ -+ /* iget also increments the inode's i_count */ -+ /* NB You can't be holding gross_lock or deadlock will happen! */ -+ -+ return inode; -+} -+ -+ -+ -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 29) -+#define YCRED(x) x -+#else -+#define YCRED(x) (x->cred) -+#endif -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) -+static int yaffs_mknod(struct inode *dir, struct dentry *dentry, umode_t mode, -+ dev_t rdev) -+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) -+static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, -+ dev_t rdev) -+#else -+static int yaffs_mknod(struct inode *dir, struct dentry *dentry, int mode, -+ int rdev) -+#endif -+{ -+ struct inode *inode; -+ -+ struct yaffs_obj *obj = NULL; -+ struct yaffs_dev *dev; -+ -+ struct yaffs_obj *parent = yaffs_inode_to_obj(dir); -+ -+ int error = -ENOSPC; -+ uid_t uid = YCRED(current)->fsuid; -+ gid_t gid = -+ (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid; -+ -+ if ((dir->i_mode & S_ISGID) && S_ISDIR(mode)) -+ mode |= S_ISGID; -+ -+ if (parent) { -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_mknod: parent object %d type %d", -+ parent->obj_id, parent->variant_type); -+ } else { -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_mknod: could not get parent object"); -+ return -EPERM; -+ } -+ -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_mknod: making oject for %s, mode %x dev %x", -+ dentry->d_name.name, mode, rdev); -+ -+ dev = parent->my_dev; -+ -+ yaffs_gross_lock(dev); -+ -+ switch (mode & S_IFMT) { -+ default: -+ /* Special (socket, fifo, device...) */ -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod: making special"); -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) -+ obj = -+ yaffs_create_special(parent, dentry->d_name.name, mode, uid, -+ gid, old_encode_dev(rdev)); -+#else -+ obj = -+ yaffs_create_special(parent, dentry->d_name.name, mode, uid, -+ gid, rdev); -+#endif -+ break; -+ case S_IFREG: /* file */ -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod: making file"); -+ obj = yaffs_create_file(parent, dentry->d_name.name, mode, uid, -+ gid); -+ break; -+ case S_IFDIR: /* directory */ -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod: making directory"); -+ obj = yaffs_create_dir(parent, dentry->d_name.name, mode, -+ uid, gid); -+ break; -+ case S_IFLNK: /* symlink */ -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod: making symlink"); -+ obj = NULL; /* Do we ever get here? */ -+ break; -+ } -+ -+ /* Can not call yaffs_get_inode() with gross lock held */ -+ yaffs_gross_unlock(dev); -+ -+ if (obj) { -+ inode = yaffs_get_inode(dir->i_sb, mode, rdev, obj); -+ d_instantiate(dentry, inode); -+ update_dir_time(dir); -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_mknod created object %d count = %d", -+ obj->obj_id, atomic_read(&inode->i_count)); -+ error = 0; -+ yaffs_fill_inode_from_obj(dir, parent); -+ } else { -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_mknod failed making object"); -+ error = -ENOMEM; -+ } - - return error; - } - --static int yaffs_removexattr(struct dentry *dentry, const char *name) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) -+static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, umode_t mode) -+#else -+static int yaffs_mkdir(struct inode *dir, struct dentry *dentry, int mode) -+#endif -+{ -+ int ret_val; -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_mkdir"); -+ ret_val = yaffs_mknod(dir, dentry, mode | S_IFDIR, 0); -+ return ret_val; -+} -+ -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) -+static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode, -+ bool dummy) -+#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 4, 0)) -+static int yaffs_create(struct inode *dir, struct dentry *dentry, umode_t mode, -+ struct nameidata *n) -+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) -+static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode, -+ struct nameidata *n) -+#else -+static int yaffs_create(struct inode *dir, struct dentry *dentry, int mode) -+#endif -+{ -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_create"); -+ return yaffs_mknod(dir, dentry, mode | S_IFREG, 0); -+} -+ -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3, 6, 0)) -+static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry, -+ unsigned int dummy) -+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) -+static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry, -+ struct nameidata *n) -+#else -+static struct dentry *yaffs_lookup(struct inode *dir, struct dentry *dentry) -+#endif -+{ -+ struct yaffs_obj *obj; -+ struct inode *inode = NULL; /* NCB 2.5/2.6 needs NULL here */ -+ -+ struct yaffs_dev *dev = yaffs_inode_to_obj(dir)->my_dev; -+ -+ if (current != yaffs_dev_to_lc(dev)->readdir_process) -+ yaffs_gross_lock(dev); -+ -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_lookup for %d:%s", -+ yaffs_inode_to_obj(dir)->obj_id, dentry->d_name.name); -+ -+ obj = yaffs_find_by_name(yaffs_inode_to_obj(dir), dentry->d_name.name); -+ -+ obj = yaffs_get_equivalent_obj(obj); /* in case it was a hardlink */ -+ -+ /* Can't hold gross lock when calling yaffs_get_inode() */ -+ if (current != yaffs_dev_to_lc(dev)->readdir_process) -+ yaffs_gross_unlock(dev); -+ -+ if (obj) { -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_lookup found %d", obj->obj_id); -+ -+ inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj); -+ } else { -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_lookup not found"); -+ -+ } -+ -+/* added NCB for 2.5/6 compatability - forces add even if inode is -+ * NULL which creates dentry hash */ -+ d_add(dentry, inode); -+ -+ return NULL; -+} -+ -+/* -+ * Create a link... -+ */ -+static int yaffs_link(struct dentry *old_dentry, struct inode *dir, -+ struct dentry *dentry) -+{ -+ struct inode *inode = old_dentry->d_inode; -+ struct yaffs_obj *obj = NULL; -+ struct yaffs_obj *link = NULL; -+ struct yaffs_dev *dev; -+ -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_link"); -+ -+ obj = yaffs_inode_to_obj(inode); -+ dev = obj->my_dev; -+ -+ yaffs_gross_lock(dev); -+ -+ if (!S_ISDIR(inode->i_mode)) /* Don't link directories */ -+ link = -+ yaffs_link_obj(yaffs_inode_to_obj(dir), dentry->d_name.name, -+ obj); -+ -+ if (link) { -+ set_nlink(old_dentry->d_inode, yaffs_get_obj_link_count(obj)); -+ d_instantiate(dentry, old_dentry->d_inode); -+ atomic_inc(&old_dentry->d_inode->i_count); -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_link link count %d i_count %d", -+ old_dentry->d_inode->i_nlink, -+ atomic_read(&old_dentry->d_inode->i_count)); -+ } -+ -+ yaffs_gross_unlock(dev); -+ -+ if (link) { -+ update_dir_time(dir); -+ return 0; -+ } -+ -+ return -EPERM; -+} -+ -+static int yaffs_symlink(struct inode *dir, struct dentry *dentry, -+ const char *symname) - { -- struct inode *inode = dentry->d_inode; -- int error; -+ struct yaffs_obj *obj; - struct yaffs_dev *dev; -- struct yaffs_obj *obj = yaffs_inode_to_obj(inode); -+ uid_t uid = YCRED(current)->fsuid; -+ gid_t gid = -+ (dir->i_mode & S_ISGID) ? dir->i_gid : YCRED(current)->fsgid; - -- yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_removexattr of object %d", obj->obj_id); -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_symlink"); - -- dev = obj->my_dev; -+ if (strnlen(dentry->d_name.name, YAFFS_MAX_NAME_LENGTH + 1) > -+ YAFFS_MAX_NAME_LENGTH) -+ return -ENAMETOOLONG; -+ -+ if (strnlen(symname, YAFFS_MAX_ALIAS_LENGTH + 1) > -+ YAFFS_MAX_ALIAS_LENGTH) -+ return -ENAMETOOLONG; -+ -+ dev = yaffs_inode_to_obj(dir)->my_dev; - yaffs_gross_lock(dev); -- error = yaffs_remove_xattrib(obj, name); -+ obj = yaffs_create_symlink(yaffs_inode_to_obj(dir), dentry->d_name.name, -+ S_IFLNK | S_IRWXUGO, uid, gid, symname); - yaffs_gross_unlock(dev); - -- yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_removexattr done returning %d", error); -+ if (obj) { -+ struct inode *inode; - -- return error; -+ inode = yaffs_get_inode(dir->i_sb, obj->yst_mode, 0, obj); -+ d_instantiate(dentry, inode); -+ update_dir_time(dir); -+ yaffs_trace(YAFFS_TRACE_OS, "symlink created OK"); -+ return 0; -+ } else { -+ yaffs_trace(YAFFS_TRACE_OS, "symlink not created"); -+ } -+ -+ return -ENOMEM; - } - --static ssize_t yaffs_listxattr(struct dentry *dentry, char *buff, size_t size) -+/* -+ * The VFS layer already does all the dentry stuff for rename. -+ * -+ * NB: POSIX says you can rename an object over an old object of the same name -+ */ -+static int yaffs_rename(struct inode *old_dir, struct dentry *old_dentry, -+ struct inode *new_dir, struct dentry *new_dentry) - { -- struct inode *inode = dentry->d_inode; -- int error; - struct yaffs_dev *dev; -- struct yaffs_obj *obj = yaffs_inode_to_obj(inode); -+ int ret_val = YAFFS_FAIL; -+ struct yaffs_obj *target; - -- yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_listxattr of object %d", obj->obj_id); -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_rename"); -+ dev = yaffs_inode_to_obj(old_dir)->my_dev; - -- dev = obj->my_dev; - yaffs_gross_lock(dev); -- error = yaffs_list_xattrib(obj, buff, size); -+ -+ /* Check if the target is an existing directory that is not empty. */ -+ target = yaffs_find_by_name(yaffs_inode_to_obj(new_dir), -+ new_dentry->d_name.name); -+ -+ if (target && target->variant_type == YAFFS_OBJECT_TYPE_DIRECTORY && -+ !list_empty(&target->variant.dir_variant.children)) { -+ -+ yaffs_trace(YAFFS_TRACE_OS, "target is non-empty dir"); -+ -+ ret_val = YAFFS_FAIL; -+ } else { -+ /* Now does unlinking internally using shadowing mechanism */ -+ yaffs_trace(YAFFS_TRACE_OS, "calling yaffs_rename_obj"); -+ -+ ret_val = yaffs_rename_obj(yaffs_inode_to_obj(old_dir), -+ old_dentry->d_name.name, -+ yaffs_inode_to_obj(new_dir), -+ new_dentry->d_name.name); -+ } - yaffs_gross_unlock(dev); - -- yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_listxattr done returning %d", error); -+ if (ret_val == YAFFS_OK) { -+ if (target) -+ inode_dec_link_count(new_dentry->d_inode); - -- return error; -+ update_dir_time(old_dir); -+ if (old_dir != new_dir) -+ update_dir_time(new_dir); -+ return 0; -+ } else { -+ return -ENOTEMPTY; -+ } -+} -+ -+ -+ -+ -+static int yaffs_unlink(struct inode *dir, struct dentry *dentry) -+{ -+ int ret_val; -+ -+ struct yaffs_dev *dev; -+ struct yaffs_obj *obj; -+ -+ yaffs_trace(YAFFS_TRACE_OS, "yaffs_unlink %d:%s", -+ (int)(dir->i_ino), dentry->d_name.name); -+ obj = yaffs_inode_to_obj(dir); -+ dev = obj->my_dev; -+ -+ yaffs_gross_lock(dev); -+ -+ ret_val = yaffs_unlinker(obj, dentry->d_name.name); -+ -+ if (ret_val == YAFFS_OK) { -+ inode_dec_link_count(dentry->d_inode); -+ dir->i_version++; -+ yaffs_gross_unlock(dev); -+ update_dir_time(dir); -+ return 0; -+ } -+ yaffs_gross_unlock(dev); -+ return -ENOTEMPTY; - } - -+ -+ - static const struct inode_operations yaffs_dir_inode_operations = { - .create = yaffs_create, - .lookup = yaffs_lookup, -@@ -649,6 +1558,7 @@ static const struct inode_operations yaffs_dir_inode_operations = { - .listxattr = yaffs_listxattr, - .removexattr = yaffs_removexattr, - }; -+ - /*-----------------------------------------------------------------*/ - /* Directory search context allows us to unlock access to yaffs during - * filldir without causing problems with the directory being modified. -@@ -686,21 +1596,18 @@ static struct yaffs_search_context *yaffs_new_search(struct yaffs_obj *dir) - struct yaffs_dev *dev = dir->my_dev; - struct yaffs_search_context *sc = - kmalloc(sizeof(struct yaffs_search_context), GFP_NOFS); -- -- if (!sc) -- return NULL; -- -- sc->dir_obj = dir; -- sc->dev = dev; -- if (list_empty(&sc->dir_obj->variant.dir_variant.children)) -- sc->next_return = NULL; -- else -- sc->next_return = -- list_entry(dir->variant.dir_variant.children.next, -- struct yaffs_obj, siblings); -- INIT_LIST_HEAD(&sc->others); -- list_add(&sc->others, &(yaffs_dev_to_lc(dev)->search_contexts)); -- -+ if (sc) { -+ sc->dir_obj = dir; -+ sc->dev = dev; -+ if (list_empty(&sc->dir_obj->variant.dir_variant.children)) -+ sc->next_return = NULL; -+ else -+ sc->next_return = -+ list_entry(dir->variant.dir_variant.children.next, -+ struct yaffs_obj, siblings); -+ INIT_LIST_HEAD(&sc->others); -+ list_add(&sc->others, &(yaffs_dev_to_lc(dev)->search_contexts)); -+ } - return sc; - } - -@@ -764,6 +1671,9 @@ static void yaffs_remove_obj_callback(struct yaffs_obj *obj) - - } - -+ -+/*-----------------------------------------------------------------*/ -+ - static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) - { - struct yaffs_obj *obj; -@@ -773,6 +1683,7 @@ static int yaffs_readdir(struct file *f, void *dirent, filldir_t filldir) - unsigned long offset, curoffs; - struct yaffs_obj *l; - int ret_val = 0; -+ - char name[YAFFS_MAX_NAME_LENGTH + 1]; - - obj = yaffs_dentry_to_obj(f->f_dentry); -@@ -877,555 +1788,560 @@ static const struct file_operations yaffs_dir_operations = { - .llseek = generic_file_llseek, - }; - -- -- --static int yaffs_file_flush(struct file *file, fl_owner_t id) --{ -- struct yaffs_obj *obj = yaffs_dentry_to_obj(file->f_dentry); -- struct yaffs_dev *dev = obj->my_dev; -- -- yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_file_flush object %d (%s)", -- obj->obj_id, obj->dirty ? "dirty" : "clean"); -- -- yaffs_gross_lock(dev); -- -- yaffs_flush_file(obj, 1, 0); -- -- yaffs_gross_unlock(dev); -- -- return 0; --} -- --static const struct file_operations yaffs_file_operations = { -- .read = do_sync_read, -- .write = do_sync_write, -- .aio_read = generic_file_aio_read, -- .aio_write = generic_file_aio_write, -- .mmap = generic_file_mmap, -- .flush = yaffs_file_flush, -- .fsync = yaffs_sync_object, -- .splice_read = generic_file_splice_read, -- .splice_write = generic_file_splice_write, -- .llseek = generic_file_llseek, --}; -- -- --/* ExportFS support */ --static struct inode *yaffs2_nfs_get_inode(struct super_block *sb, uint64_t ino, -- uint32_t generation) --{ -- return yaffs_iget(sb, ino); --} -- --static struct dentry *yaffs2_fh_to_dentry(struct super_block *sb, -- struct fid *fid, int fh_len, -- int fh_type) --{ -- return generic_fh_to_dentry(sb, fid, fh_len, fh_type, -- yaffs2_nfs_get_inode); --} -- --static struct dentry *yaffs2_fh_to_parent(struct super_block *sb, -- struct fid *fid, int fh_len, -- int fh_type) --{ -- return generic_fh_to_parent(sb, fid, fh_len, fh_type, -- yaffs2_nfs_get_inode); --} -- --struct dentry *yaffs2_get_parent(struct dentry *dentry) --{ -- -- struct super_block *sb = dentry->d_inode->i_sb; -- struct dentry *parent = ERR_PTR(-ENOENT); -- struct inode *inode; -- unsigned long parent_ino; -- struct yaffs_obj *d_obj; -- struct yaffs_obj *parent_obj; -- -- d_obj = yaffs_inode_to_obj(dentry->d_inode); -- -- if (d_obj) { -- parent_obj = d_obj->parent; -- if (parent_obj) { -- parent_ino = yaffs_get_obj_inode(parent_obj); -- inode = yaffs_iget(sb, parent_ino); -- -- if (IS_ERR(inode)) { -- parent = ERR_CAST(inode); -- } else { -- parent = d_obtain_alias(inode); -- if (!IS_ERR(parent)) { -- parent = ERR_PTR(-ENOMEM); -- iput(inode); -- } -- } -- } -- } -- return parent; --} -- --/* Just declare a zero structure as a NULL value implies -- * using the default functions of exportfs. -- */ -- --static struct export_operations yaffs_export_ops = { -- .fh_to_dentry = yaffs2_fh_to_dentry, -- .fh_to_parent = yaffs2_fh_to_parent, -- .get_parent = yaffs2_get_parent, --}; -- -- --/*-----------------------------------------------------------------*/ -- --static int yaffs_readlink(struct dentry *dentry, char __user * buffer, -- int buflen) -+static void yaffs_fill_inode_from_obj(struct inode *inode, -+ struct yaffs_obj *obj) - { -- unsigned char *alias; -- int ret; -- struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev; -+ if (inode && obj) { - -- yaffs_gross_lock(dev); -+ /* Check mode against the variant type and attempt to repair if broken. */ -+ u32 mode = obj->yst_mode; -+ switch (obj->variant_type) { -+ case YAFFS_OBJECT_TYPE_FILE: -+ if (!S_ISREG(mode)) { -+ obj->yst_mode &= ~S_IFMT; -+ obj->yst_mode |= S_IFREG; -+ } - -- alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry)); -+ break; -+ case YAFFS_OBJECT_TYPE_SYMLINK: -+ if (!S_ISLNK(mode)) { -+ obj->yst_mode &= ~S_IFMT; -+ obj->yst_mode |= S_IFLNK; -+ } - -- yaffs_gross_unlock(dev); -+ break; -+ case YAFFS_OBJECT_TYPE_DIRECTORY: -+ if (!S_ISDIR(mode)) { -+ obj->yst_mode &= ~S_IFMT; -+ obj->yst_mode |= S_IFDIR; -+ } - -- if (!alias) -- return -ENOMEM; -+ break; -+ case YAFFS_OBJECT_TYPE_UNKNOWN: -+ case YAFFS_OBJECT_TYPE_HARDLINK: -+ case YAFFS_OBJECT_TYPE_SPECIAL: -+ default: -+ /* TODO? */ -+ break; -+ } - -- ret = vfs_readlink(dentry, buffer, buflen, alias); -- kfree(alias); -- return ret; --} -+ inode->i_flags |= S_NOATIME; -+ -+ inode->i_ino = obj->obj_id; -+ inode->i_mode = obj->yst_mode; -+ inode->i_uid = obj->yst_uid; -+ inode->i_gid = obj->yst_gid; -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)) -+ inode->i_blksize = inode->i_sb->s_blocksize; -+#endif -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) -+ -+ inode->i_rdev = old_decode_dev(obj->yst_rdev); -+ inode->i_atime.tv_sec = (time_t) (obj->yst_atime); -+ inode->i_atime.tv_nsec = 0; -+ inode->i_mtime.tv_sec = (time_t) obj->yst_mtime; -+ inode->i_mtime.tv_nsec = 0; -+ inode->i_ctime.tv_sec = (time_t) obj->yst_ctime; -+ inode->i_ctime.tv_nsec = 0; -+#else -+ inode->i_rdev = obj->yst_rdev; -+ inode->i_atime = obj->yst_atime; -+ inode->i_mtime = obj->yst_mtime; -+ inode->i_ctime = obj->yst_ctime; -+#endif -+ inode->i_size = yaffs_get_obj_length(obj); -+ inode->i_blocks = (inode->i_size + 511) >> 9; -+ -+ set_nlink(inode, yaffs_get_obj_link_count(obj)); - --static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd) --{ -- unsigned char *alias; -- void *ret; -- struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev; -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_fill_inode mode %x uid %d gid %d size %lld count %d", -+ inode->i_mode, inode->i_uid, inode->i_gid, -+ inode->i_size, atomic_read(&inode->i_count)); -+ -+ switch (obj->yst_mode & S_IFMT) { -+ default: /* fifo, device or socket */ -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) -+ init_special_inode(inode, obj->yst_mode, -+ old_decode_dev(obj->yst_rdev)); -+#else -+ init_special_inode(inode, obj->yst_mode, -+ (dev_t) (obj->yst_rdev)); -+#endif -+ break; -+ case S_IFREG: /* file */ -+ inode->i_op = &yaffs_file_inode_operations; -+ inode->i_fop = &yaffs_file_operations; -+ inode->i_mapping->a_ops = -+ &yaffs_file_address_operations; -+ break; -+ case S_IFDIR: /* directory */ -+ inode->i_op = &yaffs_dir_inode_operations; -+ inode->i_fop = &yaffs_dir_operations; -+ break; -+ case S_IFLNK: /* symlink */ -+ inode->i_op = &yaffs_symlink_inode_operations; -+ break; -+ } - -- yaffs_gross_lock(dev); -+ yaffs_inode_to_obj_lv(inode) = obj; - -- alias = yaffs_get_symlink_alias(yaffs_dentry_to_obj(dentry)); -- yaffs_gross_unlock(dev); -+ obj->my_inode = inode; - -- if (!alias) { -- ret = ERR_PTR(-ENOMEM); -- goto out; -+ } else { -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_fill_inode invalid parameters"); - } - -- nd_set_link(nd, alias); -- ret = (void *)alias; --out: -- return ret; --} -- --void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias) --{ -- kfree(alias); - } - - --static void yaffs_unstitch_obj(struct inode *inode, struct yaffs_obj *obj) --{ -- /* Clear the association between the inode and -- * the struct yaffs_obj. -- */ -- obj->my_inode = NULL; -- yaffs_inode_to_obj_lv(inode) = NULL; -- -- /* If the object freeing was deferred, then the real -- * free happens now. -- * This should fix the inode inconsistency problem. -- */ -- yaffs_handle_defered_free(obj); --} - --/* yaffs_evict_inode combines into one operation what was previously done in -- * yaffs_clear_inode() and yaffs_delete_inode() -+/* -+ * yaffs background thread functions . -+ * yaffs_bg_thread_fn() the thread function -+ * yaffs_bg_start() launches the background thread. -+ * yaffs_bg_stop() cleans up the background thread. - * -+ * NB: -+ * The thread should only run after the yaffs is initialised -+ * The thread should be stopped before yaffs is unmounted. -+ * The thread should not do any writing while the fs is in read only. - */ --static void yaffs_evict_inode(struct inode *inode) --{ -- struct yaffs_obj *obj; -- struct yaffs_dev *dev; -- int deleteme = 0; -- -- obj = yaffs_inode_to_obj(inode); -- -- yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_evict_inode: ino %d, count %d %s", -- (int)inode->i_ino, -- atomic_read(&inode->i_count), -- obj ? "object exists" : "null object"); - -- if (!inode->i_nlink && !is_bad_inode(inode)) -- deleteme = 1; -- truncate_inode_pages(&inode->i_data, 0); -- end_writeback(inode); -+static unsigned yaffs_bg_gc_urgency(struct yaffs_dev *dev) -+{ -+ unsigned erased_chunks = -+ dev->n_erased_blocks * dev->param.chunks_per_block; -+ struct yaffs_linux_context *context = yaffs_dev_to_lc(dev); -+ unsigned scattered = 0; /* Free chunks not in an erased block */ - -- if (deleteme && obj) { -- dev = obj->my_dev; -- yaffs_gross_lock(dev); -- yaffs_del_obj(obj); -- yaffs_gross_unlock(dev); -- } -- if (obj) { -- dev = obj->my_dev; -- yaffs_gross_lock(dev); -- yaffs_unstitch_obj(inode, obj); -- yaffs_gross_unlock(dev); -- } -+ if (erased_chunks < dev->n_free_chunks) -+ scattered = (dev->n_free_chunks - erased_chunks); - -+ if (!context->bg_running) -+ return 0; -+ else if (scattered < (dev->param.chunks_per_block * 2)) -+ return 0; -+ else if (erased_chunks > dev->n_free_chunks / 2) -+ return 0; -+ else if (erased_chunks > dev->n_free_chunks / 4) -+ return 1; -+ else -+ return 2; - } - --static void yaffs_touch_super(struct yaffs_dev *dev) --{ -- struct super_block *sb = yaffs_dev_to_lc(dev)->super; -+#ifdef YAFFS_COMPILE_BACKGROUND - -- yaffs_trace(YAFFS_TRACE_OS, "yaffs_touch_super() sb = %p", sb); -- if (sb) -- sb->s_dirt = 1; -+void yaffs_background_waker(unsigned long data) -+{ -+ wake_up_process((struct task_struct *)data); - } - --static int yaffs_readpage_nolock(struct file *f, struct page *pg) -+static int yaffs_bg_thread_fn(void *data) - { -- /* Lifted from jffs2 */ -- -- struct yaffs_obj *obj; -- unsigned char *pg_buf; -- int ret; -- struct yaffs_dev *dev; -- loff_t pos = ((loff_t) pg->index) << PAGE_CACHE_SHIFT; -- -- yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_readpage_nolock at %lld, size %08x", -- (long long)pos, -- (unsigned)PAGE_CACHE_SIZE); -+ struct yaffs_dev *dev = (struct yaffs_dev *)data; -+ struct yaffs_linux_context *context = yaffs_dev_to_lc(dev); -+ unsigned long now = jiffies; -+ unsigned long next_dir_update = now; -+ unsigned long next_gc = now; -+ unsigned long expires; -+ unsigned int urgency; - -+ int gc_result; -+ struct timer_list timer; - -- obj = yaffs_dentry_to_obj(f->f_dentry); -+ yaffs_trace(YAFFS_TRACE_BACKGROUND, -+ "yaffs_background starting for dev %p", (void *)dev); - -- dev = obj->my_dev; -+#ifdef YAFFS_COMPILE_FREEZER -+ set_freezable(); -+#endif -+ while (context->bg_running) { -+ yaffs_trace(YAFFS_TRACE_BACKGROUND, "yaffs_background"); - -- BUG_ON(!PageLocked(pg)); -+ if (kthread_should_stop()) -+ break; - -- pg_buf = kmap(pg); -- /* FIXME: Can kmap fail? */ -+#ifdef YAFFS_COMPILE_FREEZER -+ if (try_to_freeze()) -+ continue; -+#endif -+ yaffs_gross_lock(dev); - -- yaffs_gross_lock(dev); -+ now = jiffies; - -- ret = yaffs_file_rd(obj, pg_buf, pos, PAGE_CACHE_SIZE); -+ if (time_after(now, next_dir_update) && yaffs_bg_enable) { -+ yaffs_update_dirty_dirs(dev); -+ next_dir_update = now + HZ; -+ } - -- yaffs_gross_unlock(dev); -+ if (time_after(now, next_gc) && yaffs_bg_enable) { -+ if (!dev->is_checkpointed) { -+ urgency = yaffs_bg_gc_urgency(dev); -+ gc_result = yaffs_bg_gc(dev, urgency); -+ if (urgency > 1) -+ next_gc = now + HZ / 20 + 1; -+ else if (urgency > 0) -+ next_gc = now + HZ / 10 + 1; -+ else -+ next_gc = now + HZ * 2; -+ } else { -+ /* -+ * gc not running so set to next_dir_update -+ * to cut down on wake ups -+ */ -+ next_gc = next_dir_update; -+ } -+ } -+ yaffs_gross_unlock(dev); -+#if 1 -+ expires = next_dir_update; -+ if (time_before(next_gc, expires)) -+ expires = next_gc; -+ if (time_before(expires, now)) -+ expires = now + HZ; - -- if (ret >= 0) -- ret = 0; -+ Y_INIT_TIMER(&timer); -+ timer.expires = expires + 1; -+ timer.data = (unsigned long)current; -+ timer.function = yaffs_background_waker; - -- if (ret) { -- ClearPageUptodate(pg); -- SetPageError(pg); -- } else { -- SetPageUptodate(pg); -- ClearPageError(pg); -+ set_current_state(TASK_INTERRUPTIBLE); -+ add_timer(&timer); -+ schedule(); -+ del_timer_sync(&timer); -+#else -+ msleep(10); -+#endif - } - -- flush_dcache_page(pg); -- kunmap(pg); -- -- yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage_nolock done"); -- return ret; -+ return 0; - } - --static int yaffs_readpage_unlock(struct file *f, struct page *pg) -+static int yaffs_bg_start(struct yaffs_dev *dev) - { -- int ret = yaffs_readpage_nolock(f, pg); -+ int retval = 0; -+ struct yaffs_linux_context *context = yaffs_dev_to_lc(dev); - -- unlock_page(pg); -- return ret; --} -+ if (dev->read_only) -+ return -1; - --static int yaffs_readpage(struct file *f, struct page *pg) --{ -- int ret; -+ context->bg_running = 1; - -- yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage"); -- ret = yaffs_readpage_unlock(f, pg); -- yaffs_trace(YAFFS_TRACE_OS, "yaffs_readpage done"); -- return ret; -+ context->bg_thread = kthread_run(yaffs_bg_thread_fn, -+ (void *)dev, "yaffs-bg-%d", -+ context->mount_id); -+ -+ if (IS_ERR(context->bg_thread)) { -+ retval = PTR_ERR(context->bg_thread); -+ context->bg_thread = NULL; -+ context->bg_running = 0; -+ } -+ return retval; - } - --/* writepage inspired by/stolen from smbfs */ -+static void yaffs_bg_stop(struct yaffs_dev *dev) -+{ -+ struct yaffs_linux_context *ctxt = yaffs_dev_to_lc(dev); -+ -+ ctxt->bg_running = 0; - --static int yaffs_writepage(struct page *page, struct writeback_control *wbc) -+ if (ctxt->bg_thread) { -+ kthread_stop(ctxt->bg_thread); -+ ctxt->bg_thread = NULL; -+ } -+} -+#else -+static int yaffs_bg_thread_fn(void *data) - { -- struct yaffs_dev *dev; -- struct address_space *mapping = page->mapping; -- struct inode *inode; -- unsigned long end_index; -- char *buffer; -- struct yaffs_obj *obj; -- int n_written = 0; -- unsigned n_bytes; -- loff_t i_size; -+ return 0; -+} - -- if (!mapping) -- BUG(); -- inode = mapping->host; -- if (!inode) -- BUG(); -- i_size = i_size_read(inode); -+static int yaffs_bg_start(struct yaffs_dev *dev) -+{ -+ return 0; -+} - -- end_index = i_size >> PAGE_CACHE_SHIFT; -+static void yaffs_bg_stop(struct yaffs_dev *dev) -+{ -+} -+#endif - -- if (page->index < end_index) -- n_bytes = PAGE_CACHE_SIZE; -- else { -- n_bytes = i_size & (PAGE_CACHE_SIZE - 1); - -- if (page->index > end_index || !n_bytes) { -- yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_writepage at %08x, inode size = %08x!!!", -- (unsigned)(page->index << PAGE_CACHE_SHIFT), -- (unsigned)inode->i_size); -- yaffs_trace(YAFFS_TRACE_OS, -- " -> don't care!!"); -+static void yaffs_flush_inodes(struct super_block *sb) -+{ -+ struct inode *iptr; -+ struct yaffs_obj *obj; - -- zero_user_segment(page, 0, PAGE_CACHE_SIZE); -- set_page_writeback(page); -- unlock_page(page); -- end_page_writeback(page); -- return 0; -+ list_for_each_entry(iptr, &sb->s_inodes, i_sb_list) { -+ obj = yaffs_inode_to_obj(iptr); -+ if (obj) { -+ yaffs_trace(YAFFS_TRACE_OS, -+ "flushing obj %d", -+ obj->obj_id); -+ yaffs_flush_file(obj, 1, 0); - } - } -+} - -- if (n_bytes != PAGE_CACHE_SIZE) -- zero_user_segment(page, n_bytes, PAGE_CACHE_SIZE); -+static void yaffs_flush_super(struct super_block *sb, int do_checkpoint) -+{ -+ struct yaffs_dev *dev = yaffs_super_to_dev(sb); -+ if (!dev) -+ return; - -- get_page(page); -+ yaffs_flush_inodes(sb); -+ yaffs_update_dirty_dirs(dev); -+ yaffs_flush_whole_cache(dev); -+ if (do_checkpoint) -+ yaffs_checkpoint_save(dev); -+} - -- buffer = kmap(page); -+static LIST_HEAD(yaffs_context_list); -+struct mutex yaffs_context_lock; - -- obj = yaffs_inode_to_obj(inode); -- dev = obj->my_dev; -- yaffs_gross_lock(dev); -+static void yaffs_put_super(struct super_block *sb) -+{ -+ struct yaffs_dev *dev = yaffs_super_to_dev(sb); -+ struct mtd_info *mtd = yaffs_dev_to_mtd(dev); - -- yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_writepage at %08x, size %08x", -- (unsigned)(page->index << PAGE_CACHE_SHIFT), n_bytes); -- yaffs_trace(YAFFS_TRACE_OS, -- "writepag0: obj = %05x, ino = %05x", -- (int)obj->variant.file_variant.file_size, (int)inode->i_size); -+ yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_ALWAYS, -+ "yaffs_put_super"); - -- n_written = yaffs_wr_file(obj, buffer, -- ((loff_t)page->index) << PAGE_CACHE_SHIFT, -- n_bytes, 0); -+ yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND, -+ "Shutting down yaffs background thread"); -+ yaffs_bg_stop(dev); -+ yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND, -+ "yaffs background thread shut down"); - -- yaffs_touch_super(dev); -+ yaffs_gross_lock(dev); - -- yaffs_trace(YAFFS_TRACE_OS, -- "writepag1: obj = %05x, ino = %05x", -- (int)obj->variant.file_variant.file_size, (int)inode->i_size); -+ yaffs_flush_super(sb, 1); -+ -+ yaffs_deinitialise(dev); - - yaffs_gross_unlock(dev); - -- kunmap(page); -- set_page_writeback(page); -- unlock_page(page); -- end_page_writeback(page); -- put_page(page); -+ mutex_lock(&yaffs_context_lock); -+ list_del_init(&(yaffs_dev_to_lc(dev)->context_list)); -+ mutex_unlock(&yaffs_context_lock); - -- return (n_written == n_bytes) ? 0 : -ENOSPC; --} -+ if (yaffs_dev_to_lc(dev)->spare_buffer) { -+ kfree(yaffs_dev_to_lc(dev)->spare_buffer); -+ yaffs_dev_to_lc(dev)->spare_buffer = NULL; -+ } - --/* Space holding and freeing is done to ensure we have space available for -- * write_begin/end. -- * For now we just assume few parallel writes and check against a small -- * number. -- * Todo: need to do this with a counter to handle parallel reads better -- */ -+ kfree(dev); - --static ssize_t yaffs_hold_space(struct file *f) --{ -- struct yaffs_obj *obj; -- struct yaffs_dev *dev; -- int n_free_chunks; -+ yaffs_put_mtd_device(mtd); - -- obj = yaffs_dentry_to_obj(f->f_dentry); -+ yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_ALWAYS, -+ "yaffs_put_super done"); -+} - -- dev = obj->my_dev; - -- yaffs_gross_lock(dev); -+static unsigned yaffs_gc_control_callback(struct yaffs_dev *dev) -+{ -+ return yaffs_gc_control; -+} - -- n_free_chunks = yaffs_get_n_free_chunks(dev); - -- yaffs_gross_unlock(dev); -+#ifdef YAFFS_COMPILE_EXPORTFS - -- return (n_free_chunks > 20) ? 1 : 0; -+static struct inode *yaffs2_nfs_get_inode(struct super_block *sb, uint64_t ino, -+ uint32_t generation) -+{ -+ return Y_IGET(sb, ino); - } - --static void yaffs_release_space(struct file *f) -+static struct dentry *yaffs2_fh_to_dentry(struct super_block *sb, -+ struct fid *fid, int fh_len, -+ int fh_type) - { -- struct yaffs_obj *obj; -- struct yaffs_dev *dev; -- -- obj = yaffs_dentry_to_obj(f->f_dentry); -- -- dev = obj->my_dev; -- -- yaffs_gross_lock(dev); -+ return generic_fh_to_dentry(sb, fid, fh_len, fh_type, -+ yaffs2_nfs_get_inode); -+} - -- yaffs_gross_unlock(dev); -+static struct dentry *yaffs2_fh_to_parent(struct super_block *sb, -+ struct fid *fid, int fh_len, -+ int fh_type) -+{ -+ return generic_fh_to_parent(sb, fid, fh_len, fh_type, -+ yaffs2_nfs_get_inode); - } - --static int yaffs_write_begin(struct file *filp, struct address_space *mapping, -- loff_t pos, unsigned len, unsigned flags, -- struct page **pagep, void **fsdata) -+struct dentry *yaffs2_get_parent(struct dentry *dentry) - { -- struct page *pg = NULL; -- pgoff_t index = pos >> PAGE_CACHE_SHIFT; -- int ret = 0; -- int space_held = 0; - -- /* Get a page */ -- pg = grab_cache_page_write_begin(mapping, index, flags); -+ struct super_block *sb = dentry->d_inode->i_sb; -+ struct dentry *parent = ERR_PTR(-ENOENT); -+ struct inode *inode; -+ unsigned long parent_ino; -+ struct yaffs_obj *d_obj; -+ struct yaffs_obj *parent_obj; - -- *pagep = pg; -- if (!pg) { -- ret = -ENOMEM; -- goto out; -- } -- yaffs_trace(YAFFS_TRACE_OS, -- "start yaffs_write_begin index %d(%x) uptodate %d", -- (int)index, (int)index, PageUptodate(pg) ? 1 : 0); -+ d_obj = yaffs_inode_to_obj(dentry->d_inode); - -- /* Get fs space */ -- space_held = yaffs_hold_space(filp); -+ if (d_obj) { -+ parent_obj = d_obj->parent; -+ if (parent_obj) { -+ parent_ino = yaffs_get_obj_inode(parent_obj); -+ inode = Y_IGET(sb, parent_ino); - -- if (!space_held) { -- ret = -ENOSPC; -- goto out; -+ if (IS_ERR(inode)) { -+ parent = ERR_CAST(inode); -+ } else { -+ parent = d_obtain_alias(inode); -+ if (!IS_ERR(parent)) { -+ parent = ERR_PTR(-ENOMEM); -+ iput(inode); -+ } -+ } -+ } - } - -- /* Update page if required */ -+ return parent; -+} - -- if (!PageUptodate(pg)) -- ret = yaffs_readpage_nolock(filp, pg); -+/* Just declare a zero structure as a NULL value implies -+ * using the default functions of exportfs. -+ */ - -- if (ret) -- goto out; -+static struct export_operations yaffs_export_ops = { -+ .fh_to_dentry = yaffs2_fh_to_dentry, -+ .fh_to_parent = yaffs2_fh_to_parent, -+ .get_parent = yaffs2_get_parent, -+}; - -- /* Happy path return */ -- yaffs_trace(YAFFS_TRACE_OS, "end yaffs_write_begin - ok"); -+#endif - -- return 0; -+static void yaffs_unstitch_obj(struct inode *inode, struct yaffs_obj *obj) -+{ -+ /* Clear the association between the inode and -+ * the struct yaffs_obj. -+ */ -+ obj->my_inode = NULL; -+ yaffs_inode_to_obj_lv(inode) = NULL; - --out: -- yaffs_trace(YAFFS_TRACE_OS, -- "end yaffs_write_begin fail returning %d", ret); -- if (space_held) -- yaffs_release_space(filp); -- if (pg) { -- unlock_page(pg); -- page_cache_release(pg); -- } -- return ret; -+ /* If the object freeing was deferred, then the real -+ * free happens now. -+ * This should fix the inode inconsistency problem. -+ */ -+ yaffs_handle_defered_free(obj); - } - --static ssize_t yaffs_file_write(struct file *f, const char *buf, size_t n, -- loff_t *pos) -+#ifdef YAFFS_HAS_EVICT_INODE -+/* yaffs_evict_inode combines into one operation what was previously done in -+ * yaffs_clear_inode() and yaffs_delete_inode() -+ * -+ */ -+static void yaffs_evict_inode(struct inode *inode) - { - struct yaffs_obj *obj; -- int n_written, ipos; -- struct inode *inode; - struct yaffs_dev *dev; -+ int deleteme = 0; - -- obj = yaffs_dentry_to_obj(f->f_dentry); -- -- if (!obj) { -- /* This should not happen */ -- yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_file_write: hey obj is null!"); -- return -EINVAL; -- } -- -- dev = obj->my_dev; -+ obj = yaffs_inode_to_obj(inode); - -- yaffs_gross_lock(dev); -+ yaffs_trace(YAFFS_TRACE_OS, -+ "yaffs_evict_inode: ino %d, count %d %s", -+ (int)inode->i_ino, atomic_read(&inode->i_count), -+ obj ? "object exists" : "null object"); - -- inode = f->f_dentry->d_inode; -+ if (!inode->i_nlink && !is_bad_inode(inode)) -+ deleteme = 1; -+ truncate_inode_pages(&inode->i_data, 0); -+ Y_CLEAR_INODE(inode); - -- if (!S_ISBLK(inode->i_mode) && f->f_flags & O_APPEND) -- ipos = inode->i_size; -- else -- ipos = *pos; -+ if (deleteme && obj) { -+ dev = obj->my_dev; -+ yaffs_gross_lock(dev); -+ yaffs_del_obj(obj); -+ yaffs_gross_unlock(dev); -+ } -+ if (obj) { -+ dev = obj->my_dev; -+ yaffs_gross_lock(dev); -+ yaffs_unstitch_obj(inode, obj); -+ yaffs_gross_unlock(dev); -+ } -+} -+#else - -- yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_file_write about to write writing %u(%x) bytes to object %d at %d(%x)", -- (unsigned)n, (unsigned)n, obj->obj_id, ipos, ipos); -+/* clear is called to tell the fs to release any per-inode data it holds. -+ * The object might still exist on disk and is just being thrown out of the cache -+ * or else the object has actually been deleted and we're being called via -+ * the chain -+ * yaffs_delete_inode() -> clear_inode()->yaffs_clear_inode() -+ */ - -- n_written = yaffs_wr_file(obj, buf, ipos, n, 0); -+static void yaffs_clear_inode(struct inode *inode) -+{ -+ struct yaffs_obj *obj; -+ struct yaffs_dev *dev; - -- yaffs_touch_super(dev); -+ obj = yaffs_inode_to_obj(inode); - - yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_file_write: %d(%x) bytes written", -- (unsigned)n, (unsigned)n); -- -- if (n_written > 0) { -- ipos += n_written; -- *pos = ipos; -- if (ipos > inode->i_size) { -- inode->i_size = ipos; -- inode->i_blocks = (ipos + 511) >> 9; -+ "yaffs_clear_inode: ino %d, count %d %s", -+ (int)inode->i_ino, atomic_read(&inode->i_count), -+ obj ? "object exists" : "null object"); - -- yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_file_write size updated to %d bytes, %d blocks", -- ipos, (int)(inode->i_blocks)); -- } -+ if (obj) { -+ dev = obj->my_dev; -+ yaffs_gross_lock(dev); -+ yaffs_unstitch_obj(inode, obj); -+ yaffs_gross_unlock(dev); - } -- yaffs_gross_unlock(dev); -- return (n_written == 0) && (n > 0) ? -ENOSPC : n_written; -+ - } - --static int yaffs_write_end(struct file *filp, struct address_space *mapping, -- loff_t pos, unsigned len, unsigned copied, -- struct page *pg, void *fsdadata) -+/* delete is called when the link count is zero and the inode -+ * is put (ie. nobody wants to know about it anymore, time to -+ * delete the file). -+ * NB Must call clear_inode() -+ */ -+static void yaffs_delete_inode(struct inode *inode) - { -- int ret = 0; -- void *addr, *kva; -- uint32_t offset_into_page = pos & (PAGE_CACHE_SIZE - 1); -- -- kva = kmap(pg); -- addr = kva + offset_into_page; -+ struct yaffs_obj *obj = yaffs_inode_to_obj(inode); -+ struct yaffs_dev *dev; - - yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_write_end addr %p pos %x n_bytes %d", -- addr, (unsigned)pos, copied); -- -- ret = yaffs_file_write(filp, addr, copied, &pos); -+ "yaffs_delete_inode: ino %d, count %d %s", -+ (int)inode->i_ino, atomic_read(&inode->i_count), -+ obj ? "object exists" : "null object"); - -- if (ret != copied) { -- yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_write_end not same size ret %d copied %d", -- ret, copied); -- SetPageError(pg); -+ if (obj) { -+ dev = obj->my_dev; -+ yaffs_gross_lock(dev); -+ yaffs_del_obj(obj); -+ yaffs_gross_unlock(dev); - } -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 13)) -+ truncate_inode_pages(&inode->i_data, 0); -+#endif -+ clear_inode(inode); -+} -+#endif - -- kunmap(pg); - -- yaffs_release_space(filp); -- unlock_page(pg); -- page_cache_release(pg); -- return ret; --} - -+ -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) - static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf) - { - struct yaffs_dev *dev = yaffs_dentry_to_obj(dentry)->my_dev; - struct super_block *sb = dentry->d_sb; -+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) -+static int yaffs_statfs(struct super_block *sb, struct kstatfs *buf) -+{ -+ struct yaffs_dev *dev = yaffs_super_to_dev(sb); -+#else -+static int yaffs_statfs(struct super_block *sb, struct statfs *buf) -+{ -+ struct yaffs_dev *dev = yaffs_super_to_dev(sb); -+#endif - - yaffs_trace(YAFFS_TRACE_OS, "yaffs_statfs"); - -@@ -1443,12 +2359,11 @@ static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf) - - bytes_in_dev = - ((uint64_t) -- ((dev->param.end_block - dev->param.start_block + 1))) * -- ((uint64_t) (dev->param.chunks_per_block * -+ ((dev->param.end_block - dev->param.start_block + -+ 1))) * ((uint64_t) (dev->param.chunks_per_block * - dev->data_bytes_per_chunk)); - -- do_div(bytes_in_dev, sb->s_blocksize); -- /* bytes_in_dev becomes the number of blocks */ -+ do_div(bytes_in_dev, sb->s_blocksize); /* bytes_in_dev becomes the number of blocks */ - buf->f_blocks = bytes_in_dev; - - bytes_free = ((uint64_t) (yaffs_get_n_free_chunks(dev))) * -@@ -1480,230 +2395,72 @@ static int yaffs_statfs(struct dentry *dentry, struct kstatfs *buf) - - buf->f_files = 0; - buf->f_ffree = 0; -- buf->f_bavail = buf->f_bfree; -- -- yaffs_gross_unlock(dev); -- return 0; --} -- --static void yaffs_flush_inodes(struct super_block *sb) --{ -- struct inode *iptr; -- struct yaffs_obj *obj; -- -- list_for_each_entry(iptr, &sb->s_inodes, i_sb_list) { -- obj = yaffs_inode_to_obj(iptr); -- if (obj) { -- yaffs_trace(YAFFS_TRACE_OS, -- "flushing obj %d", obj->obj_id); -- yaffs_flush_file(obj, 1, 0); -- } -- } --} -- --static void yaffs_flush_super(struct super_block *sb, int do_checkpoint) --{ -- struct yaffs_dev *dev = yaffs_super_to_dev(sb); -- -- if (!dev) -- return; -- -- yaffs_flush_inodes(sb); -- yaffs_update_dirty_dirs(dev); -- yaffs_flush_whole_cache(dev); -- if (do_checkpoint) -- yaffs_checkpoint_save(dev); --} -- --static unsigned yaffs_bg_gc_urgency(struct yaffs_dev *dev) --{ -- unsigned erased_chunks = -- dev->n_erased_blocks * dev->param.chunks_per_block; -- struct yaffs_linux_context *context = yaffs_dev_to_lc(dev); -- unsigned scattered = 0; /* Free chunks not in an erased block */ -- -- if (erased_chunks < dev->n_free_chunks) -- scattered = (dev->n_free_chunks - erased_chunks); -- -- if (!context->bg_running) -- return 0; -- else if (scattered < (dev->param.chunks_per_block * 2)) -- return 0; -- else if (erased_chunks > dev->n_free_chunks / 2) -- return 0; -- else if (erased_chunks > dev->n_free_chunks / 4) -- return 1; -- else -- return 2; --} -- --static int yaffs_do_sync_fs(struct super_block *sb, int request_checkpoint) --{ -- -- struct yaffs_dev *dev = yaffs_super_to_dev(sb); -- unsigned int oneshot_checkpoint = (yaffs_auto_checkpoint & 4); -- unsigned gc_urgent = yaffs_bg_gc_urgency(dev); -- int do_checkpoint; -- -- yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND, -- "yaffs_do_sync_fs: gc-urgency %d %s %s%s", -- gc_urgent, -- sb->s_dirt ? "dirty" : "clean", -- request_checkpoint ? "checkpoint requested" : "no checkpoint", -- oneshot_checkpoint ? " one-shot" : ""); -- -- yaffs_gross_lock(dev); -- do_checkpoint = ((request_checkpoint && !gc_urgent) || -- oneshot_checkpoint) && !dev->is_checkpointed; -- -- if (sb->s_dirt || do_checkpoint) { -- yaffs_flush_super(sb, !dev->is_checkpointed && do_checkpoint); -- sb->s_dirt = 0; -- if (oneshot_checkpoint) -- yaffs_auto_checkpoint &= ~4; -- } -- yaffs_gross_unlock(dev); -- -- return 0; --} -- --/* -- * yaffs background thread functions . -- * yaffs_bg_thread_fn() the thread function -- * yaffs_bg_start() launches the background thread. -- * yaffs_bg_stop() cleans up the background thread. -- * -- * NB: -- * The thread should only run after the yaffs is initialised -- * The thread should be stopped before yaffs is unmounted. -- * The thread should not do any writing while the fs is in read only. -- */ -- --void yaffs_background_waker(unsigned long data) --{ -- wake_up_process((struct task_struct *)data); --} -- --static int yaffs_bg_thread_fn(void *data) --{ -- struct yaffs_dev *dev = (struct yaffs_dev *)data; -- struct yaffs_linux_context *context = yaffs_dev_to_lc(dev); -- unsigned long now = jiffies; -- unsigned long next_dir_update = now; -- unsigned long next_gc = now; -- unsigned long expires; -- unsigned int urgency; -- int gc_result; -- struct timer_list timer; -- -- yaffs_trace(YAFFS_TRACE_BACKGROUND, -- "yaffs_background starting for dev %p", (void *)dev); -- -- set_freezable(); -- while (context->bg_running) { -- yaffs_trace(YAFFS_TRACE_BACKGROUND, "yaffs_background"); -- -- if (kthread_should_stop()) -- break; -- -- if (try_to_freeze()) -- continue; -- -- yaffs_gross_lock(dev); -- -- now = jiffies; -- -- if (time_after(now, next_dir_update) && yaffs_bg_enable) { -- yaffs_update_dirty_dirs(dev); -- next_dir_update = now + HZ; -- } -- -- if (time_after(now, next_gc) && yaffs_bg_enable) { -- if (!dev->is_checkpointed) { -- urgency = yaffs_bg_gc_urgency(dev); -- gc_result = yaffs_bg_gc(dev, urgency); -- if (urgency > 1) -- next_gc = now + HZ / 20 + 1; -- else if (urgency > 0) -- next_gc = now + HZ / 10 + 1; -- else -- next_gc = now + HZ * 2; -- } else { -- /* -- * gc not running so set to next_dir_update -- * to cut down on wake ups -- */ -- next_gc = next_dir_update; -- } -- } -- yaffs_gross_unlock(dev); -- expires = next_dir_update; -- if (time_before(next_gc, expires)) -- expires = next_gc; -- if (time_before(expires, now)) -- expires = now + HZ; -- -- init_timer_on_stack(&timer); -- timer.expires = expires + 1; -- timer.data = (unsigned long)current; -- timer.function = yaffs_background_waker; -- -- set_current_state(TASK_INTERRUPTIBLE); -- add_timer(&timer); -- schedule(); -- del_timer_sync(&timer); -- } -- -- return 0; --} -- --static int yaffs_bg_start(struct yaffs_dev *dev) --{ -- int retval = 0; -- struct yaffs_linux_context *context = yaffs_dev_to_lc(dev); -- -- if (dev->read_only) -- return -1; -- -- context->bg_running = 1; -- -- context->bg_thread = kthread_run(yaffs_bg_thread_fn, -- (void *)dev, "yaffs-bg-%d", -- context->mount_id); -- -- if (IS_ERR(context->bg_thread)) { -- retval = PTR_ERR(context->bg_thread); -- context->bg_thread = NULL; -- context->bg_running = 0; -- } -- return retval; -+ buf->f_bavail = buf->f_bfree; -+ -+ yaffs_gross_unlock(dev); -+ return 0; - } - --static void yaffs_bg_stop(struct yaffs_dev *dev) -+ -+ -+static int yaffs_do_sync_fs(struct super_block *sb, int request_checkpoint) - { -- struct yaffs_linux_context *ctxt = yaffs_dev_to_lc(dev); - -- ctxt->bg_running = 0; -+ struct yaffs_dev *dev = yaffs_super_to_dev(sb); -+ unsigned int oneshot_checkpoint = (yaffs_auto_checkpoint & 4); -+ unsigned gc_urgent = yaffs_bg_gc_urgency(dev); -+ int do_checkpoint; -+ int dirty = yaffs_check_super_dirty(dev); - -- if (ctxt->bg_thread) { -- kthread_stop(ctxt->bg_thread); -- ctxt->bg_thread = NULL; -+ yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND, -+ "yaffs_do_sync_fs: gc-urgency %d %s %s%s", -+ gc_urgent, -+ dirty ? "dirty" : "clean", -+ request_checkpoint ? "checkpoint requested" : "no checkpoint", -+ oneshot_checkpoint ? " one-shot" : ""); -+ -+ yaffs_gross_lock(dev); -+ do_checkpoint = ((request_checkpoint && !gc_urgent) || -+ oneshot_checkpoint) && !dev->is_checkpointed; -+ -+ if (dirty || do_checkpoint) { -+ yaffs_flush_super(sb, !dev->is_checkpointed && do_checkpoint); -+ yaffs_clear_super_dirty(dev); -+ if (oneshot_checkpoint) -+ yaffs_auto_checkpoint &= ~4; - } -+ yaffs_gross_unlock(dev); -+ -+ return 0; - } - -+ -+#ifdef YAFFS_HAS_WRITE_SUPER -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) - static void yaffs_write_super(struct super_block *sb) -+#else -+static int yaffs_write_super(struct super_block *sb) -+#endif - { - unsigned request_checkpoint = (yaffs_auto_checkpoint >= 2); - - yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_SYNC | YAFFS_TRACE_BACKGROUND, -- "yaffs_write_super%s", -+ "yaffs_write_super %s", - request_checkpoint ? " checkpt" : ""); - - yaffs_do_sync_fs(sb, request_checkpoint); - -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 18)) -+ return 0; -+#endif - } -+#endif - -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) - static int yaffs_sync_fs(struct super_block *sb, int wait) -+#else -+static int yaffs_sync_fs(struct super_block *sb) -+#endif - { - unsigned request_checkpoint = (yaffs_auto_checkpoint >= 1); - -@@ -1715,8 +2472,29 @@ static int yaffs_sync_fs(struct super_block *sb, int wait) - return 0; - } - --static LIST_HEAD(yaffs_context_list); --struct mutex yaffs_context_lock; -+ -+ -+static const struct super_operations yaffs_super_ops = { -+ .statfs = yaffs_statfs, -+ -+#ifndef YAFFS_USE_OWN_IGET -+ .read_inode = yaffs_read_inode, -+#endif -+#ifdef YAFFS_HAS_PUT_INODE -+ .put_inode = yaffs_put_inode, -+#endif -+ .put_super = yaffs_put_super, -+#ifdef YAFFS_HAS_EVICT_INODE -+ .evict_inode = yaffs_evict_inode, -+#else -+ .delete_inode = yaffs_delete_inode, -+ .clear_inode = yaffs_clear_inode, -+#endif -+ .sync_fs = yaffs_sync_fs, -+#ifdef YAFFS_HAS_WRITE_SUPER -+ .write_super = yaffs_write_super, -+#endif -+}; - - struct yaffs_options { - int inband_tags; -@@ -1729,11 +2507,12 @@ struct yaffs_options { - int lazy_loading_overridden; - int empty_lost_and_found; - int empty_lost_and_found_overridden; -+ int disable_summary; - }; - - #define MAX_OPT_LEN 30 - static int yaffs_parse_options(struct yaffs_options *options, -- const char *options_str) -+ const char *options_str) - { - char cur_opt[MAX_OPT_LEN + 1]; - int p; -@@ -1770,6 +2549,8 @@ static int yaffs_parse_options(struct yaffs_options *options, - } else if (!strcmp(cur_opt, "lazy-loading-on")) { - options->lazy_loading_enabled = 1; - options->lazy_loading_overridden = 1; -+ } else if (!strcmp(cur_opt, "disable-summary")) { -+ options->disable_summary = 1; - } else if (!strcmp(cur_opt, "empty-lost-and-found-off")) { - options->empty_lost_and_found = 0; - options->empty_lost_and_found_overridden = 1; -@@ -1791,174 +2572,27 @@ static int yaffs_parse_options(struct yaffs_options *options, - error = 1; - } - } -+ - return error; - } - --static const struct address_space_operations yaffs_file_address_operations = { -- .readpage = yaffs_readpage, -- .writepage = yaffs_writepage, -- .write_begin = yaffs_write_begin, -- .write_end = yaffs_write_end, --}; -- -- -- --static const struct inode_operations yaffs_file_inode_operations = { -- .setattr = yaffs_setattr, -- .setxattr = yaffs_setxattr, -- .getxattr = yaffs_getxattr, -- .listxattr = yaffs_listxattr, -- .removexattr = yaffs_removexattr, --}; -- --static const struct inode_operations yaffs_symlink_inode_operations = { -- .readlink = yaffs_readlink, -- .follow_link = yaffs_follow_link, -- .put_link = yaffs_put_link, -- .setattr = yaffs_setattr, -- .setxattr = yaffs_setxattr, -- .getxattr = yaffs_getxattr, -- .listxattr = yaffs_listxattr, -- .removexattr = yaffs_removexattr, --}; - --static void yaffs_fill_inode_from_obj(struct inode *inode, -- struct yaffs_obj *obj) -+static struct dentry *yaffs_make_root(struct inode *inode) - { -- u32 mode; -- -- if (!inode || !obj) { -- yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_fill_inode invalid parameters"); -- return; -- } -- -- /* Check mode against the variant type -- * and attempt to repair if broken. */ -- mode = obj->yst_mode; -- -- switch (obj->variant_type) { -- case YAFFS_OBJECT_TYPE_FILE: -- if (!S_ISREG(mode)) { -- obj->yst_mode &= ~S_IFMT; -- obj->yst_mode |= S_IFREG; -- } -- break; -- case YAFFS_OBJECT_TYPE_SYMLINK: -- if (!S_ISLNK(mode)) { -- obj->yst_mode &= ~S_IFMT; -- obj->yst_mode |= S_IFLNK; -- } -- break; -- case YAFFS_OBJECT_TYPE_DIRECTORY: -- if (!S_ISDIR(mode)) { -- obj->yst_mode &= ~S_IFMT; -- obj->yst_mode |= S_IFDIR; -- } -- break; -- case YAFFS_OBJECT_TYPE_UNKNOWN: -- case YAFFS_OBJECT_TYPE_HARDLINK: -- case YAFFS_OBJECT_TYPE_SPECIAL: -- default: -- /* TODO? */ -- break; -- } -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)) -+ struct dentry *root = d_alloc_root(inode); - -- inode->i_flags |= S_NOATIME; -- inode->i_ino = obj->obj_id; -- inode->i_mode = obj->yst_mode; -- inode->i_uid = obj->yst_uid; -- inode->i_gid = obj->yst_gid; -- -- inode->i_rdev = old_decode_dev(obj->yst_rdev); -- -- inode->i_atime.tv_sec = (time_t) (obj->yst_atime); -- inode->i_atime.tv_nsec = 0; -- inode->i_mtime.tv_sec = (time_t) obj->yst_mtime; -- inode->i_mtime.tv_nsec = 0; -- inode->i_ctime.tv_sec = (time_t) obj->yst_ctime; -- inode->i_ctime.tv_nsec = 0; -- inode->i_size = yaffs_get_obj_length(obj); -- inode->i_blocks = (inode->i_size + 511) >> 9; -- set_nlink(inode, yaffs_get_obj_link_count(obj)); -- yaffs_trace(YAFFS_TRACE_OS, -- "yaffs_fill_inode mode %x uid %d gid %d size %d count %d", -- inode->i_mode, inode->i_uid, inode->i_gid, -- (int)inode->i_size, atomic_read(&inode->i_count)); -- -- switch (obj->yst_mode & S_IFMT) { -- default: /* fifo, device or socket */ -- init_special_inode(inode, obj->yst_mode, -- old_decode_dev(obj->yst_rdev)); -- break; -- case S_IFREG: /* file */ -- inode->i_op = &yaffs_file_inode_operations; -- inode->i_fop = &yaffs_file_operations; -- inode->i_mapping->a_ops = &yaffs_file_address_operations; -- break; -- case S_IFDIR: /* directory */ -- inode->i_op = &yaffs_dir_inode_operations; -- inode->i_fop = &yaffs_dir_operations; -- break; -- case S_IFLNK: /* symlink */ -- inode->i_op = &yaffs_symlink_inode_operations; -- break; -- } -+ if (!root) -+ iput(inode); - -- yaffs_inode_to_obj_lv(inode) = obj; -- obj->my_inode = inode; -+ return root; -+#else -+ return d_make_root(inode); -+#endif - } - --static void yaffs_put_super(struct super_block *sb) --{ -- struct yaffs_dev *dev = yaffs_super_to_dev(sb); -- struct mtd_info *mtd = yaffs_dev_to_mtd(dev); -- -- yaffs_trace(YAFFS_TRACE_OS, "yaffs_put_super"); -- -- yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND, -- "Shutting down yaffs background thread"); -- yaffs_bg_stop(dev); -- yaffs_trace(YAFFS_TRACE_OS | YAFFS_TRACE_BACKGROUND, -- "yaffs background thread shut down"); -- -- yaffs_gross_lock(dev); -- -- yaffs_flush_super(sb, 1); -- -- if (yaffs_dev_to_lc(dev)->put_super_fn) -- yaffs_dev_to_lc(dev)->put_super_fn(sb); -- -- yaffs_deinitialise(dev); -- -- yaffs_gross_unlock(dev); -- mutex_lock(&yaffs_context_lock); -- list_del_init(&(yaffs_dev_to_lc(dev)->context_list)); -- mutex_unlock(&yaffs_context_lock); -- -- if (yaffs_dev_to_lc(dev)->spare_buffer) { -- kfree(yaffs_dev_to_lc(dev)->spare_buffer); -- yaffs_dev_to_lc(dev)->spare_buffer = NULL; -- } -- -- kfree(dev); -- - - -- if (mtd && mtd->sync) -- mtd->sync(mtd); -- -- if (mtd) -- put_mtd_device(mtd); --} -- --static const struct super_operations yaffs_super_ops = { -- .statfs = yaffs_statfs, -- .put_super = yaffs_put_super, -- .evict_inode = yaffs_evict_inode, -- .sync_fs = yaffs_sync_fs, -- .write_super = yaffs_write_super, --}; - - static struct super_block *yaffs_internal_read_super(int yaffs_version, - struct super_block *sb, -@@ -1974,8 +2608,12 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, - char *data_str = (char *)data; - struct yaffs_linux_context *context = NULL; - struct yaffs_param *param; -+ - int read_only = 0; -+ int inband_tags = 0; -+ - struct yaffs_options options; -+ - unsigned mount_id; - int found; - struct yaffs_linux_context *context_iterator; -@@ -1984,7 +2622,7 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, - if (!sb) { - printk(KERN_INFO "yaffs: sb is NULL\n"); - return NULL; -- } -+ } - - sb->s_magic = YAFFS_MAGIC; - sb->s_op = &yaffs_super_ops; -@@ -1992,7 +2630,9 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, - - read_only = ((sb->s_flags & MS_RDONLY) != 0); - -+#ifdef YAFFS_COMPILE_EXPORTFS - sb->s_export_op = &yaffs_export_ops; -+#endif - - if (!sb->s_dev) - printk(KERN_INFO "yaffs: sb->s_dev is NULL\n"); -@@ -2010,9 +2650,10 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, - - memset(&options, 0, sizeof(options)); - -- if (yaffs_parse_options(&options, data_str)) -+ if (yaffs_parse_options(&options, data_str)) { - /* Option parsing failed */ - return NULL; -+ } - - sb->s_blocksize = PAGE_CACHE_SIZE; - sb->s_blocksize_bits = PAGE_CACHE_SHIFT; -@@ -2023,89 +2664,37 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, - "yaffs_read_super: block size %d", (int)(sb->s_blocksize)); - - yaffs_trace(YAFFS_TRACE_ALWAYS, -- "Attempting MTD mount of %u.%u,\"%s\"", -+ "yaffs: Attempting MTD mount of %u.%u,\"%s\"", - MAJOR(sb->s_dev), MINOR(sb->s_dev), - yaffs_devname(sb, devname_buf)); - -- /* Check it's an mtd device..... */ -- if (MAJOR(sb->s_dev) != MTD_BLOCK_MAJOR) -- return NULL; /* This isn't an mtd device */ -- - /* Get the device */ - mtd = get_mtd_device(NULL, MINOR(sb->s_dev)); - if (!mtd) { - yaffs_trace(YAFFS_TRACE_ALWAYS, -- "MTD device #%u doesn't appear to exist", -+ "yaffs: MTD device %u either not valid or unavailable", - MINOR(sb->s_dev)); - return NULL; - } -- /* Check it's NAND */ -- if (mtd->type != MTD_NANDFLASH) { -- yaffs_trace(YAFFS_TRACE_ALWAYS, -- "MTD device is not NAND it's type %d", -- mtd->type); -- return NULL; -- } -- -- yaffs_trace(YAFFS_TRACE_OS, " erase %p", mtd->erase); -- yaffs_trace(YAFFS_TRACE_OS, " read %p", mtd->read); -- yaffs_trace(YAFFS_TRACE_OS, " write %p", mtd->write); -- yaffs_trace(YAFFS_TRACE_OS, " readoob %p", mtd->read_oob); -- yaffs_trace(YAFFS_TRACE_OS, " writeoob %p", mtd->write_oob); -- yaffs_trace(YAFFS_TRACE_OS, " block_isbad %p", mtd->block_isbad); -- yaffs_trace(YAFFS_TRACE_OS, " block_markbad %p", mtd->block_markbad); -- yaffs_trace(YAFFS_TRACE_OS, " writesize %d", mtd->writesize); -- yaffs_trace(YAFFS_TRACE_OS, " oobsize %d", mtd->oobsize); -- yaffs_trace(YAFFS_TRACE_OS, " erasesize %d", mtd->erasesize); -- yaffs_trace(YAFFS_TRACE_OS, " size %lld", mtd->size); - -- if (yaffs_auto_select && yaffs_version == 1 && mtd->writesize >= 2048) { -+ if (yaffs_auto_select && yaffs_version == 1 && WRITE_SIZE(mtd) >= 2048) { - yaffs_trace(YAFFS_TRACE_ALWAYS, "auto selecting yaffs2"); - yaffs_version = 2; - } - -- if (yaffs_auto_select && yaffs_version == 2 && !options.inband_tags && -- mtd->writesize == 512) { -+ /* Added NCB 26/5/2006 for completeness */ -+ if (yaffs_version == 2 && !options.inband_tags -+ && WRITE_SIZE(mtd) == 512) { - yaffs_trace(YAFFS_TRACE_ALWAYS, "auto selecting yaffs1"); - yaffs_version = 1; - } - -- if (yaffs_version == 2) { -- /* Check for version 2 style functions */ -- if (!mtd->erase || -- !mtd->block_isbad || -- !mtd->block_markbad || -- !mtd->read || -- !mtd->write || !mtd->read_oob || !mtd->write_oob) { -- yaffs_trace(YAFFS_TRACE_ALWAYS, -- "MTD device does not support required functions"); -- return NULL; -- } -- -- if ((mtd->writesize < YAFFS_MIN_YAFFS2_CHUNK_SIZE || -- mtd->oobsize < YAFFS_MIN_YAFFS2_SPARE_SIZE) && -- !options.inband_tags) { -- yaffs_trace(YAFFS_TRACE_ALWAYS, -- "MTD device does not have the right page sizes"); -- return NULL; -- } -- } else { -- /* Check for V1 style functions */ -- if (!mtd->erase || -- !mtd->read || -- !mtd->write || !mtd->read_oob || !mtd->write_oob) { -- yaffs_trace(YAFFS_TRACE_ALWAYS, -- "MTD device does not support required functions"); -- return NULL; -- } -+ if (mtd->oobavail < sizeof(struct yaffs_packed_tags2) || -+ options.inband_tags) -+ inband_tags = 1; - -- if (mtd->writesize < YAFFS_BYTES_PER_CHUNK || -- mtd->oobsize != YAFFS_BYTES_PER_SPARE) { -- yaffs_trace(YAFFS_TRACE_ALWAYS, -- "MTD device does not support have the right page sizes"); -- return NULL; -- } -- } -+ if(yaffs_verify_mtd(mtd, yaffs_version, inband_tags) < 0) -+ return NULL; - - /* OK, so if we got here, we have an MTD that's NAND and looks - * like it has the right capabilities -@@ -2115,7 +2704,8 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, - if (!read_only && !(mtd->flags & MTD_WRITEABLE)) { - read_only = 1; - printk(KERN_INFO -- "yaffs: mtd is read only, setting superblock read only"); -+ "yaffs: mtd is read only, setting superblock read only\n" -+ ); - sb->s_flags |= MS_RDONLY; - } - -@@ -2123,8 +2713,10 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, - context = kmalloc(sizeof(struct yaffs_linux_context), GFP_KERNEL); - - if (!dev || !context) { -- kfree(dev); -- kfree(context); -+ if (dev) -+ kfree(dev); -+ if (context) -+ kfree(context); - dev = NULL; - context = NULL; - } -@@ -2132,7 +2724,8 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, - if (!dev) { - /* Deep shit could not allocate device structure */ - yaffs_trace(YAFFS_TRACE_ALWAYS, -- "yaffs_read_super failed trying to allocate yaffs_dev"); -+ "yaffs_read_super: Failed trying to allocate struct yaffs_dev." -+ ); - return NULL; - } - memset(dev, 0, sizeof(struct yaffs_dev)); -@@ -2146,26 +2739,23 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, - - dev->read_only = read_only; - -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) - sb->s_fs_info = dev; -+#else -+ sb->u.generic_sbp = dev; -+#endif -+ - - dev->driver_context = mtd; - param->name = mtd->name; - - /* Set up the memory size parameters.... */ - -- n_blocks = -- YCALCBLOCKS(mtd->size, -- (YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK)); - -- param->start_block = 0; -- param->end_block = n_blocks - 1; -- param->chunks_per_block = YAFFS_CHUNKS_PER_BLOCK; -- param->total_bytes_per_chunk = YAFFS_BYTES_PER_CHUNK; - param->n_reserved_blocks = 5; - param->n_caches = (options.no_cache) ? 0 : 10; -- param->inband_tags = options.inband_tags; -+ param->inband_tags = inband_tags; - -- param->disable_lazy_load = 1; - param->enable_xattr = 1; - if (options.lazy_loading_overridden) - param->disable_lazy_load = !options.lazy_loading_enabled; -@@ -2176,42 +2766,45 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, - param->no_tags_ecc = !options.tags_ecc_on; - - param->empty_lost_n_found = 1; -- - param->refresh_period = 500; -+ param->disable_summary = options.disable_summary; -+ - -+#ifdef CONFIG_YAFFS_DISABLE_BAD_BLOCK_MARKING -+ param->disable_bad_block_marking = 1; -+#endif - if (options.empty_lost_and_found_overridden) - param->empty_lost_n_found = options.empty_lost_and_found; - - /* ... and the functions. */ - if (yaffs_version == 2) { -- param->write_chunk_tags_fn = nandmtd2_write_chunk_tags; -- param->read_chunk_tags_fn = nandmtd2_read_chunk_tags; -- param->bad_block_fn = nandmtd2_mark_block_bad; -- param->query_block_fn = nandmtd2_query_block; -- yaffs_dev_to_lc(dev)->spare_buffer = -- kmalloc(mtd->oobsize, GFP_NOFS); - param->is_yaffs2 = 1; -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) - param->total_bytes_per_chunk = mtd->writesize; - param->chunks_per_block = mtd->erasesize / mtd->writesize; -+#else -+ param->total_bytes_per_chunk = mtd->oobblock; -+ param->chunks_per_block = mtd->erasesize / mtd->oobblock; -+#endif - n_blocks = YCALCBLOCKS(mtd->size, mtd->erasesize); - - param->start_block = 0; - param->end_block = n_blocks - 1; - } else { -- /* use the MTD interface in yaffs_mtdif1.c */ -- param->write_chunk_tags_fn = nandmtd1_write_chunk_tags; -- param->read_chunk_tags_fn = nandmtd1_read_chunk_tags; -- param->bad_block_fn = nandmtd1_mark_block_bad; -- param->query_block_fn = nandmtd1_query_block; - param->is_yaffs2 = 0; -+ n_blocks = YCALCBLOCKS(mtd->size, -+ YAFFS_CHUNKS_PER_BLOCK * YAFFS_BYTES_PER_CHUNK); -+ -+ param->chunks_per_block = YAFFS_CHUNKS_PER_BLOCK; -+ param->total_bytes_per_chunk = YAFFS_BYTES_PER_CHUNK; - } -- /* ... and common functions */ -- param->erase_fn = nandmtd_erase_block; -- param->initialise_flash_fn = nandmtd_initialise; - -- yaffs_dev_to_lc(dev)->put_super_fn = yaffs_mtd_put_super; -+ param->start_block = 0; -+ param->end_block = n_blocks - 1; -+ -+ yaffs_mtd_drv_install(dev); - -- param->sb_dirty_fn = yaffs_touch_super; -+ param->sb_dirty_fn = yaffs_set_super_dirty; - param->gc_control_fn = yaffs_gc_control_callback; - - yaffs_dev_to_lc(dev)->super = sb; -@@ -2223,12 +2816,13 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, - - mutex_lock(&yaffs_context_lock); - /* Get a mount id */ -- for (mount_id = 0, found = 0; !found; mount_id++) { -+ found = 0; -+ for (mount_id = 0; !found; mount_id++) { - found = 1; - list_for_each(l, &yaffs_context_list) { - context_iterator = -- list_entry(l, struct yaffs_linux_context, -- context_list); -+ list_entry(l, struct yaffs_linux_context, -+ context_list); - if (context_iterator->mount_id == mount_id) - found = 0; - } -@@ -2276,16 +2870,15 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, - - yaffs_trace(YAFFS_TRACE_OS, "yaffs_read_super: got root inode"); - -- root = d_alloc_root(inode); -- -- yaffs_trace(YAFFS_TRACE_OS, "yaffs_read_super: d_alloc_root done"); -+ root = yaffs_make_root(inode); - -- if (!root) { -- iput(inode); -+ if (!root) - return NULL; -- } -+ - sb->s_root = root; -- sb->s_dirt = !dev->is_checkpointed; -+ if(!dev->is_checkpointed) -+ yaffs_set_super_dirty(dev); -+ - yaffs_trace(YAFFS_TRACE_ALWAYS, - "yaffs_read_super: is_checkpointed %d", - dev->is_checkpointed); -@@ -2294,48 +2887,115 @@ static struct super_block *yaffs_internal_read_super(int yaffs_version, - return sb; - } - -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) - static int yaffs_internal_read_super_mtd(struct super_block *sb, void *data, - int silent) - { - return yaffs_internal_read_super(1, sb, data, silent) ? 0 : -EINVAL; - } - --static struct dentry *yaffs_mount(struct file_system_type *fs, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) -+static struct dentry *yaffs_mount(struct file_system_type *fs_type, int flags, -+ const char *dev_name, void *data) -+{ -+ return mount_bdev(fs_type, flags, dev_name, data, yaffs_internal_read_super_mtd); -+} -+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) -+static int yaffs_read_super(struct file_system_type *fs, - int flags, const char *dev_name, -- void *data) -+ void *data, struct vfsmount *mnt) -+{ -+ -+ return get_sb_bdev(fs, flags, dev_name, data, -+ yaffs_internal_read_super_mtd, mnt); -+} -+#else -+static struct super_block *yaffs_read_super(struct file_system_type *fs, -+ int flags, const char *dev_name, -+ void *data) - { -- return mount_bdev(fs, flags, dev_name, data, -+ -+ return get_sb_bdev(fs, flags, dev_name, data, - yaffs_internal_read_super_mtd); - } -+#endif - - static struct file_system_type yaffs_fs_type = { - .owner = THIS_MODULE, - .name = "yaffs", -- .mount = yaffs_mount, -- .kill_sb = kill_block_super, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) -+ .mount = yaffs_mount, -+#else -+ .get_sb = yaffs_read_super, -+#endif -+ .kill_sb = kill_block_super, - .fs_flags = FS_REQUIRES_DEV, - }; -+#else -+static struct super_block *yaffs_read_super(struct super_block *sb, void *data, -+ int silent) -+{ -+ return yaffs_internal_read_super(1, sb, data, silent); -+} - -+static DECLARE_FSTYPE(yaffs_fs_type, "yaffs", yaffs_read_super, -+ FS_REQUIRES_DEV); -+#endif -+ -+ -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) - static int yaffs2_internal_read_super_mtd(struct super_block *sb, void *data, - int silent) - { - return yaffs_internal_read_super(2, sb, data, silent) ? 0 : -EINVAL; - } - --static struct dentry *yaffs2_mount(struct file_system_type *fs, -- int flags, const char *dev_name, void *data) -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) -+static struct dentry *yaffs2_mount(struct file_system_type *fs_type, int flags, -+ const char *dev_name, void *data) -+{ -+ return mount_bdev(fs_type, flags, dev_name, data, yaffs2_internal_read_super_mtd); -+} -+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 17)) -+static int yaffs2_read_super(struct file_system_type *fs, -+ int flags, const char *dev_name, void *data, -+ struct vfsmount *mnt) - { -- return mount_bdev(fs, flags, dev_name, data, -+ return get_sb_bdev(fs, flags, dev_name, data, -+ yaffs2_internal_read_super_mtd, mnt); -+} -+#else -+static struct super_block *yaffs2_read_super(struct file_system_type *fs, -+ int flags, const char *dev_name, -+ void *data) -+{ -+ -+ return get_sb_bdev(fs, flags, dev_name, data, - yaffs2_internal_read_super_mtd); - } -+#endif - - static struct file_system_type yaffs2_fs_type = { - .owner = THIS_MODULE, - .name = "yaffs2", -- .mount = yaffs2_mount, -- .kill_sb = kill_block_super, -+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 39)) -+ .mount = yaffs2_mount, -+#else -+ .get_sb = yaffs2_read_super, -+#endif -+ .kill_sb = kill_block_super, - .fs_flags = FS_REQUIRES_DEV, - }; -+#else -+static struct super_block *yaffs2_read_super(struct super_block *sb, -+ void *data, int silent) -+{ -+ return yaffs_internal_read_super(2, sb, data, silent); -+} -+ -+static DECLARE_FSTYPE(yaffs2_fs_type, "yaffs2", yaffs2_read_super, -+ FS_REQUIRES_DEV); -+#endif - - - static struct proc_dir_entry *my_proc_entry; -@@ -2343,78 +3003,86 @@ static struct proc_dir_entry *my_proc_entry; - static char *yaffs_dump_dev_part0(char *buf, struct yaffs_dev *dev) - { - struct yaffs_param *param = &dev->param; -- -- buf += sprintf(buf, "start_block........... %d\n", param->start_block); -- buf += sprintf(buf, "end_block............. %d\n", param->end_block); -- buf += sprintf(buf, "total_bytes_per_chunk. %d\n", -- param->total_bytes_per_chunk); -- buf += sprintf(buf, "use_nand_ecc.......... %d\n", -- param->use_nand_ecc); -- buf += sprintf(buf, "no_tags_ecc........... %d\n", param->no_tags_ecc); -- buf += sprintf(buf, "is_yaffs2............. %d\n", param->is_yaffs2); -- buf += sprintf(buf, "inband_tags........... %d\n", param->inband_tags); -- buf += sprintf(buf, "empty_lost_n_found.... %d\n", -- param->empty_lost_n_found); -- buf += sprintf(buf, "disable_lazy_load..... %d\n", -- param->disable_lazy_load); -- buf += sprintf(buf, "refresh_period........ %d\n", -- param->refresh_period); -- buf += sprintf(buf, "n_caches.............. %d\n", param->n_caches); -- buf += sprintf(buf, "n_reserved_blocks..... %d\n", -- param->n_reserved_blocks); -- buf += sprintf(buf, "always_check_erased... %d\n", -- param->always_check_erased); -+ int bs[10]; -+ -+ yaffs_count_blocks_by_state(dev,bs); -+ -+ buf += sprintf(buf, "start_block.......... %d\n", param->start_block); -+ buf += sprintf(buf, "end_block............ %d\n", param->end_block); -+ buf += sprintf(buf, "total_bytes_per_chunk %d\n", -+ param->total_bytes_per_chunk); -+ buf += sprintf(buf, "use_nand_ecc......... %d\n", param->use_nand_ecc); -+ buf += sprintf(buf, "no_tags_ecc.......... %d\n", param->no_tags_ecc); -+ buf += sprintf(buf, "is_yaffs2............ %d\n", param->is_yaffs2); -+ buf += sprintf(buf, "inband_tags.......... %d\n", param->inband_tags); -+ buf += sprintf(buf, "empty_lost_n_found... %d\n", -+ param->empty_lost_n_found); -+ buf += sprintf(buf, "disable_lazy_load.... %d\n", -+ param->disable_lazy_load); -+ buf += sprintf(buf, "disable_bad_block_mrk %d\n", -+ param->disable_bad_block_marking); -+ buf += sprintf(buf, "refresh_period....... %d\n", -+ param->refresh_period); -+ buf += sprintf(buf, "n_caches............. %d\n", param->n_caches); -+ buf += sprintf(buf, "n_reserved_blocks.... %d\n", -+ param->n_reserved_blocks); -+ buf += sprintf(buf, "always_check_erased.. %d\n", -+ param->always_check_erased); -+ buf += sprintf(buf, "\n"); -+ buf += sprintf(buf, "block count by state\n"); -+ buf += sprintf(buf, "0:%d 1:%d 2:%d 3:%d 4:%d\n", -+ bs[0], bs[1], bs[2], bs[3], bs[4]); -+ buf += sprintf(buf, "5:%d 6:%d 7:%d 8:%d 9:%d\n", -+ bs[5], bs[6], bs[7], bs[8], bs[9]); - - return buf; - } - - static char *yaffs_dump_dev_part1(char *buf, struct yaffs_dev *dev) - { -- buf += sprintf(buf, "max file size......... %lld\n", -- (long long) yaffs_max_file_size(dev)); -- buf += sprintf(buf, "data_bytes_per_chunk.. %d\n", -- dev->data_bytes_per_chunk); -- buf += sprintf(buf, "chunk_grp_bits........ %d\n", dev->chunk_grp_bits); -- buf += sprintf(buf, "chunk_grp_size........ %d\n", dev->chunk_grp_size); -- buf += -- sprintf(buf, "n_erased_blocks....... %d\n", dev->n_erased_blocks); -- buf += -- sprintf(buf, "blocks_in_checkpt..... %d\n", dev->blocks_in_checkpt); -+ buf += sprintf(buf, "max file size....... %lld\n", -+ (long long) yaffs_max_file_size(dev)); -+ buf += sprintf(buf, "data_bytes_per_chunk. %d\n", -+ dev->data_bytes_per_chunk); -+ buf += sprintf(buf, "chunk_grp_bits....... %d\n", dev->chunk_grp_bits); -+ buf += sprintf(buf, "chunk_grp_size....... %d\n", dev->chunk_grp_size); -+ buf += sprintf(buf, "n_erased_blocks...... %d\n", dev->n_erased_blocks); -+ buf += sprintf(buf, "blocks_in_checkpt.... %d\n", -+ dev->blocks_in_checkpt); - buf += sprintf(buf, "\n"); -- buf += sprintf(buf, "n_tnodes.............. %d\n", dev->n_tnodes); -- buf += sprintf(buf, "n_obj................. %d\n", dev->n_obj); -- buf += sprintf(buf, "n_free_chunks......... %d\n", dev->n_free_chunks); -+ buf += sprintf(buf, "n_tnodes............. %d\n", dev->n_tnodes); -+ buf += sprintf(buf, "n_obj................ %d\n", dev->n_obj); -+ buf += sprintf(buf, "n_free_chunks........ %d\n", dev->n_free_chunks); - buf += sprintf(buf, "\n"); -- buf += sprintf(buf, "n_page_writes......... %u\n", dev->n_page_writes); -- buf += sprintf(buf, "n_page_reads.......... %u\n", dev->n_page_reads); -- buf += sprintf(buf, "n_erasures............ %u\n", dev->n_erasures); -- buf += sprintf(buf, "n_gc_copies........... %u\n", dev->n_gc_copies); -- buf += sprintf(buf, "all_gcs............... %u\n", dev->all_gcs); -- buf += -- sprintf(buf, "passive_gc_count...... %u\n", dev->passive_gc_count); -- buf += -- sprintf(buf, "oldest_dirty_gc_count. %u\n", -- dev->oldest_dirty_gc_count); -- buf += sprintf(buf, "n_gc_blocks........... %u\n", dev->n_gc_blocks); -- buf += sprintf(buf, "bg_gcs................ %u\n", dev->bg_gcs); -- buf += -- sprintf(buf, "n_retried_writes...... %u\n", dev->n_retried_writes); -- buf += -- sprintf(buf, "n_retired_blocks...... %u\n", dev->n_retired_blocks); -- buf += sprintf(buf, "n_ecc_fixed........... %u\n", dev->n_ecc_fixed); -- buf += sprintf(buf, "n_ecc_unfixed......... %u\n", dev->n_ecc_unfixed); -- buf += -- sprintf(buf, "n_tags_ecc_fixed...... %u\n", dev->n_tags_ecc_fixed); -- buf += -- sprintf(buf, "n_tags_ecc_unfixed.... %u\n", -- dev->n_tags_ecc_unfixed); -- buf += sprintf(buf, "cache_hits............ %u\n", dev->cache_hits); -- buf += -- sprintf(buf, "n_deleted_files....... %u\n", dev->n_deleted_files); -- buf += -- sprintf(buf, "n_unlinked_files...... %u\n", dev->n_unlinked_files); -- buf += sprintf(buf, "refresh_count......... %u\n", dev->refresh_count); -- buf += sprintf(buf, "n_bg_deletions........ %u\n", dev->n_bg_deletions); -+ buf += sprintf(buf, "n_page_writes........ %u\n", dev->n_page_writes); -+ buf += sprintf(buf, "n_page_reads......... %u\n", dev->n_page_reads); -+ buf += sprintf(buf, "n_erasures........... %u\n", dev->n_erasures); -+ buf += sprintf(buf, "n_gc_copies.......... %u\n", dev->n_gc_copies); -+ buf += sprintf(buf, "all_gcs.............. %u\n", dev->all_gcs); -+ buf += sprintf(buf, "passive_gc_count..... %u\n", -+ dev->passive_gc_count); -+ buf += sprintf(buf, "oldest_dirty_gc_count %u\n", -+ dev->oldest_dirty_gc_count); -+ buf += sprintf(buf, "n_gc_blocks.......... %u\n", dev->n_gc_blocks); -+ buf += sprintf(buf, "bg_gcs............... %u\n", dev->bg_gcs); -+ buf += sprintf(buf, "n_retried_writes..... %u\n", -+ dev->n_retried_writes); -+ buf += sprintf(buf, "n_retired_blocks..... %u\n", -+ dev->n_retired_blocks); -+ buf += sprintf(buf, "n_ecc_fixed.......... %u\n", dev->n_ecc_fixed); -+ buf += sprintf(buf, "n_ecc_unfixed........ %u\n", dev->n_ecc_unfixed); -+ buf += sprintf(buf, "n_tags_ecc_fixed..... %u\n", -+ dev->n_tags_ecc_fixed); -+ buf += sprintf(buf, "n_tags_ecc_unfixed... %u\n", -+ dev->n_tags_ecc_unfixed); -+ buf += sprintf(buf, "cache_hits........... %u\n", dev->cache_hits); -+ buf += sprintf(buf, "n_deleted_files...... %u\n", dev->n_deleted_files); -+ buf += sprintf(buf, "n_unlinked_files..... %u\n", -+ dev->n_unlinked_files); -+ buf += sprintf(buf, "refresh_count........ %u\n", dev->refresh_count); -+ buf += sprintf(buf, "n_bg_deletions....... %u\n", dev->n_bg_deletions); -+ buf += sprintf(buf, "tags_used............ %u\n", dev->tags_used); -+ buf += sprintf(buf, "summary_used......... %u\n", dev->summary_used); - - return buf; - } -@@ -2438,7 +3106,10 @@ static int yaffs_proc_read(char *page, - - /* Print header first */ - if (step == 0) -- buf += sprintf(buf, "YAFFS built:" __DATE__ " " __TIME__ "\n"); -+ buf += -+ sprintf(buf, -+ "Multi-version YAFFS built:" __DATE__ " " __TIME__ -+ "\n"); - else if (step == 1) - buf += sprintf(buf, "\n"); - else { -@@ -2446,8 +3117,7 @@ static int yaffs_proc_read(char *page, - - mutex_lock(&yaffs_context_lock); - -- /* Locate and print the Nth entry. -- * Order N-squared but N is small. */ -+ /* Locate and print the Nth entry. Order N-squared but N is small. */ - list_for_each(item, &yaffs_context_list) { - struct yaffs_linux_context *dc = - list_entry(item, struct yaffs_linux_context, -@@ -2465,7 +3135,7 @@ static int yaffs_proc_read(char *page, - buf = yaffs_dump_dev_part0(buf, dev); - } else { - buf = yaffs_dump_dev_part1(buf, dev); -- } -+ } - - break; - } -@@ -2475,7 +3145,232 @@ static int yaffs_proc_read(char *page, - return buf - page < count ? buf - page : count; - } - -+/** -+ * Set the verbosity of the warnings and error messages. -+ * -+ * Note that the names can only be a..z or _ with the current code. -+ */ -+ -+static struct { -+ char *mask_name; -+ unsigned mask_bitfield; -+} mask_flags[] = { -+ {"allocate", YAFFS_TRACE_ALLOCATE}, -+ {"always", YAFFS_TRACE_ALWAYS}, -+ {"background", YAFFS_TRACE_BACKGROUND}, -+ {"bad_blocks", YAFFS_TRACE_BAD_BLOCKS}, -+ {"buffers", YAFFS_TRACE_BUFFERS}, -+ {"bug", YAFFS_TRACE_BUG}, -+ {"checkpt", YAFFS_TRACE_CHECKPOINT}, -+ {"deletion", YAFFS_TRACE_DELETION}, -+ {"erase", YAFFS_TRACE_ERASE}, -+ {"error", YAFFS_TRACE_ERROR}, -+ {"gc_detail", YAFFS_TRACE_GC_DETAIL}, -+ {"gc", YAFFS_TRACE_GC}, -+ {"lock", YAFFS_TRACE_LOCK}, -+ {"mtd", YAFFS_TRACE_MTD}, -+ {"nandaccess", YAFFS_TRACE_NANDACCESS}, -+ {"os", YAFFS_TRACE_OS}, -+ {"scan_debug", YAFFS_TRACE_SCAN_DEBUG}, -+ {"scan", YAFFS_TRACE_SCAN}, -+ {"mount", YAFFS_TRACE_MOUNT}, -+ {"tracing", YAFFS_TRACE_TRACING}, -+ {"sync", YAFFS_TRACE_SYNC}, -+ {"write", YAFFS_TRACE_WRITE}, -+ {"verify", YAFFS_TRACE_VERIFY}, -+ {"verify_nand", YAFFS_TRACE_VERIFY_NAND}, -+ {"verify_full", YAFFS_TRACE_VERIFY_FULL}, -+ {"verify_all", YAFFS_TRACE_VERIFY_ALL}, -+ {"all", 0xffffffff}, -+ {"none", 0}, -+ {NULL, 0}, -+}; -+ -+#define MAX_MASK_NAME_LENGTH 40 -+static int yaffs_proc_write_trace_options(struct file *file, const char *buf, -+ unsigned long count, void *data) -+{ -+ unsigned rg = 0, mask_bitfield; -+ char *end; -+ char *mask_name; -+ const char *x; -+ char substring[MAX_MASK_NAME_LENGTH + 1]; -+ int i; -+ int done = 0; -+ int add, len = 0; -+ int pos = 0; -+ -+ rg = yaffs_trace_mask; -+ -+ while (!done && (pos < count)) { -+ done = 1; -+ while ((pos < count) && isspace(buf[pos])) -+ pos++; -+ -+ switch (buf[pos]) { -+ case '+': -+ case '-': -+ case '=': -+ add = buf[pos]; -+ pos++; -+ break; -+ -+ default: -+ add = ' '; -+ break; -+ } -+ mask_name = NULL; -+ -+ mask_bitfield = simple_strtoul(buf + pos, &end, 0); -+ -+ if (end > buf + pos) { -+ mask_name = "numeral"; -+ len = end - (buf + pos); -+ pos += len; -+ done = 0; -+ } else { -+ for (x = buf + pos, i = 0; -+ (*x == '_' || (*x >= 'a' && *x <= 'z')) && -+ i < MAX_MASK_NAME_LENGTH; x++, i++, pos++) -+ substring[i] = *x; -+ substring[i] = '\0'; -+ -+ for (i = 0; mask_flags[i].mask_name != NULL; i++) { -+ if (strcmp(substring, mask_flags[i].mask_name) -+ == 0) { -+ mask_name = mask_flags[i].mask_name; -+ mask_bitfield = -+ mask_flags[i].mask_bitfield; -+ done = 0; -+ break; -+ } -+ } -+ } -+ -+ if (mask_name != NULL) { -+ done = 0; -+ switch (add) { -+ case '-': -+ rg &= ~mask_bitfield; -+ break; -+ case '+': -+ rg |= mask_bitfield; -+ break; -+ case '=': -+ rg = mask_bitfield; -+ break; -+ default: -+ rg |= mask_bitfield; -+ break; -+ } -+ } -+ } -+ -+ yaffs_trace_mask = rg | YAFFS_TRACE_ALWAYS; -+ -+ printk(KERN_DEBUG "new trace = 0x%08X\n", yaffs_trace_mask); -+ -+ if (rg & YAFFS_TRACE_ALWAYS) { -+ for (i = 0; mask_flags[i].mask_name != NULL; i++) { -+ char flag; -+ flag = ((rg & mask_flags[i].mask_bitfield) == -+ mask_flags[i].mask_bitfield) ? '+' : '-'; -+ printk(KERN_DEBUG "%c%s\n", flag, -+ mask_flags[i].mask_name); -+ } -+ } -+ -+ return count; -+} -+ -+/* Debug strings are of the form: -+ * .bnnn print info on block n -+ * .cobjn,chunkn print nand chunk id for objn:chunkn -+ */ -+ -+static int yaffs_proc_debug_write(struct file *file, const char *buf, -+ unsigned long count, void *data) -+{ -+ -+ char str[100]; -+ char *p0; -+ char *p1; -+ long p1_val; -+ long p0_val; -+ char cmd; -+ struct list_head *item; -+ -+ memset(str, 0, sizeof(str)); -+ memcpy(str, buf, min(count, sizeof(str) -1)); -+ -+ cmd = str[1]; -+ -+ p0 = str + 2; -+ -+ p1 = p0; -+ -+ while (*p1 && *p1 != ',') { -+ p1++; -+ } -+ *p1 = '\0'; -+ p1++; -+ -+ p0_val = simple_strtol(p0, NULL, 0); -+ p1_val = simple_strtol(p1, NULL, 0); -+ -+ -+ mutex_lock(&yaffs_context_lock); -+ -+ /* Locate and print the Nth entry. Order N-squared but N is small. */ -+ list_for_each(item, &yaffs_context_list) { -+ struct yaffs_linux_context *dc = -+ list_entry(item, struct yaffs_linux_context, -+ context_list); -+ struct yaffs_dev *dev = dc->dev; - -+ if (cmd == 'b') { -+ struct yaffs_block_info *bi; -+ -+ bi = yaffs_get_block_info(dev,p0_val); -+ -+ if(bi) { -+ printk("Block %d: state %d, retire %d, use %d, seq %d\n", -+ (int)p0_val, bi->block_state, -+ bi->needs_retiring, bi->pages_in_use, -+ bi->seq_number); -+ } -+ } else if (cmd == 'c') { -+ struct yaffs_obj *obj; -+ int nand_chunk; -+ -+ obj = yaffs_find_by_number(dev, p0_val); -+ if (!obj) -+ printk("No obj %d\n", (int)p0_val); -+ else { -+ if(p1_val == 0) -+ nand_chunk = obj->hdr_chunk; -+ else -+ nand_chunk = -+ yaffs_find_chunk_in_file(obj, -+ p1_val, NULL); -+ printk("Nand chunk for %d:%d is %d\n", -+ (int)p0_val, (int)p1_val, nand_chunk); -+ } -+ } -+ } -+ -+ mutex_unlock(&yaffs_context_lock); -+ -+ return count; -+} -+ -+static int yaffs_proc_write(struct file *file, const char *buf, -+ unsigned long count, void *data) -+{ -+ if (buf[0] == '.') -+ return yaffs_proc_debug_write(file, buf, count, data); -+ return yaffs_proc_write_trace_options(file, buf, count, data); -+} - - /* Stuff to handle installation of file systems */ - struct file_system_to_install { -@@ -2501,16 +3396,15 @@ static int __init init_yaffs_fs(void) - - /* Install the proc_fs entries */ - my_proc_entry = create_proc_entry("yaffs", -- S_IRUGO | S_IFREG, NULL); -+ S_IRUGO | S_IFREG, YPROC_ROOT); - - if (my_proc_entry) { -- my_proc_entry->write_proc = NULL; -+ my_proc_entry->write_proc = yaffs_proc_write; - my_proc_entry->read_proc = yaffs_proc_read; - my_proc_entry->data = NULL; - } else { - return -ENOMEM; -- } -- -+ } - - /* Now add the file system entries */ - -@@ -2547,7 +3441,7 @@ static void __exit exit_yaffs_fs(void) - yaffs_trace(YAFFS_TRACE_ALWAYS, - "yaffs built " __DATE__ " " __TIME__ " removing."); - -- remove_proc_entry("yaffs", NULL); -+ remove_proc_entry("yaffs", YPROC_ROOT); - - fsinst = fs_to_install; - -@@ -2561,8 +3455,8 @@ static void __exit exit_yaffs_fs(void) - } - - module_init(init_yaffs_fs) --module_exit(exit_yaffs_fs) -+ module_exit(exit_yaffs_fs) - --MODULE_DESCRIPTION("YAFFS2 - a NAND specific flash file system"); -+ MODULE_DESCRIPTION("YAFFS2 - a NAND specific flash file system"); - MODULE_AUTHOR("Charles Manning, Aleph One Ltd., 2002-2011"); - MODULE_LICENSE("GPL"); -diff --git a/fs/yaffs2/yportenv.h b/fs/yaffs2/yportenv.h -index 76a7914..8975af3 100644 ---- a/fs/yaffs2/yportenv.h -+++ b/fs/yaffs2/yportenv.h -@@ -13,9 +13,27 @@ - * Note: Only YAFFS headers are LGPL, YAFFS C code is covered by GPL. - */ - --#ifndef __YPORTENV_LINUX_H__ --#define __YPORTENV_LINUX_H__ -+#ifndef __YPORTENV_H__ -+#define __YPORTENV_H__ - -+/* -+ * Define the MTD version in terms of Linux Kernel versions -+ * This allows yaffs to be used independantly of the kernel -+ * as well as with it. -+ */ -+ -+#define MTD_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c)) -+ -+#ifdef YAFFS_OUT_OF_TREE -+#include "moduleconfig.h" -+#endif -+ -+#include <linux/version.h> -+#define MTD_VERSION_CODE LINUX_VERSION_CODE -+ -+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19)) -+#include <linux/config.h> -+#endif - #include <linux/version.h> - #include <linux/kernel.h> - #include <linux/mm.h> -@@ -43,23 +61,25 @@ - #define YAFFS_ROOT_MODE 0755 - #define YAFFS_LOSTNFOUND_MODE 0700 - -+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) - #define Y_CURRENT_TIME CURRENT_TIME.tv_sec - #define Y_TIME_CONVERT(x) (x).tv_sec -+#else -+#define Y_CURRENT_TIME CURRENT_TIME -+#define Y_TIME_CONVERT(x) (x) -+#endif - - #define compile_time_assertion(assertion) \ - ({ int x = __builtin_choose_expr(assertion, 0, (void)0); (void) x; }) - -+ - #define yaffs_printf(msk, fmt, ...) \ - printk(KERN_DEBUG "yaffs: " fmt "\n", ##__VA_ARGS__) - --#ifdef CONFIG_YAFFS_DEBUG - #define yaffs_trace(msk, fmt, ...) do { \ - if (yaffs_trace_mask & (msk)) \ - printk(KERN_DEBUG "yaffs: " fmt "\n", ##__VA_ARGS__); \ - } while (0) --#else --#define yaffs_trace(msk, fmt, ...) do { \ --} while (0) --#endif -+ - - #endif --- -1.7.10.4 - diff --git a/features/yaffs2/yaffs2-switch-simple-generic_file_aio_read-users-to-.patch b/features/yaffs2/yaffs2-switch-simple-generic_file_aio_read-users-to-.patch deleted file mode 100644 index 8958961e..00000000 --- a/features/yaffs2/yaffs2-switch-simple-generic_file_aio_read-users-to-.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 6acc59b6db9eaba0e95ece48f462ac9c168bcb57 Mon Sep 17 00:00:00 2001 -From: Paul Gortmaker <paul.gortmaker@windriver.com> -Date: Mon, 29 Sep 2014 15:03:38 -0400 -Subject: [PATCH 2/4] yaffs2: switch simple generic_file_aio_read() users to - ->read_iter() - -A parallel of the changes in mainline aad4f8bb42af06371aa0e85bf0cd9d -("switch simple generic_file_aio_read() users to ->read_iter()") - -Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> ---- - fs/yaffs2/yaffs_vfs.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index d2c9de20a218..433c2b562b8d 100644 ---- a/fs/yaffs2/yaffs_vfs.c -+++ b/fs/yaffs2/yaffs_vfs.c -@@ -794,9 +794,9 @@ static int yaffs_sync_object(struct file *file, struct dentry *dentry, - - #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22)) - static const struct file_operations yaffs_file_operations = { -- .read = do_sync_read, -+ .read = new_sync_read, - .write = do_sync_write, -- .aio_read = generic_file_aio_read, -+ .read_iter = generic_file_read_iter, - .aio_write = generic_file_aio_write, - .mmap = generic_file_mmap, - .flush = yaffs_file_flush, --- -1.8.1.2 - diff --git a/features/yaffs2/yaffs2-use-write_iter-variants-of-__-generic_file_ai.patch b/features/yaffs2/yaffs2-use-write_iter-variants-of-__-generic_file_ai.patch deleted file mode 100644 index 7f01487a..00000000 --- a/features/yaffs2/yaffs2-use-write_iter-variants-of-__-generic_file_ai.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 402aa41beb8afc2a4bf267cbaaa918cedb3b03e6 Mon Sep 17 00:00:00 2001 -From: Paul Gortmaker <paul.gortmaker@windriver.com> -Date: Mon, 29 Sep 2014 15:06:09 -0400 -Subject: [PATCH 3/4] yaffs2: use write_iter variants of - {__,}generic_file_aio_write() - -A parallel of changes in mainline 8174202b34c30e0c07231bf63f18ab2 -("write_iter variants of {__,}generic_file_aio_write()") - -Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> ---- - fs/yaffs2/yaffs_vfs.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index 433c2b562b8d..f391145cdf71 100644 ---- a/fs/yaffs2/yaffs_vfs.c -+++ b/fs/yaffs2/yaffs_vfs.c -@@ -795,9 +795,9 @@ static int yaffs_sync_object(struct file *file, struct dentry *dentry, - #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 6, 22)) - static const struct file_operations yaffs_file_operations = { - .read = new_sync_read, -- .write = do_sync_write, -+ .write = new_sync_write, - .read_iter = generic_file_read_iter, -- .aio_write = generic_file_aio_write, -+ .write_iter = generic_file_write_iter, - .mmap = generic_file_mmap, - .flush = yaffs_file_flush, - .fsync = yaffs_sync_object, --- -1.8.1.2 - diff --git a/features/yaffs2/yaffs2-using-new-follow_link-and-put_link-calling-co.patch b/features/yaffs2/yaffs2-using-new-follow_link-and-put_link-calling-co.patch deleted file mode 100644 index e04d5cc6..00000000 --- a/features/yaffs2/yaffs2-using-new-follow_link-and-put_link-calling-co.patch +++ /dev/null @@ -1,52 +0,0 @@ -From d4eb3ab036f8c37c5bc5f45ad0fa4dc34b7228c8 Mon Sep 17 00:00:00 2001 -From: Kevin Hao <kexin.hao@windriver.com> -Date: Wed, 24 Feb 2016 14:37:13 +0800 -Subject: [PATCH 3/3] yaffs2: using new ->follow_link() and ->put_link() - calling conventions - -As what we did in commit 680baacbca69 ("new ->follow_link() and -->put_link() calling conventions"). - -Signed-off-by: Kevin Hao <kexin.hao@windriver.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - fs/yaffs2/yaffs_vfs.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c -index 0a3e9dabe1aa..1494c8f33d20 100644 ---- a/fs/yaffs2/yaffs_vfs.c -+++ b/fs/yaffs2/yaffs_vfs.c -@@ -1060,7 +1060,7 @@ static int yaffs_readlink(struct dentry *dentry, char __user * buffer, - } - - #if (YAFFS_NEW_FOLLOW_LINK == 1) --static void *yaffs_follow_link(struct dentry *dentry, struct nameidata *nd) -+static const char *yaffs_follow_link(struct dentry *dentry, void **cookie) - { - void *ret; - #else -@@ -1082,7 +1082,7 @@ static int yaffs_follow_link(struct dentry *dentry, struct nameidata *nd) - goto out; - } - #if (YAFFS_NEW_FOLLOW_LINK == 1) -- nd_set_link(nd, alias); -+ *cookie = alias; - ret = alias; - out: - if (ret_int) -@@ -1114,9 +1114,9 @@ static void yaffs_put_inode(struct inode *inode) - #endif - - #if (YAFFS_NEW_FOLLOW_LINK == 1) --void yaffs_put_link(struct dentry *dentry, struct nameidata *nd, void *alias) -+void yaffs_put_link(struct inode *inode, void *cookie) - { -- kfree(alias); -+ kfree(cookie); - } - #endif - --- -2.5.0 - diff --git a/features/yaffs2/yaffs2-v5.6-build-fixups.patch b/features/yaffs2/yaffs2-v5.6-build-fixups.patch new file mode 100644 index 00000000..375625b4 --- /dev/null +++ b/features/yaffs2/yaffs2-v5.6-build-fixups.patch @@ -0,0 +1,50 @@ +From 046fe0a1215486fa81327553215eca8acab9d546 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Mon, 16 Mar 2020 23:20:57 -0400 +Subject: [PATCH] yaffs2: v5.6 build fixups + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_vfs.c | 17 ++++++++--------- + 1 file changed, 8 insertions(+), 9 deletions(-) + +diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c +index 4fbd0a42ff3d..598ecd57a0ed 100644 +--- a/fs/yaffs2/yaffs_vfs.c ++++ b/fs/yaffs2/yaffs_vfs.c +@@ -2059,11 +2059,11 @@ static void yaffs_fill_inode_from_obj(struct inode *inode, + #if (LINUX_VERSION_CODE > KERNEL_VERSION(2, 5, 0)) + + inode->i_rdev = old_decode_dev(obj->yst_rdev); +- inode->i_atime.tv_sec = (time_t) (obj->yst_atime); ++ inode->i_atime.tv_sec = (time64_t) (obj->yst_atime); + inode->i_atime.tv_nsec = 0; +- inode->i_mtime.tv_sec = (time_t) obj->yst_mtime; ++ inode->i_mtime.tv_sec = (time64_t) obj->yst_mtime; + inode->i_mtime.tv_nsec = 0; +- inode->i_ctime.tv_sec = (time_t) obj->yst_ctime; ++ inode->i_ctime.tv_sec = (time64_t) obj->yst_ctime; + inode->i_ctime.tv_nsec = 0; + #else + inode->i_rdev = obj->yst_rdev; +@@ -3692,12 +3692,11 @@ static int yaffs_proc_open(struct inode *inode, struct file *file) + return single_open(file, yaffs_proc_show, NULL); + } + +-static struct file_operations procfs_ops = { +- .owner = THIS_MODULE, +- .open = yaffs_proc_open, +- .read = seq_read, +- .write = yaffs_proc_write, +- .release = single_release, ++static struct proc_ops procfs_ops = { ++ .proc_open = yaffs_proc_open, ++ .proc_read = seq_read, ++ .proc_write = yaffs_proc_write, ++ .proc_release = single_release, + }; + + static int yaffs_procfs_init(void) +-- +2.19.1 + diff --git a/features/yaffs2/yaffs2-v6.5-fixups.patch b/features/yaffs2/yaffs2-v6.5-fixups.patch new file mode 100644 index 00000000..0159a00b --- /dev/null +++ b/features/yaffs2/yaffs2-v6.5-fixups.patch @@ -0,0 +1,26 @@ +From e9ca040537fb905d7a55ee9d20ce0414eed5f10e Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Thu, 27 Jul 2023 18:17:32 -0400 +Subject: [PATCH] yaffs2: v6.5 fixups + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + fs/yaffs2/yaffs_vfs.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/fs/yaffs2/yaffs_vfs.c b/fs/yaffs2/yaffs_vfs.c +index 32864c715545..04abeee99ff5 100644 +--- a/fs/yaffs2/yaffs_vfs.c ++++ b/fs/yaffs2/yaffs_vfs.c +@@ -844,7 +844,7 @@ static const struct file_operations yaffs_file_operations = { + .mmap = generic_file_mmap, + .flush = yaffs_file_flush, + .fsync = yaffs_sync_object, +- .splice_read = generic_file_splice_read, ++ .splice_read = copy_splice_read, + #if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 16, 0) + .splice_write = iter_file_splice_write, + #else +-- +2.34.1 + diff --git a/features/yaffs2/yaffs2.scc b/features/yaffs2/yaffs2.scc index 59743ab3..5b131bd7 100644 --- a/features/yaffs2/yaffs2.scc +++ b/features/yaffs2/yaffs2.scc @@ -1,35 +1,24 @@ # SPDX-License-Identifier: MIT -patch yaffs2-import-2013-git-3a8580.patch -patch yaffs2-restore-multi-kernel-version-functionality.patch -patch yaffs2-convert-to-kuid_t-and-kgid_t.patch -patch yaffs2-disable-procfs-support.patch +patch yaffs2-import-git-revision-b4ce1bb-jan-2020.patch +patch yaffs2-adjust-to-proper-location-of-MS_RDONLY.patch +patch fs-yaffs2-replace-CURRENT_TIME-by-other-appropriate-.patch patch Yaffs-check-oob-size-before-auto-selecting-Yaffs1.patch -patch yaffs2-fix-3.12-compilation-issues.patch -patch yaffs2-fix-MTD_BLOCK_MAJOR-compilation-error.patch -patch yaffs2-remove-the-using-of-macro-__DATE__-__TIME__.patch patch yaffs-Avoid-setting-any-ACL-releated-xattr.patch -patch yaffs-fix-yaffs_vfs.c-warnings.patch -patch yaffs2-fix-compile-fails-due-to-undefined-vfs_readli.patch -patch yaffs2-switch-simple-generic_file_aio_read-users-to-.patch -patch yaffs2-use-write_iter-variants-of-__-generic_file_ai.patch -patch yaffs2-implement-splice_write-via-write_iter.patch patch yaffs2-fix-memory-leak-in-mount-umount.patch -patch yaffs2-fix-missing-checkpoint-on-yaffs.patch -patch yaffs2-replace-f_dentry-to-f_path.dentry.patch -patch yaffs2-NULL-read-write.patch -patch yaffs2-using-new-follow_link-and-put_link-calling-co.patch -patch fs-yaffs2-kill-PAGE_CACHE_-and-page_cache_-get-relea.patch -patch fs-yaffs2-switch-to-the-new-prototype-for-set-getxat.patch -patch fs-yaffs2-replace-follow_link-with-get_link.patch -patch fs-yaffs2-kill-put_link.patch -patch fs-yaffs2-fix-the-wrong-check-of-return-value-of-dir.patch -patch fs-yaffs2-adjust-to-the-change-of-inode_change_ok.patch -patch fs-yaffs2-switch-to-the-generic-xattr-handler.patch -patch fs-yaffs2-fix-the-prototype-of-function-yaffs_rename.patch -patch fs-yaffs2-replace-CURRENT_TIME-by-other-appropriate-.patch -patch fs-yaffs2-includes-the-missing-header-file.patch -patch yaffs2-include-rawnand.h-instead-of-nand.h.patch -patch yaffs2-Adjust-the-timer-callback-and-init-functions.patch patch yaffs-Fix-build-failure-by-handling-inode-i_version-.patch -patch yaffs-Fix-build-failure-by-removing-unused-members-o.patch -patch yaffs2-adjust-to-new-location-of-MS_RDONLY-define.patch +patch yaffs-repair-yaffs_get_mtd_device.patch +patch yaffs-add-strict-check-when-call-yaffs_internal_read.patch +patch yaffs2-fix-memory-leak-when-proc-yaffs-is-read.patch +patch yaffs2-v5.6-build-fixups.patch +patch yaffs-fix-misplaced-variable-declaration.patch +patch yaffs-include-blkdev.h.patch +patch 0001-yaffs2-v5.12-build-fixups-not-runtime-tested.patch +patch yaffs-fix-Wstringop-overread-compile-warning-in-yaff.patch +patch yaffs-replace-IS_ERR-with-IS_ERR_OR_NULL-to-check-bo.patch +patch 0001-yaffs2-convert-read_page-readfolio.patch +patch 0001-yaffs2-replace-bdevname-call-with-sprintf.patch +patch yaffs2-convert-user_namespace-to-mnt_idmap.patch +patch yaffs2-Fix-miscalculation-of-devname-buffer-length.patch +patch yaffs2-v6.5-fixups.patch +patch 0001-yaffs2-update-VFS-ctime-operations-to-6.6.patch +patch yaffs-fix-mtime-itime-field-access.patch diff --git a/features/zram/zram.cfg b/features/zram/zram.cfg new file mode 100644 index 00000000..9e58fb71 --- /dev/null +++ b/features/zram/zram.cfg @@ -0,0 +1,23 @@ +# SPDX-License-Identifier: MIT +CONFIG_ZSMALLOC=y +CONFIG_ZSMALLOC_STAT=n +CONFIG_ZRAM=y +CONFIG_ZRAM_DEF_COMP_LZORLE=y +CONFIG_ZRAM_DEF_COMP_ZSTD=n +CONFIG_ZRAM_DEF_COMP_LZ4=n +CONFIG_ZRAM_DEF_COMP_LZO=n +CONFIG_ZRAM_DEF_COMP_LZ4HC=n +CONFIG_ZRAM_DEF_COMP_842=n +CONFIG_ZRAM_DEF_COMP="lzo-rle" +CONFIG_ZRAM_WRITEBACK=n +CONFIG_ZRAM_MEMORY_TRACKING=n +CONFIG_CRYPTO_LZO=y +CONFIG_CRYPTO_842=y +CONFIG_CRYPTO_LZ4=y +CONFIG_CRYPTO_LZ4HC=y +CONFIG_CRYPTO_ZSTD=y +CONFIG_842_COMPRESS=y +CONFIG_842_DECOMPRESS=y +CONFIG_LZ4_COMPRESS=y +CONFIG_LZ4HC_COMPRESS=y +CONFIG_ZSTD_COMPRESS=y diff --git a/features/zram/zram.scc b/features/zram/zram.scc new file mode 100644 index 00000000..30388842 --- /dev/null +++ b/features/zram/zram.scc @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: MIT +define KFEATURE_DESCRIPTION "Compressed RAM block device support" +define KFEATURE_COMPATIBILITY all + +kconf non-hardware zram.cfg diff --git a/kern-features.rc b/kern-features.rc index 9dc78a2c..0e83053c 100644 --- a/kern-features.rc +++ b/kern-features.rc @@ -1,203 +1,296 @@ [kernel-options] - config = cgl/features/quota/quota.scc - config = cgl/features/audit/audit.scc - config = cgl/features/selinux/selinux.scc - config = cgl/features/selinux/selinux-dev.scc - config = cgl/features/aoe/aoe.scc - config = cgl/features/pstore/pstore.scc - config = cgl/features/mip6/mip6.scc - config = cgl/cfg/dmm.scc + config = cfg/crypto-obsolete-disable.scc + config = cfg/sound.scc + config = cfg/vmware-guest.scc + config = cfg/fs/btrfs.scc + config = cfg/fs/ext3.scc + config = cfg/fs/flash_fs.scc + config = cfg/fs/vfat.scc + config = cfg/fs/devtmpfs.scc + config = cfg/fs/debugfs.scc + config = cfg/fs/ext2.scc + config = cfg/fs/ext4.scc + config = cfg/8250.scc + config = cfg/usb-mass-storage.scc + config = cfg/paravirt_kvm.scc + config = cfg/debug-kselftest.scc + config = cfg/hv-guest.scc + config = cfg/smp.scc + config = cfg/smp_64.scc + config = cfg/vesafb.scc + config = cfg/boot-live.scc + config = cfg/efi.scc + config = cfg/rbd.scc + config = cfg/dmaengine.scc + config = cfg/net/ip_nf.scc + config = cfg/net/mdio.scc + config = cfg/net/ipv6.scc + config = cfg/net/ipsec.scc + config = cfg/net/ip6_nf.scc + config = cfg/net/bridge.scc + config = cfg/net/ipsec6.scc + config = cfg/virtio.scc + config = cfg/debug/kcov/debug-kcov.scc + config = cfg/debug/kcsan/debug-kcsan.scc + config = cfg/debug/syzkaller/debug-syzkaller.scc + config = cfg/debug/fault-inject/debug-fault-injection-debugfs.scc + config = cfg/x32.scc + config = cfg/timer/hpet.scc + config = cfg/timer/hz_1000.scc + config = cfg/timer/no_hz.scc + config = cfg/timer/rtc.scc + config = cfg/timer/hz_250.scc + config = cfg/timer/hz_100.scc + config = cfg/efi-ext.scc + config = arch/arm/arm64-4kb-pages.scc + config = arch/arm/arm64-64kb-pages.scc + config = arch/arm/arm64-16kb-pages.scc config = cgl/cfg/scsi_dh_hpsw.scc - config = cgl/cfg/scsi_dh_rdac.scc - config = cgl/cfg/iscsi.scc - config = cgl/cfg/scsi_dh_emc.scc - config = cgl/cfg/scsi_dh.scc - config = cgl/cfg/scsi_dh_alua.scc + config = cgl/cfg/fs/ocfs2.scc config = cgl/cfg/drbd.scc + config = cgl/cfg/scsi_dh_alua.scc + config = cgl/cfg/scsi_dh_emc.scc + config = cgl/cfg/scsi_dh_rdac.scc + config = cgl/cfg/dmm.scc + config = cgl/cfg/net/l2tp.scc config = cgl/cfg/net/macvlan.scc config = cgl/cfg/net/ip_vs.scc - config = cgl/cfg/net/l2tp.scc - config = cgl/cfg/fs/ocfs2.scc - config = features/i40e/i40e.scc + config = cgl/cfg/iscsi.scc + config = cgl/cfg/scsi_dh.scc + config = cgl/features/pstore/pstore.scc + config = cgl/features/mip6/mip6.scc + config = cgl/features/audit/audit.scc + config = cgl/features/selinux/selinux-dev.scc + config = cgl/features/selinux/selinux.scc + config = cgl/features/aoe/aoe.scc + config = cgl/features/quota/quota.scc + config = features/pwm/pwm.scc + config = features/pwm/intel_pwm.scc + config = features/usb-net/usb-net.scc config = features/hrt/hrt.scc - config = features/ramconsole/ramconsole.scc - config = features/bpf/bpf.scc - config = features/device-mapper/dm-verity.scc - config = features/kdump/kdump-enable.scc - config = features/lxc/lxc-enable.scc - config = features/leds/leds.scc - config = features/mtd/mtd.scc - config = features/edac/edac-enable.scc - config = features/qat/qat.scc - config = features/intel-e1xxxx/intel-e100.scc - config = features/serial/8250.scc - config = features/power/intel.scc - config = features/power/bq25890.scc - config = features/power/intel_pmic.scc - config = features/hugetlb/hugetlb.scc - config = features/lto/lto-debug.scc - config = features/lto/lto-disable.scc - config = features/lto/lto.scc - config = features/uprobe/uprobe.scc - config = features/uprobe/uprobe-enable.scc - config = features/pci-iov/pci-iov.scc - config = features/full_nohz/full_nohz-enable.scc - config = features/x2apic/x2apic.scc config = features/tmpfs/tmpfs-posix-acl.scc - config = features/fuse/fuse.scc - config = features/intel-txt/intel-txt.scc - config = features/uio/uio.scc - config = features/ftrace/ftrace.scc - config = features/ftrace/ftrace-function-tracer-disable.scc - config = features/taskstats/taskstats.scc - config = features/tpm/tpm.scc - config = features/intel-pmc/intel-pmc-core.scc - config = features/systemtap/systemtap.scc - config = features/kmemcheck/kmemcheck-enable.scc - config = features/latencytop/latencytop.scc - config = features/netfilter/netfilter.scc - config = features/vrf/vrf.scc - config = features/firmware/firmware.scc + config = features/lxc/lxc-enable.scc + config = features/inline/inline.scc config = features/intel-tco/intel-tco.scc - config = features/rpmb/rpmb-sim.scc - config = features/rpmb/rpmb-base.scc - config = features/rpmb/rpmb-uapi.scc - config = features/sound/snd_hda_intel.scc - config = features/scsi/disk.scc - config = features/scsi/scsi.scc - config = features/scsi/cdrom.scc - config = features/iwlwifi/iwlwifi.scc - config = features/iommu/iommu.scc - config = features/ciphers/ciphers.scc - config = features/ipmi/ipmi.scc - config = features/intel-dpdk/intel-dpdk.scc - config = features/kprobes/kprobes.scc - config = features/blktrace/blktrace.scc - config = features/powertop/powertop.scc - config = features/mac80211/mac80211.scc - config = features/nfsd/nfsd-enable.scc - config = features/namespaces/namespaces.scc - config = features/kgdb/kgdb.scc - config = features/eg20t/eg20t.scc - config = features/vfio/vfio.scc - config = features/iio/iio.scc - config = features/kexec/kexec-enable.scc + config = features/ftrace/ftrace-function-tracer-disable.scc + config = features/ftrace/ftrace.scc + config = features/vxlan/vxlan-enable.scc config = features/i915/i915.scc - config = features/usb-net/usb-net.scc - config = features/6lowpan/6lowpan.scc - config = features/inline/inline.scc - config = features/spi/spi.scc - config = features/spi/spidev.scc - config = features/usb/designware-usb2.scc + config = features/nfc/nfc-generic.scc + config = features/nfc/nfc-vendor.scc + config = features/profiling/profiling.scc + config = features/misc/bosch-pressure-sensor-i2c.scc + config = features/security/security.scc + config = features/kgdb/kgdb.scc + config = features/vrf/vrf.scc config = features/usb/usb-gadgets.scc - config = features/usb/usb-typec.scc - config = features/usb/ehci-hcd.scc - config = features/usb/serial.scc + config = features/usb/serial-all.scc + config = features/usb/designware-usb3.scc + config = features/usb/usb-dummy-hcd.scc config = features/usb/touchscreen-composite.scc config = features/usb/uhci-hcd.scc + config = features/usb/ehci-hcd.scc + config = features/usb/designware-usb2.scc config = features/usb/usb-base.scc - config = features/usb/xhci-hcd.scc - config = features/usb/designware-usb3.scc - config = features/usb/serial-all.scc config = features/usb/ohci-hcd.scc - config = features/input/keyboard-gpio.scc - config = features/input/input.scc - config = features/input/touchscreen.scc - config = features/crypto/crypto.scc - config = features/wifi/wifi-sdio.scc - config = features/wifi/wifi-usb.scc - config = features/wifi/wifi-common.scc - config = features/wifi/wifi-pci.scc - config = features/wifi/wifi-all.scc + config = features/usb/usb-typec.scc + config = features/usb/serial.scc + config = features/usb/xhci-hcd.scc + config = features/usb/usb-raw-gadget.scc + config = features/intel-uncore-frequency/intel-uncore-frequency.scc + config = features/mpx/mpx.scc config = features/igb/igb.scc - config = features/pwm/pwm.scc - config = features/pwm/intel_pwm.scc - config = features/media/media-dvb-frontends.scc - config = features/media/media-radio.scc - config = features/media/media-rc.scc - config = features/media/media-pci-capture.scc - config = features/media/media-platform.scc - config = features/media/media-tuners.scc - config = features/media/media-usb-webcams.scc - config = features/media/media-i2c.scc - config = features/media/media-usb-tv.scc - config = features/media/media.scc - config = features/criu/criu-enable.scc - config = features/numa/numa.scc + config = features/stm/stm.scc + config = features/nf_tables/nf_tables.scc + config = features/nf_tables/nft_test.scc + config = features/cgroups/cgroups.scc + config = features/can/m_can.scc config = features/can/can.scc + config = features/intel-e1xxxx/intel-e100.scc + config = features/mtd/mtd.scc + config = features/blktrace/blktrace.scc + config = features/landlock/landlock.scc + config = features/iwlegacy/iwlegacy.scc + config = features/kfence/kfence.scc + config = features/latencytop/latencytop.scc + config = features/bpf/bpf.scc + config = features/xilinx/v4l2/v4l2.scc + config = features/xilinx/overlay_of/overlay_of.scc + config = features/xilinx/hdmi-module/hdmi-module.scc + config = features/kmemcheck/kmemcheck-enable.scc + config = features/uprobe/uprobe-enable.scc + config = features/uprobe/uprobe.scc config = features/mmc/mmc-block.scc config = features/mmc/mmc-sdhci.scc config = features/mmc/mmc-base.scc config = features/mmc/mmc-realtek.scc + config = features/scsi/scsi.scc + config = features/scsi/scsi-debug.scc + config = features/scsi/cdrom.scc + config = features/scsi/disk.scc + config = features/intel-idxd/intel-idxd.scc + config = features/tun/tun.scc + config = features/hid/hid.scc + config = features/rpmb/rpmb-uapi.scc + config = features/rpmb/rpmb-sim.scc + config = features/rpmb/rpmb-base.scc + config = features/igc/igc.scc + config = features/iommu/iommu.scc + config = features/systemtap/systemtap.scc + config = features/intel-pmc/intel-pmc-core.scc + config = features/tsn/tsn.scc + config = features/power/bq25890.scc + config = features/power/intel.scc + config = features/power/intel_pmic.scc + config = features/power/arm.scc + config = features/bluetooth/bluetooth-usb.scc + config = features/bluetooth/bluetooth-vhci.scc + config = features/kexec/kexec-enable.scc + config = features/serial/8250.scc + config = features/intel-sst/intel-sst.scc + config = features/intel-dptf/intel-dptf.scc + config = features/wifi/wifi-all.scc + config = features/wifi/wifi-usb.scc + config = features/wifi/wifi-pci.scc + config = features/wifi/wifi-sdio.scc + config = features/wifi/wifi-common.scc + config = features/gpio/mockup.scc + config = features/gpio/sim.scc + config = features/kprobes/kprobes.scc config = features/mfd/mfd-intel-lpss.scc + config = features/thunderbolt/thunderbolt.scc + config = features/intel-sgx/intel-sgx.scc + config = features/transparent-hugepage/transparent-hugepage.scc + config = features/netfilter/netfilter.scc + config = features/mei/amt.scc + config = features/mei/mei.scc + config = features/mei/mei-txe.scc + config = features/mei/mei-spd.scc + config = features/mei/mei-me.scc + config = features/kdump/kdump-enable.scc + config = features/intel-persistent-memory/intel-x86-64-pmem.scc + config = features/intel-persistent-memory/intel-x86-64-pmem-preempt-rt.scc config = features/ecryptfs/ecryptfs.scc - config = features/security/security.scc - config = features/vxlan/vxlan-enable.scc - config = features/intel-pinctrl/intel-pinctrl.scc - config = features/misc/bosch-pressure-sensor-i2c.scc - config = features/profiling/profiling.scc + config = features/module-signing/signing.scc + config = features/module-signing/force-signing.scc + config = features/docker/docker.scc + config = features/reproducibility/reproducibility.scc + config = features/leds/leds.scc + config = features/apparmor/apparmor.scc + config = features/yama/yama.scc + config = features/criu/criu-enable.scc + config = features/6lowpan/6lowpan.scc + config = features/iio/iio.scc + config = features/i40e/i40e.scc + config = features/pci/pci-of-generic.scc config = features/pci/pci.scc - config = features/dca/dca.scc - config = features/mpx/mpx.scc - config = features/firewire/firewire.scc - config = features/kvm/qemu-kvm-enable.scc - config = features/cgroups/cgroups.scc - config = features/nf_tables/nf_tables.scc - config = features/telemetry/intel-telemetry.scc - config = features/thermal/coretemp.scc - config = features/i2c/i2cdev.scc config = features/i2c/i2c-ismt.scc + config = features/i2c/i2cdev.scc config = features/i2c/i2c.scc config = features/i2c/i2cdbg.scc - config = features/nfc/nfc-vendor.scc - config = features/nfc/nfc-generic.scc - config = features/iwlegacy/iwlegacy.scc - config = features/bluetooth/bluetooth-usb.scc - config = features/mei/mei-me.scc - config = features/mei/mei-spd.scc - config = features/mei/amt.scc - config = features/mei/mei-txe.scc - config = features/mei/mei.scc + config = features/iscsi/iscsi.scc + config = features/firewire/firewire.scc + config = features/iwlwifi/iwlwifi.scc + config = features/spi/spi.scc + config = features/spi/spidev.scc + config = features/kvm/qemu-kvm-enable.scc + config = features/intel-th/intel-th.scc + config = features/mac80211/mac80211-hwsim.scc + config = features/mac80211/mac80211.scc + config = features/qat/qat.scc + config = features/device-mapper/dm-verity.scc + config = features/ieee802154/ieee802154-hwsim.scc + config = features/ima/ima.scc + config = features/ima/modsign.scc + config = features/fuse/fuse.scc + config = features/xen/xen.scc + config = features/powertop/powertop.scc + config = features/full_nohz/full_nohz-enable.scc + config = features/lto/lto.scc + config = features/lto/lto-debug.scc + config = features/lto/lto-disable.scc + config = features/thermal/coretemp.scc + config = features/ice/ice.scc + config = features/ramconsole/ramconsole.scc + config = features/eg20t/eg20t.scc + config = features/edac/edac-enable.scc + config = features/vfio/vfio.scc + config = features/vswitch/vswitch.scc + config = features/dca/dca.scc + config = features/hugetlb/hugetlb.scc + config = features/intel-txt/intel-txt.scc + config = features/telemetry/intel-telemetry.scc + config = features/i3c/i3c.scc + config = features/intel-dpdk/intel-dpdk.scc + config = features/ipmi/ipmi.scc + config = features/intel-vmd/intel-vmd.scc + config = features/debug/debug-runtime.scc config = features/debug/debug-kernel.scc - config = features/debug/printk.scc config = features/debug/debug-dyndbg.scc - config = cfg/debug-kselftest.scc - config = cfg/x32.scc - config = cfg/hv-guest.scc - config = cfg/paravirt_kvm.scc - config = cfg/efi.scc - config = cfg/sound.scc - config = cfg/smp.scc - config = cfg/virtio.scc - config = cfg/vesafb.scc - config = cfg/efi-ext.scc - config = cfg/8250.scc - config = cfg/boot-live.scc - config = cfg/timer/no_hz.scc - config = cfg/timer/hz_100.scc - config = cfg/timer/hz_1000.scc - config = cfg/timer/hpet.scc - config = cfg/timer/hz_250.scc - config = cfg/timer/rtc.scc - config = cfg/net/ip_nf.scc - config = cfg/net/ipsec6.scc - config = cfg/net/ip6_nf.scc - config = cfg/net/ipsec.scc - config = cfg/net/bridge.scc - config = cfg/net/ipv6.scc - config = cfg/vmware-guest.scc - config = cfg/usb-mass-storage.scc - config = cfg/fs/ext4.scc - config = cfg/fs/devtmpfs.scc - config = cfg/fs/btrfs.scc - config = cfg/fs/debugfs.scc - config = cfg/fs/ext3.scc - config = cfg/fs/ext2.scc - config = cfg/fs/vfat.scc - config = cfg/fs/flash_fs.scc - config = cfg/dmaengine.scc - config = cfg/smp_64.scc - config = cfg/rbd.scc + config = features/debug/printk.scc + config = features/debug/debug-btf.scc + config = features/sound/snd_hda_intel.scc + config = features/zram/zram.scc + config = features/random/random.scc + config = features/mgag200/mgag200.scc + config = features/taskstats/taskstats.scc + config = features/media/media-i2c.scc + config = features/media/media.scc + config = features/media/media-usb-tv.scc + config = features/media/media-rc.scc + config = features/media/media-usb-webcams.scc + config = features/media/media-radio.scc + config = features/media/media-platform.scc + config = features/media/media-dvb-frontends.scc + config = features/media/media-tuners.scc + config = features/media/media-pci-capture.scc + config = features/input/keyboard-gpio.scc + config = features/input/input.scc + config = features/input/touchscreen.scc + config = features/nfsd/nfsd-enable.scc + config = features/nfsd/nfsd.scc + config = features/namespaces/namespaces.scc + config = features/pci-iov/pci-iov.scc + config = features/ocicontainer/xt-checksum.scc + config = features/ocicontainer/ebtables.scc + config = features/ocicontainer/cgroup.scc + config = features/numa/numa.scc + config = features/smack/smack.scc + config = features/tpm/tpm-1.2.scc + config = features/tpm/tpm-common.scc + config = features/tpm/tpm-2.0-crb.scc + config = features/tpm/tpm.scc + config = features/tpm/tpm-2.0.scc + config = features/tpm/vtpm.scc + config = features/firmware/firmware.scc + config = features/intel-pinctrl/intel-pinctrl.scc + config = features/ciphers/ciphers.scc + config = features/x2apic/x2apic.scc + config = features/uio/uio.scc + config = bsp/xilinx/board-common.scc + config = bsp/xilinx/kc705-microblazeel-features/kc705-microblazeel-features.scc config = bsp/xilinx/soc/zynq.scc config = bsp/xilinx/soc/drivers-softip.scc - config = bsp/xilinx/board-common.scc + config = bsp/xilinx/zybo-linux-bd-zynq7/zybo-linux-bd-zynq7.scc + config = bsp/xilinx/ultra96-zynqmp/mipi-config-ultra96.scc + config = bsp/pentagram/sound.scc + config = bsp/pentagram/hw_emmc.scc + config = bsp/pentagram/sensors/hw_thermal.scc + config = bsp/pentagram/hw_pwm.scc + config = bsp/pentagram/usb/usb.scc + config = bsp/pentagram/usb/customers.scc + config = bsp/pentagram/hw_i2c.scc + config = bsp/pentagram/hw_sdio.scc + config = bsp/pentagram/net/hw_net.scc + config = bsp/pentagram/spi/sp_nor.scc + config = bsp/pentagram/spi/sp_nornand.scc + config = bsp/pentagram/spi/sp_nand.scc + config = bsp/pentagram/pm.scc + config = bsp/pentagram/debug/pins9.scc + config = bsp/pentagram/debug/axi_mon.scc + config = bsp/pentagram/1w/1w-gpio.scc + config = bsp/pentagram/1w/1w-slaves.scc + config = bsp/pentagram/media/video_sen.scc + config = bsp/pentagram/media/video_out.scc + config = bsp/pentagram/sdio/sdio.scc + config = bsp/pentagram/hw_nvmem.scc diff --git a/ktypes/base/base.cfg b/ktypes/base/base.cfg index 598fd802..19bb06d8 100644 --- a/ktypes/base/base.cfg +++ b/ktypes/base/base.cfg @@ -20,13 +20,13 @@ # General setup # CONFIG_LOCALVERSION="" -# CONFIG_LOCALVERSION_AUTO is not set +CONFIG_LOCALVERSION_AUTO=n CONFIG_SWAP=y CONFIG_SYSVIPC=y CONFIG_POSIX_MQUEUE=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y -# CONFIG_AUDIT is not set +CONFIG_AUDIT=n CONFIG_BLK_DEV_INITRD=y CONFIG_INITRAMFS_SOURCE="" @@ -34,9 +34,9 @@ CONFIG_INITRAMFS_SOURCE="" # Resource Groups # CONFIG_SYSCTL=y -# CONFIG_EMBEDDED is not set +CONFIG_EXPERT=n CONFIG_KALLSYMS=y -# CONFIG_KALLSYMS_ALL is not set +CONFIG_KALLSYMS_ALL=n CONFIG_FUTEX=y CONFIG_EPOLL=y @@ -99,7 +99,6 @@ CONFIG_PREEMPT=y # # Executable file formats / Emulations # -# CONFIG_BINFMT_AOUT is not set CONFIG_BINFMT_ELF=y # @@ -184,10 +183,9 @@ CONFIG_SYN_COOKIES=y # TIPC Configuration (EXPERIMENTAL) # -# CONFIG_DECNET is not set -# CONFIG_LLC2 is not set -# CONFIG_X25 is not set -# CONFIG_LAPB is not set +CONFIG_LLC2=n +CONFIG_X25=n +CONFIG_LAPB=n # # QoS and/or fair queueing @@ -204,7 +202,7 @@ CONFIG_SYN_COOKIES=y # # Network testing # -# CONFIG_HAMRADIO is not set +CONFIG_HAMRADIO=n # # Packet Radio protocols @@ -245,7 +243,7 @@ CONFIG_SYN_COOKIES=y # # FIR device drivers # -# CONFIG_BT is not set +CONFIG_BT=n # # Bluetooth device drivers @@ -260,8 +258,8 @@ CONFIG_SYN_COOKIES=y # CONFIG_STANDALONE=y CONFIG_PREVENT_FIRMWARE_BUILD=y -# CONFIG_FW_LOADER is not set -# CONFIG_DEBUG_DRIVER is not set +CONFIG_FW_LOADER=m +CONFIG_DEBUG_DRIVER=n # # Connector - unified userspace <-> kernelspace linker @@ -566,7 +564,7 @@ CONFIG_NETCONSOLE=y # Non-8250 serial port support # CONFIG_UNIX98_PTYS=y -# CONFIG_LEGACY_PTYS is not set +CONFIG_LEGACY_PTYS=n # # IPMI @@ -926,7 +924,7 @@ CONFIG_PROC_FS=y CONFIG_PROC_KCORE=y CONFIG_SYSFS=y CONFIG_TMPFS=y -# CONFIG_HUGETLB_PAGE is not set +CONFIG_HUGETLB_PAGE=n # # Layered filesystems @@ -935,22 +933,23 @@ CONFIG_TMPFS=y # # Miscellaneous filesystems # -# CONFIG_ADFS_FS is not set -# CONFIG_AFFS_FS is not set -# CONFIG_HFS_FS is not set -# CONFIG_HFSPLUS_FS is not set -# CONFIG_BEFS_FS is not set -# CONFIG_BFS_FS is not set -# CONFIG_EFS_FS is not set -# CONFIG_VXFS_FS is not set -# CONFIG_HPFS_FS is not set -# CONFIG_QNX4FS_FS is not set -# CONFIG_SYSV_FS is not set +CONFIG_ADFS_FS=n +CONFIG_AFFS_FS=n +CONFIG_HFS_FS=n +CONFIG_HFSPLUS_FS=n +CONFIG_BEFS_FS=n +CONFIG_BFS_FS=n +CONFIG_EFS_FS=n +CONFIG_VXFS_FS=n +CONFIG_HPFS_FS=n +CONFIG_QNX4FS_FS=n +CONFIG_SYSV_FS=n # # Network File Systems # CONFIG_NFS_FS=y +CONFIG_NFS_DISABLE_UDP_SUPPORT=n CONFIG_NFS_V3=y CONFIG_NFS_V4=y CONFIG_ROOT_NFS=y @@ -964,20 +963,20 @@ CONFIG_RPCSEC_GSS_KRB5=y # # Partition Types # -# CONFIG_ACORN_PARTITION is not set -# CONFIG_OSF_PARTITION is not set -# CONFIG_AMIGA_PARTITION is not set -# CONFIG_ATARI_PARTITION is not set +CONFIG_ACORN_PARTITION=n +CONFIG_OSF_PARTITION=n +CONFIG_AMIGA_PARTITION=n +CONFIG_ATARI_PARTITION=n CONFIG_MSDOS_PARTITION=y -# CONFIG_BSD_DISKLABEL is not set -# CONFIG_MINIX_SUBPARTITION is not set -# CONFIG_SOLARIS_X86_PARTITION is not set -# CONFIG_UNIXWARE_DISKLABEL is not set -# CONFIG_LDM_PARTITION is not set -# CONFIG_SGI_PARTITION is not set -# CONFIG_ULTRIX_PARTITION is not set -# CONFIG_SUN_PARTITION is not set -# CONFIG_EFI_PARTITION is not set +CONFIG_BSD_DISKLABEL=n +CONFIG_MINIX_SUBPARTITION=n +CONFIG_SOLARIS_X86_PARTITION=n +CONFIG_UNIXWARE_DISKLABEL=n +CONFIG_LDM_PARTITION=n +CONFIG_SGI_PARTITION=n +CONFIG_ULTRIX_PARTITION=n +CONFIG_SUN_PARTITION=n +CONFIG_EFI_PARTITION=n # # Native Language Support @@ -1004,13 +1003,13 @@ CONFIG_NLS_DEFAULT="iso8859-1" # Kernel hacking # CONFIG_MAGIC_SYSRQ=y -# CONFIG_DEBUG_KERNEL is not set -# CONFIG_SCHEDSTATS is not set -# CONFIG_DEBUG_SLAB is not set -# CONFIG_DEBUG_SPINLOCK is not set -# CONFIG_DEBUG_KOBJECT is not set -# CONFIG_DEBUG_HIGHMEM is not set -# CONFIG_DEBUG_INFO is not set +CONFIG_DEBUG_KERNEL=n +CONFIG_SCHEDSTATS=n +CONFIG_DEBUG_SLAB=n +CONFIG_DEBUG_SPINLOCK=n +CONFIG_DEBUG_KOBJECT=n +CONFIG_DEBUG_HIGHMEM=n +CONFIG_DEBUG_INFO=n # # Security options @@ -1071,12 +1070,18 @@ CONFIG_MAGIC_SYSRQ=y # # Logging Options # -# CONFIG_KEYS is not set # # Cryptographic options # CONFIG_CRYPTO=y +CONFIG_CRYPTO_DES=y +CONFIG_CRYPTO_ARC4=y +CONFIG_CRYPTO_LIB_ARC4=y +CONFIG_CRYPTO_USER_API_HASH=m +CONFIG_CRYPTO_USER_API_SKCIPHER=m +CONFIG_CRYPTO_USER_API_RNG=m +CONFIG_CRYPTO_USER_API_AEAD=m # # Hardware crypto devices diff --git a/ktypes/base/base.scc b/ktypes/base/base.scc index 2369a1fa..bdef6a81 100644 --- a/ktypes/base/base.scc +++ b/ktypes/base/base.scc @@ -1,9 +1,9 @@ # SPDX-License-Identifier: MIT -define KERNEL_VERSION 5.0 +define KERNEL_VERSION 6.9 # Force the base configuration # uncomment this branch line for shared kernel tree builds -# branch v4.18 +branch v6.9 force kconf non-hardware base.cfg diff --git a/ktypes/base/hardware.cfg b/ktypes/base/hardware.cfg index 361ee795..36a109f8 100644 --- a/ktypes/base/hardware.cfg +++ b/ktypes/base/hardware.cfg @@ -1,3 +1,10 @@ # SPDX-License-Identifier: MIT # Items listed in here are explicitly considered as hardware items, regardless # of what Kconfig file they were found in. + +CONFIG_BMIPS_CPUFREQ +CONFIG_LOONGSON2_CPUFREQ +CONFIG_LOONGSON1_CPUFREQ +CONFIG_SPARC_US3_CPUFREQ +CONFIG_SPARC_US2E_CPUFREQ +CONFIG_QORIQ_CPUFREQ diff --git a/ktypes/base/hardware.kcf b/ktypes/base/hardware.kcf index 1541c70f..6cbeb95b 100644 --- a/ktypes/base/hardware.kcf +++ b/ktypes/base/hardware.kcf @@ -3,7 +3,6 @@ arch/alpha/Kconfig.debug arch/arc/Kconfig arch/arc/Kconfig.debug arch/arc/plat-axs10x/Kconfig -arch/arc/plat-eznps/Kconfig arch/arc/plat-hsdk/Kconfig arch/arc/plat-tb10x/Kconfig arch/arm64/crypto/Kconfig @@ -13,22 +12,20 @@ arch/arm64/Kconfig.platforms arch/arm64/kvm/Kconfig arch/arm/common/Kconfig arch/arm/crypto/Kconfig -arch/arm/firmware/Kconfig arch/arm/Kconfig +arch/arm/Kconfig.assembler arch/arm/Kconfig.debug arch/arm/Kconfig-nommu -arch/arm/kvm/Kconfig +arch/arm/Kconfig.platforms arch/arm/mach-actions/Kconfig arch/arm/mach-alpine/Kconfig arch/arm/mach-artpec/Kconfig -arch/arm/mach-asm9260/Kconfig arch/arm/mach-aspeed/Kconfig arch/arm/mach-at91/Kconfig arch/arm/mach-axxia/Kconfig arch/arm/mach-bcm/Kconfig arch/arm/mach-berlin/Kconfig arch/arm/mach-clps711x/Kconfig -arch/arm/mach-cns3xxx/Kconfig arch/arm/mach-davinci/Kconfig arch/arm/mach-digicolor/Kconfig arch/arm/mach-dove/Kconfig @@ -38,39 +35,31 @@ arch/arm/mach-footbridge/Kconfig arch/arm/mach-gemini/Kconfig arch/arm/mach-highbank/Kconfig arch/arm/mach-hisi/Kconfig -arch/arm/mach-imx/devices/Kconfig +arch/arm/mach-hpe/Kconfig arch/arm/mach-imx/Kconfig -arch/arm/mach-integrator/Kconfig -arch/arm/mach-iop13xx/Kconfig -arch/arm/mach-iop32x/Kconfig -arch/arm/mach-iop33x/Kconfig arch/arm/mach-ixp4xx/Kconfig arch/arm/mach-keystone/Kconfig -arch/arm/mach-ks8695/Kconfig +arch/arm/mach-lpc32xx/Kconfig arch/arm/mach-mediatek/Kconfig arch/arm/mach-meson/Kconfig +arch/arm/mach-milbeaut/Kconfig arch/arm/mach-mmp/Kconfig -arch/arm/mach-moxart/Kconfig +arch/arm/mach-mstar/Kconfig arch/arm/mach-mv78xx0/Kconfig arch/arm/mach-mvebu/Kconfig arch/arm/mach-mxs/Kconfig -arch/arm/mach-netx/Kconfig arch/arm/mach-nomadik/Kconfig arch/arm/mach-npcm/Kconfig -arch/arm/mach-nspire/Kconfig arch/arm/mach-omap1/Kconfig arch/arm/mach-omap2/Kconfig arch/arm/mach-orion5x/Kconfig -arch/arm/mach-oxnas/Kconfig -arch/arm/mach-picoxcell/Kconfig -arch/arm/mach-prima2/Kconfig arch/arm/mach-pxa/Kconfig arch/arm/mach-qcom/Kconfig -arch/arm/mach-rda/Kconfig -arch/arm/mach-realview/Kconfig +arch/arm/mach-realtek/Kconfig arch/arm/mach-rockchip/Kconfig -arch/arm/mach-s3c24xx/Kconfig -arch/arm/mach-s3c64xx/Kconfig +arch/arm/mach-rpc/Kconfig +arch/arm/mach-s3c/Kconfig +arch/arm/mach-s3c/Kconfig.s3c64xx arch/arm/mach-s5pv210/Kconfig arch/arm/mach-sa1100/Kconfig arch/arm/mach-shmobile/Kconfig @@ -79,36 +68,22 @@ arch/arm/mach-spear/Kconfig arch/arm/mach-sti/Kconfig arch/arm/mach-stm32/Kconfig arch/arm/mach-sunxi/Kconfig -arch/arm/mach-tango/Kconfig arch/arm/mach-tegra/Kconfig -arch/arm/mach-u300/Kconfig -arch/arm/mach-uniphier/Kconfig arch/arm/mach-ux500/Kconfig arch/arm/mach-versatile/Kconfig -arch/arm/mach-vexpress/Kconfig arch/arm/mach-vt8500/Kconfig -arch/arm/mach-w90x900/Kconfig -arch/arm/mach-zx/Kconfig arch/arm/mach-zynq/Kconfig arch/arm/mm/Kconfig -arch/arm/plat-omap/Kconfig -arch/arm/plat-pxa/Kconfig -arch/arm/plat-samsung/Kconfig -arch/arm/plat-versatile/Kconfig -arch/c6x/Kconfig -arch/c6x/Kconfig.debug -arch/c6x/platforms/Kconfig arch/csky/Kconfig arch/csky/Kconfig.debug -arch/h8300/Kconfig -arch/h8300/Kconfig.cpu -arch/h8300/Kconfig.debug +arch/csky/Kconfig.platforms arch/hexagon/Kconfig arch/hexagon/Kconfig.debug -arch/ia64/hp/sim/Kconfig -arch/ia64/Kconfig -arch/ia64/Kconfig.debug arch/Kconfig +arch/loongarch/crypto/Kconfig +arch/loongarch/Kconfig +arch/loongarch/Kconfig.debug +arch/loongarch/kvm/Kconfig arch/m68k/Kconfig arch/m68k/Kconfig.bus arch/m68k/Kconfig.cpu @@ -126,29 +101,23 @@ arch/mips/bcm63xx/boards/Kconfig arch/mips/bcm63xx/Kconfig arch/mips/bmips/Kconfig arch/mips/cavium-octeon/Kconfig +arch/mips/crypto/Kconfig arch/mips/generic/Kconfig +arch/mips/ingenic/Kconfig arch/mips/jazz/Kconfig -arch/mips/jz4740/Kconfig arch/mips/Kconfig arch/mips/Kconfig.debug arch/mips/kvm/Kconfig arch/mips/lantiq/Kconfig -arch/mips/lasat/Kconfig +arch/mips/loongson2ef/Kconfig arch/mips/loongson32/Kconfig arch/mips/loongson64/Kconfig -arch/mips/netlogic/Kconfig -arch/mips/paravirt/Kconfig arch/mips/pic32/Kconfig -arch/mips/pistachio/Kconfig -arch/mips/pmcs-msp71xx/Kconfig arch/mips/ralink/Kconfig arch/mips/sgi-ip27/Kconfig arch/mips/sibyte/Kconfig arch/mips/txx9/Kconfig -arch/mips/vr41xx/Kconfig -arch/nds32/Kconfig -arch/nds32/Kconfig.cpu -arch/nds32/Kconfig.debug +arch/mips/vdso/Kconfig arch/nios2/Kconfig arch/nios2/Kconfig.debug arch/nios2/platform/Kconfig.platform @@ -156,6 +125,7 @@ arch/openrisc/Kconfig arch/openrisc/Kconfig.debug arch/parisc/Kconfig arch/parisc/Kconfig.debug +arch/powerpc/crypto/Kconfig arch/powerpc/Kconfig arch/powerpc/Kconfig.debug arch/powerpc/kvm/Kconfig @@ -169,12 +139,14 @@ arch/powerpc/platforms/85xx/Kconfig arch/powerpc/platforms/86xx/Kconfig arch/powerpc/platforms/8xx/Kconfig arch/powerpc/platforms/amigaone/Kconfig +arch/powerpc/platforms/book3s/Kconfig arch/powerpc/platforms/cell/Kconfig arch/powerpc/platforms/chrp/Kconfig arch/powerpc/platforms/embedded6xx/Kconfig arch/powerpc/platforms/Kconfig arch/powerpc/platforms/Kconfig.cputype arch/powerpc/platforms/maple/Kconfig +arch/powerpc/platforms/microwatt/Kconfig arch/powerpc/platforms/pasemi/Kconfig arch/powerpc/platforms/powermac/Kconfig arch/powerpc/platforms/powernv/Kconfig @@ -185,6 +157,11 @@ arch/powerpc/sysdev/xics/Kconfig arch/powerpc/sysdev/xive/Kconfig arch/riscv/Kconfig arch/riscv/Kconfig.debug +arch/riscv/Kconfig.errata +arch/riscv/Kconfig.socs +arch/riscv/kernel/tests/Kconfig.debug +arch/riscv/kvm/Kconfig +arch/s390/crypto/Kconfig arch/s390/Kconfig arch/s390/Kconfig.debug arch/s390/kvm/Kconfig @@ -201,16 +178,16 @@ arch/sh/Kconfig arch/sh/Kconfig.cpu arch/sh/Kconfig.debug arch/sh/mm/Kconfig +arch/sparc/crypto/Kconfig arch/sparc/Kconfig arch/sparc/Kconfig.debug arch/um/drivers/Kconfig arch/um/Kconfig arch/um/Kconfig.debug -arch/unicore32/Kconfig -arch/unicore32/Kconfig.debug -arch/unicore32/mm/Kconfig +arch/x86/crypto/Kconfig arch/x86/events/Kconfig arch/x86/Kconfig +arch/x86/Kconfig.assembler arch/x86/Kconfig.cpu arch/x86/Kconfig.debug arch/x86/kvm/Kconfig @@ -220,15 +197,23 @@ arch/x86/xen/Kconfig arch/xtensa/Kconfig arch/xtensa/Kconfig.debug crypto/async_tx/Kconfig +drivers/accel/habanalabs/Kconfig +drivers/accel/ivpu/Kconfig +drivers/accel/Kconfig +drivers/accel/qaic/Kconfig drivers/accessibility/Kconfig +drivers/accessibility/speakup/Kconfig drivers/acpi/apei/Kconfig drivers/acpi/arm64/Kconfig drivers/acpi/dptf/Kconfig drivers/acpi/Kconfig drivers/acpi/nfit/Kconfig +drivers/acpi/numa/Kconfig +drivers/acpi/pmic/Kconfig drivers/amba/Kconfig drivers/android/Kconfig drivers/ata/Kconfig +drivers/ata/pata_parport/Kconfig drivers/atm/Kconfig drivers/auxdisplay/Kconfig drivers/base/firmware_loader/Kconfig @@ -239,20 +224,28 @@ drivers/bcma/Kconfig drivers/block/drbd/Kconfig drivers/block/Kconfig drivers/block/mtip32xx/Kconfig -drivers/block/paride/Kconfig +drivers/block/null_blk/Kconfig +drivers/block/rnbd/Kconfig drivers/block/zram/Kconfig drivers/bluetooth/Kconfig drivers/bus/fsl-mc/Kconfig drivers/bus/Kconfig +drivers/bus/mhi/ep/Kconfig +drivers/bus/mhi/host/Kconfig +drivers/bus/mhi/Kconfig +drivers/cache/Kconfig +drivers/cdx/controller/Kconfig +drivers/cdx/Kconfig drivers/char/agp/Kconfig drivers/char/hw_random/Kconfig drivers/char/ipmi/Kconfig drivers/char/Kconfig -drivers/char/pcmcia/Kconfig drivers/char/tpm/Kconfig drivers/char/tpm/st33zp24/Kconfig drivers/char/xillybus/Kconfig drivers/clk/actions/Kconfig +drivers/clk/analogbits/Kconfig +drivers/clk/baikal-t1/Kconfig drivers/clk/bcm/Kconfig drivers/clk/hisilicon/Kconfig drivers/clk/imgtec/Kconfig @@ -262,19 +255,35 @@ drivers/clk/Kconfig drivers/clk/keystone/Kconfig drivers/clk/mediatek/Kconfig drivers/clk/meson/Kconfig +drivers/clk/microchip/Kconfig +drivers/clk/mstar/Kconfig drivers/clk/mvebu/Kconfig +drivers/clk/nuvoton/Kconfig +drivers/clk/pistachio/Kconfig drivers/clk/qcom/Kconfig +drivers/clk/ralink/Kconfig drivers/clk/renesas/Kconfig +drivers/clk/rockchip/Kconfig drivers/clk/samsung/Kconfig +drivers/clk/sifive/Kconfig +drivers/clk/socfpga/Kconfig drivers/clk/sprd/Kconfig +drivers/clk/starfive/Kconfig +drivers/clk/stm32/Kconfig +drivers/clk/sunxi/Kconfig drivers/clk/sunxi-ng/Kconfig drivers/clk/tegra/Kconfig drivers/clk/ti/Kconfig drivers/clk/uniphier/Kconfig drivers/clk/versatile/Kconfig +drivers/clk/visconti/Kconfig +drivers/clk/x86/Kconfig +drivers/clk/xilinx/Kconfig drivers/clk/zynqmp/Kconfig drivers/clocksource/Kconfig +drivers/comedi/Kconfig drivers/connector/Kconfig +drivers/counter/Kconfig drivers/cpufreq/Kconfig drivers/cpufreq/Kconfig.arm drivers/cpufreq/Kconfig.powerpc @@ -283,46 +292,70 @@ drivers/cpuidle/Kconfig drivers/cpuidle/Kconfig.arm drivers/cpuidle/Kconfig.mips drivers/cpuidle/Kconfig.powerpc +drivers/cpuidle/Kconfig.riscv +drivers/crypto/allwinner/Kconfig +drivers/crypto/amlogic/Kconfig +drivers/crypto/aspeed/Kconfig drivers/crypto/caam/Kconfig drivers/crypto/cavium/cpt/Kconfig drivers/crypto/cavium/nitrox/Kconfig drivers/crypto/ccp/Kconfig drivers/crypto/chelsio/Kconfig drivers/crypto/hisilicon/Kconfig +drivers/crypto/intel/iaa/Kconfig +drivers/crypto/intel/ixp4xx/Kconfig +drivers/crypto/intel/Kconfig +drivers/crypto/intel/keembay/Kconfig +drivers/crypto/intel/qat/Kconfig drivers/crypto/Kconfig +drivers/crypto/marvell/Kconfig drivers/crypto/nx/Kconfig -drivers/crypto/qat/Kconfig +drivers/crypto/starfive/Kconfig drivers/crypto/stm32/Kconfig -drivers/crypto/ux500/Kconfig drivers/crypto/virtio/Kconfig drivers/crypto/vmx/Kconfig +drivers/cxl/Kconfig drivers/dax/Kconfig drivers/dca/Kconfig drivers/devfreq/event/Kconfig drivers/devfreq/Kconfig drivers/dma/bestcomm/Kconfig +drivers/dma-buf/heaps/Kconfig drivers/dma-buf/Kconfig +drivers/dma/dw-edma/Kconfig drivers/dma/dw/Kconfig +drivers/dma/fsl-dpaa2-qdma/Kconfig drivers/dma/hsu/Kconfig drivers/dma/Kconfig +drivers/dma/lgm/Kconfig drivers/dma/mediatek/Kconfig +drivers/dma/ptdma/Kconfig drivers/dma/qcom/Kconfig +drivers/dma/sf-pdma/Kconfig drivers/dma/sh/Kconfig drivers/dma/ti/Kconfig +drivers/dpll/Kconfig drivers/edac/Kconfig drivers/eisa/Kconfig drivers/extcon/Kconfig drivers/firewire/Kconfig +drivers/firmware/arm_ffa/Kconfig +drivers/firmware/arm_scmi/Kconfig drivers/firmware/broadcom/Kconfig +drivers/firmware/cirrus/Kconfig drivers/firmware/efi/Kconfig drivers/firmware/google/Kconfig drivers/firmware/imx/Kconfig drivers/firmware/Kconfig drivers/firmware/meson/Kconfig +drivers/firmware/microchip/Kconfig +drivers/firmware/psci/Kconfig +drivers/firmware/qcom/Kconfig +drivers/firmware/smccc/Kconfig drivers/firmware/tegra/Kconfig drivers/firmware/xilinx/Kconfig -drivers/fmc/Kconfig drivers/fpga/Kconfig +drivers/fpga/tests/Kconfig drivers/fsi/Kconfig drivers/gnss/Kconfig drivers/gpio/Kconfig @@ -330,78 +363,106 @@ drivers/gpu/drm/amd/acp/Kconfig drivers/gpu/drm/amd/amdgpu/Kconfig drivers/gpu/drm/amd/amdkfd/Kconfig drivers/gpu/drm/amd/display/Kconfig -drivers/gpu/drm/amd/lib/Kconfig -drivers/gpu/drm/arc/Kconfig drivers/gpu/drm/armada/Kconfig +drivers/gpu/drm/arm/display/Kconfig drivers/gpu/drm/arm/Kconfig +drivers/gpu/drm/aspeed/Kconfig drivers/gpu/drm/ast/Kconfig drivers/gpu/drm/atmel-hlcdc/Kconfig -drivers/gpu/drm/bochs/Kconfig drivers/gpu/drm/bridge/adv7511/Kconfig drivers/gpu/drm/bridge/analogix/Kconfig +drivers/gpu/drm/bridge/cadence/Kconfig +drivers/gpu/drm/bridge/imx/Kconfig drivers/gpu/drm/bridge/Kconfig drivers/gpu/drm/bridge/synopsys/Kconfig -drivers/gpu/drm/cirrus/Kconfig +drivers/gpu/drm/display/Kconfig drivers/gpu/drm/etnaviv/Kconfig drivers/gpu/drm/exynos/Kconfig drivers/gpu/drm/fsl-dcu/Kconfig drivers/gpu/drm/gma500/Kconfig +drivers/gpu/drm/gud/Kconfig drivers/gpu/drm/hisilicon/hibmc/Kconfig drivers/gpu/drm/hisilicon/Kconfig drivers/gpu/drm/hisilicon/kirin/Kconfig drivers/gpu/drm/i2c/Kconfig drivers/gpu/drm/i915/Kconfig drivers/gpu/drm/i915/Kconfig.debug +drivers/gpu/drm/i915/Kconfig.profile +drivers/gpu/drm/imagination/Kconfig +drivers/gpu/drm/imx/dcss/Kconfig +drivers/gpu/drm/imx/ipuv3/Kconfig drivers/gpu/drm/imx/Kconfig +drivers/gpu/drm/imx/lcdc/Kconfig +drivers/gpu/drm/ingenic/Kconfig drivers/gpu/drm/Kconfig +drivers/gpu/drm/kmb/Kconfig +drivers/gpu/drm/lima/Kconfig +drivers/gpu/drm/logicvc/Kconfig +drivers/gpu/drm/loongson/Kconfig +drivers/gpu/drm/mcde/Kconfig drivers/gpu/drm/mediatek/Kconfig drivers/gpu/drm/meson/Kconfig drivers/gpu/drm/mgag200/Kconfig drivers/gpu/drm/msm/Kconfig drivers/gpu/drm/mxsfb/Kconfig drivers/gpu/drm/nouveau/Kconfig -drivers/gpu/drm/omapdrm/displays/Kconfig -drivers/gpu/drm/omapdrm/dss/Kconfig drivers/gpu/drm/omapdrm/Kconfig drivers/gpu/drm/panel/Kconfig +drivers/gpu/drm/panfrost/Kconfig drivers/gpu/drm/pl111/Kconfig drivers/gpu/drm/qxl/Kconfig drivers/gpu/drm/radeon/Kconfig -drivers/gpu/drm/rcar-du/Kconfig +drivers/gpu/drm/renesas/Kconfig +drivers/gpu/drm/renesas/rcar-du/Kconfig +drivers/gpu/drm/renesas/shmobile/Kconfig drivers/gpu/drm/rockchip/Kconfig -drivers/gpu/drm/shmobile/Kconfig +drivers/gpu/drm/solomon/Kconfig +drivers/gpu/drm/sprd/Kconfig drivers/gpu/drm/sti/Kconfig drivers/gpu/drm/stm/Kconfig drivers/gpu/drm/sun4i/Kconfig drivers/gpu/drm/tegra/Kconfig +drivers/gpu/drm/tidss/Kconfig drivers/gpu/drm/tilcdc/Kconfig -drivers/gpu/drm/tinydrm/Kconfig +drivers/gpu/drm/tiny/Kconfig drivers/gpu/drm/tve200/Kconfig drivers/gpu/drm/udl/Kconfig drivers/gpu/drm/v3d/Kconfig +drivers/gpu/drm/vboxvideo/Kconfig drivers/gpu/drm/vc4/Kconfig drivers/gpu/drm/virtio/Kconfig drivers/gpu/drm/vmwgfx/Kconfig +drivers/gpu/drm/xe/Kconfig +drivers/gpu/drm/xe/Kconfig.debug +drivers/gpu/drm/xe/Kconfig.profile drivers/gpu/drm/xen/Kconfig -drivers/gpu/drm/zte/Kconfig +drivers/gpu/drm/xlnx/Kconfig drivers/gpu/host1x/Kconfig drivers/gpu/ipu-v3/Kconfig +drivers/gpu/trace/Kconfig drivers/gpu/vga/Kconfig +drivers/greybus/Kconfig +drivers/hid/amd-sfh-hid/Kconfig +drivers/hid/bpf/Kconfig drivers/hid/i2c-hid/Kconfig drivers/hid/intel-ish-hid/Kconfig drivers/hid/Kconfig +drivers/hid/surface-hid/Kconfig drivers/hid/usbhid/Kconfig drivers/hsi/clients/Kconfig drivers/hsi/controllers/Kconfig drivers/hsi/Kconfig +drivers/hte/Kconfig drivers/hv/Kconfig drivers/hwmon/Kconfig drivers/hwmon/occ/Kconfig +drivers/hwmon/peci/Kconfig drivers/hwmon/pmbus/Kconfig drivers/hwspinlock/Kconfig drivers/hwtracing/coresight/Kconfig drivers/hwtracing/intel_th/Kconfig drivers/hwtracing/Kconfig +drivers/hwtracing/ptt/Kconfig drivers/hwtracing/stm/Kconfig drivers/i2c/algos/Kconfig drivers/i2c/busses/Kconfig @@ -409,53 +470,63 @@ drivers/i2c/Kconfig drivers/i2c/muxes/Kconfig drivers/i3c/Kconfig drivers/i3c/master/Kconfig -drivers/ide/Kconfig drivers/idle/Kconfig drivers/iio/accel/Kconfig drivers/iio/adc/Kconfig +drivers/iio/addac/Kconfig drivers/iio/afe/Kconfig drivers/iio/amplifiers/Kconfig drivers/iio/buffer/Kconfig +drivers/iio/cdc/Kconfig drivers/iio/chemical/Kconfig drivers/iio/common/cros_ec_sensors/Kconfig drivers/iio/common/hid-sensors/Kconfig +drivers/iio/common/inv_sensors/Kconfig drivers/iio/common/Kconfig drivers/iio/common/ms_sensors/Kconfig +drivers/iio/common/scmi_sensors/Kconfig drivers/iio/common/ssp_sensors/Kconfig drivers/iio/common/st_sensors/Kconfig -drivers/iio/counter/Kconfig drivers/iio/dac/Kconfig drivers/iio/dummy/Kconfig +drivers/iio/filter/Kconfig drivers/iio/frequency/Kconfig drivers/iio/gyro/Kconfig drivers/iio/health/Kconfig drivers/iio/humidity/Kconfig drivers/iio/imu/bmi160/Kconfig +drivers/iio/imu/bmi323/Kconfig +drivers/iio/imu/bno055/Kconfig +drivers/iio/imu/inv_icm42600/Kconfig drivers/iio/imu/inv_mpu6050/Kconfig drivers/iio/imu/Kconfig drivers/iio/imu/st_lsm6dsx/Kconfig +drivers/iio/imu/st_lsm9ds0/Kconfig drivers/iio/Kconfig drivers/iio/light/Kconfig drivers/iio/magnetometer/Kconfig drivers/iio/multiplexer/Kconfig drivers/iio/orientation/Kconfig +drivers/iio/position/Kconfig drivers/iio/potentiometer/Kconfig drivers/iio/potentiostat/Kconfig drivers/iio/pressure/Kconfig drivers/iio/proximity/Kconfig drivers/iio/resolver/Kconfig drivers/iio/temperature/Kconfig +drivers/iio/test/Kconfig drivers/iio/trigger/Kconfig drivers/infiniband/hw/bnxt_re/Kconfig -drivers/infiniband/hw/cxgb3/Kconfig drivers/infiniband/hw/cxgb4/Kconfig +drivers/infiniband/hw/efa/Kconfig +drivers/infiniband/hw/erdma/Kconfig drivers/infiniband/hw/hfi1/Kconfig drivers/infiniband/hw/hns/Kconfig -drivers/infiniband/hw/i40iw/Kconfig +drivers/infiniband/hw/irdma/Kconfig +drivers/infiniband/hw/mana/Kconfig drivers/infiniband/hw/mlx4/Kconfig drivers/infiniband/hw/mlx5/Kconfig drivers/infiniband/hw/mthca/Kconfig -drivers/infiniband/hw/nes/Kconfig drivers/infiniband/hw/ocrdma/Kconfig drivers/infiniband/hw/qedr/Kconfig drivers/infiniband/hw/qib/Kconfig @@ -464,10 +535,12 @@ drivers/infiniband/hw/vmw_pvrdma/Kconfig drivers/infiniband/Kconfig drivers/infiniband/sw/rdmavt/Kconfig drivers/infiniband/sw/rxe/Kconfig +drivers/infiniband/sw/siw/Kconfig drivers/infiniband/ulp/ipoib/Kconfig drivers/infiniband/ulp/iser/Kconfig drivers/infiniband/ulp/isert/Kconfig drivers/infiniband/ulp/opa_vnic/Kconfig +drivers/infiniband/ulp/rtrs/Kconfig drivers/infiniband/ulp/srp/Kconfig drivers/infiniband/ulp/srpt/Kconfig drivers/input/gameport/Kconfig @@ -481,32 +554,41 @@ drivers/input/rmi4/Kconfig drivers/input/serio/Kconfig drivers/input/tablet/Kconfig drivers/input/touchscreen/Kconfig +drivers/interconnect/imx/Kconfig +drivers/interconnect/Kconfig +drivers/interconnect/qcom/Kconfig +drivers/interconnect/samsung/Kconfig +drivers/iommu/amd/Kconfig +drivers/iommu/intel/Kconfig +drivers/iommu/iommufd/Kconfig drivers/iommu/Kconfig drivers/ipack/carriers/Kconfig drivers/ipack/devices/Kconfig drivers/ipack/Kconfig drivers/irqchip/Kconfig drivers/isdn/capi/Kconfig -drivers/isdn/gigaset/Kconfig -drivers/isdn/hardware/avm/Kconfig -drivers/isdn/hardware/Kconfig drivers/isdn/hardware/mISDN/Kconfig -drivers/isdn/hisax/Kconfig -drivers/isdn/hysdn/Kconfig -drivers/isdn/i4l/Kconfig drivers/isdn/Kconfig drivers/isdn/mISDN/Kconfig drivers/Kconfig +drivers/leds/blink/Kconfig +drivers/leds/flash/Kconfig drivers/leds/Kconfig +drivers/leds/rgb/Kconfig +drivers/leds/simple/Kconfig drivers/leds/trigger/Kconfig -drivers/lightnvm/Kconfig drivers/macintosh/Kconfig drivers/mailbox/Kconfig drivers/mcb/Kconfig drivers/md/bcache/Kconfig drivers/md/Kconfig drivers/md/persistent-data/Kconfig +drivers/media/cec/i2c/Kconfig drivers/media/cec/Kconfig +drivers/media/cec/platform/Kconfig +drivers/media/cec/usb/Kconfig +drivers/media/cec/usb/pulse8/Kconfig +drivers/media/cec/usb/rainshadow/Kconfig drivers/media/common/b2c2/Kconfig drivers/media/common/Kconfig drivers/media/common/saa7146/Kconfig @@ -518,13 +600,12 @@ drivers/media/dvb-frontends/cxd2880/Kconfig drivers/media/dvb-frontends/drx39xyj/Kconfig drivers/media/dvb-frontends/Kconfig drivers/media/firewire/Kconfig +drivers/media/i2c/ccs/Kconfig drivers/media/i2c/cx25840/Kconfig drivers/media/i2c/et8ek8/Kconfig drivers/media/i2c/Kconfig -drivers/media/i2c/m5mols/Kconfig -drivers/media/i2c/smiapp/Kconfig -drivers/media/i2c/soc_camera/Kconfig drivers/media/Kconfig +drivers/media/mc/Kconfig drivers/media/mmc/Kconfig drivers/media/mmc/siano/Kconfig drivers/media/pci/b2c2/Kconfig @@ -538,10 +619,12 @@ drivers/media/pci/ddbridge/Kconfig drivers/media/pci/dm1105/Kconfig drivers/media/pci/dt3155/Kconfig drivers/media/pci/intel/ipu3/Kconfig +drivers/media/pci/intel/ivsc/Kconfig +drivers/media/pci/intel/Kconfig drivers/media/pci/ivtv/Kconfig drivers/media/pci/Kconfig drivers/media/pci/mantis/Kconfig -drivers/media/pci/meye/Kconfig +drivers/media/pci/mgb4/Kconfig drivers/media/pci/netup_unidvb/Kconfig drivers/media/pci/ngene/Kconfig drivers/media/pci/pluto2/Kconfig @@ -557,21 +640,71 @@ drivers/media/pci/ttpci/Kconfig drivers/media/pci/tw5864/Kconfig drivers/media/pci/tw686x/Kconfig drivers/media/pci/tw68/Kconfig -drivers/media/platform/am437x/Kconfig +drivers/media/pci/zoran/Kconfig +drivers/media/platform/allegro-dvt/Kconfig +drivers/media/platform/amlogic/Kconfig +drivers/media/platform/amlogic/meson-ge2d/Kconfig +drivers/media/platform/amphion/Kconfig +drivers/media/platform/aspeed/Kconfig drivers/media/platform/atmel/Kconfig drivers/media/platform/cadence/Kconfig -drivers/media/platform/davinci/Kconfig -drivers/media/platform/exynos4-is/Kconfig +drivers/media/platform/chips-media/coda/Kconfig +drivers/media/platform/chips-media/Kconfig +drivers/media/platform/chips-media/wave5/Kconfig +drivers/media/platform/intel/Kconfig drivers/media/platform/Kconfig -drivers/media/platform/marvell-ccic/Kconfig -drivers/media/platform/omap/Kconfig -drivers/media/platform/rcar-vin/Kconfig -drivers/media/platform/soc_camera/Kconfig -drivers/media/platform/sti/c8sectpfe/Kconfig +drivers/media/platform/marvell/Kconfig +drivers/media/platform/mediatek/jpeg/Kconfig +drivers/media/platform/mediatek/Kconfig +drivers/media/platform/mediatek/mdp3/Kconfig +drivers/media/platform/mediatek/mdp/Kconfig +drivers/media/platform/mediatek/vcodec/Kconfig +drivers/media/platform/mediatek/vpu/Kconfig +drivers/media/platform/microchip/Kconfig +drivers/media/platform/nuvoton/Kconfig +drivers/media/platform/nvidia/Kconfig +drivers/media/platform/nvidia/tegra-vde/Kconfig +drivers/media/platform/nxp/dw100/Kconfig +drivers/media/platform/nxp/imx8-isi/Kconfig +drivers/media/platform/nxp/imx-jpeg/Kconfig +drivers/media/platform/nxp/Kconfig +drivers/media/platform/qcom/camss/Kconfig +drivers/media/platform/qcom/Kconfig +drivers/media/platform/qcom/venus/Kconfig +drivers/media/platform/renesas/Kconfig +drivers/media/platform/renesas/rcar-vin/Kconfig +drivers/media/platform/renesas/rzg2l-cru/Kconfig +drivers/media/platform/rockchip/Kconfig +drivers/media/platform/rockchip/rga/Kconfig +drivers/media/platform/rockchip/rkisp1/Kconfig +drivers/media/platform/samsung/exynos4-is/Kconfig +drivers/media/platform/samsung/exynos-gsc/Kconfig +drivers/media/platform/samsung/Kconfig +drivers/media/platform/samsung/s3c-camif/Kconfig +drivers/media/platform/samsung/s5p-g2d/Kconfig +drivers/media/platform/samsung/s5p-jpeg/Kconfig +drivers/media/platform/samsung/s5p-mfc/Kconfig +drivers/media/platform/st/Kconfig +drivers/media/platform/st/sti/bdisp/Kconfig +drivers/media/platform/st/sti/c8sectpfe/Kconfig +drivers/media/platform/st/sti/delta/Kconfig +drivers/media/platform/st/sti/hva/Kconfig +drivers/media/platform/st/sti/Kconfig +drivers/media/platform/st/stm32/Kconfig +drivers/media/platform/sunxi/Kconfig +drivers/media/platform/sunxi/sun4i-csi/Kconfig drivers/media/platform/sunxi/sun6i-csi/Kconfig -drivers/media/platform/vicodec/Kconfig -drivers/media/platform/vimc/Kconfig -drivers/media/platform/vivid/Kconfig +drivers/media/platform/sunxi/sun6i-mipi-csi2/Kconfig +drivers/media/platform/sunxi/sun8i-a83t-mipi-csi2/Kconfig +drivers/media/platform/sunxi/sun8i-di/Kconfig +drivers/media/platform/sunxi/sun8i-rotate/Kconfig +drivers/media/platform/ti/am437x/Kconfig +drivers/media/platform/ti/davinci/Kconfig +drivers/media/platform/ti/Kconfig +drivers/media/platform/ti/omap3isp/Kconfig +drivers/media/platform/ti/omap/Kconfig +drivers/media/platform/verisilicon/Kconfig +drivers/media/platform/via/Kconfig drivers/media/platform/xilinx/Kconfig drivers/media/radio/Kconfig drivers/media/radio/si470x/Kconfig @@ -581,12 +714,17 @@ drivers/media/rc/img-ir/Kconfig drivers/media/rc/Kconfig drivers/media/rc/keymaps/Kconfig drivers/media/spi/Kconfig +drivers/media/test-drivers/Kconfig +drivers/media/test-drivers/vicodec/Kconfig +drivers/media/test-drivers/vidtv/Kconfig +drivers/media/test-drivers/vimc/Kconfig +drivers/media/test-drivers/visl/Kconfig +drivers/media/test-drivers/vivid/Kconfig drivers/media/tuners/Kconfig drivers/media/usb/airspy/Kconfig drivers/media/usb/as102/Kconfig drivers/media/usb/au0828/Kconfig drivers/media/usb/b2c2/Kconfig -drivers/media/usb/cpia2/Kconfig drivers/media/usb/cx231xx/Kconfig drivers/media/usb/dvb-usb/Kconfig drivers/media/usb/dvb-usb-v2/Kconfig @@ -600,21 +738,15 @@ drivers/media/usb/hackrf/Kconfig drivers/media/usb/hdpvr/Kconfig drivers/media/usb/Kconfig drivers/media/usb/msi2500/Kconfig -drivers/media/usb/pulse8-cec/Kconfig drivers/media/usb/pvrusb2/Kconfig drivers/media/usb/pwc/Kconfig -drivers/media/usb/rainshadow-cec/Kconfig drivers/media/usb/s2255/Kconfig drivers/media/usb/siano/Kconfig drivers/media/usb/stk1160/Kconfig -drivers/media/usb/stkwebcam/Kconfig -drivers/media/usb/tm6000/Kconfig drivers/media/usb/ttusb-budget/Kconfig drivers/media/usb/ttusb-dec/Kconfig drivers/media/usb/usbtv/Kconfig -drivers/media/usb/usbvision/Kconfig drivers/media/usb/uvc/Kconfig -drivers/media/usb/zr364xx/Kconfig drivers/media/v4l2-core/Kconfig drivers/memory/Kconfig drivers/memory/samsung/Kconfig @@ -625,6 +757,7 @@ drivers/memstick/Kconfig drivers/message/fusion/Kconfig drivers/mfd/Kconfig drivers/misc/altera-stapl/Kconfig +drivers/misc/bcm-vk/Kconfig drivers/misc/c2port/Kconfig drivers/misc/cardreader/Kconfig drivers/misc/cb710/Kconfig @@ -634,32 +767,42 @@ drivers/misc/eeprom/Kconfig drivers/misc/genwqe/Kconfig drivers/misc/Kconfig drivers/misc/lis3lv02d/Kconfig +drivers/misc/mchp_pci1xxxx/Kconfig +drivers/misc/mei/gsc_proxy/Kconfig +drivers/misc/mei/hdcp/Kconfig drivers/misc/mei/Kconfig -drivers/misc/mic/Kconfig +drivers/misc/mei/pxp/Kconfig drivers/misc/ocxl/Kconfig +drivers/misc/pvpanic/Kconfig drivers/misc/ti-st/Kconfig +drivers/misc/uacce/Kconfig drivers/misc/vmw_vmci/Kconfig drivers/mmc/core/Kconfig drivers/mmc/host/Kconfig drivers/mmc/Kconfig +drivers/most/Kconfig drivers/mtd/chips/Kconfig drivers/mtd/devices/Kconfig +drivers/mtd/hyperbus/Kconfig drivers/mtd/Kconfig drivers/mtd/lpddr/Kconfig drivers/mtd/maps/Kconfig drivers/mtd/nand/Kconfig drivers/mtd/nand/onenand/Kconfig +drivers/mtd/nand/raw/brcmnand/Kconfig +drivers/mtd/nand/raw/ingenic/Kconfig drivers/mtd/nand/raw/Kconfig drivers/mtd/nand/spi/Kconfig drivers/mtd/parsers/Kconfig +drivers/mtd/spi-nor/controllers/Kconfig drivers/mtd/spi-nor/Kconfig drivers/mtd/ubi/Kconfig drivers/mux/Kconfig -drivers/net/appletalk/Kconfig drivers/net/arcnet/Kconfig drivers/net/caif/Kconfig drivers/net/can/cc770/Kconfig drivers/net/can/c_can/Kconfig +drivers/net/can/ctucanfd/Kconfig drivers/net/can/ifi_canfd/Kconfig drivers/net/can/Kconfig drivers/net/can/m_can/Kconfig @@ -669,14 +812,23 @@ drivers/net/can/rcar/Kconfig drivers/net/can/sja1000/Kconfig drivers/net/can/softing/Kconfig drivers/net/can/spi/Kconfig +drivers/net/can/spi/mcp251xfd/Kconfig drivers/net/can/usb/Kconfig drivers/net/dsa/b53/Kconfig +drivers/net/dsa/hirschmann/Kconfig drivers/net/dsa/Kconfig drivers/net/dsa/microchip/Kconfig drivers/net/dsa/mv88e6xxx/Kconfig +drivers/net/dsa/ocelot/Kconfig +drivers/net/dsa/qca/Kconfig +drivers/net/dsa/realtek/Kconfig +drivers/net/dsa/sja1105/Kconfig +drivers/net/dsa/xrs700x/Kconfig drivers/net/ethernet/3com/Kconfig drivers/net/ethernet/8390/Kconfig +drivers/net/ethernet/actions/Kconfig drivers/net/ethernet/adaptec/Kconfig +drivers/net/ethernet/adi/Kconfig drivers/net/ethernet/aeroflex/Kconfig drivers/net/ethernet/agere/Kconfig drivers/net/ethernet/alacritech/Kconfig @@ -691,14 +843,15 @@ drivers/net/ethernet/apm/xgene-v2/Kconfig drivers/net/ethernet/apple/Kconfig drivers/net/ethernet/aquantia/Kconfig drivers/net/ethernet/arc/Kconfig +drivers/net/ethernet/asix/Kconfig drivers/net/ethernet/atheros/Kconfig -drivers/net/ethernet/aurora/Kconfig drivers/net/ethernet/broadcom/Kconfig drivers/net/ethernet/brocade/bna/Kconfig drivers/net/ethernet/brocade/Kconfig drivers/net/ethernet/cadence/Kconfig drivers/net/ethernet/calxeda/Kconfig drivers/net/ethernet/cavium/Kconfig +drivers/net/ethernet/chelsio/inline_crypto/Kconfig drivers/net/ethernet/chelsio/Kconfig drivers/net/ethernet/cirrus/Kconfig drivers/net/ethernet/cisco/enic/Kconfig @@ -710,16 +863,20 @@ drivers/net/ethernet/dec/tulip/Kconfig drivers/net/ethernet/dlink/Kconfig drivers/net/ethernet/emulex/benet/Kconfig drivers/net/ethernet/emulex/Kconfig +drivers/net/ethernet/engleder/Kconfig drivers/net/ethernet/ezchip/Kconfig drivers/net/ethernet/faraday/Kconfig drivers/net/ethernet/freescale/dpaa2/Kconfig drivers/net/ethernet/freescale/dpaa/Kconfig +drivers/net/ethernet/freescale/enetc/Kconfig drivers/net/ethernet/freescale/fman/Kconfig drivers/net/ethernet/freescale/fs_enet/Kconfig drivers/net/ethernet/freescale/Kconfig drivers/net/ethernet/fujitsu/Kconfig +drivers/net/ethernet/fungible/funeth/Kconfig +drivers/net/ethernet/fungible/Kconfig +drivers/net/ethernet/google/Kconfig drivers/net/ethernet/hisilicon/Kconfig -drivers/net/ethernet/hp/Kconfig drivers/net/ethernet/huawei/hinic/Kconfig drivers/net/ethernet/huawei/Kconfig drivers/net/ethernet/i825xx/Kconfig @@ -727,16 +884,24 @@ drivers/net/ethernet/ibm/emac/Kconfig drivers/net/ethernet/ibm/Kconfig drivers/net/ethernet/intel/Kconfig drivers/net/ethernet/Kconfig +drivers/net/ethernet/litex/Kconfig drivers/net/ethernet/marvell/Kconfig +drivers/net/ethernet/marvell/octeon_ep/Kconfig drivers/net/ethernet/marvell/octeontx2/Kconfig +drivers/net/ethernet/marvell/prestera/Kconfig drivers/net/ethernet/mediatek/Kconfig drivers/net/ethernet/mellanox/Kconfig drivers/net/ethernet/mellanox/mlx4/Kconfig drivers/net/ethernet/mellanox/mlx5/core/Kconfig +drivers/net/ethernet/mellanox/mlxbf_gige/Kconfig drivers/net/ethernet/mellanox/mlxfw/Kconfig drivers/net/ethernet/mellanox/mlxsw/Kconfig drivers/net/ethernet/micrel/Kconfig drivers/net/ethernet/microchip/Kconfig +drivers/net/ethernet/microchip/lan966x/Kconfig +drivers/net/ethernet/microchip/sparx5/Kconfig +drivers/net/ethernet/microchip/vcap/Kconfig +drivers/net/ethernet/microsoft/Kconfig drivers/net/ethernet/moxa/Kconfig drivers/net/ethernet/mscc/Kconfig drivers/net/ethernet/myricom/Kconfig @@ -744,13 +909,13 @@ drivers/net/ethernet/natsemi/Kconfig drivers/net/ethernet/neterion/Kconfig drivers/net/ethernet/netronome/Kconfig drivers/net/ethernet/ni/Kconfig -drivers/net/ethernet/nuvoton/Kconfig drivers/net/ethernet/nvidia/Kconfig drivers/net/ethernet/nxp/Kconfig drivers/net/ethernet/oki-semi/Kconfig drivers/net/ethernet/oki-semi/pch_gbe/Kconfig drivers/net/ethernet/packetengines/Kconfig drivers/net/ethernet/pasemi/Kconfig +drivers/net/ethernet/pensando/Kconfig drivers/net/ethernet/qlogic/Kconfig drivers/net/ethernet/qualcomm/Kconfig drivers/net/ethernet/qualcomm/rmnet/Kconfig @@ -762,6 +927,7 @@ drivers/net/ethernet/samsung/Kconfig drivers/net/ethernet/seeq/Kconfig drivers/net/ethernet/sfc/falcon/Kconfig drivers/net/ethernet/sfc/Kconfig +drivers/net/ethernet/sfc/siena/Kconfig drivers/net/ethernet/sgi/Kconfig drivers/net/ethernet/silan/Kconfig drivers/net/ethernet/sis/Kconfig @@ -770,12 +936,15 @@ drivers/net/ethernet/socionext/Kconfig drivers/net/ethernet/stmicro/Kconfig drivers/net/ethernet/stmicro/stmmac/Kconfig drivers/net/ethernet/sun/Kconfig +drivers/net/ethernet/sunplus/Kconfig drivers/net/ethernet/synopsys/Kconfig drivers/net/ethernet/tehuti/Kconfig drivers/net/ethernet/ti/Kconfig drivers/net/ethernet/toshiba/Kconfig drivers/net/ethernet/tundra/Kconfig +drivers/net/ethernet/vertexcom/Kconfig drivers/net/ethernet/via/Kconfig +drivers/net/ethernet/wangxun/Kconfig drivers/net/ethernet/wiznet/Kconfig drivers/net/ethernet/xilinx/Kconfig drivers/net/ethernet/xircom/Kconfig @@ -785,19 +954,27 @@ drivers/net/hamradio/Kconfig drivers/net/hippi/Kconfig drivers/net/hyperv/Kconfig drivers/net/ieee802154/Kconfig +drivers/net/ipa/Kconfig drivers/net/Kconfig +drivers/net/mctp/Kconfig +drivers/net/mdio/Kconfig +drivers/net/pcs/Kconfig +drivers/net/phy/aquantia/Kconfig drivers/net/phy/Kconfig drivers/net/plip/Kconfig drivers/net/ppp/Kconfig +drivers/net/pse-pd/Kconfig drivers/net/slip/Kconfig drivers/net/team/Kconfig +drivers/net/thunderbolt/Kconfig drivers/net/usb/Kconfig +drivers/net/wan/framer/Kconfig drivers/net/wan/Kconfig -drivers/net/wimax/i2400m/Kconfig -drivers/net/wimax/Kconfig drivers/net/wireless/admtek/Kconfig drivers/net/wireless/ath/ar5523/Kconfig drivers/net/wireless/ath/ath10k/Kconfig +drivers/net/wireless/ath/ath11k/Kconfig +drivers/net/wireless/ath/ath12k/Kconfig drivers/net/wireless/ath/ath5k/Kconfig drivers/net/wireless/ath/ath6kl/Kconfig drivers/net/wireless/ath/ath9k/Kconfig @@ -808,16 +985,14 @@ drivers/net/wireless/ath/wil6210/Kconfig drivers/net/wireless/atmel/Kconfig drivers/net/wireless/broadcom/b43/Kconfig drivers/net/wireless/broadcom/b43legacy/Kconfig +drivers/net/wireless/broadcom/brcm80211/brcmfmac/Kconfig drivers/net/wireless/broadcom/brcm80211/Kconfig drivers/net/wireless/broadcom/Kconfig -drivers/net/wireless/cisco/Kconfig drivers/net/wireless/intel/ipw2x00/Kconfig drivers/net/wireless/intel/iwlegacy/Kconfig drivers/net/wireless/intel/iwlwifi/Kconfig drivers/net/wireless/intel/Kconfig -drivers/net/wireless/intersil/hostap/Kconfig drivers/net/wireless/intersil/Kconfig -drivers/net/wireless/intersil/orinoco/Kconfig drivers/net/wireless/intersil/p54/Kconfig drivers/net/wireless/Kconfig drivers/net/wireless/marvell/Kconfig @@ -827,8 +1002,18 @@ drivers/net/wireless/marvell/mwifiex/Kconfig drivers/net/wireless/mediatek/Kconfig drivers/net/wireless/mediatek/mt7601u/Kconfig drivers/net/wireless/mediatek/mt76/Kconfig +drivers/net/wireless/mediatek/mt76/mt7603/Kconfig +drivers/net/wireless/mediatek/mt76/mt7615/Kconfig drivers/net/wireless/mediatek/mt76/mt76x0/Kconfig drivers/net/wireless/mediatek/mt76/mt76x2/Kconfig +drivers/net/wireless/mediatek/mt76/mt7915/Kconfig +drivers/net/wireless/mediatek/mt76/mt7921/Kconfig +drivers/net/wireless/mediatek/mt76/mt7925/Kconfig +drivers/net/wireless/mediatek/mt76/mt7996/Kconfig +drivers/net/wireless/microchip/Kconfig +drivers/net/wireless/microchip/wilc1000/Kconfig +drivers/net/wireless/purelifi/Kconfig +drivers/net/wireless/purelifi/plfxlc/Kconfig drivers/net/wireless/quantenna/Kconfig drivers/net/wireless/quantenna/qtnfmac/Kconfig drivers/net/wireless/ralink/Kconfig @@ -837,7 +1022,11 @@ drivers/net/wireless/realtek/Kconfig drivers/net/wireless/realtek/rtl818x/Kconfig drivers/net/wireless/realtek/rtl8xxxu/Kconfig drivers/net/wireless/realtek/rtlwifi/Kconfig +drivers/net/wireless/realtek/rtw88/Kconfig +drivers/net/wireless/realtek/rtw89/Kconfig drivers/net/wireless/rsi/Kconfig +drivers/net/wireless/silabs/Kconfig +drivers/net/wireless/silabs/wfx/Kconfig drivers/net/wireless/st/cw1200/Kconfig drivers/net/wireless/st/Kconfig drivers/net/wireless/ti/Kconfig @@ -845,8 +1034,10 @@ drivers/net/wireless/ti/wl1251/Kconfig drivers/net/wireless/ti/wl12xx/Kconfig drivers/net/wireless/ti/wl18xx/Kconfig drivers/net/wireless/ti/wlcore/Kconfig +drivers/net/wireless/virtual/Kconfig drivers/net/wireless/zydas/Kconfig drivers/net/wireless/zydas/zd1211rw/Kconfig +drivers/net/wwan/Kconfig drivers/nfc/fdp/Kconfig drivers/nfc/Kconfig drivers/nfc/microread/Kconfig @@ -859,6 +1050,7 @@ drivers/nfc/st21nfca/Kconfig drivers/nfc/st95hf/Kconfig drivers/nfc/st-nci/Kconfig drivers/ntb/hw/amd/Kconfig +drivers/ntb/hw/epf/Kconfig drivers/ntb/hw/idt/Kconfig drivers/ntb/hw/intel/Kconfig drivers/ntb/hw/Kconfig @@ -866,16 +1058,20 @@ drivers/ntb/hw/mscc/Kconfig drivers/ntb/Kconfig drivers/ntb/test/Kconfig drivers/nvdimm/Kconfig +drivers/nvme/common/Kconfig drivers/nvme/host/Kconfig drivers/nvme/Kconfig drivers/nvmem/Kconfig +drivers/nvmem/layouts/Kconfig drivers/nvme/target/Kconfig drivers/of/Kconfig drivers/opp/Kconfig drivers/parisc/Kconfig drivers/parport/Kconfig +drivers/pci/controller/cadence/Kconfig drivers/pci/controller/dwc/Kconfig drivers/pci/controller/Kconfig +drivers/pci/controller/mobiveil/Kconfig drivers/pci/endpoint/functions/Kconfig drivers/pci/endpoint/Kconfig drivers/pci/hotplug/Kconfig @@ -883,6 +1079,11 @@ drivers/pci/Kconfig drivers/pci/pcie/Kconfig drivers/pci/switch/Kconfig drivers/pcmcia/Kconfig +drivers/peci/controller/Kconfig +drivers/peci/Kconfig +drivers/perf/amlogic/Kconfig +drivers/perf/arm_cspmu/Kconfig +drivers/perf/hisilicon/Kconfig drivers/perf/Kconfig drivers/phy/allwinner/Kconfig drivers/phy/amlogic/Kconfig @@ -890,10 +1091,13 @@ drivers/phy/broadcom/Kconfig drivers/phy/cadence/Kconfig drivers/phy/freescale/Kconfig drivers/phy/hisilicon/Kconfig +drivers/phy/ingenic/Kconfig +drivers/phy/intel/Kconfig drivers/phy/Kconfig drivers/phy/lantiq/Kconfig drivers/phy/marvell/Kconfig drivers/phy/mediatek/Kconfig +drivers/phy/microchip/Kconfig drivers/phy/motorola/Kconfig drivers/phy/mscc/Kconfig drivers/phy/qualcomm/Kconfig @@ -902,9 +1106,12 @@ drivers/phy/renesas/Kconfig drivers/phy/rockchip/Kconfig drivers/phy/samsung/Kconfig drivers/phy/socionext/Kconfig +drivers/phy/starfive/Kconfig drivers/phy/st/Kconfig +drivers/phy/sunplus/Kconfig drivers/phy/tegra/Kconfig drivers/phy/ti/Kconfig +drivers/phy/xilinx/Kconfig drivers/pinctrl/actions/Kconfig drivers/pinctrl/aspeed/Kconfig drivers/pinctrl/bcm/Kconfig @@ -912,36 +1119,82 @@ drivers/pinctrl/berlin/Kconfig drivers/pinctrl/cirrus/Kconfig drivers/pinctrl/freescale/Kconfig drivers/pinctrl/intel/Kconfig +drivers/pinctrl/intel/Kconfig.tng drivers/pinctrl/Kconfig drivers/pinctrl/mediatek/Kconfig drivers/pinctrl/meson/Kconfig drivers/pinctrl/mvebu/Kconfig drivers/pinctrl/nomadik/Kconfig drivers/pinctrl/nuvoton/Kconfig +drivers/pinctrl/nxp/Kconfig drivers/pinctrl/pxa/Kconfig drivers/pinctrl/qcom/Kconfig +drivers/pinctrl/qcom/Kconfig.msm +drivers/pinctrl/realtek/Kconfig +drivers/pinctrl/renesas/Kconfig drivers/pinctrl/samsung/Kconfig -drivers/pinctrl/sh-pfc/Kconfig drivers/pinctrl/spear/Kconfig drivers/pinctrl/sprd/Kconfig +drivers/pinctrl/starfive/Kconfig drivers/pinctrl/stm32/Kconfig +drivers/pinctrl/sunplus/Kconfig drivers/pinctrl/sunxi/Kconfig drivers/pinctrl/tegra/Kconfig drivers/pinctrl/ti/Kconfig drivers/pinctrl/uniphier/Kconfig +drivers/pinctrl/visconti/Kconfig drivers/pinctrl/vt8500/Kconfig -drivers/pinctrl/zte/Kconfig drivers/platform/chrome/Kconfig +drivers/platform/chrome/wilco_ec/Kconfig drivers/platform/goldfish/Kconfig drivers/platform/Kconfig +drivers/platform/loongarch/Kconfig drivers/platform/mellanox/Kconfig drivers/platform/mips/Kconfig +drivers/platform/olpc/Kconfig +drivers/platform/surface/aggregator/Kconfig +drivers/platform/surface/Kconfig +drivers/platform/x86/amd/Kconfig +drivers/platform/x86/amd/pmc/Kconfig +drivers/platform/x86/amd/pmf/Kconfig +drivers/platform/x86/dell/Kconfig +drivers/platform/x86/hp/Kconfig +drivers/platform/x86/intel/atomisp2/Kconfig +drivers/platform/x86/intel/ifs/Kconfig +drivers/platform/x86/intel/int1092/Kconfig +drivers/platform/x86/intel/int3472/Kconfig +drivers/platform/x86/intel/Kconfig +drivers/platform/x86/intel/pmc/Kconfig +drivers/platform/x86/intel/pmt/Kconfig +drivers/platform/x86/intel/speed_select_if/Kconfig +drivers/platform/x86/intel/telemetry/Kconfig +drivers/platform/x86/intel/uncore-frequency/Kconfig +drivers/platform/x86/intel/wmi/Kconfig drivers/platform/x86/Kconfig +drivers/platform/x86/siemens/Kconfig +drivers/platform/x86/x86-android-tablets/Kconfig +drivers/pmdomain/actions/Kconfig +drivers/pmdomain/amlogic/Kconfig +drivers/pmdomain/apple/Kconfig +drivers/pmdomain/arm/Kconfig +drivers/pmdomain/bcm/Kconfig +drivers/pmdomain/imx/Kconfig +drivers/pmdomain/Kconfig +drivers/pmdomain/mediatek/Kconfig +drivers/pmdomain/qcom/Kconfig +drivers/pmdomain/renesas/Kconfig +drivers/pmdomain/rockchip/Kconfig +drivers/pmdomain/samsung/Kconfig +drivers/pmdomain/starfive/Kconfig +drivers/pmdomain/st/Kconfig +drivers/pmdomain/sunxi/Kconfig +drivers/pmdomain/tegra/Kconfig +drivers/pmdomain/ti/Kconfig +drivers/pmdomain/xilinx/Kconfig drivers/pnp/isapnp/Kconfig drivers/pnp/Kconfig drivers/pnp/pnpacpi/Kconfig drivers/pnp/pnpbios/Kconfig -drivers/power/avs/Kconfig drivers/powercap/Kconfig drivers/power/Kconfig drivers/power/reset/Kconfig @@ -959,6 +1212,7 @@ drivers/regulator/Kconfig drivers/remoteproc/Kconfig drivers/reset/hisilicon/Kconfig drivers/reset/Kconfig +drivers/reset/starfive/Kconfig drivers/reset/sti/Kconfig drivers/reset/tegra/Kconfig drivers/rpmsg/Kconfig @@ -980,38 +1234,46 @@ drivers/scsi/cxgbi/cxgb4i/Kconfig drivers/scsi/cxgbi/Kconfig drivers/scsi/cxlflash/Kconfig drivers/scsi/device_handler/Kconfig +drivers/scsi/elx/Kconfig drivers/scsi/esas2r/Kconfig drivers/scsi/hisi_sas/Kconfig drivers/scsi/Kconfig drivers/scsi/libsas/Kconfig drivers/scsi/megaraid/Kconfig.megaraid +drivers/scsi/mpi3mr/Kconfig drivers/scsi/mpt3sas/Kconfig drivers/scsi/mvsas/Kconfig -drivers/scsi/osd/Kconfig drivers/scsi/pcmcia/Kconfig drivers/scsi/qedf/Kconfig drivers/scsi/qedi/Kconfig drivers/scsi/qla2xxx/Kconfig drivers/scsi/qla4xxx/Kconfig drivers/scsi/smartpqi/Kconfig -drivers/scsi/ufs/Kconfig -drivers/sfi/Kconfig drivers/sh/intc/Kconfig drivers/sh/Kconfig drivers/siox/Kconfig drivers/slimbus/Kconfig -drivers/sn/Kconfig -drivers/soc/actions/Kconfig drivers/soc/amlogic/Kconfig +drivers/soc/apple/Kconfig +drivers/soc/aspeed/Kconfig drivers/soc/atmel/Kconfig drivers/soc/bcm/brcmstb/Kconfig drivers/soc/bcm/Kconfig +drivers/soc/canaan/Kconfig drivers/soc/fsl/Kconfig drivers/soc/fsl/qbman/Kconfig drivers/soc/fsl/qe/Kconfig +drivers/soc/fujitsu/Kconfig +drivers/soc/hisilicon/Kconfig drivers/soc/imx/Kconfig +drivers/soc/ixp4xx/Kconfig drivers/soc/Kconfig +drivers/soc/litex/Kconfig +drivers/soc/loongson/Kconfig drivers/soc/mediatek/Kconfig +drivers/soc/microchip/Kconfig +drivers/soc/nuvoton/Kconfig +drivers/soc/pxa/Kconfig drivers/soc/qcom/Kconfig drivers/soc/renesas/Kconfig drivers/soc/rockchip/Kconfig @@ -1022,108 +1284,81 @@ drivers/soc/ti/Kconfig drivers/soc/ux500/Kconfig drivers/soc/versatile/Kconfig drivers/soc/xilinx/Kconfig -drivers/soc/zte/Kconfig drivers/soundwire/Kconfig drivers/spi/Kconfig drivers/spmi/Kconfig drivers/ssb/Kconfig -drivers/staging/android/ion/Kconfig -drivers/staging/android/Kconfig drivers/staging/axis-fifo/Kconfig drivers/staging/board/Kconfig -drivers/staging/clocking-wizard/Kconfig -drivers/staging/comedi/Kconfig drivers/staging/emxx_udc/Kconfig -drivers/staging/erofs/Kconfig drivers/staging/fbtft/Kconfig -drivers/staging/fsl-dpaa2/Kconfig -drivers/staging/fwserial/Kconfig -drivers/staging/gasket/Kconfig +drivers/staging/fieldbus/anybuss/Kconfig +drivers/staging/fieldbus/Kconfig drivers/staging/gdm724x/Kconfig -drivers/staging/goldfish/Kconfig drivers/staging/greybus/Kconfig -drivers/staging/gs_fpgaboot/Kconfig drivers/staging/iio/accel/Kconfig drivers/staging/iio/adc/Kconfig drivers/staging/iio/addac/Kconfig -drivers/staging/iio/cdc/Kconfig drivers/staging/iio/frequency/Kconfig drivers/staging/iio/impedance-analyzer/Kconfig drivers/staging/iio/Kconfig -drivers/staging/iio/meter/Kconfig -drivers/staging/iio/resolver/Kconfig drivers/staging/Kconfig drivers/staging/ks7010/Kconfig -drivers/staging/media/bcm2048/Kconfig -drivers/staging/media/davinci_vpfe/Kconfig -drivers/staging/media/imx074/Kconfig +drivers/staging/media/atomisp/i2c/Kconfig +drivers/staging/media/atomisp/Kconfig +drivers/staging/media/av7110/Kconfig +drivers/staging/media/deprecated/atmel/Kconfig drivers/staging/media/imx/Kconfig drivers/staging/media/ipu3/Kconfig drivers/staging/media/Kconfig -drivers/staging/media/mt9t031/Kconfig +drivers/staging/media/max96712/Kconfig +drivers/staging/media/meson/vdec/Kconfig drivers/staging/media/omap4iss/Kconfig -drivers/staging/media/rockchip/vpu/Kconfig +drivers/staging/media/rkvdec/Kconfig +drivers/staging/media/starfive/camss/Kconfig +drivers/staging/media/starfive/Kconfig drivers/staging/media/sunxi/cedrus/Kconfig drivers/staging/media/sunxi/Kconfig -drivers/staging/media/tegra-vde/Kconfig -drivers/staging/media/zoran/Kconfig -drivers/staging/most/cdev/Kconfig +drivers/staging/media/sunxi/sun6i-isp/Kconfig +drivers/staging/media/tegra-video/Kconfig drivers/staging/most/dim2/Kconfig drivers/staging/most/i2c/Kconfig drivers/staging/most/Kconfig drivers/staging/most/net/Kconfig -drivers/staging/most/sound/Kconfig -drivers/staging/most/usb/Kconfig drivers/staging/most/video/Kconfig -drivers/staging/mt7621-dma/Kconfig -drivers/staging/mt7621-dts/Kconfig -drivers/staging/mt7621-eth/Kconfig -drivers/staging/mt7621-mmc/Kconfig -drivers/staging/mt7621-pci/Kconfig -drivers/staging/mt7621-pinctrl/Kconfig -drivers/staging/mt7621-spi/Kconfig -drivers/staging/netlogic/Kconfig drivers/staging/nvec/Kconfig drivers/staging/octeon/Kconfig -drivers/staging/octeon-usb/Kconfig drivers/staging/olpc_dcon/Kconfig drivers/staging/pi433/Kconfig -drivers/staging/rtl8188eu/Kconfig drivers/staging/rtl8192e/Kconfig drivers/staging/rtl8192e/rtl8192e/Kconfig -drivers/staging/rtl8192u/Kconfig drivers/staging/rtl8712/Kconfig drivers/staging/rtl8723bs/Kconfig -drivers/staging/rtlwifi/Kconfig drivers/staging/rts5208/Kconfig drivers/staging/sm750fb/Kconfig -drivers/staging/speakup/Kconfig -drivers/staging/unisys/Kconfig -drivers/staging/unisys/visorhba/Kconfig -drivers/staging/unisys/visorinput/Kconfig -drivers/staging/unisys/visornic/Kconfig -drivers/staging/vboxvideo/Kconfig drivers/staging/vc04_services/bcm2835-audio/Kconfig drivers/staging/vc04_services/bcm2835-camera/Kconfig drivers/staging/vc04_services/Kconfig -drivers/staging/vme/devices/Kconfig +drivers/staging/vc04_services/vchiq-mmal/Kconfig +drivers/staging/vme_user/Kconfig drivers/staging/vt6655/Kconfig drivers/staging/vt6656/Kconfig -drivers/staging/wilc1000/Kconfig drivers/staging/wlan-ng/Kconfig -drivers/staging/xgifb/Kconfig drivers/target/iscsi/cxgbit/Kconfig drivers/target/iscsi/Kconfig drivers/target/Kconfig drivers/target/loopback/Kconfig drivers/target/sbp/Kconfig drivers/target/tcm_fc/Kconfig +drivers/target/tcm_remote/Kconfig +drivers/tee/amdtee/Kconfig drivers/tee/Kconfig drivers/tee/optee/Kconfig drivers/thermal/broadcom/Kconfig drivers/thermal/intel/int340x_thermal/Kconfig drivers/thermal/intel/Kconfig drivers/thermal/Kconfig +drivers/thermal/mediatek/Kconfig drivers/thermal/qcom/Kconfig drivers/thermal/samsung/Kconfig drivers/thermal/st/Kconfig @@ -1135,17 +1370,24 @@ drivers/tty/Kconfig drivers/tty/serdev/Kconfig drivers/tty/serial/8250/Kconfig drivers/tty/serial/Kconfig +drivers/ufs/core/Kconfig +drivers/ufs/host/Kconfig +drivers/ufs/Kconfig drivers/uio/Kconfig drivers/usb/atm/Kconfig +drivers/usb/cdns3/Kconfig drivers/usb/chipidea/Kconfig drivers/usb/class/Kconfig +drivers/usb/common/Kconfig drivers/usb/core/Kconfig drivers/usb/dwc2/Kconfig drivers/usb/dwc3/Kconfig +drivers/usb/fotg210/Kconfig drivers/usb/gadget/Kconfig drivers/usb/gadget/legacy/Kconfig drivers/usb/gadget/udc/aspeed-vhub/Kconfig drivers/usb/gadget/udc/bdc/Kconfig +drivers/usb/gadget/udc/cdns2/Kconfig drivers/usb/gadget/udc/Kconfig drivers/usb/host/Kconfig drivers/usb/image/Kconfig @@ -1165,19 +1407,25 @@ drivers/usb/typec/altmodes/Kconfig drivers/usb/typec/Kconfig drivers/usb/typec/mux/Kconfig drivers/usb/typec/tcpm/Kconfig +drivers/usb/typec/tipd/Kconfig drivers/usb/typec/ucsi/Kconfig drivers/usb/usbip/Kconfig -drivers/usb/wusbcore/Kconfig -drivers/uwb/Kconfig +drivers/vdpa/Kconfig +drivers/vfio/cdx/Kconfig +drivers/vfio/fsl-mc/Kconfig drivers/vfio/Kconfig drivers/vfio/mdev/Kconfig +drivers/vfio/pci/hisilicon/Kconfig drivers/vfio/pci/Kconfig +drivers/vfio/pci/mlx5/Kconfig +drivers/vfio/pci/pds/Kconfig +drivers/vfio/pci/virtio/Kconfig drivers/vfio/platform/Kconfig drivers/vfio/platform/reset/Kconfig drivers/vhost/Kconfig -drivers/vhost/Kconfig.vringh drivers/video/backlight/Kconfig drivers/video/console/Kconfig +drivers/video/fbdev/core/Kconfig drivers/video/fbdev/geode/Kconfig drivers/video/fbdev/Kconfig drivers/video/fbdev/mmp/fb/Kconfig @@ -1191,28 +1439,30 @@ drivers/video/fbdev/omap2/omapfb/Kconfig drivers/video/fbdev/omap/Kconfig drivers/video/Kconfig drivers/video/logo/Kconfig +drivers/virt/acrn/Kconfig +drivers/virt/coco/efi_secret/Kconfig +drivers/virt/coco/Kconfig +drivers/virt/coco/sev-guest/Kconfig +drivers/virt/coco/tdx-guest/Kconfig drivers/virtio/Kconfig drivers/virt/Kconfig +drivers/virt/nitro_enclaves/Kconfig drivers/virt/vboxguest/Kconfig -drivers/visorbus/Kconfig -drivers/vlynq/Kconfig -drivers/vme/boards/Kconfig -drivers/vme/bridges/Kconfig -drivers/vme/Kconfig drivers/w1/Kconfig drivers/w1/masters/Kconfig drivers/w1/slaves/Kconfig drivers/watchdog/Kconfig drivers/xen/Kconfig drivers/zorro/Kconfig +mm/damon/Kconfig mm/Kconfig mm/Kconfig.debug +net/can/j1939/Kconfig net/can/Kconfig net/iucv/Kconfig net/nfc/hci/Kconfig net/nfc/Kconfig net/nfc/nci/Kconfig -net/wimax/Kconfig sound/ac97/Kconfig sound/aoa/codecs/Kconfig sound/aoa/fabrics/Kconfig @@ -1236,7 +1486,9 @@ sound/pcmcia/Kconfig sound/ppc/Kconfig sound/sh/Kconfig sound/soc/adi/Kconfig +sound/soc/amd/acp/Kconfig sound/soc/amd/Kconfig +sound/soc/apple/Kconfig sound/soc/atmel/Kconfig sound/soc/au1x/Kconfig sound/soc/bcm/Kconfig @@ -1245,39 +1497,47 @@ sound/soc/codecs/Kconfig sound/soc/dwc/Kconfig sound/soc/fsl/Kconfig sound/soc/generic/Kconfig +sound/soc/google/Kconfig sound/soc/hisilicon/Kconfig sound/soc/img/Kconfig +sound/soc/intel/avs/boards/Kconfig sound/soc/intel/boards/Kconfig sound/soc/intel/Kconfig sound/soc/jz4740/Kconfig sound/soc/Kconfig sound/soc/kirkwood/Kconfig +sound/soc/loongson/Kconfig sound/soc/mediatek/Kconfig sound/soc/meson/Kconfig sound/soc/mxs/Kconfig -sound/soc/nuc900/Kconfig sound/soc/pxa/Kconfig sound/soc/qcom/Kconfig sound/soc/rockchip/Kconfig sound/soc/samsung/Kconfig sound/soc/sh/Kconfig -sound/soc/sirf/Kconfig +sound/soc/sof/amd/Kconfig +sound/soc/sof/imx/Kconfig +sound/soc/sof/intel/Kconfig +sound/soc/sof/Kconfig +sound/soc/sof/mediatek/Kconfig +sound/soc/sof/xtensa/Kconfig sound/soc/spear/Kconfig +sound/soc/sprd/Kconfig +sound/soc/starfive/Kconfig sound/soc/sti/Kconfig sound/soc/stm/Kconfig sound/soc/sunxi/Kconfig sound/soc/tegra/Kconfig sound/soc/ti/Kconfig -sound/soc/txx9/Kconfig sound/soc/uniphier/Kconfig sound/soc/ux500/Kconfig sound/soc/xilinx/Kconfig sound/soc/xtensa/Kconfig -sound/soc/zte/Kconfig sound/sparc/Kconfig sound/spi/Kconfig sound/synth/Kconfig sound/usb/Kconfig sound/usb/line6/Kconfig +sound/virtio/Kconfig sound/x86/Kconfig sound/xen/Kconfig diff --git a/ktypes/base/non-hardware.cfg b/ktypes/base/non-hardware.cfg index 1b79c70e..0474699d 100644 --- a/ktypes/base/non-hardware.cfg +++ b/ktypes/base/non-hardware.cfg @@ -8,7 +8,6 @@ # Misc drivers CONFIG_BLK_DEV_LOOP -CONFIG_BLK_DEV_CRYPTOLOOP CONFIG_BLK_DEV_RAM CONFIG_BLK_DEV_NBD @@ -19,12 +18,38 @@ CONFIG_PREEMPT # Network related drivers/items. CONFIG_NET +CONFIG_NET_CORE CONFIG_NETCONSOLE +CONFIG_NETCONSOLE_DYNAMIC CONFIG_NETDEVICES CONFIG_TUN CONFIG_BONDING CONFIG_DUMMY +CONFIG_WIREGUARD +CONFIG_EQUALIZER + +CONFIG_MACVLAN +CONFIG_MACVTAP +CONFIG_IPVLAN +CONFIG_IPVTAP +CONFIG_VXLAN +CONFIG_GENEVE +CONFIG_BAREUDP +CONFIG_GTP + +CONFIG_NETPOLL +CONFIG_NET_POLL_CONTROLLER +CONFIG_NTB_NETDEV + +CONFIG_TAP +CONFIG_TUN +CONFIG_VETH +CONFIG_VIRTIO_NET +CONFIG_NLMON +CONFIG_NET_VRF +CONFIG_VSOCKMON +CONFIG_MHI_NET CONFIG_PPP CONFIG_PPP_ASYNC @@ -50,3 +75,15 @@ CONFIG_LEGACY_PTYS CONFIG_COMMON_CLK CONFIG_COMMON_CLK_DEBUG + +CONFIG_BT_HCIBTUSB +CONFIG_BT_HCIUART +CONFIG_BT_HCIUART_LL +CONFIG_BT_HCIUART_BCM +CONFIG_BT_HCIUART_QCA +CONFIG_LEGACY_PTY_COUNT + +CONFIG_XEN_NETDEV_FRONTEND +CONFIG_XEN_NETDEV_BACKEND +CONFIG_NETDEVSIM + diff --git a/ktypes/base/non-hardware.kcf b/ktypes/base/non-hardware.kcf index 1a83f73c..98a6ddf6 100644 --- a/ktypes/base/non-hardware.kcf +++ b/ktypes/base/non-hardware.kcf @@ -5,6 +5,7 @@ crypto/asymmetric_keys/Kconfig crypto/async_tx/Kconfig crypto/Kconfig drivers/accessibility/Kconfig +drivers/accessibility/speakup/Kconfig drivers/base/firmware_loader/Kconfig drivers/base/Kconfig drivers/base/regmap/Kconfig @@ -16,6 +17,7 @@ drivers/cpuidle/Kconfig drivers/cpuidle/Kconfig.arm drivers/cpuidle/Kconfig.mips drivers/cpuidle/Kconfig.powerpc +drivers/cpuidle/Kconfig.riscv drivers/firewire/Kconfig drivers/hv/Kconfig drivers/md/bcache/Kconfig @@ -24,95 +26,71 @@ drivers/md/persistent-data/Kconfig drivers/mtd/ubi/Kconfig drivers/remoteproc/Kconfig drivers/rpmsg/Kconfig -drivers/staging/android/ion/Kconfig -drivers/staging/android/Kconfig drivers/staging/axis-fifo/Kconfig drivers/staging/board/Kconfig -drivers/staging/clocking-wizard/Kconfig -drivers/staging/comedi/Kconfig drivers/staging/emxx_udc/Kconfig -drivers/staging/erofs/Kconfig drivers/staging/fbtft/Kconfig -drivers/staging/fsl-dpaa2/Kconfig -drivers/staging/fwserial/Kconfig -drivers/staging/gasket/Kconfig +drivers/staging/fieldbus/anybuss/Kconfig +drivers/staging/fieldbus/Kconfig drivers/staging/gdm724x/Kconfig -drivers/staging/goldfish/Kconfig drivers/staging/greybus/Kconfig -drivers/staging/gs_fpgaboot/Kconfig drivers/staging/iio/accel/Kconfig drivers/staging/iio/adc/Kconfig drivers/staging/iio/addac/Kconfig -drivers/staging/iio/cdc/Kconfig drivers/staging/iio/frequency/Kconfig drivers/staging/iio/impedance-analyzer/Kconfig drivers/staging/iio/Kconfig -drivers/staging/iio/meter/Kconfig -drivers/staging/iio/resolver/Kconfig drivers/staging/Kconfig drivers/staging/ks7010/Kconfig -drivers/staging/media/bcm2048/Kconfig -drivers/staging/media/davinci_vpfe/Kconfig -drivers/staging/media/imx074/Kconfig +drivers/staging/media/atomisp/i2c/Kconfig +drivers/staging/media/atomisp/Kconfig +drivers/staging/media/av7110/Kconfig +drivers/staging/media/deprecated/atmel/Kconfig drivers/staging/media/imx/Kconfig drivers/staging/media/ipu3/Kconfig drivers/staging/media/Kconfig -drivers/staging/media/mt9t031/Kconfig +drivers/staging/media/max96712/Kconfig +drivers/staging/media/meson/vdec/Kconfig drivers/staging/media/omap4iss/Kconfig -drivers/staging/media/rockchip/vpu/Kconfig +drivers/staging/media/rkvdec/Kconfig +drivers/staging/media/starfive/camss/Kconfig +drivers/staging/media/starfive/Kconfig drivers/staging/media/sunxi/cedrus/Kconfig drivers/staging/media/sunxi/Kconfig -drivers/staging/media/tegra-vde/Kconfig -drivers/staging/media/zoran/Kconfig -drivers/staging/most/cdev/Kconfig +drivers/staging/media/sunxi/sun6i-isp/Kconfig +drivers/staging/media/tegra-video/Kconfig drivers/staging/most/dim2/Kconfig drivers/staging/most/i2c/Kconfig drivers/staging/most/Kconfig drivers/staging/most/net/Kconfig -drivers/staging/most/sound/Kconfig -drivers/staging/most/usb/Kconfig drivers/staging/most/video/Kconfig -drivers/staging/mt7621-dma/Kconfig -drivers/staging/mt7621-dts/Kconfig -drivers/staging/mt7621-eth/Kconfig -drivers/staging/mt7621-mmc/Kconfig -drivers/staging/mt7621-pci/Kconfig -drivers/staging/mt7621-pinctrl/Kconfig -drivers/staging/mt7621-spi/Kconfig -drivers/staging/netlogic/Kconfig drivers/staging/nvec/Kconfig drivers/staging/octeon/Kconfig -drivers/staging/octeon-usb/Kconfig drivers/staging/olpc_dcon/Kconfig drivers/staging/pi433/Kconfig -drivers/staging/rtl8188eu/Kconfig drivers/staging/rtl8192e/Kconfig drivers/staging/rtl8192e/rtl8192e/Kconfig -drivers/staging/rtl8192u/Kconfig drivers/staging/rtl8712/Kconfig drivers/staging/rtl8723bs/Kconfig -drivers/staging/rtlwifi/Kconfig drivers/staging/rts5208/Kconfig drivers/staging/sm750fb/Kconfig -drivers/staging/speakup/Kconfig -drivers/staging/unisys/Kconfig -drivers/staging/unisys/visorhba/Kconfig -drivers/staging/unisys/visorinput/Kconfig -drivers/staging/unisys/visornic/Kconfig -drivers/staging/vboxvideo/Kconfig drivers/staging/vc04_services/bcm2835-audio/Kconfig drivers/staging/vc04_services/bcm2835-camera/Kconfig drivers/staging/vc04_services/Kconfig -drivers/staging/vme/devices/Kconfig +drivers/staging/vc04_services/vchiq-mmal/Kconfig +drivers/staging/vme_user/Kconfig drivers/staging/vt6655/Kconfig drivers/staging/vt6656/Kconfig -drivers/staging/wilc1000/Kconfig drivers/staging/wlan-ng/Kconfig -drivers/staging/xgifb/Kconfig drivers/vhost/Kconfig -drivers/vhost/Kconfig.vringh +drivers/virt/acrn/Kconfig +drivers/virt/coco/efi_secret/Kconfig +drivers/virt/coco/Kconfig +drivers/virt/coco/sev-guest/Kconfig +drivers/virt/coco/tdx-guest/Kconfig drivers/virtio/Kconfig drivers/virt/Kconfig +drivers/virt/nitro_enclaves/Kconfig drivers/virt/vboxguest/Kconfig drivers/xen/Kconfig fs/9p/Kconfig @@ -121,12 +99,12 @@ fs/affs/Kconfig fs/afs/Kconfig fs/aufs/Kconfig fs/autofs/Kconfig +fs/bcachefs/Kconfig fs/befs/Kconfig fs/bfs/Kconfig fs/btrfs/Kconfig fs/cachefiles/Kconfig fs/ceph/Kconfig -fs/cifs/Kconfig fs/coda/Kconfig fs/configfs/Kconfig fs/cramfs/Kconfig @@ -135,14 +113,13 @@ fs/dlm/Kconfig fs/ecryptfs/Kconfig fs/efivarfs/Kconfig fs/efs/Kconfig -fs/exofs/Kconfig -fs/exofs/Kconfig.ore +fs/erofs/Kconfig +fs/exfat/Kconfig fs/ext2/Kconfig fs/ext4/Kconfig fs/f2fs/Kconfig fs/fat/Kconfig fs/freevxfs/Kconfig -fs/fscache/Kconfig fs/fuse/Kconfig fs/gfs2/Kconfig fs/hfs/Kconfig @@ -156,6 +133,7 @@ fs/Kconfig fs/Kconfig.binfmt fs/kernfs/Kconfig fs/minix/Kconfig +fs/netfs/Kconfig fs/nfsd/Kconfig fs/nfs/Kconfig fs/nilfs2/Kconfig @@ -164,6 +142,7 @@ fs/notify/dnotify/Kconfig fs/notify/fanotify/Kconfig fs/notify/inotify/Kconfig fs/notify/Kconfig +fs/ntfs3/Kconfig fs/ntfs/Kconfig fs/ocfs2/Kconfig fs/omfs/Kconfig @@ -176,39 +155,59 @@ fs/qnx6/Kconfig fs/quota/Kconfig fs/reiserfs/Kconfig fs/romfs/Kconfig +fs/smb/client/Kconfig +fs/smb/Kconfig +fs/smb/server/Kconfig fs/squashfs/Kconfig fs/sysfs/Kconfig fs/sysv/Kconfig fs/ubifs/Kconfig fs/udf/Kconfig fs/ufs/Kconfig +fs/unicode/Kconfig +fs/vboxsf/Kconfig +fs/verity/Kconfig fs/xfs/Kconfig fs/yaffs2/Kconfig +fs/zonefs/Kconfig init/Kconfig +kernel/bpf/Kconfig +kernel/bpf/preload/Kconfig kernel/dma/Kconfig kernel/gcov/Kconfig kernel/irq/Kconfig kernel/Kconfig.freezer kernel/Kconfig.hz +kernel/Kconfig.kexec kernel/Kconfig.locks kernel/Kconfig.preempt kernel/livepatch/Kconfig +kernel/module/Kconfig kernel/power/Kconfig kernel/rcu/Kconfig kernel/rcu/Kconfig.debug kernel/time/Kconfig kernel/trace/Kconfig +kernel/trace/rv/Kconfig +lib/crypto/Kconfig lib/fonts/Kconfig lib/Kconfig lib/Kconfig.debug lib/Kconfig.kasan +lib/Kconfig.kcsan +lib/Kconfig.kfence lib/Kconfig.kgdb +lib/Kconfig.kmsan lib/Kconfig.ubsan +lib/kunit/Kconfig +lib/math/Kconfig +lib/vdso/Kconfig lib/xz/Kconfig net/6lowpan/Kconfig net/8021q/Kconfig net/802/Kconfig net/9p/Kconfig +net/appletalk/Kconfig net/atm/Kconfig net/ax25/Kconfig net/batman-adv/Kconfig @@ -217,17 +216,15 @@ net/bluetooth/cmtp/Kconfig net/bluetooth/hidp/Kconfig net/bluetooth/Kconfig net/bluetooth/rfcomm/Kconfig -net/bpfilter/Kconfig net/bridge/Kconfig net/bridge/netfilter/Kconfig net/caif/Kconfig +net/can/j1939/Kconfig net/can/Kconfig net/ceph/Kconfig net/dcb/Kconfig net/dccp/ccids/Kconfig net/dccp/Kconfig -net/decnet/Kconfig -net/decnet/netfilter/Kconfig net/dns_resolver/Kconfig net/dsa/Kconfig net/hsr/Kconfig @@ -241,13 +238,16 @@ net/ipv6/netfilter/Kconfig net/iucv/Kconfig net/kcm/Kconfig net/Kconfig +net/Kconfig.debug net/l2tp/Kconfig net/l3mdev/Kconfig net/lapb/Kconfig net/llc/Kconfig net/mac80211/Kconfig net/mac802154/Kconfig +net/mctp/Kconfig net/mpls/Kconfig +net/mptcp/Kconfig net/ncsi/Kconfig net/netfilter/ipset/Kconfig net/netfilter/ipvs/Kconfig @@ -276,19 +276,24 @@ net/tipc/Kconfig net/tls/Kconfig net/unix/Kconfig net/vmw_vsock/Kconfig -net/wimax/Kconfig net/wireless/Kconfig net/x25/Kconfig net/xdp/Kconfig net/xfrm/Kconfig samples/Kconfig +samples/rust/Kconfig security/apparmor/Kconfig security/integrity/evm/Kconfig security/integrity/ima/Kconfig security/integrity/Kconfig security/Kconfig +security/Kconfig.hardening security/keys/Kconfig +security/keys/trusted-keys/Kconfig +security/landlock/Kconfig security/loadpin/Kconfig +security/lockdown/Kconfig +security/safesetid/Kconfig security/selinux/Kconfig security/smack/Kconfig security/tomoyo/Kconfig diff --git a/ktypes/developer/developer.cfg b/ktypes/developer/developer.cfg index 2111490e..e541f76a 100644 --- a/ktypes/developer/developer.cfg +++ b/ktypes/developer/developer.cfg @@ -16,7 +16,6 @@ # General setup # CONFIG_EXPERT=y -CONFIG_EMBEDDED=y CONFIG_DEBUG_KERNEL=y # diff --git a/ktypes/preempt-rt/preempt-rt.cfg b/ktypes/preempt-rt/preempt-rt.cfg index 193f6653..3c2f676e 100644 --- a/ktypes/preempt-rt/preempt-rt.cfg +++ b/ktypes/preempt-rt/preempt-rt.cfg @@ -21,7 +21,7 @@ # CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=n # # Resource Groups @@ -51,7 +51,7 @@ CONFIG_SLAB=y # # Processor type and features # -CONFIG_PREEMPT_RT_FULL=y +CONFIG_PREEMPT_RT=y # # Power management options @@ -107,7 +107,7 @@ CONFIG_NET_IPIP=m CONFIG_NET_IPGRE_DEMUX=m CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE_BROADCAST=y -CONFIG_INET_TUNNEL=m +CONFIG_INET_TUNNEL=y # # IP: Virtual Server Configuration @@ -157,7 +157,7 @@ CONFIG_SCTP_COOKIE_HMAC_MD5=y # CONFIG_TIPC=m -# CONFIG_ATM is not set +CONFIG_ATM=n CONFIG_BRIDGE=m CONFIG_VLAN_8021Q=m @@ -291,7 +291,6 @@ CONFIG_NET_PKTGEN=m # Parallel IDE protocol modules # CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_NBD=m # @@ -902,18 +901,16 @@ CONFIG_SOFT_WATCHDOG=m # # File systems # -# CONFIG_REISERFS_FS is not set -# CONFIG_REISERFS_CHECK is not set -CONFIG_REISERFS_FS_XATTR=y -CONFIG_REISERFS_FS_POSIX_ACL=y -# CONFIG_REISERFS_FS_SECURITY is not set -# CONFIG_JFS_FS is not set +CONFIG_REISERFS_FS=n +CONFIG_REISERFS_CHECK=n +CONFIG_REISERFS_FS_SECURITY=n +CONFIG_JFS_FS=n CONFIG_FS_POSIX_ACL=y -# CONFIG_OCFS2_FS is not set -# CONFIG_MINIX_FS is not set +CONFIG_OCFS2_FS=n +CONFIG_MINIX_FS=n CONFIG_ROMFS_FS=m -# CONFIG_QUOTA is not set -CONFIG_AUTOFS4_FS=y +CONFIG_QUOTA=n +CONFIG_AUTOFS_FS=y # # CD-ROM/DVD Filesystems @@ -942,11 +939,10 @@ CONFIG_CONFIGFS_FS=m # # Network File Systems # -CONFIG_CIFS=m -CONFIG_CIFS_XATTR=y +CONFIG_CIFS=m CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y -# CONFIG_CODA_FS is not set -# CONFIG_AFS_FS is not set +CONFIG_CODA_FS=n +CONFIG_AFS_FS=n # # Partition Types @@ -1074,33 +1070,33 @@ CONFIG_NLS_UTF8=m # Logging Options # CONFIG_SECURITY=y -# CONFIG_SECURITY_NETWORK is not set +CONFIG_SECURITY_NETWORK=n # # Cryptographic options # CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_NULL=y +CONFIG_CRYPTO_MD4=y CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_TEA=m CONFIG_CRYPTO_ARC4=m CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_TEST=m # @@ -1119,4 +1115,4 @@ CONFIG_CRYPTO_CTR=y # Library routines # CONFIG_LIBCRC32C=y -CONFIG_ZLIB_DEFLATE=m +CONFIG_ZLIB_DEFLATE=y diff --git a/ktypes/preempt-rt/preempt-rt.scc b/ktypes/preempt-rt/preempt-rt.scc index 9c5901d9..7ff7c0a8 100644 --- a/ktypes/preempt-rt/preempt-rt.scc +++ b/ktypes/preempt-rt/preempt-rt.scc @@ -4,11 +4,13 @@ branch preempt-rt # feature block include features/blktrace/blktrace.scc -include arch/arm/arm.scc nopatch include features/hrt/hrt.scc include features/ftrace/ftrace.scc +include arch/arm/arm.scc nopatch +include features/tmpfs/tmpfs-posix-acl.scc include features/cgroups/cgroups.scc include features/net_sched/net_sched.scc +include features/kprobes/kprobes.scc include features/fuse/fuse.scc include features/serial/8250.scc diff --git a/ktypes/standard/0001-qemux86-add-configuration-symbol-to-select-values.patch b/ktypes/standard/0001-qemux86-add-configuration-symbol-to-select-values.patch new file mode 100644 index 00000000..084ce9d6 --- /dev/null +++ b/ktypes/standard/0001-qemux86-add-configuration-symbol-to-select-values.patch @@ -0,0 +1,35 @@ +From 1c56f2a0d1ded83c334aa7a0406551815a16c5a4 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Mon, 22 Feb 2021 09:53:04 -0500 +Subject: [PATCH] qemux86: add configuration symbol to select values + +On 5.10+ we are seeing some MSI interrupt assignment errors. In +our emulated 32bit platform, we are lacking this support. To avoid +the warnings, we define our own platform and select the MSI arch +fallback, which handles the missing support. + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + arch/x86/Kconfig | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig +index 3a5ecb1039bf..061f9f5f1933 100644 +--- a/arch/x86/Kconfig ++++ b/arch/x86/Kconfig +@@ -483,6 +483,12 @@ config X86_CPU_RESCTRL + + Say N if unsure. + ++config QEMUX86 ++ bool "Enable for qemumx86 specific configurations" ++ default n ++ select PCI_MSI_ARCH_FALLBACKS if PCI_MSI ++ ++ + if X86_32 + config X86_BIGSMP + bool "Support for big SMP systems with more than 8 CPUs" +-- +2.19.1 + diff --git a/ktypes/standard/standard.cfg b/ktypes/standard/standard.cfg index a0bcc647..2cbeb759 100644 --- a/ktypes/standard/standard.cfg +++ b/ktypes/standard/standard.cfg @@ -21,7 +21,7 @@ # CONFIG_IKCONFIG=y CONFIG_IKCONFIG_PROC=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set +CONFIG_CC_OPTIMIZE_FOR_SIZE=n # # Resource Groups @@ -101,7 +101,7 @@ CONFIG_NET_IPIP=m CONFIG_NET_IPGRE_DEMUX=m CONFIG_NET_IPGRE=m CONFIG_NET_IPGRE_BROADCAST=y -CONFIG_INET_TUNNEL=m +CONFIG_INET_TUNNEL=y # # IP: Virtual Server Configuration @@ -151,7 +151,7 @@ CONFIG_SCTP_COOKIE_HMAC_MD5=y # CONFIG_TIPC=m -# CONFIG_ATM is not set +CONFIG_ATM=n CONFIG_BRIDGE=m CONFIG_VLAN_8021Q=m @@ -285,7 +285,6 @@ CONFIG_NET_PKTGEN=m # Parallel IDE protocol modules # CONFIG_BLK_DEV_LOOP=m -CONFIG_BLK_DEV_CRYPTOLOOP=m CONFIG_BLK_DEV_NBD=m # @@ -340,6 +339,7 @@ CONFIG_BLK_DEV_MD=y CONFIG_MD_LINEAR=y CONFIG_MD_RAID0=y CONFIG_MD_RAID1=y +CONFIG_MD_RAID456=y CONFIG_MD_RAID10=y CONFIG_MD_MULTIPATH=y CONFIG_MD_FAULTY=y @@ -896,18 +896,16 @@ CONFIG_SOFT_WATCHDOG=m # # File systems # -# CONFIG_REISERFS_FS is not set -# CONFIG_REISERFS_CHECK is not set -CONFIG_REISERFS_FS_XATTR=y -CONFIG_REISERFS_FS_POSIX_ACL=y -# CONFIG_REISERFS_FS_SECURITY is not set -# CONFIG_JFS_FS is not set +CONFIG_REISERFS_FS=n +CONFIG_REISERFS_CHECK=n +CONFIG_REISERFS_FS_SECURITY=n +CONFIG_JFS_FS=n CONFIG_FS_POSIX_ACL=y -# CONFIG_OCFS2_FS is not set -# CONFIG_MINIX_FS is not set +CONFIG_OCFS2_FS=n +CONFIG_MINIX_FS=n CONFIG_ROMFS_FS=m -# CONFIG_QUOTA is not set -CONFIG_AUTOFS4_FS=y +CONFIG_QUOTA=n +CONFIG_AUTOFS_FS=y # # CD-ROM/DVD Filesystems @@ -916,7 +914,7 @@ CONFIG_AUTOFS4_FS=y # # DOS/FAT/NT Filesystems # -CONFIG_FAT_FS=m +CONFIG_FAT_FS=y # # Pseudo filesystems @@ -934,11 +932,11 @@ CONFIG_CONFIGFS_FS=m # # Network File Systems # -CONFIG_CIFS=m +CONFIG_CIFS=y CONFIG_CIFS_XATTR=y CONFIG_CIFS_POSIX=y -# CONFIG_CODA_FS is not set -# CONFIG_AFS_FS is not set +CONFIG_CODA_FS=n +CONFIG_AFS_FS=n # # Partition Types @@ -1066,36 +1064,36 @@ CONFIG_NLS_UTF8=m # Logging Options # CONFIG_SECURITY=y -# CONFIG_SECURITY_NETWORK is not set +CONFIG_SECURITY_NETWORK=n # # Cryptographic options # CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_NULL=m -CONFIG_CRYPTO_MD4=m +CONFIG_CRYPTO_NULL=y +CONFIG_CRYPTO_MD4=y CONFIG_CRYPTO_MD5=y -CONFIG_CRYPTO_SHA1=m -CONFIG_CRYPTO_SHA256=m -CONFIG_CRYPTO_SHA512=m +CONFIG_CRYPTO_SHA1=y +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA512=y CONFIG_CRYPTO_WP512=m CONFIG_CRYPTO_DES=y CONFIG_CRYPTO_BLOWFISH=m CONFIG_CRYPTO_TWOFISH=m CONFIG_CRYPTO_SERPENT=m -CONFIG_CRYPTO_AES=m +CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_CAST5=m CONFIG_CRYPTO_CAST6=m CONFIG_CRYPTO_TEA=m -CONFIG_CRYPTO_ARC4=m +CONFIG_CRYPTO_ARC4=y CONFIG_CRYPTO_KHAZAD=m CONFIG_CRYPTO_ANUBIS=m -CONFIG_CRYPTO_DEFLATE=m +CONFIG_CRYPTO_DEFLATE=y CONFIG_CRYPTO_MICHAEL_MIC=m -CONFIG_CRYPTO_CRC32C=m +CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_TEST=m -CONFIG_CRYPTO_CCM=m -CONFIG_CRYPTO_GCM=m +CONFIG_CRYPTO_CCM=y +CONFIG_CRYPTO_GCM=y # # Layered filesystem encryption @@ -1113,6 +1111,7 @@ CONFIG_CRYPTO_CTR=y # Library routines # CONFIG_LIBCRC32C=y -CONFIG_ZLIB_DEFLATE=m +CONFIG_ZLIB_DEFLATE=y CONFIG_SHMEM=y + diff --git a/ktypes/standard/standard.scc b/ktypes/standard/standard.scc index 751cc4ff..63a3fb1e 100644 --- a/ktypes/standard/standard.scc +++ b/ktypes/standard/standard.scc @@ -76,12 +76,13 @@ include features/vdso/vdso.scc include features/fuse/fuse.scc include features/serial/8250.scc -include features/uptime/uptime.scc include features/ktest/ktest.scc include features/perf/perf.scc include features/input/input.scc include features/edac/edac.scc +include features/clear_warn_once/clear_warn_once.scc + include features/bfq.scc include backports/backports.scc @@ -102,3 +103,10 @@ include cfg/systemd.scc include features/rfkill/rfkill.scc include features/bpf/bpf.scc +include features/landlock/landlock.scc + +include features/kfence/kfence.scc + +include cfg/crypto-obsolete-disable.scc + +patch 0001-qemux86-add-configuration-symbol-to-select-values.patch diff --git a/ktypes/tiny/tiny.cfg b/ktypes/tiny/tiny.cfg index 4a7b23df..3dfeaa1a 100644 --- a/ktypes/tiny/tiny.cfg +++ b/ktypes/tiny/tiny.cfg @@ -3,7 +3,6 @@ # RCU Subsystem # CONFIG_EXPERT=y -CONFIG_EMBEDDED=y CONFIG_CC_OPTIMIZE_FOR_SIZE=y @@ -11,9 +10,6 @@ CONFIG_SLUB=y CONFIG_BASE_SMALL=1 -CONFIG_PHYSICAL_START=0x1000000 -CONFIG_PHYSICAL_ALIGN=0x1000000 - # -15% of bzImage size over gz CONFIG_KERNEL_LZMA=y @@ -31,3 +27,6 @@ CONFIG_BINFMT_SCRIPT=y # Support /proc/sys CONFIG_PROC_SYSCTL=y + +CONFIG_VT=y +CONFIG_POSIX_TIMERS=y diff --git a/ktypes/tiny/yocto.cfg b/ktypes/tiny/yocto.cfg index 2e51a7d7..e891070b 100644 --- a/ktypes/tiny/yocto.cfg +++ b/ktypes/tiny/yocto.cfg @@ -20,7 +20,6 @@ CONFIG_RT_MUTEXES=y # Basic logging facilities CONFIG_PRINTK=y -CONFIG_EARLY_PRINTK=y CONFIG_PRINTK_TIME=y # Provide a minimal dynamic device fs @@ -1 +1 @@ -v5.4-rc4 +v6.9-rc2 diff --git a/patches/boot/NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch b/patches/boot/NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch index 540c2a7a..f9ae028c 100644 --- a/patches/boot/NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch +++ b/patches/boot/NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch @@ -1,4 +1,4 @@ -From ae9f6294d685cda95203d5752bb1d0cd275bb59a Mon Sep 17 00:00:00 2001 +From 0c834c586066af4c804c38d23b9763d818105f64 Mon Sep 17 00:00:00 2001 From: Jason Wessel <jason.wessel@windriver.com> Date: Wed, 7 Jan 2009 00:59:33 -0500 Subject: [PATCH] NFS: allow nfs root mount to use alternate rpc ports @@ -12,13 +12,13 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> fs/nfs/client.c | 12 ++++++++++-- fs/nfs/internal.h | 7 +++++-- fs/nfs/mount_clnt.c | 7 ++++--- - fs/nfs/super.c | 34 +++++++++++++++++++++++++++++++++- + fs/nfs/fs_context.c | 34 +++++++++++++++++++++++++++++++++- include/linux/nfs_fs_sb.h | 2 ++ include/uapi/linux/nfs_mount.h | 4 +++- 6 files changed, 57 insertions(+), 9 deletions(-) diff --git a/fs/nfs/client.c b/fs/nfs/client.c -index 30838304a0bf..a0389dc885ea 100644 +index 02110a30a49e..a0f0a7d6208a 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -5,7 +5,6 @@ @@ -46,17 +46,17 @@ index 30838304a0bf..a0389dc885ea 100644 refcount_set(&clp->cl_count, 1); clp->cl_cons_state = NFS_CS_INITING; -@@ -312,6 +312,9 @@ static struct nfs_client *nfs_match_client(const struct nfs_client_initdata *dat - /* Match nfsv4 minorversion */ - if (clp->cl_minorversion != data->minorversion) +@@ -318,6 +318,9 @@ static struct nfs_client *nfs_match_client(const struct nfs_client_initdata *dat + test_bit(NFS_CS_DS, &clp->cl_flags)) continue; + + if (clp->nfs_prog != data->nfs_prog) + continue; + /* Match the full socket address */ if (!rpc_cmp_addr_port(sap, clap)) /* Match all xprt_switch full socket addresses */ -@@ -519,6 +522,10 @@ int nfs_create_rpc_client(struct nfs_client *clp, +@@ -529,6 +532,10 @@ int nfs_create_rpc_client(struct nfs_client *clp, if (!IS_ERR(clp->cl_rpcclient)) return 0; @@ -67,19 +67,19 @@ index 30838304a0bf..a0389dc885ea 100644 clnt = rpc_create(&args); if (IS_ERR(clnt)) { dprintk("%s: cannot create RPC client. Error = %ld\n", -@@ -662,6 +669,7 @@ static int nfs_init_server(struct nfs_server *server, - .timeparms = &timeparms, +@@ -673,6 +680,7 @@ static int nfs_init_server(struct nfs_server *server, .cred = server->cred, .nconnect = data->nfs_server.nconnect, + .init_flags = (1UL << NFS_CS_REUSEPORT), + .nfs_prog = data->nfs_prog, }; struct nfs_client *clp; int error; diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h -index a2346a2f8361..85fa99dd8441 100644 +index 24a65da58aa9..0961649ec4dc 100644 --- a/fs/nfs/internal.h +++ b/fs/nfs/internal.h -@@ -85,6 +85,7 @@ struct nfs_client_initdata { +@@ -77,6 +77,7 @@ struct nfs_client_initdata { struct net *net; const struct rpc_timeout *timeparms; const struct cred *cred; @@ -87,7 +87,7 @@ index a2346a2f8361..85fa99dd8441 100644 }; /* -@@ -96,6 +97,8 @@ struct nfs_parsed_mount_data { +@@ -88,6 +89,8 @@ struct nfs_parsed_mount_data { unsigned int timeo, retrans; unsigned int acregmin, acregmax, acdirmin, acdirmax; @@ -96,7 +96,7 @@ index a2346a2f8361..85fa99dd8441 100644 unsigned int namlen; unsigned int options; unsigned int bsize; -@@ -153,11 +156,11 @@ struct nfs_mount_info { +@@ -145,11 +148,11 @@ struct nfs_mount_info { struct nfs_fh *mntfh; }; @@ -149,10 +149,10 @@ index cb7c10e9721e..266da4cac411 100644 .name = "mount", .number = NFS_MNT_PROGRAM, .nrvers = ARRAY_SIZE(mnt_version), -diff --git a/fs/nfs/super.c b/fs/nfs/super.c -index 628631e2e34f..f05026a0c3da 100644 ---- a/fs/nfs/super.c -+++ b/fs/nfs/super.c +diff --git a/fs/nfs/fs_context.c b/fs/nfs/fs_context.c +index 8d8d04bb9d64..e09f468bcf18 100644 +--- a/fs/nfs/fs_context.c ++++ b/fs/nfs/fs_context.c @@ -105,6 +105,8 @@ enum { Opt_mountport, Opt_mountvers, @@ -234,7 +234,7 @@ index 628631e2e34f..f05026a0c3da 100644 if (nfs_parse_mount_options((char *)options, args) == 0) return -EINVAL; -@@ -2823,6 +2853,8 @@ static int nfs4_validate_mount_data(void *options, +@@ -2849,6 +2879,8 @@ static int nfs4_validate_mount_data(void *options, args->version = 4; @@ -244,10 +244,10 @@ index 628631e2e34f..f05026a0c3da 100644 case 1: if (data->host_addrlen > sizeof(args->nfs_server.address)) diff --git a/include/linux/nfs_fs_sb.h b/include/linux/nfs_fs_sb.h -index a87fe854f008..65749341e107 100644 +index c176f705bf98..4514af8b8d39 100644 --- a/include/linux/nfs_fs_sb.h +++ b/include/linux/nfs_fs_sb.h -@@ -60,6 +60,7 @@ struct nfs_client { +@@ -63,6 +63,7 @@ struct nfs_client { u32 cl_minorversion;/* NFSv4 minorversion */ unsigned int cl_nconnect; /* Number of connections */ const char * cl_principal; /* used for machine cred */ @@ -255,7 +255,7 @@ index a87fe854f008..65749341e107 100644 #if IS_ENABLED(CONFIG_NFS_V4) struct list_head cl_ds_clients; /* auth flavor data servers */ -@@ -82,6 +83,7 @@ struct nfs_client { +@@ -85,6 +86,7 @@ struct nfs_client { const char * cl_owner_id; u32 cl_cb_ident; /* v4.0 callback identifier */ diff --git a/patches/boot/boot.scc b/patches/boot/boot.scc index 3512a3a6..258b2119 100644 --- a/patches/boot/boot.scc +++ b/patches/boot/boot.scc @@ -1,5 +1,7 @@ # SPDX-License-Identifier: MIT -patch NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch + +# temporarily suspsended due to a v6.6 change +# patch NFS-allow-nfs-root-mount-to-use-alternate-rpc-ports.patch patch mount_root-clarify-error-messages-for-when-no-rootfs.patch patch check-console-device-file-on-fs-when-booting.patch patch nfs-Allow-default-io-size-to-be-configured.patch diff --git a/patches/boot/check-console-device-file-on-fs-when-booting.patch b/patches/boot/check-console-device-file-on-fs-when-booting.patch index 13ae92af..d1f3a339 100644 --- a/patches/boot/check-console-device-file-on-fs-when-booting.patch +++ b/patches/boot/check-console-device-file-on-fs-when-booting.patch @@ -1,4 +1,4 @@ -From 4ad8c12c9b21426166d55ef6e9e5aaad03df8c57 Mon Sep 17 00:00:00 2001 +From 2f9c3e4ee446d66e110973eb5bf9f4f00220f186 Mon Sep 17 00:00:00 2001 From: Bruce Ashfield <bruce.ashfield@windriver.com> Date: Thu, 8 Apr 2010 23:44:21 -0700 Subject: [PATCH] check console device file on fs when booting @@ -8,44 +8,44 @@ the tell tale signs is /dev/console not being a character file. To save a whole class of questions, let's just test for the condition and let the user know. +vfs_lstat() which was used previously would fail with certain +configurations. This was likely due to the involved functions being +marked __init at some point in the past. + Signed-off-by: Richard Laroque <rlarocqu@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +Signed-off-by: Sven Schwermer <sven.schwermer@disruptive-technologies.com> --- - init/main.c | 15 +++++++++++++++ - 1 file changed, 15 insertions(+) + init/main.c | 16 +++++++++++++++- + 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/init/main.c b/init/main.c -index 18f8f0140fa0..5b904bc78fa4 100644 +index 649d9e4201a8..4e6af76ca199 100644 --- a/init/main.c +++ b/init/main.c -@@ -1112,6 +1112,9 @@ static int __ref kernel_init(void *unused) - - static noinline void __init kernel_init_freeable(void) +@@ -1574,7 +1574,21 @@ static int __ref kernel_init(void *unused) + /* Open /dev/console, for stdin/stdout/stderr, this should never fail */ + void __init console_on_rootfs(void) { +- struct file *file = filp_open("/dev/console", O_RDWR, 0); ++ struct file *file; ++ +#ifndef CONFIG_BLK_DEV_INITRD -+ struct kstat console_stat; -+#endif - /* - * Wait until kthreadd is all set-up. - */ -@@ -1143,6 +1146,18 @@ static noinline void __init kernel_init_freeable(void) - - do_basic_setup(); - -+#ifndef CONFIG_BLK_DEV_INITRD -+ /* -+ * Use /dev/console to infer if the rootfs is setup properly. -+ * In case of initrd or initramfs /dev/console might be instantiated -+ * later by /init so don't do this check for CONFIG_BLK_DEV_INITRD -+ */ -+ if (vfs_lstat((char __user *) "/dev/console", (struct kstat __user *) &console_stat) -+ || !S_ISCHR(console_stat.mode)) { ++ /* ++ * Use /dev/console to infer if the rootfs is setup properly. ++ * In case of initrd or initramfs /dev/console might be instantiated ++ * later by /init so don't do this check for CONFIG_BLK_DEV_INITRD ++ */ ++ struct kstat stat; ++ if (init_stat("/dev/console", &stat, 0) || !S_ISCHR(stat.mode)) { + panic("/dev/console is missing or not a character device!\nPlease ensure your rootfs is properly configured\n"); + } +#endif + - /* Open the /dev/console on the rootfs, this should never fail */ - if (ksys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0) ++ file = filp_open("/dev/console", O_RDWR, 0); + + if (IS_ERR(file)) { pr_err("Warning: unable to open an initial console.\n"); -- 2.19.1 diff --git a/patches/boot/mount_root-clarify-error-messages-for-when-no-rootfs.patch b/patches/boot/mount_root-clarify-error-messages-for-when-no-rootfs.patch index 64809d68..286993ea 100644 --- a/patches/boot/mount_root-clarify-error-messages-for-when-no-rootfs.patch +++ b/patches/boot/mount_root-clarify-error-messages-for-when-no-rootfs.patch @@ -1,4 +1,4 @@ -From 02b8e9894174f57d64db04d3cf190415abc0ea43 Mon Sep 17 00:00:00 2001 +From ca14e0ea8ac29797e9eedfda5456b818a83626e8 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker <paul.gortmaker@windriver.com> Date: Thu, 26 Nov 2009 07:32:09 -0800 Subject: [PATCH] mount_root: clarify error messages for when no rootfs found @@ -20,33 +20,36 @@ any background that it is an end user configuration issue. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> Signed-off-by: Darren Hart <dvhart@linux.intel.com> +--- + init/do_mounts.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/init/do_mounts.c b/init/do_mounts.c -index dea5de95c2dd..8b35204910be 100644 +index 5fdef94f0864..73d5b89d0c24 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c -@@ -418,7 +418,9 @@ retry: - printk("DEBUG_BLOCK_EXT_DEVT is enabled, you need to specify " - "explicit textual name for \"root=\" boot option.\n"); - #endif +@@ -231,7 +231,9 @@ void __init mount_root_generic(char *name, char *pretty_name, int flags) + pr_err("\n"); + } + - panic("VFS: Unable to mount root fs on %s", b); + printk(KERN_EMERG "VFS: Unable to mount root fs on %s\n", b); + printk(KERN_EMERG "User configuration error - no valid root filesystem found\n"); + panic("Invalid configuration from end user prevents continuing"); } - if (!(flags & MS_RDONLY)) { - flags |= MS_RDONLY; -@@ -434,7 +436,9 @@ retry: - #ifdef CONFIG_BLOCK - __bdevname(ROOT_DEV, b); - #endif -- panic("VFS: Unable to mount root fs on %s", b); -+ printk(KERN_EMERG "VFS: Unable to mount root fs on %s\n", b); + if (!(flags & SB_RDONLY)) { + flags |= SB_RDONLY; +@@ -244,7 +246,9 @@ void __init mount_root_generic(char *name, char *pretty_name, int flags) + for (i = 0, p = fs_names; i < num_fs; i++, p += strlen(p)+1) + printk(" %s", p); + printk("\n"); +- panic("VFS: Unable to mount root fs on \"%s\" or %s", pretty_name, b); ++ printk(KERN_EMERG "VFS: Unable to mount root fs on \"%s\" or %s\n", pretty_name, b); + printk(KERN_EMERG "User configuration error - no valid root filesystem found\n"); + panic("Invalid configuration from end user prevents continuing"); out: put_page(page); } -- -2.10.1 +2.34.1 diff --git a/patches/build/build.scc b/patches/build/build.scc index 181da38c..367c0cc2 100644 --- a/patches/build/build.scc +++ b/patches/build/build.scc @@ -8,3 +8,7 @@ patch kbuild-exclude-meta-directory-from-distclean-processi.patch patch modpost-mask-trivial-warnings.patch patch menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch + +# solved in 6.x by removing the need for ASM_GOTO as an arch dependency +#patch init-Kconfig-fix-CC_HAS_ASM_GOTO_TIED_OUTPUT-test-wi.patch +patch mconf-fix-output-of-cflags-and-libraries.patch diff --git a/patches/build/init-Kconfig-fix-CC_HAS_ASM_GOTO_TIED_OUTPUT-test-wi.patch b/patches/build/init-Kconfig-fix-CC_HAS_ASM_GOTO_TIED_OUTPUT-test-wi.patch new file mode 100644 index 00000000..13bfce6d --- /dev/null +++ b/patches/build/init-Kconfig-fix-CC_HAS_ASM_GOTO_TIED_OUTPUT-test-wi.patch @@ -0,0 +1,103 @@ +From e0e977e1b098d96389f2ab657849456ded9189c9 Mon Sep 17 00:00:00 2001 +From: Alexandre Belloni <alexandre.belloni@bootlin.com> +Date: Thu, 4 Aug 2022 21:03:20 +0200 +Subject: [PATCH] init/Kconfig: fix CC_HAS_ASM_GOTO_TIED_OUTPUT test with dash +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When using dash as /bin/sh, the CC_HAS_ASM_GOTO_TIED_OUTPUT test fails +with a syntax error which is not the one we are looking for: + +<stdin>: In function ‘foo’: +<stdin>:1:29: warning: missing terminating " character +<stdin>:1:29: error: missing terminating " character +<stdin>:2:5: error: expected ‘:’ before ‘+’ token +<stdin>:2:7: warning: missing terminating " character +<stdin>:2:7: error: missing terminating " character +<stdin>:2:5: error: expected declaration or statement at end of input + +Move all the CC_HAS_ASM_GOTO tests to scripts/gcc-goto.sh to solve the +escaping issues. + +Fixes: 1aa0e8b144b6 ("Kconfig: Add option for asm goto w/ tied outputs to workaround clang-13 bug") +Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + init/Kconfig | 6 +++--- + scripts/gcc-goto.sh | 31 +++++++++++++++++++++++++++++++ + 2 files changed, 34 insertions(+), 3 deletions(-) + +diff --git a/init/Kconfig b/init/Kconfig +index c7900e8975f1..80b252ba58b0 100644 +--- a/init/Kconfig ++++ b/init/Kconfig +@@ -71,16 +71,16 @@ config CC_CAN_LINK_STATIC + default $(success,$(srctree)/scripts/cc-can-link.sh $(CC) $(CLANG_FLAGS) $(USERCFLAGS) $(USERLDFLAGS) $(m32-flag) -static) + + config CC_HAS_ASM_GOTO +- def_bool $(success,$(srctree)/scripts/gcc-goto.sh $(CC)) ++ def_bool $(success,$(srctree)/scripts/gcc-goto.sh goto $(CC)) + + config CC_HAS_ASM_GOTO_OUTPUT + depends on CC_HAS_ASM_GOTO +- def_bool $(success,echo 'int foo(int x) { asm goto ("": "=r"(x) ::: bar); return x; bar: return 0; }' | $(CC) -x c - -c -o /dev/null) ++ def_bool $(success,$(srctree)/scripts/gcc-goto.sh goto_output $(CC)) + + config CC_HAS_ASM_GOTO_TIED_OUTPUT + depends on CC_HAS_ASM_GOTO_OUTPUT + # Detect buggy gcc and clang, fixed in gcc-11 clang-14. +- def_bool $(success,echo 'int foo(int *x) { asm goto (".long (%l[bar]) - .\n": "+m"(*x) ::: bar); return *x; bar: return 0; }' | $CC -x c - -c -o /dev/null) ++ def_bool $(success,$(srctree)/scripts/gcc-goto.sh goto_tied_output $(CC)) + + config TOOLS_SUPPORT_RELR + def_bool $(success,env "CC=$(CC)" "LD=$(LD)" "NM=$(NM)" "OBJCOPY=$(OBJCOPY)" $(srctree)/scripts/tools-support-relr.sh) +diff --git a/scripts/gcc-goto.sh b/scripts/gcc-goto.sh +index 8b980fb2270a..aa9498b74df8 100755 +--- a/scripts/gcc-goto.sh ++++ b/scripts/gcc-goto.sh +@@ -3,6 +3,11 @@ + # Test for gcc 'asm goto' support + # Copyright (C) 2010, Jason Baron <jbaron@redhat.com> + ++TEST=$1 ++shift ++ ++case $TEST in ++ "goto") + cat << "END" | $@ -x c - -fno-PIE -c -o /dev/null + int main(void) + { +@@ -20,3 +25,29 @@ entry: + return 0; + } + END ++ ;; ++ ++ "goto_output") ++cat << "END" | $@ -x c - -c -o /dev/null ++int foo(int x) { ++ asm goto ("": "=r"(x) ::: bar); ++ return x; ++ bar: return 0; ++} ++END ++ ;; ++ ++ "goto_tied_output") ++cat << "END" | $@ -x c - -c -o /dev/null ++int foo(int *x) { ++ asm goto (".long (%l[bar]) - .\n": "+m"(*x) ::: bar); ++ return *x; ++ bar: return 0; ++} ++END ++ ;; ++ ++ *) ++ exit -1 ++ ;; ++esac +-- +2.19.1 + diff --git a/patches/build/mconf-fix-output-of-cflags-and-libraries.patch b/patches/build/mconf-fix-output-of-cflags-and-libraries.patch new file mode 100644 index 00000000..565f51dd --- /dev/null +++ b/patches/build/mconf-fix-output-of-cflags-and-libraries.patch @@ -0,0 +1,38 @@ +From dee78ad1963cff9c063fba486d43fc9670285883 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Mon, 17 Jul 2023 17:17:55 -0400 +Subject: [PATCH] mconf: fix output of cflags and libraries + +commit 3122c84409d578a5df8bcb1 [kconfig: refactor Makefile to reduce +process forks] changes the way that flags are detected. They are +no longer just echo'd and captured, they are written to a file and +later read. + +We adjust our CROSS ncurses patch accordingly. + +We'll eventually be able to drop this patch, but not quite yet. + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + scripts/kconfig/mconf-cfg.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh +index 38cf8304bb31..a5ae56e08b07 100755 +--- a/scripts/kconfig/mconf-cfg.sh ++++ b/scripts/kconfig/mconf-cfg.sh +@@ -8,9 +8,9 @@ PKG="ncursesw" + PKG2="ncurses" + + if [ "$CROSS_CURSES_LIB" != "" ]; then +- echo libs=\'$CROSS_CURSES_LIB\' ++ echo $CROSS_CURSES_LIB > ${libs} + if [ x"$CROSS_CURSES_INC" != x ]; then +- echo cflags=\'$CROSS_CURSES_INC\' ++ echo $CROSS_CURSES_INC > ${cflags} + fi + exit 0 + fi +-- +2.34.1 + diff --git a/patches/build/menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch b/patches/build/menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch index dde1554d..9a301b63 100644 --- a/patches/build/menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch +++ b/patches/build/menuconfig-mconf-cfg-Allow-specification-of-ncurses-.patch @@ -1,4 +1,4 @@ -From b50cad575d2b9d3f8fc0b01e83a5c7fd3cddb684 Mon Sep 17 00:00:00 2001 +From 660178adc3529a6cb06bd0bfdfd22c5cb24cee5c Mon Sep 17 00:00:00 2001 From: Bruce Ashfield <bruce.ashfield@windriver.com> Date: Mon, 2 Jul 2018 23:10:28 -0400 Subject: [PATCH] menuconfig,mconf-cfg: Allow specification of ncurses location @@ -26,9 +26,7 @@ Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> mode change 100755 => 100644 scripts/kconfig/mconf-cfg.sh diff --git a/scripts/kconfig/mconf-cfg.sh b/scripts/kconfig/mconf-cfg.sh -old mode 100755 -new mode 100644 -index c812872d7f9d..65a9b9e5b8a6 +index 025b565e0b7c..a3c59b360ca3 --- a/scripts/kconfig/mconf-cfg.sh +++ b/scripts/kconfig/mconf-cfg.sh @@ -4,6 +4,14 @@ @@ -43,9 +41,9 @@ index c812872d7f9d..65a9b9e5b8a6 + exit 0 +fi + - if [ -n "$(command -v pkg-config)" ]; then - if pkg-config --exists $PKG; then - echo cflags=\"$(pkg-config --cflags $PKG)\" + if [ -n "$(command -v ${HOSTPKG_CONFIG})" ]; then + if ${HOSTPKG_CONFIG} --exists $PKG; then + echo cflags=\"$(${HOSTPKG_CONFIG} --cflags $PKG)\" -- -2.5.0 +2.19.1 diff --git a/patches/build/modpost-mask-trivial-warnings.patch b/patches/build/modpost-mask-trivial-warnings.patch index 57d2a873..1b202f5d 100644 --- a/patches/build/modpost-mask-trivial-warnings.patch +++ b/patches/build/modpost-mask-trivial-warnings.patch @@ -1,4 +1,4 @@ -From bd48931bc142bdd104668f3a062a1f22600aae61 Mon Sep 17 00:00:00 2001 +From 14ad0a1925fad537a485227a5d89eb4329975e97 Mon Sep 17 00:00:00 2001 From: Paul Gortmaker <paul.gortmaker@windriver.com> Date: Sun, 25 Jan 2009 17:58:09 -0500 Subject: [PATCH] modpost: mask trivial warnings @@ -10,38 +10,32 @@ assign values so we aren't overwhelmed with these warnings once the kernel build kicks off. Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> +--- + scripts/mod/modpost.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index 48958d3cec9e..5911b2d18500 100644 +index 620dc8c4c814..618c4a9e83ed 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c -@@ -1929,7 +1929,7 @@ static void read_symbols(char *modname) - char *version; +@@ -1964,7 +1964,7 @@ static void read_symbols(const char *modname) char *license; + char *namespace; struct module *mod; - struct elf_info info = { }; + struct elf_info info = { .hdr = NULL }; Elf_Sym *sym; if (!parse_elf(&info, modname)) -@@ -2355,7 +2355,7 @@ static int dump_sym(struct symbol *sym) +@@ -2455,7 +2455,7 @@ static void read_dump(const char *fname) static void write_dump(const char *fname) { - struct buffer buf = { }; + struct buffer buf = { NULL, 0, 0 }; - struct symbol *symbol; - int n; - -@@ -2381,7 +2381,7 @@ struct ext_sym_list { - int main(int argc, char **argv) - { struct module *mod; -- struct buffer buf = { }; -+ struct buffer buf = { NULL, 0, 0 }; - char *kernel_read = NULL, *module_read = NULL; - char *dump_write = NULL, *files_source = NULL; - int opt; + struct symbol *sym; + -- -2.10.1 +2.19.1 diff --git a/patches/drivers/drivers.scc b/patches/drivers/drivers.scc index 548d2d44..4d7a225e 100644 --- a/patches/drivers/drivers.scc +++ b/patches/drivers/drivers.scc @@ -1 +1,2 @@ # SPDX-License-Identifier: MIT +patch mtd_blkdevs-add-mtd_table_mutex-lock-back-to-blktran.patch diff --git a/patches/drivers/mtd_blkdevs-add-mtd_table_mutex-lock-back-to-blktran.patch b/patches/drivers/mtd_blkdevs-add-mtd_table_mutex-lock-back-to-blktran.patch new file mode 100644 index 00000000..6d36effb --- /dev/null +++ b/patches/drivers/mtd_blkdevs-add-mtd_table_mutex-lock-back-to-blktran.patch @@ -0,0 +1,89 @@ +From 30350f237490eb52050647b2a75f6f4e91b2e44d Mon Sep 17 00:00:00 2001 +From: LiweiSong <liwei.song@windriver.com> +Date: Wed, 31 May 2023 17:31:35 +0800 +Subject: [PATCH] mtd_blkdevs: add mtd_table_mutex lock back to blktrans_{open, + release} to avoid race condition + +without lock mtd_table_mutex in blktrans_{open, release}, there will +be a race condition when access devices /dev/mtd1 and /dev/mtdblock1 +at the same time with a high frequency open and close test: + +kernel BUG at drivers/mtd/mtdcore.c:1221! +Internal error: Oops - BUG: 0 1 PREEMPT_RT SMP +CPU: 0 PID: 15349 Comm: mtd-test Not tainted 5.15.52-rt41-yocto-preempt-rt #1 +Hardware name: SoCFPGA Stratix 10 SoCDK (DT) +pstate: 60000005put_mtd_device+0x4c/0x84 +lr : blktrans_release+0xb0/0x120 +Call trace: +__put_mtd_device+0x4c/0x84 +blktrans_release+0xb0/0x120 +blkdev_put+0xd4/0x210 +blkdev_close+0x34/0x50 +__fput+0x8c/0x240 +____fput+0x1c/0x30 +task_work_run+0x98/00t_64_sync_handler+0xa4/0x130 +el0t_64_sync+0x1a0/0x1a4 + +since the original purpose of commit 799ae31c58ae ("mtd_blkdevs: +don't hold del_mtd_blktrans_dev in blktrans_{open, release}") is +to fix a DEADLOCK issue, here convert mutex_lock to mutex_trylock +and return immediately if failed acquire mtd_table_mutex, then +both race condition and DEADLOCK can be avoided. + +Fixes: 799ae31c58ae ("mtd_blkdevs: don't hold del_mtd_blktrans_dev in blktrans_{open, release}") +Signed-off-by: Liwei Song <liwei.song@windriver.com> +Signed-off-by: He Zhe <zhe.he@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + drivers/mtd/mtd_blkdevs.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/drivers/mtd/mtd_blkdevs.c b/drivers/mtd/mtd_blkdevs.c +index 60b222799871..31967ff4b826 100644 +--- a/drivers/mtd/mtd_blkdevs.c ++++ b/drivers/mtd/mtd_blkdevs.c +@@ -189,6 +189,8 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode) + + kref_get(&dev->ref); + ++ if (!mutex_trylock(&mtd_table_mutex)) ++ return ret; + mutex_lock(&dev->lock); + + if (dev->open) +@@ -213,6 +215,7 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode) + unlock: + dev->open++; + mutex_unlock(&dev->lock); ++ mutex_unlock(&mtd_table_mutex); + return ret; + + error_release: +@@ -221,6 +224,7 @@ static int blktrans_open(struct block_device *bdev, fmode_t mode) + error_put: + module_put(dev->tr->owner); + mutex_unlock(&dev->lock); ++ mutex_unlock(&mtd_table_mutex); + blktrans_dev_put(dev); + return ret; + } +@@ -229,6 +233,8 @@ static void blktrans_release(struct gendisk *disk, fmode_t mode) + { + struct mtd_blktrans_dev *dev = disk->private_data; + ++ if (!mutex_trylock(&mtd_table_mutex)) ++ return; + mutex_lock(&dev->lock); + + if (--dev->open) +@@ -243,6 +249,7 @@ static void blktrans_release(struct gendisk *disk, fmode_t mode) + } + unlock: + mutex_unlock(&dev->lock); ++ mutex_unlock(&mtd_table_mutex); + blktrans_dev_put(dev); + } + +-- +2.34.1 + diff --git a/patches/misc/arm64-perf-Fix-wrong-cast-that-may-cause-wrong-trunc.patch b/patches/misc/arm64-perf-Fix-wrong-cast-that-may-cause-wrong-trunc.patch new file mode 100644 index 00000000..e310275c --- /dev/null +++ b/patches/misc/arm64-perf-Fix-wrong-cast-that-may-cause-wrong-trunc.patch @@ -0,0 +1,43 @@ +From 7fcb1380d3fa751a1559a2632a23ebf23f404077 Mon Sep 17 00:00:00 2001 +From: He Zhe <zhe.he@windriver.com> +Date: Fri, 21 Aug 2020 00:52:50 +0800 +Subject: [PATCH] arm64/perf: Fix wrong cast that may cause wrong truncation + +tail is a pointer while buftail.fp is a u32. + +arch/arm64/kernel/perf_callchain.c:100:6: warning: cast from pointer to +integer of different size [-Wpointer-to-int-cast] + 100 | if ((u32)tail + 4 >= buftail.fp) + | ^ +arch/arm64/kernel/perf_callchain.c:103:9: warning: cast to pointer from +integer of different size [-Wint-to-pointer-cast]{noformat} + 103 | return (struct compat_frame_tail __user *)(buftail.fp - 4); + | ^ + +Fixes: 8818670c17d2 ("arm64/perf: fix backtrace for AAPCS with FP enabled") +Signed-off-by: He Zhe <zhe.he@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + arch/arm64/kernel/perf_callchain.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/arch/arm64/kernel/perf_callchain.c b/arch/arm64/kernel/perf_callchain.c +index 1be96e3631ea..a4b0864c4e32 100644 +--- a/arch/arm64/kernel/perf_callchain.c ++++ b/arch/arm64/kernel/perf_callchain.c +@@ -97,10 +97,10 @@ compat_user_backtrace(struct compat_frame_tail __user *tail, + * Frame pointers should strictly progress back up the stack + * (towards higher addresses). + */ +- if ((u32)tail + 4 >= buftail.fp) ++ if ((u64)tail + 4 >= (u64)buftail.fp) + return NULL; + +- return (struct compat_frame_tail __user *)(buftail.fp - 4); ++ return (struct compat_frame_tail __user *)((u64)buftail.fp - 4); + } + #endif /* CONFIG_COMPAT */ + +-- +2.19.1 + diff --git a/patches/misc/arm64-perf-fix-backtrace-for-AAPCS-with-FP-enabled.patch b/patches/misc/arm64-perf-fix-backtrace-for-AAPCS-with-FP-enabled.patch new file mode 100644 index 00000000..4c1e78cf --- /dev/null +++ b/patches/misc/arm64-perf-fix-backtrace-for-AAPCS-with-FP-enabled.patch @@ -0,0 +1,93 @@ +From cbbce37ccc6041d3ae3d3cb3b1918a61a39820a0 Mon Sep 17 00:00:00 2001 +From: Fang Jia <fang.jia@windriver.com> +Date: Fri, 28 Dec 2018 16:28:34 +0800 +Subject: [PATCH] arm64/perf: fix backtrace for AAPCS with FP enabled + +This change is for arm64 platform compat mode. +The change for arm32 platform has been included in this commit "perf: fix +backtrace for AAPCS with FP enabled". + +This change replaces code designed for the obsolete ARM APCS ABI, which +causes failures of the perf backtrace logic unless the gcc option +-mapcs-frame is used to build all binaries on the platform. This +obsolete gcc option forces the compiler to include the stack pointer +along with the frame pointer and link register in the stack frame +for each funciton call. The current AAPCS ABI document, doesn't +explicitly describe the frame structure when the gcc frame pointer +option, -fno-omit-frame-pointer, is enabled. However, with this option +enabled, examination of the emitted prologue instructions shows that +1) R11 is used as the frame pointer, +2) only the R11 and LR are saved onto the stack, not the stack pointer, +3) after this prologue setup, the frame pointer, R11 points to the +saved location of LR on the stack. + +The use of unsigned int arithmetic in the commit is required since +the gcc emitted pointer arithmetic uses 8-byte pointer sizes, which are +incorrect addresses for the 4-byte stack address size. + +Signed-off-by: Fang Jia <fang.jia@windriver.com> +Reviewed-by: Jiwei Sun <jiwei.sun@windriver.com> +Signed-off-by: De Huo <de.huo@windriver.com> +--- + arch/arm64/kernel/perf_callchain.c | 25 +++++++++++++++---------- + 1 file changed, 15 insertions(+), 10 deletions(-) + +diff --git a/arch/arm64/kernel/perf_callchain.c b/arch/arm64/kernel/perf_callchain.c +index 9d63514b9836..b9bbe0b04fc1 100644 +--- a/arch/arm64/kernel/perf_callchain.c ++++ b/arch/arm64/kernel/perf_callchain.c +@@ -54,16 +54,22 @@ user_backtrace(struct frame_tail __user *tail, + + #ifdef CONFIG_COMPAT + /* +- * The registers we're interested in are at the end of the variable +- * length saved register structure. The fp points at the end of this +- * structure so the address of this struct is: +- * (struct compat_frame_tail *)(xxx->fp)-1 ++ * The AAPCS ABI, the most current replacing the obsolete APCS ABI, ++ * does not specifically describe the stack frame with respect to the ++ * frame pointer. However, the examination of emitted prologue ++ * instructions for ARM implies that with -fno-omit-framepointer, ++ * register R11 is used as the frame pointer register and saved on the ++ * stack, with LR. + * +- * This code has been adapted from the ARM OProfile support. ++ * After the prolog, the FP points to the location of the saved LR and ++ * FP+4 points to the previous frames FP as shown below: ++ * Stack Hi Mem ++ * (Value of FP)+4 Saved FP for caller ++ * (Value of FP) LR set by caller ++ * Stack Lo Mem + */ + struct compat_frame_tail { + compat_uptr_t fp; /* a (struct compat_frame_tail *) in compat mode */ +- u32 sp; + u32 lr; + } __attribute__((packed)); + +@@ -91,11 +97,10 @@ compat_user_backtrace(struct compat_frame_tail __user *tail, + * Frame pointers should strictly progress back up the stack + * (towards higher addresses). + */ +- if (tail + 1 >= (struct compat_frame_tail __user *) +- compat_ptr(buftail.fp)) ++ if ((u32)tail + 4 >= buftail.fp) + return NULL; + +- return (struct compat_frame_tail __user *)compat_ptr(buftail.fp) - 1; ++ return (struct compat_frame_tail __user *)(buftail.fp - 4); + } + #endif /* CONFIG_COMPAT */ + +@@ -123,7 +128,7 @@ void perf_callchain_user(struct perf_callchain_entry_ctx *entry, + /* AARCH32 compat mode */ + struct compat_frame_tail __user *tail; + +- tail = (struct compat_frame_tail __user *)regs->compat_fp - 1; ++ tail = (struct compat_frame_tail __user *)(regs->compat_fp - 4); + + while ((entry->nr < entry->max_stack) && + tail && !((unsigned long)tail & 0x3)) +-- +2.17.1 + diff --git a/patches/misc/defconfigs-drop-obselete-options.patch b/patches/misc/defconfigs-drop-obselete-options.patch new file mode 100644 index 00000000..9005ff6f --- /dev/null +++ b/patches/misc/defconfigs-drop-obselete-options.patch @@ -0,0 +1,137 @@ +From 681badc58988e7d15aaf4b4b239b352b1601c3c2 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Mon, 10 Aug 2020 22:40:22 -0400 +Subject: [PATCH] defconfigs: drop obselete options + +Remove the following options from the various defconfigs, since +they are no longer valid, and will be reported as such by the +tools: + + CONFIG_TYPEC_HD3SS3220 + CONFIG_MFD_CROS_EC_CHARDEV + CONFIG_MTD_M25P80 + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + arch/arm/configs/axm55xx_defconfig | 1 - + arch/arm/configs/davinci_all_defconfig | 1 - + arch/arm/configs/dove_defconfig | 1 - + arch/arm/configs/keystone_defconfig | 1 - + arch/arm/configs/mvebu_v5_defconfig | 1 - + arch/arm/configs/mxs_defconfig | 1 - + arch/arm/configs/pxa_defconfig | 1 - + arch/arm/configs/qcom_defconfig | 1 - + arch/arm/configs/socfpga_defconfig | 1 - + 9 files changed, 9 deletions(-) + +diff --git a/arch/arm/configs/axm55xx_defconfig b/arch/arm/configs/axm55xx_defconfig +index 46075216ee6d..c731d4ade857 100644 +--- a/arch/arm/configs/axm55xx_defconfig ++++ b/arch/arm/configs/axm55xx_defconfig +@@ -88,7 +88,6 @@ CONFIG_MTD_CFI_AMDSTD=y + CONFIG_MTD_CFI_STAA=y + CONFIG_MTD_PHYSMAP=y + CONFIG_MTD_PHYSMAP_OF=y +-CONFIG_MTD_M25P80=y + CONFIG_PROC_DEVICETREE=y + CONFIG_BLK_DEV_LOOP=y + CONFIG_BLK_DEV_RAM=y +diff --git a/arch/arm/configs/davinci_all_defconfig b/arch/arm/configs/davinci_all_defconfig +index e849367c0566..4d8f6f647dc6 100644 +--- a/arch/arm/configs/davinci_all_defconfig ++++ b/arch/arm/configs/davinci_all_defconfig +@@ -75,7 +75,6 @@ CONFIG_MTD_CFI=m + CONFIG_MTD_CFI_INTELEXT=m + CONFIG_MTD_CFI_AMDSTD=m + CONFIG_MTD_PHYSMAP=m +-CONFIG_MTD_M25P80=m + CONFIG_MTD_RAW_NAND=m + CONFIG_MTD_NAND_DAVINCI=m + CONFIG_MTD_SPI_NOR=m +diff --git a/arch/arm/configs/dove_defconfig b/arch/arm/configs/dove_defconfig +index 33074fdab2ea..7a548296ea8c 100644 +--- a/arch/arm/configs/dove_defconfig ++++ b/arch/arm/configs/dove_defconfig +@@ -44,7 +44,6 @@ CONFIG_MTD_CFI_GEOMETRY=y + CONFIG_MTD_CFI_INTELEXT=y + CONFIG_MTD_CFI_STAA=y + CONFIG_MTD_PHYSMAP=y +-CONFIG_MTD_M25P80=y + CONFIG_MTD_SPI_NOR=y + CONFIG_BLK_DEV_LOOP=y + CONFIG_BLK_DEV_RAM=y +diff --git a/arch/arm/configs/keystone_defconfig b/arch/arm/configs/keystone_defconfig +index 33c917df7b32..081cd5fa2358 100644 +--- a/arch/arm/configs/keystone_defconfig ++++ b/arch/arm/configs/keystone_defconfig +@@ -120,7 +120,6 @@ CONFIG_MTD=y + CONFIG_MTD_CMDLINE_PARTS=y + CONFIG_MTD_BLOCK=y + CONFIG_MTD_PLATRAM=y +-CONFIG_MTD_M25P80=y + CONFIG_MTD_RAW_NAND=y + CONFIG_MTD_NAND_DAVINCI=y + CONFIG_MTD_SPI_NOR=y +diff --git a/arch/arm/configs/mvebu_v5_defconfig b/arch/arm/configs/mvebu_v5_defconfig +index d57ff30dabff..3feef3fbc918 100644 +--- a/arch/arm/configs/mvebu_v5_defconfig ++++ b/arch/arm/configs/mvebu_v5_defconfig +@@ -74,7 +74,6 @@ CONFIG_MTD_CFI_GEOMETRY=y + CONFIG_MTD_CFI_INTELEXT=y + CONFIG_MTD_CFI_STAA=y + CONFIG_MTD_PHYSMAP=y +-CONFIG_MTD_M25P80=y + CONFIG_MTD_RAW_NAND=y + CONFIG_MTD_NAND_ORION=y + CONFIG_MTD_SPI_NOR=y +diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig +index ca32446b187f..bd87306385ad 100644 +--- a/arch/arm/configs/mxs_defconfig ++++ b/arch/arm/configs/mxs_defconfig +@@ -46,7 +46,6 @@ CONFIG_MTD=y + CONFIG_MTD_CMDLINE_PARTS=y + CONFIG_MTD_BLOCK=y + CONFIG_MTD_DATAFLASH=y +-CONFIG_MTD_M25P80=y + CONFIG_MTD_SST25L=y + CONFIG_MTD_RAW_NAND=y + CONFIG_MTD_NAND_GPMI_NAND=y +diff --git a/arch/arm/configs/pxa_defconfig b/arch/arm/configs/pxa_defconfig +index 58f4834289e6..87bbad9b3055 100644 +--- a/arch/arm/configs/pxa_defconfig ++++ b/arch/arm/configs/pxa_defconfig +@@ -178,7 +178,6 @@ CONFIG_MTD_RAM=m + CONFIG_MTD_ROM=m + CONFIG_MTD_COMPLEX_MAPPINGS=y + CONFIG_MTD_PXA2XX=m +-CONFIG_MTD_M25P80=m + CONFIG_MTD_BLOCK2MTD=y + CONFIG_MTD_DOCG3=m + CONFIG_MTD_RAW_NAND=m +diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig +index 0daa9c0d298e..f03cf1f465fb 100644 +--- a/arch/arm/configs/qcom_defconfig ++++ b/arch/arm/configs/qcom_defconfig +@@ -61,7 +61,6 @@ CONFIG_DEVTMPFS=y + CONFIG_DEVTMPFS_MOUNT=y + CONFIG_MTD=y + CONFIG_MTD_BLOCK=y +-CONFIG_MTD_M25P80=y + CONFIG_MTD_RAW_NAND=y + CONFIG_MTD_NAND_QCOM=y + CONFIG_MTD_SPI_NOR=y +diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig +index 2d9404ea52c6..f7ae6f5867ed 100644 +--- a/arch/arm/configs/socfpga_defconfig ++++ b/arch/arm/configs/socfpga_defconfig +@@ -47,7 +47,6 @@ CONFIG_DEVTMPFS=y + CONFIG_DEVTMPFS_MOUNT=y + CONFIG_MTD=y + CONFIG_MTD_BLOCK=y +-CONFIG_MTD_M25P80=y + CONFIG_MTD_RAW_NAND=y + CONFIG_MTD_NAND_DENALI_DT=y + CONFIG_MTD_SPI_NOR=y +-- +2.19.1 + diff --git a/patches/misc/iwlwifi-select-MAC80211_LEDS-conditionally.patch b/patches/misc/iwlwifi-select-MAC80211_LEDS-conditionally.patch new file mode 100644 index 00000000..2db53044 --- /dev/null +++ b/patches/misc/iwlwifi-select-MAC80211_LEDS-conditionally.patch @@ -0,0 +1,36 @@ +From 4e50d844ef9f358236e3c711b5a669ca721623e8 Mon Sep 17 00:00:00 2001 +From: Liwei Song <liwei.song@windriver.com> +Date: Mon, 28 Jun 2021 17:04:40 +0800 +Subject: [PATCH] iwlwifi: select MAC80211_LEDS conditionally + +MAC80211_LEDS depends on LEDS_CLASS=y or LEDS_CLASS=MAC80211, +add condition to enable it in iwlwifi/Kconfig to avoid below +compile warning when LEDS_CLASS was set to m: + +WARNING: unmet direct dependencies detected for MAC80211_LEDS + Depends on [n]: NET [=y] && WIRELESS [=y] && MAC80211 [=y] && (LEDS_CLASS [=m]=y || LEDS_CLASS [=m]=MAC80211 [=y]) + Selected by [m]: + - IWLWIFI_LEDS [=y] && NETDEVICES [=y] && WLAN [=y] && WLAN_VENDOR_INTEL [=y] && IWLWIFI [=m] && (LEDS_CLASS [=m]=y || LEDS_CLASS [=m]=IWLWIFI [=m]) && (IWLMVM [=m] || IWLDVM [=m]) + +Signed-off-by: Liwei Song <liwei.song@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + drivers/net/wireless/intel/iwlwifi/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/drivers/net/wireless/intel/iwlwifi/Kconfig b/drivers/net/wireless/intel/iwlwifi/Kconfig +index 1085afbefba8..0e1de69c259f 100644 +--- a/drivers/net/wireless/intel/iwlwifi/Kconfig ++++ b/drivers/net/wireless/intel/iwlwifi/Kconfig +@@ -50,7 +50,7 @@ config IWLWIFI_LEDS + depends on LEDS_CLASS=y || LEDS_CLASS=IWLWIFI + depends on IWLMVM || IWLDVM + select LEDS_TRIGGERS +- select MAC80211_LEDS ++ select MAC80211_LEDS if (LEDS_CLASS=y || LEDS_CLASS=MAC80211) + default y + + config IWLDVM +-- +2.19.1 + diff --git a/patches/misc/lib-build_OID_registry-fix-reproducibility-issues.patch b/patches/misc/lib-build_OID_registry-fix-reproducibility-issues.patch new file mode 100644 index 00000000..da04c927 --- /dev/null +++ b/patches/misc/lib-build_OID_registry-fix-reproducibility-issues.patch @@ -0,0 +1,43 @@ +From 2fca0fd719812ea2ff67630b01355aa80481623e Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Sun, 10 Jul 2022 22:56:53 -0400 +Subject: [PATCH] lib/build_OID_registry: fix reproducibility issues + +The script build_OID_registry captures the full path of itself +in the generated data. This causes reproduciblity issues as the +path is captured and packaged. + +We use the basename of the script instead, and that allows us +to be reprodicible, with slightly less information captured in +the output data (but the generating script can still easily +be found). + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + lib/build_OID_registry | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/lib/build_OID_registry b/lib/build_OID_registry +index d7fc32ea8ac2..f6de0a7f7457 100755 +--- a/lib/build_OID_registry ++++ b/lib/build_OID_registry +@@ -8,6 +8,7 @@ + # + + use strict; ++use File::Basename; + + my @names = (); + my @oids = (); +@@ -35,7 +36,7 @@ close IN_FILE || die; + # + open C_FILE, ">$ARGV[1]" or die; + print C_FILE "/*\n"; +-print C_FILE " * Automatically generated by ", $0, ". Do not edit\n"; ++print C_FILE " * Automatically generated by ", basename $0, ". Do not edit\n"; + print C_FILE " */\n"; + + # +-- +2.19.1 + diff --git a/patches/misc/linux-yocto-Handle-bin-awk-issues.patch b/patches/misc/linux-yocto-Handle-bin-awk-issues.patch index d95490a1..6c524699 100644 --- a/patches/misc/linux-yocto-Handle-bin-awk-issues.patch +++ b/patches/misc/linux-yocto-Handle-bin-awk-issues.patch @@ -1,4 +1,4 @@ -From 6c49448ba9f0db847f6ece71b31e30bc5d944f30 Mon Sep 17 00:00:00 2001 +From 3e7a2ca72d99a2277ac42c578bd8f55ef9ef9141 Mon Sep 17 00:00:00 2001 From: Richard Purdie <richard.purdie@linuxfoundation.org> Date: Tue, 22 Aug 2017 09:50:50 +0100 Subject: [PATCH] linux-yocto: Handle /bin/awk issues @@ -11,13 +11,12 @@ Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> --- - arch/arm/tools/gen-mach-types | 2 +- - arch/sh/tools/gen-mach-types | 2 +- - arch/x86/tools/gen-insn-attr-x86.awk | 2 +- - tools/perf/arch/x86/tests/gen-insn-x86-dat.awk | 2 +- - .../selftests/rcutorture/formal/srcu-cbmc/modify_srcu.awk | 2 +- - 7 files changed, 7 insertions(+), 7 deletions(-) - mode change 100755 => 100644 tools/testing/selftests/rcutorture/formal/srcu-cbmc/modify_srcu.awk + arch/arm/tools/gen-mach-types | 2 +- + arch/sh/tools/gen-mach-types | 2 +- + arch/x86/tools/gen-insn-attr-x86.awk | 2 +- + tools/arch/x86/tools/gen-insn-attr-x86.awk | 2 +- + tools/perf/arch/x86/tests/gen-insn-x86-dat.awk | 2 +- + 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/tools/gen-mach-types b/arch/arm/tools/gen-mach-types index cbe1c33bb871..cb2b69f2a39d 100644 @@ -40,7 +39,7 @@ index 6d7c2d8eaf55..2a4a42a6d70c 100644 # # Awk script to generate include/generated/machtypes.h diff --git a/arch/x86/tools/gen-insn-attr-x86.awk b/arch/x86/tools/gen-insn-attr-x86.awk -index b02a36b2c14f..9166a071484c 100644 +index af38469afd14..21a7a5db887e 100644 --- a/arch/x86/tools/gen-insn-attr-x86.awk +++ b/arch/x86/tools/gen-insn-attr-x86.awk @@ -1,4 +1,4 @@ @@ -49,6 +48,16 @@ index b02a36b2c14f..9166a071484c 100644 # SPDX-License-Identifier: GPL-2.0 # gen-insn-attr-x86.awk: Instruction attribute table generator # Written by Masami Hiramatsu <mhiramat@redhat.com> +diff --git a/tools/arch/x86/tools/gen-insn-attr-x86.awk b/tools/arch/x86/tools/gen-insn-attr-x86.awk +index af38469afd14..21a7a5db887e 100644 +--- a/tools/arch/x86/tools/gen-insn-attr-x86.awk ++++ b/tools/arch/x86/tools/gen-insn-attr-x86.awk +@@ -1,4 +1,4 @@ +-#!/bin/awk -f ++#!/usr/bin/awk -f + # SPDX-License-Identifier: GPL-2.0 + # gen-insn-attr-x86.awk: Instruction attribute table generator + # Written by Masami Hiramatsu <mhiramat@redhat.com> diff --git a/tools/perf/arch/x86/tests/gen-insn-x86-dat.awk b/tools/perf/arch/x86/tests/gen-insn-x86-dat.awk index 1a29f6379bde..6285ff7158a5 100644 --- a/tools/perf/arch/x86/tests/gen-insn-x86-dat.awk @@ -59,18 +68,6 @@ index 1a29f6379bde..6285ff7158a5 100644 # SPDX-License-Identifier: GPL-2.0-only # gen-insn-x86-dat.awk: script to convert data for the insn-x86 test # Copyright (c) 2015, Intel Corporation. -diff --git a/tools/testing/selftests/rcutorture/formal/srcu-cbmc/modify_srcu.awk b/tools/testing/selftests/rcutorture/formal/srcu-cbmc/modify_srcu.awk -old mode 100755 -new mode 100644 -index e05182d3e47d..6798ab45032d ---- a/tools/testing/selftests/rcutorture/formal/srcu-cbmc/modify_srcu.awk -+++ b/tools/testing/selftests/rcutorture/formal/srcu-cbmc/modify_srcu.awk -@@ -1,4 +1,4 @@ --#!/usr/bin/awk -f -+#!/usr/usr/bin/awk -f - # SPDX-License-Identifier: GPL-2.0 - - # Modify SRCU for formal verification. The first argument should be srcu.h and -- -2.19.1 +2.34.1 diff --git a/patches/misc/misc.scc b/patches/misc/misc.scc index 1093b14e..904f41c0 100644 --- a/patches/misc/misc.scc +++ b/patches/misc/misc.scc @@ -6,5 +6,12 @@ patch compiler.h-Undef-before-redefining-__attribute_const.patch patch uvesafb-print-error-message-when-task-timeout-occurs.patch patch uvesafb-provide-option-to-specify-timeout-for-task-c.patch patch linux-yocto-Handle-bin-awk-issues.patch -patch modpost-srcversion-sometimes-incorrect.patch -patch signal-ptrace-fix-cgroup2-freezer-long-runtimes.patch +patch arm64-perf-fix-backtrace-for-AAPCS-with-FP-enabled.patch +patch defconfigs-drop-obselete-options.patch +patch arm64-perf-Fix-wrong-cast-that-may-cause-wrong-trunc.patch +patch net-dccp-make-it-depend-on-CONFIG_BROKEN-CVE-2020-16.patch +patch iwlwifi-select-MAC80211_LEDS-conditionally.patch +patch vt-conmakehash-improve-reproducibility.patch +patch lib-build_OID_registry-fix-reproducibility-issues.patch +patch tools-use-basename-to-identify-file-in-gen-mach-type.patch +patch pnmtologo-use-relocatable-file-name.patch diff --git a/patches/misc/modpost-srcversion-sometimes-incorrect.patch b/patches/misc/modpost-srcversion-sometimes-incorrect.patch deleted file mode 100644 index ab8d1b7c..00000000 --- a/patches/misc/modpost-srcversion-sometimes-incorrect.patch +++ /dev/null @@ -1,59 +0,0 @@ -From 74f6cd2b6976e37491779fcb1bc4966d3a61492c Mon Sep 17 00:00:00 2001 -From: Juro Bystricky <juro.bystricky@intel.com> -Date: Fri, 30 Mar 2018 10:14:05 -0700 -Subject: [PATCH] modpost: srcversion sometimes incorrect - -"srcversion" field inserted into module modinfo section contains a -sum of the source files which made it. However, this field can -be incorrect. Building the same module can end up having inconsistent -srcversion field eventhough the sources remain the same. -This can be reproduced by building modules in a deeply nested directory, -but other factors contribute as well. - -The reason for incorrect srcversion is that some source files can be -simply silently skipped from the checksum calculation due to limited -buffer space for line parsing. - -This patch addresses two issues: - -1. Allocates a larger line buffer (32k vs 4k). -2. Issues a warning if a line length exceeds the line buffer. - -Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> -Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> ---- - scripts/mod/modpost.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c -index b9bd26f3e6c9..7d2f1d659a43 100644 ---- a/scripts/mod/modpost.c -+++ b/scripts/mod/modpost.c -@@ -385,9 +385,10 @@ void *grab_file(const char *filename, unsigned long *size) - * spaces in the beginning of the line is trimmed away. - * Return a pointer to a static buffer. - **/ -+#define MODPOST_MAX_LINE 32768 - char *get_next_line(unsigned long *pos, void *file, unsigned long size) - { -- static char line[4096]; -+ static char line[MODPOST_MAX_LINE]; - int skip = 1; - size_t len = 0; - signed char *p = (signed char *)file + *pos; -@@ -402,8 +403,11 @@ char *get_next_line(unsigned long *pos, void *file, unsigned long size) - if (*p != '\n' && (*pos < size)) { - len++; - *s++ = *p++; -- if (len > 4095) -+ if (len > (sizeof(line)-1)) { -+ warn(" %s: line exceeds buffer size %zu bytes\n" -+ , __func__, sizeof(line)); - break; /* Too long, stop */ -+ } - } else { - /* End of string */ - *s = '\0'; --- -2.5.0 - diff --git a/patches/misc/net-dccp-make-it-depend-on-CONFIG_BROKEN-CVE-2020-16.patch b/patches/misc/net-dccp-make-it-depend-on-CONFIG_BROKEN-CVE-2020-16.patch new file mode 100644 index 00000000..263c6190 --- /dev/null +++ b/patches/misc/net-dccp-make-it-depend-on-CONFIG_BROKEN-CVE-2020-16.patch @@ -0,0 +1,45 @@ +From 56fd8c36614e9aaeadec647ce3d07f1ceb16a0a4 Mon Sep 17 00:00:00 2001 +From: Paul Gortmaker <paul.gortmaker@windriver.com> +Date: Wed, 5 May 2021 00:11:29 -0400 +Subject: [PATCH] net/dccp: make it depend on CONFIG_BROKEN (CVE-2020-16119) + +There were some proposed fixes for this back in 2020, but the discussion +largely fizzled out[1] and never got picked up again. + +We can see other distros are either blacklisting it from user space[2] +or explicitly calling it out as "is not set" in their base config[3] but +that really doesn't bind the workaround to the kernel source in any +robust transportable way. + +So I've done the tried and true "depends on BROKEN" to ensure the +workaround goes wherever the kernel source goes. + +We can revert this if a real fix eventually appears, but given that it +was marked "EXPERIMENTAL" back when we had that, I don't expect we'll +need to. Also note that none of our base ktypes or BSPs enabled it. + +[1] https://lore.kernel.org/netdev/20201013171849.236025-1-kleber.souza@canonical.com/T/ +[2] https://access.redhat.com/security/cve/cve-2020-16119 +[3] https://github.com/archlinux/svntogit-packages/commit/c07751100e1d64d9aa5789881ddc2ef68e43aed4 + +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + net/dccp/Kconfig | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/net/dccp/Kconfig b/net/dccp/Kconfig +index 0c7d2f66ba27..efa01566da0f 100644 +--- a/net/dccp/Kconfig ++++ b/net/dccp/Kconfig +@@ -2,6 +2,7 @@ + menuconfig IP_DCCP + tristate "The DCCP Protocol" + depends on INET ++ depends on BROKEN + help + Datagram Congestion Control Protocol (RFC 4340) + +-- +2.19.1 + diff --git a/patches/misc/pnmtologo-use-relocatable-file-name.patch b/patches/misc/pnmtologo-use-relocatable-file-name.patch new file mode 100644 index 00000000..bcfb5904 --- /dev/null +++ b/patches/misc/pnmtologo-use-relocatable-file-name.patch @@ -0,0 +1,52 @@ +From 4da597cafebb4d6743da1dd54099dadb6c356e08 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Thu, 14 Jul 2022 14:43:46 -0400 +Subject: [PATCH] pnmtologo: use relocatable file name + +The logo generation utility is capturing the source of the logo +in the generated .c file. The source file is absolute (as passed +by make), so the full path is captured. + +This makes the source fail reproducibility tests. + +We use basename() to just get the source file name, and use +that in the generated .c file. + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + drivers/video/logo/pnmtologo.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/drivers/video/logo/pnmtologo.c b/drivers/video/logo/pnmtologo.c +index ada5ef6e51b7..7527be845443 100644 +--- a/drivers/video/logo/pnmtologo.c ++++ b/drivers/video/logo/pnmtologo.c +@@ -13,7 +13,7 @@ + #include <stdlib.h> + #include <string.h> + #include <unistd.h> +- ++#include <libgen.h> + + static const char *programname; + static const char *filename; +@@ -223,6 +223,7 @@ static inline int is_equal(struct color c1, struct color c2) + + static void write_header(void) + { ++ char *filename_basename = basename(filename); + /* open logo file */ + if (outputname) { + out = fopen(outputname, "w"); +@@ -235,7 +236,7 @@ static void write_header(void) + fputs("/*\n", out); + fputs(" * DO NOT EDIT THIS FILE!\n", out); + fputs(" *\n", out); +- fprintf(out, " * It was automatically generated from %s\n", filename); ++ fprintf(out, " * It was automatically generated from %s\n", filename_basename); + fputs(" *\n", out); + fprintf(out, " * Linux logo %s\n", logoname); + fputs(" */\n\n", out); +-- +2.34.1 + diff --git a/patches/misc/signal-ptrace-fix-cgroup2-freezer-long-runtimes.patch b/patches/misc/signal-ptrace-fix-cgroup2-freezer-long-runtimes.patch deleted file mode 100644 index 6336981b..00000000 --- a/patches/misc/signal-ptrace-fix-cgroup2-freezer-long-runtimes.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 255a750d28cd45df8923c3aba1e82c322757a50d Mon Sep 17 00:00:00 2001 -From: Bruce Ashfield <bruce.ashfield@gmail.com> -Date: Tue, 8 Oct 2019 13:15:46 +0000 -Subject: [PATCH] signal/ptrace: fix cgroup2/freezer long runtimes - -As reported in the thread: https://lkml.org/lkml/2019/10/1/789, in -kernels with commit 76f969e8948d82 [cgroup: cgroup v2 freezer], we -were seeing much longer runtime in strace/ptrace tests (4 minutes -versus 4 seconds). - -The issue only manifests if CONFIG_PREEMPT is enabled, which is in -all of the default configurations. - -As sugggested in the thread, the movement of preempt_enable_no_resched() -until after the cgroup is frozen returns the behaviour to pre-5.2 -runtimes. - -Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> ---- - kernel/signal.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kernel/signal.c b/kernel/signal.c -index 8aad311cbd59..07da8def4329 100644 ---- a/kernel/signal.c -+++ b/kernel/signal.c -@@ -2155,8 +2155,8 @@ static void ptrace_stop(int exit_code, int why, int clear_code, kernel_siginfo_t - */ - preempt_disable(); - read_unlock(&tasklist_lock); -- preempt_enable_no_resched(); - cgroup_enter_frozen(); -+ preempt_enable_no_resched(); - freezable_schedule(); - cgroup_leave_frozen(true); - } else { --- -2.19.1 - diff --git a/patches/misc/tools-use-basename-to-identify-file-in-gen-mach-type.patch b/patches/misc/tools-use-basename-to-identify-file-in-gen-mach-type.patch new file mode 100644 index 00000000..cd091361 --- /dev/null +++ b/patches/misc/tools-use-basename-to-identify-file-in-gen-mach-type.patch @@ -0,0 +1,41 @@ +From 6c085baf183868ed45d8c1d44408d7b24724cde5 Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Wed, 13 Jul 2022 12:18:15 -0400 +Subject: [PATCH] tools: use basename to identify file in gen-mach-types + +FILENAME is replaced by the full path to the executing script. If +the script is executed via a fully specified path, that is captured +in the output. Although it doesn't impact the output, it does trigger +reproducibility warnings/errors. + +So we introduce a basename() function in the script and use it to +make sure the output file contains only the name of the awk script. + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + arch/arm/tools/gen-mach-types | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/arch/arm/tools/gen-mach-types b/arch/arm/tools/gen-mach-types +index cb2b69f2a39d..1fcdba948623 100644 +--- a/arch/arm/tools/gen-mach-types ++++ b/arch/arm/tools/gen-mach-types +@@ -21,10 +21,14 @@ NF == 3 { + num[nr] = ""; nr++ + } + ++ function basename(file) { ++ sub(".*/", "", file) ++ return file ++ } + + END { + printf("/*\n"); +- printf(" * This was automagically generated from %s!\n", FILENAME); ++ printf(" * This was automagically generated from %s!\n", basename(FILENAME)); + printf(" * Do NOT edit\n"); + printf(" */\n\n"); + printf("#ifndef __ASM_ARM_MACH_TYPE_H\n"); +-- +2.19.1 + diff --git a/patches/misc/vt-conmakehash-improve-reproducibility.patch b/patches/misc/vt-conmakehash-improve-reproducibility.patch new file mode 100644 index 00000000..cf663271 --- /dev/null +++ b/patches/misc/vt-conmakehash-improve-reproducibility.patch @@ -0,0 +1,53 @@ +From 0f586f4ee8adacac79b64d1f3d47799a5eb7fbea Mon Sep 17 00:00:00 2001 +From: Bruce Ashfield <bruce.ashfield@gmail.com> +Date: Sun, 10 Jul 2022 21:37:07 -0400 +Subject: [PATCH] vt/conmakehash: improve reproducibility + +The file generated by conmakehash capture the application +path used to generate the file. While that can be informative, +it varies based on where the kernel was built, as the full +path is captured. + +We tweak the application to use a second input as the "capture +name", and then modify the Makefile to pass the basename of +the source, making it reproducible. + +This could be improved by using some sort of path mapping, +or the application manipualing argv[1] itself, but for now +this solves the reprodicibility issue. + +Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com> +--- + drivers/tty/vt/Makefile | 2 +- + drivers/tty/vt/conmakehash.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/tty/vt/Makefile b/drivers/tty/vt/Makefile +index fe30ce512819..cb51c21b58f9 100644 +--- a/drivers/tty/vt/Makefile ++++ b/drivers/tty/vt/Makefile +@@ -15,7 +15,7 @@ clean-files := consolemap_deftbl.c defkeymap.c + hostprogs += conmakehash + + quiet_cmd_conmk = CONMK $@ +- cmd_conmk = $(obj)/conmakehash $< > $@ ++ cmd_conmk = $(obj)/conmakehash $< $(shell basename $<) > $@ + + $(obj)/consolemap_deftbl.c: $(src)/$(FONTMAPFILE) $(obj)/conmakehash + $(call cmd,conmk) +diff --git a/drivers/tty/vt/conmakehash.c b/drivers/tty/vt/conmakehash.c +index cddd789fe46e..d62510b280e9 100644 +--- a/drivers/tty/vt/conmakehash.c ++++ b/drivers/tty/vt/conmakehash.c +@@ -253,7 +253,7 @@ int main(int argc, char *argv[]) + #include <linux/types.h>\n\ + \n\ + u8 dfont_unicount[%d] = \n\ +-{\n\t", argv[1], fontlen); ++{\n\t", argv[2], fontlen); + + for ( i = 0 ; i < fontlen ; i++ ) + { +-- +2.19.1 + diff --git a/small/small.cfg b/small/small.cfg index d21ab751..0a6df066 100644 --- a/small/small.cfg +++ b/small/small.cfg @@ -19,7 +19,7 @@ # # General setup # -# CONFIG_IKCONFIG is not set +CONFIG_IKCONFIG=n CONFIG_CC_OPTIMIZE_FOR_SIZE=y # @@ -94,15 +94,15 @@ CONFIG_BINFMT_MISC=y # # Networking options # -# CONFIG_INET_XFRM_MODE_TRANSPORT is not set -# CONFIG_INET_XFRM_MODE_TUNNEL is not set -# CONFIG_INET_XFRM_MODE_BEET is not set -# CONFIG_IPV6 is not set +CONFIG_INET_XFRM_MODE_TRANSPORT=n +CONFIG_INET_XFRM_MODE_TUNNEL=n +CONFIG_INET_XFRM_MODE_BEET=n +CONFIG_IPV6=n # # Core Netfilter Configuration # -# CONFIG_NETFILTER is not set +CONFIG_NETFILTER=n # # IP: Netfilter Configuration @@ -115,7 +115,7 @@ CONFIG_BINFMT_MISC=y # # IP: Virtual Server Configuration # -# CONFIG_IP_VS is not set +CONFIG_IP_VS=n # # IPVS transport protocol load balancing support @@ -132,21 +132,21 @@ CONFIG_BINFMT_MISC=y # # DCCP Configuration (EXPERIMENTAL) # -# CONFIG_IP_DCCP is not set +CONFIG_IP_DCCP=n # # SCTP Configuration (EXPERIMENTAL) # -# CONFIG_IP_SCTP is not set +CONFIG_IP_SCTP=n # # TIPC Configuration (EXPERIMENTAL) # -# CONFIG_TIPC is not set +CONFIG_TIPC=n -# CONFIG_ATM is not set -# CONFIG_BRIDGE is not set -# CONFIG_ECONET is not set +CONFIG_ATM=n +CONFIG_BRIDGE=n +CONFIG_ECONET=n # # QoS and/or fair queueing @@ -155,33 +155,31 @@ CONFIG_BINFMT_MISC=y # # Queueing/Scheduling # -# CONFIG_NET_SCH_CBQ is not set -# CONFIG_NET_SCH_HTB is not set -# CONFIG_NET_SCH_HFSC is not set -# CONFIG_NET_SCH_PRIO is not set -# CONFIG_NET_SCH_RED is not set -# CONFIG_NET_SCH_SFQ is not set -# CONFIG_NET_SCH_TEQL is not set -# CONFIG_NET_SCH_TBF is not set -# CONFIG_NET_SCH_GRED is not set -# CONFIG_NET_SCH_DSMARK is not set -# CONFIG_NET_SCH_NETEM is not set +CONFIG_NET_SCH_HTB=n +CONFIG_NET_SCH_HFSC=n +CONFIG_NET_SCH_PRIO=n +CONFIG_NET_SCH_RED=n +CONFIG_NET_SCH_SFQ=n +CONFIG_NET_SCH_TEQL=n +CONFIG_NET_SCH_TBF=n +CONFIG_NET_SCH_GRED=n +CONFIG_NET_SCH_NETEM=n # # Classification # -# CONFIG_NET_CLS_BASIC is not set -# CONFIG_NET_CLS_TCINDEX is not set -# CONFIG_NET_CLS_ROUTE4 is not set -# CONFIG_NET_CLS_FW is not set -# CONFIG_NET_CLS_U32 is not set -# CONFIG_NET_CLS_RSVP is not set -# CONFIG_NET_CLS_RSVP6 is not set +CONFIG_NET_CLS_BASIC=n +CONFIG_NET_CLS_TCINDEX=n +CONFIG_NET_CLS_ROUTE4=n +CONFIG_NET_CLS_FW=n +CONFIG_NET_CLS_U32=n +CONFIG_NET_CLS_RSVP=n +CONFIG_NET_CLS_RSVP6=n # # Network testing # -# CONFIG_NET_PKTGEN is not set +CONFIG_NET_PKTGEN=n # # Packet Radio protocols @@ -995,13 +993,13 @@ CONFIG_NLS_UTF8=y # # Logging Options # -# CONFIG_SECURITY is not set +CONFIG_SECURITY=n # # Cryptographic options # -# CONFIG_CRYPTO_ECB is not set -# CONFIG_CRYPTO_PCBC is not set +CONFIG_CRYPTO_ECB=n +CONFIG_CRYPTO_PCBC=n # # Hardware crypto devices |