5.19.2-rc1 review
Subsystems (12)
Greg Kroah-Hartman
maintainerPATCH 1010/1157 powerpc/spufs: Fix refcount leak in spufs_init_isolated_loader
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 6ac059dacffa8ab2f7798f20e4bd3333890c541c ]
of_find_node_by_path() returns remote device nodepointer with refcount incremented, we should use of_node_put() on it when done. Add missing of_node_put() to avoid refcount leak.
--- arch/powerpc/platforms/cell/spufs/inode.c | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/platforms/cell/spufs/inode.c +1 -0
@@ -660,6 +660,7 @@ spufs_init_isolated_loader(void)return ; loader =of_get_property (dn,"loader" , &size); +of_node_put (dn);if (!loader)return ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1011/1157 powerpc/xive: Fix refcount leak in xive_get_max_prio
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit 255b650cbec6849443ce2e0cdd187fd5e61c218c ]
of_find_node_by_path() returns a node pointer with refcount incremented, we should use of_node_put() on it when done. Add missing of_node_put() to avoid refcount leak.
--- arch/powerpc/sysdev/xive/spapr.c | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/sysdev/xive/spapr.c +1 -0
@@ -718,6 +718,7 @@ static bool __init xive_get_max_prio(u8 *max_prio) } reg =of_get_property (rootdn,"ibm,plat-res-int-priorities" , &len); +of_node_put (rootdn);if (!reg) {pr_err ("Failed to read 'ibm,plat-res-int-priorities' property\n" );return false;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1012/1157 powerpc/cell/axon_msi: Fix refcount leak in setup_msi_msg_address
In reply to Greg Kroah-HartmanFrom: Miaoqian Lin <[email protected]>
[ Upstream commit df5d4b616ee76abc97e5bd348e22659c2b095b1c ]
of_get_next_parent() returns a node pointer with refcount incremented, we should use of_node_put() on it when not need anymore. Add missing of_node_put() in the error path to avoid refcount leak.
--- arch/powerpc/platforms/cell/axon_msi.c | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/platforms/cell/axon_msi.c +1 -0
@@ -223,6 +223,7 @@ static int setup_msi_msg_address(struct pci_dev *dev, struct msi_msg *msg)if (!prop) {dev_dbg (&dev->dev,"axon_msi: no msi-address-(32|64) properties found\n" ); +of_node_put (dn);return -ENOENT ; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1013/1157 perf symbol: Fail to read phdr workaround
In reply to Greg Kroah-HartmanFrom: Ian Rogers <[email protected]>
[ Upstream commit 6d518ac7be6223811ab947897273b1bbef846180 ]
The perf jvmti agent doesn't create program headers, in this case fallback on section headers as happened previously.
Committer notes:
To test this, from a public post by Ian:
1) download a Java workload dacapo-9.12-MR1-bach.jar from
https://sourceforge.net/projects/dacapobench/
2) build perf such as "make -C tools/perf O=/tmp/perf NO_LIBBFD=1" it should detect Java and create /tmp/perf/libperf-jvmti.so
3) run perf with the jvmti agent:
perf record -k 1 java -agentpath:/tmp/perf/libperf-jvmti.so -jar dacapo-9.12-MR1-bach.jar -n 10 fop
4) run perf inject:
perf inject -i perf.data -o perf-injected.data -j
5) run perf report
perf report -i perf-injected.data | grep org.apache.fop
With this patch reverted I see lots of symbols like:
0.00% java jitted-388040-4656.so [.] org.apache.fop.fo.FObj.bind(org.apache.fop.fo.PropertyList)
With the patch (2d86612aacb7805f ("perf symbol: Correct address for bss symbols")) I see lots of:
dso__load_sym_internal: failed to find program header for symbol:
Lorg/apache/fop/fo/FObj;bind(Lorg/apache/fop/fo/PropertyList;)V
st_value: 0x40
--- tools/perf/util/symbol-elf.c | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-)
tools/perf/util/symbol-elf.c +20 -7
@@ -1305,16 +1305,29 @@ dso__load_sym_internal(struct dso *dso, struct map *map, struct symsrc *syms_ss,if (elf_read_program_header (syms_ss->elf, (u64 )sym.st_value, &phdr)) { -pr_warning ("%s: failed to find program header for " +pr_debug4 ("%s: failed to find program header for " "symbol: %s st_value: %#" PRIx64"\n" , __func__, elf_name, (u64 )sym.st_value); -continue ; +pr_debug4 ("%s: adjusting symbol: st_value: %#" PRIx64" " +"sh_addr: %#" PRIx64" sh_offset: %#" PRIx64"\n" , + __func__, (u64 )sym.st_value, (u64 )shdr.sh_addr, + (u64 )shdr.sh_offset); +/* +* Fail to find program header, let's rollback +* to use shdr.sh_addr and shdr.sh_offset to +* calibrate symbol's file address, though this +* is not necessary for normal C ELF file, we +* still need to handle java JIT symbols in this +* case. +*/ + sym.st_value -= shdr.sh_addr - shdr.sh_offset; + }else { +pr_debug4 ("%s: adjusting symbol: st_value: %#" PRIx64" " +"p_vaddr: %#" PRIx64" p_offset: %#" PRIx64"\n" , + __func__, (u64 )sym.st_value, (u64 )phdr.p_vaddr, + (u64 )phdr.p_offset); + sym.st_value -= phdr.p_vaddr - phdr.p_offset; } -pr_debug4 ("%s: adjusting symbol: st_value: %#" PRIx64" " -"p_vaddr: %#" PRIx64" p_offset: %#" PRIx64"\n" , - __func__, (u64 )sym.st_value, (u64 )phdr.p_vaddr, - (u64 )phdr.p_offset); - sym.st_value -= phdr.p_vaddr - phdr.p_offset; } demangled =demangle_sym (dso, kmodule, elf_name);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1014/1157 kprobes: Forbid probing on trampoline and BPF code areas
In reply to Greg Kroah-HartmanFrom: Chen Zhongjin <[email protected]>
[ Upstream commit 28f6c37a2910f565b4f5960df52b2eccae28c891 ]
kernel_text_address() treats ftrace_trampoline, kprobe_insn_slot and bpf_text_address as valid kprobe addresses - which is not ideal.
These text areas are removable and changeable without any notification to kprobes, and probing on them can trigger unexpected behavior:
https://lkml.org/lkml/2022/7/26/1148
Considering that jump_label and static_call text are already forbiden to probe, kernel_text_address() should be replaced with core_kernel_text() and is_module_text_address() to check other text areas which are unsafe to kprobe.
[ mingo: Rewrote the changelog. ]
--- kernel/kprobes.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/kprobes.c +2 -1
@@ -1560,7 +1560,8 @@ static int check_kprobe_address_safe(struct kprobe *p,preempt_disable ();/* Ensure it is not in reserved area nor out of text */ - if (!kernel_text_address((unsigned long) p->addr) || + if (!(core_kernel_text((unsigned long) p->addr) || + is_module_text_address((unsigned long) p->addr)) || within_kprobe_blacklist((unsigned long) p->addr) || jump_label_text_reserved(p->addr, p->addr) || static_call_text_reserved(p->addr, p->addr) ||
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1015/1157 x86/bus_lock: Dont assume the init value of DEBUGCTLMSR.BUS_LOCK_DETECT to be zero
In reply to Greg Kroah-HartmanFrom: Chenyi Qiang <[email protected]>
[ Upstream commit ffa6482e461ff550325356ae705b79e256702ea9 ]
It's possible that this kernel has been kexec'd from a kernel that enabled bus lock detection, or (hypothetically) BIOS/firmware has set DEBUGCTLMSR_BUS_LOCK_DETECT.
Disable bus lock detection explicitly if not wanted.
--- arch/x86/kernel/cpu/intel.c | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-)
arch/x86/kernel/cpu/intel.c +14 -13
@@ -1216,22 +1216,23 @@ static void bus_lock_init(void) {u64 val; -/* -* Warn and fatal are handled by #AC for split lock if #AC for -* split lock is supported. -*/ -if (!boot_cpu_has (X86_FEATURE_BUS_LOCK_DETECT ) || - (boot_cpu_has (X86_FEATURE_SPLIT_LOCK_DETECT ) && - (sld_state == sld_warn || sld_state == sld_fatal)) || - sld_state == sld_off) +if (!boot_cpu_has (X86_FEATURE_BUS_LOCK_DETECT ))return ; -/* -* Enable #DB for bus lock. All bus locks are handled in #DB except -* split locks are handled in #AC in the fatal case. -*/ rdmsrl (MSR_IA32_DEBUGCTLMSR , val); - val |=DEBUGCTLMSR_BUS_LOCK_DETECT ; + +if ((boot_cpu_has (X86_FEATURE_SPLIT_LOCK_DETECT ) && + (sld_state == sld_warn || sld_state == sld_fatal)) || + sld_state == sld_off) { +/* +* Warn and fatal are handled by #AC for split lock if #AC for +* split lock is supported. +*/ + val &= ~DEBUGCTLMSR_BUS_LOCK_DETECT ; + }else { + val |=DEBUGCTLMSR_BUS_LOCK_DETECT ; + } +wrmsrl (MSR_IA32_DEBUGCTLMSR , val); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1016/1157 powerpc/pci: Fix PHB numbering when using opal-phbid
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
[ Upstream commit f4b39e88b42d13366b831270306326b5c20971ca ]
The recent change to the PHB numbering logic has a logic error in the handling of "ibm,opal-phbid".
When an "ibm,opal-phbid" property is present, &prop is written to and ret is set to zero.
The following call to of_alias_get_id() is skipped because ret == 0.
But then the if (ret >= 0) is true, and the body of that if statement sets prop = ret which throws away the value that was just read from "ibm,opal-phbid".
Fix the logic by only doing the ret >= 0 check in the of_alias_get_id() case.
--- arch/powerpc/kernel/pci-common.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
arch/powerpc/kernel/pci-common.c +6 -4
@@ -90,11 +90,13 @@ static int get_phb_number(struct device_node *dn) }if (ret) ret =of_property_read_u64 (dn,"ibm,opal-phbid" , &prop); -if (ret) + +if (ret) { ret =of_alias_get_id (dn,"pci" ); -if (ret >=0 ) { - prop = ret; - ret =0 ; +if (ret >=0 ) { + prop = ret; + ret =0 ; + } }if (ret) {u32 prop_32;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1017/1157 genelf: Use HAVE_LIBCRYPTO_SUPPORT, not the never defined HAVE_LIBCRYPTO
In reply to Greg Kroah-HartmanFrom: Arnaldo Carvalho de Melo <[email protected]>
[ Upstream commit 91cea6be90e436c55cde8770a15e4dac9d3032d0 ]
When genelf was introduced it tested for HAVE_LIBCRYPTO not HAVE_LIBCRYPTO_SUPPORT, which is the define the feature test for openssl defines, fix it.
This also adds disables the deprecation warning, someone has to fix this to build with openssl 3.0 before the warning becomes a hard error.
--- tools/perf/util/genelf.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
tools/perf/util/genelf.c +5 -1
@@ -30,7 +30,11 @@#define BUILD_ID_URANDOM /* different uuid for each run */ -#ifdef HAVE_LIBCRYPTO +// FIXME, remove this and fix the deprecation warnings before its removed and +// We'll break for good here... +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" + +#ifdef HAVE_LIBCRYPTO_SUPPORT #define BUILD_ID_MD5 #undef BUILD_ID_SHA/* does not seem to work well when linked with Java */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1018/1157 scripts/faddr2line: Fix vmlinux detection on arm64
In reply to Greg Kroah-HartmanFrom: Josh Poimboeuf <[email protected]>
[ Upstream commit b6a5068854cfe372da7dee3224dcf023ed5b00cb ]
Since commit dcea997beed6 ("faddr2line: Fix overlapping text section failures, the sequel"), faddr2line is completely broken on arm64.
For some reason, on arm64, the vmlinux ELF object file type is ET_DYN rather than ET_EXEC. Check for both when determining whether the object is vmlinux.
Modules and vmlinux.o have type ET_REL on all arches.
--- scripts/faddr2line | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
scripts/faddr2line +3 -1
@@ -112,7 +112,9 @@ __faddr2line() { # section offsets. local file_type=$(${READELF} --file-header $objfile | ${AWK} '$1 == "Type:" { print $2; exit }') - [[ $file_type = "EXEC" ]] && is_vmlinux=1 + if [[ $file_type = "EXEC" ]] || [[ $file_type == "DYN" ]]; then + is_vmlinux=1 + fi # Go through each of the object's symbols which match the func name. # In rare cases there might be duplicates, in which case we print all
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1019/1157 tty: serial: qcom-geni-serial: Fix %lu -> %u in print statements
In reply to Greg Kroah-HartmanFrom: Douglas Anderson <[email protected]>
[ Upstream commit 0fec518018cc5ceffa706370b6e3acbbb1e3c798 ]
When we multiply an unsigned int by a u32 we still end up with an unsigned int. That means we should specify "%u" not "%lu" in the format code.
NOTE: this fix was chosen instead of somehow promoting the value to "unsigned long" since the max baud rate from the earlier call to uart_get_baud_rate() is 4000000 and the max sampling rate is 32. 4000000 * 32 = 0x07a12000, not even close to overflowing 32-bits.
--- drivers/tty/serial/qcom_geni_serial.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/tty/serial/qcom_geni_serial.c +2 -2
@@ -1033,12 +1033,12 @@ static void qcom_geni_serial_set_termios(struct uart_port *uport, sampling_rate, &clk_div);if (!clk_rate) {dev_err (port->se.dev, -"Couldn't find suitable clock rate for %lu\n" , +"Couldn't find suitable clock rate for %u\n" , baud * sampling_rate); goto out_restart_rx; } -dev_dbg (port->se.dev,"desired_rate-%lu, clk_rate-%lu, clk_div-%u\n" , +dev_dbg (port->se.dev,"desired_rate-%u, clk_rate-%lu, clk_div-%u\n" , baud * sampling_rate, clk_rate, clk_div); uport->uartclk = clk_rate;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1020/1157 powerpc/64e: Fix kexec build error
In reply to Greg Kroah-HartmanFrom: Michael Ellerman <[email protected]>
[ Upstream commit 4cfa6ff24a9744ba484521c38bea613134fbfcb3 ]
When building ppc64_book3e_allmodconfig the build fails with:
arch/powerpc/kexec/file_load_64.c:1063:14: error: implicit declaration of function ‘firmware_has_feature’
1063 | if (!firmware_has_feature(FW_FEATURE_LPAR))
| ^~~~~~~~~~~~~~~~~~~~
Add a direct include of asm/firmware.h to fix the error.
--- arch/powerpc/kexec/file_load_64.c | 1 + 1 file changed, 1 insertion(+)
arch/powerpc/kexec/file_load_64.c +1 -0
@@ -23,6 +23,7 @@#include <linux/vmalloc.h> #include <asm/setup.h> #include <asm/drmem.h> +#include <asm/firmware.h> #include <asm/kexec_ranges.h> #include <asm/crashdump-ppc64.h>
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1021/1157 sched, cpuset: Fix dl_cpu_busy() panic due to empty cs->cpus_allowed
In reply to Greg Kroah-HartmanFrom: Waiman Long <[email protected]>
[ Upstream commit b6e8d40d43ae4dec00c8fea2593eeea3114b8f44 ]
With cgroup v2, the cpuset's cpus_allowed mask can be empty indicating that the cpuset will just use the effective CPUs of its parent. So cpuset_can_attach() can call task_can_attach() with an empty mask. This can lead to cpumask_any_and() returns nr_cpu_ids causing the call to dl_bw_of() to crash due to percpu value access of an out of bound CPU value. For example:
[80468.182258] BUG: unable to handle page fault for address: ffffffff8b6648b0 : [80468.191019] RIP: 0010:dl_cpu_busy+0x30/0x2b0 : [80468.207946] Call Trace: [80468.208947] cpuset_can_attach+0xa0/0x140 [80468.209953] cgroup_migrate_execute+0x8c/0x490 [80468.210931] cgroup_update_dfl_csses+0x254/0x270 [80468.211898] cgroup_subtree_control_write+0x322/0x400 [80468.212854] kernfs_fop_write_iter+0x11c/0x1b0 [80468.213777] new_sync_write+0x11f/0x1b0 [80468.214689] vfs_write+0x1eb/0x280 [80468.215592] ksys_write+0x5f/0xe0 [80468.216463] do_syscall_64+0x5c/0x80 [80468.224287] entry_SYSCALL_64_after_hwframe+0x44/0xae
Fix that by using effective_cpus instead. For cgroup v1, effective_cpus is the same as cpus_allowed. For v2, effective_cpus is the real cpumask to be used by tasks within the cpuset anyway.
Also update task_can_attach()'s 2nd argument name to cs_effective_cpus to reflect the change. In addition, a check is added to task_can_attach() to guard against the possibility that cpumask_any_and() may return a value >= nr_cpu_ids.
--- include/linux/sched.h | 2 +- kernel/cgroup/cpuset.c | 2 +- kernel/sched/core.c | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-)
include/linux/sched.h +1 -1
@@ -1813,7 +1813,7 @@ current_restore_flags(unsigned long orig_flags, unsigned long flags) }extern int cpuset_cpumask_can_shrink (const struct cpumask *cur,const struct cpumask *trial); -extern int task_can_attach (struct task_struct *p,const struct cpumask *cs_cpus_allowed); +extern int task_can_attach (struct task_struct *p,const struct cpumask *cs_effective_cpus);#ifdef CONFIG_SMP extern void do_set_cpus_allowed (struct task_struct *p,const struct cpumask *new_mask);extern int set_cpus_allowed_ptr (struct task_struct *p,const struct cpumask *new_mask);
kernel/cgroup/cpuset.c +1 -1
@@ -2239,7 +2239,7 @@ static int cpuset_can_attach(struct cgroup_taskset *tset) goto out_unlock;cgroup_taskset_for_each (task, css, tset) { - ret =task_can_attach (task, cs->cpus_allowed); + ret =task_can_attach (task, cs->effective_cpus);if (ret) goto out_unlock; ret =security_task_setscheduler (task);
kernel/sched/core.c +5 -3
@@ -8979,7 +8979,7 @@ int cpuset_cpumask_can_shrink(const struct cpumask *cur, }int task_can_attach (struct task_struct *p, -const struct cpumask *cs_cpus_allowed) +const struct cpumask *cs_effective_cpus) {int ret =0 ;
@@ -8998,9 +8998,11 @@ int task_can_attach(struct task_struct *p, }if (dl_task (p) && !cpumask_intersects (task_rq (p)->rd->span, - cs_cpus_allowed)) { -int cpu =cpumask_any_and (cpu_active_mask, cs_cpus_allowed); + cs_effective_cpus)) { +int cpu =cpumask_any_and (cpu_active_mask, cs_effective_cpus); +if (unlikely (cpu >= nr_cpu_ids)) +return -EINVAL ; ret =dl_cpu_busy (cpu, p); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1022/1157 x86/numa: Use cpumask_available instead of hardcoded NULL check
In reply to Greg Kroah-HartmanFrom: Siddh Raman Pant <[email protected]>
[ Upstream commit 625395c4a0f4775e0fe00f616888d2e6c1ba49db ]
GCC-12 started triggering a new warning:
arch/x86/mm/numa.c: In function ‘cpumask_of_node’:
arch/x86/mm/numa.c:916:39: warning: the comparison will always evaluate as ‘false’ for the address of ‘node_to_cpumask_map’ will never be NULL [-Waddress]
916 | if (node_to_cpumask_map[node] == NULL) {
| ^~node_to_cpumask_map is of type cpumask_var_t[].
When CONFIG_CPUMASK_OFFSTACK is set, cpumask_var_t is typedef'd to a pointer for dynamic allocation, else to an array of one element. The "wicked game" can be checked on line 700 of include/linux/cpumask.h.
The original code in debug_cpumask_set_cpu() and cpumask_of_node() were probably written by the original authors with CONFIG_CPUMASK_OFFSTACK=y (i.e. dynamic allocation) in mind, checking if the cpumask was available via a direct NULL check.
When CONFIG_CPUMASK_OFFSTACK is not set, GCC gives the above warning while compiling the kernel.
Fix that by using cpumask_available(), which does the NULL check when CONFIG_CPUMASK_OFFSTACK is set, otherwise returns true. Use it wherever such checks are made.
Conditional definitions of cpumask_available() can be found along with the definition of cpumask_var_t. Check the cpumask.h reference mentioned above.
--- arch/x86/mm/numa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/mm/numa.c +2 -2
@@ -867,7 +867,7 @@ void debug_cpumask_set_cpu(int cpu, int node, bool enable)return ; } mask = node_to_cpumask_map[node]; -if (!mask) { +if (!cpumask_available (mask)) {pr_err ("node_to_cpumask_map[%i] NULL\n" , node);dump_stack ();return ;
@@ -913,7 +913,7 @@ const struct cpumask *cpumask_of_node(int node)dump_stack ();return cpu_none_mask; } -if (node_to_cpumask_map[node] ==NULL ) { +if (!cpumask_available (node_to_cpumask_map[node])) {printk (KERN_WARNING "cpumask_of_node(%d): no node_to_cpumask_map!\n" , node);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1023/1157 video: fbdev: arkfb: Fix a divide-by-zero bug in ark_set_pixclock()
In reply to Greg Kroah-HartmanFrom: Zheyu Ma <[email protected]>
[ Upstream commit 2f1c4523f7a3aaabe7e53d3ebd378292947e95c8 ]
Since the user can control the arguments of the ioctl() from the user
space, under special arguments that may result in a divide-by-zero bug
in:
drivers/video/fbdev/arkfb.c:784: ark_set_pixclock(info, (hdiv * info->var.pixclock) / hmul);
with hdiv=1, pixclock=1 and hmul=2 you end up with (1*1)/2 = (int) 0.
and then in:
drivers/video/fbdev/arkfb.c:504: rv = dac_set_freq(par->dac, 0, 1000000000 / pixclock);
we'll get a division-by-zero.
The following log can reveal it:
divide error: 0000 [#1] PREEMPT SMP KASAN PTI
RIP: 0010:ark_set_pixclock drivers/video/fbdev/arkfb.c:504 [inline] RIP: 0010:arkfb_set_par+0x10fc/0x24c0 drivers/video/fbdev/arkfb.c:784 Call Trace: fb_set_var+0x604/0xeb0 drivers/video/fbdev/core/fbmem.c:1034 do_fb_ioctl+0x234/0x670 drivers/video/fbdev/core/fbmem.c:1110 fb_ioctl+0xdd/0x130 drivers/video/fbdev/core/fbmem.c:1189
Fix this by checking the argument of ark_set_pixclock() first.
--- drivers/video/fbdev/arkfb.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/video/fbdev/arkfb.c +6 -1
@@ -781,7 +781,12 @@ static int arkfb_set_par(struct fb_info *info)return -EINVAL ; } -ark_set_pixclock (info, (hdiv * info->var.pixclock) / hmul); + value = (hdiv * info->var.pixclock) / hmul; +if (!value) { +fb_dbg (info,"invalid pixclock\n" ); + value =1 ; + } +ark_set_pixclock (info, value); svga_set_timings(par->state.vgabase, &ark_timing_regs, &(info->var), hmul, hdiv, (info->var.vmode & FB_VMODE_DOUBLE) ? 2 : 1, (info->var.vmode & FB_VMODE_INTERLACED) ? 2 : 1,
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1024/1157 tools/thermal: Fix possible path truncations
In reply to Greg Kroah-HartmanFrom: Florian Fainelli <[email protected]>
[ Upstream commit 6c58cf40e3a1d2f47c09d3489857e9476316788a ]
A build with -D_FORTIFY_SOURCE=2 enabled will produce the following warnings:
sysfs.c:63:30: warning: '%s' directive output may be truncated writing up to 255 bytes into a region of size between 0 and 255 [-Wformat-truncation=]
snprintf(filepath, 256, "%s/%s", path, filename);
^~Bump up the buffer to PATH_MAX which is the limit and account for all of the possible NUL and separators that could lead to exceeding the allocated buffer sizes.
--- tools/thermal/tmon/sysfs.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
tools/thermal/tmon/sysfs.c +13 -11
@@ -13,6 +13,7 @@#include <stdint.h> #include <dirent.h> #include <libintl.h> +#include <limits.h> #include <ctype.h> #include <time.h> #include <syslog.h>
@@ -33,9 +34,9 @@ int sysfs_set_ulong(char *path, char *filename, unsigned long val) {FILE *fd;int ret =-1 ; -char filepath[256 ]; +char filepath[PATH_MAX +2 ];/* NUL and '/' */ -snprintf (filepath,256 ,"%s/%s" , path, filename); +snprintf (filepath,sizeof (filepath),"%s/%s" , path, filename); fd =fopen (filepath,"w" );if (!fd) {
@@ -57,9 +58,9 @@ static int sysfs_get_ulong(char *path, char *filename, unsigned long *p_ulong) {FILE *fd;int ret =-1 ; -char filepath[256 ]; +char filepath[PATH_MAX +2 ];/* NUL and '/' */ -snprintf (filepath,256 ,"%s/%s" , path, filename); +snprintf (filepath,sizeof (filepath),"%s/%s" , path, filename); fd =fopen (filepath,"r" );if (!fd) {
@@ -76,9 +77,9 @@ static int sysfs_get_string(char *path, char *filename, char *str) {FILE *fd;int ret =-1 ; -char filepath[256 ]; +char filepath[PATH_MAX +2 ];/* NUL and '/' */ -snprintf (filepath,256 ,"%s/%s" , path, filename); +snprintf (filepath,sizeof (filepath),"%s/%s" , path, filename); fd =fopen (filepath,"r" );if (!fd) {
@@ -199,8 +200,8 @@ static int find_tzone_cdev(struct dirent *nl, char *tz_name, {unsigned long trip_instance =0 ;char cdev_name_linked[256 ]; -char cdev_name[256 ]; -char cdev_trip_name[256 ]; +char cdev_name[PATH_MAX ]; +char cdev_trip_name[PATH_MAX ];int cdev_id;if (nl->d_type ==DT_LNK ) {
@@ -213,7 +214,8 @@ static int find_tzone_cdev(struct dirent *nl, char *tz_name,return -EINVAL ; }/* find the link to real cooling device record binding */ -snprintf (cdev_name,256 ,"%s/%s" , tz_name, nl->d_name); +snprintf (cdev_name,sizeof (cdev_name) -2 ,"%s/%s" , + tz_name, nl->d_name);memset (cdev_name_linked,0 ,sizeof (cdev_name_linked));if (readlink (cdev_name, cdev_name_linked,sizeof (cdev_name_linked) -1 ) !=-1 ) {
@@ -226,8 +228,8 @@ static int find_tzone_cdev(struct dirent *nl, char *tz_name,/* find the trip point in which the cdev is binded to * in this tzone */ -snprintf (cdev_trip_name,256 ,"%s%s" , nl->d_name, -"_trip_point" ); +snprintf (cdev_trip_name,sizeof (cdev_trip_name) -1 , +"%s%s" , nl->d_name,"_trip_point" );sysfs_get_ulong (tz_name, cdev_trip_name, &trip_instance);/* validate trip point range, e.g. trip could return -1
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1025/1157 sched: Fix the check of nr_running at queue wakelist
In reply to Greg Kroah-HartmanFrom: Tianchen Ding <[email protected]>
[ Upstream commit 28156108fecb1f808b21d216e8ea8f0d205a530c ]
The commit 2ebb17717550 ("sched/core: Offload wakee task activation if it the wakee is descheduling") checked rq->nr_running <= 1 to avoid task stacking when WF_ON_CPU.
Per the ordering of writes to p->on_rq and p->on_cpu, observing p->on_cpu (WF_ON_CPU) in ttwu_queue_cond() implies !p->on_rq, IOW p has gone through the deactivate_task() in __schedule(), thus p has been accounted out of rq->nr_running. As such, the task being the only runnable task on the rq implies reading rq->nr_running == 0 at that point.
The benchmark result is in [1].
[1] https://lore.kernel.org/all/[email protected]/
--- kernel/sched/core.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
kernel/sched/core.c +5 -1
@@ -3829,8 +3829,12 @@ static inline bool ttwu_queue_cond(int cpu, int wake_flags)* CPU then use the wakelist to offload the task activation to * the soon-to-be-idle CPU as the current CPU is likely busy. * nr_running is checked to avoid unnecessary task stacking. +* +* Note that we can only get here with (wakee) p->on_rq=0, +* p->on_cpu can be whatever, we've done the dequeue, so +* the wakee has been accounted out of ->nr_running. */ -if ((wake_flags &WF_ON_CPU ) &&cpu_rq (cpu)->nr_running <=1 ) +if ((wake_flags &WF_ON_CPU ) && !cpu_rq (cpu)->nr_running)return true;return false;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1026/1157 sched: Remove the limitation of WF_ON_CPU on wakelist if wakee cpu is idle
In reply to Greg Kroah-HartmanFrom: Tianchen Ding <[email protected]>
[ Upstream commit f3dd3f674555bd9455c5ae7fafce0696bd9931b3 ]
Wakelist can help avoid cache bouncing and offload the overhead of waker cpu. So far, using wakelist within the same llc only happens on WF_ON_CPU, and this limitation could be removed to further improve wakeup performance.
The commit 518cd6234178 ("sched: Only queue remote wakeups when crossing cache boundaries") disabled queuing tasks on wakelist when the cpus share llc. This is because, at that time, the scheduler must send IPIs to do ttwu_queue_wakelist. Nowadays, ttwu_queue_wakelist also supports TIF_POLLING, so this is not a problem now when the wakee cpu is in idle polling.
Benefits:
Queuing the task on idle cpu can help improving performance on waker cpu and utilization on wakee cpu, and further improve locality because the wakee cpu can handle its own rq. This patch helps improving rt on our real java workloads where wakeup happens frequently.
Consider the normal condition (CPU0 and CPU1 share same llc) Before this patch:
CPU0 CPU1
select_task_rq() idle
rq_lock(CPU1->rq)
enqueue_task(CPU1->rq)
notify CPU1 (by sending IPI or CPU1 polling)
resched()After this patch:
CPU0 CPU1
select_task_rq() idle
add to wakelist of CPU1
notify CPU1 (by sending IPI or CPU1 polling)
rq_lock(CPU1->rq) enqueue_task(CPU1->rq) resched()
We see CPU0 can finish its work earlier. It only needs to put task to wakelist and return.
While CPU1 is idle, so let itself handle its own runqueue data.
This patch brings no difference about IPI.
This patch only takes effect when the wakee cpu is:
1) idle polling
2) idle not polling
For 1), there will be no IPI with or without this patch.
For 2), there will always be an IPI before or after this patch. Before this patch: waker cpu will enqueue task and check preempt. Since "idle" will be sure to be preempted, waker cpu must send a resched IPI. After this patch: waker cpu will put the task to the wakelist of wakee cpu, and send an IPI.
Benchmark:
We've tested schbench, unixbench, and hachbench on both x86 and arm64.
On x86 (Intel Xeon Platinum 8269CY):
schbench -m 2 -t 8
Latency percentiles (usec) before after
50.0000th: 8 6
75.0000th: 10 7
90.0000th: 11 8
95.0000th: 12 8
*99.0000th: 13 10
99.5000th: 15 11
99.9000th: 18 14
Unixbench with full threads (104)
before after
Dhrystone 2 using register variables 3011862938 3009935994 -0.06%
Double-Precision Whetstone 617119.3 617298.5 0.03%
Execl Throughput 27667.3 27627.3 -0.14%
File Copy 1024 bufsize 2000 maxblocks 785871.4 784906.2 -0.12%
File Copy 256 bufsize 500 maxblocks 210113.6 212635.4 1.20%
File Copy 4096 bufsize 8000 maxblocks 2328862.2 2320529.1 -0.36%
Pipe Throughput 145535622.8 145323033.2 -0.15%
Pipe-based Context Switching 3221686.4 3583975.4 11.25%
Process Creation 101347.1 103345.4 1.97%
Shell Scripts (1 concurrent) 120193.5 123977.8 3.15%
Shell Scripts (8 concurrent) 17233.4 17138.4 -0.55%
System Call Overhead 5300604.8 5312213.6 0.22% hackbench -g 1 -l 100000
before after
Time 3.246 2.251
On arm64 (Ampere Altra):
schbench -m 2 -t 8
Latency percentiles (usec) before after
50.0000th: 14 10
75.0000th: 19 14
90.0000th: 22 16
95.0000th: 23 16
*99.0000th: 24 17
99.5000th: 24 17
99.9000th: 28 25
Unixbench with full threads (80)
before after
Dhrystone 2 using register variables 3536194249 3537019613 0.02%
Double-Precision Whetstone 629383.6 629431.6 0.01%
Execl Throughput 65920.5 65846.2 -0.11%
File Copy 1024 bufsize 2000 maxblocks 1063722.8 1064026.8 0.03%
File Copy 256 bufsize 500 maxblocks 322684.5 318724.5 -1.23%
File Copy 4096 bufsize 8000 maxblocks 2348285.3 2328804.8 -0.83%
Pipe Throughput 133542875.3 131619389.8 -1.44%
Pipe-based Context Switching 3215356.1 3576945.1 11.25%
Process Creation 108520.5 120184.6 10.75%
Shell Scripts (1 concurrent) 122636.3 121888 -0.61%
Shell Scripts (8 concurrent) 17462.1 17381.4 -0.46%
System Call Overhead 4429998.9 4435006.7 0.11% hackbench -g 1 -l 100000
before after
Time 4.217 2.916
Our patch has improvement on schbench, hackbench
and Pipe-based Context Switching of unixbench
when there exists idle cpus,
and no obvious regression on other tests of unixbench. This can help improve rt in scenes where wakeup happens frequently.
--- kernel/sched/core.c | 26 ++++++++++++++------------ kernel/sched/sched.h | 1 - 2 files changed, 14 insertions(+), 13 deletions(-)
kernel/sched/core.c +14 -12
@@ -3808,7 +3808,7 @@ bool cpus_share_cache(int this_cpu, int that_cpu)return per_cpu (sd_llc_id, this_cpu) ==per_cpu (sd_llc_id, that_cpu); } -static inline bool ttwu_queue_cond (int cpu,int wake_flags) +static inline bool ttwu_queue_cond (int cpu) {/* * Do not complicate things with the async wake_list while the CPU is
@@ -3824,17 +3824,21 @@ static inline bool ttwu_queue_cond(int cpu, int wake_flags)if (!cpus_share_cache (smp_processor_id (), cpu))return true; +if (cpu ==smp_processor_id ()) +return false; +/* -* If the task is descheduling and the only running task on the -* CPU then use the wakelist to offload the task activation to -* the soon-to-be-idle CPU as the current CPU is likely busy. -* nr_running is checked to avoid unnecessary task stacking. +* If the wakee cpu is idle, or the task is descheduling and the +* only running task on the CPU, then use the wakelist to offload +* the task activation to the idle (or soon-to-be-idle) CPU as +* the current CPU is likely busy. nr_running is checked to +* avoid unnecessary task stacking. * * Note that we can only get here with (wakee) p->on_rq=0, * p->on_cpu can be whatever, we've done the dequeue, so * the wakee has been accounted out of ->nr_running. */ -if ((wake_flags &WF_ON_CPU ) && !cpu_rq (cpu)->nr_running) +if (!cpu_rq (cpu)->nr_running)return true;return false;
@@ -3842,10 +3846,7 @@ static inline bool ttwu_queue_cond(int cpu, int wake_flags)static bool ttwu_queue_wakelist (struct task_struct *p,int cpu,int wake_flags) { -if (sched_feat (TTWU_QUEUE ) &&ttwu_queue_cond (cpu, wake_flags)) { -if (WARN_ON_ONCE (cpu ==smp_processor_id ())) -return false; - +if (sched_feat (TTWU_QUEUE ) &&ttwu_queue_cond (cpu)) {sched_clock_cpu (cpu);/* Sync clocks across CPUs */ __ttwu_queue_wakelist (p, cpu, wake_flags);return true;
@@ -4167,7 +4168,7 @@ try_to_wake_up(struct task_struct *p, unsigned int state, int wake_flags)* scheduling. */ if (smp_load_acquire (&p->on_cpu) && -ttwu_queue_wakelist (p,task_cpu (p), wake_flags |WF_ON_CPU )) +ttwu_queue_wakelist (p,task_cpu (p), wake_flags)) goto unlock;/*
@@ -4757,7 +4758,8 @@ static inline void prepare_task(struct task_struct *next)* Claim the task as running, we do this before switching to it * such that any running task will have this set. * -* See the ttwu() WF_ON_CPU case and its ordering comment. +* See the smp_load_acquire(&p->on_cpu) case in ttwu() and +* its ordering comment. */ WRITE_ONCE (next->on_cpu,1 );#endif
kernel/sched/sched.h +0 -1
@@ -2044,7 +2044,6 @@ static inline int task_on_rq_migrating(struct task_struct *p)#define WF_SYNC 0x10/* Waker goes to sleep after wakeup */ #define WF_MIGRATED 0x20/* Internal use, task got migrated */ -#define WF_ON_CPU 0x40/* Wakee is on_cpu */ #ifdef CONFIG_SMP static_assert (WF_EXEC ==SD_BALANCE_EXEC );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1027/1157 sched/core: Do not requeue task on CPU excluded from cpus_mask
In reply to Greg Kroah-HartmanFrom: Mel Gorman <[email protected]>
[ Upstream commit 751d4cbc43879229dbc124afefe240b70fd29a85 ]
The following warning was triggered on a large machine early in boot on a distribution kernel but the same problem should also affect mainline.
WARNING: CPU: 439 PID: 10 at ../kernel/workqueue.c:2231 process_one_work+0x4d/0x440
Call Trace:
<TASK>
rescuer_thread+0x1f6/0x360
kthread+0x156/0x180
ret_from_fork+0x22/0x30
</TASK>Commit c6e7bd7afaeb ("sched/core: Optimize ttwu() spinning on p->on_cpu") optimises ttwu by queueing a task that is descheduling on the wakelist, but does not check if the task descheduling is still allowed to run on that CPU.
In this warning, the problematic task is a workqueue rescue thread which checks if the rescue is for a per-cpu workqueue and running on the wrong CPU. While this is early in boot and it should be possible to create workers, the rescue thread may still used if the MAYDAY_INITIAL_TIMEOUT is reached or MAYDAY_INTERVAL and on a sufficiently large machine, the rescue thread is being used frequently.
Tracing confirmed that the task should have migrated properly using the stopper thread to handle the migration. However, a parallel wakeup from udev running on another CPU that does not share CPU cache observes p->on_cpu and uses task_cpu(p), queues the task on the old CPU and triggers the warning.
Check that the wakee task that is descheduling is still allowed to run on its current CPU and if not, wait for the descheduling to complete and select an allowed CPU.
--- kernel/sched/core.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
kernel/sched/core.c +6 -2
@@ -3808,7 +3808,7 @@ bool cpus_share_cache(int this_cpu, int that_cpu)return per_cpu (sd_llc_id, this_cpu) ==per_cpu (sd_llc_id, that_cpu); } -static inline bool ttwu_queue_cond (int cpu) +static inline bool ttwu_queue_cond (struct task_struct *p,int cpu) {/* * Do not complicate things with the async wake_list while the CPU is
@@ -3817,6 +3817,10 @@ static inline bool ttwu_queue_cond(int cpu)if (!cpu_active (cpu))return false; +/* Ensure the task will still be allowed to run on the CPU. */ +if (!cpumask_test_cpu (cpu, p->cpus_ptr)) +return false; +/* * If the CPU does not share cache, then queue the task on the * remote rqs wakelist to avoid accessing remote data.
@@ -3846,7 +3850,7 @@ static inline bool ttwu_queue_cond(int cpu)static bool ttwu_queue_wakelist (struct task_struct *p,int cpu,int wake_flags) { -if (sched_feat (TTWU_QUEUE ) &&ttwu_queue_cond (cpu)) { +if (sched_feat (TTWU_QUEUE ) &&ttwu_queue_cond (p, cpu)) {sched_clock_cpu (cpu);/* Sync clocks across CPUs */ __ttwu_queue_wakelist (p, cpu, wake_flags);return true;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1028/1157 x86/entry: Build thunk_$(BITS) only if CONFIG_PREEMPTION=y
In reply to Greg Kroah-HartmanFrom: Andrea Righi <[email protected]>
[ Upstream commit de979c83574abf6e78f3fa65b716515c91b2613d ]
With CONFIG_PREEMPTION disabled, arch/x86/entry/thunk_$(BITS).o becomes an empty object file.
With some old versions of binutils (i.e., 2.35.90.20210113-1ubuntu1) the GNU assembler doesn't generate a symbol table for empty object files and objtool fails with the following error when a valid symbol table cannot be found:
arch/x86/entry/thunk_64.o: warning: objtool: missing symbol table
To prevent this from happening, build thunk_$(BITS).o only if CONFIG_PREEMPTION is enabled.
--- arch/x86/entry/Makefile | 3 ++- arch/x86/entry/thunk_32.S | 2 -- arch/x86/entry/thunk_64.S | 4 ---- arch/x86/um/Makefile | 3 ++- 4 files changed, 4 insertions(+), 8 deletions(-)
arch/x86/entry/Makefile +2 -1
@@ -11,12 +11,13 @@ CFLAGS_REMOVE_common.o = $(CC_FLAGS_FTRACE) CFLAGS_common.o += -fno-stack-protector -obj-y := entry.o entry_$(BITS).o thunk_$(BITS).o syscall_$(BITS).o +obj-y := entry.o entry_$(BITS).o syscall_$(BITS).o obj-y += common.o obj-y += vdso/ obj-y += vsyscall/ +obj-$(CONFIG_PREEMPTION) += thunk_$(BITS).o obj-$(CONFIG_IA32_EMULATION) += entry_64_compat.o syscall_32.o obj-$(CONFIG_X86_X32_ABI) += syscall_x32.o
arch/x86/entry/thunk_32.S +0 -2
@@ -29,10 +29,8 @@ SYM_CODE_START_NOALIGN(\name) SYM_CODE_END(\name) .endm -#ifdef CONFIG_PREEMPTION THUNK preempt_schedule_thunk, preempt_schedule THUNK preempt_schedule_notrace_thunk, preempt_schedule_notrace EXPORT_SYMBOL(preempt_schedule_thunk) EXPORT_SYMBOL(preempt_schedule_notrace_thunk) -#endif
arch/x86/entry/thunk_64.S +0 -4
@@ -31,14 +31,11 @@ SYM_FUNC_END(\name) _ASM_NOKPROBE(\name) .endm -#ifdef CONFIG_PREEMPTION THUNK preempt_schedule_thunk, preempt_schedule THUNK preempt_schedule_notrace_thunk, preempt_schedule_notrace EXPORT_SYMBOL(preempt_schedule_thunk) EXPORT_SYMBOL(preempt_schedule_notrace_thunk) -#endif -#ifdef CONFIG_PREEMPTION SYM_CODE_START_LOCAL_NOALIGN(__thunk_restore) popq %r11 popq %r10
@@ -53,4 +50,3 @@ SYM_CODE_START_LOCAL_NOALIGN(__thunk_restore) RET _ASM_NOKPROBE(__thunk_restore) SYM_CODE_END(__thunk_restore) -#endif
arch/x86/um/Makefile +2 -1
@@ -28,7 +28,8 @@ else obj-y += syscalls_64.o vdso/ -subarch-y = ../lib/csum-partial_64.o ../lib/memcpy_64.o ../entry/thunk_64.o +subarch-y = ../lib/csum-partial_64.o ../lib/memcpy_64.o +subarch-$(CONFIG_PREEMPTION) += ../entry/thunk_64.o endif
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1029/1157 f2fs: do not allow to decompress files have FI_COMPRESS_RELEASED
In reply to Greg Kroah-HartmanFrom: Jaewook Kim <[email protected]>
[ Upstream commit 90be48bd9d29ece3965e5e8b21499b6db166e57b ]
If a file has FI_COMPRESS_RELEASED, all writes for it should not be allowed. However, as of now, in case of compress_mode=user, writes triggered by IOCTLs like F2FS_IOC_DE/COMPRESS_FILE are allowed unexpectly, which could crash that file.
To fix it, let's do not allow F2FS_IOC_DE/COMPRESS_IOCTL if a file already has FI_COMPRESS_RELEASED flag.
This is the reproduction process:
1. $ touch ./file 2. $ chattr +c ./file 3. $ dd if=/dev/random of=./file bs=4096 count=30 conv=notrunc 4. $ dd if=/dev/zero of=./file bs=4096 count=34 seek=30 conv=notrunc 5. $ sync 6. $ do_compress ./file ; call F2FS_IOC_COMPRESS_FILE 7. $ get_compr_blocks ./file ; call F2FS_IOC_GET_COMPRESS_BLOCKS 8. $ release ./file ; call F2FS_IOC_RELEASE_COMPRESS_BLOCKS 9. $ do_compress ./file ; call F2FS_IOC_COMPRESS_FILE again
10. $ get_compr_blocks ./file ; call F2FS_IOC_GET_COMPRESS_BLOCKS again
This reproduction process is tested in 128kb cluster size. You can find compr_blocks has a negative value.
--- fs/f2fs/file.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
fs/f2fs/file.c +10 -0
@@ -3938,6 +3938,11 @@ static int f2fs_ioc_decompress_file(struct file *filp, unsigned long arg) goto out; } +if (is_inode_flag_set (inode,FI_COMPRESS_RELEASED )) { + ret = -EINVAL ; + goto out; + } + ret =filemap_write_and_wait_range (inode->i_mapping,0 ,LLONG_MAX );if (ret) goto out;
@@ -4005,6 +4010,11 @@ static int f2fs_ioc_compress_file(struct file *filp, unsigned long arg) goto out; } +if (is_inode_flag_set (inode,FI_COMPRESS_RELEASED )) { + ret = -EINVAL ; + goto out; + } + ret =filemap_write_and_wait_range (inode->i_mapping,0 ,LLONG_MAX );if (ret) goto out;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1030/1157 video: fbdev: vt8623fb: Check the size of screen before memset_io()
In reply to Greg Kroah-HartmanFrom: Zheyu Ma <[email protected]>
[ Upstream commit ec0754c60217248fa77cc9005d66b2b55200ac06 ]
In the function vt8623fb_set_par(), the value of 'screen_size' is calculated by the user input. If the user provides the improper value, the value of 'screen_size' may larger than 'info->screen_size', which may cause the following bug:
[ 583.339036] BUG: unable to handle page fault for address: ffffc90005000000 [ 583.339049] #PF: supervisor write access in kernel mode [ 583.339052] #PF: error_code(0x0002) - not-present page [ 583.339074] RIP: 0010:memset_orig+0x33/0xb0 [ 583.339110] Call Trace: [ 583.339118] vt8623fb_set_par+0x11cd/0x21e0 [ 583.339146] fb_set_var+0x604/0xeb0 [ 583.339181] do_fb_ioctl+0x234/0x670 [ 583.339209] fb_ioctl+0xdd/0x130
Fix the this by checking the value of 'screen_size' before memset_io().
--- drivers/video/fbdev/vt8623fb.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/video/fbdev/vt8623fb.c +2 -0
@@ -507,6 +507,8 @@ static int vt8623fb_set_par(struct fb_info *info) (info->var.vmode &FB_VMODE_DOUBLE ) ?2 :1 ,1 , 1, info->node); +if (screen_size > info->screen_size) + screen_size = info->screen_size;memset_io (info->screen_base,0x00 , screen_size);/* Device and screen back on */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1031/1157 video: fbdev: arkfb: Check the size of screen before memset_io()
In reply to Greg Kroah-HartmanFrom: Zheyu Ma <[email protected]>
[ Upstream commit 96b550971c65d54d64728d8ba973487878a06454 ]
In the function arkfb_set_par(), the value of 'screen_size' is calculated by the user input. If the user provides the improper value, the value of 'screen_size' may larger than 'info->screen_size', which may cause the following bug:
[ 659.399066] BUG: unable to handle page fault for address: ffffc90003000000 [ 659.399077] #PF: supervisor write access in kernel mode [ 659.399079] #PF: error_code(0x0002) - not-present page [ 659.399094] RIP: 0010:memset_orig+0x33/0xb0 [ 659.399116] Call Trace: [ 659.399122] arkfb_set_par+0x143f/0x24c0 [ 659.399130] fb_set_var+0x604/0xeb0 [ 659.399161] do_fb_ioctl+0x234/0x670 [ 659.399189] fb_ioctl+0xdd/0x130
Fix the this by checking the value of 'screen_size' before memset_io().
--- drivers/video/fbdev/arkfb.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/video/fbdev/arkfb.c +2 -0
@@ -797,6 +797,8 @@ static int arkfb_set_par(struct fb_info *info) value = ((value * hmul / hdiv) /8 ) -5 ;vga_wcrt (par->state.vgabase,0x42 , (value +1 ) /2 ); +if (screen_size > info->screen_size) + screen_size = info->screen_size;memset_io (info->screen_base,0x00 , screen_size);/* Device and screen back on */ svga_wcrt_mask (par->state.vgabase,0x17 ,0x80 ,0x80 );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1032/1157 video: fbdev: s3fb: Check the size of screen before memset_io()
In reply to Greg Kroah-HartmanFrom: Zheyu Ma <[email protected]>
[ Upstream commit 6ba592fa014f21f35a8ee8da4ca7b95a018f13e8 ]
In the function s3fb_set_par(), the value of 'screen_size' is calculated by the user input. If the user provides the improper value, the value of 'screen_size' may larger than 'info->screen_size', which may cause the following bug:
[ 54.083733] BUG: unable to handle page fault for address: ffffc90003000000 [ 54.083742] #PF: supervisor write access in kernel mode [ 54.083744] #PF: error_code(0x0002) - not-present page [ 54.083760] RIP: 0010:memset_orig+0x33/0xb0 [ 54.083782] Call Trace: [ 54.083788] s3fb_set_par+0x1ec6/0x4040 [ 54.083806] fb_set_var+0x604/0xeb0 [ 54.083836] do_fb_ioctl+0x234/0x670
Fix the this by checking the value of 'screen_size' before memset_io().
--- drivers/video/fbdev/s3fb.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/video/fbdev/s3fb.c +2 -0
@@ -905,6 +905,8 @@ static int s3fb_set_par(struct fb_info *info) value =clamp ((htotal + hsstart +1 ) /2 +2 , hsstart +4 , htotal +1 );svga_wcrt_multi (par->state.vgabase, s3_dtpc_regs, value); +if (screen_size > info->screen_size) + screen_size = info->screen_size;memset_io (info->screen_base,0x00 , screen_size);/* Device and screen back on */ svga_wcrt_mask (par->state.vgabase,0x17 ,0x80 ,0x80 );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1033/1157 scsi: ufs: core: Correct ufshcd_shutdown() flow
In reply to Greg Kroah-HartmanFrom: Peter Wang <[email protected]>
commit 00511d2abf5708ad05dd5d1c36adb2468d274698 upstream.
After ufshcd_wl_shutdown() set device power off and link off, ufshcd_shutdown() could turn off clock/power. Also remove pm_runtime_get_sync.
The reason why it is safe to remove pm_runtime_get_sync() is because:
- ufshcd_wl_shutdown() -> pm_runtime_get_sync() will resume hba->dev too.
- device resume(turn on clk/power) is not required, even if device is in RPM_SUSPENDED.
--- drivers/ufs/core/ufshcd.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/ufs/core/ufshcd.c +1 -5
@@ -9484,12 +9484,8 @@ EXPORT_SYMBOL(ufshcd_runtime_resume);int ufshcd_shutdown (struct ufs_hba *hba) {if (ufshcd_is_ufs_dev_poweroff (hba) &&ufshcd_is_link_off (hba)) - goto out; +ufshcd_suspend (hba); -pm_runtime_get_sync (hba->dev); - -ufshcd_suspend (hba); -out: hba->is_powered = false;/* allow force shutdown even in case of errors */ return 0 ;
Greg Kroah-Hartman
maintainerPATCH 1034/1157 scsi: zfcp: Fix missing auto port scan and thus missing target ports
In reply to Greg Kroah-HartmanFrom: Steffen Maier <[email protected]>
commit 4da8c5f76825269f28d6a89fa752934a4bcb6dfa upstream.
Case (1):
The only waiter on wka_port->completion_wq is zfcp_fc_wka_port_get() trying to open a WKA port. As such it should only be woken up by WKA port *open* responses, not by WKA port close responses.
Case (2):
A close WKA port response coming in just after having sent a new open WKA port request and before blocking for the open response with wait_event() in zfcp_fc_wka_port_get() erroneously renders the wait_event a NOP because the close handler overwrites wka_port->status. Hence the wait_event condition is erroneously true and it does not enter blocking state.
With non-negligible probability, the following time space sequence happens depending on timing without this fix:
user process ERP thread zfcp work queue tasklet system work queue
============ ========== =============== ======= =================
$ echo 1 > online
zfcp_ccw_set_online
zfcp_ccw_activate
zfcp_erp_adapter_reopen
msleep scan backoff zfcp_erp_strategy
| ...
| zfcp_erp_action_cleanup
| ...
| queue delayed scan_work
| queue ns_up_work
| ns_up_work:
| zfcp_fc_wka_port_get
| open wka request
| open response
| GSPN FC-GS
| RSPN FC-GS [NPIV-only]
| zfcp_fc_wka_port_put
| (--wka->refcount==0)
| sched delayed wka->work
|
~~~Case (1)~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
zfcp_erp_wait
flush scan_work
| wka->work:
| wka->status=CLOSING
| close wka request
| scan_work:
| zfcp_fc_wka_port_get
| (wka->status==CLOSING)
| wka->status=OPENING
| open wka request
| wait_event
| | close response
| | wka->status=OFFLINE
| | wake_up /*WRONG*/
~~~Case (2)~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| wka->work:
| wka->status=CLOSING
| close wka request
zfcp_erp_wait
flush scan_work
| scan_work:
| zfcp_fc_wka_port_get
| (wka->status==CLOSING)
| wka->status=OPENING
| open wka request
| close response
| wka->status=OFFLINE
| wake_up /*WRONG&NOP*/
| wait_event /*NOP*/
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
| (wka->status!=ONLINE)
| return -EIO
| return early
open response
wka->status=ONLINE
wake_up /*NOP*/So we erroneously end up with no automatic port scan. This is a big problem when it happens during boot. The timing is influenced by v3.19 commit 18f87a67e6d6 ("zfcp: auto port scan resiliency").
Fix it by fully mutually excluding zfcp_fc_wka_port_get() and zfcp_fc_wka_port_offline(). For that to work, we make the latter block until we got the response for a close WKA port. In order not to penalize the system workqueue, we move wka_port->work to our own adapter workqueue. Note that before v2.6.30 commit 828bc1212a68 ("[SCSI] zfcp: Set WKA-port to offline on adapter deactivation"), zfcp did block in zfcp_fc_wka_port_offline() as well, but with a different condition.
While at it, make non-functional cleanups to improve code reading in zfcp_fc_wka_port_get(). If we cannot send the WKA port open request, don't rely on the subsequent wait_event condition to immediately let this case pass without blocking. Also don't want to rely on the additional condition handling the refcount to be skipped just to finally return with -EIO.
--- drivers/s390/scsi/zfcp_fc.c | 29 ++++++++++++++++++++--------- drivers/s390/scsi/zfcp_fc.h | 6 ++++-- drivers/s390/scsi/zfcp_fsf.c | 4 ++-- 3 files changed, 26 insertions(+), 13 deletions(-)
drivers/s390/scsi/zfcp_fc.c +20 -9
@@ -145,27 +145,33 @@ void zfcp_fc_enqueue_event(struct zfcp_astatic int zfcp_fc_wka_port_get (struct zfcp_fc_wka_port *wka_port) { +int ret = -EIO ; +if (mutex_lock_interruptible (&wka_port->mutex))return -ERESTARTSYS ;if (wka_port->status ==ZFCP_FC_WKA_PORT_OFFLINE || wka_port->status ==ZFCP_FC_WKA_PORT_CLOSING ) { wka_port->status =ZFCP_FC_WKA_PORT_OPENING ; -if (zfcp_fsf_open_wka_port (wka_port)) +if (zfcp_fsf_open_wka_port (wka_port)) { +/* could not even send request, nothing to wait for */ wka_port->status =ZFCP_FC_WKA_PORT_OFFLINE ; + goto out; + } } -mutex_unlock (&wka_port->mutex); - -wait_event (wka_port->completion_wq, +wait_event (wka_port->opened, wka_port->status ==ZFCP_FC_WKA_PORT_ONLINE || wka_port->status ==ZFCP_FC_WKA_PORT_OFFLINE );if (wka_port->status ==ZFCP_FC_WKA_PORT_ONLINE ) {atomic_inc (&wka_port->refcount); -return 0 ; + ret =0 ; + goto out; } -return -EIO ; +out: +mutex_unlock (&wka_port->mutex); +return ret; }static void zfcp_fc_wka_port_offline (struct work_struct *work)
@@ -181,9 +187,12 @@ static void zfcp_fc_wka_port_offline(str wka_port->status =ZFCP_FC_WKA_PORT_CLOSING ;if (zfcp_fsf_close_wka_port (wka_port)) { +/* could not even send request, nothing to wait for */ wka_port->status =ZFCP_FC_WKA_PORT_OFFLINE ; -wake_up (&wka_port->completion_wq); + goto out; } +wait_event (wka_port->closed, + wka_port->status ==ZFCP_FC_WKA_PORT_OFFLINE ); out:mutex_unlock (&wka_port->mutex); }
@@ -193,13 +202,15 @@ static void zfcp_fc_wka_port_put(structif (atomic_dec_return (&wka_port->refcount) !=0 )return ;/* wait 10 milliseconds, other reqs might pop in */ -schedule_delayed_work (&wka_port->work,HZ /100 ); +queue_delayed_work (wka_port->adapter->work_queue, &wka_port->work, +msecs_to_jiffies (10 )); }static void zfcp_fc_wka_port_init (struct zfcp_fc_wka_port *wka_port,u32 d_id,struct zfcp_adapter *adapter) { -init_waitqueue_head (&wka_port->completion_wq); +init_waitqueue_head (&wka_port->opened); +init_waitqueue_head (&wka_port->closed); wka_port->adapter = adapter; wka_port->d_id = d_id;
drivers/s390/scsi/zfcp_fc.h +4 -2
@@ -185,7 +185,8 @@ enum zfcp_fc_wka_status {/** * struct zfcp_fc_wka_port - representation of well-known-address (WKA) FC port * @adapter: Pointer to adapter structure this WKA port belongs to -* @completion_wq: Wait for completion of open/close command +* @opened: Wait for completion of open command +* @closed: Wait for completion of close command * @status: Current status of WKA port * @refcount: Reference count to keep port open as long as it is in use * @d_id: FC destination id or well-known-address
@@ -195,7 +196,8 @@ enum zfcp_fc_wka_status {*/ struct zfcp_fc_wka_port {struct zfcp_adapter *adapter; -wait_queue_head_t completion_wq; +wait_queue_head_t opened; +wait_queue_head_t closed;enum zfcp_fc_wka_status status;atomic_t refcount;u32 d_id;
drivers/s390/scsi/zfcp_fsf.c +2 -2
@@ -1907,7 +1907,7 @@ static void zfcp_fsf_open_wka_port_handl wka_port->status =ZFCP_FC_WKA_PORT_ONLINE ; } out: -wake_up (&wka_port->completion_wq); +wake_up (&wka_port->opened); }/**
@@ -1966,7 +1966,7 @@ static void zfcp_fsf_close_wka_port_hand } wka_port->status =ZFCP_FC_WKA_PORT_OFFLINE ; -wake_up (&wka_port->completion_wq); +wake_up (&wka_port->closed); }/**
Greg Kroah-Hartman
maintainerPATCH 1035/1157 scsi: qla2xxx: Fix imbalance vha->vref_count
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
commit 63fa7f2644b4b48e1913af33092c044bf48e9321 upstream.
vref_count took an extra decrement in the task management path. Add an extra ref count to compensate the imbalance.
--- drivers/scsi/qla2xxx/qla_init.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/scsi/qla2xxx/qla_init.c +4 -0
@@ -161,6 +161,7 @@ int qla24xx_async_abort_cmd(srb_t *cmd_sstruct srb_iocb *abt_iocb;srb_t *sp;int rval =QLA_FUNCTION_FAILED ; +uint8_t bail;/* ref: INIT for ABTS command */ sp = qla2xxx_get_qpair_sp(cmd_sp->vha, cmd_sp->qpair, cmd_sp->fcport,
@@ -168,6 +169,7 @@ int qla24xx_async_abort_cmd(srb_t *cmd_sif (!sp)return QLA_MEMORY_ALLOC_FAILED ; +QLA_VHA_MARK_BUSY (vha, bail); abt_iocb = &sp->u.iocb_cmd; sp->type =SRB_ABT_CMD ; sp->name ="abort" ;
@@ -2007,12 +2009,14 @@ qla2x00_async_tm_cmd(fc_port_t *fcport,struct srb_iocb *tm_iocb;srb_t *sp;int rval =QLA_FUNCTION_FAILED ; +uint8_t bail;/* ref: INIT */ sp =qla2x00_get_sp (vha, fcport,GFP_KERNEL );if (!sp) goto done; +QLA_VHA_MARK_BUSY (vha, bail); sp->type =SRB_TM_CMD ; sp->name ="tmf" ; qla2x00_init_async_sp(sp, qla2x00_get_async_timeout(vha),
Greg Kroah-Hartman
maintainerPATCH 1036/1157 scsi: qla2xxx: Fix discovery issues in FC-AL topology
In reply to Greg Kroah-HartmanFrom: Arun Easi <[email protected]>
commit 47ccb113cead905bdc236571bf8ac6fed90321b3 upstream.
A direct attach tape device, when gets swapped with another, was not discovered. Fix this by looking at loop map and reinitialize link if there are devices present.
--- drivers/scsi/qla2xxx/qla_gbl.h | 3 ++- drivers/scsi/qla2xxx/qla_init.c | 29 +++++++++++++++++++++++++++++ drivers/scsi/qla2xxx/qla_mbx.c | 5 ++++- 3 files changed, 35 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_gbl.h +2 -1
@@ -434,7 +434,8 @@ extern intqla2x00_get_resource_cnts (scsi_qla_host_t *);extern int -qla2x00_get_fcal_position_map (scsi_qla_host_t *ha,char *pos_map); +qla2x00_get_fcal_position_map (scsi_qla_host_t *ha,char *pos_map, +u8 *num_entries); extern int qla2x00_get_link_status(scsi_qla_host_t *, uint16_t, struct link_statistics *,
drivers/scsi/qla2xxx/qla_init.c +29 -0
@@ -5505,6 +5505,22 @@ static int qla2x00_configure_n2n_loop(screturn QLA_FUNCTION_FAILED ; } +static void +qla_reinitialize_link (scsi_qla_host_t *vha) +{ +int rval; + +atomic_set (&vha->loop_state,LOOP_DOWN ); +atomic_set (&vha->loop_down_timer,LOOP_DOWN_TIME ); + rval =qla2x00_full_login_lip (vha); +if (rval ==QLA_SUCCESS ) { +ql_dbg (ql_dbg_disc, vha,0xd050 ,"Link reinitialized\n" ); + }else { +ql_dbg (ql_dbg_disc, vha,0xd051 , +"Link reinitialization failed (%d)\n" , rval); + } +} +/* * qla2x00_configure_local_loop * Updates Fibre Channel Device Database with local loop devices.
@@ -5556,6 +5572,19 @@ qla2x00_configure_local_loop(scsi_qla_hospin_unlock_irqrestore (&vha->work_lock, flags);if (vha->scan.scan_retry <MAX_SCAN_RETRIES ) { +u8 loop_map_entries =0 ; +int rc; + + rc =qla2x00_get_fcal_position_map (vha,NULL , + &loop_map_entries); +if (rc ==QLA_SUCCESS && loop_map_entries >1 ) { +/* +* There are devices that are still not logged +* in. Reinitialize to give them a chance. +*/ +qla_reinitialize_link (vha); +return QLA_FUNCTION_FAILED ; + }set_bit (LOCAL_LOOP_UPDATE , &vha->dpc_flags);set_bit (LOOP_RESYNC_NEEDED , &vha->dpc_flags); }
drivers/scsi/qla2xxx/qla_mbx.c +4 -1
@@ -3068,7 +3068,8 @@ qla2x00_get_resource_cnts(scsi_qla_host_* Kernel context. */ int -qla2x00_get_fcal_position_map (scsi_qla_host_t *vha,char *pos_map) +qla2x00_get_fcal_position_map (scsi_qla_host_t *vha,char *pos_map, +u8 *num_entries) {int rval;mbx_cmd_t mc;
@@ -3108,6 +3109,8 @@ qla2x00_get_fcal_position_map(scsi_qla_hif (pos_map)memcpy (pos_map, pmap,FCAL_MAP_SIZE ); +if (num_entries) + *num_entries = pmap[0 ]; }dma_pool_free (ha->s_dma_pool, pmap, pmap_dma);
Greg Kroah-Hartman
maintainerPATCH 1037/1157 scsi: qla2xxx: Turn off multi-queue for 8G adapters
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
commit 5304673bdb1635e27555bd636fd5d6956f1cd552 upstream.
For 8G adapters, multi-queue was enabled accidentally. Make sure multi-queue is not enabled.
--- drivers/scsi/qla2xxx/qla_def.h | 4 ++-- drivers/scsi/qla2xxx/qla_isr.c | 16 ++++++---------- 2 files changed, 8 insertions(+), 12 deletions(-)
drivers/scsi/qla2xxx/qla_def.h +2 -2
@@ -4264,8 +4264,8 @@ struct qla_hw_data {#define IS_OEM_001 (ha) ((ha)->device_type & DT_OEM_001)#define HAS_EXTENDED_IDS (ha) ((ha)->device_type & DT_EXTENDED_IDS)#define IS_CT6_SUPPORTED (ha) ((ha)->device_type & DT_CT6_SUPPORTED) -#define IS_MQUE_CAPABLE (ha) ((ha)->mqenable || IS_QLA83XX(ha) || \ - IS_QLA27XX(ha) || IS_QLA28XX(ha)) +#define IS_MQUE_CAPABLE (ha) (IS_QLA83XX(ha) || IS_QLA27XX(ha) || \ + IS_QLA28XX(ha))#define IS_BIDI_CAPABLE (ha) \ (IS_QLA25XX(ha) || IS_QLA2031(ha) || IS_QLA27XX(ha) || IS_QLA28XX(ha))/* Bit 21 of fw_attributes decides the MCTP capabilities */
drivers/scsi/qla2xxx/qla_isr.c +6 -10
@@ -4419,16 +4419,12 @@ msix_register_fail: }/* Enable MSI-X vector for response queue update for queue 0 */ -if (IS_QLA83XX (ha) ||IS_QLA27XX (ha) ||IS_QLA28XX (ha)) { -if (ha->msixbase && ha->mqiobase && - (ha->max_rsp_queues >1 || ha->max_req_queues >1 || - ql2xmqsupport)) - ha->mqenable =1 ; - }else -if (ha->mqiobase && - (ha->max_rsp_queues >1 || ha->max_req_queues >1 || - ql2xmqsupport)) - ha->mqenable =1 ; +if (IS_MQUE_CAPABLE (ha) && + (ha->msixbase && ha->mqiobase && ha->max_qpairs)) + ha->mqenable =1 ; +else + ha->mqenable =0 ; +ql_dbg (ql_dbg_multiq, vha,0xc005 ,"mqiobase=%p, max_rsp_queues=%d, max_req_queues=%d.\n" , ha->mqiobase, ha->max_rsp_queues, ha->max_req_queues);
Greg Kroah-Hartman
maintainerPATCH 1038/1157 scsi: qla2xxx: Fix crash due to stale SRB access around I/O timeouts
In reply to Greg Kroah-HartmanFrom: Arun Easi <[email protected]>
commit c39587bc0abaf16593f7abcdf8aeec3c038c7d52 upstream.
Ensure SRB is returned during I/O timeout error escalation. If that is not possible fail the escalation path.
Following crash stack was seen:
BUG: unable to handle kernel paging request at 0000002f56aa90f8 IP: qla_chk_edif_rx_sa_delete_pending+0x14/0x30 [qla2xxx] Call Trace: ? qla2x00_status_entry+0x19f/0x1c50 [qla2xxx] ? qla2x00_start_sp+0x116/0x1170 [qla2xxx] ? dma_pool_alloc+0x1d6/0x210 ? mempool_alloc+0x54/0x130 ? qla24xx_process_response_queue+0x548/0x12b0 [qla2xxx] ? qla_do_work+0x2d/0x40 [qla2xxx] ? process_one_work+0x14c/0x390
--- drivers/scsi/qla2xxx/qla_os.c | 43 ++++++++++++++++++++++++++++++------------ 1 file changed, 31 insertions(+), 12 deletions(-)
drivers/scsi/qla2xxx/qla_os.c +31 -12
@@ -1337,21 +1337,20 @@ qla2xxx_eh_abort(struct scsi_cmnd *cmd)/* * Returns: QLA_SUCCESS or QLA_FUNCTION_FAILED. */ -int -qla2x00_eh_wait_for_pending_commands (scsi_qla_host_t *vha,unsigned int t, -uint64_t l,enum nexus_wait_type type) +static int +__qla2x00_eh_wait_for_pending_commands (struct qla_qpair *qpair,unsigned int t, +uint64_t l,enum nexus_wait_type type) {int cnt, match, status;unsigned long flags; -struct qla_hw_data *ha = vha->hw; -struct req_que *req; +scsi_qla_host_t *vha = qpair->vha; +struct req_que *req = qpair->req;srb_t *sp;struct scsi_cmnd *cmd; status =QLA_SUCCESS ; -spin_lock_irqsave (&ha->hardware_lock, flags); - req = vha->req; +spin_lock_irqsave (qpair->qp_lock_ptr, flags);for (cnt =1 ; status ==QLA_SUCCESS && cnt < req->num_outstanding_cmds; cnt++) { sp = req->outstanding_cmds[cnt];
@@ -1378,12 +1377,32 @@ qla2x00_eh_wait_for_pending_commands(scsif (!match)continue ; -spin_unlock_irqrestore (&ha->hardware_lock, flags); +spin_unlock_irqrestore (qpair->qp_lock_ptr, flags); status =qla2x00_eh_wait_on_command (cmd); -spin_lock_irqsave (&ha->hardware_lock, flags); +spin_lock_irqsave (qpair->qp_lock_ptr, flags); } -spin_unlock_irqrestore (&ha->hardware_lock, flags); +spin_unlock_irqrestore (qpair->qp_lock_ptr, flags); + +return status; +} + +int +qla2x00_eh_wait_for_pending_commands (scsi_qla_host_t *vha,unsigned int t, +uint64_t l,enum nexus_wait_type type) +{ +struct qla_qpair *qpair; +struct qla_hw_data *ha = vha->hw; +int i, status =QLA_SUCCESS ; + status =__qla2x00_eh_wait_for_pending_commands (ha->base_qpair, t, l, + type); +for (i =0 ; status ==QLA_SUCCESS && i < ha->max_qpairs; i++) { + qpair = ha->queue_pair_map[i]; +if (!qpair) +continue ; + status =__qla2x00_eh_wait_for_pending_commands (qpair, t, l, + type); + }return status; }
@@ -1420,7 +1439,7 @@ qla2xxx_eh_device_reset(struct scsi_cmndreturn err;if (fcport->deleted) -return SUCCESS ; +return FAILED ; ql_log(ql_log_info, vha, 0x8009, "DEVICE RESET ISSUED nexus=%ld:%d:%llu cmd=%p.\n", vha->host_no,
@@ -1488,7 +1507,7 @@ qla2xxx_eh_target_reset(struct scsi_cmndreturn err;if (fcport->deleted) -return SUCCESS ; +return FAILED ; ql_log(ql_log_info, vha, 0x8009, "TARGET RESET ISSUED nexus=%ld:%d cmd=%p.\n", vha->host_no,
Greg Kroah-Hartman
maintainerPATCH 1039/1157 scsi: qla2xxx: Fix excessive I/O error messages by default
In reply to Greg Kroah-HartmanFrom: Arun Easi <[email protected]>
commit bff4873c709085e09d0ffae0c25b8e65256e3205 upstream.
Disable printing I/O error messages by default. The messages will be printed only when logging was enabled.
--- drivers/scsi/qla2xxx/qla_isr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_isr.c +2 -2
@@ -2637,7 +2637,7 @@ static void qla24xx_nvme_iocb_entry(scsi }if (unlikely (logit)) - ql_log(ql_dbg_io, fcport->vha, 0x5060, + ql_dbg(ql_dbg_io, fcport->vha, 0x5060, "NVME-%s ERR Handling - hdl=%x status(%x) tr_len:%x resid=%x ox_id=%x\n", sp->name, sp->handle, comp_status, fd->transferred_length, le32_to_cpu(sts->residual_len),
@@ -3495,7 +3495,7 @@ check_scsi_status: out:if (logit) - ql_log(ql_dbg_io, fcport->vha, 0x3022, + ql_dbg(ql_dbg_io, fcport->vha, 0x3022, "FCP command status: 0x%x-0x%x (0x%x) nexus=%ld:%d:%llu portid=%02x%02x%02x oxid=0x%x cdb=%10phN len=0x%x rsp_info=0x%x resid=0x%x fw_resid=0x%x sp=%p cp=%p.\n", comp_status, scsi_status, res, vha->host_no, cp->device->id, cp->device->lun, fcport->d_id.b.domain,
Greg Kroah-Hartman
maintainerPATCH 1040/1157 scsi: qla2xxx: Fix erroneous mailbox timeout after PCI error injection
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
commit f260694e6463b63ae550aad25ddefe94cb1904da upstream.
Clear wait for mailbox interrupt flag to prevent stale mailbox:
Feb 22 05:22:56 ltcden4-lp7 kernel: qla2xxx [0135:90:00.1]-500a:4: LOOP UP detected (16 Gbps). Feb 22 05:22:59 ltcden4-lp7 kernel: qla2xxx [0135:90:00.1]-d04c:4: MBX Command timeout for cmd 69, ...
To fix the issue, driver needs to clear the MBX_INTR_WAIT flag on purging the mailbox. When the stale mailbox completion does arrive, it will be dropped.
--- drivers/scsi/qla2xxx/qla_mbx.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/scsi/qla2xxx/qla_mbx.c +6 -6
@@ -276,6 +276,12 @@ qla2x00_mailbox_command(scsi_qla_host_tatomic_inc (&ha->num_pend_mbx_stage3);if (!wait_for_completion_timeout (&ha->mbx_intr_comp, mcp->tov *HZ )) { +ql_dbg (ql_dbg_mbx, vha,0x117a , +"cmd=%x Timeout.\n" , command); +spin_lock_irqsave (&ha->hardware_lock, flags); +clear_bit (MBX_INTR_WAIT , &ha->mbx_cmd_flags); +spin_unlock_irqrestore (&ha->hardware_lock, flags); +if (chip_reset != ha->chip_reset) { eeh_delay = ha->flags.eeh_busy ?1 :0 ;
@@ -288,12 +294,6 @@ qla2x00_mailbox_command(scsi_qla_host_t rval =QLA_ABORTED ; goto premature_exit; } -ql_dbg (ql_dbg_mbx, vha,0x117a , -"cmd=%x Timeout.\n" , command); -spin_lock_irqsave (&ha->hardware_lock, flags); -clear_bit (MBX_INTR_WAIT , &ha->mbx_cmd_flags); -spin_unlock_irqrestore (&ha->hardware_lock, flags); - }else if (ha->flags.purge_mbox || chip_reset != ha->chip_reset) { eeh_delay = ha->flags.eeh_busy ?1 :0 ;
Greg Kroah-Hartman
maintainerPATCH 1041/1157 scsi: qla2xxx: Wind down adapter after PCIe error
In reply to Greg Kroah-HartmanFrom: Quinn Tran <[email protected]>
commit d3117c83ba316b3200d9f2fe900f2b9a5525a25c upstream.
Put adapter into a wind down state if OS does not make any attempt to recover the adapter after PCIe error.
--- drivers/scsi/qla2xxx/qla_bsg.c | 10 +++++++- drivers/scsi/qla2xxx/qla_def.h | 4 +++ drivers/scsi/qla2xxx/qla_init.c | 20 ++++++++++++++++ drivers/scsi/qla2xxx/qla_os.c | 48 ++++++++++++++++++++++++++++++++++++++++ 4 files changed, 81 insertions(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_bsg.c +9 -1
@@ -2975,6 +2975,13 @@ qla24xx_bsg_timeout(struct bsg_job *bsg_ql_log (ql_log_info, vha,0x708b ,"%s CMD timeout. bsg ptr %p.\n" , __func__, bsg_job); + +if (qla2x00_isp_reg_stat (ha)) { +ql_log (ql_log_info, vha,0x9007 , +"PCI/Register disconnect.\n" ); +qla_pci_set_eeh_busy (vha); + } +/* find the bsg job from the active list of commands */ spin_lock_irqsave (&ha->hardware_lock, flags);for (que =0 ; que < ha->max_req_queues; que++) {
@@ -2992,7 +2999,8 @@ qla24xx_bsg_timeout(struct bsg_job *bsg_ sp->u.bsg_job == bsg_job) { req->outstanding_cmds[cnt] =NULL ;spin_unlock_irqrestore (&ha->hardware_lock, flags); -if (ha->isp_ops->abort_command (sp)) { + +if (!ha->flags.eeh_busy && ha->isp_ops->abort_command (sp)) {ql_log (ql_log_warn, vha,0x7089 ,"mbx abort_command failed.\n" ); bsg_reply->result = -EIO ;
drivers/scsi/qla2xxx/qla_def.h +4 -0
@@ -4048,6 +4048,9 @@ struct qla_hw_data { uint32_t n2n_fw_acc_sec:1; uint32_t plogi_template_valid:1; uint32_t port_isolated:1; + uint32_t eeh_flush:2; +#define EEH_FLUSH_RDY 1 +#define EEH_FLUSH_DONE 2 } flags;uint16_t max_exchg;
@@ -4082,6 +4085,7 @@ struct qla_hw_data {uint32_t rsp_que_len;uint32_t req_que_off;uint32_t rsp_que_off; +unsigned long eeh_jif;/* Multi queue data structs */ device_reg_t *mqiobase;
drivers/scsi/qla2xxx/qla_init.c +20 -0
@@ -47,6 +47,7 @@ qla2x00_sp_timeout(struct timer_list *t) {srb_t *sp =from_timer (sp, t, u.iocb_cmd.timer);struct srb_iocb *iocb; +scsi_qla_host_t *vha = sp->vha;WARN_ON (irqs_disabled ()); iocb = &sp->u.iocb_cmd;
@@ -54,6 +55,12 @@ qla2x00_sp_timeout(struct timer_list *t)/* ref: TMR */ kref_put (&sp->cmd_kref, qla2x00_sp_release); + +if (vha &&qla2x00_isp_reg_stat (vha->hw)) { +ql_log (ql_log_info, vha,0x9008 , +"PCI/Register disconnect.\n" ); +qla_pci_set_eeh_busy (vha); + } }void qla2x00_sp_free (srb_t *sp)
@@ -9702,6 +9709,12 @@ int qla2xxx_disable_port(struct Scsi_Hos vha->hw->flags.port_isolated =1 ; +if (qla2x00_isp_reg_stat (vha->hw)) { +ql_log (ql_log_info, vha,0x9006 , +"PCI/Register disconnect, exiting.\n" ); +qla_pci_set_eeh_busy (vha); +return FAILED ; + }if (qla2x00_chip_is_down (vha))return 0 ;
@@ -9717,6 +9730,13 @@ int qla2xxx_enable_port(struct Scsi_Host {scsi_qla_host_t *vha =shost_priv (host); +if (qla2x00_isp_reg_stat (vha->hw)) { +ql_log (ql_log_info, vha,0x9001 , +"PCI/Register disconnect, exiting.\n" ); +qla_pci_set_eeh_busy (vha); +return FAILED ; + } + vha->hw->flags.port_isolated =0 ;/* Set the flag to 1, so that isp_abort can proceed */ vha->flags.online =1 ;
drivers/scsi/qla2xxx/qla_os.c +48 -0
72 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 1042/1157 scsi: qla2xxx: Fix losing FCP-2 targets on long port disable with I/Os
In reply to Greg Kroah-HartmanFrom: Arun Easi <[email protected]>
commit 2416ccd3815ba1613e10a6da0a24ef21acfe5633 upstream.
FCP-2 devices were not coming back online once they were lost, login retries exhausted, and then came back up. Fix this by accepting RSCN when the device is not online.
--- drivers/scsi/qla2xxx/qla_init.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +8 -4
@@ -1834,7 +1834,8 @@ void qla2x00_handle_rscn(scsi_qla_host_tcase RSCN_PORT_ADDR : fcport =qla2x00_find_fcport_by_nportid (vha, &ea->id,1 );if (fcport) { -if (fcport->flags &FCF_FCP2_DEVICE ) { +if (fcport->flags &FCF_FCP2_DEVICE && +atomic_read (&fcport->state) ==FCS_ONLINE ) {ql_dbg (ql_dbg_disc, vha,0x2115 ,"Delaying session delete for FCP2 portid=%06x %8phC " , fcport->d_id.b24, fcport->port_name);
@@ -1866,7 +1867,8 @@ void qla2x00_handle_rscn(scsi_qla_host_tbreak ;case RSCN_AREA_ADDR :list_for_each_entry (fcport, &vha->vp_fcports, list) { -if (fcport->flags &FCF_FCP2_DEVICE ) +if (fcport->flags &FCF_FCP2_DEVICE && +atomic_read (&fcport->state) ==FCS_ONLINE )continue ;if ((ea->id.b24 &0xffff00 ) == (fcport->d_id.b24 &0xffff00 )) {
@@ -1877,7 +1879,8 @@ void qla2x00_handle_rscn(scsi_qla_host_tbreak ;case RSCN_DOM_ADDR :list_for_each_entry (fcport, &vha->vp_fcports, list) { -if (fcport->flags &FCF_FCP2_DEVICE ) +if (fcport->flags &FCF_FCP2_DEVICE && +atomic_read (&fcport->state) ==FCS_ONLINE )continue ;if ((ea->id.b24 &0xff0000 ) == (fcport->d_id.b24 &0xff0000 )) {
@@ -1889,7 +1892,8 @@ void qla2x00_handle_rscn(scsi_qla_host_tcase RSCN_FAB_ADDR :default :list_for_each_entry (fcport, &vha->vp_fcports, list) { -if (fcport->flags &FCF_FCP2_DEVICE ) +if (fcport->flags &FCF_FCP2_DEVICE && +atomic_read (&fcport->state) ==FCS_ONLINE )continue ; fcport->scan_needed =1 ;
Greg Kroah-Hartman
maintainerPATCH 1043/1157 scsi: qla2xxx: Fix losing target when it reappears during delete
In reply to Greg Kroah-HartmanFrom: Arun Easi <[email protected]>
commit 118b0c863c8f5629cc5271fc24d72d926e0715d9 upstream.
FC target disappeared during port perturbation tests due to a race that tramples target state. Fix the issue by adding state checks before proceeding.
--- drivers/scsi/qla2xxx/qla_attr.c | 24 +++++++++++++++++------- 1 file changed, 17 insertions(+), 7 deletions(-)
drivers/scsi/qla2xxx/qla_attr.c +17 -7
@@ -2716,17 +2716,24 @@ qla2x00_dev_loss_tmo_callbk(struct fc_rpif (!fcport)return ; -/* Now that the rport has been deleted, set the fcport state to -FCS_DEVICE_DEAD */ -qla2x00_set_fcport_state (fcport,FCS_DEVICE_DEAD ); + +/* +* Now that the rport has been deleted, set the fcport state to +* FCS_DEVICE_DEAD, if the fcport is still lost. +*/ +if (fcport->scan_state !=QLA_FCPORT_FOUND ) +qla2x00_set_fcport_state (fcport,FCS_DEVICE_DEAD );/* * Transport has effectively 'deleted' the rport, clear * all local references. */ spin_lock_irqsave (host->host_lock, flags); - fcport->rport = fcport->drport =NULL ; - *((fc_port_t **)rport->dd_data) =NULL ; +/* Confirm port has not reappeared before clearing pointers. */ +if (rport->port_state !=FC_PORTSTATE_ONLINE ) { + fcport->rport = fcport->drport =NULL ; + *((fc_port_t **)rport->dd_data) =NULL ; + }spin_unlock_irqrestore (host->host_lock, flags);if (test_bit (ABORT_ISP_ACTIVE , &fcport->vha->dpc_flags))
@@ -2759,9 +2766,12 @@ qla2x00_terminate_rport_io(struct fc_rpo/* * At this point all fcport's software-states are cleared. Perform any * final cleanup of firmware resources (PCBs and XCBs). +* +* Attempt to cleanup only lost devices. */ if (fcport->loop_id !=FC_NO_LOOP_ID ) { -if (IS_FWI2_CAPABLE (fcport->vha->hw)) { +if (IS_FWI2_CAPABLE (fcport->vha->hw) && + fcport->scan_state !=QLA_FCPORT_FOUND ) {if (fcport->loop_id !=FC_NO_LOOP_ID ) fcport->logout_on_delete =1 ;
@@ -2771,7 +2781,7 @@ qla2x00_terminate_rport_io(struct fc_rpo __LINE__);qlt_schedule_sess_for_deletion (fcport); } - }else { + }else if (!IS_FWI2_CAPABLE (fcport->vha->hw)) {qla2x00_port_logout (fcport->vha, fcport); } }
Greg Kroah-Hartman
maintainerPATCH 1044/1157 scsi: qla2xxx: Fix losing FCP-2 targets during port perturbation tests
In reply to Greg Kroah-HartmanFrom: Arun Easi <[email protected]>
commit 58d1c124cd79ea686b512043c5bd515590b2ed95 upstream.
When a mix of FCP-2 (tape) and non-FCP-2 targets are present, FCP-2 target state was incorrectly transitioned when both of the targets were gone. Fix this by ignoring state transition for FCP-2 targets.
--- drivers/scsi/qla2xxx/qla_gs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_gs.c +1 -1
@@ -3629,7 +3629,7 @@ login_logout: do_delete) {if (fcport->loop_id !=FC_NO_LOOP_ID ) {if (fcport->flags &FCF_FCP2_DEVICE ) - fcport->logout_on_delete =0 ; +continue ; ql_log(ql_log_warn, vha, 0x20f0, "%s %d %8phC post del sess\n",
Greg Kroah-Hartman
maintainerPATCH 1045/1157 cifs: fix lock length calculation
In reply to Greg Kroah-HartmanFrom: Paulo Alcantara <[email protected]>
commit 773891ffd4d628d05c4e22f34541e4779ee7a076 upstream.
The lock length was wrongly set to 0 when fl_end == OFFSET_MAX, thus failing to lock the whole file when l_start=0 and l_len=0.
This fixes test 2 from cthon04.
Before patch:
$ ./cthon04/lock/tlocklfs -t 2 /mnt
Creating parent/child synchronization pipes.
Test #1 - Test regions of an unlocked file.
Parent: 1.1 - F_TEST [ 0, 1] PASSED.
Parent: 1.2 - F_TEST [ 0, ENDING] PASSED.
Parent: 1.3 - F_TEST [ 0,7fffffffffffffff] PASSED.
Parent: 1.4 - F_TEST [ 1, 1] PASSED.
Parent: 1.5 - F_TEST [ 1, ENDING] PASSED.
Parent: 1.6 - F_TEST [ 1,7fffffffffffffff] PASSED.
Parent: 1.7 - F_TEST [7fffffffffffffff, 1] PASSED.
Parent: 1.8 - F_TEST [7fffffffffffffff, ENDING] PASSED.
Parent: 1.9 - F_TEST [7fffffffffffffff,7fffffffffffffff] PASSED.Test #2 - Try to lock the whole file.
Parent: 2.0 - F_TLOCK [ 0, ENDING] PASSED.
Child: 2.1 - F_TEST [ 0, 1] FAILED! Child: **** Expected EACCES, returned success...
Child: **** Probably implementation error.
** CHILD pass 1 results: 0/0 pass, 0/0 warn, 1/1 fail (pass/total).
Parent: Child died
** PARENT pass 1 results: 10/10 pass, 0/0 warn, 0/0 fail (pass/total).
After patch:
$ ./cthon04/lock/tlocklfs -t 2 /mnt
Creating parent/child synchronization pipes.
Test #2 - Try to lock the whole file.
Parent: 2.0 - F_TLOCK [ 0, ENDING] PASSED.
Child: 2.1 - F_TEST [ 0, 1] PASSED.
Child: 2.2 - F_TEST [ 0, ENDING] PASSED.
Child: 2.3 - F_TEST [ 0,7fffffffffffffff] PASSED.
Child: 2.4 - F_TEST [ 1, 1] PASSED.
Child: 2.5 - F_TEST [ 1, ENDING] PASSED.
Child: 2.6 - F_TEST [ 1,7fffffffffffffff] PASSED.
Child: 2.7 - F_TEST [7fffffffffffffff, 1] PASSED.
Child: 2.8 - F_TEST [7fffffffffffffff, ENDING] PASSED.
Child: 2.9 - F_TEST [7fffffffffffffff,7fffffffffffffff] PASSED. Parent: 2.10 - F_ULOCK [ 0, ENDING] PASSED.
** PARENT pass 1 results: 2/2 pass, 0/0 warn, 0/0 fail (pass/total).
** CHILD pass 1 results: 9/9 pass, 0/0 warn, 0/0 fail (pass/total).
--- fs/cifs/cifsglob.h | 4 ++-- fs/cifs/file.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-)
fs/cifs/cifsglob.h +2 -2
@@ -2085,9 +2085,9 @@ static inline bool cifs_is_referral_servreturn is_tcon_dfs (tcon) || (ref && (ref->flags &DFSREF_REFERRAL_SERVER )); } -static inline u64 cifs_flock_len (struct file_lock *fl) +static inline u64 cifs_flock_len (const struct file_lock *fl) { -return fl->fl_end ==OFFSET_MAX ?0 : fl->fl_end - fl->fl_start +1 ; +return (u64 )fl->fl_end - fl->fl_start +1 ; }static inline size_t ntlmssp_workstation_name_size (const struct cifs_ses *ses)
fs/cifs/file.c +3 -3
@@ -1861,9 +1861,9 @@ int cifs_lock(struct file *file, int cmd rc = -EACCES ; xid =get_xid (); -cifs_dbg (FYI ,"Lock parm: 0x%x flockflags: 0x%x flocktype: 0x%x start: %lld end: %lld\n" , - cmd, flock->fl_flags, flock->fl_type, - flock->fl_start, flock->fl_end); +cifs_dbg (FYI ,"%s: %pD2 cmd=0x%x type=0x%x flags=0x%x r=%lld:%lld\n" , __func__, file, cmd, + flock->fl_flags, flock->fl_type, (long long )flock->fl_start, + (long long )flock->fl_end); cfile = (struct cifsFileInfo *)file->private_data; tcon =tlink_tcon (cfile->tlink);
Greg Kroah-Hartman
maintainerPATCH 1046/1157 x86/bugs: Enable STIBP for IBPB mitigated RETBleed
In reply to Greg Kroah-HartmanFrom: Kim Phillips <[email protected]>
commit e6cfcdda8cbe81eaf821c897369a65fec987b404 upstream.
AMD's "Technical Guidance for Mitigating Branch Type Confusion, Rev. 1.0 2022-07-12" whitepaper, under section 6.1.2 "IBPB On Privileged Mode Entry / SMT Safety" says:
Similar to the Jmp2Ret mitigation, if the code on the sibling thread cannot be trusted, software should set STIBP to 1 or disable SMT to ensure SMT safety when using this mitigation.
So, like already being done for retbleed=unret, and now also for retbleed=ibpb, force STIBP on machines that have it, and report its SMT vulnerability status accordingly.
[ bp: Remove the "we" and remove "[AMD]" applicability parameter which
doesn't work here. ]
--- Documentation/admin-guide/kernel-parameters.txt | 29 +++++++++++++++++------- arch/x86/kernel/cpu/bugs.c | 10 ++++---- 2 files changed, 27 insertions(+), 12 deletions(-)
Documentation/admin-guide/kernel-parameters.txt +21 -8
@@ -5203,20 +5203,33 @@ Speculative Code Execution with Return Instructions) vulnerability. + AMD-based UNRET and IBPB mitigations alone do not stop + sibling threads from influencing the predictions of other + sibling threads. For that reason, STIBP is used on pro- + cessors that support it, and mitigate SMT on processors + that don't. + off - no mitigation auto - automatically select a migitation auto,nosmt - automatically select a mitigation, disabling SMT if necessary for the full mitigation (only on Zen1 and older without STIBP). - ibpb - mitigate short speculation windows on - basic block boundaries too. Safe, highest - perf impact. - unret - force enable untrained return thunks, - only effective on AMD f15h-f17h - based systems. - unret,nosmt - like unret, will disable SMT when STIBP - is not available. + ibpb - On AMD, mitigate short speculation + windows on basic block boundaries too. + Safe, highest perf impact. It also + enables STIBP if present. Not suitable + on Intel. + ibpb,nosmt - Like "ibpb" above but will disable SMT + when STIBP is not available. This is + the alternative for systems which do not + have STIBP. + unret - Force enable untrained return thunks, + only effective on AMD f15h-f17h based + systems. + unret,nosmt - Like unret, but will disable SMT when STIBP + is not available. This is the alternative for + systems which do not have STIBP. Selecting 'auto' will choose a mitigation method at run time according to the CPU.
arch/x86/kernel/cpu/bugs.c +6 -4
@@ -152,7 +152,7 @@ void __init check_bugs(void)/* * spectre_v2_user_select_mitigation() relies on the state set by * retbleed_select_mitigation(); specifically the STIBP selection is -* forced for UNRET. +* forced for UNRET or IBPB. */ spectre_v2_user_select_mitigation ();ssb_select_mitigation ();
@@ -1179,7 +1179,8 @@ spectre_v2_user_select_mitigation(void) boot_cpu_has(X86_FEATURE_AMD_STIBP_ALWAYS_ON)) mode =SPECTRE_V2_USER_STRICT_PREFERRED ; -if (retbleed_mitigation ==RETBLEED_MITIGATION_UNRET ) { +if (retbleed_mitigation ==RETBLEED_MITIGATION_UNRET || + retbleed_mitigation ==RETBLEED_MITIGATION_IBPB ) {if (mode !=SPECTRE_V2_USER_STRICT && mode !=SPECTRE_V2_USER_STRICT_PREFERRED )pr_info ("Selecting STIBP always-on mode to complement retbleed mitigation\n" );
@@ -2360,10 +2361,11 @@ static ssize_t srbds_show_state(char *bustatic ssize_t retbleed_show_state (char *buf) { -if (retbleed_mitigation ==RETBLEED_MITIGATION_UNRET ) { +if (retbleed_mitigation ==RETBLEED_MITIGATION_UNRET || + retbleed_mitigation ==RETBLEED_MITIGATION_IBPB ) {if (boot_cpu_data.x86_vendor !=X86_VENDOR_AMD && boot_cpu_data.x86_vendor !=X86_VENDOR_HYGON ) -return sprintf (buf,"Vulnerable: untrained return thunk on non-Zen uarch\n" ); +return sprintf (buf,"Vulnerable: untrained return thunk / IBPB on non-AMD based uarch\n" ); return sprintf(buf, "%s; SMT %s\n", retbleed_strings[retbleed_mitigation],
Greg Kroah-Hartman
maintainerPATCH 1047/1157 ftrace/x86: Add back ftrace_expected assignment
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (Google) <[email protected]>
commit ac6c1b2ca77e722a1e5d651f12f437f2f237e658 upstream.
When a ftrace_bug happens (where ftrace fails to modify a location) it is helpful to have what was at that location as well as what was expected to be there.
But with the conversion to text_poke() the variable that assigns the expected for debugging was dropped. Unfortunately, I noticed this when I needed it. Add it back.
--- arch/x86/kernel/ftrace.c | 1 + 1 file changed, 1 insertion(+)
arch/x86/kernel/ftrace.c +1 -0
@@ -91,6 +91,7 @@ static int ftrace_verify_code(unsigned l/* Make sure it is what we expect it to be */ if (memcmp (cur_code, old_code,MCOUNT_INSN_SIZE ) !=0 ) { + ftrace_expected = old_code;WARN_ON (1 );return -EINVAL ; }
Greg Kroah-Hartman
maintainerPATCH 1048/1157 x86/kprobes: Update kcb status flag after singlestepping
In reply to Greg Kroah-HartmanFrom: Masami Hiramatsu (Google) <[email protected]>
commit dec8784c9088b131a1523f582c2194cfc8107dc0 upstream.
Fix kprobes to update kcb (kprobes control block) status flag to KPROBE_HIT_SSDONE even if the kp->post_handler is not set.
This bug may cause a kernel panic if another INT3 user runs right after kprobes because kprobe_int3_handler() misunderstands the INT3 is kprobe's single stepping INT3.
--- arch/x86/kernel/kprobes/core.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
arch/x86/kernel/kprobes/core.c +11 -7
@@ -814,16 +814,20 @@ set_current_kprobe(struct kprobe *p, strstatic void kprobe_post_process (struct kprobe *cur,struct pt_regs *regs,struct kprobe_ctlblk *kcb) { -if ((kcb->kprobe_status !=KPROBE_REENTER ) && cur->post_handler) { - kcb->kprobe_status =KPROBE_HIT_SSDONE ; - cur->post_handler (cur, regs,0 ); - } -/* Restore back the original saved kprobes variables and continue. */ -if (kcb->kprobe_status ==KPROBE_REENTER ) +if (kcb->kprobe_status ==KPROBE_REENTER ) { +/* This will restore both kcb and current_kprobe */ restore_previous_kprobe (kcb); -else + }else { +/* +* Always update the kcb status because +* reset_curent_kprobe() doesn't update kcb. +*/ + kcb->kprobe_status =KPROBE_HIT_SSDONE ; +if (cur->post_handler) + cur->post_handler (cur, regs,0 );reset_current_kprobe (); + } }NOKPROBE_SYMBOL (kprobe_post_process);
Greg Kroah-Hartman
maintainerPATCH 1049/1157 x86/olpc: fix logical not is only applied to the left hand side
In reply to Greg Kroah-HartmanFrom: Alexander Lobakin <[email protected]>
commit 3a2ba42cbd0b669ce3837ba400905f93dd06c79f upstream.
The bitops compile-time optimization series revealed one more problem in olpc-xo1-sci.c:send_ebook_state(), resulted in GCC warnings:
arch/x86/platform/olpc/olpc-xo1-sci.c: In function 'send_ebook_state':arch/x86/platform/olpc/olpc-xo1-sci.c:83:63: warning: logical not is only applied to the left hand side of comparison [-Wlogical-not-parentheses]
83 | if (!!test_bit(SW_TABLET_MODE, ebook_switch_idev->sw) == state)
| ^~arch/x86/platform/olpc/olpc-xo1-sci.c:83:13: note: add parentheses around left hand side expression to silence this warning
Despite this code working as intended, this redundant double negation of boolean value, together with comparing to char with no explicit conversion to bool, makes compilers think the author made some unintentional logical mistakes here. Make it the other way around and negate the char instead to silence the warnings.
--- arch/x86/platform/olpc/olpc-xo1-sci.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/platform/olpc/olpc-xo1-sci.c +1 -1
@@ -80,7 +80,7 @@ static void send_ebook_state(void)return ; } -if (!!test_bit (SW_TABLET_MODE , ebook_switch_idev->sw) == state) +if (test_bit (SW_TABLET_MODE , ebook_switch_idev->sw) == !!state)return ;/* Nothing new to report. */ input_report_switch (ebook_switch_idev,SW_TABLET_MODE , state);
Greg Kroah-Hartman
maintainerPATCH 1050/1157 SMB3: fix lease break timeout when multiple deferred close handles for the same file.
In reply to Greg Kroah-HartmanFrom: Bharath SM <[email protected]>
commit 9e31678fb403eae0f4fe37c6374be098835c73cd upstream.
Solution is to send lease break ack immediately even in case of deferred close handles to avoid lease break request timing out and let deferred closed handle gets closed as scheduled. Later patches could optimize cases where we then close some of these handles sooner for the cases where lease break is to 'none'
--- fs/cifs/file.c | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-)
fs/cifs/file.c +1 -19
@@ -4811,8 +4811,6 @@ void cifs_oplock_break(struct work_strucstruct TCP_Server_Info *server = tcon->ses->server;int rc =0 ;bool purge_cache = false; -bool is_deferred = false; -struct cifs_deferred_close *dclose;wait_on_bit (&cinode->flags,CIFS_INODE_PENDING_WRITERS ,TASK_UNINTERRUPTIBLE );
@@ -4849,22 +4847,6 @@ void cifs_oplock_break(struct work_struc oplock_break_ack:/* -* When oplock break is received and there are no active -* file handles but cached, then schedule deferred close immediately. -* So, new open will not use cached handle. -*/ -spin_lock (&CIFS_I (inode)->deferred_lock); - is_deferred =cifs_is_deferred_close (cfile, &dclose); -spin_unlock (&CIFS_I (inode)->deferred_lock); -if (is_deferred && - cfile->deferred_close_scheduled && -delayed_work_pending (&cfile->deferred)) { -if (cancel_delayed_work (&cfile->deferred)) { -_cifsFileInfo_put (cfile, false, false); - goto oplock_break_done; - } - } -/* * releasing stale oplock after recent reconnect of smb session using * a now incorrect file handle is not a data integrity issue but do * not bother sending an oplock release if session to server still is
@@ -4875,7 +4857,7 @@ oplock_break_ack: cinode);cifs_dbg (FYI ,"Oplock release rc = %d\n" , rc); } -oplock_break_done: +_cifsFileInfo_put (cfile, false/* do not wait for ourself */ , false);cifs_done_oplock_break (cinode); }
Greg Kroah-Hartman
maintainerPATCH 1051/1157 posix-cpu-timers: Cleanup CPU timers before freeing them during exec
In reply to Greg Kroah-HartmanFrom: Thadeu Lima de Souza Cascardo <[email protected]>
commit e362359ace6f87c201531872486ff295df306d13 upstream.
Commit 55e8c8eb2c7b ("posix-cpu-timers: Store a reference to a pid not a task") started looking up tasks by PID when deleting a CPU timer.
When a non-leader thread calls execve, it will switch PIDs with the leader process. Then, as it calls exit_itimers, posix_cpu_timer_del cannot find the task because the timer still points out to the old PID.
That means that armed timers won't be disarmed, that is, they won't be removed from the timerqueue_list. exit_itimers will still release their memory, and when that list is later processed, it leads to a use-after-free.
Clean up the timers from the de-threaded task before freeing them. This prevents a reported use-after-free.
--- fs/exec.c | 3 +++ 1 file changed, 3 insertions(+)
fs/exec.c +3 -0
@@ -1301,6 +1301,9 @@ int begin_new_exec(struct linux_binprm * bprm->mm =NULL ;#ifdef CONFIG_POSIX_TIMERS +spin_lock_irq (&me->sighand->siglock); +posix_cpu_timers_exit (me); +spin_unlock_irq (&me->sighand->siglock);exit_itimers (me);flush_itimer_signals ();#endif
Greg Kroah-Hartman
maintainerPATCH 1052/1157 Input: gscps2 - check return value of ioremap() in gscps2_probe()
In reply to Greg Kroah-HartmanFrom: Xie Shaowen <[email protected]>
commit e61b3125a4f036b3c6b87ffd656fc1ab00440ae9 upstream.
The function ioremap() in gscps2_probe() can fail, so its return value should be checked.
--- drivers/input/serio/gscps2.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/input/serio/gscps2.c +4 -0
@@ -350,6 +350,10 @@ static int __init gscps2_probe(struct pa ps2port->port = serio; ps2port->padev = dev; ps2port->addr =ioremap (hpa,GSC_STATUS +4 ); +if (!ps2port->addr) { + ret = -ENOMEM ; + goto fail_nomem; + }spin_lock_init (&ps2port->lock);gscps2_reset (ps2port);
Greg Kroah-Hartman
maintainerPATCH 1053/1157 __follow_mount_rcu(): verify that mount_lock remains unchanged
In reply to Greg Kroah-HartmanFrom: Al Viro <[email protected]>
commit 20aac6c60981f5bfacd66661d090d907bf1482f0 upstream.
Validate mount_lock seqcount as soon as we cross into mount in RCU mode. Sure, ->mnt_root is pinned and will remain so until we do rcu_read_unlock() anyway, and we will eventually fail to unlazy if the mount_lock had been touched, but we might run into a hard error (e.g. -ENOENT) before trying to unlazy. And it's possible to end up with RCU pathwalk racing with rename() and umount() in a way that would fail with -ENOENT while non-RCU pathwalk would've succeeded with any timings.
Once upon a time we hadn't needed that, but analysis had been subtle, brittle and went out of window as soon as RENAME_EXCHANGE had been added.
It's narrow, hard to hit and won't get you anything other than stray -ENOENT that could be arranged in much easier way with the same priveleges, but it's a bug all the same.
Cc: [email protected]
X-sky-is-falling: unlikely
--- fs/namei.c | 2 ++ 1 file changed, 2 insertions(+)
fs/namei.c +2 -0
@@ -1505,6 +1505,8 @@ static bool __follow_mount_rcu(struct na* becoming unpinned. */ flags = dentry->d_flags; +if (read_seqretry (&mount_lock, nd->m_seq)) +return false;continue ; }if (read_seqretry (&mount_lock, nd->m_seq))
Greg Kroah-Hartman
maintainerPATCH 1054/1157 spmi: trace: fix stack-out-of-bound access in SPMI tracing functions
In reply to Greg Kroah-HartmanFrom: David Collins <[email protected]>
commit 2af28b241eea816e6f7668d1954f15894b45d7e3 upstream.
trace_spmi_write_begin() and trace_spmi_read_end() both call memcpy() with a length of "len + 1". This leads to one extra byte being read beyond the end of the specified buffer. Fix this out-of-bound memory access by using a length of "len" instead.
Here is a KASAN log showing the issue:
BUG: KASAN: stack-out-of-bounds in trace_event_raw_event_spmi_read_end+0x1d0/0x234 Read of size 2 at addr ffffffc0265b7540 by task [email protected]/1314 ... Call trace: dump_backtrace+0x0/0x3e8 show_stack+0x2c/0x3c dump_stack_lvl+0xdc/0x11c print_address_description+0x74/0x384 kasan_report+0x188/0x268 kasan_check_range+0x270/0x2b0 memcpy+0x90/0xe8 trace_event_raw_event_spmi_read_end+0x1d0/0x234 spmi_read_cmd+0x294/0x3ac spmi_ext_register_readl+0x84/0x9c regmap_spmi_ext_read+0x144/0x1b0 [regmap_spmi] _regmap_raw_read+0x40c/0x754 regmap_raw_read+0x3a0/0x514 regmap_bulk_read+0x418/0x494 adc5_gen3_poll_wait_hs+0xe8/0x1e0 [qcom_spmi_adc5_gen3] ... __arm64_sys_read+0x4c/0x60 invoke_syscall+0x80/0x218 el0_svc_common+0xec/0x1c8 ...
addr ffffffc0265b7540 is located in stack of task [email protected]/1314 at offset 32 in frame:
adc5_gen3_poll_wait_hs+0x0/0x1e0 [qcom_spmi_adc5_gen3]
this frame has 1 object:
[32, 33) 'status'
Memory state around the buggy address:
ffffffc0265b7400: 00 00 00 00 00 00 00 00 00 00 00 00 f1 f1 f1 f1
ffffffc0265b7480: 04 f3 f3 f3 00 00 00 00 00 00 00 00 00 00 00 00
>ffffffc0265b7500: 00 00 00 00 f1 f1 f1 f1 01 f3 f3 f3 00 00 00 00
^
ffffffc0265b7580: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
ffffffc0265b7600: f1 f1 f1 f1 01 f2 07 f2 f2 f2 01 f3 00 00 00 00
==================================================================--- include/trace/events/spmi.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
include/trace/events/spmi.h +6 -6
@@ -21,15 +21,15 @@ TRACE_EVENT(spmi_write_begin,__field ( u8, sid ) __field ( u16, addr ) __field ( u8, len ) -__dynamic_array ( u8, buf, len +1 ) +__dynamic_array ( u8, buf, len ) ),TP_fast_assign ( __entry->opcode = opcode; __entry->sid = sid; __entry->addr = addr; - __entry->len = len +1 ; -memcpy (__get_dynamic_array (buf), buf, len +1 ); + __entry->len = len; +memcpy (__get_dynamic_array (buf), buf, len); ), TP_printk("opc=%d sid=%02d addr=0x%04x len=%d buf=0x[%*phD]",
@@ -92,7 +92,7 @@ TRACE_EVENT(spmi_read_end,__field ( u16, addr ) __field ( int, ret ) __field ( u8, len ) -__dynamic_array ( u8, buf, len +1 ) +__dynamic_array ( u8, buf, len ) ), TP_fast_assign(
@@ -100,8 +100,8 @@ TRACE_EVENT(spmi_read_end, __entry->sid = sid; __entry->addr = addr; __entry->ret = ret; - __entry->len = len +1 ; -memcpy (__get_dynamic_array (buf), buf, len +1 ); + __entry->len = len; +memcpy (__get_dynamic_array (buf), buf, len); ), TP_printk("opc=%d sid=%02d addr=0x%04x ret=%d len=%02d buf=0x[%*phD]",
Greg Kroah-Hartman
maintainerPATCH 1055/1157 csky: abiv1: Fixup compile error
In reply to Greg Kroah-HartmanFrom: Guo Ren <[email protected]>
commit 45fef4c4b9c94e86d9c13f0b2e7e71bb32254509 upstream.
LD vmlinux.oarch/csky/lib/string.o: In function `memmove':
string.c:(.text+0x108): multiple definition of memmove' lib/string.o:string.c:(.text+0x7e8): first defined here arch/csky/lib/string.o: In function memset':
string.c:(.text+0x148): multiple definition of `memset' lib/string.o:string.c:(.text+0x2ac): first defined here scripts/Makefile.vmlinux_o:68: recipe for target 'vmlinux.o' failed make[4]: *** [vmlinux.o] Error 1
--- arch/csky/abiv1/inc/abi/string.h | 6 ++++++ 1 file changed, 6 insertions(+)
arch/csky/abiv1/inc/abi/string.h +6 -0
@@ -6,4 +6,10 @@#define __HAVE_ARCH_MEMCPYextern void *memcpy (void *,const void *,__kernel_size_t ); +#define __HAVE_ARCH_MEMMOVE +extern void *memmove (void *,const void *,__kernel_size_t ); + +#define __HAVE_ARCH_MEMSET +extern void *memset (void *,int ,__kernel_size_t ); +#endif /* __ABI_CSKY_STRING_H */
Signature · 1 line
2.37.2
Greg Kroah-Hartman
maintainerPATCH 1056/1157 drivers/base: fix userspace break from using bin_attributes for cpumap and cpulist
In reply to Greg Kroah-HartmanFrom: Phil Auld <[email protected]>
commit 7ee951acd31a88f941fd6535fbdee3a1567f1d63 upstream.
Using bin_attributes with a 0 size causes fstat and friends to return that 0 size. This breaks userspace code that retrieves the size before reading the file. Rather than reverting 75bd50fa841 ("drivers/base/node.c: use bin_attribute to break the size limitation of cpumap ABI") let's put in a size value at compile time.
For cpulist the maximum size is on the order of
NR_CPUS * (ceil(log10(NR_CPUS)) + 1)/2
which for 8192 is 20480 (8192 * 5)/2. In order to get near that you'd need a system with every other CPU on one node. For example: (0,2,4,8, ... ). To simplify the math and support larger NR_CPUS in the future we are using (NR_CPUS * 7)/2. We also set it to a min of PAGE_SIZE to retain the older behavior for smaller NR_CPUS.
The cpumap file the size works out to be NR_CPUS/4 + NR_CPUS/32 - 1 (or NR_CPUS * 9/32 - 1) including the ","s.
Add a set of macros for these values to cpumask.h so they can be used in multiple places. Apply these to the handful of such files in drivers/base/topology.c as well as node.c.
As an example, on an 80 cpu 4-node system (NR_CPUS == 8192):
before:
-r--r--r--. 1 root root 0 Jul 12 14:08 system/node/node0/cpulist -r--r--r--. 1 root root 0 Jul 11 17:25 system/node/node0/cpumap
after:
-r--r--r--. 1 root root 28672 Jul 13 11:32 system/node/node0/cpulist -r--r--r--. 1 root root 4096 Jul 13 11:31 system/node/node0/cpumap
CONFIG_NR_CPUS = 16384
-r--r--r--. 1 root root 57344 Jul 13 14:03 system/node/node0/cpulist -r--r--r--. 1 root root 4607 Jul 13 14:02 system/node/node0/cpumap
The actual number of cpus doesn't matter for the reported size since they are based on NR_CPUS.
--- drivers/base/node.c | 4 ++-- drivers/base/topology.c | 32 ++++++++++++++++---------------- include/linux/cpumask.h | 18 ++++++++++++++++++ 3 files changed, 36 insertions(+), 18 deletions(-)
drivers/base/node.c +2 -2
@@ -45,7 +45,7 @@ static inline ssize_t cpumap_read(structreturn n; } -static BIN_ATTR_RO(cpumap, 0); +static BIN_ATTR_RO(cpumap, CPUMAP_FILE_MAX_BYTES); static inline ssize_t cpulist_read(struct file *file, struct kobject *kobj, struct bin_attribute *attr, char *buf,
@@ -66,7 +66,7 @@ static inline ssize_t cpulist_read(strucreturn n; } -static BIN_ATTR_RO(cpulist, 0); +static BIN_ATTR_RO(cpulist, CPULIST_FILE_MAX_BYTES);/** * struct node_access_nodes - Access class device to hold user visible
drivers/base/topology.c +16 -16
@@ -62,47 +62,47 @@ define_id_show_func(ppin, "0x%llx");static DEVICE_ATTR_ADMIN_RO (ppin);define_siblings_read_func (thread_siblings, sibling_cpumask); -static BIN_ATTR_RO(thread_siblings, 0); -static BIN_ATTR_RO(thread_siblings_list, 0); +static BIN_ATTR_RO(thread_siblings, CPUMAP_FILE_MAX_BYTES); +static BIN_ATTR_RO(thread_siblings_list, CPULIST_FILE_MAX_BYTES);define_siblings_read_func (core_cpus, sibling_cpumask); -static BIN_ATTR_RO(core_cpus, 0); -static BIN_ATTR_RO(core_cpus_list, 0); +static BIN_ATTR_RO(core_cpus, CPUMAP_FILE_MAX_BYTES); +static BIN_ATTR_RO(core_cpus_list, CPULIST_FILE_MAX_BYTES);define_siblings_read_func (core_siblings, core_cpumask); -static BIN_ATTR_RO(core_siblings, 0); -static BIN_ATTR_RO(core_siblings_list, 0); +static BIN_ATTR_RO(core_siblings, CPUMAP_FILE_MAX_BYTES); +static BIN_ATTR_RO(core_siblings_list, CPULIST_FILE_MAX_BYTES);#ifdef TOPOLOGY_CLUSTER_SYSFS define_siblings_read_func (cluster_cpus, cluster_cpumask); -static BIN_ATTR_RO(cluster_cpus, 0); -static BIN_ATTR_RO(cluster_cpus_list, 0); +static BIN_ATTR_RO(cluster_cpus, CPUMAP_FILE_MAX_BYTES); +static BIN_ATTR_RO(cluster_cpus_list, CPULIST_FILE_MAX_BYTES);#endif #ifdef TOPOLOGY_DIE_SYSFS define_siblings_read_func (die_cpus, die_cpumask); -static BIN_ATTR_RO(die_cpus, 0); -static BIN_ATTR_RO(die_cpus_list, 0); +static BIN_ATTR_RO(die_cpus, CPUMAP_FILE_MAX_BYTES); +static BIN_ATTR_RO(die_cpus_list, CPULIST_FILE_MAX_BYTES);#endif define_siblings_read_func (package_cpus, core_cpumask); -static BIN_ATTR_RO(package_cpus, 0); -static BIN_ATTR_RO(package_cpus_list, 0); +static BIN_ATTR_RO(package_cpus, CPUMAP_FILE_MAX_BYTES); +static BIN_ATTR_RO(package_cpus_list, CPULIST_FILE_MAX_BYTES);#ifdef TOPOLOGY_BOOK_SYSFS define_id_show_func (book_id,"%d" );static DEVICE_ATTR_RO (book_id);define_siblings_read_func (book_siblings, book_cpumask); -static BIN_ATTR_RO(book_siblings, 0); -static BIN_ATTR_RO(book_siblings_list, 0); +static BIN_ATTR_RO(book_siblings, CPUMAP_FILE_MAX_BYTES); +static BIN_ATTR_RO(book_siblings_list, CPULIST_FILE_MAX_BYTES);#endif #ifdef TOPOLOGY_DRAWER_SYSFS define_id_show_func (drawer_id,"%d" );static DEVICE_ATTR_RO (drawer_id);define_siblings_read_func (drawer_siblings, drawer_cpumask); -static BIN_ATTR_RO(drawer_siblings, 0); -static BIN_ATTR_RO(drawer_siblings_list, 0); +static BIN_ATTR_RO(drawer_siblings, CPUMAP_FILE_MAX_BYTES); +static BIN_ATTR_RO(drawer_siblings_list, CPULIST_FILE_MAX_BYTES);#endif static struct bin_attribute *bin_attrs[] = {
include/linux/cpumask.h +18 -0
@@ -1071,4 +1071,22 @@ cpumap_print_list_to_buf(char *buf, cons [0] = 1UL \ } } +/* +* Provide a valid theoretical max size for cpumap and cpulist sysfs files +* to avoid breaking userspace which may allocate a buffer based on the size +* reported by e.g. fstat. +* +* for cpumap NR_CPUS * 9/32 - 1 should be an exact length. +* +* For cpulist 7 is (ceil(log10(NR_CPUS)) + 1) allowing for NR_CPUS to be up +* to 2 orders of magnitude larger than 8192. And then we divide by 2 to +* cover a worst-case of every other cpu being on one of two nodes for a +* very large NR_CPUS. +* +* Use PAGE_SIZE as a minimum for smaller configurations. +*/ +#define CPUMAP_FILE_MAX_BYTES ((((NR_CPUS * 9)/32 - 1) > PAGE_SIZE) \ + ? (NR_CPUS * 9)/32 - 1 : PAGE_SIZE) +#define CPULIST_FILE_MAX_BYTES (((NR_CPUS * 7)/2 > PAGE_SIZE) ? (NR_CPUS * 7)/2 : PAGE_SIZE) +#endif /* __LINUX_CPUMASK_H */
Greg Kroah-Hartman
maintainerPATCH 1057/1157 drm/mediatek: Keep dsi as LP00 before dcs cmds transfer
In reply to Greg Kroah-HartmanFrom: Jitao Shi <[email protected]>
[ Upstream commit 39e8d062b03c3dc257d880d82bd55cdd9e185a3b ]
To comply with the panel sequence, hold the mipi signal to LP00 before the dcs cmds transmission, and pull the mipi signal high from LP00 to LP11 until the start of the dcs cmds transmission.
The normal panel timing is :
(1) pp1800 DC pull up
(2) avdd & avee AC pull high
(3) lcm_reset pull high -> pull low -> pull high
(4) Pull MIPI signal high (LP11) -> initial code -> send video data (HS mode)
The power-off sequence is reversed.
If dsi is not in cmd mode, then dsi will pull the mipi signal high in the mtk_output_dsi_enable function. The delay in lane_ready func is the reaction time of dsi_rx after pulling up the mipi signal.
--- drivers/gpu/drm/mediatek/mtk_dsi.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-)
drivers/gpu/drm/mediatek/mtk_dsi.c +21 -7
@@ -203,6 +203,7 @@ struct mtk_dsi {struct mtk_phy_timing phy_timing;int refcount;bool enabled; +bool lanes_ready;u32 irq_data;wait_queue_head_t irq_wait_queue;const struct mtk_dsi_driver_data *driver_data;
@@ -661,18 +662,11 @@ static int mtk_dsi_poweron(struct mtk_dsmtk_dsi_reset_engine (dsi);mtk_dsi_phy_timconfig (dsi); -mtk_dsi_rxtx_control (dsi); -usleep_range (30 ,100 ); -mtk_dsi_reset_dphy (dsi);mtk_dsi_ps_control_vact (dsi);mtk_dsi_set_vm_cmd (dsi);mtk_dsi_config_vdo_timing (dsi);mtk_dsi_set_interrupt_enable (dsi); -mtk_dsi_clk_ulp_mode_leave (dsi); -mtk_dsi_lane0_ulp_mode_leave (dsi); -mtk_dsi_clk_hs_mode (dsi,0 ); -return 0 ; err_disable_engine_clk:clk_disable_unprepare (dsi->engine_clk);
@@ -703,6 +697,23 @@ static void mtk_dsi_poweroff(struct mtk_clk_disable_unprepare (dsi->digital_clk);phy_power_off (dsi->phy); + + dsi->lanes_ready = false; +} + +static void mtk_dsi_lane_ready (struct mtk_dsi *dsi) +{ +if (!dsi->lanes_ready) { + dsi->lanes_ready = true; +mtk_dsi_rxtx_control (dsi); +usleep_range (30 ,100 ); +mtk_dsi_reset_dphy (dsi); +mtk_dsi_clk_ulp_mode_leave (dsi); +mtk_dsi_lane0_ulp_mode_leave (dsi); +mtk_dsi_clk_hs_mode (dsi,0 ); +msleep (20 ); +/* The reaction time after pulling up the mipi signal for dsi_rx */ + } }static void mtk_output_dsi_enable (struct mtk_dsi *dsi)
@@ -710,6 +721,7 @@ static void mtk_output_dsi_enable(structif (dsi->enabled)return ; +mtk_dsi_lane_ready (dsi);mtk_dsi_set_mode (dsi);mtk_dsi_clk_hs_mode (dsi,1 );
@@ -1019,6 +1031,8 @@ static ssize_t mtk_dsi_host_transfer(strif (MTK_DSI_HOST_IS_READ (msg->type)) irq_flag |=LPRX_RD_RDY_INT_FLAG ; +mtk_dsi_lane_ready (dsi); + ret =mtk_dsi_host_send_cmd (dsi, msg, irq_flag);if (ret) goto restore_dsi_mode;
Greg Kroah-Hartman
maintainerPATCH 1058/1157 crypto: blake2s - remove shash module
In reply to Greg Kroah-HartmanFrom: Jason A. Donenfeld <[email protected]>
[ Upstream commit 2d16803c562ecc644803d42ba98a8e0aef9c014e ]
BLAKE2s has no currently known use as an shash. Just remove all of this unnecessary plumbing. Removing this shash was something we talked about back when we were making BLAKE2s a built-in, but I simply never got around to doing it. So this completes that project.
Importantly, this fixs a bug in which the lib code depends on crypto_simd_disabled_for_test, causing linker errors.
Also add more alignment tests to the selftests and compare SIMD and non-SIMD compression functions, to make up for what we lose from testmgr.c.
--- arch/arm/crypto/Kconfig | 2 +- arch/arm/crypto/Makefile | 4 +- arch/arm/crypto/blake2s-shash.c | 75 ----------- arch/x86/crypto/Makefile | 4 +- arch/x86/crypto/blake2s-glue.c | 3 +- arch/x86/crypto/blake2s-shash.c | 77 ----------- crypto/Kconfig | 20 +-- crypto/Makefile | 1 - crypto/blake2s_generic.c | 75 ----------- crypto/tcrypt.c | 12 -- crypto/testmgr.c | 24 ---- crypto/testmgr.h | 217 ------------------------------ include/crypto/internal/blake2s.h | 108 --------------- lib/crypto/blake2s-selftest.c | 41 ++++++ lib/crypto/blake2s.c | 37 ++++- 15 files changed, 76 insertions(+), 624 deletions(-) delete mode 100644 arch/arm/crypto/blake2s-shash.c delete mode 100644 arch/x86/crypto/blake2s-shash.c delete mode 100644 crypto/blake2s_generic.c
arch/arm/crypto/Kconfig +1 -1
@@ -63,7 +63,7 @@ config CRYPTO_SHA512_ARM using optimized ARM assembler and NEON, when available. config CRYPTO_BLAKE2S_ARM - tristate "BLAKE2s digest algorithm (ARM)" + bool "BLAKE2s digest algorithm (ARM)" select CRYPTO_ARCH_HAVE_LIB_BLAKE2S help BLAKE2s digest algorithm optimized with ARM scalar instructions. This
arch/arm/crypto/Makefile +1 -3
@@ -9,8 +9,7 @@ obj-$(CONFIG_CRYPTO_SHA1_ARM) += sha1-arm.o obj-$(CONFIG_CRYPTO_SHA1_ARM_NEON) += sha1-arm-neon.o obj-$(CONFIG_CRYPTO_SHA256_ARM) += sha256-arm.o obj-$(CONFIG_CRYPTO_SHA512_ARM) += sha512-arm.o -obj-$(CONFIG_CRYPTO_BLAKE2S_ARM) += blake2s-arm.o -obj-$(if $(CONFIG_CRYPTO_BLAKE2S_ARM),y) += libblake2s-arm.o +obj-$(CONFIG_CRYPTO_BLAKE2S_ARM) += libblake2s-arm.o obj-$(CONFIG_CRYPTO_BLAKE2B_NEON) += blake2b-neon.o obj-$(CONFIG_CRYPTO_CHACHA20_NEON) += chacha-neon.o obj-$(CONFIG_CRYPTO_POLY1305_ARM) += poly1305-arm.o
@@ -32,7 +31,6 @@ sha256-arm-neon-$(CONFIG_KERNEL_MODE_NEON) := sha256_neon_glue.o sha256-arm-y := sha256-core.o sha256_glue.o $(sha256-arm-neon-y) sha512-arm-neon-$(CONFIG_KERNEL_MODE_NEON) := sha512-neon-glue.o sha512-arm-y := sha512-core.o sha512-glue.o $(sha512-arm-neon-y) -blake2s-arm-y := blake2s-shash.o libblake2s-arm-y:= blake2s-core.o blake2s-glue.o blake2b-neon-y := blake2b-neon-core.o blake2b-neon-glue.o sha1-arm-ce-y := sha1-ce-core.o sha1-ce-glue.o
arch/arm/crypto/blake2s-shash.c deleted +0 -75
75 lines not on this page · raw message
arch/x86/crypto/Makefile +1 -3
@@ -61,9 +61,7 @@ sha256-ssse3-$(CONFIG_AS_SHA256_NI) += sha256_ni_asm.o obj-$(CONFIG_CRYPTO_SHA512_SSSE3) += sha512-ssse3.o sha512-ssse3-y := sha512-ssse3-asm.o sha512-avx-asm.o sha512-avx2-asm.o sha512_ssse3_glue.o -obj-$(CONFIG_CRYPTO_BLAKE2S_X86) += blake2s-x86_64.o -blake2s-x86_64-y := blake2s-shash.o -obj-$(if $(CONFIG_CRYPTO_BLAKE2S_X86),y) += libblake2s-x86_64.o +obj-$(CONFIG_CRYPTO_BLAKE2S_X86) += libblake2s-x86_64.o libblake2s-x86_64-y := blake2s-core.o blake2s-glue.o obj-$(CONFIG_CRYPTO_GHASH_CLMUL_NI_INTEL) += ghash-clmulni-intel.o
arch/x86/crypto/blake2s-glue.c +1 -2
@@ -4,7 +4,6 @@*/ #include <crypto/internal/blake2s.h> -#include <crypto/internal/simd.h> #include <linux/types.h> #include <linux/jump_label.h>
@@ -33,7 +32,7 @@ void blake2s_compress(struct blake2s_state *state, const u8 *block,/* SIMD disables preemption, so relax after processing each page. */ BUILD_BUG_ON (SZ_4K /BLAKE2S_BLOCK_SIZE <8 ); -if (!static_branch_likely (&blake2s_use_ssse3) || !crypto_simd_usable ()) { +if (!static_branch_likely (&blake2s_use_ssse3) || !may_use_simd ()) {blake2s_compress_generic (state, block, nblocks, inc);return ; }
arch/x86/crypto/blake2s-shash.c deleted +0 -77
77 lines not on this page · raw message
crypto/Kconfig +1 -19
@@ -704,26 +704,8 @@ config CRYPTO_BLAKE2B See https://blake2.net for further information. -config CRYPTO_BLAKE2S - tristate "BLAKE2s digest algorithm" - select CRYPTO_LIB_BLAKE2S_GENERIC - select CRYPTO_HASH - help - Implementation of cryptographic hash function BLAKE2s - optimized for 8-32bit platforms and can produce digests of any size - between 1 to 32. The keyed hash is also implemented. - - This module provides the following algorithms: - - - blake2s-128 - - blake2s-160 - - blake2s-224 - - blake2s-256 - - See https://blake2.net for further information. - config CRYPTO_BLAKE2S_X86 - tristate "BLAKE2s digest algorithm (x86 accelerated version)" + bool "BLAKE2s digest algorithm (x86 accelerated version)" depends on X86 && 64BIT select CRYPTO_LIB_BLAKE2S_GENERIC select CRYPTO_ARCH_HAVE_LIB_BLAKE2S
crypto/Makefile +0 -1
@@ -84,7 +84,6 @@ obj-$(CONFIG_CRYPTO_STREEBOG) += streebog_generic.o obj-$(CONFIG_CRYPTO_WP512) += wp512.o CFLAGS_wp512.o := $(call cc-option,-fno-schedule-insns) # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=79149 obj-$(CONFIG_CRYPTO_BLAKE2B) += blake2b_generic.o -obj-$(CONFIG_CRYPTO_BLAKE2S) += blake2s_generic.o obj-$(CONFIG_CRYPTO_GF128MUL) += gf128mul.o obj-$(CONFIG_CRYPTO_ECB) += ecb.o obj-$(CONFIG_CRYPTO_CBC) += cbc.o
crypto/blake2s_generic.c deleted +0 -75
75 lines not on this page · raw message
crypto/tcrypt.c +0 -12
@@ -1669,10 +1669,6 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb) ret +=tcrypt_test ("rmd160" );break ; -case 41 : - ret +=tcrypt_test ("blake2s-256" ); -break ; -case 42 : ret +=tcrypt_test ("blake2b-512" );break ;
@@ -2240,10 +2236,6 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb)test_hash_speed ("rmd160" , sec, generic_hash_speed_template);if (mode >300 && mode <400 )break ; fallthrough; -case 316 : -test_hash_speed ("blake2s-256" , sec, generic_hash_speed_template); -if (mode >300 && mode <400 )break ; - fallthrough;case 317 :test_hash_speed ("blake2b-512" , sec, generic_hash_speed_template);if (mode >300 && mode <400 )break ;
@@ -2352,10 +2344,6 @@ static int do_test(const char *alg, u32 type, u32 mask, int m, u32 num_mb)test_ahash_speed ("rmd160" , sec, generic_hash_speed_template);if (mode >400 && mode <500 )break ; fallthrough; -case 416 : -test_ahash_speed ("blake2s-256" , sec, generic_hash_speed_template); -if (mode >400 && mode <500 )break ; - fallthrough;case 417 :test_ahash_speed ("blake2b-512" , sec, generic_hash_speed_template);if (mode >400 && mode <500 )break ;
crypto/testmgr.c +0 -24
@@ -4375,30 +4375,6 @@ static const struct alg_test_desc alg_test_descs[] = { .suite = { .hash = __VECS(blake2b_512_tv_template) } - }, { - .alg = "blake2s-128", - .test = alg_test_hash, - .suite = { - .hash = __VECS(blakes2s_128_tv_template) - } - }, { - .alg = "blake2s-160", - .test = alg_test_hash, - .suite = { - .hash = __VECS(blakes2s_160_tv_template) - } - }, { - .alg = "blake2s-224", - .test = alg_test_hash, - .suite = { - .hash = __VECS(blakes2s_224_tv_template) - } - }, { - .alg = "blake2s-256", - .test = alg_test_hash, - .suite = { - .hash = __VECS(blakes2s_256_tv_template) - } }, { .alg = "cbc(aes)", .test = alg_test_skcipher,
crypto/testmgr.h +0 -217
221 lines not on this page · raw message
include/crypto/internal/blake2s.h +0 -108
118 lines not on this page · raw message
lib/crypto/blake2s-selftest.c +41 -0
52 lines not on this page · raw message
lib/crypto/blake2s.c +30 -7
@@ -16,16 +16,44 @@#include <linux/init.h> #include <linux/bug.h> +static inline void blake2s_set_lastblock (struct blake2s_state *state) +{ + state->f[0 ] =-1 ; +} +void blake2s_update (struct blake2s_state *state,const u8 *in,size_t inlen) { -__blake2s_update (state, in, inlen, false); +const size_t fill =BLAKE2S_BLOCK_SIZE - state->buflen; + +if (unlikely (!inlen)) +return ; +if (inlen > fill) { +memcpy (state->buf + state->buflen, in, fill); +blake2s_compress (state, state->buf,1 ,BLAKE2S_BLOCK_SIZE ); + state->buflen =0 ; + in += fill; + inlen -= fill; + } +if (inlen >BLAKE2S_BLOCK_SIZE ) { +const size_t nblocks =DIV_ROUND_UP (inlen,BLAKE2S_BLOCK_SIZE ); +blake2s_compress (state, in, nblocks -1 ,BLAKE2S_BLOCK_SIZE ); + in +=BLAKE2S_BLOCK_SIZE * (nblocks -1 ); + inlen -=BLAKE2S_BLOCK_SIZE * (nblocks -1 ); + } +memcpy (state->buf + state->buflen, in, inlen); + state->buflen += inlen; }EXPORT_SYMBOL (blake2s_update);void blake2s_final (struct blake2s_state *state,u8 *out) {WARN_ON (IS_ENABLED (DEBUG ) && !out); -__blake2s_final (state, out, false); +blake2s_set_lastblock (state); +memset (state->buf + state->buflen,0 , +BLAKE2S_BLOCK_SIZE - state->buflen);/* Padding */ +blake2s_compress (state, state->buf,1 , state->buflen); +cpu_to_le32_array (state->h,ARRAY_SIZE (state->h)); +memcpy (out, state->h, state->outlen);memzero_explicit (state,sizeof (*state)); }EXPORT_SYMBOL (blake2s_final);
@@ -38,12 +66,7 @@ static int __init blake2s_mod_init(void)return 0 ; } -static void __exit blake2s_mod_exit(void) -{ -} -module_init (blake2s_mod_init); -module_exit (blake2s_mod_exit);MODULE_LICENSE ("GPL v2" );MODULE_DESCRIPTION ("BLAKE2s hash function" );MODULE_AUTHOR ("Jason A. Donenfeld <[email protected]>" );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1059/1157 firmware: arm_scpi: Ensure scpi_info is not assigned if the probe fails
In reply to Greg Kroah-HartmanFrom: Sudeep Holla <[email protected]>
[ Upstream commit 689640efc0a2c4e07e6f88affe6d42cd40cc3f85 ]
When scpi probe fails, at any point, we need to ensure that the scpi_info is not set and will remain NULL until the probe succeeds. If it is not taken care, then it could result use-after-free as the value is exported via get_scpi_ops() and could refer to a memory allocated via devm_kzalloc() but freed when the probe fails.
--- drivers/firmware/arm_scpi.c | 61 +++++++++++++++++++++---------------- 1 file changed, 35 insertions(+), 26 deletions(-)
drivers/firmware/arm_scpi.c +35 -26
@@ -815,7 +815,7 @@ static int scpi_init_versions(struct scpi_drvinfo *info) info->firmware_version =le32_to_cpu (caps.platform_version); }/* Ignore error if not implemented */ -if (scpi_info->is_legacy && ret == -EOPNOTSUPP ) +if (info->is_legacy && ret == -EOPNOTSUPP )return 0 ;return ret;
@@ -913,13 +913,14 @@ static int scpi_probe(struct platform_device *pdev)struct resource res;struct device *dev = &pdev->dev;struct device_node *np = dev->of_node; +struct scpi_drvinfo *scpi_drvinfo; - scpi_info =devm_kzalloc (dev,sizeof (*scpi_info),GFP_KERNEL ); -if (!scpi_info) + scpi_drvinfo =devm_kzalloc (dev,sizeof (*scpi_drvinfo),GFP_KERNEL ); +if (!scpi_drvinfo)return -ENOMEM ;if (of_match_device (legacy_scpi_of_match, &pdev->dev)) - scpi_info->is_legacy = true; + scpi_drvinfo->is_legacy = true; count =of_count_phandle_with_args (np,"mboxes" ,"#mbox-cells" );if (count <0 ) {
@@ -927,19 +928,19 @@ static int scpi_probe(struct platform_device *pdev)return -ENODEV ; } - scpi_info->channels =devm_kcalloc (dev, count,sizeof (struct scpi_chan ), -GFP_KERNEL ); -if (!scpi_info->channels) + scpi_drvinfo->channels = +devm_kcalloc (dev, count,sizeof (struct scpi_chan ),GFP_KERNEL ); +if (!scpi_drvinfo->channels)return -ENOMEM ; - ret =devm_add_action (dev, scpi_free_channels, scpi_info); + ret =devm_add_action (dev, scpi_free_channels, scpi_drvinfo);if (ret)return ret; -for (; scpi_info->num_chans < count; scpi_info->num_chans++) { +for (; scpi_drvinfo->num_chans < count; scpi_drvinfo->num_chans++) {resource_size_t size; -int idx = scpi_info->num_chans; -struct scpi_chan *pchan = scpi_info->channels + idx; +int idx = scpi_drvinfo->num_chans; +struct scpi_chan *pchan = scpi_drvinfo->channels + idx;struct mbox_client *cl = &pchan->cl;struct device_node *shmem =of_parse_phandle (np,"shmem" , idx);
@@ -986,45 +987,53 @@ static int scpi_probe(struct platform_device *pdev)return ret; } - scpi_info->commands = scpi_std_commands; + scpi_drvinfo->commands = scpi_std_commands; -platform_set_drvdata (pdev, scpi_info); +platform_set_drvdata (pdev, scpi_drvinfo); -if (scpi_info->is_legacy) { +if (scpi_drvinfo->is_legacy) {/* Replace with legacy variants */ scpi_ops.clk_set_val = legacy_scpi_clk_set_val; - scpi_info->commands = scpi_legacy_commands; + scpi_drvinfo->commands = scpi_legacy_commands;/* Fill priority bitmap */ for (idx =0 ; idx <ARRAY_SIZE (legacy_hpriority_cmds); idx++)set_bit (legacy_hpriority_cmds[idx], - scpi_info->cmd_priority); + scpi_drvinfo->cmd_priority); } - ret =scpi_init_versions (scpi_info); + scpi_info = scpi_drvinfo; + + ret =scpi_init_versions (scpi_drvinfo);if (ret) {dev_err (dev,"incorrect or no SCP firmware found\n" ); + scpi_info =NULL ;return ret; } -if (scpi_info->is_legacy && !scpi_info->protocol_version && - !scpi_info->firmware_version) +if (scpi_drvinfo->is_legacy && !scpi_drvinfo->protocol_version && + !scpi_drvinfo->firmware_version)dev_info (dev,"SCP Protocol legacy pre-1.0 firmware\n" );else dev_info (dev,"SCP Protocol %lu.%lu Firmware %lu.%lu.%lu version\n" ,FIELD_GET (PROTO_REV_MAJOR_MASK , - scpi_info->protocol_version), + scpi_drvinfo->protocol_version),FIELD_GET (PROTO_REV_MINOR_MASK , - scpi_info->protocol_version), + scpi_drvinfo->protocol_version),FIELD_GET (FW_REV_MAJOR_MASK , - scpi_info->firmware_version), + scpi_drvinfo->firmware_version),FIELD_GET (FW_REV_MINOR_MASK , - scpi_info->firmware_version), + scpi_drvinfo->firmware_version),FIELD_GET (FW_REV_PATCH_MASK , - scpi_info->firmware_version)); - scpi_info->scpi_ops = &scpi_ops; + scpi_drvinfo->firmware_version)); + + scpi_drvinfo->scpi_ops = &scpi_ops; -return devm_of_platform_populate (dev); + ret =devm_of_platform_populate (dev); +if (ret) + scpi_info =NULL ; + +return ret; }static const struct of_device_id scpi_of_match[] = {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1060/1157 intel_th: pci: Add Meteor Lake-P support
In reply to Greg Kroah-HartmanFrom: Alexander Shishkin <[email protected]>
[ Upstream commit 802a9a0b1d91274ef10d9fe429b4cc1e8c200aef ]
Add support for the Trace Hub in Meteor Lake-P.
--- drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hwtracing/intel_th/pci.c +5 -0
@@ -285,6 +285,11 @@ static const struct pci_device_id intel_ .driver_data = (kernel_ulong_t)&intel_th_2x, }, { +/* Meteor Lake-P */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x7e24), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, + {/* Alder Lake CPU */ PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x466f ), .driver_data = (kernel_ulong_t)&intel_th_2x,
Greg Kroah-Hartman
maintainerPATCH 1061/1157 intel_th: pci: Add Raptor Lake-S PCH support
In reply to Greg Kroah-HartmanFrom: Alexander Shishkin <[email protected]>
[ Upstream commit 23e2de5826e2fc4dd43e08bab3a2ea1a5338b063 ]
Add support for the Trace Hub in Raptor Lake-S PCH.
--- drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hwtracing/intel_th/pci.c +5 -0
@@ -290,6 +290,11 @@ static const struct pci_device_id intel_ .driver_data = (kernel_ulong_t)&intel_th_2x, }, { +/* Raptor Lake-S */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x7a26), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, + {/* Alder Lake CPU */ PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x466f ), .driver_data = (kernel_ulong_t)&intel_th_2x,
Greg Kroah-Hartman
maintainerPATCH 1062/1157 intel_th: pci: Add Raptor Lake-S CPU support
In reply to Greg Kroah-HartmanFrom: Alexander Shishkin <[email protected]>
[ Upstream commit ff46a601afc5a66a81c3945b83d0a2caeb88e8bc ]
Add support for the Trace Hub in Raptor Lake-S CPU.
--- drivers/hwtracing/intel_th/pci.c | 5 +++++ 1 file changed, 5 insertions(+)
drivers/hwtracing/intel_th/pci.c +5 -0
@@ -295,6 +295,11 @@ static const struct pci_device_id intel_ .driver_data = (kernel_ulong_t)&intel_th_2x, }, { +/* Raptor Lake-S CPU */ + PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa76f), + .driver_data = (kernel_ulong_t)&intel_th_2x, + }, + {/* Alder Lake CPU */ PCI_DEVICE (PCI_VENDOR_ID_INTEL ,0x466f ), .driver_data = (kernel_ulong_t)&intel_th_2x,
Greg Kroah-Hartman
maintainerPATCH 1063/1157 KVM: set_msr_mce: Permit guests to ignore single-bit ECC errors
In reply to Greg Kroah-HartmanFrom: Lev Kujawski <[email protected]>
[ Upstream commit 0471a7bd1bca2a47a5f378f2222c5cf39ce94152 ]
Certain guest operating systems (e.g., UNIXWARE) clear bit 0 of MC1_CTL to ignore single-bit ECC data errors. Single-bit ECC data errors are always correctable and thus are safe to ignore because they are informational in nature rather than signaling a loss of data integrity.
Prior to this patch, these guests would crash upon writing MC1_CTL, with resultant error messages like the following:
error: kvm run failed Operation not permitted
EAX=fffffffe EBX=fffffffe ECX=00000404 EDX=ffffffff ESI=ffffffff EDI=00000001 EBP=fffdaba4 ESP=fffdab20 EIP=c01333a5 EFL=00000246 [---Z-P-] CPL=0 II=0 A20=1 SMM=0 HLT=0
ES =0108 00000000 ffffffff 00c09300 DPL=0 DS [-WA]
CS =0100 00000000 ffffffff 00c09b00 DPL=0 CS32 [-RA]
SS =0108 00000000 ffffffff 00c09300 DPL=0 DS [-WA]
DS =0108 00000000 ffffffff 00c09300 DPL=0 DS [-WA]
FS =0000 00000000 ffffffff 00c00000
GS =0000 00000000 ffffffff 00c00000
LDT=0118 c1026390 00000047 00008200 DPL=0 LDT
TR =0110 ffff5af0 00000067 00008b00 DPL=0 TSS32-busy
GDT= ffff5020 000002cf
IDT= ffff52f0 000007ff
CR0=8001003b CR2=00000000 CR3=0100a000 CR4=00000230 DR0=00000000 DR1=00000000 DR2=00000000 DR3=00000000 DR6=ffff0ff0 DR7=00000400
EFER=0000000000000000
Code=08 89 01 89 51 04 c3 8b 4c 24 08 8b 01 8b 51 04 8b 4c 24 04 <0f> 30 c3 f7 05 a4 6d ff ff 10 00 00 00 74 03 0f 31 c3 33 c0 33 d2 c3 8d 74 26 00 0f 31 c3
Message-Id: <[email protected]>
--- arch/x86/kvm/x86.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
arch/x86/kvm/x86.c +5 -2
@@ -3245,10 +3245,13 @@ static int set_msr_mce(struct kvm_vcpu */* only 0 or all 1s can be written to IA32_MCi_CTL * some Linux kernels though clear bit 10 in bank 4 to * workaround a BIOS/GART TBL issue on AMD K8s, ignore -* this to avoid an uncatched #GP in the guest +* this to avoid an uncatched #GP in the guest. +* +* UNIXWARE clears bit 0 of MC1_CTL to ignore +* correctable, single-bit ECC data errors. */ if ((offset &0x3 ) ==0 && - data !=0 && (data | (1 <<10 )) != ~(u64 )0 ) + data !=0 && (data | (1 <<10 ) |1 ) != ~(u64 )0 )return -1 ;/* MCi_STATUS */
Greg Kroah-Hartman
maintainerPATCH 1064/1157 KVM: x86: Signal #GP, not -EPERM, on bad WRMSR(MCi_CTL/STATUS)
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
[ Upstream commit 2368048bf5c2ec4b604ac3431564071e89a0bc71 ]
Return '1', not '-1', when handling an illegal WRMSR to a MCi_CTL or MCi_STATUS MSR. The behavior of "all zeros' or "all ones" for CTL MSRs is architectural, as is the "only zeros" behavior for STATUS MSRs. I.e. the intent is to inject a #GP, not exit to userspace due to an unhandled emulation case. Returning '-1' gets interpreted as -EPERM up the stack and effecitvely kills the guest.
--- arch/x86/kvm/x86.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/x86/kvm/x86.c +2 -2
@@ -3252,13 +3252,13 @@ static int set_msr_mce(struct kvm_vcpu **/ if ((offset &0x3 ) ==0 && data !=0 && (data | (1 <<10 ) |1 ) != ~(u64 )0 ) -return -1 ; +return 1 ;/* MCi_STATUS */ if (!msr_info->host_initiated && (offset &0x3 ) ==1 && data !=0 ) {if (!can_set_mci_status (vcpu)) -return -1 ; +return 1 ; } vcpu->arch.mce_banks[offset] = data;
Greg Kroah-Hartman
maintainerPATCH 1065/1157 iommu/vt-d: avoid invalid memory access via node_online(NUMA_NO_NODE)
In reply to Greg Kroah-HartmanFrom: Alexander Lobakin <[email protected]>
[ Upstream commit b0b0b77ea611e3088e9523e60860f4f41b62b235 ]
KASAN reports:
[ 4.668325][ T0] BUG: KASAN: wild-memory-access in dmar_parse_one_rhsa (arch/x86/include/asm/bitops.h:214 arch/x86/include/asm/bitops.h:226 include/asm-generic/bitops/instrumented-non-atomic.h:142 include/linux/nodemask.h:415 drivers/iommu/intel/dmar.c:497) [ 4.676149][ T0] Read of size 8 at addr 1fffffff85115558 by task swapper/0/0 [ 4.683454][ T0] [ 4.685638][ T0] CPU: 0 PID: 0 Comm: swapper/0 Not tainted 5.19.0-rc3-00004-g0e862838f290 #1 [ 4.694331][ T0] Hardware name: Supermicro SYS-5018D-FN4T/X10SDV-8C-TLN4F, BIOS 1.1 03/02/2016 [ 4.703196][ T0] Call Trace: [ 4.706334][ T0] <TASK> [ 4.709133][ T0] ? dmar_parse_one_rhsa (arch/x86/include/asm/bitops.h:214 arch/x86/include/asm/bitops.h:226 include/asm-generic/bitops/instrumented-non-atomic.h:142 include/linux/nodemask.h:415 drivers/iommu/intel/dmar.c:497)
after converting the type of the first argument (@nr, bit number) of arch_test_bit() from long to unsigned long[0].
Under certain conditions (for example, when ACPI NUMA is disabled via command line), pxm_to_node() can return %NUMA_NO_NODE (-1). It is valid 'magic' number of NUMA node, but not valid bit number to use in bitops.node_online() eventually descends to test_bit() without checking for the input, assuming it's on caller side (which might be good for perf-critical tasks). There, -1 becomes %ULONG_MAX which leads to an insane array index when calculating bit position in memory.
For now, add an explicit check for @node being not %NUMA_NO_NODE before calling test_bit(). The actual logics didn't change here at all.
[0] https://github.com/norov/linux/commit/0e862838f290147ea9c16db852d8d494b552d38d
--- drivers/iommu/intel/dmar.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/intel/dmar.c +1 -1
@@ -494,7 +494,7 @@ static int dmar_parse_one_rhsa(struct acpi_dmar_header *header, void *arg)if (drhd->reg_base_addr == rhsa->base_address) {int node =pxm_to_node (rhsa->proximity_domain); -if (!node_online (node)) +if (node !=NUMA_NO_NODE && !node_online (node)) node =NUMA_NO_NODE ; drhd->iommu->node = node;return 0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1066/1157 PCI/AER: Iterate over error counters instead of error strings
In reply to Greg Kroah-HartmanFrom: Mohamed Khalfella <[email protected]>
[ Upstream commit 5e6ae050955b566484f3cc6a66e3925eae87a0ed ]
Previously we iterated over AER stat *names*, e.g., aer_correctable_error_string[32], but the actual stat *counters* may not be that large, e.g., pdev->aer_stats->dev_cor_errs[16], which means that we printed junk in the sysfs stats files.
Iterate over the stat counter arrays instead of the names to avoid this junk.
Also, added a build time check to make sure all
counters have entries in strings array.
--- drivers/pci/pcie/aer.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/pci/pcie/aer.c +6 -1
@@ -538,7 +538,7 @@ static const char *aer_agent_string[] = {u64 *stats = pdev->aer_stats->stats_array; \size_t len =0 ; \ \ -for (i =0 ; i <ARRAY_SIZE (strings_array); i++) { \ +for (i =0 ; i <ARRAY_SIZE (pdev->aer_stats->stats_array); i++) {\if (strings_array[i]) \ len += sysfs_emit_at(buf, len, "%s %llu\n", \ strings_array[i], \
@@ -1347,6 +1347,11 @@ static int aer_probe(struct pcie_device *dev)struct device *device = &dev->device;struct pci_dev *port = dev->port; +BUILD_BUG_ON (ARRAY_SIZE (aer_correctable_error_string) < +AER_MAX_TYPEOF_COR_ERRS ); +BUILD_BUG_ON (ARRAY_SIZE (aer_uncorrectable_error_string) < +AER_MAX_TYPEOF_UNCOR_ERRS ); +/* Limit to Root Ports or Root Complex Event Collectors */ if ((pci_pcie_type (port) !=PCI_EXP_TYPE_RC_EC ) && (pci_pcie_type (port) !=PCI_EXP_TYPE_ROOT_PORT ))
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1067/1157 PCI: qcom: Power on PHY before IPQ8074 DBI register accesses
In reply to Greg Kroah-HartmanFrom: Robert Marko <[email protected]>
[ Upstream commit a0e43bb9973b06ce5c666f0901e104e2037c1b34 ]
Currently the Gen2 port in IPQ8074 will cause the system to hang as it accesses DBI registers in qcom_pcie_init_2_3_3(), and those are only accesible after phy_power_on().
Move the DBI read/writes to a new qcom_pcie_post_init_2_3_3(), which is executed after phy_power_on().
--- drivers/pci/controller/dwc/pcie-qcom.c | 48 +++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 20 deletions(-)
drivers/pci/controller/dwc/pcie-qcom.c +28 -20
@@ -1036,9 +1036,7 @@ static int qcom_pcie_init_2_3_3(struct qstruct qcom_pcie_resources_2_3_3 *res = &pcie->res.v2_3_3;struct dw_pcie *pci = pcie->pci;struct device *dev = pci->dev; -u16 offset =dw_pcie_find_capability (pci,PCI_CAP_ID_EXP );int i, ret; -u32 val;for (i =0 ; i <ARRAY_SIZE (res->rst); i++) { ret =reset_control_assert (res->rst[i]);
@@ -1095,6 +1093,33 @@ static int qcom_pcie_init_2_3_3(struct q goto err_clk_aux; } +return 0 ; + +err_clk_aux: +clk_disable_unprepare (res->ahb_clk); +err_clk_ahb: +clk_disable_unprepare (res->axi_s_clk); +err_clk_axi_s: +clk_disable_unprepare (res->axi_m_clk); +err_clk_axi_m: +clk_disable_unprepare (res->iface); +err_clk_iface: +/* +* Not checking for failure, will anyway return +* the original failure in 'ret'. +*/ +for (i =0 ; i <ARRAY_SIZE (res->rst); i++) +reset_control_assert (res->rst[i]); + +return ret; +} + +static int qcom_pcie_post_init_2_3_3 (struct qcom_pcie *pcie) +{ +struct dw_pcie *pci = pcie->pci; +u16 offset =dw_pcie_find_capability (pci,PCI_CAP_ID_EXP ); +u32 val; +writel (SLV_ADDR_SPACE_SZ , pcie->parf + PCIE20_v3_PARF_SLV_ADDR_SPACE_SIZE);
@@ -1122,24 +1147,6 @@ static int qcom_pcie_init_2_3_3(struct q PCI_EXP_DEVCTL2);return 0 ; - -err_clk_aux: -clk_disable_unprepare (res->ahb_clk); -err_clk_ahb: -clk_disable_unprepare (res->axi_s_clk); -err_clk_axi_s: -clk_disable_unprepare (res->axi_m_clk); -err_clk_axi_m: -clk_disable_unprepare (res->iface); -err_clk_iface: -/* -* Not checking for failure, will anyway return -* the original failure in 'ret'. -*/ -for (i =0 ; i <ARRAY_SIZE (res->rst); i++) -reset_control_assert (res->rst[i]); - -return ret; }static int qcom_pcie_get_resources_2_7_0 (struct qcom_pcie *pcie)
@@ -1465,6 +1472,7 @@ static const struct qcom_pcie_ops ops_2_static const struct qcom_pcie_ops ops_2_3_3 = { .get_resources = qcom_pcie_get_resources_2_3_3, .init = qcom_pcie_init_2_3_3, + .post_init = qcom_pcie_post_init_2_3_3, .deinit = qcom_pcie_deinit_2_3_3, .ltssm_enable = qcom_pcie_2_3_2_ltssm_enable, };
Greg Kroah-Hartman
maintainerPATCH 1068/1157 dm writecache: set a default MAX_WRITEBACK_JOBS
In reply to Greg Kroah-HartmanFrom: Mikulas Patocka <[email protected]>
[ Upstream commit ca7dc242e358e46d963b32f9d9dd829785a9e957 ]
dm-writecache has the capability to limit the number of writeback jobs in progress. However, this feature was off by default. As such there were some out-of-memory crashes observed when lowering the low watermark while the cache is full.
This commit enables writeback limit by default. It is set to 256MiB or 1/16 of total system memory, whichever is smaller.
--- drivers/md/dm-writecache.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-writecache.c +1 -1
@@ -22,7 +22,7 @@#define HIGH_WATERMARK 50#define LOW_WATERMARK 45 -#define MAX_WRITEBACK_JOBS 0 +#define MAX_WRITEBACK_JOBS min(0x10000000 / PAGE_SIZE, totalram_pages() / 16)#define ENDIO_LATENCY 16#define WRITEBACK_LATENCY 64#define AUTOCOMMIT_BLOCKS_SSD 65536
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1069/1157 kexec_file: drop weak attribute from functions
In reply to Greg Kroah-HartmanFrom: Naveen N. Rao <[email protected]>
[ Upstream commit 65d9a9a60fd71be964effb2e94747a6acb6e7015 ]
As requested
(http://lkml.kernel.org/r/[email protected]),
this series converts weak functions in kexec to use the #ifdef approach.
Quoting the 3e35142ef99fe ("kexec_file: drop weak attribute from arch_kexec_apply_relocations[_add]") changelog:
: Since commit d1bcae833b32f1 ("ELF: Don't generate unused section symbols") : [1], binutils (v2.36+) started dropping section symbols that it thought : were unused. This isn't an issue in general, but with kexec_file.c, gcc : is placing kexec_arch_apply_relocations[_add] into a separate : .text.unlikely section and the section symbol ".text.unlikely" is being : dropped. Due to this, recordmcount is unable to find a non-weak symbol in : .text.unlikely to generate a relocation record against.
This patch (of 2);
Drop __weak attribute from functions in kexec_file.c:
- arch_kexec_kernel_image_probe()
- arch_kimage_file_post_load_cleanup()
- arch_kexec_kernel_image_load()
- arch_kexec_locate_mem_hole()
- arch_kexec_kernel_verify_sig()
arch_kexec_kernel_image_load() calls into kexec_image_load_default(), so drop the static attribute for the latter.
arch_kexec_kernel_verify_sig() is not overridden by any architecture, so drop the __weak attribute.
--- arch/arm64/include/asm/kexec.h | 4 ++- arch/powerpc/include/asm/kexec.h | 9 +++++++ arch/s390/include/asm/kexec.h | 3 +++ arch/x86/include/asm/kexec.h | 6 +++++ include/linux/kexec.h | 44 +++++++++++++++++++++++++++----- kernel/kexec_file.c | 35 ++----------------------- 6 files changed, 61 insertions(+), 40 deletions(-)
arch/arm64/include/asm/kexec.h +3 -1
@@ -115,7 +115,9 @@ extern const struct kexec_file_ops kexec_image_ops;struct kimage ; -extern int arch_kimage_file_post_load_cleanup (struct kimage *image); +int arch_kimage_file_post_load_cleanup (struct kimage *image); +#define arch_kimage_file_post_load_cleanup arch_kimage_file_post_load_cleanup + extern int load_other_segments(struct kimage *image, unsigned long kernel_load_addr, unsigned long kernel_size, char *initrd, unsigned long initrd_len,
arch/powerpc/include/asm/kexec.h +9 -0
@@ -120,6 +120,15 @@ int setup_purgatory(struct kimage *image, const void *slave_code,#ifdef CONFIG_PPC64 struct kexec_buf ; +int arch_kexec_kernel_image_probe (struct kimage *image,void *buf,unsigned long buf_len); +#define arch_kexec_kernel_image_probe arch_kexec_kernel_image_probe + +int arch_kimage_file_post_load_cleanup (struct kimage *image); +#define arch_kimage_file_post_load_cleanup arch_kimage_file_post_load_cleanup + +int arch_kexec_locate_mem_hole (struct kexec_buf *kbuf); +#define arch_kexec_locate_mem_hole arch_kexec_locate_mem_hole +int load_crashdump_segments_ppc64 (struct kimage *image,struct kexec_buf *kbuf); int setup_purgatory_ppc64(struct kimage *image, const void *slave_code,
arch/s390/include/asm/kexec.h +3 -0
@@ -92,5 +92,8 @@ int arch_kexec_apply_relocations_add(struct purgatory_info *pi,const Elf_Shdr *relsec, const Elf_Shdr *symtab);#define arch_kexec_apply_relocations_add arch_kexec_apply_relocations_add + +int arch_kimage_file_post_load_cleanup (struct kimage *image); +#define arch_kimage_file_post_load_cleanup arch_kimage_file_post_load_cleanup#endif #endif /*_S390_KEXEC_H */
arch/x86/include/asm/kexec.h +6 -0
@@ -193,6 +193,12 @@ int arch_kexec_apply_relocations_add(struct purgatory_info *pi,const Elf_Shdr *relsec, const Elf_Shdr *symtab);#define arch_kexec_apply_relocations_add arch_kexec_apply_relocations_add + +void *arch_kexec_kernel_image_load (struct kimage *image); +#define arch_kexec_kernel_image_load arch_kexec_kernel_image_load + +int arch_kimage_file_post_load_cleanup (struct kimage *image); +#define arch_kimage_file_post_load_cleanup arch_kimage_file_post_load_cleanup#endif #endif
include/linux/kexec.h +38 -6
59 lines not on this page · raw message
kernel/kexec_file.c +2 -33
@@ -62,14 +62,7 @@ int kexec_image_probe_default(struct kimage *image, void *buf,return ret; } -/* Architectures can provide this probe function */ -int __weak arch_kexec_kernel_image_probe (struct kimage *image,void *buf, -unsigned long buf_len) -{ -return kexec_image_probe_default (image, buf, buf_len); -} - -static void *kexec_image_load_default (struct kimage *image) +void *kexec_image_load_default (struct kimage *image) {if (!image->fops || !image->fops->load)return ERR_PTR (-ENOEXEC );
@@ -80,11 +73,6 @@ static void *kexec_image_load_default(struct kimage *image) image->cmdline_buf_len); } -void *__weak arch_kexec_kernel_image_load (struct kimage *image) -{ -return kexec_image_load_default (image); -} -int kexec_image_post_load_cleanup_default (struct kimage *image) {if (!image->fops || !image->fops->cleanup)
@@ -93,11 +81,6 @@ int kexec_image_post_load_cleanup_default(struct kimage *image)return image->fops->cleanup (image->image_loader_data); } -int __weak arch_kimage_file_post_load_cleanup (struct kimage *image) -{ -return kexec_image_post_load_cleanup_default (image); -} -#ifdef CONFIG_KEXEC_SIG static int kexec_image_verify_sig_default (struct kimage *image,void *buf,unsigned long buf_len)
@@ -110,8 +93,7 @@ static int kexec_image_verify_sig_default(struct kimage *image, void *buf,return image->fops->verify_sig (buf, buf_len); } -int __weak arch_kexec_kernel_verify_sig (struct kimage *image,void *buf, -unsigned long buf_len) +int arch_kexec_kernel_verify_sig (struct kimage *image,void *buf,unsigned long buf_len) {return kexec_image_verify_sig_default (image, buf, buf_len); }
@@ -621,19 +603,6 @@ int kexec_locate_mem_hole(struct kexec_buf *kbuf)return ret ==1 ?0 : -EADDRNOTAVAIL ; } -/** -* arch_kexec_locate_mem_hole - Find free memory to place the segments. -* @kbuf: Parameters for the memory search. -* -* On success, kbuf->mem will have the start address of the memory region found. -* -* Return: 0 on success, negative errno on error. -*/ -int __weak arch_kexec_locate_mem_hole (struct kexec_buf *kbuf) -{ -return kexec_locate_mem_hole (kbuf); -} -/** * kexec_add_buffer - place a buffer in a kexec segment * @kbuf: Buffer contents and memory parameters.
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1070/1157 kexec: clean up arch_kexec_kernel_verify_sig
In reply to Greg Kroah-HartmanFrom: Coiby Xu <[email protected]>
[ Upstream commit 689a71493bd2f31c024f8c0395f85a1fd4b2138e ]
Before commit 105e10e2cf1c ("kexec_file: drop weak attribute from functions"), there was already no arch-specific implementation of arch_kexec_kernel_verify_sig. With weak attribute dropped by that commit, arch_kexec_kernel_verify_sig is completely useless. So clean it up.
Note later patches are dependent on this patch so it should be backported to the stable tree as well.
--- include/linux/kexec.h | 5 ----- kernel/kexec_file.c | 33 +++++++++++++-------------------- 2 files changed, 13 insertions(+), 25 deletions(-)
include/linux/kexec.h +0 -5
@@ -212,11 +212,6 @@ static inline void *arch_kexec_kernel_image_load(struct kimage *image) }#endif -#ifdef CONFIG_KEXEC_SIG -int arch_kexec_kernel_verify_sig (struct kimage *image,void *buf, -unsigned long buf_len); -#endif -extern int kexec_add_buffer (struct kexec_buf *kbuf);int kexec_locate_mem_hole (struct kexec_buf *kbuf);
kernel/kexec_file.c +13 -20
@@ -81,24 +81,6 @@ int kexec_image_post_load_cleanup_default(struct kimage *image)return image->fops->cleanup (image->image_loader_data); } -#ifdef CONFIG_KEXEC_SIG -static int kexec_image_verify_sig_default (struct kimage *image,void *buf, -unsigned long buf_len) -{ -if (!image->fops || !image->fops->verify_sig) { -pr_debug ("kernel loader does not support signature verification.\n" ); -return -EKEYREJECTED ; - } - -return image->fops->verify_sig (buf, buf_len); -} - -int arch_kexec_kernel_verify_sig (struct kimage *image,void *buf,unsigned long buf_len) -{ -return kexec_image_verify_sig_default (image, buf, buf_len); -} -#endif -/* * Free up memory used by kernel, initrd, and command line. This is temporary * memory allocation which is not needed any more after these buffers have
@@ -141,13 +123,24 @@ void kimage_file_post_load_cleanup(struct kimage *image) }#ifdef CONFIG_KEXEC_SIG +static int kexec_image_verify_sig (struct kimage *image,void *buf, +unsigned long buf_len) +{ +if (!image->fops || !image->fops->verify_sig) { +pr_debug ("kernel loader does not support signature verification.\n" ); +return -EKEYREJECTED ; + } + +return image->fops->verify_sig (buf, buf_len); +} +static int kimage_validate_signature (struct kimage *image) {int ret; - ret =arch_kexec_kernel_verify_sig (image, image->kernel_buf, - image->kernel_buf_len); + ret =kexec_image_verify_sig (image, image->kernel_buf, + image->kernel_buf_len);if (ret) {if (sig_enforce) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1071/1157 kexec, KEYS, s390: Make use of built-in and secondary keyring for signature verification
In reply to Greg Kroah-HartmanFrom: Michal Suchanek <[email protected]>
[ Upstream commit 0828c4a39be57768b8788e8cbd0d84683ea757e5 ]
commit e23a8020ce4e ("s390/kexec_file: Signature verification prototype") adds support for KEXEC_SIG verification with keys from platform keyring but the built-in keys and secondary keyring are not used.
Add support for the built-in keys and secondary keyring as x86 does.
--- arch/s390/kernel/machine_kexec_file.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
arch/s390/kernel/machine_kexec_file.c +13 -5
@@ -31,6 +31,7 @@ int s390_verify_sig(const char *kernel, unsigned long kernel_len)const unsigned long marker_len =sizeof (MODULE_SIG_STRING ) -1 ;struct module_signature *ms;unsigned long sig_len; +int ret;/* Skip signature verification when not secure IPLed. */ if (!ipl_secure_flag)
@@ -65,11 +66,18 @@ int s390_verify_sig(const char *kernel, unsigned long kernel_len) return -EBADMSG; } -return verify_pkcs7_signature (kernel, kernel_len, - kernel + kernel_len, sig_len, -VERIFY_USE_PLATFORM_KEYRING , -VERIFYING_MODULE_SIGNATURE , -NULL ,NULL ); + ret =verify_pkcs7_signature (kernel, kernel_len, + kernel + kernel_len, sig_len, +VERIFY_USE_SECONDARY_KEYRING , +VERIFYING_MODULE_SIGNATURE , +NULL ,NULL ); +if (ret == -ENOKEY &&IS_ENABLED (CONFIG_INTEGRITY_PLATFORM_KEYRING )) + ret =verify_pkcs7_signature (kernel, kernel_len, + kernel + kernel_len, sig_len, +VERIFY_USE_PLATFORM_KEYRING , +VERIFYING_MODULE_SIGNATURE , +NULL ,NULL ); +return ret; }#endif /* CONFIG_KEXEC_SIG */
Signature · 9 lines
2.35.1 _______________________________________________ kexec mailing list [email protected] http://lists.infradead.org/mailman/listinfo/kexec
Greg Kroah-Hartman
maintainerPATCH 1072/1157 tracing/events: Add __vstring() and __assign_vstr() helper macros
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (Google) <[email protected]>
[ Upstream commit 0563231f93c6d1f582b168a47753b345c1e20d81 ]
There's several places that open code the following logic:
TP_STRUCT__entry(__dynamic_array(char, msg, MSG_MAX)), TP_fast_assign(vsnprintf(__get_str(msg), MSG_MAX, vaf->fmt, *vaf->va);)
To load a string created by variable array va_list.
The main issue with this approach is that "MSG_MAX" usage in the __dynamic_array() portion. That actually just reserves the MSG_MAX in the event, and even wastes space because there's dynamic meta data also saved in the event to denote the offset and size of the dynamic array. It would have been better to just use a static __array() field.
Instead, create __vstring() and __assign_vstr() that work like __string and __assign_str() but instead of taking a destination string to copy, take a format string and a va_list pointer and fill in the values.
It uses the helper:
#define __trace_event_vstr_len(fmt, va) \
({ \
va_list __ap; \
int __ret; \
\
va_copy(__ap, *(va)); \
__ret = vsnprintf(NULL, 0, fmt, __ap) + 1; \
va_end(__ap); \
\
min(__ret, TRACE_EVENT_STR_MAX); \})
To figure out the length to store the string. It may be slightly slower as it needs to run the vsnprintf() twice, but it now saves space on the ring buffer.
--- include/linux/trace_events.h | 18 ++++++++++++++++++ include/trace/stages/stage1_struct_define.h | 3 +++ include/trace/stages/stage2_data_offsets.h | 3 +++ include/trace/stages/stage4_event_fields.h | 3 +++ include/trace/stages/stage5_get_offsets.h | 4 ++++ include/trace/stages/stage6_event_callback.h | 7 +++++++ 6 files changed, 38 insertions(+)
include/linux/trace_events.h +18 -0
@@ -916,6 +916,24 @@ perf_trace_buf_submit(void *raw_data, int size, int rctx, u16 type,#endif +#define TRACE_EVENT_STR_MAX 512 + +/* +* gcc warns that you can not use a va_list in an inlined +* function. But lets me make it into a macro :-/ +*/ +#define __trace_event_vstr_len (fmt, va) \ +({ \ + va_list __ap; \ + int __ret; \ + \ + va_copy(__ap, *(va)); \ + __ret = vsnprintf(NULL, 0, fmt, __ap) + 1; \ + va_end(__ap); \ + \ + min(__ret, TRACE_EVENT_STR_MAX); \ +}) +#endif /* _LINUX_TRACE_EVENT_H */ /*
include/trace/stages/stage1_struct_define.h +3 -0
@@ -26,6 +26,9 @@#undef __string_len#define __string_len (item, src, len) __dynamic_array(char, item, -1) +#undef __vstring +#define __vstring (item, fmt, ap) __dynamic_array(char, item, -1) +#undef __bitmask#define __bitmask (item, nr_bits) __dynamic_array(char, item, -1)
include/trace/stages/stage2_data_offsets.h +3 -0
@@ -32,6 +32,9 @@#undef __string_len#define __string_len (item, src, len) __dynamic_array(char, item, -1) +#undef __vstring +#define __vstring (item, fmt, ap) __dynamic_array(char, item, -1) +#undef __bitmask#define __bitmask (item, nr_bits) __dynamic_array(unsigned long, item, -1)
include/trace/stages/stage4_event_fields.h +3 -0
@@ -38,6 +38,9 @@#undef __string_len#define __string_len (item, src, len) __dynamic_array(char, item, -1) +#undef __vstring +#define __vstring (item, fmt, ap) __dynamic_array(char, item, -1) +#undef __bitmask#define __bitmask (item, nr_bits) __dynamic_array(unsigned long, item, -1)
include/trace/stages/stage5_get_offsets.h +4 -0
@@ -39,6 +39,10 @@#undef __string_len#define __string_len (item, src, len) __dynamic_array(char, item, (len) + 1) +#undef __vstring +#define __vstring (item, fmt, ap) __dynamic_array(char, item, \ + __trace_event_vstr_len(fmt, ap)) +#undef __rel_dynamic_array#define __rel_dynamic_array (type, item, len) \ __item_length = (len) * sizeof(type); \
include/trace/stages/stage6_event_callback.h +7 -0
@@ -24,6 +24,9 @@#undef __string_len#define __string_len (item, src, len) __dynamic_array(char, item, -1) +#undef __vstring +#define __vstring (item, fmt, ap) __dynamic_array(char, item, -1) +#undef __assign_str#define __assign_str (dst, src) \ strcpy(__get_str(dst), (src) ? (const char *)(src) : "(null)");
@@ -35,6 +38,10 @@__get_str (dst)[len] ='\0' ; \ } while(0) +#undef __assign_vstr +#define __assign_vstr (dst, fmt, va) \ + vsnprintf(__get_str(dst), TRACE_EVENT_STR_MAX, fmt, *(va)) +#undef __bitmask#define __bitmask (item, nr_bits) __dynamic_array(unsigned long, item, -1)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1073/1157 dm thin: fix use-after-free crash in dm_sm_register_threshold_callback
In reply to Greg Kroah-HartmanFrom: Luo Meng <[email protected]>
[ Upstream commit 3534e5a5ed2997ca1b00f44a0378a075bd05e8a3 ]
Fault inject on pool metadata device reports:
BUG: KASAN: use-after-free in dm_pool_register_metadata_threshold+0x40/0x80 Read of size 8 at addr ffff8881b9d50068 by task dmsetup/950 CPU: 7 PID: 950 Comm: dmsetup Tainted: G W 5.19.0-rc6 #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.14.0-1.fc33 04/01/2014 Call Trace: <TASK> dump_stack_lvl+0x34/0x44 print_address_description.constprop.0.cold+0xeb/0x3f4 kasan_report.cold+0xe6/0x147 dm_pool_register_metadata_threshold+0x40/0x80 pool_ctr+0xa0a/0x1150 dm_table_add_target+0x2c8/0x640 table_load+0x1fd/0x430 ctl_ioctl+0x2c4/0x5a0 dm_ctl_ioctl+0xa/0x10 __x64_sys_ioctl+0xb3/0xd0 do_syscall_64+0x35/0x80 entry_SYSCALL_64_after_hwframe+0x46/0xb0
This can be easily reproduced using:
echo offline > /sys/block/sda/device/state
dd if=/dev/zero of=/dev/mapper/thin bs=4k count=10
dmsetup load pool --table "0 20971520 thin-pool /dev/sda /dev/sdb 128 0 0"
If a metadata commit fails, the transaction will be aborted and the metadata space maps will be destroyed. If a DM table reload then happens for this failed thin-pool, a use-after-free will occur in dm_sm_register_threshold_callback (called from dm_pool_register_metadata_threshold).
Fix this by in dm_pool_register_metadata_threshold() by returning the -EINVAL error if the thin-pool is in fail mode. Also fail pool_ctr() with a new error message: "Error registering metadata threshold".
--- drivers/md/dm-thin-metadata.c | 7 +++++-- drivers/md/dm-thin.c | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-)
drivers/md/dm-thin-metadata.c +5 -2
@@ -2045,10 +2045,13 @@ int dm_pool_register_metadata_threshold(struct dm_pool_metadata *pmd,dm_sm_threshold_fn fn, void *context) { - int r; + int r = -EINVAL;pmd_write_lock_in_core (pmd); - r =dm_sm_register_threshold_callback (pmd->metadata_sm, threshold, fn, context); +if (!pmd->fail_io) { + r =dm_sm_register_threshold_callback (pmd->metadata_sm, + threshold, fn, context); + }pmd_write_unlock (pmd);return r;
drivers/md/dm-thin.c +3 -1
@@ -3375,8 +3375,10 @@ static int pool_ctr(struct dm_target *ti, unsigned argc, char **argv)calc_metadata_threshold (pt), metadata_low_callback, pool); -if (r) +if (r) { + ti->error ="Error registering metadata threshold" ; goto out_flags_changed; + }dm_pool_register_pre_commit_callback (pool->pmd, metadata_pre_commit_callback, pool);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1074/1157 net/9p: Initialize the iounit field during fid creation
In reply to Greg Kroah-HartmanFrom: Tyler Hicks <[email protected]>
[ Upstream commit aa7aeee169480e98cf41d83c01290a37e569be6d ]
Ensure that the fid's iounit field is set to zero when a new fid is created. Certain 9P operations, such as OPEN and CREATE, allow the server to reply with an iounit size which the client code assigns to the p9_fid struct shortly after the fid is created by p9_fid_create(). On the other hand, an XATTRWALK operation doesn't allow for the server to specify an iounit value. The iounit field of the newly allocated p9_fid struct remained uninitialized in that case. Depending on allocation patterns, the iounit value could have been something reasonable that was carried over from previously freed fids or, in the worst case, could have been arbitrary values from non-fid related usages of the memory location.
The bug was detected in the Windows Subsystem for Linux 2 (WSL2) kernel after the uninitialized iounit field resulted in the typical sequence of two getxattr(2) syscalls, one to get the size of an xattr and another after allocating a sufficiently sized buffer to fit the xattr value, to hit an unexpected ERANGE error in the second call to getxattr(2). An uninitialized iounit field would sometimes force rsize to be smaller than the xattr value size in p9_client_read_once() and the 9P server in WSL refused to chunk up the READ on the attr_fid and, instead, returned ERANGE to the client. The virtfs server in QEMU seems happy to chunk up the READ and this problem goes undetected there.
--- net/9p/client.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
net/9p/client.c +1 -4
@@ -886,16 +886,13 @@ static struct p9_fid *p9_fid_create(strustruct p9_fid *fid;p9_debug (P9_DEBUG_FID ,"clnt %p\n" , clnt); - fid =kmalloc (sizeof (*fid),GFP_KERNEL ); + fid =kzalloc (sizeof (*fid),GFP_KERNEL );if (!fid)return NULL ; -memset (&fid->qid,0 ,sizeof (fid->qid)); fid->mode =-1 ; fid->uid =current_fsuid (); fid->clnt = clnt; - fid->rdir =NULL ; - fid->fid =0 ;refcount_set (&fid->count,1 );idr_preload (GFP_KERNEL );
Greg Kroah-Hartman
maintainerPATCH 1075/1157 ARM: Marvell: Update PCIe fixup
In reply to Greg Kroah-HartmanFrom: Pali Rohár <[email protected]>
[ Upstream commit fdaa3725831972284ef2779ddba00491d9dbbfca ]
- The code relies on rc_pci_fixup being called, which only happens when CONFIG_PCI_QUIRKS is enabled, so add that to Kconfig. Omitting this causes a booting failure with a non-obvious cause.
- Update rc_pci_fixup to set the class properly, copying the more modern style from other places
- Correct the rc_pci_fixup comment
This patch just re-applies commit 1dc831bf53fd ("ARM: Kirkwood: Update PCI-E fixup") for all other Marvell ARM platforms which have same buggy PCIe controller and do not use pci-mvebu.c controller driver yet.
Long-term goal for these Marvell ARM platforms should be conversion to pci-mvebu.c controller driver and removal of these fixups in arch code.
--- arch/arm/mach-dove/Kconfig | 1 + arch/arm/mach-dove/pcie.c | 11 ++++++++--- arch/arm/mach-mv78xx0/pcie.c | 11 ++++++++--- arch/arm/mach-orion5x/Kconfig | 1 + arch/arm/mach-orion5x/pci.c | 12 +++++++++--- 5 files changed, 27 insertions(+), 9 deletions(-)
arch/arm/mach-dove/Kconfig +1 -0
@@ -8,6 +8,7 @@ menuconfig ARCH_DOVE select PINCTRL_DOVE select PLAT_ORION_LEGACY select PM_GENERIC_DOMAINS if PM + select PCI_QUIRKS if PCI help Support for the Marvell Dove SoC 88AP510
arch/arm/mach-dove/pcie.c +8 -3
@@ -136,14 +136,19 @@ static struct pci_ops pcie_ops = { .write = pcie_wr_conf, }; +/* +* The root complex has a hardwired class of PCI_CLASS_MEMORY_OTHER, when it +* is operating as a root complex this needs to be switched to +* PCI_CLASS_BRIDGE_HOST or Linux will errantly try to process the BAR's on +* the device. Decoding setup is handled by the orion code. +*/ static void rc_pci_fixup (struct pci_dev *dev) { -/* -* Prevent enumeration of root complex. -*/ if (dev->bus->parent ==NULL && dev->devfn ==0 ) {int i; + dev->class &=0xff ; + dev->class |=PCI_CLASS_BRIDGE_HOST <<8 ;for (i =0 ; i <DEVICE_COUNT_RESOURCE ; i++) { dev->resource[i].start =0 ; dev->resource[i].end =0 ;
arch/arm/mach-mv78xx0/pcie.c +8 -3
@@ -180,14 +180,19 @@ static struct pci_ops pcie_ops = { .write = pcie_wr_conf, }; +/* +* The root complex has a hardwired class of PCI_CLASS_MEMORY_OTHER, when it +* is operating as a root complex this needs to be switched to +* PCI_CLASS_BRIDGE_HOST or Linux will errantly try to process the BAR's on +* the device. Decoding setup is handled by the orion code. +*/ static void rc_pci_fixup (struct pci_dev *dev) { -/* -* Prevent enumeration of root complex. -*/ if (dev->bus->parent ==NULL && dev->devfn ==0 ) {int i; + dev->class &=0xff ; + dev->class |=PCI_CLASS_BRIDGE_HOST <<8 ;for (i =0 ; i <DEVICE_COUNT_RESOURCE ; i++) { dev->resource[i].start =0 ; dev->resource[i].end =0 ;
arch/arm/mach-orion5x/Kconfig +1 -0
@@ -7,6 +7,7 @@ menuconfig ARCH_ORION5X select GPIOLIB select MVEBU_MBUS select FORCE_PCI + select PCI_QUIRKS select PHYLIB if NETDEVICES select PLAT_ORION_LEGACY help
arch/arm/mach-orion5x/pci.c +9 -3
@@ -515,14 +515,20 @@ static int __init pci_setup(struct pci_sys_data *sys)/***************************************************************************** * General PCIe + PCI ****************************************************************************/ + +/* +* The root complex has a hardwired class of PCI_CLASS_MEMORY_OTHER, when it +* is operating as a root complex this needs to be switched to +* PCI_CLASS_BRIDGE_HOST or Linux will errantly try to process the BAR's on +* the device. Decoding setup is handled by the orion code. +*/ static void rc_pci_fixup (struct pci_dev *dev) { -/* -* Prevent enumeration of root complex. -*/ if (dev->bus->parent ==NULL && dev->devfn ==0 ) {int i; + dev->class &=0xff ; + dev->class |=PCI_CLASS_BRIDGE_HOST <<8 ;for (i =0 ; i <DEVICE_COUNT_RESOURCE ; i++) { dev->resource[i].start =0 ; dev->resource[i].end =0 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1076/1157 timekeeping: contribute wall clock to rng on time change
In reply to Greg Kroah-HartmanFrom: Jason A. Donenfeld <[email protected]>
[ Upstream commit b8ac29b40183a6038919768b5d189c9bd91ce9b4 ]
The rng's random_init() function contributes the real time to the rng at boot time, so that events can at least start in relation to something particular in the real world. But this clock might not yet be set that point in boot, so nothing is contributed. In addition, the relation between minor clock changes from, say, NTP, and the cycle counter is potentially useful entropic data.
This commit addresses this by mixing in a time stamp on calls to settimeofday and adjtimex. No entropy is credited in doing so, so it doesn't make initialization faster, but it is still useful input to have.
--- kernel/time/timekeeping.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
kernel/time/timekeeping.c +6 -1
@@ -23,6 +23,7 @@#include <linux/pvclock_gtod.h> #include <linux/compiler.h> #include <linux/audit.h> +#include <linux/random.h> #include "tick-internal.h" #include "ntp_internal.h"
@@ -1343,8 +1344,10 @@ int do_settimeofday64(const struct timespec64 *ts)/* Signal hrtimers about time change */ clock_was_set (CLOCK_SET_WALL ); -if (!ret) +if (!ret) {audit_tk_injoffset (ts_delta); +add_device_randomness (ts,sizeof (*ts)); + }return ret; }
@@ -2430,6 +2433,7 @@ int do_adjtimex(struct __kernel_timex *txc) ret =timekeeping_validate_timex (txc);if (ret)return ret; +add_device_randomness (txc,sizeof (*txc));if (txc->modes &ADJ_SETOFFSET ) {struct timespec64 delta;
@@ -2447,6 +2451,7 @@ int do_adjtimex(struct __kernel_timex *txc)audit_ntp_init (&ad);ktime_get_real_ts64 (&ts); +add_device_randomness (&ts,sizeof (ts));raw_spin_lock_irqsave (&timekeeper_lock, flags);write_seqcount_begin (&tk_core.seq);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1077/1157 locking/csd_lock: Change csdlock_debug from early_param to __setup
In reply to Greg Kroah-HartmanFrom: Chen Zhongjin <[email protected]>
[ Upstream commit 9c9b26b0df270d4f9246e483a44686fca951a29c ]
The csdlock_debug kernel-boot parameter is parsed by the early_param() function csdlock_debug(). If set, csdlock_debug() invokes static_branch_enable() to enable csd_lock_wait feature, which triggers a panic on arm64 for kernels built with CONFIG_SPARSEMEM=y and CONFIG_SPARSEMEM_VMEMMAP=n.
With CONFIG_SPARSEMEM_VMEMMAP=n, __nr_to_section is called in static_key_enable() and returns NULL, resulting in a NULL dereference because mem_section is initialized only later in sparse_init().
This is also a problem for powerpc because early_param() functions are invoked earlier than jump_label_init(), also resulting in static_key_enable() failures. These failures cause the warning "static key 'xxx' used before call to jump_label_init()".
Thus, early_param is too early for csd_lock_wait to run static_branch_enable(), so changes it to __setup to fix these.
--- kernel/smp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/smp.c +2 -2
@@ -174,9 +174,9 @@ static int __init csdlock_debug(char *str)if (val)static_branch_enable (&csdlock_debug_enabled); -return 0 ; +return 1 ; } -early_param ("csdlock_debug" , csdlock_debug); +__setup ("csdlock_debug=" , csdlock_debug); static DEFINE_PER_CPU(call_single_data_t *, cur_csd); static DEFINE_PER_CPU(smp_call_func_t, cur_csd_func);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1078/1157 block: dont allow the same type rq_qos add more than once
In reply to Greg Kroah-HartmanFrom: Jinke Han <[email protected]>
[ Upstream commit 14a6e2eb7df5c7897c15b109cba29ab0c4a791b6 ]
In our test of iocost, we encountered some list add/del corruptions of inner_walk list in ioc_timer_fn.
The reason can be described as follows:
cpu 0 cpu 1ioc_qos_write ioc_qos_write
ioc = q_to_ioc(queue);
if (!ioc) {
ioc = kzalloc();
ioc = q_to_ioc(queue);
if (!ioc) {
ioc = kzalloc();
...
rq_qos_add(q, rqos);
}
...
rq_qos_add(q, rqos);
...
}When the io.cost.qos file is written by two cpus concurrently, rq_qos may be added to one disk twice. In that case, there will be two iocs enabled and running on one disk. They own different iocgs on their active list. In the ioc_timer_fn function, because of the iocgs from two iocs have the same root iocg, the root iocg's walk_list may be overwritten by each other and this leads to list add/del corruptions in building or destroying the inner_walk list.
And so far, the blk-rq-qos framework works in case that one instance for one type rq_qos per queue by default. This patch make this explicit and also fix the crash above.
--- block/blk-iocost.c | 20 +++++++++++++------- block/blk-iolatency.c | 18 +++++++++++------- block/blk-rq-qos.h | 11 ++++++++++- block/blk-wbt.c | 12 +++++++++++- 4 files changed, 45 insertions(+), 16 deletions(-)
block/blk-iocost.c +13 -7
@@ -2886,15 +2886,21 @@ static int blk_iocost_init(struct request_queue *q)* called before policy activation completion, can't assume that the * target bio has an iocg associated and need to test for NULL iocg. */ -rq_qos_add (q, rqos); + ret =rq_qos_add (q, rqos); +if (ret) + goto err_free_ioc; + ret =blkcg_activate_policy (q, &blkcg_policy_iocost); -if (ret) { -rq_qos_del (q, rqos); -free_percpu (ioc->pcpu_stat); -kfree (ioc); -return ret; - } +if (ret) + goto err_del_qos;return 0 ; + +err_del_qos: +rq_qos_del (q, rqos); +err_free_ioc: +free_percpu (ioc->pcpu_stat); +kfree (ioc); +return ret; }static struct blkcg_policy_data *ioc_cpd_alloc (gfp_t gfp)
block/blk-iolatency.c +11 -7
@@ -773,19 +773,23 @@ int blk_iolatency_init(struct request_queue *q) rqos->ops = &blkcg_iolatency_ops; rqos->q = q; -rq_qos_add (q, rqos); - + ret =rq_qos_add (q, rqos); +if (ret) + goto err_free; ret =blkcg_activate_policy (q, &blkcg_policy_iolatency); -if (ret) { -rq_qos_del (q, rqos); -kfree (blkiolat); -return ret; - } +if (ret) + goto err_qos_del;timer_setup (&blkiolat->timer, blkiolatency_timer_fn,0 );INIT_WORK (&blkiolat->enable_work, blkiolatency_enable_work_fn);return 0 ; + +err_qos_del: +rq_qos_del (q, rqos); +err_free: +kfree (blkiolat); +return ret; }static void iolatency_set_min_lat_nsec (struct blkcg_gq *blkg,u64 val)
block/blk-rq-qos.h +10 -1
@@ -86,7 +86,7 @@ static inline void rq_wait_init(struct rq_wait *rq_wait)init_waitqueue_head (&rq_wait->wait); } -static inline void rq_qos_add (struct request_queue *q,struct rq_qos *rqos) +static inline int rq_qos_add (struct request_queue *q,struct rq_qos *rqos) {/* * No IO can be in-flight when adding rqos, so freeze queue, which
@@ -98,6 +98,8 @@ static inline void rq_qos_add(struct request_queue *q, struct rq_qos *rqos)blk_mq_freeze_queue (q);spin_lock_irq (&q->queue_lock); +if (rq_qos_id (q, rqos->id)) + goto ebusy; rqos->next = q->rq_qos; q->rq_qos = rqos;spin_unlock_irq (&q->queue_lock);
@@ -109,6 +111,13 @@ static inline void rq_qos_add(struct request_queue *q, struct rq_qos *rqos)blk_mq_debugfs_register_rqos (rqos);mutex_unlock (&q->debugfs_mutex); } + +return 0 ; +ebusy: +spin_unlock_irq (&q->queue_lock); +blk_mq_unfreeze_queue (q); +return -EBUSY ; + }static inline void rq_qos_del (struct request_queue *q,struct rq_qos *rqos)
block/blk-wbt.c +11 -1
@@ -820,6 +820,7 @@ int wbt_init(struct request_queue *q) {struct rq_wb *rwb;int i; +int ret; rwb =kzalloc (sizeof (*rwb),GFP_KERNEL );if (!rwb)
@@ -846,7 +847,10 @@ int wbt_init(struct request_queue *q)/* * Assign rwb and add the stats callback. */ -rq_qos_add (q, &rwb->rqos); + ret =rq_qos_add (q, &rwb->rqos); +if (ret) + goto err_free; +blk_stat_add_callback (q, rwb->cb); rwb->min_lat_nsec =wbt_default_latency_nsec (q);
@@ -855,4 +859,10 @@ int wbt_init(struct request_queue *q)wbt_set_write_cache (q,test_bit (QUEUE_FLAG_WC , &q->queue_flags));return 0 ; + +err_free: +blk_stat_free_callback (rwb->cb); +kfree (rwb); +return ret; + }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1079/1157 btrfs: tree-log: make the return value for log syncing consistent
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
[ Upstream commit f31f09f6be1c6c1a673e0566e258281a7bbaaa51 ]
Currently we will return 1 or -EAGAIN if we decide we need to commit the transaction rather than sync the log. In practice this doesn't really matter, we interpret any !0 and !BTRFS_NO_LOG_SYNC as needing to commit the transaction. However this makes it hard to figure out what the correct thing to do is.
Fix this up by defining BTRFS_LOG_FORCE_COMMIT and using this in all the places where we want to force the transaction to be committed.
--- fs/btrfs/file.c | 2 +- fs/btrfs/tree-log.c | 18 +++++++++--------- fs/btrfs/tree-log.h | 3 +++ 3 files changed, 13 insertions(+), 10 deletions(-)
fs/btrfs/file.c +1 -1
@@ -2308,7 +2308,7 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)btrfs_release_log_ctx_extents (&ctx);if (ret <0 ) {/* Fallthrough and commit/free transaction. */ - ret =1 ; + ret =BTRFS_LOG_FORCE_COMMIT ; }/* we've logged all the items and now have a consistent
fs/btrfs/tree-log.c +9 -9
@@ -171,7 +171,7 @@ static int start_log_trans(struct btrfs_trans_handle *trans,int index = (root->log_transid +1 ) %2 ;if (btrfs_need_log_full_commit (trans)) { - ret = -EAGAIN ; + ret =BTRFS_LOG_FORCE_COMMIT ; goto out; }
@@ -194,7 +194,7 @@ static int start_log_trans(struct btrfs_trans_handle *trans,* writing. */ if (zoned && !created) { - ret = -EAGAIN ; + ret =BTRFS_LOG_FORCE_COMMIT ; goto out; }
@@ -3121,7 +3121,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,/* bail out if we need to do a full commit */ if (btrfs_need_log_full_commit (trans)) { - ret = -EAGAIN ; + ret =BTRFS_LOG_FORCE_COMMIT ;mutex_unlock (&root->log_mutex); goto out; }
@@ -3222,7 +3222,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans, }btrfs_wait_tree_log_extents (log, mark);mutex_unlock (&log_root_tree->log_mutex); - ret = -EAGAIN ; + ret =BTRFS_LOG_FORCE_COMMIT ; goto out; }
@@ -3261,7 +3261,7 @@ int btrfs_sync_log(struct btrfs_trans_handle *trans,blk_finish_plug (&plug);btrfs_wait_tree_log_extents (log, mark);mutex_unlock (&log_root_tree->log_mutex); - ret = -EAGAIN ; + ret =BTRFS_LOG_FORCE_COMMIT ; goto out_wake_log_root; }
@@ -5848,7 +5848,7 @@ static int btrfs_log_inode(struct btrfs_trans_handle *trans, inode_only == LOG_INODE_ALL && inode->last_unlink_trans >= trans->transid) {btrfs_set_log_full_commit (trans); - ret =1 ; + ret =BTRFS_LOG_FORCE_COMMIT ; goto out_unlock; }
@@ -6562,12 +6562,12 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans,bool log_dentries = false;if (btrfs_test_opt (fs_info,NOTREELOG )) { - ret =1 ; + ret =BTRFS_LOG_FORCE_COMMIT ; goto end_no_trans; }if (btrfs_root_refs (&root->root_item) ==0 ) { - ret =1 ; + ret =BTRFS_LOG_FORCE_COMMIT ; goto end_no_trans; }
@@ -6665,7 +6665,7 @@ static int btrfs_log_inode_parent(struct btrfs_trans_handle *trans, end_trans:if (ret <0 ) {btrfs_set_log_full_commit (trans); - ret =1 ; + ret =BTRFS_LOG_FORCE_COMMIT ; }if (ret)
fs/btrfs/tree-log.h +3 -0
@@ -12,6 +12,9 @@/* return value for btrfs_log_dentry_safe that means we don't need to log it at all */ #define BTRFS_NO_LOG_SYNC 256 +/* We can't use the tree log for whatever reason, force a transaction commit */ +#define BTRFS_LOG_FORCE_COMMIT (1) +struct btrfs_log_ctx {int log_ret;int log_transid;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1080/1157 btrfs: ensure pages are unlocked on cow_file_range() failure
In reply to Greg Kroah-HartmanFrom: Naohiro Aota <[email protected]>
[ Upstream commit 9ce7466f372d83054c7494f6b3e4b9abaf3f0355 ]
There is a hung_task report on zoned btrfs like below.
https://github.com/naota/linux/issues/59
[726.328648] INFO: task rocksdb:high0:11085 blocked for more than 241 seconds. [726.329839] Not tainted 5.16.0-rc1+ #1 [726.330484] "echo 0 > /proc/sys/kernel/hung_task_timeout_secs" disables this message. [726.331603] task:rocksdb:high0 state:D stack: 0 pid:11085 ppid: 11082 flags:0x00000000 [726.331608] Call Trace: [726.331611] <TASK> [726.331614] __schedule+0x2e5/0x9d0 [726.331622] schedule+0x58/0xd0 [726.331626] io_schedule+0x3f/0x70 [726.331629] __folio_lock+0x125/0x200 [726.331634] ? find_get_entries+0x1bc/0x240 [726.331638] ? filemap_invalidate_unlock_two+0x40/0x40 [726.331642] truncate_inode_pages_range+0x5b2/0x770 [726.331649] truncate_inode_pages_final+0x44/0x50 [726.331653] btrfs_evict_inode+0x67/0x480 [726.331658] evict+0xd0/0x180 [726.331661] iput+0x13f/0x200 [726.331664] do_unlinkat+0x1c0/0x2b0 [726.331668] __x64_sys_unlink+0x23/0x30 [726.331670] do_syscall_64+0x3b/0xc0 [726.331674] entry_SYSCALL_64_after_hwframe+0x44/0xae [726.331677] RIP: 0033:0x7fb9490a171b [726.331681] RSP: 002b:00007fb943ffac68 EFLAGS: 00000246 ORIG_RAX: 0000000000000057 [726.331684] RAX: ffffffffffffffda RBX: 0000000000000000 RCX: 00007fb9490a171b [726.331686] RDX: 00007fb943ffb040 RSI: 000055a6bbe6ec20 RDI: 00007fb94400d300 [726.331687] RBP: 00007fb943ffad00 R08: 0000000000000000 R09: 0000000000000000 [726.331688] R10: 0000000000000031 R11: 0000000000000246 R12: 00007fb943ffb000 [726.331690] R13: 00007fb943ffb040 R14: 0000000000000000 R15: 00007fb943ffd260 [726.331693] </TASK>
While we debug the issue, we found running fstests generic/551 on 5GB non-zoned null_blk device in the emulated zoned mode also had a similar hung issue.
Also, we can reproduce the same symptom with an error injected cow_file_range() setup.
The hang occurs when cow_file_range() fails in the middle of allocation. cow_file_range() called from do_allocation_zoned() can split the give region ([start, end]) for allocation depending on current block group usages. When btrfs can allocate bytes for one part of the split regions but fails for the other region (e.g. because of -ENOSPC), we return the error leaving the pages in the succeeded regions locked. Technically, this occurs only when @unlock == 0. Otherwise, we unlock the pages in an allocated region after creating an ordered extent.
Considering the callers of cow_file_range(unlock=0) won't write out the pages, we can unlock the pages on error exit from cow_file_range(). So, we can ensure all the pages except @locked_page are unlocked on error case.
In summary, cow_file_range now behaves like this:
- page_started == 1 (return value)
- All the pages are unlocked. IO is started.
- unlock == 1
- All the pages except @locked_page are unlocked in any case
- unlock == 0
- On success, all the pages are locked for writing out them
- On failure, all the pages except @locked_page are unlocked
--- fs/btrfs/inode.c | 72 ++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 64 insertions(+), 8 deletions(-)
fs/btrfs/inode.c +64 -8
@@ -1133,6 +1133,28 @@ static u64 get_extent_allocation_hint(struct btrfs_inode *inode, u64 start,* *page_started is set to one if we unlock locked_page and do everything * required to start IO on it. It may be clean and already done with * IO when we return. +* +* When unlock == 1, we unlock the pages in successfully allocated regions. +* When unlock == 0, we leave them locked for writing them out. +* +* However, we unlock all the pages except @locked_page in case of failure. +* +* In summary, page locking state will be as follow: +* +* - page_started == 1 (return value) +* - All the pages are unlocked. IO is started. +* - Note that this can happen only on success +* - unlock == 1 +* - All the pages except @locked_page are unlocked in any case +* - unlock == 0 +* - On success, all the pages are locked for writing out them +* - On failure, all the pages except @locked_page are unlocked +* +* When a failure happens in the second or later iteration of the +* while-loop, the ordered extents created in previous iterations are kept +* intact. So, the caller must clean them up by calling +* btrfs_cleanup_ordered_extents(). See btrfs_run_delalloc_range() for +* example. */ static noinline int cow_file_range(struct btrfs_inode *inode, struct page *locked_page,
@@ -1142,6 +1164,7 @@ static noinline int cow_file_range(struct btrfs_inode *inode,struct btrfs_root *root = inode->root;struct btrfs_fs_info *fs_info = root->fs_info;u64 alloc_hint =0 ; +u64 orig_start = start;u64 num_bytes;unsigned long ram_size;u64 cur_alloc_size =0 ;
@@ -1329,18 +1352,44 @@ static noinline int cow_file_range(struct btrfs_inode *inode,btrfs_dec_block_group_reservations (fs_info, ins.objectid);btrfs_free_reserved_extent (fs_info, ins.objectid, ins.offset,1 ); out_unlock: +/* +* Now, we have three regions to clean up: +* +* |-------(1)----|---(2)---|-------------(3)----------| +* `- orig_start `- start `- start + cur_alloc_size `- end +* +* We process each region below. +*/ + clear_bits =EXTENT_LOCKED |EXTENT_DELALLOC |EXTENT_DELALLOC_NEW |EXTENT_DEFRAG |EXTENT_CLEAR_META_RESV ; page_ops =PAGE_UNLOCK |PAGE_START_WRITEBACK |PAGE_END_WRITEBACK ; +/* -* If we reserved an extent for our delalloc range (or a subrange) and -* failed to create the respective ordered extent, then it means that -* when we reserved the extent we decremented the extent's size from -* the data space_info's bytes_may_use counter and incremented the -* space_info's bytes_reserved counter by the same amount. We must make -* sure extent_clear_unlock_delalloc() does not try to decrement again -* the data space_info's bytes_may_use counter, therefore we do not pass -* it the flag EXTENT_CLEAR_DATA_RESV. +* For the range (1). We have already instantiated the ordered extents +* for this region. They are cleaned up by +* btrfs_cleanup_ordered_extents() in e.g, +* btrfs_run_delalloc_range(). EXTENT_LOCKED | EXTENT_DELALLOC are +* already cleared in the above loop. And, EXTENT_DELALLOC_NEW | +* EXTENT_DEFRAG | EXTENT_CLEAR_META_RESV are handled by the cleanup +* function. +* +* However, in case of unlock == 0, we still need to unlock the pages +* (except @locked_page) to ensure all the pages are unlocked. +*/ +if (!unlock && orig_start < start) +extent_clear_unlock_delalloc (inode, orig_start, start -1 , + locked_page,0 , page_ops); + +/* +* For the range (2). If we reserved an extent for our delalloc range +* (or a subrange) and failed to create the respective ordered extent, +* then it means that when we reserved the extent we decremented the +* extent's size from the data space_info's bytes_may_use counter and +* incremented the space_info's bytes_reserved counter by the same +* amount. We must make sure extent_clear_unlock_delalloc() does not try +* to decrement again the data space_info's bytes_may_use counter, +* therefore we do not pass it the flag EXTENT_CLEAR_DATA_RESV. */ if (extent_reserved) { extent_clear_unlock_delalloc(inode, start,
@@ -1352,6 +1401,13 @@ static noinline int cow_file_range(struct btrfs_inode *inode,if (start >= end) goto out; } + +/* +* For the range (3). We never touched the region. In addition to the +* clear_bits above, we add EXTENT_CLEAR_DATA_RESV to release the data +* space_info's bytes_may_use counter, reserved in +* btrfs_check_data_free_space(). +*/ extent_clear_unlock_delalloc (inode, start, end, locked_page, clear_bits |EXTENT_CLEAR_DATA_RESV , page_ops);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1081/1157 btrfs: fix error handling of fallback uncompress write
In reply to Greg Kroah-HartmanFrom: Naohiro Aota <[email protected]>
[ Upstream commit 71aa147b4d9d81fa65afa6016f50d7818b64a54f ]
When cow_file_range() fails in the middle of the allocation loop, it unlocks the pages but leaves the ordered extents intact. Thus, we need to call btrfs_cleanup_ordered_extents() to finish the created ordered extents.
Also, we need to call end_extent_writepage() if locked_page is available because btrfs_cleanup_ordered_extents() never processes the region on the locked_page.
Furthermore, we need to set the mapping as error if locked_page is unavailable before unlocking the pages, so that the errno is properly propagated to the user space.
--- fs/btrfs/inode.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-)
fs/btrfs/inode.c +15 -2
@@ -927,8 +927,18 @@ static int submit_uncompressed_range(struct btrfs_inode *inode, goto out; }if (ret <0 ) { -if (locked_page) +btrfs_cleanup_ordered_extents (inode, locked_page, start, end - start +1 ); +if (locked_page) { +const u64 page_start =page_offset (locked_page); +const u64 page_end = page_start +PAGE_SIZE -1 ; + +btrfs_page_set_error (inode->root->fs_info, locked_page, + page_start,PAGE_SIZE ); +set_page_writeback (locked_page); +end_page_writeback (locked_page); +end_extent_writepage (locked_page, ret, page_start, page_end);unlock_page (locked_page); + } goto out; }
@@ -1377,9 +1387,12 @@ static noinline int cow_file_range(struct btrfs_inode *inode,* However, in case of unlock == 0, we still need to unlock the pages * (except @locked_page) to ensure all the pages are unlocked. */ -if (!unlock && orig_start < start) +if (!unlock && orig_start < start) { +if (!locked_page) +mapping_set_error (inode->vfs_inode.i_mapping, ret);extent_clear_unlock_delalloc (inode, orig_start, start -1 , locked_page,0 , page_ops); + }/* * For the range (2). If we reserved an extent for our delalloc range
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1082/1157 btrfs: reset block group chunk force if we have to wait
In reply to Greg Kroah-HartmanFrom: Josef Bacik <[email protected]>
[ Upstream commit 1314ca78b2c35d3e7d0f097268a2ee6dc0d369ef ]
If you try to force a chunk allocation, but you race with another chunk allocation, you will end up waiting on the chunk allocation that just occurred and then allocate another chunk. If you have many threads all doing this at once you can way over-allocate chunks.
Fix this by resetting force to NO_FORCE, that way if we think we need to allocate we can, otherwise we don't force another chunk allocation if one is already happening.
--- fs/btrfs/block-group.c | 1 + 1 file changed, 1 insertion(+)
fs/btrfs/block-group.c +1 -0
@@ -3761,6 +3761,7 @@ int btrfs_chunk_alloc(struct btrfs_trans_handle *trans, u64 flags,* attempt. */ wait_for_alloc = true; + force =CHUNK_ALLOC_NO_FORCE ;spin_unlock (&space_info->lock);mutex_lock (&fs_info->chunk_mutex);mutex_unlock (&fs_info->chunk_mutex);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1083/1157 btrfs: properly flag filesystem with BTRFS_FEATURE_INCOMPAT_BIG_METADATA
In reply to Greg Kroah-HartmanFrom: Nikolay Borisov <[email protected]>
[ Upstream commit e26b04c4c91925dba57324db177a24e18e2d0013 ]
Commit 6f93e834fa7c seemingly inadvertently moved the code responsible for flagging the filesystem as having BIG_METADATA to a place where setting the flag was essentially lost. This means that filesystems created with kernels containing this bug (starting with 5.15) can potentially be mounted by older (pre-3.4) kernels. In reality chances for this happening are low because there are other incompat flags introduced in the mean time. Still the correct behavior is to set INCOMPAT_BIG_METADATA flag and persist this in the superblock.
--- fs/btrfs/disk-io.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
fs/btrfs/disk-io.c +11 -10
@@ -3593,16 +3593,6 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_device*/ fs_info->compress_type =BTRFS_COMPRESS_ZLIB ; -/* -* Flag our filesystem as having big metadata blocks if they are bigger -* than the page size. -*/ -if (btrfs_super_nodesize (disk_super) >PAGE_SIZE ) { -if (!(features &BTRFS_FEATURE_INCOMPAT_BIG_METADATA )) -btrfs_info (fs_info, -"flagging fs with big metadata feature" ); - features |=BTRFS_FEATURE_INCOMPAT_BIG_METADATA ; - }/* Set up fs_info before parsing mount options */ nodesize =btrfs_super_nodesize (disk_super);
@@ -3643,6 +3633,17 @@ int __cold open_ctree(struct super_block *sb, struct btrfs_fs_devices *fs_deviceif (features &BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA )btrfs_info (fs_info,"has skinny extents" ); +/* +* Flag our filesystem as having big metadata blocks if they are bigger +* than the page size. +*/ +if (btrfs_super_nodesize (disk_super) >PAGE_SIZE ) { +if (!(features &BTRFS_FEATURE_INCOMPAT_BIG_METADATA )) +btrfs_info (fs_info, +"flagging fs with big metadata feature" ); + features |=BTRFS_FEATURE_INCOMPAT_BIG_METADATA ; + } +/* * mixed block groups end up with duplicate but slightly offset * extent buffers for the same range. It leads to corruptions
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1084/1157 block: add bdev_max_segments() helper
In reply to Greg Kroah-HartmanFrom: Naohiro Aota <[email protected]>
[ Upstream commit 65ea1b66482f415d51cd46515b02477257330339 ]
Add bdev_max_segments() like other queue parameters.
--- include/linux/blkdev.h | 5 +++++ 1 file changed, 5 insertions(+)
include/linux/blkdev.h +5 -0
@@ -1206,6 +1206,11 @@ bdev_max_zone_append_sectors(struct block_device *bdev)return queue_max_zone_append_sectors (bdev_get_queue (bdev)); } +static inline unsigned int bdev_max_segments (struct block_device *bdev) +{ +return queue_max_segments (bdev_get_queue (bdev)); +} +static inline unsigned queue_logical_block_size (const struct request_queue *q) {int retval =512 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1085/1157 btrfs: zoned: revive max_zone_append_bytes
In reply to Greg Kroah-HartmanFrom: Naohiro Aota <[email protected]>
[ Upstream commit c2ae7b772ef4e86c5ddf3fd47bf59045ae96a414 ]
This patch is basically a revert of commit 5a80d1c6a270 ("btrfs: zoned:
remove max_zone_append_size logic"), but without unnecessary ASSERT and check. The max_zone_append_size will be used as a hint to estimate the number of extents to cover delalloc/writeback region in the later commits.
The size of a ZONE APPEND bio is also limited by queue_max_segments(), so this commit considers it to calculate max_zone_append_size. Technically, a bio can be larger than queue_max_segments() * PAGE_SIZE if the pages are contiguous. But, it is safe to consider "queue_max_segments() * PAGE_SIZE" as an upper limit of an extent size to calculate the number of extents needed to write data.
--- fs/btrfs/ctree.h | 2 ++ fs/btrfs/zoned.c | 17 +++++++++++++++++ fs/btrfs/zoned.h | 1 + 3 files changed, 20 insertions(+)
fs/btrfs/ctree.h +2 -0
@@ -1047,6 +1047,8 @@ struct btrfs_fs_info {*/ u64 zone_size; +/* Max size to emit ZONE_APPEND write command */ +u64 max_zone_append_size;struct mutex zoned_meta_io_lock;spinlock_t treelog_bg_lock;u64 treelog_bg;
fs/btrfs/zoned.c +17 -0
@@ -415,6 +415,16 @@ int btrfs_get_dev_zone_info(struct btrfs_device *device, bool populate_cache) nr_sectors =bdev_nr_sectors (bdev); zone_info->zone_size_shift =ilog2 (zone_info->zone_size); zone_info->nr_zones = nr_sectors >>ilog2 (zone_sectors); +/* +* We limit max_zone_append_size also by max_segments * +* PAGE_SIZE. Technically, we can have multiple pages per segment. But, +* since btrfs adds the pages one by one to a bio, and btrfs cannot +* increase the metadata reservation even if it increases the number of +* extents, it is safe to stick with the limit. +*/ + zone_info->max_zone_append_size = +min_t (u64, (u64 )bdev_max_zone_append_sectors (bdev) <<SECTOR_SHIFT , + (u64 )bdev_max_segments (bdev) <<PAGE_SHIFT );if (!IS_ALIGNED (nr_sectors, zone_sectors)) zone_info->nr_zones++;
@@ -640,6 +650,7 @@ int btrfs_check_zoned_mode(struct btrfs_fs_info *fs_info)u64 zoned_devices =0 ;u64 nr_devices =0 ;u64 zone_size =0 ; +u64 max_zone_append_size =0 ;const bool incompat_zoned =btrfs_fs_incompat (fs_info,ZONED );int ret =0 ;
@@ -674,6 +685,11 @@ int btrfs_check_zoned_mode(struct btrfs_fs_info *fs_info) ret = -EINVAL ; goto out; } +if (!max_zone_append_size || + (zone_info->max_zone_append_size && + zone_info->max_zone_append_size < max_zone_append_size)) + max_zone_append_size = + zone_info->max_zone_append_size; } nr_devices++; }
@@ -723,6 +739,7 @@ int btrfs_check_zoned_mode(struct btrfs_fs_info *fs_info) } fs_info->zone_size = zone_size; + fs_info->max_zone_append_size = max_zone_append_size; fs_info->fs_devices->chunk_alloc_policy =BTRFS_CHUNK_ALLOC_ZONED ;/*
fs/btrfs/zoned.h +1 -0
@@ -19,6 +19,7 @@ struct btrfs_zoned_device_info {*/ u64 zone_size;u8 zone_size_shift; +u64 max_zone_append_size;u32 nr_zones;unsigned int max_active_zones;atomic_t active_zones_left;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1086/1157 btrfs: replace BTRFS_MAX_EXTENT_SIZE with fs_info->max_extent_size
In reply to Greg Kroah-HartmanFrom: Naohiro Aota <[email protected]>
[ Upstream commit f7b12a62f008a3041f42f2426983e59a6a0a3c59 ]
On zoned filesystem, data write out is limited by max_zone_append_size, and a large ordered extent is split according the size of a bio. OTOH, the number of extents to be written is calculated using BTRFS_MAX_EXTENT_SIZE, and that estimated number is used to reserve the metadata bytes to update and/or create the metadata items.
The metadata reservation is done at e.g, btrfs_buffered_write() and then released according to the estimation changes. Thus, if the number of extent increases massively, the reserved metadata can run out.
The increase of the number of extents easily occurs on zoned filesystem if BTRFS_MAX_EXTENT_SIZE > max_zone_append_size. And, it causes the following warning on a small RAM environment with disabling metadata over-commit (in the following patch).
[75721.498492] ------------[ cut here ]------------ [75721.505624] BTRFS: block rsv 1 returned -28 [75721.512230] WARNING: CPU: 24 PID: 2327559 at fs/btrfs/block-rsv.c:537 btrfs_use_block_rsv+0x560/0x760 [btrfs] [75721.581854] CPU: 24 PID: 2327559 Comm: kworker/u64:10 Kdump: loaded Tainted: G W 5.18.0-rc2-BTRFS-ZNS+ #109 [75721.597200] Hardware name: Supermicro Super Server/H12SSL-NT, BIOS 2.0 02/22/2021 [75721.607310] Workqueue: btrfs-endio-write btrfs_work_helper [btrfs] [75721.616209] RIP: 0010:btrfs_use_block_rsv+0x560/0x760 [btrfs] [75721.646649] RSP: 0018:ffffc9000fbdf3e0 EFLAGS: 00010286 [75721.654126] RAX: 0000000000000000 RBX: 0000000000004000 RCX: 0000000000000000 [75721.663524] RDX: 0000000000000004 RSI: 0000000000000008 RDI: fffff52001f7be6e [75721.672921] RBP: ffffc9000fbdf420 R08: 0000000000000001 R09: ffff889f8d1fc6c7 [75721.682493] R10: ffffed13f1a3f8d8 R11: 0000000000000001 R12: ffff88980a3c0e28 [75721.692284] R13: ffff889b66590000 R14: ffff88980a3c0e40 R15: ffff88980a3c0e8a [75721.701878] FS: 0000000000000000(0000) GS:ffff889f8d000000(0000) knlGS:0000000000000000 [75721.712601] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [75721.720726] CR2: 000055d12e05c018 CR3: 0000800193594000 CR4: 0000000000350ee0 [75721.730499] Call Trace: [75721.735166] <TASK> [75721.739886] btrfs_alloc_tree_block+0x1e1/0x1100 [btrfs] [75721.747545] ? btrfs_alloc_logged_file_extent+0x550/0x550 [btrfs] [75721.756145] ? btrfs_get_32+0xea/0x2d0 [btrfs] [75721.762852] ? btrfs_get_32+0xea/0x2d0 [btrfs] [75721.769520] ? push_leaf_left+0x420/0x620 [btrfs] [75721.776431] ? memcpy+0x4e/0x60 [75721.781931] split_leaf+0x433/0x12d0 [btrfs] [75721.788392] ? btrfs_get_token_32+0x580/0x580 [btrfs] [75721.795636] ? push_for_double_split.isra.0+0x420/0x420 [btrfs] [75721.803759] ? leaf_space_used+0x15d/0x1a0 [btrfs] [75721.811156] btrfs_search_slot+0x1bc3/0x2790 [btrfs] [75721.818300] ? lock_downgrade+0x7c0/0x7c0 [75721.824411] ? free_extent_buffer.part.0+0x107/0x200 [btrfs] [75721.832456] ? split_leaf+0x12d0/0x12d0 [btrfs] [75721.839149] ? free_extent_buffer.part.0+0x14f/0x200 [btrfs] [75721.846945] ? free_extent_buffer+0x13/0x20 [btrfs] [75721.853960] ? btrfs_release_path+0x4b/0x190 [btrfs] [75721.861429] btrfs_csum_file_blocks+0x85c/0x1500 [btrfs] [75721.869313] ? rcu_read_lock_sched_held+0x16/0x80 [75721.876085] ? lock_release+0x552/0xf80 [75721.881957] ? btrfs_del_csums+0x8c0/0x8c0 [btrfs] [75721.888886] ? __kasan_check_write+0x14/0x20 [75721.895152] ? do_raw_read_unlock+0x44/0x80 [75721.901323] ? _raw_write_lock_irq+0x60/0x80 [75721.907983] ? btrfs_global_root+0xb9/0xe0 [btrfs] [75721.915166] ? btrfs_csum_root+0x12b/0x180 [btrfs] [75721.921918] ? btrfs_get_global_root+0x820/0x820 [btrfs] [75721.929166] ? _raw_write_unlock+0x23/0x40 [75721.935116] ? unpin_extent_cache+0x1e3/0x390 [btrfs] [75721.942041] btrfs_finish_ordered_io.isra.0+0xa0c/0x1dc0 [btrfs] [75721.949906] ? try_to_wake_up+0x30/0x14a0 [75721.955700] ? btrfs_unlink_subvol+0xda0/0xda0 [btrfs] [75721.962661] ? rcu_read_lock_sched_held+0x16/0x80 [75721.969111] ? lock_acquire+0x41b/0x4c0 [75721.974982] finish_ordered_fn+0x15/0x20 [btrfs] [75721.981639] btrfs_work_helper+0x1af/0xa80 [btrfs] [75721.988184] ? _raw_spin_unlock_irq+0x28/0x50 [75721.994643] process_one_work+0x815/0x1460 [75722.000444] ? pwq_dec_nr_in_flight+0x250/0x250 [75722.006643] ? do_raw_spin_trylock+0xbb/0x190 [75722.013086] worker_thread+0x59a/0xeb0 [75722.018511] kthread+0x2ac/0x360 [75722.023428] ? process_one_work+0x1460/0x1460 [75722.029431] ? kthread_complete_and_exit+0x30/0x30 [75722.036044] ret_from_fork+0x22/0x30 [75722.041255] </TASK> [75722.045047] irq event stamp: 0 [75722.049703] hardirqs last enabled at (0): [<0000000000000000>] 0x0 [75722.057610] hardirqs last disabled at (0): [<ffffffff8118a94a>] copy_process+0x1c1a/0x66b0 [75722.067533] softirqs last enabled at (0): [<ffffffff8118a989>] copy_process+0x1c59/0x66b0 [75722.077423] softirqs last disabled at (0): [<0000000000000000>] 0x0 [75722.085335] ---[ end trace 0000000000000000 ]---
To fix the estimation, we need to introduce fs_info->max_extent_size to replace BTRFS_MAX_EXTENT_SIZE, which allow setting the different size for regular vs zoned filesystem.
Set fs_info->max_extent_size to BTRFS_MAX_EXTENT_SIZE by default. On zoned filesystem, it is set to fs_info->max_zone_append_size.
--- fs/btrfs/ctree.h | 6 ++++++ fs/btrfs/disk-io.c | 2 ++ fs/btrfs/extent_io.c | 4 +++- fs/btrfs/inode.c | 6 ++++-- fs/btrfs/zoned.c | 5 ++++- 5 files changed, 19 insertions(+), 4 deletions(-)
fs/btrfs/ctree.h +6 -0
@@ -1032,6 +1032,12 @@ struct btrfs_fs_info {u32 csums_per_leaf;u32 stripesize; +/* +* Maximum size of an extent. BTRFS_MAX_EXTENT_SIZE on regular +* filesystem, on zoned it depends on the device constraints. +*/ +u64 max_extent_size; +/* Block groups and devices containing active swapfiles. */ spinlock_t swapfile_pins_lock;struct rb_root swapfile_pins;
fs/btrfs/disk-io.c +2 -0
@@ -3262,6 +3262,8 @@ void btrfs_init_fs_info(struct btrfs_fs_info *fs_info) fs_info->sectorsize_bits =ilog2 (4096 ); fs_info->stripesize =4096 ; + fs_info->max_extent_size =BTRFS_MAX_EXTENT_SIZE ; +spin_lock_init (&fs_info->swapfile_pins_lock); fs_info->swapfile_pins =RB_ROOT ;
fs/btrfs/extent_io.c +3 -1
@@ -2007,10 +2007,12 @@ noinline_for_stack bool find_lock_delalloc_range(struct inode *inode, struct page *locked_page, u64 *start, u64 *end) { + struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);struct extent_io_tree *tree = &BTRFS_I (inode)->io_tree;const u64 orig_start = *start;const u64 orig_end = *end; -u64 max_bytes =BTRFS_MAX_EXTENT_SIZE ; +/* The sanity tests may not set a valid fs_info. */ +u64 max_bytes = fs_info ? fs_info->max_extent_size :BTRFS_MAX_EXTENT_SIZE ;u64 delalloc_start;u64 delalloc_end;bool found;
fs/btrfs/inode.c +4 -2
@@ -2200,6 +2200,7 @@ int btrfs_run_delalloc_range(struct btrfs_inode *inode, struct page *locked_pagevoid btrfs_split_delalloc_extent (struct inode *inode,struct extent_state *orig,u64 split) { +struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb);u64 size;/* not delalloc, ignore it */
@@ -2207,7 +2208,7 @@ void btrfs_split_delalloc_extent(struct inode *inode,return ; size = orig->end - orig->start +1 ; -if (size >BTRFS_MAX_EXTENT_SIZE ) { +if (size > fs_info->max_extent_size) {u32 num_extents;u64 new_size;
@@ -2236,6 +2237,7 @@ void btrfs_split_delalloc_extent(struct inode *inode,void btrfs_merge_delalloc_extent (struct inode *inode,struct extent_state *new,struct extent_state *other) { +struct btrfs_fs_info *fs_info =btrfs_sb (inode->i_sb);u64 new_size, old_size;u32 num_extents;
@@ -2249,7 +2251,7 @@ void btrfs_merge_delalloc_extent(struct inode *inode, struct extent_state *new, new_size = other->end - new->start +1 ;/* we're not bigger than the max, unreserve the space and go */ -if (new_size <=BTRFS_MAX_EXTENT_SIZE ) { +if (new_size <= fs_info->max_extent_size) {spin_lock (&BTRFS_I (inode)->lock);btrfs_mod_outstanding_extents (BTRFS_I (inode),-1 );spin_unlock (&BTRFS_I (inode)->lock);
fs/btrfs/zoned.c +4 -1
@@ -739,8 +739,11 @@ int btrfs_check_zoned_mode(struct btrfs_fs_info *fs_info) } fs_info->zone_size = zone_size; - fs_info->max_zone_append_size = max_zone_append_size; + fs_info->max_zone_append_size =ALIGN_DOWN (max_zone_append_size, + fs_info->sectorsize); fs_info->fs_devices->chunk_alloc_policy =BTRFS_CHUNK_ALLOC_ZONED ; +if (fs_info->max_zone_append_size < fs_info->max_extent_size) + fs_info->max_extent_size = fs_info->max_zone_append_size;/* * Check mount options here, because we might change fs_info->zoned
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1087/1157 btrfs: convert count_max_extents() to use fs_info->max_extent_size
In reply to Greg Kroah-HartmanFrom: Naohiro Aota <[email protected]>
[ Upstream commit 7d7672bc5d1038c745716c397d892d21e29de71c ]
If count_max_extents() uses BTRFS_MAX_EXTENT_SIZE to calculate the number of extents needed, btrfs release the metadata reservation too much on its way to write out the data.
Now that BTRFS_MAX_EXTENT_SIZE is replaced with fs_info->max_extent_size, convert count_max_extents() to use it instead, and fix the calculation of the metadata reservation.
--- fs/btrfs/ctree.h | 21 +++++++++++++-------- fs/btrfs/delalloc-space.c | 6 +++--- fs/btrfs/inode.c | 16 ++++++++-------- 3 files changed, 24 insertions(+), 19 deletions(-)
fs/btrfs/ctree.h +13 -8
@@ -107,14 +107,6 @@ struct btrfs_ioctl_encoded_io_args;#define BTRFS_STAT_CURR 0#define BTRFS_STAT_PREV 1 -/* -* Count how many BTRFS_MAX_EXTENT_SIZE cover the @size -*/ -static inline u32 count_max_extents (u64 size) -{ -return div_u64 (size +BTRFS_MAX_EXTENT_SIZE -1 ,BTRFS_MAX_EXTENT_SIZE ); -} -static inline unsigned long btrfs_chunk_item_size (int num_stripes) {BUG_ON (num_stripes ==0 );
@@ -4017,6 +4009,19 @@ static inline bool btrfs_is_zoned(const struct btrfs_fs_info *fs_info)return fs_info->zone_size >0 ; } +/* +* Count how many fs_info->max_extent_size cover the @size +*/ +static inline u32 count_max_extents (struct btrfs_fs_info *fs_info,u64 size) +{ +#ifdef CONFIG_BTRFS_FS_RUN_SANITY_TESTS +if (!fs_info) +return div_u64 (size +BTRFS_MAX_EXTENT_SIZE -1 ,BTRFS_MAX_EXTENT_SIZE ); +#endif + +return div_u64 (size + fs_info->max_extent_size -1 , fs_info->max_extent_size); +} +static inline bool btrfs_is_data_reloc_root (const struct btrfs_root *root) {return root->root_key.objectid ==BTRFS_DATA_RELOC_TREE_OBJECTID ;
fs/btrfs/delalloc-space.c +3 -3
@@ -273,7 +273,7 @@ static void calc_inode_reservations(struct btrfs_fs_info *fs_info, u64 num_bytes, u64 disk_num_bytes, u64 *meta_reserve, u64 *qgroup_reserve) { - u64 nr_extents = count_max_extents(num_bytes); + u64 nr_extents = count_max_extents(fs_info, num_bytes);u64 csum_leaves =btrfs_csum_bytes_to_leaves (fs_info, disk_num_bytes);u64 inode_update =btrfs_calc_metadata_size (fs_info,1 );
@@ -350,7 +350,7 @@ int btrfs_delalloc_reserve_metadata(struct btrfs_inode *inode, u64 num_bytes,* needs to free the reservation we just made. */ spin_lock (&inode->lock); - nr_extents =count_max_extents (num_bytes); + nr_extents =count_max_extents (fs_info, num_bytes);btrfs_mod_outstanding_extents (inode, nr_extents); inode->csum_bytes += disk_num_bytes;btrfs_calculate_inode_block_rsv_size (fs_info, inode);
@@ -413,7 +413,7 @@ void btrfs_delalloc_release_extents(struct btrfs_inode *inode, u64 num_bytes)unsigned num_extents;spin_lock (&inode->lock); - num_extents =count_max_extents (num_bytes); + num_extents =count_max_extents (fs_info, num_bytes);btrfs_mod_outstanding_extents (inode, -num_extents);btrfs_calculate_inode_block_rsv_size (fs_info, inode);spin_unlock (&inode->lock);
fs/btrfs/inode.c +8 -8
@@ -2217,10 +2217,10 @@ void btrfs_split_delalloc_extent(struct inode *inode,* applies here, just in reverse. */ new_size = orig->end - split +1 ; - num_extents =count_max_extents (new_size); + num_extents =count_max_extents (fs_info, new_size); new_size = split - orig->start; - num_extents +=count_max_extents (new_size); -if (count_max_extents (size) >= num_extents) + num_extents +=count_max_extents (fs_info, new_size); +if (count_max_extents (fs_info, size) >= num_extents)return ; }
@@ -2277,10 +2277,10 @@ void btrfs_merge_delalloc_extent(struct inode *inode, struct extent_state *new,* this case. */ old_size = other->end - other->start +1 ; - num_extents =count_max_extents (old_size); + num_extents =count_max_extents (fs_info, old_size); old_size = new->end - new->start +1 ; - num_extents +=count_max_extents (old_size); -if (count_max_extents (new_size) >= num_extents) + num_extents +=count_max_extents (fs_info, old_size); +if (count_max_extents (fs_info, new_size) >= num_extents)return ;spin_lock (&BTRFS_I (inode)->lock);
@@ -2359,7 +2359,7 @@ void btrfs_set_delalloc_extent(struct inode *inode, struct extent_state *state,if (!(state->state &EXTENT_DELALLOC ) && (*bits &EXTENT_DELALLOC )) {struct btrfs_root *root =BTRFS_I (inode)->root;u64 len = state->end +1 - state->start; -u32 num_extents =count_max_extents (len); +u32 num_extents =count_max_extents (fs_info, len);bool do_list = !btrfs_is_free_space_inode (BTRFS_I (inode));spin_lock (&BTRFS_I (inode)->lock);
@@ -2401,7 +2401,7 @@ void btrfs_clear_delalloc_extent(struct inode *vfs_inode,struct btrfs_inode *inode =BTRFS_I (vfs_inode);struct btrfs_fs_info *fs_info =btrfs_sb (vfs_inode->i_sb);u64 len = state->end +1 - state->start; -u32 num_extents =count_max_extents (len); +u32 num_extents =count_max_extents (fs_info, len);if ((state->state &EXTENT_DEFRAG ) && (*bits &EXTENT_DEFRAG )) {spin_lock (&inode->lock);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1088/1157 btrfs: let can_allocate_chunk return error
In reply to Greg Kroah-HartmanFrom: Naohiro Aota <[email protected]>
[ Upstream commit bb9950d3df7169a673c594d38fb74e241ed4fb2a ]
For the later patch, convert the return type from bool to int and return errors. No functional changes.
--- fs/btrfs/extent-tree.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-)
fs/btrfs/extent-tree.c +8 -7
@@ -3981,12 +3981,12 @@ static void found_extent(struct find_free_extent_ctl *ffe_ctl, } } -static bool can_allocate_chunk (struct btrfs_fs_info *fs_info, -struct find_free_extent_ctl *ffe_ctl) +static int can_allocate_chunk (struct btrfs_fs_info *fs_info, +struct find_free_extent_ctl *ffe_ctl) {switch (ffe_ctl->policy) {case BTRFS_EXTENT_ALLOC_CLUSTERED : -return true; +return 0 ;case BTRFS_EXTENT_ALLOC_ZONED :/* * If we have enough free space left in an already
@@ -3996,8 +3996,8 @@ static bool can_allocate_chunk(struct btrfs_fs_info *fs_info,*/ if (ffe_ctl->max_extent_size >= ffe_ctl->min_alloc_size && !btrfs_can_activate_zone (fs_info->fs_devices, ffe_ctl->flags)) -return false; -return true; +return -ENOSPC ; +return 0 ;default :BUG (); }
@@ -4079,8 +4079,9 @@ static int find_free_extent_update_loop(struct btrfs_fs_info *fs_info,int exist =0 ;/*Check if allocation policy allows to create a new chunk */ -if (!can_allocate_chunk (fs_info, ffe_ctl)) -return -ENOSPC ; + ret =can_allocate_chunk (fs_info, ffe_ctl); +if (ret) +return ret; trans = current->journal_info;if (trans)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1089/1157 btrfs: zoned: finish least available block group on data bg allocation
In reply to Greg Kroah-HartmanFrom: Naohiro Aota <[email protected]>
[ Upstream commit 393f646e34c18b85d0f41272bfcbd475ae3a0d34 ]
When we run out of active zones and no sufficient space is left in any block groups, we need to finish one block group to make room to activate a new block group.
However, we cannot do this for metadata block groups because we can cause a deadlock by waiting for a running transaction commit. So, do that only for a data block group.
Furthermore, the block group to be finished has two requirements. First, the block group must not have reserved bytes left. Having reserved bytes means we have an allocated region but did not yet send bios for it. If that region is allocated by the thread calling btrfs_zone_finish(), it results in a deadlock.
Second, the block group to be finished must not be a SYSTEM block group. Finishing a SYSTEM block group easily breaks further chunk allocation by nullifying the SYSTEM free space.
In a certain case, we cannot find any zone finish candidate or btrfs_zone_finish() may fail. In that case, we fall back to split the allocation bytes and fill the last spaces left in the block groups.
--- fs/btrfs/extent-tree.c | 50 +++++++++++++++++++++++++++++++++--------- fs/btrfs/zoned.c | 40 +++++++++++++++++++++++++++++++++ fs/btrfs/zoned.h | 7 ++++++ 3 files changed, 87 insertions(+), 10 deletions(-)
fs/btrfs/extent-tree.c +40 -10
@@ -3981,6 +3981,45 @@ static void found_extent(struct find_free_extent_ctl *ffe_ctl, } } +static int can_allocate_chunk_zoned (struct btrfs_fs_info *fs_info, +struct find_free_extent_ctl *ffe_ctl) +{ +/* If we can activate new zone, just allocate a chunk and use it */ +if (btrfs_can_activate_zone (fs_info->fs_devices, ffe_ctl->flags)) +return 0 ; + +/* +* We already reached the max active zones. Try to finish one block +* group to make a room for a new block group. This is only possible +* for a data block group because btrfs_zone_finish() may need to wait +* for a running transaction which can cause a deadlock for metadata +* allocation. +*/ +if (ffe_ctl->flags &BTRFS_BLOCK_GROUP_DATA ) { +int ret =btrfs_zone_finish_one_bg (fs_info); + +if (ret ==1 ) +return 0 ; +else if (ret <0 ) +return ret; + } + +/* +* If we have enough free space left in an already active block group +* and we can't activate any other zone now, do not allow allocating a +* new chunk and let find_free_extent() retry with a smaller size. +*/ +if (ffe_ctl->max_extent_size >= ffe_ctl->min_alloc_size) +return -ENOSPC ; + +/* +* We cannot activate a new block group and no enough space left in any +* block groups. So, allocating a new block group may not help. But, +* there is nothing to do anyway, so let's go with it. +*/ +return 0 ; +} +static int can_allocate_chunk (struct btrfs_fs_info *fs_info,struct find_free_extent_ctl *ffe_ctl) {
@@ -3988,16 +4027,7 @@ static int can_allocate_chunk(struct btrfs_fs_info *fs_info,case BTRFS_EXTENT_ALLOC_CLUSTERED :return 0 ;case BTRFS_EXTENT_ALLOC_ZONED : -/* -* If we have enough free space left in an already -* active block group and we can't activate any other -* zone now, do not allow allocating a new chunk and -* let find_free_extent() retry with a smaller size. -*/ -if (ffe_ctl->max_extent_size >= ffe_ctl->min_alloc_size && - !btrfs_can_activate_zone (fs_info->fs_devices, ffe_ctl->flags)) -return -ENOSPC ; -return 0 ; +return can_allocate_chunk_zoned (fs_info, ffe_ctl);default :BUG (); }
fs/btrfs/zoned.c +40 -0
@@ -2180,3 +2180,43 @@ void btrfs_zoned_release_data_reloc_bg(struct btrfs_fs_info *fs_info, u64 logicaspin_unlock (&block_group->lock);btrfs_put_block_group (block_group); } + +int btrfs_zone_finish_one_bg (struct btrfs_fs_info *fs_info) +{ +struct btrfs_block_group *block_group; +struct btrfs_block_group *min_bg =NULL ; +u64 min_avail =U64_MAX ; +int ret; + +spin_lock (&fs_info->zone_active_bgs_lock); +list_for_each_entry (block_group, &fs_info->zone_active_bgs, + active_bg_list) { +u64 avail; + +spin_lock (&block_group->lock); +if (block_group->reserved || + (block_group->flags &BTRFS_BLOCK_GROUP_SYSTEM )) { +spin_unlock (&block_group->lock); +continue ; + } + + avail = block_group->zone_capacity - block_group->alloc_offset; +if (min_avail > avail) { +if (min_bg) +btrfs_put_block_group (min_bg); + min_bg = block_group; + min_avail = avail; +btrfs_get_block_group (min_bg); + } +spin_unlock (&block_group->lock); + } +spin_unlock (&fs_info->zone_active_bgs_lock); + +if (!min_bg) +return 0 ; + + ret =btrfs_zone_finish (min_bg); +btrfs_put_block_group (min_bg); + +return ret <0 ? ret :1 ; +}
fs/btrfs/zoned.h +7 -0
@@ -80,6 +80,7 @@ void btrfs_free_zone_cache(struct btrfs_fs_info *fs_info);bool btrfs_zoned_should_reclaim (struct btrfs_fs_info *fs_info);void btrfs_zoned_release_data_reloc_bg (struct btrfs_fs_info *fs_info,u64 logical,u64 length); +int btrfs_zone_finish_one_bg (struct btrfs_fs_info *fs_info);#else /* CONFIG_BLK_DEV_ZONED */ static inline int btrfs_get_dev_zone (struct btrfs_device *device,u64 pos,struct blk_zone *zone)
@@ -249,6 +250,12 @@ static inline bool btrfs_zoned_should_reclaim(struct btrfs_fs_info *fs_info)static inline void btrfs_zoned_release_data_reloc_bg (struct btrfs_fs_info *fs_info,u64 logical,u64 length) { } + +static inline int btrfs_zone_finish_one_bg (struct btrfs_fs_info *fs_info) +{ +return 1 ; +} +#endif static inline bool btrfs_dev_is_sequential (struct btrfs_device *device,u64 pos)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1090/1157 btrfs: zoned: disable metadata overcommit for zoned
In reply to Greg Kroah-HartmanFrom: Naohiro Aota <[email protected]>
[ Upstream commit 79417d040f4f77b19c701bccc23013b9cdac358d ]
The metadata overcommit makes the space reservation flexible but it is also harmful to active zone tracking. Since we cannot finish a block group from the metadata allocation context, we might not activate a new block group and might not be able to actually write out the overcommit reservations.
So, disable metadata overcommit for zoned filesystems. We will ensure the reservations are under active_total_bytes in the following patches.
--- fs/btrfs/space-info.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
fs/btrfs/space-info.c +4 -1
@@ -349,7 +349,10 @@ int btrfs_can_overcommit(struct btrfs_fs_info *fs_info,return 0 ; used =btrfs_space_info_used (space_info, true); - avail =calc_available_free_space (fs_info, space_info, flush); +if (btrfs_is_zoned (fs_info) && (space_info->flags &BTRFS_BLOCK_GROUP_METADATA )) + avail =0 ; +else + avail =calc_available_free_space (fs_info, space_info, flush);if (used + bytes < space_info->total_bytes + avail)return 1 ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1091/1157 btrfs: store chunk size in space-info struct
In reply to Greg Kroah-HartmanFrom: Stefan Roesch <[email protected]>
[ Upstream commit f6fca3917b4d99d8c13901738afec35f570a3c2f ]
The chunk size is stored in the btrfs_space_info structure. It is initialized at the start and is then used.
A new API is added to update the current chunk size. This API is used to be able to expose the chunk_size as a sysfs setting.
--- fs/btrfs/space-info.c | 32 ++++++++++++++++++++++++++++++++ fs/btrfs/space-info.h | 4 ++++ fs/btrfs/volumes.c | 28 +++++++++------------------- 3 files changed, 45 insertions(+), 19 deletions(-)
fs/btrfs/space-info.c +32 -0
@@ -187,6 +187,37 @@ void btrfs_clear_space_info_full(struct btrfs_fs_info *info)*/ #define BTRFS_DEFAULT_ZONED_RECLAIM_THRESH (75) +/* +* Calculate chunk size depending on volume type (regular or zoned). +*/ +static u64 calc_chunk_size (const struct btrfs_fs_info *fs_info,u64 flags) +{ +if (btrfs_is_zoned (fs_info)) +return fs_info->zone_size; + +ASSERT (flags &BTRFS_BLOCK_GROUP_TYPE_MASK ); + +if (flags &BTRFS_BLOCK_GROUP_DATA ) +return SZ_1G ; +else if (flags &BTRFS_BLOCK_GROUP_SYSTEM ) +return SZ_32M ; + +/* Handle BTRFS_BLOCK_GROUP_METADATA */ +if (fs_info->fs_devices->total_rw_bytes >50ULL *SZ_1G ) +return SZ_1G ; + +return SZ_256M ; +} + +/* +* Update default chunk size. +*/ +void btrfs_update_space_info_chunk_size (struct btrfs_space_info *space_info, +u64 chunk_size) +{ +WRITE_ONCE (space_info->chunk_size, chunk_size); +} +static int create_space_info (struct btrfs_fs_info *info,u64 flags) {
@@ -208,6 +239,7 @@ static int create_space_info(struct btrfs_fs_info *info, u64 flags)INIT_LIST_HEAD (&space_info->tickets);INIT_LIST_HEAD (&space_info->priority_tickets); space_info->clamp =1 ; +btrfs_update_space_info_chunk_size (space_info,calc_chunk_size (info, flags));if (btrfs_is_zoned (info)) space_info->bg_reclaim_threshold =BTRFS_DEFAULT_ZONED_RECLAIM_THRESH ;
fs/btrfs/space-info.h +4 -0
@@ -25,6 +25,8 @@ struct btrfs_space_info {u64 max_extent_size;/* This will hold the maximum extent size of the space info if we had an ENOSPC in the allocator. */ +/* Chunk size in bytes */ +u64 chunk_size;/* * Once a block group drops below this threshold (percents) we'll
@@ -123,6 +125,8 @@ void btrfs_update_space_info(struct btrfs_fs_info *info, u64 flags, u64 total_bytes, u64 bytes_used, u64 bytes_readonly, u64 bytes_zone_unusable, struct btrfs_space_info **space_info); +void btrfs_update_space_info_chunk_size (struct btrfs_space_info *space_info, +u64 chunk_size);struct btrfs_space_info *btrfs_find_space_info (struct btrfs_fs_info *info,u64 flags); u64 __pure btrfs_space_info_used(struct btrfs_space_info *s_info,
fs/btrfs/volumes.c +9 -19
@@ -5071,26 +5071,16 @@ static void init_alloc_chunk_ctl_policy_regular(struct btrfs_fs_devices *fs_devices, struct alloc_chunk_ctl *ctl) { - u64 type = ctl->type; + struct btrfs_space_info *space_info; -if (type &BTRFS_BLOCK_GROUP_DATA ) { - ctl->max_stripe_size =SZ_1G ; - ctl->max_chunk_size =BTRFS_MAX_DATA_CHUNK_SIZE ; - }else if (type &BTRFS_BLOCK_GROUP_METADATA ) { -/* For larger filesystems, use larger metadata chunks */ -if (fs_devices->total_rw_bytes >50ULL *SZ_1G ) - ctl->max_stripe_size =SZ_1G ; -else - ctl->max_stripe_size =SZ_256M ; - ctl->max_chunk_size = ctl->max_stripe_size; - }else if (type &BTRFS_BLOCK_GROUP_SYSTEM ) { - ctl->max_stripe_size =SZ_32M ; - ctl->max_chunk_size =2 * ctl->max_stripe_size; - ctl->devs_max =min_t (int, ctl->devs_max, -BTRFS_MAX_DEVS_SYS_CHUNK ); - }else { -BUG (); - } + space_info =btrfs_find_space_info (fs_devices->fs_info, ctl->type); +ASSERT (space_info); + + ctl->max_chunk_size =READ_ONCE (space_info->chunk_size); + ctl->max_stripe_size = ctl->max_chunk_size; + +if (ctl->type &BTRFS_BLOCK_GROUP_SYSTEM ) + ctl->devs_max =min_t (int, ctl->devs_max,BTRFS_MAX_DEVS_SYS_CHUNK );/* We don't want a chunk larger than 10% of writable space */ ctl->max_chunk_size = min(div_factor(fs_devices->total_rw_bytes, 1),
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1092/1157 btrfs: zoned: introduce space_info->active_total_bytes
In reply to Greg Kroah-HartmanFrom: Naohiro Aota <[email protected]>
[ Upstream commit 6a921de589926a350634e6e279f43fa5b9dbf5ba ]
The active_total_bytes, like the total_bytes, accounts for the total bytes of active block groups in the space_info.
With an introduction of active_total_bytes, we can check if the reserved bytes can be written to the block groups without activating a new block group. The check is necessary for metadata allocation on zoned filesystem. We cannot finish a block group, which may require waiting for the current transaction, from the metadata allocation context. Instead, we need to ensure the ongoing allocation (reserved bytes) fits in active block groups.
--- fs/btrfs/block-group.c | 12 +++++++++--- fs/btrfs/space-info.c | 41 ++++++++++++++++++++++++++++++++--------- fs/btrfs/space-info.h | 4 +++- fs/btrfs/zoned.c | 6 ++++++ 4 files changed, 50 insertions(+), 13 deletions(-)
fs/btrfs/block-group.c +9 -3
@@ -1051,8 +1051,13 @@ int btrfs_remove_block_group(struct btrfs_trans_handle *trans, < block_group->zone_unusable);WARN_ON (block_group->space_info->disk_total < block_group->length * factor); +WARN_ON (block_group->zone_is_active && + block_group->space_info->active_total_bytes + < block_group->length); } block_group->space_info->total_bytes -= block_group->length; +if (block_group->zone_is_active) + block_group->space_info->active_total_bytes -= block_group->length; block_group->space_info->bytes_readonly -= (block_group->length - block_group->zone_unusable); block_group->space_info->bytes_zone_unusable -=
@@ -2108,7 +2113,8 @@ static int read_one_block_group(struct btrfs_fs_info *info,trace_btrfs_add_block_group (info, cache,0 );btrfs_update_space_info (info, cache->flags, cache->length, cache->used, cache->bytes_super, - cache->zone_unusable, &space_info); + cache->zone_unusable, cache->zone_is_active, + &space_info); cache->space_info = space_info;
@@ -2178,7 +2184,7 @@ static int fill_dummy_bgs(struct btrfs_fs_info *fs_info) }btrfs_update_space_info (fs_info, bg->flags, em->len, em->len, -0 ,0 , &space_info); +0 ,0 , false, &space_info); bg->space_info = space_info;link_block_group (bg);
@@ -2559,7 +2565,7 @@ struct btrfs_block_group *btrfs_make_block_group(struct btrfs_trans_handle *trantrace_btrfs_add_block_group (fs_info, cache,1 );btrfs_update_space_info (fs_info, cache->flags, size, bytes_used, cache->bytes_super, cache->zone_unusable, - &cache->space_info); + cache->zone_is_active, &cache->space_info);btrfs_update_global_block_rsv (fs_info);link_block_group (cache);
fs/btrfs/space-info.c +32 -9
103 lines not on this page · raw message
fs/btrfs/space-info.h +3 -1
@@ -19,6 +19,8 @@ struct btrfs_space_info {u64 bytes_may_use;/* number of bytes that may be used for delalloc/allocations */ u64 bytes_readonly;/* total bytes that are read only */ +/* Total bytes in the space, but only accounts active block groups. */ +u64 active_total_bytes;u64 bytes_zone_unusable;/* total bytes that are unusable until resetting the device zone */
@@ -124,7 +126,7 @@ int btrfs_init_space_info(struct btrfs_fs_info *fs_info);void btrfs_update_space_info (struct btrfs_fs_info *info,u64 flags,u64 total_bytes,u64 bytes_used,u64 bytes_readonly,u64 bytes_zone_unusable, -struct btrfs_space_info **space_info); +bool active,struct btrfs_space_info **space_info);void btrfs_update_space_info_chunk_size (struct btrfs_space_info *space_info,u64 chunk_size); struct btrfs_space_info *btrfs_find_space_info(struct btrfs_fs_info *info,
fs/btrfs/zoned.c +6 -0
@@ -1849,6 +1849,7 @@ struct btrfs_device *btrfs_zoned_get_device(struct btrfs_fs_info *fs_info,bool btrfs_zone_activate (struct btrfs_block_group *block_group) {struct btrfs_fs_info *fs_info = block_group->fs_info; +struct btrfs_space_info *space_info = block_group->space_info;struct map_lookup *map;struct btrfs_device *device;u64 physical;
@@ -1860,6 +1861,7 @@ bool btrfs_zone_activate(struct btrfs_block_group *block_group) map = block_group->physical_map; +spin_lock (&space_info->lock);spin_lock (&block_group->lock);if (block_group->zone_is_active) { ret = true;
@@ -1888,7 +1890,10 @@ bool btrfs_zone_activate(struct btrfs_block_group *block_group)/* Successfully activated all the zones */ block_group->zone_is_active =1 ; + space_info->active_total_bytes += block_group->length;spin_unlock (&block_group->lock); +btrfs_try_granting_tickets (fs_info, space_info); +spin_unlock (&space_info->lock);/* For the active block group list */ btrfs_get_block_group (block_group);
@@ -1901,6 +1906,7 @@ bool btrfs_zone_activate(struct btrfs_block_group *block_group) out_unlock:spin_unlock (&block_group->lock); +spin_unlock (&space_info->lock);return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1093/1157 btrfs: zoned: activate metadata block group on flush_space
In reply to Greg Kroah-HartmanFrom: Naohiro Aota <[email protected]>
[ Upstream commit b0931513913633044ed6e3800334c28433c007b0 ]
For metadata space on zoned filesystem, reaching ALLOC_CHUNK{,_FORCE} means we don't have enough space left in the active_total_bytes. Before allocating a new chunk, we can try to activate an existing block group in this case.
Also, allocating a chunk is not enough to grant a ticket for metadata space on zoned filesystem we need to activate the block group to increase the active_total_bytes.
btrfs_zoned_activate_one_bg() implements the activation feature. It will activate a block group by (maybe) finishing a block group. It will give up activating a block group if it cannot finish any block group.
--- fs/btrfs/space-info.c | 30 ++++++++++++++++++++++++ fs/btrfs/zoned.c | 53 +++++++++++++++++++++++++++++++++++++++++++ fs/btrfs/zoned.h | 10 ++++++++ 3 files changed, 93 insertions(+)
fs/btrfs/space-info.c +30 -0
@@ -9,6 +9,7 @@#include "ordered-data.h" #include "transaction.h" #include "block-group.h" +#include "zoned.h" /* * HOW DOES SPACE RESERVATION WORK
@@ -724,6 +725,18 @@ static void flush_space(struct btrfs_fs_info *fs_info,break ;case ALLOC_CHUNK :case ALLOC_CHUNK_FORCE : +/* +* For metadata space on zoned filesystem, reaching here means we +* don't have enough space left in active_total_bytes. Try to +* activate a block group first, because we may have inactive +* block group already allocated. +*/ + ret =btrfs_zoned_activate_one_bg (fs_info, space_info, false); +if (ret <0 ) +break ; +else if (ret ==1 ) +break ; + trans =btrfs_join_transaction (root);if (IS_ERR (trans)) { ret =PTR_ERR (trans);
@@ -734,6 +747,23 @@ static void flush_space(struct btrfs_fs_info *fs_info, (state ==ALLOC_CHUNK ) ?CHUNK_ALLOC_NO_FORCE : CHUNK_ALLOC_FORCE);btrfs_end_transaction (trans); + +/* +* For metadata space on zoned filesystem, allocating a new chunk +* is not enough. We still need to activate the block * group. +* Active the newly allocated block group by (maybe) finishing +* a block group. +*/ +if (ret ==1 ) { + ret =btrfs_zoned_activate_one_bg (fs_info, space_info, true); +/* +* Revert to the original ret regardless we could finish +* one block group or not. +*/ +if (ret >=0 ) + ret =1 ; + } +if (ret >0 || ret == -ENOSPC ) ret =0 ;break ;
fs/btrfs/zoned.c +53 -0
56 lines not on this page · raw message
fs/btrfs/zoned.h +10 -0
@@ -81,6 +81,8 @@ bool btrfs_zoned_should_reclaim(struct btrfs_fs_info *fs_info);void btrfs_zoned_release_data_reloc_bg (struct btrfs_fs_info *fs_info,u64 logical,u64 length);int btrfs_zone_finish_one_bg (struct btrfs_fs_info *fs_info); +int btrfs_zoned_activate_one_bg (struct btrfs_fs_info *fs_info, +struct btrfs_space_info *space_info,bool do_finish);#else /* CONFIG_BLK_DEV_ZONED */ static inline int btrfs_get_dev_zone (struct btrfs_device *device,u64 pos,struct blk_zone *zone)
@@ -256,6 +258,14 @@ static inline int btrfs_zone_finish_one_bg(struct btrfs_fs_info *fs_info) return 1; } +static inline int btrfs_zoned_activate_one_bg (struct btrfs_fs_info *fs_info, +struct btrfs_space_info *space_info, +bool do_finish) +{ +/* Consider all the block groups are active */ +return 0 ; +} +#endif static inline bool btrfs_dev_is_sequential (struct btrfs_device *device,u64 pos)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1094/1157 btrfs: zoned: activate necessary block group
In reply to Greg Kroah-HartmanFrom: Naohiro Aota <[email protected]>
[ Upstream commit b6a98021e4019c562a23ad151a7e40adfa9f91e5 ]
There are two places where allocating a chunk is not enough. These two places are trying to ensure the space by allocating a chunk. To meet the condition for active_total_bytes, we also need to activate a block group there.
--- fs/btrfs/block-group.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
fs/btrfs/block-group.c +16 -0
@@ -2665,6 +2665,14 @@ int btrfs_inc_block_group_ro(struct btrfs_block_group *cache, ret =btrfs_chunk_alloc (trans, alloc_flags,CHUNK_ALLOC_FORCE );if (ret <0 ) goto out; +/* +* We have allocated a new chunk. We also need to activate that chunk to +* grant metadata tickets for zoned filesystem. +*/ + ret =btrfs_zoned_activate_one_bg (fs_info, cache->space_info, true); +if (ret <0 ) + goto out; + ret =inc_block_group_ro (cache,0 );if (ret == -ETXTBSY ) goto unlock_out;
@@ -3890,6 +3898,14 @@ static void reserve_chunk_space(struct btrfs_trans_handle *trans,if (IS_ERR (bg)) { ret =PTR_ERR (bg); }else { +/* +* We have a new chunk. We also need to activate it for +* zoned filesystem. +*/ + ret =btrfs_zoned_activate_one_bg (fs_info, info, true); +if (ret <0 ) +return ; +/* * If we fail to add the chunk item here, we end up * trying again at phase 2 of chunk allocation, at
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1095/1157 btrfs: zoned: write out partially allocated region
In reply to Greg Kroah-HartmanFrom: Naohiro Aota <[email protected]>
[ Upstream commit 898793d992c23dac6126a6a94ad893eae1a2c9df ]
cow_file_range() works in an all-or-nothing way: if it fails to allocate an extent for a part of the given region, it gives up all the region including the successfully allocated parts. On cow_file_range(), run_delalloc_zoned() writes data for the region only when it successfully allocate all the region.
This all-or-nothing allocation and write-out are problematic when available space in all the block groups are get tight with the active zone restriction. btrfs_reserve_extent() try hard to utilize the left space in the active block groups and gives up finally and fails with -ENOSPC. However, if we send IOs for the successfully allocated region, we can finish a zone and can continue on the rest of the allocation on a newly allocated block group.
This patch implements the partial write-out for run_delalloc_zoned(). With this patch applied, cow_file_range() returns -EAGAIN to tell the caller to do something to progress the further allocation, and tells the successfully allocated region with done_offset. Furthermore, the zoned extent allocator returns -EAGAIN to tell cow_file_range() going back to the caller side.
Actually, we still need to wait for an IO to complete to continue the allocation. The next patch implements that part.
--- fs/btrfs/extent-tree.c | 10 +++++++ fs/btrfs/inode.c | 63 ++++++++++++++++++++++++++++++++---------- 2 files changed, 59 insertions(+), 14 deletions(-)
fs/btrfs/extent-tree.c +10 -0
@@ -4012,6 +4012,16 @@ static int can_allocate_chunk_zoned(struct btrfs_fs_info *fs_info,if (ffe_ctl->max_extent_size >= ffe_ctl->min_alloc_size)return -ENOSPC ; +/* +* Even min_alloc_size is not left in any block groups. Since we cannot +* activate a new block group, allocating it may not help. Let's tell a +* caller to try again and hope it progress something by writing some +* parts of the region. That is only possible for data block groups, +* where a part of the region can be written. +*/ +if (ffe_ctl->flags &BTRFS_BLOCK_GROUP_DATA ) +return -EAGAIN ; +/* * We cannot activate a new block group and no enough space left in any * block groups. So, allocating a new block group may not help. But,
fs/btrfs/inode.c +49 -14
109 lines not on this page · raw message
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1096/1157 btrfs: zoned: wait until zone is finished when allocation didnt progress
In reply to Greg Kroah-HartmanFrom: Naohiro Aota <[email protected]>
[ Upstream commit 2ce543f478433a0eec0f72090d7e814f1d53d456 ]
When the allocated position doesn't progress, we cannot submit IOs to finish a block group, but there should be ongoing IOs that will finish a block group. So, in that case, we wait for a zone to be finished and retry the allocation after that.
Introduce a new flag BTRFS_FS_NEED_ZONE_FINISH for fs_info->flags to indicate we need a zone finish to have proceeded. The flag is set when the allocator detected it cannot activate a new block group. And, it is cleared once a zone is finished.
--- fs/btrfs/ctree.h | 5 +++++ fs/btrfs/disk-io.c | 1 + fs/btrfs/inode.c | 9 +++++++-- fs/btrfs/zoned.c | 6 ++++++ 4 files changed, 19 insertions(+), 2 deletions(-)
fs/btrfs/ctree.h +5 -0
@@ -627,6 +627,9 @@ enum {/* Indicate we have half completed snapshot deletions pending. */ BTRFS_FS_UNFINISHED_DROPS , +/* Indicate we have to finish a zone to do next allocation. */ +BTRFS_FS_NEED_ZONE_FINISH , + #if BITS_PER_LONG == 32/* Indicate if we have error/warn message printed on 32bit systems */ BTRFS_FS_32BIT_ERROR,
@@ -1063,6 +1066,8 @@ struct btrfs_fs_info {spinlock_t zone_active_bgs_lock;struct list_head zone_active_bgs; +/* Waiters when BTRFS_FS_NEED_ZONE_FINISH is set */ +wait_queue_head_t zone_finish_wait;#ifdef CONFIG_BTRFS_FS_REF_VERIFY spinlock_t ref_verify_lock;
fs/btrfs/disk-io.c +1 -0
@@ -3255,6 +3255,7 @@ void btrfs_init_fs_info(struct btrfs_fs_info *fs_info)init_waitqueue_head (&fs_info->transaction_blocked_wait);init_waitqueue_head (&fs_info->async_submit_wait);init_waitqueue_head (&fs_info->delayed_iputs_wait); +init_waitqueue_head (&fs_info->zone_finish_wait);/* Usable values until the real ones are cached from the superblock */ fs_info->nodesize =4096 ;
fs/btrfs/inode.c +7 -2
@@ -1642,8 +1642,13 @@ static noinline int run_delalloc_zoned(struct btrfs_inode *inode,if (ret ==0 ) done_offset = end; -if (done_offset == start) -return -ENOSPC ; +if (done_offset == start) { +struct btrfs_fs_info *info = inode->root->fs_info; + +wait_var_event (&info->zone_finish_wait, + !test_bit (BTRFS_FS_NEED_ZONE_FINISH , &info->flags)); +continue ; + }if (!locked_page_done) {__set_page_dirty_nobuffers (locked_page);
fs/btrfs/zoned.c +6 -0
@@ -2007,6 +2007,9 @@ static int do_zone_finish(struct btrfs_block_group *block_group, bool fully_writ/* For active_bg_list */ btrfs_put_block_group (block_group); +clear_bit (BTRFS_FS_NEED_ZONE_FINISH , &fs_info->flags); +wake_up_all (&fs_info->zone_finish_wait); +return 0 ; }
@@ -2043,6 +2046,9 @@ bool btrfs_can_activate_zone(struct btrfs_fs_devices *fs_devices, u64 flags) }mutex_unlock (&fs_info->chunk_mutex); +if (!ret) +set_bit (BTRFS_FS_NEED_ZONE_FINISH , &fs_info->flags); +return ret; }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1097/1157 btrfs: join running log transaction when logging new name
In reply to Greg Kroah-HartmanFrom: Filipe Manana <[email protected]>
[ Upstream commit 723df2bcc9e166ac7fb82b3932a53e09415dfcde ]
When logging a new name, in case of a rename, we pin the log before changing it. We then either delete a directory entry from the log or insert a key range item to mark the old name for deletion on log replay.
However when doing one of those log changes we may have another task that started writing out the log (at btrfs_sync_log()) and it started before we pinned the log root. So we may end up changing a log tree while its writeback is being started by another task syncing the log. This can lead to inconsistencies in a log tree and other unexpected results during log replay, because we can get some committed node pointing to a node/leaf that ends up not getting written to disk before the next log commit.
The problem, conceptually, started to happen in commit 88d2beec7e53fc ("btrfs: avoid logging all directory changes during renames"), because there we started to update the log without joining its current transaction first.
However the problem only became visible with commit 259c4b96d78dda ("btrfs: stop doing unnecessary log updates during a rename"), and that is because we used to pin the log at btrfs_rename() and then before entering btrfs_log_new_name(), when unlinking the old dentry, we ended up at btrfs_del_inode_ref_in_log() and btrfs_del_dir_entries_in_log(). Both of them join the current log transaction, effectively waiting for any log transaction writeout (due to acquiring the root's log_mutex). This made it safe even after leaving the current log transaction, because we remained with the log pinned when we called btrfs_log_new_name().
Then in commit 259c4b96d78dda ("btrfs: stop doing unnecessary log updates during a rename"), we removed the log pinning from btrfs_rename() and stopped calling btrfs_del_inode_ref_in_log() and btrfs_del_dir_entries_in_log() during the rename, and started to do all the needed work at btrfs_log_new_name(), but without joining the current log transaction, only pinning the log, which is racy because another task may have started writeout of the log tree right before we pinned the log.
Both commits landed in kernel 5.18, so it doesn't make any practical difference which should be blamed, but I'm blaming the second commit only because with the first one, by chance, the problem did not happen due to the fact we joined the log transaction after pinning the log and unpinned it only after calling btrfs_log_new_name().
So make btrfs_log_new_name() join the current log transaction instead of pinning it, so that we never do log updates if it's writeout is starting.
--- fs/btrfs/tree-log.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
fs/btrfs/tree-log.c +8 -1
@@ -7029,8 +7029,15 @@ void btrfs_log_new_name(struct btrfs_trans_handle *trans,* anyone from syncing the log until we have updated both inodes * in the log. */ + ret =join_running_log_trans (root); +/* +* At least one of the inodes was logged before, so this should +* not fail, but if it does, it's not serious, just bail out and +* mark the log for a full commit. +*/ +if (WARN_ON_ONCE (ret <0 )) + goto out; log_pinned = true; -btrfs_pin_log_trans (root); path =btrfs_alloc_path ();if (!path) {
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1098/1157 intel_idle: make SPR C1 and C1E be independent
In reply to Greg Kroah-HartmanFrom: Artem Bityutskiy <[email protected]>
[ Upstream commit 1548fac47a114b42063def551eb152a536ed9697 ]
This patch partially reverts the changes made by the following commit:
da0e58c038e6 intel_idle: add 'preferred_cstates' module argument
As that commit describes, on early Sapphire Rapids Xeon platforms the C1 and C1E states were mutually exclusive, so that users could only have either C1 and C6, or C1E and C6.
However, Intel firmware engineers managed to remove this limitation and make C1 and C1E to be completely independent, just like on previous Xeon platforms.
Therefore, this patch:
* Removes commentary describing the old, and now non-existing SPR C1E limitation.
* Marks SPR C1E as available by default.
* Removes the 'preferred_cstates' parameter handling for SPR. Both C1 and C1E will be available regardless of 'preferred_cstates' value.
We expect that all SPR systems are shipping with new firmware, which includes the C1/C1E improvement.
--- drivers/idle/intel_idle.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-)
drivers/idle/intel_idle.c +1 -23
@@ -911,16 +911,6 @@ static struct cpuidle_state adl_l_cstates[] __initdata = { .enter = NULL } }; -/* -* On Sapphire Rapids Xeon C1 has to be disabled if C1E is enabled, and vice -* versa. On SPR C1E is enabled only if "C1E promotion" bit is set in -* MSR_IA32_POWER_CTL. But in this case there effectively no C1, because C1 -* requests are promoted to C1E. If the "C1E promotion" bit is cleared, then -* both C1 and C1E requests end up with C1, so there is effectively no C1E. -* -* By default we enable C1 and disable C1E by marking it with -* 'CPUIDLE_FLAG_UNUSABLE'. -*/ static struct cpuidle_state spr_cstates[]__initdata = { { .name ="C1" ,
@@ -933,8 +923,7 @@ static struct cpuidle_state spr_cstates[] __initdata = { { .name = "C1E", .desc = "MWAIT 0x01", - .flags =MWAIT2flg (0x01 ) |CPUIDLE_FLAG_ALWAYS_ENABLE | - CPUIDLE_FLAG_UNUSABLE, + .flags = MWAIT2flg(0x01) | CPUIDLE_FLAG_ALWAYS_ENABLE, .exit_latency = 2, .target_residency = 4, .enter = &intel_idle,
@@ -1756,17 +1745,6 @@ static void __init spr_idle_state_table_update(void) {unsigned long long msr; -/* Check if user prefers C1E over C1. */ -if ((preferred_states_mask &BIT (2 )) && - !(preferred_states_mask &BIT (1 ))) { -/* Disable C1 and enable C1E. */ - spr_cstates[0 ].flags |=CPUIDLE_FLAG_UNUSABLE ; - spr_cstates[1 ].flags &= ~CPUIDLE_FLAG_UNUSABLE ; - -/* Enable C1E using the "C1E promotion" bit. */ - c1e_promotion =C1E_PROMOTION_ENABLE ; - } -/* * By default, the C6 state assumes the worst-case scenario of package * C6. However, if PC6 is disabled, we update the numbers to match
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1099/1157 ACPI: CPPC: Do not prevent CPPC from working in the future
In reply to Greg Kroah-HartmanFrom: Rafael J. Wysocki <[email protected]>
[ Upstream commit 4f4179fcf420873002035cf1941d844c9e0e7cb3 ]
There is a problem with the current revision checks in is_cppc_supported() that they essentially prevent the CPPC support from working if a new _CPC package format revision being a proper superset of the v3 and only causing _CPC to return a package with more entries (while retaining the types and meaning of the entries defined by the v3) is introduced in the future and used by the platform firmware.
In that case, as long as the number of entries in the _CPC return package is at least CPPC_V3_NUM_ENT, it should be perfectly fine to use the v3 support code and disregard the additional package entries added by the new package format revision.
For this reason, drop is_cppc_supported() altogether, put the revision checks directly into acpi_cppc_processor_probe() so they are easier to follow and rework them to take the case mentioned above into account.
--- drivers/acpi/cppc_acpi.c | 54 ++++++++++++++++++---------------------- include/acpi/cppc_acpi.h | 2 +- 2 files changed, 25 insertions(+), 31 deletions(-)
drivers/acpi/cppc_acpi.c +24 -30
@@ -618,33 +618,6 @@ static int pcc_data_alloc(int pcc_ss_id)return 0 ; } -/* Check if CPPC revision + num_ent combination is supported */ -static bool is_cppc_supported (int revision,int num_ent) -{ -int expected_num_ent; - -switch (revision) { -case CPPC_V2_REV : - expected_num_ent =CPPC_V2_NUM_ENT ; -break ; -case CPPC_V3_REV : - expected_num_ent =CPPC_V3_NUM_ENT ; -break ; -default : -pr_debug ("Firmware exports unsupported CPPC revision: %d\n" , - revision); -return false; - } - -if (expected_num_ent != num_ent) { -pr_debug ("Firmware exports %d entries. Expected: %d for CPPC rev:%d\n" , - num_ent, expected_num_ent, revision); -return false; - } - -return true; -} -/* * An example CPC table looks like the following. *
@@ -733,7 +706,6 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr) cpc_obj->type, pr->id); goto out_free; } - cpc_ptr->num_entries = num_ent;/* Second entry should be revision. */ cpc_obj = &out_obj->package.elements[1 ];
@@ -744,10 +716,32 @@ int acpi_cppc_processor_probe(struct acpi_processor *pr) cpc_obj->type, pr->id); goto out_free; } - cpc_ptr->version = cpc_rev; -if (!is_cppc_supported (cpc_rev, num_ent)) +if (cpc_rev <CPPC_V2_REV ) { +pr_debug ("Unsupported _CPC Revision (%d) for CPU:%d\n" , cpc_rev, + pr->id); + goto out_free; + } + +/* +* Disregard _CPC if the number of entries in the return pachage is not +* as expected, but support future revisions being proper supersets of +* the v3 and only causing more entries to be returned by _CPC. +*/ +if ((cpc_rev ==CPPC_V2_REV && num_ent !=CPPC_V2_NUM_ENT ) || + (cpc_rev ==CPPC_V3_REV && num_ent !=CPPC_V3_NUM_ENT ) || + (cpc_rev >CPPC_V3_REV && num_ent <=CPPC_V3_NUM_ENT )) { +pr_debug ("Unexpected number of _CPC return package entries (%d) for CPU:%d\n" , + num_ent, pr->id); goto out_free; + } +if (cpc_rev >CPPC_V3_REV ) { + num_ent =CPPC_V3_NUM_ENT ; + cpc_rev =CPPC_V3_REV ; + } + + cpc_ptr->num_entries = num_ent; + cpc_ptr->version = cpc_rev;/* Iterate through remaining entries in _CPC */ for (i =2 ; i < num_ent; i++) {
include/acpi/cppc_acpi.h +1 -1
@@ -17,7 +17,7 @@#include <acpi/pcc.h> #include <acpi/processor.h> -/* Support CPPCv2 and CPPCv3 */ +/* CPPCv2 and CPPCv3 support */ #define CPPC_V2_REV 2#define CPPC_V3_REV 3#define CPPC_V2_NUM_ENT 21
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1100/1157 powerpc/powernv/kvm: Use darn for H_RANDOM on Power9
In reply to Greg Kroah-HartmanFrom: Jason A. Donenfeld <[email protected]>
[ Upstream commit 7ef3d06f1bc4a5e62273726f3dc2bd258ae1c71f ]
The existing logic in KVM to support guests calling H_RANDOM only works on Power8, because it looks for an RNG in the device tree, but on Power9 we just use darn.
In addition the existing code needs to work in real mode, so we have the special cased powernv_get_random_real_mode() to deal with that.
Instead just have KVM call ppc_md.get_random_seed(), and do the real mode check inside of there, that way we use whatever RNG is available, including darn on Power9.
--- arch/powerpc/include/asm/archrandom.h | 5 ---- arch/powerpc/kvm/book3s_hv_builtin.c | 7 +++--- arch/powerpc/platforms/powernv/rng.c | 36 ++++++--------------------- 3 files changed, 12 insertions(+), 36 deletions(-)
arch/powerpc/include/asm/archrandom.h +0 -5
@@ -38,12 +38,7 @@ static inline bool __must_check arch_get_random_seed_int(unsigned int *v)#endif /* CONFIG_ARCH_RANDOM */ #ifdef CONFIG_PPC_POWERNV -int powernv_hwrng_present (void );int powernv_get_random_long (unsigned long *v); -int powernv_get_random_real_mode (unsigned long *v); -#else -static inline int powernv_hwrng_present (void ) {return 0 ; } -static inline int powernv_get_random_real_mode (unsigned long *v) {return 0 ; }#endif #endif /* _ASM_POWERPC_ARCHRANDOM_H */
arch/powerpc/kvm/book3s_hv_builtin.c +4 -3
@@ -19,7 +19,7 @@#include <asm/interrupt.h> #include <asm/kvm_ppc.h> #include <asm/kvm_book3s.h> -#include <asm/archrandom.h> +#include <asm/machdep.h> #include <asm/xics.h> #include <asm/xive.h> #include <asm/dbell.h>
@@ -176,13 +176,14 @@ EXPORT_SYMBOL_GPL(kvmppc_hcall_impl_hv_realmode);int kvmppc_hwrng_present (void ) { -return powernv_hwrng_present (); +return ppc_md.get_random_seed !=NULL ; }EXPORT_SYMBOL_GPL (kvmppc_hwrng_present);long kvmppc_rm_h_random (struct kvm_vcpu *vcpu) { -if (powernv_get_random_real_mode (&vcpu->arch.regs.gpr[4 ])) +if (ppc_md.get_random_seed && + ppc_md.get_random_seed (&vcpu->arch.regs.gpr[4 ]))return H_SUCCESS ;return H_HARDWARE ;
arch/powerpc/platforms/powernv/rng.c +8 -28
@@ -29,15 +29,6 @@ struct powernv_rng { static DEFINE_PER_CPU(struct powernv_rng *, powernv_rng); -int powernv_hwrng_present (void ) -{ -struct powernv_rng *rng; - - rng =get_cpu_var (powernv_rng); -put_cpu_var (rng); -return rng !=NULL ; -} -static unsigned long rng_whiten (struct powernv_rng *rng,unsigned long val) {unsigned long parity;
@@ -58,19 +49,6 @@ static unsigned long rng_whiten(struct powernv_rng *rng, unsigned long val)return val; } -int powernv_get_random_real_mode (unsigned long *v) -{ -struct powernv_rng *rng; - - rng =raw_cpu_read (powernv_rng); -if (!rng) -return 0 ; - - *v =rng_whiten (rng,__raw_rm_readq (rng->regs_real)); - -return 1 ; -} -static int powernv_get_random_darn (unsigned long *v) {unsigned long val;
@@ -107,12 +85,14 @@ int powernv_get_random_long(unsigned long *v) {struct powernv_rng *rng; - rng =get_cpu_var (powernv_rng); - - *v =rng_whiten (rng,in_be64 (rng->regs)); - -put_cpu_var (rng); - +if (mfmsr () &MSR_DR ) { + rng =get_cpu_var (powernv_rng); + *v =rng_whiten (rng,in_be64 (rng->regs)); +put_cpu_var (rng); + }else { + rng =raw_cpu_read (powernv_rng); + *v =rng_whiten (rng,__raw_rm_readq (rng->regs_real)); + }return 1 ; }EXPORT_SYMBOL_GPL (powernv_get_random_long);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1101/1157 s390/unwind: fix fgraph return address recovery
In reply to Greg Kroah-HartmanFrom: Sumanth Korikkar <[email protected]>
[ Upstream commit ded466e1806686794b403ebf031133bbaca76bb2 ]
When HAVE_FUNCTION_GRAPH_RET_ADDR_PTR is defined, the return address to the fgraph caller is recovered by tagging it along with the stack pointer of ftrace stack. This makes the stack unwinding more reliable.
When the fgraph return address is modified to return_to_handler, ftrace_graph_ret_addr tries to restore it to the original value using tagged stack pointer.
Fix this by passing tagged sp to ftrace_graph_ret_addr.
--- arch/s390/include/asm/unwind.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/include/asm/unwind.h +1 -1
@@ -47,7 +47,7 @@ struct unwind_state {static inline unsigned long unwind_recover_ret_addr (struct unwind_state *state,unsigned long ip) { - ip =ftrace_graph_ret_addr (state->task, &state->graph_idx, ip,NULL ); + ip =ftrace_graph_ret_addr (state->task, &state->graph_idx, ip, (void *)state->sp);if (is_kretprobe_trampoline (ip)) ip =kretprobe_find_ret_addr (state->task, (void *)state->sp, &state->kr_cur);return ip;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1102/1157 KVM: x86/pmu: Introduce the ctrl_mask value for fixed counter
In reply to Greg Kroah-HartmanFrom: Like Xu <[email protected]>
[ Upstream commit 2c985527dd8d283e786ad7a67e532ef7f6f00fac ]
The mask value of fixed counter control register should be dynamic adjusted with the number of fixed counters. This patch introduces a variable that includes the reserved bits of fixed counter control registers. This is a generic code refactoring.
Message-Id: <[email protected]>
--- arch/x86/include/asm/kvm_host.h | 1 + arch/x86/kvm/vmx/pmu_intel.c | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-)
arch/x86/include/asm/kvm_host.h +1 -0
@@ -505,6 +505,7 @@ struct kvm_pmu {unsigned nr_arch_fixed_counters;unsigned available_event_types;u64 fixed_ctr_ctrl; +u64 fixed_ctr_ctrl_mask;u64 global_ctrl;u64 global_status;u64 counter_bitmask[2 ];
arch/x86/kvm/vmx/pmu_intel.c +5 -1
@@ -395,7 +395,7 @@ static int intel_pmu_set_msr(struct kvm_vcpu *vcpu, struct msr_data *msr_info)case MSR_CORE_PERF_FIXED_CTR_CTRL :if (pmu->fixed_ctr_ctrl == data)return 0 ; -if (!(data &0xfffffffffffff444ull )) { +if (!(data & pmu->fixed_ctr_ctrl_mask)) {reprogram_fixed_counters (pmu, data);return 0 ; }
@@ -479,6 +479,7 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu)struct kvm_cpuid_entry2 *entry;union cpuid10_eax eax;union cpuid10_edx edx; +int i; pmu->nr_arch_gp_counters =0 ; pmu->nr_arch_fixed_counters =0 ;
@@ -487,6 +488,7 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) pmu->version =0 ; pmu->reserved_bits =0xffffffff00200000ull ; pmu->raw_event_mask =X86_RAW_EVENT_MASK ; + pmu->fixed_ctr_ctrl_mask = ~0ull ; entry =kvm_find_cpuid_entry (vcpu,0xa ,0 );if (!entry || !vcpu->kvm->arch.enable_pmu)
@@ -522,6 +524,8 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu)setup_fixed_pmc_eventsel (pmu); } +for (i =0 ; i < pmu->nr_arch_fixed_counters; i++) + pmu->fixed_ctr_ctrl_mask &= ~(0xbull << (i *4 )); pmu->global_ctrl = ((1ull << pmu->nr_arch_gp_counters) -1 ) | (((1ull << pmu->nr_arch_fixed_counters) -1 ) <<INTEL_PMC_IDX_FIXED ); pmu->global_ctrl_mask = ~pmu->global_ctrl;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1103/1157 KVM: VMX: Mark all PERF_GLOBAL_(OVF)_CTRL bits reserved if theres no vPMU
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
[ Upstream commit 93255bf92939d948bc86d81c6bb70bb0fecc5db1 ]
Mark all MSR_CORE_PERF_GLOBAL_CTRL and MSR_CORE_PERF_GLOBAL_OVF_CTRL bits as reserved if there is no guest vPMU. The nVMX VM-Entry consistency checks do not check for a valid vPMU prior to consuming the masks via kvm_valid_perf_global_ctrl(), i.e. may incorrectly allow a non-zero mask to be loaded via VM-Enter or VM-Exit (well, attempted to be loaded, the actual MSR load will be rejected by intel_is_valid_msr()).
Message-Id: <[email protected]>
--- arch/x86/kvm/vmx/pmu_intel.c | 2 ++ 1 file changed, 2 insertions(+)
arch/x86/kvm/vmx/pmu_intel.c +2 -0
@@ -488,6 +488,8 @@ static void intel_pmu_refresh(struct kvm_vcpu *vcpu) pmu->version =0 ; pmu->reserved_bits =0xffffffff00200000ull ; pmu->raw_event_mask =X86_RAW_EVENT_MASK ; + pmu->global_ctrl_mask = ~0ull ; + pmu->global_ovf_ctrl_mask = ~0ull ; pmu->fixed_ctr_ctrl_mask = ~0ull ; entry =kvm_find_cpuid_entry (vcpu,0xa ,0 );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1104/1157 KVM: x86/pmu: Ignore pmu->global_ctrl check if vPMU doesnt support global_ctrl
In reply to Greg Kroah-HartmanFrom: Like Xu <[email protected]>
[ Upstream commit 98defd2e17803263f49548fea930cfc974d505aa ]
MSR_CORE_PERF_GLOBAL_CTRL is introduced as part of Architecture PMU V2, as indicated by Intel SDM 19.2.2 and the intel_is_valid_msr() function.
So in the absence of global_ctrl support, all PMCs are enabled as AMD does.
Message-Id: <[email protected]>
--- arch/x86/kvm/vmx/pmu_intel.c | 3 +++ 1 file changed, 3 insertions(+)
arch/x86/kvm/vmx/pmu_intel.c +3 -0
@@ -98,6 +98,9 @@ static bool intel_pmc_is_enabled(struct kvm_pmc *pmc) {struct kvm_pmu *pmu =pmc_to_pmu (pmc); +if (pmu->version <2 ) +return true; +return test_bit (pmc->idx, (unsigned long *)&pmu->global_ctrl); }
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1105/1157 KVM: x86/pmu: Accept 0 for absent PMU MSRs when host-initiated if !enable_pmu
In reply to Greg Kroah-HartmanFrom: Like Xu <[email protected]>
[ Upstream commit 8e6a58e28b34e8d247e772159b8fa8f6bae39192 ]
Whenever an MSR is part of KVM_GET_MSR_INDEX_LIST, as is the case for MSR_K7_EVNTSEL0 or MSR_F15H_PERF_CTL0, it has to be always retrievable and settable with KVM_GET_MSR and KVM_SET_MSR.
Accept a zero value for these MSRs to obey the contract.
Message-Id: <[email protected]>
--- arch/x86/kvm/pmu.c | 8 ++++++++ arch/x86/kvm/svm/pmu.c | 11 ++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-)
arch/x86/kvm/pmu.c +8 -0
@@ -433,11 +433,19 @@ static void kvm_pmu_mark_pmc_in_use(struct kvm_vcpu *vcpu, u32 msr)int kvm_pmu_get_msr (struct kvm_vcpu *vcpu,struct msr_data *msr_info) { +if (msr_info->host_initiated && !vcpu->kvm->arch.enable_pmu) { + msr_info->data =0 ; +return 0 ; + } +return static_call (kvm_x86_pmu_get_msr)(vcpu, msr_info); }int kvm_pmu_set_msr (struct kvm_vcpu *vcpu,struct msr_data *msr_info) { +if (msr_info->host_initiated && !vcpu->kvm->arch.enable_pmu) +return !!msr_info->data; +kvm_pmu_mark_pmc_in_use (vcpu, msr_info->index);return static_call (kvm_x86_pmu_set_msr)(vcpu, msr_info); }
arch/x86/kvm/svm/pmu.c +10 -1
@@ -232,7 +232,16 @@ static struct kvm_pmc *amd_rdpmc_ecx_to_pmc(struct kvm_vcpu *vcpu,static bool amd_is_valid_msr (struct kvm_vcpu *vcpu,u32 msr) {/* All MSRs refer to exactly one PMC, so msr_idx_to_pmc is enough. */ -return false; +if (!host_initiated) +return false; + +switch (msr) { + case MSR_K7_EVNTSEL0 ... MSR_K7_PERFCTR3: + case MSR_F15H_PERF_CTL0 ... MSR_F15H_PERF_CTR5: +return true; +default : +return false; + } }static struct kvm_pmc *amd_msr_idx_to_pmc (struct kvm_vcpu *vcpu,u32 msr)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1106/1157 Revert "KVM: x86/pmu: Accept 0 for absent PMU MSRs when host-initiated if !enable_pmu"
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
[ Upstream commit 5d4283df5a0fc8299fba9443c33d219939eccc2d ]
Eating reads and writes to all "PMU" MSRs when there is no PMU is wildly broken as it results in allowing accesses to _any_ MSR on Intel CPUs as intel_is_valid_msr() returns true for all host_initiated accesses.
A revert of commit d1c88a402056 ("KVM: x86: always allow host-initiated writes to PMU MSRs") will soon follow.
This reverts commit 8e6a58e28b34e8d247e772159b8fa8f6bae39192.
Message-Id: <[email protected]>
--- arch/x86/kvm/pmu.c | 8 -------- arch/x86/kvm/svm/pmu.c | 11 +---------- 2 files changed, 1 insertion(+), 18 deletions(-)
arch/x86/kvm/pmu.c +0 -8
@@ -433,19 +433,11 @@ static void kvm_pmu_mark_pmc_in_use(struct kvm_vcpu *vcpu, u32 msr)int kvm_pmu_get_msr (struct kvm_vcpu *vcpu,struct msr_data *msr_info) { -if (msr_info->host_initiated && !vcpu->kvm->arch.enable_pmu) { - msr_info->data =0 ; -return 0 ; - } -return static_call (kvm_x86_pmu_get_msr)(vcpu, msr_info); }int kvm_pmu_set_msr (struct kvm_vcpu *vcpu,struct msr_data *msr_info) { -if (msr_info->host_initiated && !vcpu->kvm->arch.enable_pmu) -return !!msr_info->data; -kvm_pmu_mark_pmc_in_use (vcpu, msr_info->index);return static_call (kvm_x86_pmu_set_msr)(vcpu, msr_info); }
arch/x86/kvm/svm/pmu.c +1 -10
@@ -232,16 +232,7 @@ static struct kvm_pmc *amd_rdpmc_ecx_to_pmc(struct kvm_vcpu *vcpu,static bool amd_is_valid_msr (struct kvm_vcpu *vcpu,u32 msr) {/* All MSRs refer to exactly one PMC, so msr_idx_to_pmc is enough. */ -if (!host_initiated) -return false; - -switch (msr) { - case MSR_K7_EVNTSEL0 ... MSR_K7_PERFCTR3: - case MSR_F15H_PERF_CTL0 ... MSR_F15H_PERF_CTR5: -return true; -default : -return false; - } +return false; }static struct kvm_pmc *amd_msr_idx_to_pmc (struct kvm_vcpu *vcpu,u32 msr)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1107/1157 KVM: VMX: Add helper to check if the guest PMU has PERF_GLOBAL_CTRL
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
[ Upstream commit b663f0b5f3d665c261256d1f76e98f077c6e56af ]
Add a helper to check of the guest PMU has PERF_GLOBAL_CTRL, which is unintuitive _and_ diverges from Intel's architecturally defined behavior. Even worse, KVM currently implements the check using two different (but equivalent) checks, _and_ there has been at least one attempt to add a _third_ flavor.
Message-Id: <[email protected]>
--- arch/x86/kvm/vmx/pmu_intel.c | 4 ++-- arch/x86/kvm/vmx/vmx.h | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-)
arch/x86/kvm/vmx/pmu_intel.c +2 -2
@@ -98,7 +98,7 @@ static bool intel_pmc_is_enabled(struct kvm_pmc *pmc) {struct kvm_pmu *pmu =pmc_to_pmu (pmc); -if (pmu->version <2 ) +if (!intel_pmu_has_perf_global_ctrl (pmu))return true;return test_bit (pmc->idx, (unsigned long *)&pmu->global_ctrl);
@@ -215,7 +215,7 @@ static bool intel_is_valid_msr(struct kvm_vcpu *vcpu, u32 msr)case MSR_CORE_PERF_GLOBAL_STATUS :case MSR_CORE_PERF_GLOBAL_CTRL :case MSR_CORE_PERF_GLOBAL_OVF_CTRL : - ret = pmu->version >1 ; +return intel_pmu_has_perf_global_ctrl (pmu);break ;default : ret = get_gp_pmc(pmu, msr, MSR_IA32_PERFCTR0) ||
arch/x86/kvm/vmx/vmx.h +12 -0
@@ -92,6 +92,18 @@ union vmx_exit_reason {u32 full; }; +static inline bool intel_pmu_has_perf_global_ctrl (struct kvm_pmu *pmu) +{ +/* +* Architecturally, Intel's SDM states that IA32_PERF_GLOBAL_CTRL is +* supported if "CPUID.0AH: EAX[7:0] > 0", i.e. if the PMU version is +* greater than zero. However, KVM only exposes and emulates the MSR +* to/for the guest if the guest PMU supports at least "Architectural +* Performance Monitoring Version 2". +*/ +return pmu->version >1 ; +} +#define vcpu_to_lbr_desc (vcpu) (&to_vmx(vcpu)->lbr_desc)#define vcpu_to_lbr_records (vcpu) (&to_vmx(vcpu)->lbr_desc.records)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1108/1157 KVM: nVMX: Attempt to load PERF_GLOBAL_CTRL on nVMX xfer iff it exists
In reply to Greg Kroah-HartmanFrom: Sean Christopherson <[email protected]>
[ Upstream commit 4496a6f9b45e8cd83343ad86a3984d614e22cf54 ]
Attempt to load PERF_GLOBAL_CTRL during nested VM-Enter/VM-Exit if and only if the MSR exists (according to the guest vCPU model). KVM has very misguided handling of VM_{ENTRY,EXIT}_LOAD_IA32_PERF_GLOBAL_CTRL and attempts to force the nVMX MSR settings to match the vPMU model, i.e. to hide/expose the control based on whether or not the MSR exists from the guest's perspective.
KVM's modifications fail to handle the scenario where the vPMU is hidden from the guest _after_ being exposed to the guest, e.g. by userspace doing multiple KVM_SET_CPUID2 calls, which is allowed if done before any KVM_RUN. nested_vmx_pmu_refresh() is called if and only if there's a recognized vPMU, i.e. KVM will leave the bits in the allow state and then ultimately reject the MSR load and WARN.
KVM should not force the VMX MSRs in the first place. KVM taking control of the MSRs was a misguided attempt at mimicking what commit 5f76f6f5ff96 ("KVM: nVMX: Do not expose MPX VMX controls when guest MPX disabled", 2018-10-01) did for MPX. However, the MPX commit was a workaround for another KVM bug and not something that should be imitated (and it should never been done in the first place).
In other words, KVM's ABI _should_ be that userspace has full control over the MSRs, at which point triggering the WARN that loading the MSR must not fail is trivial.
The intent of the WARN is still valid; KVM has consistency checks to ensure that vmcs12->{guest,host}_ia32_perf_global_ctrl is valid. The problem is that '0' must be considered a valid value at all times, and so the simple/obvious solution is to just not actually load the MSR when it does not exist. It is userspace's responsibility to provide a sane vCPU model, i.e. KVM is well within its ABI and Intel's VMX architecture to skip the loads if the MSR does not exist.
Message-Id: <[email protected]>
--- arch/x86/kvm/vmx/nested.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/x86/kvm/vmx/nested.c +3 -1
@@ -2617,6 +2617,7 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, }if ((vmcs12->vm_entry_controls &VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL ) && +intel_pmu_has_perf_global_ctrl (vcpu_to_pmu (vcpu)) &&WARN_ON_ONCE (kvm_set_msr (vcpu,MSR_CORE_PERF_GLOBAL_CTRL , vmcs12->guest_ia32_perf_global_ctrl))) { *entry_failure_code =ENTRY_FAIL_DEFAULT ;
@@ -4342,7 +4343,8 @@ static void load_vmcs12_host_state(struct kvm_vcpu *vcpu,vmcs_write64 (GUEST_IA32_PAT , vmcs12->host_ia32_pat); vcpu->arch.pat = vmcs12->host_ia32_pat; } -if (vmcs12->vm_exit_controls &VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL ) +if ((vmcs12->vm_exit_controls &VM_EXIT_LOAD_IA32_PERF_GLOBAL_CTRL ) && +intel_pmu_has_perf_global_ctrl (vcpu_to_pmu (vcpu)))WARN_ON_ONCE (kvm_set_msr (vcpu,MSR_CORE_PERF_GLOBAL_CTRL , vmcs12->host_ia32_perf_global_ctrl));
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1109/1157 dm raid: fix address sanitizer warning in raid_status
In reply to Greg Kroah-HartmanFrom: Mikulas Patocka <[email protected]>
[ Upstream commit 1fbeea217d8f297fe0e0956a1516d14ba97d0396 ]
There is this warning when using a kernel with the address sanitizer and running this testsuite:
https://gitlab.com/cki-project/kernel-tests/-/tree/main/storage/swraid/scsi_raid
==================================================================
BUG: KASAN: slab-out-of-bounds in raid_status+0x1747/0x2820 [dm_raid] Read of size 4 at addr ffff888079d2c7e8 by task lvcreate/13319 CPU: 0 PID: 13319 Comm: lvcreate Not tainted 5.18.0-0.rc3.<snip> #1 Hardware name: Red Hat KVM, BIOS 0.5.1 01/01/2011 Call Trace: <TASK> dump_stack_lvl+0x6a/0x9c print_address_description.constprop.0+0x1f/0x1e0 print_report.cold+0x55/0x244 kasan_report+0xc9/0x100 raid_status+0x1747/0x2820 [dm_raid] dm_ima_measure_on_table_load+0x4b8/0xca0 [dm_mod] table_load+0x35c/0x630 [dm_mod] ctl_ioctl+0x411/0x630 [dm_mod] dm_ctl_ioctl+0xa/0x10 [dm_mod] __x64_sys_ioctl+0x12a/0x1a0 do_syscall_64+0x5b/0x80
The warning is caused by reading conf->max_nr_stripes in raid_status. The code in raid_status reads mddev->private, casts it to struct r5conf and reads the entry max_nr_stripes.
However, if we have different raid type than 4/5/6, mddev->private doesn't point to struct r5conf; it may point to struct r0conf, struct r1conf, struct r10conf or struct mpconf. If we cast a pointer to one of these structs to struct r5conf, we will be reading invalid memory and KASAN warns about it.
Fix this bug by reading struct r5conf only if raid type is 4, 5 or 6.
--- drivers/md/dm-raid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-raid.c +1 -1
@@ -3509,7 +3509,7 @@ static void raid_status(struct dm_target *ti, status_type_t type, {struct raid_set *rs = ti->private;struct mddev *mddev = &rs->md; -struct r5conf *conf = mddev->private; +struct r5conf *conf =rs_is_raid456 (rs) ? mddev->private :NULL ;int i, max_nr_stripes = conf ? conf->max_nr_stripes :0 ;unsigned long recovery;unsigned int raid_param_cnt =1 ;/* at least 1 for chunksize */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1110/1157 dm raid: fix address sanitizer warning in raid_resume
In reply to Greg Kroah-HartmanFrom: Mikulas Patocka <[email protected]>
[ Upstream commit 7dad24db59d2d2803576f2e3645728866a056dab ]
There is a KASAN warning in raid_resume when running the lvm test lvconvert-raid.sh. The reason for the warning is that mddev->raid_disks is greater than rs->raid_disks, so the loop touches one entry beyond the allocated length.
--- drivers/md/dm-raid.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/dm-raid.c +1 -1
@@ -3819,7 +3819,7 @@ static void attempt_restore_of_faulty_devices(struct raid_set *rs)memset (cleared_failed_devices,0 ,sizeof (cleared_failed_devices)); -for (i =0 ; i < mddev->raid_disks; i++) { +for (i =0 ; i < rs->raid_disks; i++) { r = &rs->dev[i].rdev;/* HM FIXME: enhance journal device recovery processing */ if (test_bit (Journal, &r->flags))
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1111/1157 dm: fix dm-raid crash if md_handle_request() splits bio
In reply to Greg Kroah-HartmanFrom: Mike Snitzer <[email protected]>
[ Upstream commit 9dd1cd3220eca534f2d47afad7ce85f4c40118d8 ]
Commit ca522482e3eaf ("dm: pass NULL bdev to bio_alloc_clone") introduced the optimization to _not_ perform bio_associate_blkg()'s relatively costly work when DM core clones its bio. But in doing so it exposed the possibility for DM's cloned bio to alter DM target behavior (e.g. crash) if a target were to issue IO without first calling bio_set_dev().
The DM raid target can trigger an MD crash due to its need to split the DM bio that is passed to md_handle_request(). The split will recurse to submit_bio_noacct() using a bio with an uninitialized ->bi_blkg. This NULL bio->bi_blkg causes blk_throtl_bio() to dereference a NULL blkg_to_tg(bio->bi_blkg).
Fix this in DM core by adding a new 'needs_bio_set_dev' target flag that will make alloc_tio() call bio_set_dev() on behalf of the target. dm-raid is the only target that requires this flag. bio_set_dev() initializes the DM cloned bio's ->bi_blkg, using bio_associate_blkg, before passing the bio to md_handle_request().
Long-term fix would be to audit and refactor MD code to rely on DM to split its bio, using dm_accept_partial_bio(), but there are MD raid personalities (e.g. raid1 and raid10) whose implementation are tightly coupled to handling the bio splitting inline.
--- drivers/md/dm-raid.c | 1 + drivers/md/dm.c | 13 ++++++------- include/linux/device-mapper.h | 6 ++++++ include/uapi/linux/dm-ioctl.h | 4 ++-- 4 files changed, 15 insertions(+), 9 deletions(-)
drivers/md/dm-raid.c +1 -0
@@ -3097,6 +3097,7 @@ static int raid_ctr(struct dm_target *ti, unsigned int argc, char **argv)INIT_WORK (&rs->md.event_work, do_table_event); ti->private = rs; ti->num_flush_bios =1 ; + ti->needs_bio_set_dev = true;/* Restore any requested new layout for conversion decision */ rs_config_restore (rs, &rs_layout);
drivers/md/dm.c +6 -7
@@ -578,9 +578,6 @@ static struct dm_io *alloc_io(struct mapped_device *md, struct bio *bio)struct bio *clone; clone =bio_alloc_clone (NULL , bio,GFP_NOIO , &md->mempools->io_bs); -/* Set default bdev, but target must bio_set_dev() before issuing IO */ - clone->bi_bdev = md->disk->part0; - tio =clone_to_tio (clone); tio->flags =0 ;dm_tio_set_flag (tio,DM_TIO_INSIDE_DM_IO );
@@ -614,6 +611,7 @@ static void free_io(struct dm_io *io)static struct bio *alloc_tio (struct clone_info *ci,struct dm_target *ti,unsigned target_bio_nr,unsigned *len,gfp_t gfp_mask) { +struct mapped_device *md = ci->io->md;struct dm_target_io *tio;struct bio *clone;
@@ -623,14 +621,10 @@ static struct bio *alloc_tio(struct clone_info *ci, struct dm_target *ti,/* alloc_io() already initialized embedded clone */ clone = &tio->clone; }else { -struct mapped_device *md = ci->io->md; - clone =bio_alloc_clone (NULL , ci->bio, gfp_mask, &md->mempools->bs);if (!clone)return NULL ; -/* Set default bdev, but target must bio_set_dev() before issuing IO */ - clone->bi_bdev = md->disk->part0;/* REQ_DM_POLL_LIST shouldn't be inherited */ clone->bi_opf &= ~REQ_DM_POLL_LIST ;
@@ -646,6 +640,11 @@ static struct bio *alloc_tio(struct clone_info *ci, struct dm_target *ti, tio->len_ptr = len; tio->old_sector =0 ; +/* Set default bdev, but target must bio_set_dev() before issuing IO */ + clone->bi_bdev = md->disk->part0; +if (unlikely (ti->needs_bio_set_dev)) +bio_set_dev (clone, md->disk->part0); +if (len) { clone->bi_iter.bi_size =to_bytes (*len);if (bio_integrity (clone))
include/linux/device-mapper.h +6 -0
@@ -373,6 +373,12 @@ struct dm_target {* after returning DM_MAPIO_SUBMITTED from its map function. */ bool accounts_remapped_io:1; + +/* +* Set if the target will submit the DM bio without first calling +* bio_set_dev(). NOTE: ideally a target should _not_ need this. +*/ + bool needs_bio_set_dev:1; };void *dm_per_bio_data (struct bio *bio,size_t data_size);
include/uapi/linux/dm-ioctl.h +2 -2
@@ -286,9 +286,9 @@ enum {#define DM_DEV_SET_GEOMETRY _IOWR(DM_IOCTL, DM_DEV_SET_GEOMETRY_CMD, struct dm_ioctl)#define DM_VERSION_MAJOR 4 -#define DM_VERSION_MINOR 46 +#define DM_VERSION_MINOR 47#define DM_VERSION_PATCHLEVEL 0 -#define DM_VERSION_EXTRA "-ioctl (2022-02-22)" +#define DM_VERSION_EXTRA "-ioctl (2022-07-28)"/* Status bits */ #define DM_READONLY_FLAG (1 << 0)/* In/Out */
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1112/1157 mm/damon/reclaim: fix potential memory leak in damon_reclaim_init()
In reply to Greg Kroah-HartmanFrom: Jianglei Nie <[email protected]>
[ Upstream commit 188043c7f4f2bd662f2a55957d684fffa543e600 ]
damon_reclaim_init() allocates a memory chunk for ctx with damon_new_ctx(). When damon_select_ops() fails, ctx is not released, which will lead to a memory leak.
We should release the ctx with damon_destroy_ctx() when damon_select_ops() fails to fix the memory leak.
--- mm/damon/reclaim.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
mm/damon/reclaim.c +3 -1
@@ -441,8 +441,10 @@ static int __init damon_reclaim_init(void)if (!ctx)return -ENOMEM ; -if (damon_select_ops (ctx,DAMON_OPS_PADDR )) +if (damon_select_ops (ctx,DAMON_OPS_PADDR )) { +damon_destroy_ctx (ctx);return -EINVAL ; + } ctx->callback.after_wmarks_check = damon_reclaim_after_wmarks_check; ctx->callback.after_aggregation = damon_reclaim_after_aggregation;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1113/1157 hugetlb_cgroup: fix wrong hugetlb cgroup numa stat
In reply to Greg Kroah-HartmanFrom: Miaohe Lin <[email protected]>
[ Upstream commit 2727cfe4072a35ce813e3708f74c135de7da8897 ]
We forget to set cft->private for numa stat file. As a result, numa stat of hstates[0] is always showed for all hstates. Encode the hstates index into cft->private to fix this issue.
--- mm/hugetlb_cgroup.c | 1 + 1 file changed, 1 insertion(+)
mm/hugetlb_cgroup.c +1 -0
@@ -772,6 +772,7 @@ static void __init __hugetlb_cgroup_file_dfl_init(int idx)/* Add the numa stat file */ cft = &h->cgroup_files_dfl[6 ];snprintf (cft->name,MAX_CFTYPE_NAME ,"%s.numa_stat" , buf); + cft->private =MEMFILE_PRIVATE (idx,0 ); cft->seq_show = hugetlb_cgroup_read_numa_stat; cft->flags =CFTYPE_NOT_ON_ROOT ;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1114/1157 batman-adv: tracing: Use the new __vstring() helper
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (Google) <[email protected]>
[ Upstream commit 9abc291812d784bd4a26c01af4ebdbf9f2dbf0bb ]
Instead of open coding a __dynamic_array() with a fixed length (which defeats the purpose of the dynamic array in the first place). Use the new __vstring() helper that will use a va_list and only write enough of the string into the ring buffer that is needed.
--- net/batman-adv/trace.h | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)
net/batman-adv/trace.h +2 -7
@@ -28,8 +28,6 @@#endif /* CONFIG_BATMAN_ADV_TRACING */ -#define BATADV_MAX_MSG_LEN 256 - TRACE_EVENT(batadv_dbg, TP_PROTO(struct batadv_priv *bat_priv,
@@ -40,16 +38,13 @@ TRACE_EVENT(batadv_dbg,TP_STRUCT__entry ( __string(device, bat_priv->soft_iface->name) __string(driver, KBUILD_MODNAME) -__dynamic_array (char, msg,BATADV_MAX_MSG_LEN ) +__vstring (msg, vaf->fmt, vaf->va) ),TP_fast_assign ( __assign_str(device, bat_priv->soft_iface->name);__assign_str (driver,KBUILD_MODNAME ); -WARN_ON_ONCE (vsnprintf (__get_dynamic_array (msg), -BATADV_MAX_MSG_LEN , - vaf->fmt, - *vaf->va) >=BATADV_MAX_MSG_LEN ); +__assign_vstr (msg, vaf->fmt, vaf->va); ), TP_printk(
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1115/1157 tracing: Use a struct alignof to determine trace event field alignment
In reply to Greg Kroah-HartmanFrom: Steven Rostedt (Google) <[email protected]>
[ Upstream commit 4c3d2f9388d36eb28640a220a6f908328442d873 ]
alignof() gives an alignment of types as they would be as standalone variables. But alignment in structures might be different, and when building the fields of events, the alignment must be the actual alignment otherwise the field offsets may not match what they actually are.
This caused trace-cmd to crash, as libtraceevent did not check if the field offset was bigger than the event. The write_msr and read_msr events on 32 bit had their fields incorrect, because it had a u64 field between two ints. alignof(u64) would give 8, but the u64 field was at a 4 byte alignment.
Define a macro as:
ALIGN_STRUCTFIELD(type) ((int)(offsetof(struct {char a; type b;}, b)))
which gives the actual alignment of types in a structure.
--- include/trace/stages/stage4_event_fields.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
include/trace/stages/stage4_event_fields.h +5 -3
@@ -2,16 +2,18 @@/* Stage 4 definitions for creating trace events */ +#define ALIGN_STRUCTFIELD (type) ((int)(offsetof(struct {char a; type b;}, b))) +#undef __field_ext#define __field_ext (_type, _item, _filter_type) { \ .type = #_type, .name = #_item, \ - .size = sizeof(_type), .align = __alignof__(_type), \ + .size = sizeof(_type), .align = ALIGN_STRUCTFIELD(_type), \ .is_signed = is_signed_type(_type), .filter_type = _filter_type },#undef __field_struct_ext#define __field_struct_ext (_type, _item, _filter_type) { \ .type = #_type, .name = #_item, \ - .size = sizeof(_type), .align = __alignof__(_type), \ + .size = sizeof(_type), .align = ALIGN_STRUCTFIELD(_type), \ 0, .filter_type = _filter_type },#undef __field
@@ -23,7 +25,7 @@#undef __array#define __array (_type, _item, _len) { \ .type = #_type"["__stringify(_len)"]", .name = #_item, \ - .size = sizeof(_type[_len]), .align = __alignof__(_type), \ + .size = sizeof(_type[_len]), .align = ALIGN_STRUCTFIELD(_type), \ .is_signed = is_signed_type(_type), .filter_type = FILTER_OTHER },#undef __dynamic_array
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1116/1157 ext4: fix reading leftover inlined symlinks
In reply to Greg Kroah-HartmanFrom: Zhang Yi <[email protected]>
[ Upstream commit 5a57bca9050d740ca37184302e23d0e7633e3ebc ]
Since commit 6493792d3299 ("ext4: convert symlink external data block mapping to bdev"), create new symlink with inline_data is not supported, but it missing to handle the leftover inlined symlinks, which could cause below error message and fail to read symlink.
ls: cannot read symbolic link 'foo': Structure needs cleaning
EXT4-fs error (device sda): ext4_map_blocks:605: inode #12: block 2021161080: comm ls: lblock 0 mapped to illegal pblock 2021161080 (length 1)
Fix this regression by adding ext4_read_inline_link(), which read the inline data directly and convert it through a kmalloced buffer.
--- fs/ext4/ext4.h | 1 + fs/ext4/inline.c | 30 ++++++++++++++++++++++++++++++ fs/ext4/symlink.c | 15 +++++++++++++++ 3 files changed, 46 insertions(+)
fs/ext4/ext4.h +1 -0
@@ -3583,6 +3583,7 @@ extern struct buffer_head *ext4_get_first_inline_block(struct inode *inode,extern int ext4_inline_data_fiemap (struct inode *inode,struct fiemap_extent_info *fieinfo,int *has_inline,__u64 start,__u64 len); +extern void *ext4_read_inline_link (struct inode *inode);struct iomap ;extern int ext4_inline_data_iomap (struct inode *inode,struct iomap *iomap);
fs/ext4/inline.c +30 -0
@@ -6,6 +6,7 @@#include <linux/iomap.h> #include <linux/fiemap.h> +#include <linux/namei.h> #include <linux/iversion.h> #include <linux/sched/mm.h>
@@ -1588,6 +1589,35 @@ int ext4_read_inline_dir(struct file *file,return ret; } +void *ext4_read_inline_link (struct inode *inode) +{ +struct ext4_iloc iloc; +int ret, inline_size; +void *link; + + ret =ext4_get_inode_loc (inode, &iloc); +if (ret) +return ERR_PTR (ret); + + ret = -ENOMEM ; + inline_size =ext4_get_inline_size (inode); + link =kmalloc (inline_size +1 ,GFP_NOFS ); +if (!link) + goto out; + + ret =ext4_read_inline_data (inode, link, inline_size, &iloc); +if (ret <0 ) { +kfree (link); + goto out; + } +nd_terminate_link (link, inode->i_size, ret); +out: +if (ret <0 ) + link =ERR_PTR (ret); +brelse (iloc.bh); +return link; +} +struct buffer_head *ext4_get_first_inline_block (struct inode *inode,struct ext4_dir_entry_2 **parent_de,int *retval)
fs/ext4/symlink.c +15 -0
@@ -74,6 +74,21 @@ static const char *ext4_get_link(struct dentry *dentry, struct inode *inode, struct delayed_call *callback) {struct buffer_head *bh; +char *inline_link; + +/* +* Create a new inlined symlink is not supported, just provide a +* method to read the leftovers. +*/ +if (ext4_has_inline_data (inode)) { +if (!dentry) +return ERR_PTR (-ECHILD ); + + inline_link =ext4_read_inline_link (inode); +if (!IS_ERR (inline_link)) +set_delayed_call (callback, kfree_link, inline_link); +return inline_link; + }if (!dentry) { bh =ext4_getblk (NULL , inode,0 ,EXT4_GET_BLOCKS_CACHED_NOWAIT );
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1117/1157 ext4: update s_overhead_clusters in the superblock during an on-line resize
In reply to Greg Kroah-HartmanFrom: Theodore Ts'o <[email protected]>
[ Upstream commit de394a86658ffe4e89e5328fd4993abfe41b7435 ]
When doing an online resize, the on-disk superblock on-disk wasn't updated. This means that when the file system is unmounted and remounted, and the on-disk overhead value is non-zero, this would result in the results of statfs(2) to be incorrect.
This was partially fixed by Commits 10b01ee92df5 ("ext4: fix overhead calculation to account for the reserved gdt blocks"), 85d825dbf489 ("ext4: force overhead calculation if the s_overhead_cluster makes no sense"), and eb7054212eac ("ext4: update the cached overhead value in the superblock").
However, since it was too expensive to forcibly recalculate the overhead for bigalloc file systems at every mount, this didn't fix the problem for bigalloc file systems. This commit should address the problem when resizing file systems with the bigalloc feature enabled.
--- fs/ext4/resize.c | 1 + 1 file changed, 1 insertion(+)
fs/ext4/resize.c +1 -0
@@ -1484,6 +1484,7 @@ static void ext4_update_super(struct super_block *sb,* Update the fs overhead information */ ext4_calculate_overhead (sb); + es->s_overhead_clusters =cpu_to_le32 (sbi->s_overhead);if (test_opt (sb,DEBUG )) printk(KERN_DEBUG "EXT4-fs: added group %u:"
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1118/1157 ext4: fix extent status tree race in writeback error recovery path
In reply to Greg Kroah-HartmanFrom: Eric Whitney <[email protected]>
[ Upstream commit 7f0d8e1d607c1a4fa9a27362a108921d82230874 ]
A race can occur in the unlikely event ext4 is unable to allocate a physical cluster for a delayed allocation in a bigalloc file system during writeback. Failure to allocate a cluster forces error recovery that includes a call to mpage_release_unused_pages(). That function removes any corresponding delayed allocated blocks from the extent status tree. If a new delayed write is in progress on the same cluster simultaneously, resulting in the addition of an new extent containing one or more blocks in that cluster to the extent status tree, delayed block accounting can be thrown off if that delayed write then encounters a similar cluster allocation failure during future writeback.
Write lock the i_data_sem in mpage_release_unused_pages() to fix this problem. Ext4's block/cluster accounting code for bigalloc relies on i_data_sem for mutual exclusion, as is found in the delayed write path, and the locking in mpage_release_unused_pages() is missing.
--- fs/ext4/inode.c | 7 +++++++ 1 file changed, 7 insertions(+)
fs/ext4/inode.c +7 -0
@@ -1571,7 +1571,14 @@ static void mpage_release_unused_pages(struct mpage_da_data *mpd,ext4_lblk_t start, last; start = index << (PAGE_SHIFT - inode->i_blkbits); last = end << (PAGE_SHIFT - inode->i_blkbits); + +/* +* avoid racing with extent status tree scans made by +* ext4_insert_delayed_block() +*/ +down_write (&EXT4_I (inode)->i_data_sem);ext4_es_remove_extent (inode, start, last - start +1 ); +up_write (&EXT4_I (inode)->i_data_sem); }pagevec_init (&pvec);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1119/1157 ext4: add EXT4_INODE_HAS_XATTR_SPACE macro in xattr.h
In reply to Greg Kroah-HartmanFrom: Baokun Li <[email protected]>
[ Upstream commit 179b14152dcb6a24c3415200603aebca70ff13af ]
When adding an xattr to an inode, we must ensure that the inode_size is not less than EXT4_GOOD_OLD_INODE_SIZE + extra_isize + pad. Otherwise, the end position may be greater than the start position, resulting in UAF.
--- fs/ext4/xattr.h | 13 +++++++++++++ 1 file changed, 13 insertions(+)
fs/ext4/xattr.h +13 -0
@@ -95,6 +95,19 @@ struct ext4_xattr_entry {#define EXT4_ZERO_XATTR_VALUE ((void *)-1) +/* +* If we want to add an xattr to the inode, we should make sure that +* i_extra_isize is not 0 and that the inode size is not less than +* EXT4_GOOD_OLD_INODE_SIZE + extra_isize + pad. +* EXT4_GOOD_OLD_INODE_SIZE extra_isize header entry pad data +* |--------------------------|------------|------|---------|---|-------| +*/ +#define EXT4_INODE_HAS_XATTR_SPACE (inode) \ + ((EXT4_I(inode)->i_extra_isize != 0) && \ + (EXT4_GOOD_OLD_INODE_SIZE + EXT4_I(inode)->i_extra_isize + \ + sizeof(struct ext4_xattr_ibody_header) + EXT4_XATTR_PAD <= \ + EXT4_INODE_SIZE((inode)->i_sb))) +struct ext4_xattr_info {const char *name;const void *value;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1120/1157 ext4: fix use-after-free in ext4_xattr_set_entry
In reply to Greg Kroah-HartmanFrom: Baokun Li <[email protected]>
[ Upstream commit 67d7d8ad99beccd9fe92d585b87f1760dc9018e3 ]
Hulk Robot reported a issue:
==================================================================
BUG: KASAN: use-after-free in ext4_xattr_set_entry+0x18ab/0x3500 Write of size 4105 at addr ffff8881675ef5f4 by task syz-executor.0/7092 CPU: 1 PID: 7092 Comm: syz-executor.0 Not tainted 4.19.90-dirty #17 Call Trace: [...] memcpy+0x34/0x50 mm/kasan/kasan.c:303 ext4_xattr_set_entry+0x18ab/0x3500 fs/ext4/xattr.c:1747 ext4_xattr_ibody_inline_set+0x86/0x2a0 fs/ext4/xattr.c:2205 ext4_xattr_set_handle+0x940/0x1300 fs/ext4/xattr.c:2386 ext4_xattr_set+0x1da/0x300 fs/ext4/xattr.c:2498 __vfs_setxattr+0x112/0x170 fs/xattr.c:149 __vfs_setxattr_noperm+0x11b/0x2a0 fs/xattr.c:180 __vfs_setxattr_locked+0x17b/0x250 fs/xattr.c:238 vfs_setxattr+0xed/0x270 fs/xattr.c:255 setxattr+0x235/0x330 fs/xattr.c:520 path_setxattr+0x176/0x190 fs/xattr.c:539 __do_sys_lsetxattr fs/xattr.c:561 [inline] __se_sys_lsetxattr fs/xattr.c:557 [inline] __x64_sys_lsetxattr+0xc2/0x160 fs/xattr.c:557 do_syscall_64+0xdf/0x530 arch/x86/entry/common.c:298 entry_SYSCALL_64_after_hwframe+0x44/0xa9 RIP: 0033:0x459fe9 RSP: 002b:00007fa5e54b4c08 EFLAGS: 00000246 ORIG_RAX: 00000000000000bd RAX: ffffffffffffffda RBX: 000000000051bf60 RCX: 0000000000459fe9 RDX: 00000000200003c0 RSI: 0000000020000180 RDI: 0000000020000140 RBP: 000000000051bf60 R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000001009 R11: 0000000000000246 R12: 0000000000000000 R13: 00007ffc73c93fc0 R14: 000000000051bf60 R15: 00007fa5e54b4d80
[...]
==================================================================
Above issue may happen as follows:
-------------------------------------ext4_xattr_set
ext4_xattr_set_handle
ext4_xattr_ibody_find
>> s->end < s->base
>> no EXT4_STATE_XATTR
>> xattr_check_inode is not executed
ext4_xattr_ibody_set
ext4_xattr_set_entry
>> size_t min_offs = s->end - s->base
>> UAF in memcpy
we can easily reproduce this problem with the following commands:
mkfs.ext4 -F /dev/sda
mount -o debug_want_extra_isize=128 /dev/sda /mnt
touch /mnt/file
setfattr -n user.cat -v seq -s z 4096|tr -d '[:digit:]' /mnt/file
In ext4_xattr_ibody_find, we have the following assignment logic:
header = IHDR(inode, raw_inode)
= raw_inode + EXT4_GOOD_OLD_INODE_SIZE + i_extra_isize
is->s.base = IFIRST(header)
= header + sizeof(struct ext4_xattr_ibody_header)
is->s.end = raw_inode + s_inode_size
In ext4_xattr_set_entry
min_offs = s->end - s->base
= s_inode_size - EXT4_GOOD_OLD_INODE_SIZE - i_extra_isize -
sizeof(struct ext4_xattr_ibody_header)
last = s->first
free = min_offs - ((void *)last - s->base) - sizeof(__u32)
= s_inode_size - EXT4_GOOD_OLD_INODE_SIZE - i_extra_isize -
sizeof(struct ext4_xattr_ibody_header) - sizeof(__u32)
In the calculation formula, all values except s_inode_size and i_extra_size are fixed values. When i_extra_size is the maximum value s_inode_size - EXT4_GOOD_OLD_INODE_SIZE, min_offs is -4 and free is -8. The value overflows. As a result, the preceding issue is triggered when memcpy is executed.
Therefore, when finding xattr or setting xattr, check whether there is space for storing xattr in the inode to resolve this issue.
--- fs/ext4/xattr.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
fs/ext4/xattr.c +4 -2
@@ -2175,8 +2175,9 @@ int ext4_xattr_ibody_find(struct inode *inode, struct ext4_xattr_info *i,struct ext4_inode *raw_inode;int error; -if (EXT4_I (inode)->i_extra_isize ==0 ) +if (!EXT4_INODE_HAS_XATTR_SPACE (inode))return 0 ; + raw_inode =ext4_raw_inode (&is->iloc); header =IHDR (inode, raw_inode); is->s.base = is->s.first =IFIRST (header);
@@ -2204,8 +2205,9 @@ int ext4_xattr_ibody_set(handle_t *handle, struct inode *inode,struct ext4_xattr_search *s = &is->s;int error; -if (EXT4_I (inode)->i_extra_isize ==0 ) +if (!EXT4_INODE_HAS_XATTR_SPACE (inode))return -ENOSPC ; + error =ext4_xattr_set_entry (i, s, handle, inode, false/* is_block */ );if (error)return error;
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1121/1157 ext4: correct max_inline_xattr_value_size computing
In reply to Greg Kroah-HartmanFrom: Baokun Li <[email protected]>
[ Upstream commit c9fd167d57133c5b748d16913c4eabc55e531c73 ]
If the ext4 inode does not have xattr space, 0 is returned in the get_max_inline_xattr_value_size function. Otherwise, the function returns a negative value when the inode does not contain EXT4_STATE_XATTR.
--- fs/ext4/inline.c | 3 +++ 1 file changed, 3 insertions(+)
fs/ext4/inline.c +3 -0
@@ -36,6 +36,9 @@ static int get_max_inline_xattr_value_size(struct inode *inode,struct ext4_inode *raw_inode;int free, min_offs; +if (!EXT4_INODE_HAS_XATTR_SPACE (inode)) +return 0 ; + min_offs =EXT4_SB (inode->i_sb)->s_inode_size -EXT4_GOOD_OLD_INODE_SIZE - EXT4_I(inode)->i_extra_isize -
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1122/1157 ext4: correct the misjudgment in ext4_iget_extra_inode
In reply to Greg Kroah-HartmanFrom: Baokun Li <[email protected]>
[ Upstream commit fd7e672ea98b95b9d4c9dae316639f03c16a749d ]
Use the EXT4_INODE_HAS_XATTR_SPACE macro to more accurately determine whether the inode have xattr space.
--- fs/ext4/inode.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/ext4/inode.c +1 -2
@@ -4692,8 +4692,7 @@ static inline int ext4_iget_extra_inode(struct inode *inode,__le32 *magic = (void *)raw_inode +EXT4_GOOD_OLD_INODE_SIZE + ei->i_extra_isize; -if (EXT4_GOOD_OLD_INODE_SIZE + ei->i_extra_isize +sizeof (__le32) <= -EXT4_INODE_SIZE (inode->i_sb) && +if (EXT4_INODE_HAS_XATTR_SPACE (inode) && *magic ==cpu_to_le32 (EXT4_XATTR_MAGIC )) {ext4_set_inode_state (inode,EXT4_STATE_XATTR );return ext4_find_inline_data_nolock (inode);
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1123/1157 ext4: fix warning in ext4_iomap_begin as race between bmap and write
In reply to Greg Kroah-HartmanFrom: Ye Bin <[email protected]>
[ Upstream commit 51ae846cff568c8c29921b1b28eb2dfbcd4ac12d ]
We got issue as follows:
------------[ cut here ]------------ WARNING: CPU: 3 PID: 9310 at fs/ext4/inode.c:3441 ext4_iomap_begin+0x182/0x5d0 RIP: 0010:ext4_iomap_begin+0x182/0x5d0 RSP: 0018:ffff88812460fa08 EFLAGS: 00010293 RAX: ffff88811f168000 RBX: 0000000000000000 RCX: ffffffff97793c12 RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000003 RBP: ffff88812c669160 R08: ffff88811f168000 R09: ffffed10258cd20f R10: ffff88812c669077 R11: ffffed10258cd20e R12: 0000000000000001 R13: 00000000000000a4 R14: 000000000000000c R15: ffff88812c6691ee FS: 00007fd0d6ff3740(0000) GS:ffff8883af180000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007fd0d6dda290 CR3: 0000000104a62000 CR4: 00000000000006e0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: iomap_apply+0x119/0x570 iomap_bmap+0x124/0x150 ext4_bmap+0x14f/0x250 bmap+0x55/0x80 do_vfs_ioctl+0x952/0xbd0 __x64_sys_ioctl+0xc6/0x170 do_syscall_64+0x33/0x40 entry_SYSCALL_64_after_hwframe+0x44/0xa9
Above issue may happen as follows:
bmap write
bmap
ext4_bmap
iomap_bmap
ext4_iomap_begin
ext4_file_write_iter
ext4_buffered_write_iter
generic_perform_write
ext4_da_write_begin
ext4_da_write_inline_data_begin
ext4_prepare_inline_data
ext4_create_inline_data
ext4_set_inode_flag(inode,
EXT4_INODE_INLINE_DATA);
if (WARN_ON_ONCE(ext4_has_inline_data(inode))) ->trigger bug_onTo solved above issue hold inode lock in ext4_bamp.
--- fs/ext4/inode.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
fs/ext4/inode.c +9 -3
@@ -3147,13 +3147,15 @@ static sector_t ext4_bmap(struct address_space *mapping, sector_t block) {struct inode *inode = mapping->host;journal_t *journal; +sector_t ret =0 ;int err; +inode_lock_shared (inode);/* * We can get here for an inline file via the FIBMAP ioctl */ if (ext4_has_inline_data (inode)) -return 0 ; + goto out;if (mapping_tagged (mapping,PAGECACHE_TAG_DIRTY ) &&test_opt (inode->i_sb,DELALLOC )) {
@@ -3192,10 +3194,14 @@ static sector_t ext4_bmap(struct address_space *mapping, sector_t block)jbd2_journal_unlock_updates (journal);if (err) -return 0 ; + goto out; } -return iomap_bmap (mapping, block, &ext4_iomap_ops); + ret =iomap_bmap (mapping, block, &ext4_iomap_ops); + +out: +inode_unlock_shared (inode); +return ret; }static int ext4_read_folio (struct file *file,struct folio *folio)
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1124/1157 Documentation: ext4: fix cell spacing of table heading on blockmap table
In reply to Greg Kroah-HartmanFrom: Bagas Sanjaya <[email protected]>
[ Upstream commit 442ec1e5bb7c46c72c41898e13a5744c84cadf51 ]
Commit 3103084afcf234 ("ext4, doc: remove unnecessary escaping") removes redundant underscore escaping, however the cell spacing in heading row of blockmap table became not aligned anymore, hence triggers malformed table warning:
Documentation/filesystems/ext4/blockmap.rst:3: WARNING: Malformed table.
+---------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ | i.i_block Offset | Where It Points |
<snipped>...
The warning caused the table not being loaded.
Realign the heading row cell by adding missing space at the first cell to fix the warning.
--- Documentation/filesystems/ext4/blockmap.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Documentation/filesystems/ext4/blockmap.rst +1 -1
@@ -1,7 +1,7 @@ .. SPDX-License-Identifier: GPL-2.0 +---------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ -| i.i_block Offset | Where It Points | +| i.i_block Offset | Where It Points | +=====================+==============================================================================================================================================================================================================================+ | 0 to 11 | Direct map to file blocks 0 to 11. | +---------------------+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1125/1157 ext4: check if directory block is within i_size
In reply to Greg Kroah-HartmanFrom: Lukas Czerner <[email protected]>
[ Upstream commit 65f8ea4cd57dbd46ea13b41dc8bac03176b04233 ]
Currently ext4 directory handling code implicitly assumes that the directory blocks are always within the i_size. In fact ext4_append() will attempt to allocate next directory block based solely on i_size and the i_size is then appropriately increased after a successful allocation.
However, for this to work it requires i_size to be correct. If, for any reason, the directory inode i_size is corrupted in a way that the directory tree refers to a valid directory block past i_size, we could end up corrupting parts of the directory tree structure by overwriting already used directory blocks when modifying the directory.
Fix it by catching the corruption early in __ext4_read_dirblock().
Addresses Red-Hat-Bugzilla: #2070205
CVE: CVE-2022-1184
--- fs/ext4/namei.c | 7 +++++++ 1 file changed, 7 insertions(+)
fs/ext4/namei.c +7 -0
@@ -110,6 +110,13 @@ static struct buffer_head *__ext4_read_dirblock(struct inode *inode,struct ext4_dir_entry *dirent;int is_dx_block =0 ; +if (block >= inode->i_size) { +ext4_error_inode (inode, func, line, block, +"Attempting to read directory block (%u) that is past i_size (%llu)" , + block, inode->i_size); +return ERR_PTR (-EFSCORRUPTED ); + } +if (ext4_simulate_fail (inode->i_sb,EXT4_SIM_DIRBLOCK_EIO )) bh =ERR_PTR (-EIO );else
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1126/1157 ext4: make sure ext4_append() always allocates new block
In reply to Greg Kroah-HartmanFrom: Lukas Czerner <[email protected]>
[ Upstream commit b8a04fe77ef1360fbf73c80fddbdfeaa9407ed1b ]
ext4_append() must always allocate a new block, otherwise we run the risk of overwriting existing directory block corrupting the directory tree in the process resulting in all manner of problems later on.
Add a sanity check to see if the logical block is already allocated and error out if it is.
--- fs/ext4/namei.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
fs/ext4/namei.c +16 -0
@@ -54,6 +54,7 @@ static struct buffer_head *ext4_append(handle_t *handle,struct inode *inode, ext4_lblk_t *block) { + struct ext4_map_blocks map;struct buffer_head *bh;int err;
@@ -63,6 +64,21 @@ static struct buffer_head *ext4_append(handle_t *handle,return ERR_PTR (-ENOSPC ); *block = inode->i_size >> inode->i_sb->s_blocksize_bits; + map.m_lblk = *block; + map.m_len =1 ; + +/* +* We're appending new directory block. Make sure the block is not +* allocated yet, otherwise we will end up corrupting the +* directory. +*/ + err =ext4_map_blocks (NULL , inode, &map,0 ); +if (err <0 ) +return ERR_PTR (err); +if (err) { +EXT4_ERROR_INODE (inode,"Logical block already allocated" ); +return ERR_PTR (-EFSCORRUPTED ); + } bh =ext4_bread (handle, inode, *block,EXT4_GET_BLOCKS_CREATE );if (IS_ERR (bh))
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1127/1157 ext4: remove EA inode entry from mbcache on inode eviction
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
[ Upstream commit 6bc0d63dad7f9f54d381925ee855b402f652fa39 ]
Currently we remove EA inode from mbcache as soon as its xattr refcount drops to zero. However there can be pending attempts to reuse the inode and thus refcount handling code has to handle the situation when refcount increases from zero anyway. So save some work and just keep EA inode in mbcache until it is getting evicted. At that moment we are sure following iget() of EA inode will fail anyway (or wait for eviction to finish and load things from the disk again) and so removing mbcache entry at that moment is fine and simplifies the code a bit.
--- fs/ext4/inode.c | 2 ++ fs/ext4/xattr.c | 24 ++++++++---------------- fs/ext4/xattr.h | 1 + 3 files changed, 11 insertions(+), 16 deletions(-)
fs/ext4/inode.c +2 -0
@@ -177,6 +177,8 @@ void ext4_evict_inode(struct inode *inode)trace_ext4_evict_inode (inode); +if (EXT4_I (inode)->i_flags &EXT4_EA_INODE_FL ) +ext4_evict_ea_inode (inode);if (inode->i_nlink) {/* * When journalling data dirty buffers are tracked only in the
fs/ext4/xattr.c +8 -16
@@ -436,6 +436,14 @@ static int ext4_xattr_inode_iget(struct inode *parent, unsigned long ea_ino,return err; } +/* Remove entry from mbcache when EA inode is getting evicted */ +void ext4_evict_ea_inode (struct inode *inode) +{ +if (EA_INODE_CACHE (inode)) +mb_cache_entry_delete (EA_INODE_CACHE (inode), +ext4_xattr_inode_get_hash (inode), inode->i_ino); +} + static int ext4_xattr_inode_verify_hashes(struct inode *ea_inode, struct ext4_xattr_entry *entry, void *buffer,
@@ -976,10 +984,8 @@ int __ext4_xattr_set_credits(struct super_block *sb, struct inode *inode,static int ext4_xattr_inode_update_ref (handle_t *handle,struct inode *ea_inode,int ref_change) { -struct mb_cache *ea_inode_cache =EA_INODE_CACHE (ea_inode);struct ext4_iloc iloc;s64 ref_count; -u32 hash;int ret;inode_lock (ea_inode);
@@ -1002,14 +1008,6 @@ static int ext4_xattr_inode_update_ref(handle_t *handle, struct inode *ea_inode,set_nlink (ea_inode,1 );ext4_orphan_del (handle, ea_inode); - -if (ea_inode_cache) { - hash =ext4_xattr_inode_get_hash (ea_inode); -mb_cache_entry_create (ea_inode_cache, -GFP_NOFS , hash, - ea_inode->i_ino, - true/* reusable */ ); - } } }else { WARN_ONCE(ref_count < 0, "EA inode %lu ref_count=%lld",
@@ -1022,12 +1020,6 @@ static int ext4_xattr_inode_update_ref(handle_t *handle, struct inode *ea_inode,clear_nlink (ea_inode);ext4_orphan_add (handle, ea_inode); - -if (ea_inode_cache) { - hash =ext4_xattr_inode_get_hash (ea_inode); -mb_cache_entry_delete (ea_inode_cache, hash, - ea_inode->i_ino); - } } }
fs/ext4/xattr.h +1 -0
@@ -191,6 +191,7 @@ extern void ext4_xattr_inode_array_free(struct ext4_xattr_inode_array *array);extern int ext4_expand_extra_isize_ea (struct inode *inode,int new_extra_isize,struct ext4_inode *raw_inode,handle_t *handle); +extern void ext4_evict_ea_inode (struct inode *inode);extern const struct xattr_handler *ext4_xattr_handlers[];
Signature · 1 line
2.35.1
Greg Kroah-Hartman
maintainerPATCH 1128/1157 ext4: unindent codeblock in ext4_xattr_block_set()
In reply to Greg Kroah-HartmanFrom: Jan Kara <[email protected]>
[ Upstream commit fd48e9acdf26d0cbd80051de07d4a735d05d29b2 ]
Remove unnecessary else (and thus indentation level) from a code block in ext4_xattr_block_set(). It will also make following code changes easier. No functional changes.
--- fs/ext4/xattr.c | 77 ++++++++++++++++++++++++------------------------- 1 file changed, 38 insertions(+), 39 deletions(-)
fs/ext4/xattr.c +38 -39
@@ -1850,6 +1850,8 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode,#define header (x) ((struct ext4_xattr_header *)(x))if (s->base) { +int offset = (char *)s->here - bs->bh->b_data; +BUFFER_TRACE (bs->bh,"get_write_access" ); error =ext4_journal_get_write_access (handle, sb, bs->bh,EXT4_JTR_NONE );
@@ -1882,49 +1884,46 @@ ext4_xattr_block_set(handle_t *handle, struct inode *inode,if (error) goto cleanup; goto inserted; - }else { -int offset = (char *)s->here - bs->bh->b_data; + } +unlock_buffer (bs->bh); +ea_bdebug (bs->bh,"cloning" ); + s->base =kmemdup (BHDR (bs->bh), bs->bh->b_size,GFP_NOFS ); + error = -ENOMEM ; +if (s->base ==NULL ) + goto cleanup; + s->first =ENTRY (header (s->base)+1 ); +header (s->base)->h_refcount =cpu_to_le32 (1 ); + s->here =ENTRY (s->base + offset); + s->end = s->base + bs->bh->b_size; -unlock_buffer (bs->bh); -ea_bdebug (bs->bh,"cloning" ); - s->base =kmemdup (BHDR (bs->bh), bs->bh->b_size,GFP_NOFS ); - error = -ENOMEM ; -if (s->base ==NULL ) +/* +* If existing entry points to an xattr inode, we need +* to prevent ext4_xattr_set_entry() from decrementing +* ref count on it because the reference belongs to the +* original block. In this case, make the entry look +* like it has an empty value. +*/ +if (!s->not_found && s->here->e_value_inum) { + ea_ino =le32_to_cpu (s->here->e_value_inum); + error =ext4_xattr_inode_iget (inode, ea_ino, +le32_to_cpu (s->here->e_hash), + &tmp_inode); +if (error) goto cleanup; - s->first =ENTRY (header (s->base)+1 ); -header (s->base)->h_refcount =cpu_to_le32 (1 ); - s->here =ENTRY (s->base + offset); - s->end = s->base + bs->bh->b_size; -/* -* If existing entry points to an xattr inode, we need -* to prevent ext4_xattr_set_entry() from decrementing -* ref count on it because the reference belongs to the -* original block. In this case, make the entry look -* like it has an empty value. -*/ -if (!s->not_found && s->here->e_value_inum) { - ea_ino =le32_to_cpu (s->here->e_value_inum); - error =ext4_xattr_inode_iget (inode, ea_ino, -le32_to_cpu (s->here->e_hash), - &tmp_inode); -if (error) - goto cleanup; - -if (!ext4_test_inode_state (tmp_inode, -EXT4_STATE_LUSTRE_EA_INODE )) { -/* -* Defer quota free call for previous -* inode until success is guaranteed. -*/ - old_ea_inode_quota =le32_to_cpu ( - s->here->e_value_size); - } -iput (tmp_inode); - - s->here->e_value_inum =0 ; - s->here->e_value_size =0 ; +if (!ext4_test_inode_state (tmp_inode, +EXT4_STATE_LUSTRE_EA_INODE )) { +/* +* Defer quota free call for previous +* inode until success is guaranteed. +*/ + old_ea_inode_quota =le32_to_cpu ( + s->here->e_value_size); } +iput (tmp_inode); + + s->here->e_value_inum =0 ; + s->here->e_value_size =0 ; } }else {/* Allocate a buffer where we construct the new block. */
Signature · 1 line
2.35.1