6.12.26-rc1 review
Subsystems (5)
Greg Kroah-Hartman
maintainerPATCH 1/280 module: sign with sha512 instead of sha1 by default
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thorsten Leemhuis <[email protected]>
commit f3b93547b91ad849b58eb5ab2dd070950ad7beb3 upstream.
Switch away from using sha1 for module signing by default and use the more modern sha512 instead, which is what among others Arch, Fedora, RHEL, and Ubuntu are currently using for their kernels.
Sha1 has not been considered secure against well-funded opponents since 2005[1]; since 2011 the NIST and other organizations furthermore recommended its replacement[2]. This is why OpenSSL on RHEL9, Fedora Linux 41+[3], and likely some other current and future distributions reject the creation of sha1 signatures, which leads to a build error of allmodconfig configurations:
80A20474797F0000:error:03000098:digital envelope routines:do_sigver_init:invalid digest:crypto/evp/m_sigver.c:342:
make[4]: *** [.../certs/Makefile:53: certs/signing_key.pem] Error 1
make[4]: *** Deleting file 'certs/signing_key.pem'
make[4]: *** Waiting for unfinished jobs....
make[3]: *** [.../scripts/Makefile.build:478: certs] Error 2
make[2]: *** [.../Makefile:1936: .] Error 2
make[1]: *** [.../Makefile:224: __sub-make] Error 2
make[1]: Leaving directory '...'
make: *** [Makefile:224: __sub-make] Error 2
This change makes allmodconfig work again and sets a default that is more appropriate for current and future users, too.
--- kernel/module/Kconfig | 1 + 1 file changed, 1 insertion(+)
kernel/module/Kconfig +1 -0
@@ -231,6 +231,7 @@ comment "Do not forget to sign required choice prompt "Hash algorithm to sign modules" depends on MODULE_SIG || IMA_APPRAISE_MODSIG + default MODULE_SIG_SHA512 help This determines which sort of hashing algorithm will be used during signature generation. This algorithm _must_ be built into the kernel
Greg Kroah-Hartman
maintainerPATCH 2/280 tracing: Add __print_dynamic_array() helper
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt <[email protected]>
[ Upstream commit e52750fb1458ae9ea5860a08ed7a149185bc5b97 ]
When printing a dynamic array in a trace event, the method is rather ugly. It has the format of:
__print_array(__get_dynamic_array(array),
__get_dynmaic_array_len(array) / el_size, el_size)
Since dynamic arrays are known to the tracing infrastructure, create a helper macro that does the above for you.
__print_dynamic_array(array, el_size)
Which would expand to the same output.
Stable-dep-of: ea8d7647f9dd ("tracing: Verify event formats that have "%*p.."")
--- include/trace/stages/stage3_trace_output.h | 8 ++++++++ include/trace/stages/stage7_class_define.h | 1 + samples/trace_events/trace-events-sample.h | 7 ++++++- 3 files changed, 15 insertions(+), 1 deletion(-)
include/trace/stages/stage3_trace_output.h +8 -0
@@ -119,6 +119,14 @@trace_print_array_seq (p, array, count, el_size); \ }) +#undef __print_dynamic_array +#define __print_dynamic_array (array, el_size) \ + ({ \ + __print_array(__get_dynamic_array(array), \ + __get_dynamic_array_len(array) / (el_size), \ + (el_size)); \ + }) +#undef __print_hex_dump#define __print_hex_dump (prefix_str, prefix_type, \ rowsize, groupsize, buf, len, ascii) \
include/trace/stages/stage7_class_define.h +1 -0
@@ -22,6 +22,7 @@#undef __get_rel_cpumask#undef __get_rel_sockaddr#undef __print_array +#undef __print_dynamic_array#undef __print_hex_dump#undef __get_buf
samples/trace_events/trace-events-sample.h +6 -1
@@ -319,7 +319,7 @@ TRACE_EVENT(foo_bar,__assign_cpumask (cpum,cpumask_bits (mask)); ), - TP_printk("foo %s %d %s %s %s %s %s (%s) (%s) %s", __entry->foo, __entry->bar, + TP_printk("foo %s %d %s %s %s %s %s %s (%s) (%s) %s", __entry->foo, __entry->bar,/* * Notice here the use of some helper functions. This includes:
@@ -363,6 +363,11 @@ TRACE_EVENT(foo_bar,__print_array (__get_dynamic_array (list),__get_dynamic_array_len (list) /sizeof (int ),sizeof (int )), + +/* A shortcut is to use __print_dynamic_array for dynamic arrays */ + +__print_dynamic_array (list,sizeof (int )), +__get_str (str),__get_str (lstr),__get_bitmask (cpus),__get_cpumask (cpum), __get_str(vstr))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 3/280 tracing: Verify event formats that have "%*p.."
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Steven Rostedt <[email protected]>
[ Upstream commit ea8d7647f9ddf1f81e2027ed305299797299aa03 ]
The trace event verifier checks the formats of trace events to make sure that they do not point at memory that is not in the trace event itself or in data that will never be freed. If an event references data that was allocated when the event triggered and that same data is freed before the event is read, then the kernel can crash by reading freed memory.
The verifier runs at boot up (or module load) and scans the print formats of the events and checks their arguments to make sure that dereferenced pointers are safe. If the format uses "%*p.." the verifier will ignore it, and that could be dangerous. Cover this case as well.
Also add to the sample code a use case of "%*pbl".
--- kernel/trace/trace_events.c | 7 +++++++ samples/trace_events/trace-events-sample.h | 8 ++++++-- 2 files changed, 13 insertions(+), 2 deletions(-)
kernel/trace/trace_events.c +7 -0
@@ -470,6 +470,7 @@ static void test_event_printk(struct trace_event_call *call)case '%' :continue ;case 'p' : + do_pointer:/* Find dereferencing fields */ switch (fmt[i +1 ]) {case 'B' :case 'R' :case 'r' :
@@ -498,6 +499,12 @@ static void test_event_printk(struct trace_event_call *call)continue ;if (fmt[i + j] =='*' ) { star = true; +/* Handle %*pbl case */ +if (!j && fmt[i +1 ] =='p' ) { + arg++; + i++; + goto do_pointer; + }continue ; }if ((fmt[i + j] =='s' )) {
samples/trace_events/trace-events-sample.h +6 -2
@@ -319,7 +319,8 @@ TRACE_EVENT(foo_bar,__assign_cpumask (cpum,cpumask_bits (mask)); ), - TP_printk("foo %s %d %s %s %s %s %s %s (%s) (%s) %s", __entry->foo, __entry->bar, + TP_printk("foo %s %d %s %s %s %s %s %s (%s) (%s) %s [%d] %*pbl", + __entry->foo, __entry->bar,/* * Notice here the use of some helper functions. This includes:
@@ -370,7 +371,10 @@ TRACE_EVENT(foo_bar,__get_str (str),__get_str (lstr),__get_bitmask (cpus),__get_cpumask (cpum), - __get_str(vstr)) +__get_str (vstr), +__get_dynamic_array_len (cpus), +__get_dynamic_array_len (cpus), + __get_dynamic_array(cpus)) );/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 4/280 mm/vmscan: dont try to reclaim hwpoison folio
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jinjiang Tu <[email protected]>
[ Upstream commit 1b0449544c6482179ac84530b61fc192a6527bfd ]
Syzkaller reports a bug as follows:
Injecting memory failure for pfn 0x18b00e at process virtual address 0x20ffd000 Memory failure: 0x18b00e: dirty swapcache page still referenced by 2 users Memory failure: 0x18b00e: recovery action for dirty swapcache page: Failed
page: refcount:2 mapcount:0 mapping:0000000000000000 index:0x20ffd pfn:0x18b00e memcg:ffff0000dd6d9000 anon flags: 0x5ffffe00482011(locked|dirty|arch_1|swapbacked|hwpoison|node=0|zone=2|lastcpupid=0xfffff) raw: 005ffffe00482011 dead000000000100 dead000000000122 ffff0000e232a7c9 raw: 0000000000020ffd 0000000000000000 00000002ffffffff ffff0000dd6d9000 page dumped because: VM_BUG_ON_FOLIO(!folio_test_uptodate(folio)) ------------[ cut here ]------------ kernel BUG at mm/swap_state.c:184! Internal error: Oops - BUG: 00000000f2000800 [#1] SMP Modules linked in: CPU: 0 PID: 60 Comm: kswapd0 Not tainted 6.6.0-gcb097e7de84e #3 Hardware name: linux,dummy-virt (DT) pstate: 80400005 (Nzcv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) pc : add_to_swap+0xbc/0x158 lr : add_to_swap+0xbc/0x158
sp : ffff800087f37340
x29: ffff800087f37340 x28: fffffc00052c0380 x27: ffff800087f37780
x26: ffff800087f37490 x25: ffff800087f37c78 x24: ffff800087f377a0
x23: ffff800087f37c50 x22: 0000000000000000 x21: fffffc00052c03b4
x20: 0000000000000000 x19: fffffc00052c0380 x18: 0000000000000000
x17: 296f696c6f662865 x16: 7461646f7470755f x15: 747365745f6f696c
x14: 6f6621284f494c4f x13: 0000000000000001 x12: ffff600036d8b97b
x11: 1fffe00036d8b97a x10: ffff600036d8b97a x9 : dfff800000000000 x8 : 00009fffc9274686 x7 : ffff0001b6c5cbd3 x6 : 0000000000000001 x5 : ffff0000c25896c0 x4 : 0000000000000000 x3 : 0000000000000000 x2 : 0000000000000000 x1 : ffff0000c25896c0 x0 : 0000000000000000
Call trace: add_to_swap+0xbc/0x158 shrink_folio_list+0x12ac/0x2648 shrink_inactive_list+0x318/0x948 shrink_lruvec+0x450/0x720 shrink_node_memcgs+0x280/0x4a8 shrink_node+0x128/0x978 balance_pgdat+0x4f0/0xb20 kswapd+0x228/0x438 kthread+0x214/0x230 ret_from_fork+0x10/0x20
I can reproduce this issue with the following steps:
1) When a dirty swapcache page is isolated by reclaim process and the page isn't locked, inject memory failure for the page. me_swapcache_dirty() clears uptodate flag and tries to delete from lru, but fails. Reclaim process will put the hwpoisoned page back to lru.
2) The process that maps the hwpoisoned page exits, the page is deleted the page will never be freed and will be in the lru forever.
3) If we trigger a reclaim again and tries to reclaim the page, add_to_swap() will trigger VM_BUG_ON_FOLIO due to the uptodate flag is cleared.
To fix it, skip the hwpoisoned page in shrink_folio_list(). Besides, the hwpoison folio may not be unmapped by hwpoison_user_mappings() yet, unmap it in shrink_folio_list(), otherwise the folio will fail to be unmaped by hwpoison_user_mappings() since the folio isn't in lru list.
--- mm/vmscan.c | 7 +++++++ 1 file changed, 7 insertions(+)
mm/vmscan.c +7 -0
@@ -1079,6 +1079,13 @@ static unsigned int shrink_folio_list(struct list_head *folio_list,if (!folio_trylock (folio)) goto keep; +if (folio_contain_hwpoisoned_page (folio)) { +unmap_poisoned_folio (folio,folio_pfn (folio), false); +folio_unlock (folio); +folio_put (folio); +continue ; + } +VM_BUG_ON_FOLIO (folio_test_active (folio), folio); nr_pages =folio_nr_pages (folio);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 5/280 soc: qcom: ice: introduce devm_of_qcom_ice_get
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tudor Ambarus <[email protected]>
[ Upstream commit 1c13d6060d612601a61423f2e8fbf9e48126acca ]
Callers of of_qcom_ice_get() leak the device reference taken by of_find_device_by_node(). Introduce devm variant for of_qcom_ice_get(). Existing consumers need the ICE instance for the entire life of their device, thus exporting qcom_ice_put() is not required.
Stable-dep-of: cbef7442fba5 ("mmc: sdhci-msm: fix dev reference leaked through of_qcom_ice_get")
--- drivers/soc/qcom/ice.c | 48 ++++++++++++++++++++++++++++++++++++++++++ include/soc/qcom/ice.h | 2 ++ 2 files changed, 50 insertions(+)
drivers/soc/qcom/ice.c +48 -0
@@ -11,6 +11,7 @@#include <linux/cleanup.h> #include <linux/clk.h> #include <linux/delay.h> +#include <linux/device.h> #include <linux/iopoll.h> #include <linux/of.h> #include <linux/of_platform.h>
@@ -324,6 +325,53 @@ struct qcom_ice *of_qcom_ice_get(struct device *dev) }EXPORT_SYMBOL_GPL (of_qcom_ice_get); +static void qcom_ice_put (const struct qcom_ice *ice) +{ +struct platform_device *pdev =to_platform_device (ice->dev); + +if (!platform_get_resource_byname (pdev,IORESOURCE_MEM ,"ice" )) +platform_device_put (pdev); +} + +static void devm_of_qcom_ice_put (struct device *dev,void *res) +{ +qcom_ice_put (*(struct qcom_ice **)res); +} + +/** +* devm_of_qcom_ice_get() - Devres managed helper to get an ICE instance from +* a DT node. +* @dev: device pointer for the consumer device. +* +* This function will provide an ICE instance either by creating one for the +* consumer device if its DT node provides the 'ice' reg range and the 'ice' +* clock (for legacy DT style). On the other hand, if consumer provides a +* phandle via 'qcom,ice' property to an ICE DT, the ICE instance will already +* be created and so this function will return that instead. +* +* Return: ICE pointer on success, NULL if there is no ICE data provided by the +* consumer or ERR_PTR() on error. +*/ +struct qcom_ice *devm_of_qcom_ice_get (struct device *dev) +{ +struct qcom_ice *ice, **dr; + + dr =devres_alloc (devm_of_qcom_ice_put,sizeof (*dr),GFP_KERNEL ); +if (!dr) +return ERR_PTR (-ENOMEM ); + + ice =of_qcom_ice_get (dev); +if (!IS_ERR_OR_NULL (ice)) { + *dr = ice; +devres_add (dev, dr); + }else { +devres_free (dr); + } + +return ice; +} +EXPORT_SYMBOL_GPL (devm_of_qcom_ice_get); +static int qcom_ice_probe (struct platform_device *pdev) {struct qcom_ice *engine;
include/soc/qcom/ice.h +2 -0
@@ -34,4 +34,6 @@ int qcom_ice_program_key(struct qcom_ice *ice, int slot);int qcom_ice_evict_key (struct qcom_ice *ice,int slot);struct qcom_ice *of_qcom_ice_get (struct device *dev); +struct qcom_ice *devm_of_qcom_ice_get (struct device *dev); +#endif /* __QCOM_ICE_H__ */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainercover 6.12.26-rc1 review
This is the start of the stable review cycle for the 6.12.26 release. There are 280 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Thu, 01 May 2025 16:10:15 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.12.26-rc1.gz
or in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.git linux-6.12.y
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 6.12.26-rc1
Christoph Hellwig <[email protected]>
mq-deadline: don't call req_get_ioprio from the I/O completion handler
Keerthy <[email protected]>
arm64: dts: ti: k3-j784s4-j742s2-main-common: Correct the GICD size
Herbert Xu <[email protected]>
crypto: Kconfig - Select LIB generic option
Dan Carpenter <[email protected]>
usb: typec: class: Unlocked on error in typec_register_partner()
Josh Poimboeuf <[email protected]>
objtool: Silence more KCOV warnings, part 2
Josh Poimboeuf <[email protected]>
objtool: Ignore end-of-section jumps for KCOV/GCOV
Michal Pecio <[email protected]>
usb: xhci: Fix Short Packet handling rework ignoring errors
Hannes Reinecke <[email protected]>
nvme: fixup scan failure for non-ANA multipath controllers
Thomas Bogendoerfer <[email protected]>
MIPS: cm: Fix warning if MIPS_CM is disabled
Dan Carpenter <[email protected]>
media: i2c: imx214: Fix uninitialized variable in imx214_set_ctrl()
Herbert Xu <[email protected]>
crypto: lib/Kconfig - Hide arch options from user
Robin Murphy <[email protected]>
iommu: Handle race with default domain setup
Marek Behún <[email protected]>
net: dsa: mv88e6xxx: enable STU methods for 6320 family
Marek Behún <[email protected]>
net: dsa: mv88e6xxx: enable .port_set_policy() for 6320 family
Marek Behún <[email protected]>
net: dsa: mv88e6xxx: enable PVT for 6321 switch
Marek Behún <[email protected]>
net: dsa: mv88e6xxx: fix atu_move_port_mask for 6341 family
Marek Behún <[email protected]>
Revert "net: dsa: mv88e6xxx: fix internal PHYs for 6320 family"
Andrei Kuchynski <[email protected]>
usb: typec: class: Invalidate USB device pointers on partner unregistration
Baokun Li <[email protected]>
ext4: goto right label 'out_mmap_sem' in ext4_setattr()
Ian Abbott <[email protected]>
comedi: jr3_pci: Fix synchronous deletion of timer
Daniel Borkmann <[email protected]>
vmxnet3: Fix malformed packet sizing in vmxnet3_process_xdp
Andrei Kuchynski <[email protected]>
usb: typec: class: Fix NULL pointer access
Shigeru Yoshida <[email protected]>
selftests/bpf: Adjust data size to have ETH_HLEN
Alexis Lothoré (eBPF Foundation) <[email protected]>
selftests/bpf: check program redirect in xdp_cpumap_attach
Alexis Lothoré (eBPF Foundation) <[email protected]>
selftests/bpf: make xdp_cpumap_attach keep redirect prog attached
Alexis Lothoré (eBPF Foundation) <[email protected]>
selftests/bpf: fix bpf_map_redirect call for cpu map test
Christoph Hellwig <[email protected]>
xfs: flush inodegc before swapon
Christoph Hellwig <[email protected]>
xfs: rename xfs_iomap_swapfile_activate to xfs_vm_swap_activate
Carlos Maiolino <[email protected]>
xfs: Do not allow norecovery mount with quotacheck
Lukas Herbolt <[email protected]>
xfs: do not check NEEDSREPAIR if ro,norecovery mount.
Dmitry Torokhov <[email protected]>
driver core: fix potential NULL pointer dereference in dev_uevent()
Dmitry Torokhov <[email protected]>
driver core: introduce device_set_driver() helper
Dmitry Torokhov <[email protected]>
Revert "drivers: core: synchronize really_probe() and dev_uevent()"
Tamura Dai <[email protected]>
spi: spi-imx: Add check for spi_imx_setupxfer()
Lijo Lazar <[email protected]>
drm/amdgpu: Use the right function for hdp flush
Christian König <[email protected]>
drm/amdgpu: use a dummy owner for sysfs triggered cleaner shaders v4
Meir Elisha <[email protected]>
md/raid1: Add check for missing source disk in process_checks()
Pi Xiange <[email protected]>
x86/cpu: Add CPU model number for Bartlett Lake CPUs with Raptor Cove cores
Mostafa Saleh <[email protected]>
ubsan: Fix panic from test_ubsan_out_of_bounds
Breno Leitao <[email protected]>
spi: tegra210-quad: add rate limiting and simplify timeout error message
Breno Leitao <[email protected]>
spi: tegra210-quad: use WARN_ON_ONCE instead of WARN_ON for timeouts
Namjae Jeon <[email protected]>
ksmbd: fix WARNING "do not call blocking ops when !TASK_RUNNING"
Andrew Jones <[email protected]>
riscv: Provide all alternative macros all the time
Gou Hao <[email protected]>
iomap: skip unnecessary ifs_block_is_uptodate check
Song Liu <[email protected]>
netfs: Only create /proc/fs/netfs with CONFIG_PROC_FS
Fernando Fernandez Mancera <[email protected]>
x86/i8253: Call clockevent_i8253_disable() with interrupts disabled
Shengjiu Wang <[email protected]>
ASoC: fsl_asrc_dma: get codec or cpu dai from backend
Igor Pylypiv <[email protected]>
scsi: pm80xx: Set phy_attached to zero when device is gone
Peter Griffin <[email protected]>
scsi: ufs: exynos: gs101: Put UFS device in reset on .suspend()
Peter Griffin <[email protected]>
scsi: ufs: exynos: Move phy calls to .exit() callback
Peter Griffin <[email protected]>
scsi: ufs: exynos: Enable PRDT pre-fetching with UFSHCD_CAP_CRYPTO
Peter Griffin <[email protected]>
scsi: ufs: exynos: Ensure pre_link() executes before exynos_ufs_phy_init()
Xingui Yang <[email protected]>
scsi: hisi_sas: Fix I/O errors caused by hardware port ID changes
Ojaswin Mujoo <[email protected]>
ext4: make block validity check resistent to sb bh corruption
Robin Murphy <[email protected]>
iommu: Clear iommu-dma ops on cleanup
Pali Rohár <[email protected]>
cifs: Fix querying of WSL CHR and BLK reparse points over SMB1
Sebastian Andrzej Siewior <[email protected]>
timekeeping: Add a lockdep override in tick_freeze()
Pali Rohár <[email protected]>
cifs: Fix encoding of SMB1 Session Setup Kerberos Request in non-UNICODE mode
Daniel Wagner <[email protected]>
nvmet-fc: put ref when assoc->del_work is already scheduled
Daniel Wagner <[email protected]>
nvmet-fc: take tgtport reference only once
Josh Poimboeuf <[email protected]>
x86/bugs: Don't fill RSB on context switch with eIBRS
Josh Poimboeuf <[email protected]>
x86/bugs: Don't fill RSB on VMEXIT with eIBRS+retpoline
Josh Poimboeuf <[email protected]>
x86/bugs: Use SBPB in write_ibpb() if applicable
Qiuxu Zhuo <[email protected]>
selftests/mincore: Allow read-ahead pages to reach the end of the file
Roger Pau Monne <[email protected]>
x86/xen: disable CPU idle and frequency drivers for PVH dom0
Andy Shevchenko <[email protected]>
gpiolib: of: Move Atmel HSMCI quirk up out of the regulator comment
Josh Poimboeuf <[email protected]>
objtool: Stop UNRET validation on UD2
Uday Shankar <[email protected]>
nvme: multipath: fix return value of nvme_available_path
Hannes Reinecke <[email protected]>
nvme: re-read ANA log page after ns scan completes
Julia Filipchuk <[email protected]>
drm/xe/xe3lpg: Apply Wa_14022293748, Wa_22019794406
Jay Cornwall <[email protected]>
drm/amdgpu: Increase KIQ invalidate_tlbs timeout
Jean-Marc Eurin <[email protected]>
ACPI PPTT: Fix coding mistakes in a couple of sizeof() calls
Mario Limonciello <[email protected]>
ACPI: EC: Set ec_no_wakeup for Lenovo Go S
Hannes Reinecke <[email protected]>
nvme: requeue namespace scan on missed AENs
Jason Andryuk <[email protected]>
xen: Change xen-acpi-processor dom0 dependency
Gabriel Shahrouzi <[email protected]>
perf/core: Fix WARN_ON(!ctx) in __free_event() for partial init
Ming Lei <[email protected]>
selftests: ublk: fix test_stripe_04
Waiman Long <[email protected]>
cgroup/cpuset: Don't allow creation of local partition over a remote one
Thomas Weißschuh <[email protected]>
KVM: s390: Don't use %pK through debug printing
Thomas Weißschuh <[email protected]>
KVM: s390: Don't use %pK through tracepoints
Oleg Nesterov <[email protected]>
sched/isolation: Make CONFIG_CPU_ISOLATION depend on CONFIG_SMP
Xi Ruoyao <[email protected]>
kbuild: add dependency from vmlinux to sorttable
Pavel Begunkov <[email protected]>
io_uring: always do atomic put from iowq
Lukas Stockmann <[email protected]>
rtc: pcf85063: do a SW reset if POR failed
Ignacio Encinas <[email protected]>
9p/trans_fd: mark concurrent read and writes to p9_conn->err
Dominique Martinet <[email protected]>
9p/net: fix improper handling of bogus negative read/write replies
Basavaraj Natikar <[email protected]>
ntb_hw_amd: Add NTB PCI ID for new gen CPU
Arnd Bergmann <[email protected]>
ntb: reduce stack usage in idt_scan_mws
Al Viro <[email protected]>
qibfs: fix _another_ leak
Josh Poimboeuf <[email protected]>
objtool, lkdtm: Obfuscate the do_nothing() pointer
Josh Poimboeuf <[email protected]>
objtool, regulator: rk808: Remove potential undefined behavior in rk806_set_mode_dcdc()
Josh Poimboeuf <[email protected]>
objtool, ASoC: codecs: wcd934x: Remove potential undefined behavior in wcd934x_slim_irq_handler()
Josh Poimboeuf <[email protected]>
objtool, panic: Disable SMAP in __stack_chk_fail()
Josh Poimboeuf <[email protected]>
objtool: Silence more KCOV warnings
Benjamin Berg <[email protected]>
um: work around sched_yield not yielding in time-travel mode
Mika Westerberg <[email protected]>
thunderbolt: Scan retimers after device router has been enumerated
Théo Lebrun <[email protected]>
usb: host: xhci-plat: mvebu: use ->quirks instead of ->init_quirk() func
Chenyuan Yang <[email protected]>
usb: gadget: aspeed: Add NULL pointer check in ast_vhub_init_dev()
Andy Yan <[email protected]>
phy: rockchip: usbdp: Avoid call hpd_event_trigger in dp_phy_init
Michal Pecio <[email protected]>
usb: xhci: Avoid Stop Endpoint retry loop if the endpoint seems Running
Vinicius Costa Gomes <[email protected]>
dmaengine: dmatest: Fix dmatest waiting less when interrupted
Stanley Chu <[email protected]>
i3c: master: svc: Add support for Nuvoton npcm845 i3c
Mathias Nyman <[email protected]>
xhci: Handle spurious events on Etron host isoc enpoints
Michal Pecio <[email protected]>
usb: xhci: Fix isochronous Ring Underrun/Overrun event handling
Michal Pecio <[email protected]>
usb: xhci: Complete 'error mid TD' transfers when handling Missed Service
John Stultz <[email protected]>
sound/virtio: Fix cancel_sync warnings on uninitialized work_structs
Andy Shevchenko <[email protected]>
usb: dwc3: gadget: Avoid using reserved endpoints on Intel Merrifield
Andy Shevchenko <[email protected]>
usb: dwc3: gadget: Refactor loop to avoid NULL endpoints
Edward Adam Davis <[email protected]>
fs/ntfs3: Fix WARNING in ntfs_extend_initialized_size
Lizhi Xu <[email protected]>
fs/ntfs3: Keep write operations atomic
Alexander Stein <[email protected]>
usb: host: max3421-hcd: Add missing spi_device_id table
Sudeep Holla <[email protected]>
mailbox: pcc: Always clear the platform ack interrupt first
Huisong Li <[email protected]>
mailbox: pcc: Fix the possible race in updation of chan_in_use flag
Yafang Shao <[email protected]>
bpf: Reject attaching fexit/fmod_ret to __noreturn functions
Martin KaFai Lau <[email protected]>
bpf: Only fails the busy counter check in bpf_cgrp_storage_get if it creates storage
Sewon Nam <[email protected]>
bpf: bpftool: Setting error code in do_loader()
Haoxiang Li <[email protected]>
s390/tty: Fix a potential memory leak bug
Haoxiang Li <[email protected]>
s390/sclp: Add check for get_zeroed_page()
Yu-Chun Lin <[email protected]>
parisc: PDT: Fix missing prototype warning
Heiko Stuebner <[email protected]>
clk: check for disabled clock-provider in of_clk_get_hw_from_clkspec()
Alexei Starovoitov <[email protected]>
bpf: Fix deadlock between rcu_tasks_trace and event_mutex.
Yonghong Song <[email protected]>
bpf: Fix kmemleak warning for percpu hashmap
Herbert Xu <[email protected]>
crypto: null - Use spin lock instead of mutex
Herbert Xu <[email protected]>
crypto: lib/Kconfig - Fix lib built-in failure when arch is modular
Devaraj Rangasamy <[email protected]>
crypto: ccp - Add support for PCI device 0x1134
Gregory CLEMENT <[email protected]>
MIPS: cm: Detect CM quirks from device tree
Dmitry Mastykin <[email protected]>
pinctrl: mcp23s08: Get rid of spurious level interrupts
Chenyuan Yang <[email protected]>
pinctrl: renesas: rza2: Fix potential NULL pointer dereference
Amery Hung <[email protected]>
selftests/bpf: Fix stdout race condition in traffic monitor
Oliver Neukum <[email protected]>
USB: wdm: add annotation
Oliver Neukum <[email protected]>
USB: wdm: wdm_wwan_port_tx_complete mutex in atomic context
Oliver Neukum <[email protected]>
USB: wdm: close race between wdm_open and wdm_wwan_port_stop
Oliver Neukum <[email protected]>
USB: wdm: handle IO errors in wdm_wwan_port_start
Oliver Neukum <[email protected]>
USB: VLI disk crashes if LPM is used
Miao Li <[email protected]>
usb: quirks: Add delay init quirk for SanDisk 3.2Gen1 Flash Drive
Miao Li <[email protected]>
usb: quirks: add DELAY_INIT quirk for Silicon Motion Flash Drive
Mike Looijmans <[email protected]>
usb: dwc3: xilinx: Prevent spike in reset signal
Frode Isaksen <[email protected]>
usb: dwc3: gadget: check that event count does not exceed event buffer length
Huacai Chen <[email protected]>
USB: OHCI: Add quirk for LS7A OHCI controller (rev 0x02)
Fedor Pchelkin <[email protected]>
usb: chipidea: ci_hdrc_imx: implement usb_phy_init() error handling
Fedor Pchelkin <[email protected]>
usb: chipidea: ci_hdrc_imx: fix call balance of regulator routines
Fedor Pchelkin <[email protected]>
usb: chipidea: ci_hdrc_imx: fix usbmisc handling
Ralph Siemsen <[email protected]>
usb: cdns3: Fix deadlock when using NCM gadget
Michal Pecio <[email protected]>
usb: xhci: Fix invalid pointer dereference in Etron workaround
Mathias Nyman <[email protected]>
xhci: Limit time spent with xHC interrupts disabled during bus resume
Craig Hesling <[email protected]>
USB: serial: simple: add OWON HDS200 series oscilloscope support
Adam Xue <[email protected]>
USB: serial: option: add Sierra Wireless EM9291
Michael Ehrenreich <[email protected]>
USB: serial: ftdi_sio: add support for Abacus Electrics Optical Probe
Ryo Takakura <[email protected]>
serial: sifive: lock port in startup()/shutdown() callbacks
Stephan Gerhold <[email protected]>
serial: msm: Configure correct working mode before starting earlycon
Günther Noack <[email protected]>
tty: Require CAP_SYS_ADMIN for all usages of TIOCL_SELMOUSEREPORT
Mahesh Rao <[email protected]>
firmware: stratix10-svc: Add of_platform_default_populate()
Rengarajan S <[email protected]>
misc: microchip: pci1xxxx: Fix incorrect IRQ status handling during ack
Rengarajan S <[email protected]>
misc: microchip: pci1xxxx: Fix Kernel panic during IRQ handler registration
Thadeu Lima de Souza Cascardo <[email protected]>
char: misc: register chrdev region with all possible minors
Sean Christopherson <[email protected]>
KVM: x86: Take irqfds.lock when adding/deleting IRQ bypass producer
Sean Christopherson <[email protected]>
KVM: x86: Reset IRTE to host control if *new* route isn't postable
Sean Christopherson <[email protected]>
KVM: x86: Explicitly treat routing entry type changes as changes
Hans de Goede <[email protected]>
mei: vsc: Fix fortify-panic caused by invalid counted_by() use
Alexander Usyskin <[email protected]>
mei: me: add panther lake H DID
Damien Le Moal <[email protected]>
scsi: Improve CDL control
Oliver Neukum <[email protected]>
USB: storage: quirk for ADATA Portable HDD CH94
Damien Le Moal <[email protected]>
ata: libata-scsi: Fix ata_msense_control_ata_feature()
Damien Le Moal <[email protected]>
ata: libata-scsi: Fix ata_mselect_control_ata_feature() return type
Damien Le Moal <[email protected]>
ata: libata-scsi: Improve CDL control
Haoxiang Li <[email protected]>
mcb: fix a double free bug in chameleon_parse_gdd()
Smita Koralahalli <[email protected]>
cxl/core/regs.c: Skip Memory Space Enable check for RCD and RCH Ports
Sean Christopherson <[email protected]>
KVM: SVM: Allocate IR data using atomic allocation
Jens Axboe <[email protected]>
io_uring: fix 'sync' handling of io_fallback_tw()
Bibo Mao <[email protected]>
LoongArch: KVM: Fix PMU pass-through issue if VM exits to host finally
Bibo Mao <[email protected]>
LoongArch: KVM: Fully clear some CSRs when VM reboot
Petr Tesarik <[email protected]>
LoongArch: Remove a bogus reference to ZONE_DMA
Ming Wang <[email protected]>
LoongArch: Return NULL from huge_pte_offset() for invalid PMD
Tiezhu Yang <[email protected]>
LoongArch: Handle fp, lsx, lasx and lbt assembly symbols
Suzuki K Poulose <[email protected]>
irqchip/gic-v2m: Prevent use after free of gicv2m_get_fwnode()
Kirill A. Shutemov <[email protected]>
x86/insn: Fix CTEST instruction decoding
Roman Li <[email protected]>
drm/amd/display: Force full update in gpu reset
Roman Li <[email protected]>
drm/amd/display: Fix gpu reset in multidisplay config
Hugo Villeneuve <[email protected]>
drm: panel: jd9365da: fix reset signal polarity in unprepare
Christian Schrefl <[email protected]>
rust: firmware: Use ffi::c_char type in FwFunc
Ranjan Kumar <[email protected]>
scsi: mpi3mr: Fix pending I/O counter
Fiona Klute <[email protected]>
net: phy: microchip: force IRQ polling mode for lan88xx
Oleksij Rempel <[email protected]>
net: selftests: initialize TCP header and skb payload with zero
Alexey Nepomnyashih <[email protected]>
xen-netfront: handle NULL returned by xdp_convert_buff_to_frame()
Marek Behún <[email protected]>
crypto: atmel-sha204a - Set hwrng quality to lowest possible
Breno Leitao <[email protected]>
sched_ext: Use kvzalloc for large exit_dump allocation
Halil Pasic <[email protected]>
virtio_console: fix missing byte order handling for cols and rows
Florian Westphal <[email protected]>
netfilter: fib: avoid lookup if socket is available
Suravee Suthikulpanit <[email protected]>
KVM: SVM: Disable AVIC on SNP-enabled system without HvInUseWrAllowed feature
Tiezhu Yang <[email protected]>
LoongArch: Make do_xyz() exception handlers more robust
Tiezhu Yang <[email protected]>
LoongArch: Make regs_irqs_disabled() more clear
Yuli Wang <[email protected]>
LoongArch: Select ARCH_USE_MEMTEST
Luo Gengkun <[email protected]>
perf/x86: Fix non-sampling (counting) events on certain x86 platforms
Alexei Starovoitov <[email protected]>
bpf: Add namespace to BPF internal symbols
T.J. Mercier <[email protected]>
splice: remove duplicate noinline from pipe_clear_nowait
Björn Töpel <[email protected]>
riscv: uprobes: Add missing fence.i after building the XOL buffer
Björn Töpel <[email protected]>
riscv: Replace function-like macro by static inline function
Sean Christopherson <[email protected]>
iommu/amd: Return an error if vCPU affinity is set for non-vCPU IRTE
Christoph Hellwig <[email protected]>
block: never reduce ra_pages in blk_apply_bdi_limits
Shannon Nelson <[email protected]>
pds_core: make wait_context part of q_info
Brett Creeley <[email protected]>
pds_core: Remove unnecessary check in pds_client_adminq_cmd()
Brett Creeley <[email protected]>
pds_core: handle unsupported PDS_CORE_CMD_FW_CONTROL result
Brett Creeley <[email protected]>
pds_core: Prevent possible adminq overflow/stuck condition
Daniel Golle <[email protected]>
net: dsa: mt7530: sync driver-specific behavior of MT7531 variants
Cong Wang <[email protected]>
net_sched: hfsc: Fix a potential UAF in hfsc_dequeue() too
Cong Wang <[email protected]>
net_sched: hfsc: Fix a UAF vulnerability in class handling
Al Viro <[email protected]>
fix a couple of races in MNT_TREE_BENEATH handling by do_move_mount()
Bo-Cun Chen <[email protected]>
net: ethernet: mtk_eth_soc: net: revise NETSYSv3 hardware configuration
Tung Nguyen <[email protected]>
tipc: fix NULL pointer dereference in tipc_mon_reinit_self()
Qingfang Deng <[email protected]>
net: phy: leds: fix memory leak
Justin Iurman <[email protected]>
net: lwtunnel: disable BHs when required
Chenyuan Yang <[email protected]>
scsi: ufs: core: Add NULL check in ufshcd_mcq_compl_pending_transfer()
Anastasia Kovaleva <[email protected]>
scsi: core: Clear flags for scsi_cmnd that did not complete
Henry Martin <[email protected]>
net/mlx5: Move ttc allocation after switch case to prevent leaks
Henry Martin <[email protected]>
net/mlx5: Fix null-ptr-deref in mlx5_create_{inner_,}ttc_table()
Dongli Zhang <[email protected]>
vhost-scsi: Fix vhost_scsi_send_status()
Dongli Zhang <[email protected]>
vhost-scsi: Fix vhost_scsi_send_bad_target()
Mike Christie <[email protected]>
vhost-scsi: Add better resource allocation failure handling
T.J. Mercier <[email protected]>
cgroup/cpuset-v1: Add missing support for cpuset_v2_mode
Johannes Thumshirn <[email protected]>
btrfs: zoned: return EIO on RAID1 block group write pointer mismatch
Qu Wenruo <[email protected]>
btrfs: avoid page_lockend underflow in btrfs_punch_hole_lock_range()
Johan Hovold <[email protected]>
cpufreq: fix compile-test defaults
Krzysztof Kozlowski <[email protected]>
cpufreq: Do not enable by default during compile testing
Marc Zyngier <[email protected]>
cpufreq: cppc: Fix invalid return value in .get() callback
Chenyuan Yang <[email protected]>
scsi: ufs: mcq: Add NULL check in ufshcd_mcq_abort()
Henry Martin <[email protected]>
cpufreq: scpi: Fix null-ptr-deref in scpi_cpufreq_get_rate()
Henry Martin <[email protected]>
cpufreq: scmi: Fix null-ptr-deref in scmi_cpufreq_get_rate()
Henry Martin <[email protected]>
cpufreq: apple-soc: Fix null-ptr-deref in apple_soc_cpufreq_get_rate()
Arnd Bergmann <[email protected]>
dma/contiguous: avoid warning about unused size_bytes
Andre Przywara <[email protected]>
cpufreq: sun50i: prevent out-of-bounds access
David Howells <[email protected]>
ceph: Fix incorrect flush end position calculation
Nathan Chancellor <[email protected]>
lib/Kconfig.ubsan: Remove 'default UBSAN' from UBSAN_INTEGER_WRAP
Alex Deucher <[email protected]>
drm/amd/display/dml2: use vzalloc rather than kzalloc
Rohit Chavan <[email protected]>
drm/amd/display: Fix unnecessary cast warnings from checkpatch
Matt Roper <[email protected]>
drm/xe/bmg: Add one additional PCI ID
Jonathan Currier <[email protected]>
net/niu: Niu requires MSIX ENTRY_DATA fields touch before entry reads
Peter Griffin <[email protected]>
scsi: ufs: exynos: Disable iocc if dma-coherent property isn't set
Peter Griffin <[email protected]>
scsi: ufs: exynos: Move UFS shareability value to drvdata
Peter Griffin <[email protected]>
scsi: ufs: exynos: Add gs101_ufs_drv_init() hook and enable WriteBooster
Tudor Ambarus <[email protected]>
scsi: ufs: exynos: Remove superfluous function parameter
Tudor Ambarus <[email protected]>
scsi: ufs: exynos: Remove empty drv_init method
Namjae Jeon <[email protected]>
ksmbd: fix use-after-free in __smb2_lease_break_noti()
Namjae Jeon <[email protected]>
ksmbd: browse interfaces list on FSCTL_QUERY_INTERFACE_INFO IOCTL
Namjae Jeon <[email protected]>
ksmbd: add netdev-up/down event debug print
Namjae Jeon <[email protected]>
ksmbd: use __GFP_RETRY_MAYFAIL
Andrzej Kacprowski <[email protected]>
accel/ivpu: Fix the NPU's DPU frequency calculation
Jacek Lawrynowicz <[email protected]>
accel/ivpu: Add auto selection logic for job scheduler
Jonathan Currier <[email protected]>
PCI/MSI: Add an option to write MSIX ENTRY_DATA before any reads
Thomas Gleixner <[email protected]>
PCI/MSI: Handle the NOMASK flag correctly for all PCI/MSI backends
Roger Pau Monne <[email protected]>
PCI/MSI: Convert pci_msi_ignore_mask to per MSI domain flag
Niklas Schnelle <[email protected]>
s390/pci: Support mmap() of PCI resources except for ISM devices
Niklas Schnelle <[email protected]>
s390/pci: Report PCI error recovery results via SCLP
Niklas Schnelle <[email protected]>
s390/sclp: Allow user-space to provide PCI reports for optical modules
Tudor Ambarus <[email protected]>
scsi: ufs: qcom: fix dev reference leaked through of_qcom_ice_get
Zijun Hu <[email protected]>
of: resolver: Fix device node refcount leakage in of_resolve_phandles()
Rob Herring (Arm) <[email protected]>
of: resolver: Simplify of_resolve_phandles() using __free()
Siddharth Vadapalli <[email protected]>
arm64: dts: ti: k3-j784s4-j742s2-main-common: Fix serdes_ln_ctrl reg-masks
Manorit Chawdhry <[email protected]>
arm64: dts: ti: Refactor J784s4 SoC files to a common file
Sergiu Cuciurean <[email protected]>
iio: adc: ad7768-1: Fix conversion result sign
Jonathan Cameron <[email protected]>
iio: adc: ad7768-1: Move setting of val a bit later to avoid unnecessary return value check
Marek Behún <[email protected]>
net: dsa: mv88e6xxx: fix VTU methods for 6320 family
Ming Lei <[email protected]>
block: make sure ->nr_integrity_segments is cloned in blk_rq_prep_clone
Christoph Hellwig <[email protected]>
block: remove the ioprio field from struct request
Christoph Hellwig <[email protected]>
block: remove the write_hint field from struct request
Hans de Goede <[email protected]>
media: ov08x40: Add missing ov08x40_identify_module() call on stream-start
Hans de Goede <[email protected]>
media: ov08x40: Move ov08x40_identify_module() function up
André Apitzsch <[email protected]>
media: i2c: imx214: Fix link frequency validation
André Apitzsch <[email protected]>
media: i2c: imx214: Check number of lanes from device tree
André Apitzsch <[email protected]>
media: i2c: imx214: Replace register addresses with macros
André Apitzsch <[email protected]>
media: i2c: imx214: Convert to CCI register access helpers
André Apitzsch <[email protected]>
media: i2c: imx214: Simplify with dev_err_probe()
André Apitzsch <[email protected]>
media: i2c: imx214: Use subdev active state
Rafael J. Wysocki <[email protected]>
PM: EM: Address RCU-related sparse warnings
Li RongQing <[email protected]>
PM: EM: use kfree_rcu() to simplify the code
Tudor Ambarus <[email protected]>
mmc: sdhci-msm: fix dev reference leaked through of_qcom_ice_get
Tudor Ambarus <[email protected]>
soc: qcom: ice: introduce devm_of_qcom_ice_get
Jinjiang Tu <[email protected]>
mm/vmscan: don't try to reclaim hwpoison folio
Steven Rostedt <[email protected]>
tracing: Verify event formats that have "%*p.."
Steven Rostedt <[email protected]>
tracing: Add __print_dynamic_array() helper
Thorsten Leemhuis <[email protected]>
module: sign with sha512 instead of sha1 by default
-------------
Diffstat:
Documentation/bpf/bpf_devel_QA.rst | 8 + Makefile | 4 +- arch/arm/crypto/Kconfig | 10 +- .../arm64/boot/dts/ti/k3-j784s4-j742s2-common.dtsi | 148 ++ .../boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi | 2673 +++++++++++++++++++ ...tsi => k3-j784s4-j742s2-mcu-wakeup-common.dtsi} | 2 +- ...l.dtsi => k3-j784s4-j742s2-thermal-common.dtsi} | 0 arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 2705 +------------------- arch/arm64/boot/dts/ti/k3-j784s4.dtsi | 133 +- arch/arm64/crypto/Kconfig | 6 +- arch/loongarch/Kconfig | 1 + arch/loongarch/include/asm/fpu.h | 33 +- arch/loongarch/include/asm/lbt.h | 10 +- arch/loongarch/include/asm/ptrace.h | 4 +- arch/loongarch/kernel/fpu.S | 6 + arch/loongarch/kernel/lbt.S | 4 + arch/loongarch/kernel/signal.c | 21 - arch/loongarch/kernel/traps.c | 20 +- arch/loongarch/kvm/vcpu.c | 8 + arch/loongarch/mm/hugetlbpage.c | 2 +- arch/loongarch/mm/init.c | 3 - arch/mips/crypto/Kconfig | 7 +- arch/mips/include/asm/mips-cm.h | 22 + arch/mips/kernel/mips-cm.c | 14 + arch/parisc/kernel/pdt.c | 2 + arch/powerpc/crypto/Kconfig | 7 +- arch/riscv/crypto/Kconfig | 1 - arch/riscv/include/asm/alternative-macros.h | 21 +- arch/riscv/include/asm/cacheflush.h | 15 +- arch/riscv/kernel/probes/uprobes.c | 10 +- arch/s390/Kconfig | 4 +- arch/s390/crypto/Kconfig | 3 +- arch/s390/include/asm/pci.h | 3 + arch/s390/include/asm/sclp.h | 33 + arch/s390/kvm/intercept.c | 2 +- arch/s390/kvm/interrupt.c | 8 +- arch/s390/kvm/kvm-s390.c | 10 +- arch/s390/kvm/trace-s390.h | 4 +- arch/s390/pci/Makefile | 2 +- arch/s390/pci/pci_event.c | 21 +- arch/s390/pci/pci_fixup.c | 23 + arch/s390/pci/pci_report.c | 111 + arch/s390/pci/pci_report.h | 16 + arch/um/include/linux/time-internal.h | 2 + arch/um/kernel/skas/syscall.c | 11 + arch/x86/crypto/Kconfig | 11 +- arch/x86/entry/entry.S | 2 +- arch/x86/events/core.c | 2 +- arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/include/asm/intel-family.h | 2 + arch/x86/kernel/cpu/bugs.c | 36 +- arch/x86/kernel/i8253.c | 3 +- arch/x86/kvm/svm/avic.c | 66 +- arch/x86/kvm/vmx/posted_intr.c | 28 +- arch/x86/kvm/x86.c | 20 +- arch/x86/lib/x86-opcode-map.txt | 4 +- arch/x86/mm/tlb.c | 6 +- arch/x86/pci/xen.c | 8 +- arch/x86/xen/enlighten_pvh.c | 19 +- block/blk-merge.c | 26 +- block/blk-mq.c | 6 +- block/blk-settings.c | 8 +- block/mq-deadline.c | 13 +- crypto/Kconfig | 3 + crypto/crypto_null.c | 37 +- drivers/accel/ivpu/ivpu_drv.c | 10 +- drivers/accel/ivpu/ivpu_drv.h | 2 + drivers/accel/ivpu/ivpu_fw.c | 18 +- drivers/accel/ivpu/ivpu_fw.h | 3 + drivers/accel/ivpu/ivpu_hw.h | 12 +- drivers/accel/ivpu/ivpu_hw_btrs.c | 128 +- drivers/accel/ivpu/ivpu_hw_btrs.h | 6 +- drivers/accel/ivpu/ivpu_job.c | 14 +- drivers/accel/ivpu/ivpu_sysfs.c | 24 + drivers/acpi/ec.c | 28 + drivers/acpi/pptt.c | 4 +- drivers/ata/libata-scsi.c | 25 +- drivers/base/base.h | 17 + drivers/base/bus.c | 2 +- drivers/base/core.c | 38 +- drivers/base/dd.c | 7 +- drivers/char/misc.c | 2 +- drivers/char/virtio_console.c | 7 +- drivers/clk/clk.c | 4 + drivers/comedi/drivers/jr3_pci.c | 2 +- drivers/cpufreq/Kconfig.arm | 20 +- drivers/cpufreq/apple-soc-cpufreq.c | 10 +- drivers/cpufreq/cppc_cpufreq.c | 2 +- drivers/cpufreq/scmi-cpufreq.c | 10 +- drivers/cpufreq/scpi-cpufreq.c | 13 +- drivers/cpufreq/sun50i-cpufreq-nvmem.c | 18 +- drivers/crypto/atmel-sha204a.c | 6 + drivers/crypto/ccp/sp-pci.c | 1 + drivers/cxl/core/regs.c | 4 - drivers/dma/dmatest.c | 6 +- drivers/firmware/stratix10-svc.c | 14 +- drivers/gpio/gpiolib-of.c | 6 +- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 14 +- drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 19 +- drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 8 +- drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 12 +- drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 6 +- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 4 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/psp_v14_0.c | 2 +- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 9 +- .../drm/amd/display/dc/dml2/dml21/dml21_wrapper.c | 11 +- drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c | 6 +- drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c | 4 +- drivers/gpu/drm/xe/xe_wa_oob.rules | 2 + drivers/i3c/master/svc-i3c-master.c | 17 +- drivers/iio/adc/ad7768-1.c | 5 +- drivers/infiniband/hw/qib/qib_fs.c | 1 + drivers/iommu/amd/iommu.c | 2 +- drivers/iommu/iommu.c | 8 + drivers/irqchip/irq-gic-v2m.c | 2 +- drivers/mailbox/pcc.c | 15 +- drivers/mcb/mcb-parse.c | 2 +- drivers/md/raid1.c | 26 +- drivers/media/i2c/Kconfig | 1 + drivers/media/i2c/imx214.c | 934 ++++--- drivers/media/i2c/ov08x40.c | 78 +- drivers/misc/lkdtm/perms.c | 14 +- drivers/misc/mchp_pci1xxxx/mchp_pci1xxxx_gpio.c | 8 +- drivers/misc/mei/hw-me-regs.h | 1 + drivers/misc/mei/pci-me.c | 1 + drivers/misc/mei/vsc-tp.c | 26 +- drivers/mmc/host/sdhci-msm.c | 2 +- drivers/net/dsa/mt7530.c | 6 +- drivers/net/dsa/mv88e6xxx/chip.c | 27 +- drivers/net/ethernet/amd/pds_core/adminq.c | 36 +- drivers/net/ethernet/amd/pds_core/auxbus.c | 3 - drivers/net/ethernet/amd/pds_core/core.c | 9 +- drivers/net/ethernet/amd/pds_core/core.h | 4 +- drivers/net/ethernet/amd/pds_core/devlink.c | 4 +- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 24 +- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 10 +- .../net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c | 26 +- drivers/net/ethernet/sun/niu.c | 2 + drivers/net/phy/microchip.c | 46 +- drivers/net/phy/phy_led_triggers.c | 23 +- drivers/net/vmxnet3/vmxnet3_xdp.c | 2 +- drivers/net/xen-netfront.c | 19 +- drivers/ntb/hw/amd/ntb_hw_amd.c | 1 + drivers/ntb/hw/idt/ntb_hw_idt.c | 18 +- drivers/nvme/host/core.c | 9 + drivers/nvme/host/multipath.c | 2 +- drivers/nvme/target/fc.c | 25 +- drivers/of/resolver.c | 37 +- drivers/pci/msi/msi.c | 38 +- drivers/phy/rockchip/phy-rockchip-usbdp.c | 1 - drivers/pinctrl/pinctrl-mcp23s08.c | 23 +- drivers/pinctrl/renesas/pinctrl-rza2.c | 3 + drivers/regulator/rk808-regulator.c | 4 +- drivers/rtc/rtc-pcf85063.c | 19 +- drivers/s390/char/sclp.h | 14 - drivers/s390/char/sclp_con.c | 17 + drivers/s390/char/sclp_pci.c | 19 +- drivers/s390/char/sclp_tty.c | 12 + drivers/s390/net/ism_drv.c | 1 - drivers/scsi/hisi_sas/hisi_sas_main.c | 20 + drivers/scsi/mpi3mr/mpi3mr_fw.c | 2 +- drivers/scsi/pm8001/pm8001_sas.c | 1 + drivers/scsi/scsi.c | 36 +- drivers/scsi/scsi_lib.c | 6 +- drivers/scsi/sd.c | 6 +- drivers/soc/qcom/ice.c | 48 + drivers/spi/spi-imx.c | 5 +- drivers/spi/spi-tegra210-quad.c | 6 +- drivers/thunderbolt/tb.c | 16 +- drivers/tty/serial/msm_serial.c | 6 + drivers/tty/serial/sifive.c | 6 + drivers/tty/vt/selection.c | 5 +- drivers/ufs/core/ufs-mcq.c | 12 +- drivers/ufs/core/ufshcd.c | 2 + drivers/ufs/host/ufs-exynos.c | 106 +- drivers/ufs/host/ufs-exynos.h | 8 +- drivers/ufs/host/ufs-qcom.c | 2 +- drivers/usb/cdns3/cdns3-gadget.c | 2 + drivers/usb/chipidea/ci_hdrc_imx.c | 44 +- drivers/usb/class/cdc-wdm.c | 21 +- drivers/usb/core/quirks.c | 9 + drivers/usb/dwc3/dwc3-pci.c | 10 + drivers/usb/dwc3/dwc3-xilinx.c | 4 +- drivers/usb/dwc3/gadget.c | 28 +- drivers/usb/gadget/udc/aspeed-vhub/dev.c | 3 + drivers/usb/host/max3421-hcd.c | 7 + drivers/usb/host/ohci-pci.c | 23 + drivers/usb/host/xhci-hub.c | 30 +- drivers/usb/host/xhci-mvebu.c | 10 - drivers/usb/host/xhci-mvebu.h | 6 - drivers/usb/host/xhci-plat.c | 2 +- drivers/usb/host/xhci-ring.c | 75 +- drivers/usb/host/xhci.c | 4 +- drivers/usb/host/xhci.h | 4 +- drivers/usb/serial/ftdi_sio.c | 2 + drivers/usb/serial/ftdi_sio_ids.h | 5 + drivers/usb/serial/option.c | 3 + drivers/usb/serial/usb-serial-simple.c | 7 + drivers/usb/storage/unusual_uas.h | 7 + drivers/usb/typec/class.c | 24 +- drivers/usb/typec/class.h | 1 + drivers/vhost/scsi.c | 80 +- drivers/xen/Kconfig | 2 +- fs/btrfs/file.c | 9 +- fs/btrfs/zoned.c | 1 - fs/ceph/inode.c | 2 +- fs/ext4/block_validity.c | 5 +- fs/ext4/inode.c | 9 +- fs/iomap/buffered-io.c | 2 +- fs/namespace.c | 69 +- fs/netfs/main.c | 4 + fs/ntfs3/file.c | 20 +- fs/smb/client/sess.c | 60 +- fs/smb/client/smb1ops.c | 36 + fs/smb/server/asn1.c | 6 +- fs/smb/server/auth.c | 19 +- fs/smb/server/connection.c | 8 +- fs/smb/server/crypto_ctx.c | 6 +- fs/smb/server/glob.h | 2 + fs/smb/server/ksmbd_netlink.h | 3 +- fs/smb/server/ksmbd_work.c | 10 +- fs/smb/server/mgmt/ksmbd_ida.c | 11 +- fs/smb/server/mgmt/share_config.c | 10 +- fs/smb/server/mgmt/tree_connect.c | 5 +- fs/smb/server/mgmt/user_config.c | 8 +- fs/smb/server/mgmt/user_session.c | 10 +- fs/smb/server/misc.c | 11 +- fs/smb/server/ndr.c | 10 +- fs/smb/server/oplock.c | 12 +- fs/smb/server/server.c | 4 +- fs/smb/server/server.h | 1 + fs/smb/server/smb2pdu.c | 42 +- fs/smb/server/smb_common.c | 2 +- fs/smb/server/smbacl.c | 23 +- fs/smb/server/transport_ipc.c | 7 +- fs/smb/server/transport_rdma.c | 10 +- fs/smb/server/transport_tcp.c | 93 +- fs/smb/server/transport_tcp.h | 2 + fs/smb/server/unicode.c | 4 +- fs/smb/server/vfs.c | 12 +- fs/smb/server/vfs_cache.c | 18 +- fs/splice.c | 2 +- fs/xfs/xfs_aops.c | 41 +- fs/xfs/xfs_qm_bhv.c | 49 +- fs/xfs/xfs_super.c | 8 +- include/drm/intel/i915_pciids.h | 1 + include/linux/blk-mq.h | 8 +- include/linux/energy_model.h | 12 +- include/linux/msi.h | 3 +- include/linux/pci.h | 2 + include/linux/pci_ids.h | 1 + include/net/netfilter/nft_fib.h | 21 + include/soc/qcom/ice.h | 2 + include/trace/events/block.h | 6 +- include/trace/stages/stage3_trace_output.h | 8 + include/trace/stages/stage7_class_define.h | 1 + include/uapi/drm/ivpu_accel.h | 4 +- init/Kconfig | 2 +- io_uring/io_uring.c | 15 +- io_uring/refs.h | 7 + kernel/bpf/bpf_cgrp_storage.c | 11 +- kernel/bpf/hashtab.c | 6 +- kernel/bpf/preload/bpf_preload_kern.c | 1 + kernel/bpf/syscall.c | 6 +- kernel/bpf/verifier.c | 32 + kernel/cgroup/cgroup.c | 29 + kernel/cgroup/cpuset-internal.h | 1 + kernel/cgroup/cpuset.c | 14 + kernel/dma/contiguous.c | 3 +- kernel/events/core.c | 6 +- kernel/irq/msi.c | 2 +- kernel/module/Kconfig | 1 + kernel/panic.c | 6 + kernel/power/energy_model.c | 47 +- kernel/sched/ext.c | 4 +- kernel/time/tick-common.c | 22 + kernel/trace/bpf_trace.c | 7 +- kernel/trace/trace_events.c | 7 + lib/Kconfig.ubsan | 1 - lib/crypto/Kconfig | 37 +- lib/test_ubsan.c | 18 +- mm/vmscan.c | 7 + net/9p/client.c | 30 +- net/9p/trans_fd.c | 17 +- net/core/lwtunnel.c | 26 +- net/core/selftests.c | 18 +- net/ipv4/netfilter/nft_fib_ipv4.c | 11 +- net/ipv6/netfilter/nft_fib_ipv6.c | 19 +- net/sched/sch_hfsc.c | 23 +- net/tipc/monitor.c | 3 +- rust/kernel/firmware.rs | 8 +- samples/trace_events/trace-events-sample.h | 13 +- scripts/Makefile.lib | 2 +- scripts/Makefile.vmlinux | 4 + sound/soc/codecs/wcd934x.c | 2 +- sound/soc/fsl/fsl_asrc_dma.c | 15 +- sound/virtio/virtio_pcm.c | 21 +- tools/arch/x86/lib/x86-opcode-map.txt | 4 +- tools/bpf/bpftool/prog.c | 1 + tools/objtool/check.c | 36 +- tools/testing/selftests/bpf/network_helpers.c | 33 +- .../selftests/bpf/prog_tests/xdp_cpumap_attach.c | 44 +- .../selftests/bpf/prog_tests/xdp_devmap_attach.c | 8 +- .../bpf/progs/test_xdp_with_cpumap_helpers.c | 7 +- tools/testing/selftests/mincore/mincore_selftest.c | 3 - tools/testing/selftests/ublk/test_stripe_04.sh | 24 + 312 files changed, 6080 insertions(+), 4681 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 7/280 PM: EM: use kfree_rcu() to simplify the code
6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Li RongQing <[email protected]>
[ Upstream commit 1618f635bdf56f3ac158171114e9bf18db234cbf ]
The callback function of call_rcu() just calls kfree(), so use kfree_rcu() instead of call_rcu() + callback function.
Stable-dep-of: 3ee7be9e10dd ("PM: EM: Address RCU-related sparse warnings")
--- kernel/power/energy_model.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)
kernel/power/energy_model.c +1 -9
@@ -161,14 +161,6 @@ static void em_debug_create_pd(struct device *dev) {}static void em_debug_remove_pd (struct device *dev) {}#endif -static void em_destroy_table_rcu (struct rcu_head *rp) -{ -struct em_perf_table __rcu *table; - - table = container_of(rp, struct em_perf_table, rcu); -kfree (table); -} -static void em_release_table_kref (struct kref *kref) {struct em_perf_table __rcu *table;
@@ -176,7 +168,7 @@ static void em_release_table_kref(struct kref *kref)/* It was the last owner of this table so we can free */ table = container_of(kref, struct em_perf_table, kref); -call_rcu (&table->rcu, em_destroy_table_rcu); +kfree_rcu (table, rcu); }/**
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 16/280 media: ov08x40: Add missing ov08x40_identify_module() call on stream-start
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit ebf185efadb71bd5344877be683895b6b18d7edf ]
The driver might skip the ov08x40_identify_module() on probe() based on the acpi_dev_state_d0() check done in probe().
If the ov08x40_identify_module() call is skipped on probe() it should be done on the first stream start. Add the missing call.
Note ov08x40_identify_module() will only do something on its first call, subsequent calls are no-ops.
--- drivers/media/i2c/ov08x40.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/media/i2c/ov08x40.c +4 -0
@@ -1908,6 +1908,10 @@ static int ov08x40_set_stream(struct v4l2_subdev *sd, int enable)if (ret <0 ) goto err_unlock; + ret =ov08x40_identify_module (ov08x); +if (ret) + goto err_rpm_put; +/* * Apply default & customized values * and then start streaming.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 17/280 block: remove the write_hint field from struct request
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
[ Upstream commit 61952bb73486fff0f5550bccdf4062d9dd0fb163 ]
The write_hint is only used for read/write requests, which must have a bio attached to them. Just use the bio field instead.
Stable-dep-of: fc0e982b8a3a ("block: make sure ->nr_integrity_segments is cloned in blk_rq_prep_clone")
--- block/blk-merge.c | 16 ++++++++++------ block/blk-mq.c | 2 -- drivers/scsi/sd.c | 6 +++--- include/linux/blk-mq.h | 1 - 4 files changed, 13 insertions(+), 12 deletions(-)
block/blk-merge.c +10 -6
@@ -864,9 +864,11 @@ static struct request *attempt_merge(struct request_queue *q,if (rq_data_dir (req) !=rq_data_dir (next))return NULL ; -/* Don't merge requests with different write hints. */ -if (req->write_hint != next->write_hint) -return NULL ; +if (req->bio && next->bio) { +/* Don't merge requests with different write hints. */ +if (req->bio->bi_write_hint != next->bio->bi_write_hint) +return NULL ; + }if (req->ioprio != next->ioprio)return NULL ;
@@ -998,9 +1000,11 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio)if (!bio_crypt_rq_ctx_compatible (rq, bio))return false; -/* Don't merge requests with different write hints. */ -if (rq->write_hint != bio->bi_write_hint) -return false; +if (rq->bio) { +/* Don't merge requests with different write hints. */ +if (rq->bio->bi_write_hint != bio->bi_write_hint) +return false; + }if (rq->ioprio !=bio_prio (bio))return false;
block/blk-mq.c +0 -2
@@ -2654,7 +2654,6 @@ static void blk_mq_bio_to_request(struct request *rq, struct bio *bio, rq->cmd_flags |=REQ_FAILFAST_MASK ; rq->__sector = bio->bi_iter.bi_sector; - rq->write_hint = bio->bi_write_hint;blk_rq_bio_prep (rq, bio, nr_segs);if (bio_integrity (bio)) rq->nr_integrity_segments = blk_rq_count_integrity_sg(rq->q,
@@ -3308,7 +3307,6 @@ int blk_rq_prep_clone(struct request *rq, struct request *rq_src, } rq->nr_phys_segments = rq_src->nr_phys_segments; rq->ioprio = rq_src->ioprio; - rq->write_hint = rq_src->write_hint;if (rq->bio &&blk_crypto_rq_bio_prep (rq, rq->bio, gfp_mask) <0 ) goto free_and_out;
drivers/scsi/sd.c +3 -3
@@ -1190,8 +1190,8 @@ static u8 sd_group_number(struct scsi_cmnd *cmd)if (!sdkp->rscs)return 0 ; -return min3 ((u32 )rq->write_hint, (u32 )sdkp->permanent_stream_count, -0x3fu ); +return min3 ((u32 )rq->bio->bi_write_hint, + (u32 )sdkp->permanent_stream_count,0x3fu ); } static blk_status_t sd_setup_rw32_cmnd(struct scsi_cmnd *cmd, bool write,
@@ -1389,7 +1389,7 @@ static blk_status_t sd_setup_read_write_cmnd(struct scsi_cmnd *cmd) ret =sd_setup_rw16_cmnd (cmd, write, lba, nr_blocks, protect | fua, dld); }else if ((nr_blocks >0xff ) || (lba >0x1fffff ) || - sdp->use_10_for_rw || protect || rq->write_hint) { + sdp->use_10_for_rw || protect || rq->bio->bi_write_hint) { ret =sd_setup_rw10_cmnd (cmd, write, lba, nr_blocks, protect | fua); }else {
include/linux/blk-mq.h +0 -1
@@ -156,7 +156,6 @@ struct request {struct blk_crypto_keyslot *crypt_keyslot;#endif -enum rw_hint write_hint;unsigned short ioprio;enum mq_rq_state state;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 18/280 block: remove the ioprio field from struct request
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
[ Upstream commit 6975c1a486a40446b5bc77a89d9c520f8296fd08 ]
The request ioprio is only initialized from the first attached bio, so requests without a bio already never set it. Directly use the bio field instead.
Stable-dep-of: fc0e982b8a3a ("block: make sure ->nr_integrity_segments is cloned in blk_rq_prep_clone")
--- block/blk-merge.c | 10 ++++------ block/blk-mq.c | 3 +-- include/linux/blk-mq.h | 7 +++---- include/trace/events/block.h | 6 +++--- 4 files changed, 11 insertions(+), 15 deletions(-)
block/blk-merge.c +4 -6
@@ -868,11 +868,10 @@ static struct request *attempt_merge(struct request_queue *q,/* Don't merge requests with different write hints. */ if (req->bio->bi_write_hint != next->bio->bi_write_hint)return NULL ; +if (req->bio->bi_ioprio != next->bio->bi_ioprio) +return NULL ; } -if (req->ioprio != next->ioprio) -return NULL ; -if (!blk_atomic_write_mergeable_rqs (req, next))return NULL ;
@@ -1004,11 +1003,10 @@ bool blk_rq_merge_ok(struct request *rq, struct bio *bio)/* Don't merge requests with different write hints. */ if (rq->bio->bi_write_hint != bio->bi_write_hint)return false; +if (rq->bio->bi_ioprio != bio->bi_ioprio) +return false; } -if (rq->ioprio !=bio_prio (bio)) -return false; -if (blk_atomic_write_mergeable_rq_bio (rq, bio) == false)return false;
block/blk-mq.c +1 -2
@@ -870,7 +870,7 @@ static void blk_print_req_error(struct request *req, blk_status_t status)blk_op_str (req_op (req)), (__force u32)(req->cmd_flags & ~REQ_OP_MASK ), req->nr_phys_segments, - IOPRIO_PRIO_CLASS(req->ioprio)); + IOPRIO_PRIO_CLASS(req_get_ioprio(req))); }/*
@@ -3306,7 +3306,6 @@ int blk_rq_prep_clone(struct request *rq, struct request *rq_src, rq->special_vec = rq_src->special_vec; } rq->nr_phys_segments = rq_src->nr_phys_segments; - rq->ioprio = rq_src->ioprio;if (rq->bio &&blk_crypto_rq_bio_prep (rq, rq->bio, gfp_mask) <0 ) goto free_and_out;
include/linux/blk-mq.h +3 -4
@@ -156,8 +156,6 @@ struct request {struct blk_crypto_keyslot *crypt_keyslot;#endif -unsigned short ioprio; -enum mq_rq_state state;atomic_t ref;
@@ -221,7 +219,9 @@ static inline bool blk_rq_is_passthrough(struct request *rq)static inline unsigned short req_get_ioprio (struct request *req) { -return req->ioprio; +if (req->bio) +return req->bio->bi_ioprio; +return 0 ; }#define rq_data_dir (rq) (op_is_write(req_op(rq)) ? WRITE : READ)
@@ -1009,7 +1009,6 @@ static inline void blk_rq_bio_prep(struct request *rq, struct bio *bio, rq->nr_phys_segments = nr_segs; rq->__data_len = bio->bi_iter.bi_size; rq->bio = rq->biotail = bio; - rq->ioprio =bio_prio (bio); } void blk_mq_hctx_set_fq_lock_class(struct blk_mq_hw_ctx *hctx,
include/trace/events/block.h +3 -3
@@ -99,7 +99,7 @@ TRACE_EVENT(block_rq_requeue, __entry->dev = rq->q->disk ?disk_devt (rq->q->disk) :0 ; __entry->sector =blk_rq_trace_sector (rq); __entry->nr_sector =blk_rq_trace_nr_sectors (rq); - __entry->ioprio = rq->ioprio; + __entry->ioprio =req_get_ioprio (rq);blk_fill_rwbs (__entry->rwbs, rq->cmd_flags);__get_str (cmd)[0 ] ='\0' ;
@@ -136,7 +136,7 @@ DECLARE_EVENT_CLASS(block_rq_completion, __entry->sector =blk_rq_pos (rq); __entry->nr_sector = nr_bytes >>9 ; __entry->error =blk_status_to_errno (error); - __entry->ioprio = rq->ioprio; + __entry->ioprio =req_get_ioprio (rq);blk_fill_rwbs (__entry->rwbs, rq->cmd_flags);__get_str (cmd)[0 ] ='\0' ;
@@ -209,7 +209,7 @@ DECLARE_EVENT_CLASS(block_rq, __entry->sector =blk_rq_trace_sector (rq); __entry->nr_sector =blk_rq_trace_nr_sectors (rq); __entry->bytes =blk_rq_bytes (rq); - __entry->ioprio = rq->ioprio; + __entry->ioprio =req_get_ioprio (rq);blk_fill_rwbs (__entry->rwbs, rq->cmd_flags);__get_str (cmd)[0 ] ='\0' ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 19/280 block: make sure ->nr_integrity_segments is cloned in blk_rq_prep_clone
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ming Lei <[email protected]>
[ Upstream commit fc0e982b8a3a169b1c654d9a1aa45bf292943ef2 ]
Make sure ->nr_integrity_segments is cloned in blk_rq_prep_clone(), otherwise requests cloned by device-mapper multipath will not have the proper nr_integrity_segments values set, then BUG() is hit from sg_alloc_table_chained().
--- block/blk-mq.c | 1 + 1 file changed, 1 insertion(+)
block/blk-mq.c +1 -0
@@ -3306,6 +3306,7 @@ int blk_rq_prep_clone(struct request *rq, struct request *rq_src, rq->special_vec = rq_src->special_vec; } rq->nr_phys_segments = rq_src->nr_phys_segments; + rq->nr_integrity_segments = rq_src->nr_integrity_segments;if (rq->bio &&blk_crypto_rq_bio_prep (rq, rq->bio, gfp_mask) <0 ) goto free_and_out;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 20/280 net: dsa: mv88e6xxx: fix VTU methods for 6320 family
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Behún <[email protected]>
[ Upstream commit f9a457722cf5e3534be5ffab549d6b49737fca72 ]
The VTU registers of the 6320 family use the 6352 semantics, not 6185. Fix it.
--- drivers/net/dsa/mv88e6xxx/chip.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/dsa/mv88e6xxx/chip.c +4 -4
@@ -5210,8 +5210,8 @@ static const struct mv88e6xxx_ops mv88e6320_ops = { .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, - .vtu_getnext = mv88e6185_g1_vtu_getnext, - .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge, + .vtu_getnext = mv88e6352_g1_vtu_getnext, + .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, .gpio_ops = &mv88e6352_gpio_ops, .avb_ops = &mv88e6352_avb_ops, .ptp_ops = &mv88e6352_ptp_ops,
@@ -5259,8 +5259,8 @@ static const struct mv88e6xxx_ops mv88e6321_ops = { .hardware_reset_pre = mv88e6xxx_g2_eeprom_wait, .hardware_reset_post = mv88e6xxx_g2_eeprom_wait, .reset = mv88e6352_g1_reset, - .vtu_getnext = mv88e6185_g1_vtu_getnext, - .vtu_loadpurge = mv88e6185_g1_vtu_loadpurge, + .vtu_getnext = mv88e6352_g1_vtu_getnext, + .vtu_loadpurge = mv88e6352_g1_vtu_loadpurge, .gpio_ops = &mv88e6352_gpio_ops, .avb_ops = &mv88e6352_avb_ops, .ptp_ops = &mv88e6352_ptp_ops,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 21/280 iio: adc: ad7768-1: Move setting of val a bit later to avoid unnecessary return value check
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonathan Cameron <[email protected]>
[ Upstream commit 0af1c801a15225304a6328258efbf2bee245c654 ]
The data used is all in local variables so there is no advantage in setting *val = ret with the direct mode claim held. Move it later to after error check.
Stable-dep-of: 8236644f5ecb ("iio: adc: ad7768-1: Fix conversion result sign")
--- drivers/iio/adc/ad7768-1.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/iio/adc/ad7768-1.c +1 -2
@@ -370,12 +370,11 @@ static int ad7768_read_raw(struct iio_dev *indio_dev,return ret; ret =ad7768_scan_direct (indio_dev); -if (ret >=0 ) - *val = ret;iio_device_release_direct_mode (indio_dev);if (ret <0 )return ret; + *val = ret;return IIO_VAL_INT ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 22/280 iio: adc: ad7768-1: Fix conversion result sign
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sergiu Cuciurean <[email protected]>
[ Upstream commit 8236644f5ecb180e80ad92d691c22bc509b747bb ]
The ad7768-1 ADC output code is two's complement, meaning that the voltage conversion result is a signed value.. Since the value is a 24 bit one, stored in a 32 bit variable, the sign should be extended in order to get the correct representation.
Also the channel description has been updated to signed representation, to match the ADC specifications.
--- drivers/iio/adc/ad7768-1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/iio/adc/ad7768-1.c +2 -2
@@ -142,7 +142,7 @@ static const struct iio_chan_spec ad7768_channels[] = { .channel = 0, .scan_index = 0, .scan_type = { - .sign = 'u', + .sign = 's', .realbits = 24, .storagebits = 32, .shift = 8,
@@ -374,7 +374,7 @@ static int ad7768_read_raw(struct iio_dev *indio_dev,iio_device_release_direct_mode (indio_dev);if (ret <0 )return ret; - *val = ret; + *val =sign_extend32 (ret, chan->scan_type.realbits -1 );return IIO_VAL_INT ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 23/280 arm64: dts: ti: Refactor J784s4 SoC files to a common file
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manorit Chawdhry <[email protected]>
[ Upstream commit 9cc161a4509c2fda7cbe35b4858b496cec03c5d0 ]
Refactor J784s4 SoC files to a common file which uses the superset device to allow reuse in j742s2-evm which uses the subset part.
Stable-dep-of: 38e7f9092efb ("arm64: dts: ti: k3-j784s4-j742s2-main-common: Fix serdes_ln_ctrl reg-masks")
---
.../boot/dts/ti/k3-j784s4-j742s2-common.dtsi | 148 +
.../dts/ti/k3-j784s4-j742s2-main-common.dtsi | 2671 ++++++++++++++++
...> k3-j784s4-j742s2-mcu-wakeup-common.dtsi} | 2 +-
...i => k3-j784s4-j742s2-thermal-common.dtsi} | 0
arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 2847 +----------------
arch/arm64/boot/dts/ti/k3-j784s4.dtsi | 133 +-
6 files changed, 2916 insertions(+), 2885 deletions(-)
create mode 100644 arch/arm64/boot/dts/ti/k3-j784s4-j742s2-common.dtsi
create mode 100644 arch/arm64/boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi
rename arch/arm64/boot/dts/ti/{k3-j784s4-mcu-wakeup.dtsi => k3-j784s4-j742s2-mcu-wakeup-common.dtsi} (99%)
rename arch/arm64/boot/dts/ti/{k3-j784s4-thermal.dtsi => k3-j784s4-j742s2-thermal-common.dtsi} (100%)arch/arm64/boot/dts/ti/k3-j784s4-j742s2-common.dtsi new file +148 -0
@@ -0,0 +1,148 @@ +// SPDX-License-Identifier: GPL-2.0-only OR MIT +/* + * Device Tree Source for J784S4 and J742S2 SoC Family + * + * TRM (j784s4) (SPRUJ43 JULY 2022): https://www.ti.com/lit/zip/spruj52 + * TRM (j742s2): https://www.ti.com/lit/pdf/spruje3 + * + * Copyright (C) 2022-2024 Texas Instruments Incorporated - https://www.ti.com/ + * + */ + +#include <dt-bindings/interrupt-controller/irq.h> +#include <dt-bindings/interrupt-controller/arm-gic.h> +#include <dt-bindings/soc/ti,sci_pm_domain.h> + +#include "k3-pinctrl.h" + +/ { + interrupt-parent = <&gic500>; + #address-cells = <2>; + #size-cells = <2>; + + L2_0: l2-cache0 { + compatible = "cache"; + cache-level = <2>; + cache-unified; + cache-size = <0x200000>; + cache-line-size = <64>; + cache-sets = <1024>; + next-level-cache = <&msmc_l3>; + }; + + L2_1: l2-cache1 { + compatible = "cache"; + cache-level = <2>; + cache-unified; + cache-size = <0x200000>; + cache-line-size = <64>; + cache-sets = <1024>; + next-level-cache = <&msmc_l3>; + }; + + msmc_l3: l3-cache0 { + compatible = "cache"; + cache-level = <3>; + cache-unified; + }; + + firmware { + optee { + compatible = "linaro,optee-tz"; + method = "smc"; + }; + + psci: psci { + compatible = "arm,psci-1.0"; + method = "smc"; + }; + }; + + a72_timer0: timer-cl0-cpu0 { + compatible = "arm,armv8-timer"; + interrupts = <GIC_PPI 13 IRQ_TYPE_LEVEL_LOW>, /* cntpsirq */ + <GIC_PPI 14 IRQ_TYPE_LEVEL_LOW>, /* cntpnsirq */ + <GIC_PPI 11 IRQ_TYPE_LEVEL_LOW>, /* cntvirq */ + <GIC_PPI 10 IRQ_TYPE_LEVEL_LOW>; /* cnthpirq */ + }; + + pmu: pmu { + compatible = "arm,cortex-a72-pmu"; + /* Recommendation from GIC500 TRM Table A.3 */ + interrupts = <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>; + }; + + cbass_main: bus@100000 { + bootph-all; + compatible = "simple-bus"; + #address-cells = <2>; + #size-cells = <2>; + ranges = <0x00 0x00100000 0x00 0x00100000 0x00 0x00020000>, /* ctrl mmr */ + <0x00 0x00600000 0x00 0x00600000 0x00 0x00031100>, /* GPIO */ + <0x00 0x00700000 0x00 0x00700000 0x00 0x00001000>, /* ESM */ + <0x00 0x01000000 0x00 0x01000000 0x00 0x0d000000>, /* Most peripherals */ + <0x00 0x04210000 0x00 0x04210000 0x00 0x00010000>, /* VPU0 */ + <0x00 0x04220000 0x00 0x04220000 0x00 0x00010000>, /* VPU1 */ + <0x00 0x0d000000 0x00 0x0d000000 0x00 0x00800000>, /* PCIe0 Core*/ + <0x00 0x0d800000 0x00 0x0d800000 0x00 0x00800000>, /* PCIe1 Core*/ + <0x00 0x0e000000 0x00 0x0e000000 0x00 0x00800000>, /* PCIe2 Core*/ + <0x00 0x0e800000 0x00 0x0e800000 0x00 0x00800000>, /* PCIe3 Core*/ + <0x00 0x10000000 0x00 0x10000000 0x00 0x08000000>, /* PCIe0 DAT0 */ + <0x00 0x18000000 0x00 0x18000000 0x00 0x08000000>, /* PCIe1 DAT0 */ + <0x00 0x64800000 0x00 0x64800000 0x00 0x0070c000>, /* C71_1 */ + <0x00 0x65800000 0x00 0x65800000 0x00 0x0070c000>, /* C71_2 */ + <0x00 0x66800000 0x00 0x66800000 0x00 0x0070c000>, /* C71_3 */ + <0x00 0x67800000 0x00 0x67800000 0x00 0x0070c000>, /* C71_4 */ + <0x00 0x6f000000 0x00 0x6f000000 0x00 0x00310000>, /* A72 PERIPHBASE */ + <0x00 0x70000000 0x00 0x70000000 0x00 0x00400000>, /* MSMC RAM */ + <0x00 0x30000000 0x00 0x30000000 0x00 0x0c400000>, /* MAIN NAVSS */ + <0x40 0x00000000 0x40 0x00000000 0x01 0x00000000>, /* PCIe0 DAT1 */ + <0x41 0x00000000 0x41 0x00000000 0x01 0x00000000>, /* PCIe1 DAT1 */ + <0x42 0x00000000 0x42 0x00000000 0x01 0x00000000>, /* PCIe2 DAT1 */ + <0x43 0x00000000 0x43 0x00000000 0x01 0x00000000>, /* PCIe3 DAT1 */ + <0x44 0x00000000 0x44 0x00000000 0x00 0x08000000>, /* PCIe2 DAT0 */ + <0x44 0x10000000 0x44 0x10000000 0x00 0x08000000>, /* PCIe3 DAT0 */ + <0x4e 0x20000000 0x4e 0x20000000 0x00 0x00080000>, /* GPU */ + + /* MCUSS_WKUP Range */ + <0x00 0x28380000 0x00 0x28380000 0x00 0x03880000>, + <0x00 0x40200000 0x00 0x40200000 0x00 0x00998400>, + <0x00 0x40f00000 0x00 0x40f00000 0x00 0x00020000>, + <0x00 0x41000000 0x00 0x41000000 0x00 0x00020000>, + <0x00 0x41400000 0x00 0x41400000 0x00 0x00020000>, + <0x00 0x41c00000 0x00 0x41c00000 0x00 0x00100000>, + <0x00 0x42040000 0x00 0x42040000 0x00 0x03ac2400>, + <0x00 0x45100000 0x00 0x45100000 0x00 0x00c24000>, + <0x00 0x46000000 0x00 0x46000000 0x00 0x00200000>, + <0x00 0x47000000 0x00 0x47000000 0x00 0x00068400>, + <0x00 0x50000000 0x00 0x50000000 0x00 0x10000000>, + <0x04 0x00000000 0x04 0x00000000 0x04 0x00000000>; + + cbass_mcu_wakeup: bus@28380000 { + bootph-all; + compatible = "simple-bus"; + #address-cells = <2>; + #size-cells = <2>; + ranges = <0x00 0x28380000 0x00 0x28380000 0x00 0x03880000>, /* MCU NAVSS*/ + <0x00 0x40200000 0x00 0x40200000 0x00 0x00998400>, /* First peripheral window */ + <0x00 0x40f00000 0x00 0x40f00000 0x00 0x00020000>, /* CTRL_MMR0 */ + <0x00 0x41000000 0x00 0x41000000 0x00 0x00020000>, /* MCU R5F Core0 */ + <0x00 0x41400000 0x00 0x41400000 0x00 0x00020000>, /* MCU R5F Core1 */ + <0x00 0x41c00000 0x00 0x41c00000 0x00 0x00100000>, /* MCU SRAM */ + <0x00 0x42040000 0x00 0x42040000 0x00 0x03ac2400>, /* WKUP peripheral window */ + <0x00 0x45100000 0x00 0x45100000 0x00 0x00c24000>, /* MMRs, remaining NAVSS */ + <0x00 0x46000000 0x00 0x46000000 0x00 0x00200000>, /* CPSW */ + <0x00 0x47000000 0x00 0x47000000 0x00 0x00068400>, /* OSPI register space */ + <0x00 0x50000000 0x00 0x50000000 0x00 0x10000000>, /* FSS data region 1 */ + <0x04 0x00000000 0x04 0x00000000 0x04 0x00000000>; /* FSS data region 0/3 */ + }; + }; + + thermal_zones: thermal-zones { + #include "k3-j784s4-j742s2-thermal-common.dtsi" + }; +}; + +/* Now include peripherals from each bus segment */ +#include "k3-j784s4-j742s2-main-common.dtsi" +#include "k3-j784s4-j742s2-mcu-wakeup-common.dtsi"
arch/arm64/boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi new file +2671 -0
2,671 lines not on this page · raw message
arch/arm64/boot/dts/ti/k3-j784s4-j742s2-mcu-wakeup-common.dtsi renamed from arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi +1 -1
@@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only OR MIT /* - * Device Tree Source for J784S4 SoC Family MCU/WAKEUP Domain peripherals + * Device Tree Source for J784S4 and J742S2 SoC Family MCU/WAKEUP Domain peripherals * * Copyright (C) 2022-2024 Texas Instruments Incorporated - https://www.ti.com/ */
arch/arm64/boot/dts/ti/k3-j784s4-j742s2-thermal-common.dtsi renamed from arch/arm64/boot/dts/ti/k3-j784s4-thermal.dtsi +0 -0
arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi +95 -2752
174 lines not on this page · raw message
arch/arm64/boot/dts/ti/k3-j784s4.dtsi +1 -132
133 lines not on this page · raw message
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.39.5
Part of the diff is not shown here. View the raw message.
Greg Kroah-Hartman
maintainerPATCH 24/280 arm64: dts: ti: k3-j784s4-j742s2-main-common: Fix serdes_ln_ctrl reg-masks
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Siddharth Vadapalli <[email protected]>
[ Upstream commit 38e7f9092efbbf2a4a67e4410b55b797f8d1e184 ]
Commit under Fixes added the 'idle-states' property for SERDES4 lane muxes without defining the corresponding register offsets and masks for it in the 'mux-reg-masks' property within the 'serdes_ln_ctrl' node.
Fix this.
--- arch/arm64/boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/ti/k3-j784s4-j742s2-main-common.dtsi +3 -1
@@ -84,7 +84,9 @@ serdes_ln_ctrl: mux-controller@4080 { <0x10 0x3>, <0x14 0x3>, /* SERDES1 lane0/1 select */ <0x18 0x3>, <0x1c 0x3>, /* SERDES1 lane2/3 select */ <0x20 0x3>, <0x24 0x3>, /* SERDES2 lane0/1 select */ - <0x28 0x3>, <0x2c 0x3>; /* SERDES2 lane2/3 select */ + <0x28 0x3>, <0x2c 0x3>, /* SERDES2 lane2/3 select */ + <0x40 0x3>, <0x44 0x3>, /* SERDES4 lane0/1 select */ + <0x48 0x3>, <0x4c 0x3>; /* SERDES4 lane2/3 select */ idle-states = <J784S4_SERDES0_LANE0_PCIE1_LANE0>, <J784S4_SERDES0_LANE1_PCIE1_LANE1>, <J784S4_SERDES0_LANE2_IP3_UNUSED>,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 25/280 of: resolver: Simplify of_resolve_phandles() using __free()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rob Herring (Arm) <[email protected]>
[ Upstream commit 5275e8b5293f65cc82a5ee5eab02dd573b911d6e ]
Use the __free() cleanup to simplify of_resolve_phandles() and remove all the goto's.
Stable-dep-of: a46a0805635d ("of: resolver: Fix device node refcount leakage in of_resolve_phandles()")
--- drivers/of/resolver.c | 34 +++++++++++----------------------- 1 file changed, 11 insertions(+), 23 deletions(-)
drivers/of/resolver.c +11 -23
@@ -250,24 +250,20 @@ static int adjust_local_phandle_references(struct device_node *local_fixups,int of_resolve_phandles (struct device_node *overlay) {struct device_node *child, *local_fixups, *refnode; -struct device_node *tree_symbols, *overlay_fixups; +struct device_node *overlay_fixups;struct property *prop;const char *refpath;phandle phandle, phandle_delta;int err; - tree_symbols =NULL ; -if (!overlay) {pr_err ("null overlay\n" ); - err = -EINVAL ; - goto out; +return -EINVAL ; }if (!of_node_check_flag (overlay,OF_DETACHED )) {pr_err ("overlay not detached\n" ); - err = -EINVAL ; - goto out; +return -EINVAL ; } phandle_delta =live_tree_max_phandle () +1 ;
@@ -279,7 +275,7 @@ int of_resolve_phandles(struct device_node *overlay) err =adjust_local_phandle_references (local_fixups, overlay, phandle_delta);if (err) - goto out; +return err; overlay_fixups =NULL ;
@@ -288,16 +284,13 @@ int of_resolve_phandles(struct device_node *overlay) overlay_fixups = child; } -if (!overlay_fixups) { - err =0 ; - goto out; - } +if (!overlay_fixups) +return 0 ; - tree_symbols =of_find_node_by_path ("/__symbols__" ); + struct device_node __free(device_node) *tree_symbols = of_find_node_by_path("/__symbols__");if (!tree_symbols) {pr_err ("no symbols in root of device tree.\n" ); - err = -EINVAL ; - goto out; +return -EINVAL ; }for_each_property_of_node (overlay_fixups, prop) {
@@ -311,14 +304,12 @@ int of_resolve_phandles(struct device_node *overlay)if (err) {pr_err ("node label '%s' not found in live devicetree symbols table\n" , prop->name); - goto out; +return err; } refnode =of_find_node_by_path (refpath); -if (!refnode) { - err = -ENOENT ; - goto out; - } +if (!refnode) +return -ENOENT ; phandle = refnode->phandle;of_node_put (refnode);
@@ -328,11 +319,8 @@ int of_resolve_phandles(struct device_node *overlay)break ; } -out:if (err)pr_err ("overlay phandle fixup failed: %d\n" , err); -of_node_put (tree_symbols); -return err; }EXPORT_SYMBOL_GPL (of_resolve_phandles);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 8/280 PM: EM: Address RCU-related sparse warnings
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rafael J. Wysocki <[email protected]>
[ Upstream commit 3ee7be9e10dd5f79448788b899591d4bd2bf0c19 ]
The usage of __rcu in the Energy Model code is quite inconsistent which causes the following sparse warnings to trigger:
kernel/power/energy_model.c:169:15: warning: incorrect type in assignment (different address spaces)kernel/power/energy_model.c:169:15: expected struct em_perf_table [noderef] __rcu *tablekernel/power/energy_model.c:169:15: got struct em_perf_table *kernel/power/energy_model.c:171:9: warning: incorrect type in argument 1 (different address spaces)kernel/power/energy_model.c:171:9: expected struct callback_head *headkernel/power/energy_model.c:171:9: got struct callback_head [noderef] __rcu *kernel/power/energy_model.c:171:9: warning: cast removes address space '__rcu' of expression kernel/power/energy_model.c:182:19: warning: incorrect type in argument 1 (different address spaces)kernel/power/energy_model.c:182:19: expected struct kref *krefkernel/power/energy_model.c:182:19: got struct kref [noderef] __rcu *kernel/power/energy_model.c:200:15: warning: incorrect type in assignment (different address spaces)kernel/power/energy_model.c:200:15: expected struct em_perf_table [noderef] __rcu *tablekernel/power/energy_model.c:200:15: got void *[assigned] _reskernel/power/energy_model.c:204:20: warning: incorrect type in argument 1 (different address spaces)kernel/power/energy_model.c:204:20: expected struct kref *krefkernel/power/energy_model.c:204:20: got struct kref [noderef] __rcu *kernel/power/energy_model.c:320:19: warning: incorrect type in argument 1 (different address spaces)kernel/power/energy_model.c:320:19: expected struct kref *krefkernel/power/energy_model.c:320:19: got struct kref [noderef] __rcu *kernel/power/energy_model.c:325:45: warning: incorrect type in argument 2 (different address spaces)kernel/power/energy_model.c:325:45: expected struct em_perf_state *tablekernel/power/energy_model.c:325:45: got struct em_perf_state [noderef] __rcu *kernel/power/energy_model.c:425:45: warning: incorrect type in argument 3 (different address spaces)kernel/power/energy_model.c:425:45: expected struct em_perf_state *tablekernel/power/energy_model.c:425:45: got struct em_perf_state [noderef] __rcu *kernel/power/energy_model.c:442:15: warning: incorrect type in argument 1 (different address spaces)kernel/power/energy_model.c:442:15: expected void const *objpkernel/power/energy_model.c:442:15: got struct em_perf_table [noderef] __rcu *[assigned] em_tablekernel/power/energy_model.c:626:55: warning: incorrect type in argument 2 (different address spaces)kernel/power/energy_model.c:626:55: expected struct em_perf_state *tablekernel/power/energy_model.c:626:55: got struct em_perf_state [noderef] __rcu *kernel/power/energy_model.c:681:16: warning: incorrect type in assignment (different address spaces)kernel/power/energy_model.c:681:16: expected struct em_perf_state *new_pskernel/power/energy_model.c:681:16: got struct em_perf_state [noderef] __rcu *kernel/power/energy_model.c:699:37: warning: incorrect type in argument 2 (different address spaces)kernel/power/energy_model.c:699:37: expected struct em_perf_state *tablekernel/power/energy_model.c:699:37: got struct em_perf_state [noderef] __rcu *kernel/power/energy_model.c:733:38: warning: incorrect type in argument 3 (different address spaces)kernel/power/energy_model.c:733:38: expected struct em_perf_state *tablekernel/power/energy_model.c:733:38: got struct em_perf_state [noderef] __rcu *kernel/power/energy_model.c:855:53: warning: dereference of noderef expression kernel/power/energy_model.c:864:32: warning: dereference of noderef expression
This is because the __rcu annotation for sparse is only applicable to pointers that need rcu_dereference() or equivalent for protection, which basically means pointers assigned with rcu_assign_pointer().
Make all of the above sparse warnings go away by cleaning up the usage of __rcu and using rcu_dereference_protected() where applicable.
--- include/linux/energy_model.h | 12 +++++------ kernel/power/energy_model.c | 39 ++++++++++++++++++------------------ 2 files changed, 26 insertions(+), 25 deletions(-)
include/linux/energy_model.h +6 -6
@@ -163,13 +163,13 @@ struct em_data_callback {struct em_perf_domain *em_cpu_get (int cpu);struct em_perf_domain *em_pd_get (struct device *dev);int em_dev_update_perf_domain (struct device *dev, -struct em_perf_table __rcu *new_table); +struct em_perf_table *new_table);int em_dev_register_perf_domain (struct device *dev,unsigned int nr_states,struct em_data_callback *cb,cpumask_t *span,bool microwatts);void em_dev_unregister_perf_domain (struct device *dev); -struct em_perf_table __rcu *em_table_alloc (struct em_perf_domain *pd); -void em_table_free (struct em_perf_table __rcu *table); +struct em_perf_table *em_table_alloc (struct em_perf_domain *pd); +void em_table_free (struct em_perf_table *table);int em_dev_compute_costs (struct device *dev,struct em_perf_state *table,int nr_states);int em_dev_update_chip_binning (struct device *dev);
@@ -365,14 +365,14 @@ static inline int em_pd_nr_perf_states(struct em_perf_domain *pd)return 0 ; }static inline -struct em_perf_table __rcu *em_table_alloc (struct em_perf_domain *pd) +struct em_perf_table *em_table_alloc (struct em_perf_domain *pd) {return NULL ; } -static inline void em_table_free (struct em_perf_table __rcu *table) {} +static inline void em_table_free (struct em_perf_table *table) {}static inline int em_dev_update_perf_domain (struct device *dev, -struct em_perf_table __rcu *new_table) +struct em_perf_table *new_table) {return -EINVAL ; }
kernel/power/energy_model.c +20 -19
@@ -163,12 +163,8 @@ static void em_debug_remove_pd(struct device *dev) {}static void em_release_table_kref (struct kref *kref) { -struct em_perf_table __rcu *table; -/* It was the last owner of this table so we can free */ - table = container_of(kref, struct em_perf_table, kref); - -kfree_rcu (table, rcu); + kfree_rcu(container_of(kref, struct em_perf_table, kref), rcu); }/**
@@ -177,7 +173,7 @@ static void em_release_table_kref(struct kref *kref)* * No return values. */ -void em_table_free (struct em_perf_table __rcu *table) +void em_table_free (struct em_perf_table *table) {kref_put (&table->kref, em_release_table_kref); }
@@ -190,9 +186,9 @@ void em_table_free(struct em_perf_table __rcu *table)* has a user. * Returns allocated table or NULL. */ -struct em_perf_table __rcu *em_table_alloc (struct em_perf_domain *pd) +struct em_perf_table *em_table_alloc (struct em_perf_domain *pd) { -struct em_perf_table __rcu *table; +struct em_perf_table *table;int table_size; table_size =sizeof (struct em_perf_state ) * pd->nr_perf_states;
@@ -300,9 +296,9 @@ int em_dev_compute_costs(struct device *dev, struct em_perf_state *table,* Return 0 on success or an error code on failure. */ int em_dev_update_perf_domain (struct device *dev, -struct em_perf_table __rcu *new_table) +struct em_perf_table *new_table) { -struct em_perf_table __rcu *old_table; +struct em_perf_table *old_table;struct em_perf_domain *pd;if (!dev)
@@ -319,7 +315,8 @@ int em_dev_update_perf_domain(struct device *dev,kref_get (&new_table->kref); - old_table = pd->em_table; + old_table =rcu_dereference_protected (pd->em_table, +lockdep_is_held (&em_pd_mutex));rcu_assign_pointer (pd->em_table, new_table);em_cpufreq_update_efficiencies (dev, new_table->state);
@@ -391,7 +388,7 @@ static int em_create_pd(struct device *dev, int nr_states, struct em_data_callback *cb, cpumask_t *cpus, unsigned long flags) { - struct em_perf_table __rcu *em_table; + struct em_perf_table *em_table;struct em_perf_domain *pd;struct device *cpu_dev;int cpu, ret, num_cpus;
@@ -551,6 +548,7 @@ int em_dev_register_perf_domain(struct device *dev, unsigned int nr_states, struct em_data_callback *cb, cpumask_t *cpus, bool microwatts) { + struct em_perf_table *em_table;unsigned long cap, prev_cap =0 ;unsigned long flags =0 ;int cpu, ret;
@@ -621,7 +619,9 @@ int em_dev_register_perf_domain(struct device *dev, unsigned int nr_states, dev->em_pd->flags |= flags; -em_cpufreq_update_efficiencies (dev, dev->em_pd->em_table->state); + em_table =rcu_dereference_protected (dev->em_pd->em_table, +lockdep_is_held (&em_pd_mutex)); +em_cpufreq_update_efficiencies (dev, em_table->state);em_debug_create_pd (dev);dev_info (dev,"EM: created perf domain\n" );
@@ -658,7 +658,8 @@ void em_dev_unregister_perf_domain(struct device *dev)mutex_lock (&em_pd_mutex);em_debug_remove_pd (dev); -em_table_free (dev->em_pd->em_table); +em_table_free (rcu_dereference_protected (dev->em_pd->em_table, +lockdep_is_held (&em_pd_mutex)));kfree (dev->em_pd); dev->em_pd =NULL ;
@@ -666,9 +667,9 @@ void em_dev_unregister_perf_domain(struct device *dev) }EXPORT_SYMBOL_GPL (em_dev_unregister_perf_domain); -static struct em_perf_table __rcu *em_table_dup (struct em_perf_domain *pd) +static struct em_perf_table *em_table_dup (struct em_perf_domain *pd) { -struct em_perf_table __rcu *em_table; +struct em_perf_table *em_table;struct em_perf_state *ps, *new_ps;int ps_size;
@@ -690,7 +691,7 @@ static struct em_perf_table __rcu *em_table_dup(struct em_perf_domain *pd) }static int em_recalc_and_update (struct device *dev,struct em_perf_domain *pd, -struct em_perf_table __rcu *em_table) +struct em_perf_table *em_table) {int ret;
@@ -721,7 +722,7 @@ static void em_adjust_new_capacity(struct device *dev, struct em_perf_domain *pd, u64 max_cap) { -struct em_perf_table __rcu *em_table; +struct em_perf_table *em_table; em_table =em_table_dup (pd);if (!em_table) {
@@ -812,7 +813,7 @@ static void em_update_workfn(struct work_struct *work)*/ int em_dev_update_chip_binning (struct device *dev) { -struct em_perf_table __rcu *em_table; +struct em_perf_table *em_table;struct em_perf_domain *pd;int i, ret;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 26/280 of: resolver: Fix device node refcount leakage in of_resolve_phandles()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Zijun Hu <[email protected]>
[ Upstream commit a46a0805635d07de50c2ac71588345323c13b2f9 ]
In of_resolve_phandles(), refcount of device node @local_fixups will be increased if the for_each_child_of_node() exits early, but nowhere to decrease the refcount, so cause refcount leakage for the node.
Fix by using __free() on @local_fixups.
--- drivers/of/resolver.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/of/resolver.c +2 -1
@@ -249,8 +249,9 @@ static int adjust_local_phandle_references(struct device_node *local_fixups,*/ int of_resolve_phandles (struct device_node *overlay) { -struct device_node *child, *local_fixups, *refnode; +struct device_node *child, *refnode;struct device_node *overlay_fixups; + struct device_node __free(device_node) *local_fixups = NULL;struct property *prop;const char *refpath;phandle phandle, phandle_delta;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 27/280 scsi: ufs: qcom: fix dev reference leaked through of_qcom_ice_get
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tudor Ambarus <[email protected]>
[ Upstream commit ded40f32b55f7f2f4ed9627dd3c37a1fe89ed8c6 ]
The driver leaks the device reference taken with of_find_device_by_node(). Fix the leak by using devm_of_qcom_ice_get().
--- drivers/ufs/host/ufs-qcom.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/ufs/host/ufs-qcom.c +1 -1
@@ -118,7 +118,7 @@ static int ufs_qcom_ice_init(struct ufs_qcom_host *host)struct device *dev = hba->dev;struct qcom_ice *ice; - ice =of_qcom_ice_get (dev); + ice =devm_of_qcom_ice_get (dev);if (ice ==ERR_PTR (-EOPNOTSUPP )) {dev_warn (dev,"Disabling inline encryption support\n" ); ice =NULL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 28/280 s390/sclp: Allow user-space to provide PCI reports for optical modules
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Schnelle <[email protected]>
[ Upstream commit e9ab04490667249633fb397be17db46a8fa6d130 ]
The new SCLP action qualifier 3 is used by user-space code to provide optical module monitoring data to the platform.
Stable-dep-of: aa9f168d55dc ("s390/pci: Support mmap() of PCI resources except for ISM devices")
--- drivers/s390/char/sclp_pci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/s390/char/sclp_pci.c +2 -0
@@ -27,6 +27,7 @@#define SCLP_ERRNOTIFY_AQ_RESET 0#define SCLP_ERRNOTIFY_AQ_REPAIR 1#define SCLP_ERRNOTIFY_AQ_INFO_LOG 2 +#define SCLP_ERRNOTIFY_AQ_OPTICS_DATA 3static DEFINE_MUTEX (sclp_pci_mutex);static struct sclp_register sclp_pci_event = {
@@ -116,6 +117,7 @@ static int sclp_pci_check_report(struct zpci_report_error_header *report)case SCLP_ERRNOTIFY_AQ_RESET :case SCLP_ERRNOTIFY_AQ_REPAIR :case SCLP_ERRNOTIFY_AQ_INFO_LOG : +case SCLP_ERRNOTIFY_AQ_OPTICS_DATA :break ;default :return -EINVAL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 29/280 s390/pci: Report PCI error recovery results via SCLP
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Schnelle <[email protected]>
[ Upstream commit 4ec6054e7321dc24ebccaa08b3af0d590f5666e6 ]
Add a mechanism with which the status of PCI error recovery runs is reported to the platform. Together with the status supply additional information that may aid in problem determination.
Stable-dep-of: aa9f168d55dc ("s390/pci: Support mmap() of PCI resources except for ISM devices")
--- arch/s390/include/asm/sclp.h | 33 +++++++++++ arch/s390/pci/Makefile | 2 +- arch/s390/pci/pci_event.c | 21 +++++-- arch/s390/pci/pci_report.c | 111 +++++++++++++++++++++++++++++++++++ arch/s390/pci/pci_report.h | 16 +++++ drivers/s390/char/sclp.h | 14 ----- drivers/s390/char/sclp_pci.c | 19 ------ 7 files changed, 178 insertions(+), 38 deletions(-) create mode 100644 arch/s390/pci/pci_report.c create mode 100644 arch/s390/pci/pci_report.h
arch/s390/include/asm/sclp.h +33 -0
@@ -16,6 +16,11 @@/* 24 + 16 * SCLP_MAX_CORES */ #define EXT_SCCB_READ_CPU (3 * PAGE_SIZE) +#define SCLP_ERRNOTIFY_AQ_RESET 0 +#define SCLP_ERRNOTIFY_AQ_REPAIR 1 +#define SCLP_ERRNOTIFY_AQ_INFO_LOG 2 +#define SCLP_ERRNOTIFY_AQ_OPTICS_DATA 3 +#ifndef __ASSEMBLY__#include <linux/uio.h> #include <asm/chpid.h>
@@ -111,6 +116,34 @@ struct sclp_info { };extern struct sclp_info sclp; +struct sccb_header { +u16 length; +u8 function_code; +u8 control_mask[3 ]; +u16 response_code; +} __packed; + +struct evbuf_header { +u16 length; +u8 type; +u8 flags; +u16 _reserved; +} __packed; + +struct err_notify_evbuf { +struct evbuf_header header; +u8 action; +u8 atype; +u32 fh; +u32 fid; +u8 data[]; +} __packed; + +struct err_notify_sccb { +struct sccb_header header; +struct err_notify_evbuf evbuf; +} __packed; +struct zpci_report_error_header {u8 version;/* Interface version byte */ u8 action;/* Action qualifier byte
arch/s390/pci/Makefile +1 -1
@@ -5,6 +5,6 @@ obj-$(CONFIG_PCI) += pci.o pci_irq.o pci_clp.o \ pci_event.o pci_debug.o pci_insn.o pci_mmio.o \ - pci_bus.o pci_kvm_hook.o + pci_bus.o pci_kvm_hook.o pci_report.o obj-$(CONFIG_PCI_IOV) += pci_iov.o obj-$(CONFIG_SYSFS) += pci_sysfs.o
arch/s390/pci/pci_event.c +17 -4
@@ -16,6 +16,7 @@#include <asm/sclp.h> #include "pci_bus.h" +#include "pci_report.h" /* Content Code Description for PCI Function Error */ struct zpci_ccdf_err {
@@ -169,6 +170,8 @@ static pci_ers_result_t zpci_event_do_reset(struct pci_dev *pdev,static pci_ers_result_t zpci_event_attempt_error_recovery (struct pci_dev *pdev) {pci_ers_result_t ers_res =PCI_ERS_RESULT_DISCONNECT ; +struct zpci_dev *zdev =to_zpci (pdev); +char *status_str ="success" ;struct pci_driver *driver;/*
@@ -186,29 +189,37 @@ static pci_ers_result_t zpci_event_attempt_error_recovery(struct pci_dev *pdev)if (is_passed_through (pdev)) {pr_info ("%s: Cannot be recovered in the host because it is a pass-through device\n" ,pci_name (pdev)); + status_str ="failed (pass-through)" ; goto out_unlock; } driver =to_pci_driver (pdev->dev.driver);if (!is_driver_supported (driver)) { -if (!driver) +if (!driver) {pr_info ("%s: Cannot be recovered because no driver is bound to the device\n" ,pci_name (pdev)); -else + status_str ="failed (no driver)" ; + }else {pr_info ("%s: The %s driver bound to the device does not support error recovery\n" ,pci_name (pdev), driver->name); + status_str ="failed (no driver support)" ; + } goto out_unlock; } ers_res =zpci_event_notify_error_detected (pdev, driver); -if (ers_result_indicates_abort (ers_res)) +if (ers_result_indicates_abort (ers_res)) { + status_str ="failed (abort on detection)" ; goto out_unlock; + }if (ers_res ==PCI_ERS_RESULT_CAN_RECOVER ) { ers_res =zpci_event_do_error_state_clear (pdev, driver); -if (ers_result_indicates_abort (ers_res)) +if (ers_result_indicates_abort (ers_res)) { + status_str ="failed (abort on MMIO enable)" ; goto out_unlock; + } }if (ers_res ==PCI_ERS_RESULT_NEED_RESET )
@@ -217,6 +228,7 @@ static pci_ers_result_t zpci_event_attempt_error_recovery(struct pci_dev *pdev)if (ers_res !=PCI_ERS_RESULT_RECOVERED ) {pr_err ("%s: Automatic recovery failed; operator intervention is required\n" ,pci_name (pdev)); + status_str ="failed (driver can't recover)" ; goto out_unlock; }
@@ -225,6 +237,7 @@ static pci_ers_result_t zpci_event_attempt_error_recovery(struct pci_dev *pdev) driver->err_handler->resume (pdev); out_unlock:pci_dev_unlock (pdev); +zpci_report_status (zdev,"recovery" , status_str);return ers_res; }
arch/s390/pci/pci_report.c new file +111 -0
111 lines not on this page · raw message
arch/s390/pci/pci_report.h new file +16 -0
@@ -0,0 +1,16 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +/* +* Copyright IBM Corp. 2024 +* +* Author(s): +* Niklas Schnelle <[email protected]> +* +*/ +#ifndef __S390_PCI_REPORT_H +#define __S390_PCI_REPORT_H + +struct zpci_dev ; + +int zpci_report_status (struct zpci_dev *zdev,const char *operation,const char *status); + +#endif /* __S390_PCI_REPORT_H */
drivers/s390/char/sclp.h +0 -14
@@ -84,13 +84,6 @@ typedef unsigned int sclp_cmdw_t;typedef u64 sccb_mask_t ; -struct sccb_header { -u16 length; -u8 function_code; -u8 control_mask[3 ]; -u16 response_code; -} __attribute__((packed)); -struct init_sccb {struct sccb_header header;u16 _reserved;
@@ -237,13 +230,6 @@ struct gds_vector {u16 gds_id; } __attribute__((packed)); -struct evbuf_header { -u16 length; -u8 type; -u8 flags; -u16 _reserved; -} __attribute__((packed)); -struct sclp_req {struct list_head list;/* list_head for request queueing. */ sclp_cmdw_t command;/* sclp command to execute */
drivers/s390/char/sclp_pci.c +0 -19
@@ -24,30 +24,11 @@#define SCLP_ATYPE_PCI 2 -#define SCLP_ERRNOTIFY_AQ_RESET 0 -#define SCLP_ERRNOTIFY_AQ_REPAIR 1 -#define SCLP_ERRNOTIFY_AQ_INFO_LOG 2 -#define SCLP_ERRNOTIFY_AQ_OPTICS_DATA 3 -static DEFINE_MUTEX (sclp_pci_mutex);static struct sclp_register sclp_pci_event = { .send_mask =EVTYP_ERRNOTIFY_MASK , }; -struct err_notify_evbuf { -struct evbuf_header header; -u8 action; -u8 atype; -u32 fh; -u32 fid; -u8 data[]; -} __packed; - -struct err_notify_sccb { -struct sccb_header header; -struct err_notify_evbuf evbuf; -} __packed; -struct pci_cfg_sccb {struct sccb_header header;u8 atype;/* adapter type */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 30/280 s390/pci: Support mmap() of PCI resources except for ISM devices
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Niklas Schnelle <[email protected]>
[ Upstream commit aa9f168d55dc47c0de564f7dfe0e90467c9fee71 ]
So far s390 does not allow mmap() of PCI resources to user-space via the usual mechanisms, though it does use it for RDMA. For the PCI sysfs resource files and /proc/bus/pci it defines neither HAVE_PCI_MMAP nor ARCH_GENERIC_PCI_MMAP_RESOURCE. For vfio-pci s390 previously relied on disabled VFIO_PCI_MMAP and now relies on setting pdev->non_mappable_bars for all devices.
This is partly because access to mapped PCI resources from user-space requires special PCI load/store memory-I/O (MIO) instructions, or the special MMIO syscalls when these are not available. Still, such access is possible and useful not just for RDMA, in fact not being able to mmap() PCI resources has previously caused extra work when testing devices.
One thing that doesn't work with PCI resources mapped to user-space though is the s390 specific virtual ISM device. Not only because the BAR size of 256 TiB prevents mapping the whole BAR but also because access requires use of the legacy PCI instructions which are not accessible to user-space on systems with the newer MIO PCI instructions.
Now with the pdev->non_mappable_bars flag ISM can be excluded from mapping its resources while making this functionality available for all other PCI devices. To this end introduce a minimal implementation of PCI_QUIRKS and use that to set pdev->non_mappable_bars for ISM devices only. Then also set ARCH_GENERIC_PCI_MMAP_RESOURCE to take advantage of the generic implementation of pci_mmap_resource_range() enabling only the newer sysfs mmap() interface. This follows the recommendation in Documentation/PCI/sysfs-pci.rst.
--- arch/s390/Kconfig | 4 +--- arch/s390/include/asm/pci.h | 3 +++ arch/s390/pci/Makefile | 2 +- arch/s390/pci/pci_fixup.c | 23 +++++++++++++++++++++++ drivers/s390/net/ism_drv.c | 1 - include/linux/pci_ids.h | 1 + 6 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 arch/s390/pci/pci_fixup.c
arch/s390/Kconfig +1 -3
@@ -41,9 +41,6 @@ config AUDIT_ARCH config NO_IOPORT_MAP def_bool y -config PCI_QUIRKS - def_bool n - config ARCH_SUPPORTS_UPROBES def_bool y
@@ -237,6 +234,7 @@ config S390 select PCI_DOMAINS if PCI select PCI_MSI if PCI select PCI_MSI_ARCH_FALLBACKS if PCI_MSI + select PCI_QUIRKS if PCI select SPARSE_IRQ select SWIOTLB select SYSCTL_EXCEPTION_TRACE
arch/s390/include/asm/pci.h +3 -0
@@ -11,6 +11,9 @@#include <asm/pci_insn.h> #include <asm/sclp.h> +#define ARCH_GENERIC_PCI_MMAP_RESOURCE 1 +#define arch_can_pci_mmap_wc () 1 +#define PCIBIOS_MIN_IO 0x1000#define PCIBIOS_MIN_MEM 0x10000000
arch/s390/pci/Makefile +1 -1
@@ -5,6 +5,6 @@ obj-$(CONFIG_PCI) += pci.o pci_irq.o pci_clp.o \ pci_event.o pci_debug.o pci_insn.o pci_mmio.o \ - pci_bus.o pci_kvm_hook.o pci_report.o + pci_bus.o pci_kvm_hook.o pci_report.o pci_fixup.o obj-$(CONFIG_PCI_IOV) += pci_iov.o obj-$(CONFIG_SYSFS) += pci_sysfs.o
arch/s390/pci/pci_fixup.c new file +23 -0
@@ -0,0 +1,23 @@ +// SPDX-License-Identifier: GPL-2.0 +/* +* Exceptions for specific devices, +* +* Copyright IBM Corp. 2025 +* +* Author(s): +* Niklas Schnelle <[email protected]> +*/ +#include <linux/pci.h> + +static void zpci_ism_bar_no_mmap (struct pci_dev *pdev) +{ +/* +* ISM's BAR is special. Drivers written for ISM know +* how to handle this but others need to be aware of their +* special nature e.g. to prevent attempts to mmap() it. +*/ + pdev->non_mappable_bars =1 ; +} +DECLARE_PCI_FIXUP_EARLY (PCI_VENDOR_ID_IBM , +PCI_DEVICE_ID_IBM_ISM , + zpci_ism_bar_no_mmap);
drivers/s390/net/ism_drv.c +0 -1
@@ -20,7 +20,6 @@MODULE_DESCRIPTION ("ISM driver for s390" );MODULE_LICENSE ("GPL" ); -#define PCI_DEVICE_ID_IBM_ISM 0x04ED#define DRV_NAME "ism"static const struct pci_device_id ism_device_table[] = {
include/linux/pci_ids.h +1 -0
@@ -517,6 +517,7 @@#define PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM 0x0251#define PCI_DEVICE_ID_IBM_ICOM_V2_ONE_PORT_RVX_ONE_PORT_MDM_PCIE 0x0361#define PCI_DEVICE_ID_IBM_ICOM_FOUR_PORT_MODEL 0x252 +#define PCI_DEVICE_ID_IBM_ISM 0x04ed#define PCI_SUBVENDOR_ID_IBM 0x1014#define PCI_SUBDEVICE_ID_IBM_SATURN_SERIAL_ONE_PORT 0x03d4
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 31/280 PCI/MSI: Convert pci_msi_ignore_mask to per MSI domain flag
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roger Pau Monne <[email protected]>
[ Upstream commit c3164d2e0d181027da8fc94f8179d8607c3d440f ]
Setting pci_msi_ignore_mask inhibits the toggling of the mask bit for both MSI and MSI-X entries globally, regardless of the IRQ chip they are using. Only Xen sets the pci_msi_ignore_mask when routing physical interrupts over event channels, to prevent PCI code from attempting to toggle the maskbit, as it's Xen that controls the bit.
However, the pci_msi_ignore_mask being global will affect devices that use MSI interrupts but are not routing those interrupts over event channels (not using the Xen pIRQ chip). One example is devices behind a VMD PCI bridge. In that scenario the VMD bridge configures MSI(-X) using the normal IRQ chip (the pIRQ one in the Xen case), and devices behind the bridge configure the MSI entries using indexes into the VMD bridge MSI table. The VMD bridge then demultiplexes such interrupts and delivers to the destination device(s). Having pci_msi_ignore_mask set in that scenario prevents (un)masking of MSI entries for devices behind the VMD bridge.
Move the signaling of no entry masking into the MSI domain flags, as that allows setting it on a per-domain basis. Set it for the Xen MSI domain that uses the pIRQ chip, while leaving it unset for the rest of the cases.
Remove pci_msi_ignore_mask at once, since it was only used by Xen code, and with Xen dropping usage the variable is unneeded.
This fixes using devices behind a VMD bridge on Xen PV hardware domains.
Albeit Devices behind a VMD bridge are not known to Xen, that doesn't mean Linux cannot use them. By inhibiting the usage of VMD_FEAT_CAN_BYPASS_MSI_REMAP and the removal of the pci_msi_ignore_mask bodge devices behind a VMD bridge do work fine when use from a Linux Xen hardware domain. That's the whole point of the series.
Message-ID: <[email protected]>
Stable-dep-of: cf761e3dacc6 ("PCI/MSI: Add an option to write MSIX ENTRY_DATA before any reads")
--- arch/x86/pci/xen.c | 8 ++------ drivers/pci/msi/msi.c | 37 +++++++++++++++++++++---------------- include/linux/msi.h | 3 ++- kernel/irq/msi.c | 2 +- 4 files changed, 26 insertions(+), 24 deletions(-)
arch/x86/pci/xen.c +2 -6
@@ -436,7 +436,8 @@ static struct msi_domain_ops xen_pci_msi_domain_ops = { };static struct msi_domain_info xen_pci_msi_domain_info = { - .flags =MSI_FLAG_PCI_MSIX |MSI_FLAG_FREE_MSI_DESCS |MSI_FLAG_DEV_SYSFS , + .flags =MSI_FLAG_PCI_MSIX |MSI_FLAG_FREE_MSI_DESCS | +MSI_FLAG_DEV_SYSFS |MSI_FLAG_NO_MASK , .ops = &xen_pci_msi_domain_ops, };
@@ -484,11 +485,6 @@ static __init void xen_setup_pci_msi(void)* in allocating the native domain and never use it. */ x86_init.irqs.create_pci_msi_domain = xen_create_pci_msi_domain; -/* -* With XEN PIRQ/Eventchannels in use PCI/MSI[-X] masking is solely -* controlled by the hypervisor. -*/ - pci_msi_ignore_mask = 1; }#else /* CONFIG_PCI_MSI */
drivers/pci/msi/msi.c +21 -16
@@ -10,12 +10,12 @@#include <linux/err.h> #include <linux/export.h> #include <linux/irq.h> +#include <linux/irqdomain.h> #include "../pci.h" #include "msi.h" int pci_msi_enable =1 ; -int pci_msi_ignore_mask;/** * pci_msi_supported - check whether MSI may be enabled on a device
@@ -285,6 +285,8 @@ static void pci_msi_set_enable(struct pci_dev *dev, int enable)static int msi_setup_msi_desc (struct pci_dev *dev,int nvec,struct irq_affinity_desc *masks) { +const struct irq_domain *d =dev_get_msi_domain (&dev->dev); +const struct msi_domain_info *info = d->host_data;struct msi_desc desc;u16 control;
@@ -295,8 +297,7 @@ static int msi_setup_msi_desc(struct pci_dev *dev, int nvec,/* Lies, damned lies, and MSIs */ if (dev->dev_flags &PCI_DEV_FLAGS_HAS_MSI_MASKING ) control |=PCI_MSI_FLAGS_MASKBIT ; -/* Respect XEN's mask disabling */ -if (pci_msi_ignore_mask) +if (info->flags &MSI_FLAG_NO_MASK ) control &= ~PCI_MSI_FLAGS_MASKBIT ; desc.nvec_used = nvec;
@@ -604,12 +605,15 @@ static void __iomem *msix_map_region(struct pci_dev *dev,*/ void msix_prepare_msi_desc (struct pci_dev *dev,struct msi_desc *desc) { +const struct irq_domain *d =dev_get_msi_domain (&dev->dev); +const struct msi_domain_info *info = d->host_data; + desc->nvec_used =1 ; desc->pci.msi_attrib.is_msix =1 ; desc->pci.msi_attrib.is_64 =1 ; desc->pci.msi_attrib.default_irq = dev->irq; desc->pci.mask_base = dev->msix_base; - desc->pci.msi_attrib.can_mask = !pci_msi_ignore_mask && + desc->pci.msi_attrib.can_mask = !(info->flags &MSI_FLAG_NO_MASK ) && !desc->pci.msi_attrib.is_virtual;if (desc->pci.msi_attrib.can_mask) {
@@ -659,9 +663,6 @@ static void msix_mask_all(void __iomem *base, int tsize)u32 ctrl =PCI_MSIX_ENTRY_CTRL_MASKBIT ;int i; -if (pci_msi_ignore_mask) -return ; -for (i =0 ; i < tsize; i++, base +=PCI_MSIX_ENTRY_SIZE )writel (ctrl, base +PCI_MSIX_ENTRY_VECTOR_CTRL ); }
@@ -714,6 +715,8 @@ static int msix_setup_interrupts(struct pci_dev *dev, struct msix_entry *entriesstatic int msix_capability_init (struct pci_dev *dev,struct msix_entry *entries,int nvec,struct irq_affinity *affd) { +const struct irq_domain *d =dev_get_msi_domain (&dev->dev); +const struct msi_domain_info *info = d->host_data;int ret, tsize;u16 control;
@@ -744,15 +747,17 @@ static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries,/* Disable INTX */ pci_intx_for_msi (dev,0 ); -/* -* Ensure that all table entries are masked to prevent -* stale entries from firing in a crash kernel. -* -* Done late to deal with a broken Marvell NVME device -* which takes the MSI-X mask bits into account even -* when MSI-X is disabled, which prevents MSI delivery. -*/ -msix_mask_all (dev->msix_base, tsize); +if (!(info->flags &MSI_FLAG_NO_MASK )) { +/* +* Ensure that all table entries are masked to prevent +* stale entries from firing in a crash kernel. +* +* Done late to deal with a broken Marvell NVME device +* which takes the MSI-X mask bits into account even +* when MSI-X is disabled, which prevents MSI delivery. +*/ +msix_mask_all (dev->msix_base, tsize); + }pci_msix_clear_and_set_ctrl (dev,PCI_MSIX_FLAGS_MASKALL ,0 );pcibios_free_irq (dev);
include/linux/msi.h +2 -1
@@ -73,7 +73,6 @@ struct msi_msg { }; }; -extern int pci_msi_ignore_mask;/* Helper functions */ struct msi_desc ;struct pci_dev ;
@@ -556,6 +555,8 @@ enum {MSI_FLAG_PCI_MSIX_ALLOC_DYN = (1 <<20 ),/* PCI MSIs cannot be steered separately to CPU cores */ MSI_FLAG_NO_AFFINITY = (1 <<21 ), +/* Inhibit usage of entry masking */ + MSI_FLAG_NO_MASK = (1 << 22), };/**
kernel/irq/msi.c +1 -1
@@ -1143,7 +1143,7 @@ static bool msi_check_reservation_mode(struct irq_domain *domain,if (!(info->flags &MSI_FLAG_MUST_REACTIVATE ))return false; -if (IS_ENABLED (CONFIG_PCI_MSI ) && pci_msi_ignore_mask) +if (info->flags &MSI_FLAG_NO_MASK )return false;/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 32/280 PCI/MSI: Handle the NOMASK flag correctly for all PCI/MSI backends
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Thomas Gleixner <[email protected]>
[ Upstream commit 3ece3e8e5976c49c3f887e5923f998eabd54ff40 ]
The conversion of the XEN specific global variable pci_msi_ignore_mask to a MSI domain flag, missed the facts that:
1) Legacy architectures do not provide a interrupt domain
2) Parent MSI domains do not necessarily have a domain info attached
Both cases result in an unconditional NULL pointer dereference. This was unfortunatly missed in review and testing revealed it late.
Cure this by using the existing pci_msi_domain_supports() helper, which handles all possible cases correctly.
Stable-dep-of: cf761e3dacc6 ("PCI/MSI: Add an option to write MSIX ENTRY_DATA before any reads")
--- drivers/pci/msi/msi.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-)
drivers/pci/msi/msi.c +6 -12
@@ -285,8 +285,6 @@ static void pci_msi_set_enable(struct pci_dev *dev, int enable)static int msi_setup_msi_desc (struct pci_dev *dev,int nvec,struct irq_affinity_desc *masks) { -const struct irq_domain *d =dev_get_msi_domain (&dev->dev); -const struct msi_domain_info *info = d->host_data;struct msi_desc desc;u16 control;
@@ -297,7 +295,7 @@ static int msi_setup_msi_desc(struct pci_dev *dev, int nvec,/* Lies, damned lies, and MSIs */ if (dev->dev_flags &PCI_DEV_FLAGS_HAS_MSI_MASKING ) control |=PCI_MSI_FLAGS_MASKBIT ; -if (info->flags &MSI_FLAG_NO_MASK ) +if (pci_msi_domain_supports (dev,MSI_FLAG_NO_MASK ,DENY_LEGACY )) control &= ~PCI_MSI_FLAGS_MASKBIT ; desc.nvec_used = nvec;
@@ -605,20 +603,18 @@ static void __iomem *msix_map_region(struct pci_dev *dev,*/ void msix_prepare_msi_desc (struct pci_dev *dev,struct msi_desc *desc) { -const struct irq_domain *d =dev_get_msi_domain (&dev->dev); -const struct msi_domain_info *info = d->host_data; - desc->nvec_used =1 ; desc->pci.msi_attrib.is_msix =1 ; desc->pci.msi_attrib.is_64 =1 ; desc->pci.msi_attrib.default_irq = dev->irq; desc->pci.mask_base = dev->msix_base; - desc->pci.msi_attrib.can_mask = !(info->flags &MSI_FLAG_NO_MASK ) && - !desc->pci.msi_attrib.is_virtual; -if (desc->pci.msi_attrib.can_mask) { + +if (!pci_msi_domain_supports (dev,MSI_FLAG_NO_MASK ,DENY_LEGACY ) && + !desc->pci.msi_attrib.is_virtual) {void __iomem *addr =pci_msix_desc_addr (desc); + desc->pci.msi_attrib.can_mask =1 ; desc->pci.msix_ctrl =readl (addr +PCI_MSIX_ENTRY_VECTOR_CTRL ); } }
@@ -715,8 +711,6 @@ static int msix_setup_interrupts(struct pci_dev *dev, struct msix_entry *entriesstatic int msix_capability_init (struct pci_dev *dev,struct msix_entry *entries,int nvec,struct irq_affinity *affd) { -const struct irq_domain *d =dev_get_msi_domain (&dev->dev); -const struct msi_domain_info *info = d->host_data;int ret, tsize;u16 control;
@@ -747,7 +741,7 @@ static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries,/* Disable INTX */ pci_intx_for_msi (dev,0 ); -if (!(info->flags &MSI_FLAG_NO_MASK )) { +if (!pci_msi_domain_supports (dev,MSI_FLAG_NO_MASK ,DENY_LEGACY )) {/* * Ensure that all table entries are masked to prevent * stale entries from firing in a crash kernel.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 33/280 PCI/MSI: Add an option to write MSIX ENTRY_DATA before any reads
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonathan Currier <[email protected]>
[ Upstream commit cf761e3dacc6ad5f65a4886d00da1f9681e6805a ]
Commit 7d5ec3d36123 ("PCI/MSI: Mask all unused MSI-X entries") introduced a readl() from ENTRY_VECTOR_CTRL before the writel() to ENTRY_DATA.
This is correct, however some hardware, like the Sun Neptune chips, the NIU module, will cause an error and/or fatal trap if any MSIX table entry is read before the corresponding ENTRY_DATA field is written to.
Add an optional early writel() in msix_prepare_msi_desc().
--- drivers/pci/msi/msi.c | 3 +++ include/linux/pci.h | 2 ++ 2 files changed, 5 insertions(+)
drivers/pci/msi/msi.c +3 -0
@@ -615,6 +615,9 @@ void msix_prepare_msi_desc(struct pci_dev *dev, struct msi_desc *desc)void __iomem *addr =pci_msix_desc_addr (desc); desc->pci.msi_attrib.can_mask =1 ; +/* Workaround for SUN NIU insanity, which requires write before read */ +if (dev->dev_flags &PCI_DEV_FLAGS_MSIX_TOUCH_ENTRY_DATA_FIRST ) +writel (0 , addr +PCI_MSIX_ENTRY_DATA ); desc->pci.msix_ctrl =readl (addr +PCI_MSIX_ENTRY_VECTOR_CTRL ); } }
include/linux/pci.h +2 -0
@@ -245,6 +245,8 @@ enum pci_dev_flags {PCI_DEV_FLAGS_NO_RELAXED_ORDERING = (__force pci_dev_flags_t) (1 <<11 ),/* Device does honor MSI masking despite saying otherwise */ PCI_DEV_FLAGS_HAS_MSI_MASKING = (__force pci_dev_flags_t) (1 <<12 ), +/* Device requires write to PCI_MSIX_ENTRY_DATA before any MSIX reads */ + PCI_DEV_FLAGS_MSIX_TOUCH_ENTRY_DATA_FIRST = (__force pci_dev_flags_t) (1 << 13), }; enum pci_irq_reroute_variant {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 34/280 accel/ivpu: Add auto selection logic for job scheduler
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jacek Lawrynowicz <[email protected]>
[ Upstream commit 436b67d6936b5658426e40d0df8f147239bc532b ]
Add ivpu_fw_sched_mode_select() function that can select scheduling mode based on HW and FW versions. This prepares for a switch to HWS on selected platforms.
Stable-dep-of: 6c2b75404d33 ("accel/ivpu: Fix the NPU's DPU frequency calculation")
--- drivers/accel/ivpu/ivpu_drv.c | 6 +++--- drivers/accel/ivpu/ivpu_drv.h | 2 ++ drivers/accel/ivpu/ivpu_fw.c | 15 +++++++++++++-- drivers/accel/ivpu/ivpu_fw.h | 3 +++ drivers/accel/ivpu/ivpu_hw.h | 1 - drivers/accel/ivpu/ivpu_hw_btrs.c | 2 -- drivers/accel/ivpu/ivpu_job.c | 14 +++++++------- drivers/accel/ivpu/ivpu_sysfs.c | 24 ++++++++++++++++++++++++ 8 files changed, 52 insertions(+), 15 deletions(-)
drivers/accel/ivpu/ivpu_drv.c +3 -3
@@ -54,9 +54,9 @@ u8 ivpu_pll_max_ratio = U8_MAX;module_param_named (pll_max_ratio, ivpu_pll_max_ratio, byte,0644 );MODULE_PARM_DESC (pll_max_ratio,"Maximum PLL ratio used to set NPU frequency" ); -int ivpu_sched_mode; +int ivpu_sched_mode =IVPU_SCHED_MODE_AUTO ;module_param_named (sched_mode, ivpu_sched_mode, int,0444 ); -MODULE_PARM_DESC (sched_mode,"Scheduler mode: 0 - Default scheduler, 1 - Force HW scheduler" ); +MODULE_PARM_DESC (sched_mode,"Scheduler mode: -1 - Use default scheduler, 0 - Use OS scheduler, 1 - Use HW scheduler" );bool ivpu_disable_mmu_cont_pages;module_param_named (disable_mmu_cont_pages, ivpu_disable_mmu_cont_pages, bool,0444 );
@@ -347,7 +347,7 @@ static int ivpu_hw_sched_init(struct ivpu_device *vdev) {int ret =0 ; -if (vdev->hw->sched_mode ==VPU_SCHEDULING_MODE_HW ) { +if (vdev->fw->sched_mode ==VPU_SCHEDULING_MODE_HW ) { ret =ivpu_jsm_hws_setup_priority_bands (vdev);if (ret) {ivpu_err (vdev,"Failed to enable hw scheduler: %d" , ret);
drivers/accel/ivpu/ivpu_drv.h +2 -0
@@ -57,6 +57,8 @@#define IVPU_PLATFORM_FPGA 3#define IVPU_PLATFORM_INVALID 8 +#define IVPU_SCHED_MODE_AUTO -1 +#define IVPU_DBG_REG BIT(0)#define IVPU_DBG_IRQ BIT(1)#define IVPU_DBG_MMU BIT(2)
drivers/accel/ivpu/ivpu_fw.c +13 -2
@@ -134,6 +134,15 @@ static bool is_within_range(u64 addr, size_t size, u64 range_start, size_t rangereturn true; } +static u32 +ivpu_fw_sched_mode_select (struct ivpu_device *vdev,const struct vpu_firmware_header *fw_hdr) +{ +if (ivpu_sched_mode !=IVPU_SCHED_MODE_AUTO ) +return ivpu_sched_mode; + +return VPU_SCHEDULING_MODE_OS ; +} +static int ivpu_fw_parse (struct ivpu_device *vdev) {struct ivpu_fw_info *fw = vdev->fw;
@@ -215,8 +224,10 @@ static int ivpu_fw_parse(struct ivpu_device *vdev) fw->dvfs_mode =0 ; + fw->sched_mode =ivpu_fw_sched_mode_select (vdev, fw_hdr); fw->primary_preempt_buf_size = fw_hdr->preemption_buffer_1_size; fw->secondary_preempt_buf_size = fw_hdr->preemption_buffer_2_size; +ivpu_info (vdev,"Scheduler mode: %s\n" , fw->sched_mode ?"HW" :"OS" ); if (fw_hdr->ro_section_start_address && !is_within_range(fw_hdr->ro_section_start_address, fw_hdr->ro_section_size,
@@ -605,8 +616,8 @@ void ivpu_fw_boot_params_setup(struct ivpu_device *vdev, struct vpu_boot_params boot_params->punit_telemetry_sram_base =ivpu_hw_telemetry_offset_get (vdev); boot_params->punit_telemetry_sram_size =ivpu_hw_telemetry_size_get (vdev); boot_params->vpu_telemetry_enable =ivpu_hw_telemetry_enable_get (vdev); - boot_params->vpu_scheduling_mode = vdev->hw->sched_mode; -if (vdev->hw->sched_mode ==VPU_SCHEDULING_MODE_HW ) + boot_params->vpu_scheduling_mode = vdev->fw->sched_mode; +if (vdev->fw->sched_mode ==VPU_SCHEDULING_MODE_HW ) boot_params->vpu_focus_present_timer_ms =IVPU_FOCUS_PRESENT_TIMER_MS ; boot_params->dvfs_mode = vdev->fw->dvfs_mode;if (!IVPU_WA (disable_d0i3_msg))
drivers/accel/ivpu/ivpu_fw.h +3 -0
@@ -6,6 +6,8 @@#ifndef __IVPU_FW_H__#define __IVPU_FW_H__ +#include "vpu_jsm_api.h" +#define FW_VERSION_HEADER_SIZE SZ_4K#define FW_VERSION_STR_SIZE SZ_256
@@ -36,6 +38,7 @@ struct ivpu_fw_info {u32 secondary_preempt_buf_size;u64 read_only_addr;u32 read_only_size; +u32 sched_mode; };int ivpu_fw_init (struct ivpu_device *vdev);
drivers/accel/ivpu/ivpu_hw.h +0 -1
@@ -46,7 +46,6 @@ struct ivpu_hw_info {u32 profiling_freq; } pll;u32 tile_fuse; -u32 sched_mode;u32 sku;u16 config;int dma_bits;
drivers/accel/ivpu/ivpu_hw_btrs.c +0 -2
@@ -163,7 +163,6 @@ static int info_init_mtl(struct ivpu_device *vdev) hw->tile_fuse =BTRS_MTL_TILE_FUSE_ENABLE_BOTH ; hw->sku =BTRS_MTL_TILE_SKU_BOTH ; hw->config =BTRS_MTL_WP_CONFIG_2_TILE_4_3_RATIO ; - hw->sched_mode = ivpu_sched_mode;return 0 ; }
@@ -178,7 +177,6 @@ static int info_init_lnl(struct ivpu_device *vdev)if (ret)return ret; - hw->sched_mode = ivpu_sched_mode; hw->tile_fuse = tile_fuse_config; hw->pll.profiling_freq =PLL_PROFILING_FREQ_DEFAULT ;
drivers/accel/ivpu/ivpu_job.c +7 -7
@@ -37,7 +37,7 @@ static int ivpu_preemption_buffers_create(struct ivpu_device *vdev,u64 secondary_size =ALIGN (vdev->fw->secondary_preempt_buf_size,PAGE_SIZE );struct ivpu_addr_range range; -if (vdev->hw->sched_mode !=VPU_SCHEDULING_MODE_HW ) +if (vdev->fw->sched_mode !=VPU_SCHEDULING_MODE_HW )return 0 ; range.start = vdev->hw->ranges.user.end - (primary_size *IVPU_NUM_CMDQS_PER_CTX );
@@ -68,7 +68,7 @@ static int ivpu_preemption_buffers_create(struct ivpu_device *vdev,static void ivpu_preemption_buffers_free (struct ivpu_device *vdev,struct ivpu_file_priv *file_priv,struct ivpu_cmdq *cmdq) { -if (vdev->hw->sched_mode !=VPU_SCHEDULING_MODE_HW ) +if (vdev->fw->sched_mode !=VPU_SCHEDULING_MODE_HW )return ;drm_WARN_ON (&vdev->drm, !cmdq->primary_preempt_buf);
@@ -149,7 +149,7 @@ static int ivpu_register_db(struct ivpu_file_priv *file_priv, struct ivpu_cmdq *struct ivpu_device *vdev = file_priv->vdev;int ret; -if (vdev->hw->sched_mode ==VPU_SCHEDULING_MODE_HW ) +if (vdev->fw->sched_mode ==VPU_SCHEDULING_MODE_HW ) ret =ivpu_jsm_hws_register_db (vdev, file_priv->ctx.id, cmdq->db_id, cmdq->db_id, cmdq->mem->vpu_addr,ivpu_bo_size (cmdq->mem));else
@@ -184,7 +184,7 @@ ivpu_cmdq_init(struct ivpu_file_priv *file_priv, struct ivpu_cmdq *cmdq, u16 eng jobq_header->tail =0 ;wmb ();/* Flush WC buffer for jobq->header */ -if (vdev->hw->sched_mode ==VPU_SCHEDULING_MODE_HW ) { +if (vdev->fw->sched_mode ==VPU_SCHEDULING_MODE_HW ) { ret =ivpu_hws_cmdq_init (file_priv, cmdq, engine, priority);if (ret)return ret;
@@ -211,7 +211,7 @@ static int ivpu_cmdq_fini(struct ivpu_file_priv *file_priv, struct ivpu_cmdq *cm cmdq->db_registered = false; -if (vdev->hw->sched_mode ==VPU_SCHEDULING_MODE_HW ) { +if (vdev->fw->sched_mode ==VPU_SCHEDULING_MODE_HW ) { ret =ivpu_jsm_hws_destroy_cmdq (vdev, file_priv->ctx.id, cmdq->db_id);if (!ret)ivpu_dbg (vdev,JOB ,"Command queue %d destroyed\n" , cmdq->db_id);
@@ -335,7 +335,7 @@ void ivpu_context_abort_locked(struct ivpu_file_priv *file_priv)ivpu_cmdq_fini_all (file_priv); -if (vdev->hw->sched_mode ==VPU_SCHEDULING_MODE_OS ) +if (vdev->fw->sched_mode ==VPU_SCHEDULING_MODE_OS )ivpu_jsm_context_release (vdev, file_priv->ctx.id); }
@@ -361,7 +361,7 @@ static int ivpu_cmdq_push_job(struct ivpu_cmdq *cmdq, struct ivpu_job *job)if (unlikely (ivpu_test_mode &IVPU_TEST_MODE_NULL_SUBMISSION )) entry->flags =VPU_JOB_FLAGS_NULL_SUBMISSION_MASK ; -if (vdev->hw->sched_mode ==VPU_SCHEDULING_MODE_HW && +if (vdev->fw->sched_mode ==VPU_SCHEDULING_MODE_HW && (unlikely (!(ivpu_test_mode &IVPU_TEST_MODE_PREEMPTION_DISABLE )))) { entry->primary_preempt_buf_addr = cmdq->primary_preempt_buf->vpu_addr; entry->primary_preempt_buf_size =ivpu_bo_size (cmdq->primary_preempt_buf);
drivers/accel/ivpu/ivpu_sysfs.c +24 -0
@@ -6,6 +6,8 @@#include <linux/device.h> #include <linux/err.h> +#include "ivpu_drv.h" +#include "ivpu_fw.h" #include "ivpu_hw.h" #include "ivpu_sysfs.h"
@@ -39,8 +41,30 @@ npu_busy_time_us_show(struct device *dev, struct device_attribute *attr, char *bstatic DEVICE_ATTR_RO (npu_busy_time_us); +/** +* DOC: sched_mode +* +* The sched_mode is used to report current NPU scheduling mode. +* +* It returns following strings: +* - "HW" - Hardware Scheduler mode +* - "OS" - Operating System Scheduler mode +* +*/ +static ssize_t +sched_mode_show (struct device *dev,struct device_attribute *attr,char *buf) +{ +struct drm_device *drm =dev_get_drvdata (dev); +struct ivpu_device *vdev =to_ivpu_device (drm); + +return sysfs_emit (buf,"%s\n" , vdev->fw->sched_mode ?"HW" :"OS" ); +} + +static DEVICE_ATTR_RO (sched_mode); +static struct attribute *ivpu_dev_attrs[] = { &dev_attr_npu_busy_time_us.attr, + &dev_attr_sched_mode.attr,NULL , };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 35/280 accel/ivpu: Fix the NPUs DPU frequency calculation
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andrzej Kacprowski <[email protected]>
[ Upstream commit 6c2b75404d33caa46a582f2791a70f92232adb71 ]
Fix the frequency returned to the user space by the DRM_IVPU_PARAM_CORE_CLOCK_RATE GET_PARAM IOCTL. The kernel driver returned CPU frequency for MTL and bare PLL frequency for LNL - this was inconsistent and incorrect for both platforms. With this fix the driver returns maximum frequency of the NPU data processing unit (DPU) for all HW generations. This is what user space always expected.
Also do not set CPU frequency in boot params - the firmware does not use frequency passed from the driver, it was only used by the early pre-production firmware.
With that we can remove CPU frequency calculation code.
Show NPU frequency in FREQ_CHANGE interrupt when frequency tracking is enabled.
--- drivers/accel/ivpu/ivpu_drv.c | 4 +- drivers/accel/ivpu/ivpu_fw.c | 3 +- drivers/accel/ivpu/ivpu_hw.h | 11 +-- drivers/accel/ivpu/ivpu_hw_btrs.c | 126 +++++++++++++----------------- drivers/accel/ivpu/ivpu_hw_btrs.h | 6 +- include/uapi/drm/ivpu_accel.h | 4 +- 6 files changed, 66 insertions(+), 88 deletions(-)
drivers/accel/ivpu/ivpu_drv.c +2 -2
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (C) 2020-2024 Intel Corporation +* Copyright (C) 2020-2025 Intel Corporation */ #include <linux/firmware.h>
@@ -165,7 +165,7 @@ static int ivpu_get_param_ioctl(struct drm_device *dev, void *data, struct drm_f args->value = vdev->platform;break ;case DRM_IVPU_PARAM_CORE_CLOCK_RATE : - args->value =ivpu_hw_ratio_to_freq (vdev, vdev->hw->pll.max_ratio); + args->value =ivpu_hw_dpu_max_freq_get (vdev);break ;case DRM_IVPU_PARAM_NUM_CONTEXTS : args->value =ivpu_get_context_count (vdev);
drivers/accel/ivpu/ivpu_fw.c +1 -2
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0-only /* -* Copyright (C) 2020-2024 Intel Corporation +* Copyright (C) 2020-2025 Intel Corporation */ #include <linux/firmware.h>
@@ -556,7 +556,6 @@ void ivpu_fw_boot_params_setup(struct ivpu_device *vdev, struct vpu_boot_params boot_params->magic =VPU_BOOT_PARAMS_MAGIC ; boot_params->vpu_id =to_pci_dev (vdev->drm.dev)->bus->number; - boot_params->frequency =ivpu_hw_pll_freq_get (vdev);/* * This param is a debug firmware feature. It switches default clock
drivers/accel/ivpu/ivpu_hw.h +3 -8
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ /* -* Copyright (C) 2020-2024 Intel Corporation +* Copyright (C) 2020-2025 Intel Corporation */ #ifndef __IVPU_HW_H__
@@ -86,9 +86,9 @@ static inline u64 ivpu_hw_range_size(const struct ivpu_addr_range *range)return range->end - range->start; } -static inline u32 ivpu_hw_ratio_to_freq (struct ivpu_device *vdev,u32 ratio) +static inline u32 ivpu_hw_dpu_max_freq_get (struct ivpu_device *vdev) { -return ivpu_hw_btrs_ratio_to_freq (vdev, ratio); +return ivpu_hw_btrs_dpu_max_freq_get (vdev); }static inline void ivpu_hw_irq_clear (struct ivpu_device *vdev)
@@ -96,11 +96,6 @@ static inline void ivpu_hw_irq_clear(struct ivpu_device *vdev)ivpu_hw_ip_irq_clear (vdev); } -static inline u32 ivpu_hw_pll_freq_get (struct ivpu_device *vdev) -{ -return ivpu_hw_btrs_pll_freq_get (vdev); -} -static inline u32 ivpu_hw_profiling_freq_get (struct ivpu_device *vdev) {return vdev->hw->pll.profiling_freq;
drivers/accel/ivpu/ivpu_hw_btrs.c +56 -70
185 lines not on this page · raw message
drivers/accel/ivpu/ivpu_hw_btrs.h +2 -4
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only */ /* -* Copyright (C) 2020-2024 Intel Corporation +* Copyright (C) 2020-2025 Intel Corporation */ #ifndef __IVPU_HW_BTRS_H__
@@ -13,7 +13,6 @@#define PLL_PROFILING_FREQ_DEFAULT 38400000#define PLL_PROFILING_FREQ_HIGH 400000000 -#define PLL_RATIO_TO_FREQ (x) ((x) * PLL_REF_CLK_FREQ)#define DCT_DEFAULT_ACTIVE_PERCENT 15u#define DCT_PERIOD_US 35300u
@@ -32,12 +31,11 @@ int ivpu_hw_btrs_ip_reset(struct ivpu_device *vdev);void ivpu_hw_btrs_profiling_freq_reg_set_lnl (struct ivpu_device *vdev);void ivpu_hw_btrs_ats_print_lnl (struct ivpu_device *vdev);void ivpu_hw_btrs_clock_relinquish_disable_lnl (struct ivpu_device *vdev); +u32 ivpu_hw_btrs_dpu_max_freq_get (struct ivpu_device *vdev);bool ivpu_hw_btrs_irq_handler_mtl (struct ivpu_device *vdev,int irq);bool ivpu_hw_btrs_irq_handler_lnl (struct ivpu_device *vdev,int irq);int ivpu_hw_btrs_dct_get_request (struct ivpu_device *vdev,bool *enable);void ivpu_hw_btrs_dct_set_status (struct ivpu_device *vdev,bool enable,u32 dct_percent); -u32 ivpu_hw_btrs_pll_freq_get (struct ivpu_device *vdev); -u32 ivpu_hw_btrs_ratio_to_freq (struct ivpu_device *vdev,u32 ratio);u32 ivpu_hw_btrs_telemetry_offset_get (struct ivpu_device *vdev);u32 ivpu_hw_btrs_telemetry_size_get (struct ivpu_device *vdev);u32 ivpu_hw_btrs_telemetry_enable_get (struct ivpu_device *vdev);
include/uapi/drm/ivpu_accel.h +2 -2
@@ -1,6 +1,6 @@/* SPDX-License-Identifier: GPL-2.0-only WITH Linux-syscall-note */ /* -* Copyright (C) 2020-2024 Intel Corporation +* Copyright (C) 2020-2025 Intel Corporation */ #ifndef __UAPI_IVPU_DRM_H__
@@ -131,7 +131,7 @@ struct drm_ivpu_param {* platform type when executing on a simulator or emulator (read-only) * * %DRM_IVPU_PARAM_CORE_CLOCK_RATE: -* Current PLL frequency (read-only) +* Maximum frequency of the NPU data processing unit clock (read-only) * * %DRM_IVPU_PARAM_NUM_CONTEXTS: * Maximum number of simultaneously existing contexts (read-only)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 9/280 media: i2c: imx214: Use subdev active state
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: André Apitzsch <[email protected]>
[ Upstream commit b6832ff659f55f86198bb8de40f278a20bda0920 ]
Port the imx214 sensor driver to use the subdev active state.
Move all the format configuration to the subdevice state and simplify the format handling, locking and initialization.
While at it, simplify imx214_start_streaming() by removing unneeded goto statements and the corresponding error label.
Stable-dep-of: acc294519f17 ("media: i2c: imx214: Fix link frequency validation")
--- drivers/media/i2c/imx214.c | 155 ++++++++++++------------------------- 1 file changed, 50 insertions(+), 105 deletions(-)
drivers/media/i2c/imx214.c +50 -105
@@ -59,8 +59,6 @@ struct imx214 {struct v4l2_subdev sd;struct media_pad pad; -struct v4l2_mbus_framefmt fmt; -struct v4l2_rect crop;struct v4l2_ctrl_handler ctrls;struct v4l2_ctrl *pixel_rate;
@@ -71,12 +69,6 @@ struct imx214 {struct regulator_bulk_data supplies[IMX214_NUM_SUPPLIES ];struct gpio_desc *enable_gpio; - -/* -* Serialize control access, get/set format, get selection -* and start streaming. -*/ -struct mutex mutex; };struct reg_8 {
@@ -490,6 +482,22 @@ static int __maybe_unused imx214_power_off(struct device *dev)return 0 ; } +static void imx214_update_pad_format (struct imx214 *imx214, +const struct imx214_mode *mode, +struct v4l2_mbus_framefmt *fmt,u32 code) +{ + fmt->code =IMX214_MBUS_CODE ; + fmt->width = mode->width; + fmt->height = mode->height; + fmt->field =V4L2_FIELD_NONE ; + fmt->colorspace =V4L2_COLORSPACE_SRGB ; + fmt->ycbcr_enc =V4L2_MAP_YCBCR_ENC_DEFAULT (fmt->colorspace); + fmt->quantization =V4L2_MAP_QUANTIZATION_DEFAULT (true, + fmt->colorspace, + fmt->ycbcr_enc); + fmt->xfer_func =V4L2_MAP_XFER_FUNC_DEFAULT (fmt->colorspace); +} +static int imx214_enum_mbus_code (struct v4l2_subdev *sd,struct v4l2_subdev_state *sd_state,struct v4l2_subdev_mbus_code_enum *code)
@@ -549,52 +557,6 @@ static const struct v4l2_subdev_core_ops imx214_core_ops = {#endif }; -static struct v4l2_mbus_framefmt * -__imx214_get_pad_format (struct imx214 *imx214, -struct v4l2_subdev_state *sd_state, -unsigned int pad, -enum v4l2_subdev_format_whence which) -{ -switch (which) { -case V4L2_SUBDEV_FORMAT_TRY : -return v4l2_subdev_state_get_format (sd_state, pad); -case V4L2_SUBDEV_FORMAT_ACTIVE : -return &imx214->fmt; -default : -return NULL ; - } -} - -static int imx214_get_format (struct v4l2_subdev *sd, -struct v4l2_subdev_state *sd_state, -struct v4l2_subdev_format *format) -{ -struct imx214 *imx214 =to_imx214 (sd); - -mutex_lock (&imx214->mutex); - format->format = *__imx214_get_pad_format (imx214, sd_state, - format->pad, - format->which); -mutex_unlock (&imx214->mutex); - -return 0 ; -} - -static struct v4l2_rect * -__imx214_get_pad_crop (struct imx214 *imx214, -struct v4l2_subdev_state *sd_state, -unsigned int pad,enum v4l2_subdev_format_whence which) -{ -switch (which) { -case V4L2_SUBDEV_FORMAT_TRY : -return v4l2_subdev_state_get_crop (sd_state, pad); -case V4L2_SUBDEV_FORMAT_ACTIVE : -return &imx214->crop; -default : -return NULL ; - } -} -static int imx214_set_format (struct v4l2_subdev *sd,struct v4l2_subdev_state *sd_state,struct v4l2_subdev_format *format)
@@ -604,34 +566,20 @@ static int imx214_set_format(struct v4l2_subdev *sd,struct v4l2_rect *__crop;const struct imx214_mode *mode; -mutex_lock (&imx214->mutex); - - __crop =__imx214_get_pad_crop (imx214, sd_state, format->pad, - format->which); - mode =v4l2_find_nearest_size (imx214_modes,ARRAY_SIZE (imx214_modes), width, height, format->format.width, format->format.height); - __crop->width = mode->width; - __crop->height = mode->height; - - __format =__imx214_get_pad_format (imx214, sd_state, format->pad, - format->which); - __format->width = __crop->width; - __format->height = __crop->height; - __format->code =IMX214_MBUS_CODE ; - __format->field =V4L2_FIELD_NONE ; - __format->colorspace =V4L2_COLORSPACE_SRGB ; - __format->ycbcr_enc =V4L2_MAP_YCBCR_ENC_DEFAULT (__format->colorspace); - __format->quantization =V4L2_MAP_QUANTIZATION_DEFAULT (true, - __format->colorspace, __format->ycbcr_enc); - __format->xfer_func =V4L2_MAP_XFER_FUNC_DEFAULT (__format->colorspace); +imx214_update_pad_format (imx214, mode, &format->format, + format->format.code); + __format =v4l2_subdev_state_get_format (sd_state,0 ); - format->format = *__format; + *__format = format->format; -mutex_unlock (&imx214->mutex); + __crop =v4l2_subdev_state_get_crop (sd_state,0 ); + __crop->width = mode->width; + __crop->height = mode->height;return 0 ; }
@@ -640,14 +588,9 @@ static int imx214_get_selection(struct v4l2_subdev *sd, struct v4l2_subdev_state *sd_state, struct v4l2_subdev_selection *sel) { - struct imx214 *imx214 = to_imx214(sd); -switch (sel->target) {case V4L2_SEL_TGT_CROP : -mutex_lock (&imx214->mutex); - sel->r = *__imx214_get_pad_crop (imx214, sd_state, sel->pad, - sel->which); -mutex_unlock (&imx214->mutex); + sel->r = *v4l2_subdev_state_get_crop (sd_state,0 );return 0 ;case V4L2_SEL_TGT_NATIVE_SIZE :
@@ -826,40 +769,35 @@ static int imx214_write_table(struct imx214 *imx214,static int imx214_start_streaming (struct imx214 *imx214) { +const struct v4l2_mbus_framefmt *fmt; +struct v4l2_subdev_state *state;const struct imx214_mode *mode;int ret; -mutex_lock (&imx214->mutex); ret =imx214_write_table (imx214, mode_table_common);if (ret <0 ) {dev_err (imx214->dev,"could not sent common table %d\n" , ret); - goto error; +return ret; } - mode =v4l2_find_nearest_size (imx214_modes, -ARRAY_SIZE (imx214_modes), width, height, - imx214->fmt.width, imx214->fmt.height); + state =v4l2_subdev_get_locked_active_state (&imx214->sd); + fmt =v4l2_subdev_state_get_format (state,0 ); + mode =v4l2_find_nearest_size (imx214_modes,ARRAY_SIZE (imx214_modes), + width, height, fmt->width, fmt->height); ret =imx214_write_table (imx214, mode->reg_table);if (ret <0 ) {dev_err (imx214->dev,"could not sent mode table %d\n" , ret); - goto error; +return ret; } ret =__v4l2_ctrl_handler_setup (&imx214->ctrls);if (ret <0 ) {dev_err (imx214->dev,"could not sync v4l2 controls\n" ); - goto error; +return ret; } ret =regmap_write (imx214->regmap,IMX214_REG_MODE_SELECT ,IMX214_MODE_STREAMING ); -if (ret <0 ) { +if (ret <0 )dev_err (imx214->dev,"could not sent start table %d\n" , ret); - goto error; - } -mutex_unlock (&imx214->mutex); -return 0 ; - -error: -mutex_unlock (&imx214->mutex);return ret; }
@@ -877,6 +815,7 @@ static int imx214_stop_streaming(struct imx214 *imx214)static int imx214_s_stream (struct v4l2_subdev *subdev,int enable) {struct imx214 *imx214 =to_imx214 (subdev); +struct v4l2_subdev_state *state;int ret;if (enable) {
@@ -884,7 +823,9 @@ static int imx214_s_stream(struct v4l2_subdev *subdev, int enable)if (ret <0 )return ret; + state =v4l2_subdev_lock_and_get_active_state (subdev); ret =imx214_start_streaming (imx214); +v4l2_subdev_unlock_state (state);if (ret <0 ) goto err_rpm_put; }else {
@@ -948,7 +889,7 @@ static const struct v4l2_subdev_pad_ops imx214_subdev_pad_ops = { .enum_mbus_code = imx214_enum_mbus_code, .enum_frame_size = imx214_enum_frame_size, .enum_frame_interval = imx214_enum_frame_interval, - .get_fmt = imx214_get_format, + .get_fmt = v4l2_subdev_get_fmt, .set_fmt = imx214_set_format, .get_selection = imx214_get_selection, .get_frame_interval = imx214_get_frame_interval,
@@ -1079,9 +1020,6 @@ static int imx214_probe(struct i2c_client *client)if (ret <0 ) goto error_power_off; -mutex_init (&imx214->mutex); - imx214->ctrls.lock = &imx214->mutex; - imx214->sd.flags |=V4L2_SUBDEV_FL_HAS_DEVNODE ; imx214->pad.flags =MEDIA_PAD_FL_SOURCE ; imx214->sd.dev = &client->dev;
@@ -1093,7 +1031,12 @@ static int imx214_probe(struct i2c_client *client) goto free_ctrl; } -imx214_entity_init_state (&imx214->sd,NULL ); + imx214->sd.state_lock = imx214->ctrls.lock; + ret =v4l2_subdev_init_finalize (&imx214->sd); +if (ret <0 ) { +dev_err (dev,"subdev init error: %d\n" , ret); + goto free_entity; + }pm_runtime_set_active (imx214->dev);pm_runtime_enable (imx214->dev);
@@ -1101,20 +1044,22 @@ static int imx214_probe(struct i2c_client *client) ret =v4l2_async_register_subdev_sensor (&imx214->sd);if (ret <0 ) {dev_err (dev,"could not register v4l2 device\n" ); - goto free_entity; + goto error_subdev_cleanup; }pm_runtime_idle (imx214->dev);return 0 ; -free_entity: +error_subdev_cleanup:pm_runtime_disable (imx214->dev);pm_runtime_set_suspended (&client->dev); +v4l2_subdev_cleanup (&imx214->sd); + +free_entity:media_entity_cleanup (&imx214->sd.entity); free_ctrl: -mutex_destroy (&imx214->mutex);v4l2_ctrl_handler_free (&imx214->ctrls); error_power_off:
@@ -1129,9 +1074,9 @@ static void imx214_remove(struct i2c_client *client)struct imx214 *imx214 =to_imx214 (sd);v4l2_async_unregister_subdev (&imx214->sd); +v4l2_subdev_cleanup (sd);media_entity_cleanup (&imx214->sd.entity);v4l2_ctrl_handler_free (&imx214->ctrls); -mutex_destroy (&imx214->mutex);pm_runtime_disable (&client->dev);if (!pm_runtime_status_suspended (&client->dev)) {imx214_power_off (imx214->dev);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 36/280 ksmbd: use __GFP_RETRY_MAYFAIL
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <[email protected]>
[ Upstream commit 0066f623bce8f98b69b752ee03d46a5047c281b8 ]
Prefer to report ENOMEM rather than incur the oom for allocations in ksmbd. __GFP_NORETRY could not achieve that, It would fail the allocations just too easily. __GFP_RETRY_MAYFAIL will keep retrying the allocation until there is no more progress and fail the allocation instead go OOM and let the caller to deal with it.
Stable-dep-of: 21a4e47578d4 ("ksmbd: fix use-after-free in __smb2_lease_break_noti()")
--- fs/smb/server/asn1.c | 6 ++--- fs/smb/server/auth.c | 19 ++++++++-------- fs/smb/server/connection.c | 4 ++-- fs/smb/server/crypto_ctx.c | 6 ++--- fs/smb/server/glob.h | 2 ++ fs/smb/server/ksmbd_work.c | 10 ++++---- fs/smb/server/mgmt/ksmbd_ida.c | 11 +++++---- fs/smb/server/mgmt/share_config.c | 10 ++++---- fs/smb/server/mgmt/tree_connect.c | 5 ++-- fs/smb/server/mgmt/user_config.c | 8 +++---- fs/smb/server/mgmt/user_session.c | 10 ++++---- fs/smb/server/misc.c | 11 +++++---- fs/smb/server/ndr.c | 10 ++++---- fs/smb/server/oplock.c | 12 +++++----- fs/smb/server/server.c | 4 ++-- fs/smb/server/smb2pdu.c | 38 +++++++++++++++---------------- fs/smb/server/smb_common.c | 2 +- fs/smb/server/smbacl.c | 23 ++++++++++--------- fs/smb/server/transport_ipc.c | 6 ++--- fs/smb/server/transport_rdma.c | 10 ++++---- fs/smb/server/transport_tcp.c | 12 +++++----- fs/smb/server/unicode.c | 4 ++-- fs/smb/server/vfs.c | 12 +++++----- fs/smb/server/vfs_cache.c | 10 ++++---- 24 files changed, 126 insertions(+), 119 deletions(-)
fs/smb/server/asn1.c +3 -3
@@ -104,7 +104,7 @@ int build_spnego_ntlmssp_neg_blob(unsigned char **pbuffer, u16 *buflen, oid_len + ntlmssp_len) * 2 + neg_result_len + oid_len + ntlmssp_len; - buf =kmalloc (total_len,GFP_KERNEL ); + buf =kmalloc (total_len,KSMBD_DEFAULT_GFP );if (!buf)return -ENOMEM ;
@@ -140,7 +140,7 @@ int build_spnego_ntlmssp_auth_blob(unsigned char **pbuffer, u16 *buflen,int total_len =4 +compute_asn_hdr_len_bytes (neg_result_len) *2 + neg_result_len; - buf =kmalloc (total_len,GFP_KERNEL ); + buf =kmalloc (total_len,KSMBD_DEFAULT_GFP );if (!buf)return -ENOMEM ;
@@ -217,7 +217,7 @@ static int ksmbd_neg_token_alloc(void *context, size_t hdrlen,if (!vlen)return -EINVAL ; - conn->mechToken =kmemdup_nul (value, vlen,GFP_KERNEL ); + conn->mechToken =kmemdup_nul (value, vlen,KSMBD_DEFAULT_GFP );if (!conn->mechToken)return -ENOMEM ;
fs/smb/server/auth.c +10 -9
@@ -151,7 +151,7 @@ static int calc_ntlmv2_hash(struct ksmbd_conn *conn, struct ksmbd_session *sess,/* convert user_name to unicode */ len =strlen (user_name (sess->user)); - uniname =kzalloc (2 +UNICODE_LEN (len),GFP_KERNEL ); + uniname =kzalloc (2 +UNICODE_LEN (len),KSMBD_DEFAULT_GFP );if (!uniname) { ret = -ENOMEM ; goto out;
@@ -175,7 +175,7 @@ static int calc_ntlmv2_hash(struct ksmbd_conn *conn, struct ksmbd_session *sess,/* Convert domain name or conn name to unicode and uppercase */ len =strlen (dname); - domain =kzalloc (2 +UNICODE_LEN (len),GFP_KERNEL ); + domain =kzalloc (2 +UNICODE_LEN (len),KSMBD_DEFAULT_GFP );if (!domain) { ret = -ENOMEM ; goto out;
@@ -254,7 +254,7 @@ int ksmbd_auth_ntlmv2(struct ksmbd_conn *conn, struct ksmbd_session *sess, } len =CIFS_CRYPTO_KEY_SIZE + blen; - construct =kzalloc (len,GFP_KERNEL ); + construct =kzalloc (len,KSMBD_DEFAULT_GFP );if (!construct) { rc = -ENOMEM ; goto out;
@@ -361,7 +361,7 @@ int ksmbd_decode_ntlmssp_auth_blob(struct authenticate_message *authblob,if (sess_key_len >CIFS_KEY_SIZE )return -EINVAL ; - ctx_arc4 =kmalloc (sizeof (*ctx_arc4),GFP_KERNEL ); + ctx_arc4 =kmalloc (sizeof (*ctx_arc4),KSMBD_DEFAULT_GFP );if (!ctx_arc4)return -ENOMEM ;
@@ -451,7 +451,7 @@ ksmbd_build_ntlmssp_challenge_blob(struct challenge_message *chgblob, chgblob->NegotiateFlags =cpu_to_le32 (flags); len =strlen (ksmbd_netbios_name ()); - name =kmalloc (2 +UNICODE_LEN (len),GFP_KERNEL ); + name =kmalloc (2 +UNICODE_LEN (len),KSMBD_DEFAULT_GFP );if (!name)return -ENOMEM ;
@@ -1045,7 +1045,7 @@ static struct scatterlist *ksmbd_init_sg(struct kvec *iov, unsigned int nvec,if (!nvec)return NULL ; - nr_entries =kcalloc (nvec,sizeof (int ),GFP_KERNEL ); + nr_entries =kcalloc (nvec,sizeof (int ),KSMBD_DEFAULT_GFP );if (!nr_entries)return NULL ;
@@ -1065,7 +1065,8 @@ static struct scatterlist *ksmbd_init_sg(struct kvec *iov, unsigned int nvec,/* Add two entries for transform header and signature */ total_entries +=2 ; - sg =kmalloc_array (total_entries,sizeof (struct scatterlist ),GFP_KERNEL ); + sg =kmalloc_array (total_entries,sizeof (struct scatterlist ), +KSMBD_DEFAULT_GFP );if (!sg) {kfree (nr_entries);return NULL ;
@@ -1165,7 +1166,7 @@ int ksmbd_crypt_message(struct ksmbd_work *work, struct kvec *iov, goto free_ctx; } - req =aead_request_alloc (tfm,GFP_KERNEL ); + req =aead_request_alloc (tfm,KSMBD_DEFAULT_GFP );if (!req) { rc = -ENOMEM ; goto free_ctx;
@@ -1184,7 +1185,7 @@ int ksmbd_crypt_message(struct ksmbd_work *work, struct kvec *iov, } iv_len =crypto_aead_ivsize (tfm); - iv =kzalloc (iv_len,GFP_KERNEL ); + iv =kzalloc (iv_len,KSMBD_DEFAULT_GFP );if (!iv) { rc = -ENOMEM ; goto free_sg;
fs/smb/server/connection.c +2 -2
@@ -52,7 +52,7 @@ struct ksmbd_conn *ksmbd_conn_alloc(void) {struct ksmbd_conn *conn; - conn =kzalloc (sizeof (struct ksmbd_conn ),GFP_KERNEL ); + conn =kzalloc (sizeof (struct ksmbd_conn ),KSMBD_DEFAULT_GFP );if (!conn)return NULL ;
@@ -369,7 +369,7 @@ int ksmbd_conn_handler_loop(void *p)/* 4 for rfc1002 length field */ /* 1 for implied bcc[0] */ size = pdu_size +4 +1 ; - conn->request_buf =kvmalloc (size,GFP_KERNEL ); + conn->request_buf =kvmalloc (size,KSMBD_DEFAULT_GFP );if (!conn->request_buf)break ;
fs/smb/server/crypto_ctx.c +3 -3
@@ -89,7 +89,7 @@ static struct shash_desc *alloc_shash_desc(int id)return NULL ; shash =kzalloc (sizeof (*shash) +crypto_shash_descsize (tfm), -GFP_KERNEL ); +KSMBD_DEFAULT_GFP );if (!shash)crypto_free_shash (tfm);else
@@ -133,7 +133,7 @@ static struct ksmbd_crypto_ctx *ksmbd_find_crypto_ctx(void) ctx_list.avail_ctx++;spin_unlock (&ctx_list.ctx_lock); - ctx =kzalloc (sizeof (struct ksmbd_crypto_ctx ),GFP_KERNEL ); + ctx =kzalloc (sizeof (struct ksmbd_crypto_ctx ),KSMBD_DEFAULT_GFP );if (!ctx) {spin_lock (&ctx_list.ctx_lock); ctx_list.avail_ctx--;
@@ -258,7 +258,7 @@ int ksmbd_crypto_create(void)init_waitqueue_head (&ctx_list.ctx_wait); ctx_list.avail_ctx =1 ; - ctx =kzalloc (sizeof (struct ksmbd_crypto_ctx ),GFP_KERNEL ); + ctx =kzalloc (sizeof (struct ksmbd_crypto_ctx ),KSMBD_DEFAULT_GFP );if (!ctx)return -ENOMEM ;list_add (&ctx->list, &ctx_list.idle_ctx);
fs/smb/server/glob.h +2 -0
@@ -44,4 +44,6 @@ extern int ksmbd_debug_types;#define UNICODE_LEN (x) ((x) * 2) +#define KSMBD_DEFAULT_GFP (GFP_KERNEL | __GFP_RETRY_MAYFAIL) +#endif /* __KSMBD_GLOB_H */
fs/smb/server/ksmbd_work.c +5 -5
@@ -18,7 +18,7 @@ static struct workqueue_struct *ksmbd_wq;struct ksmbd_work *ksmbd_alloc_work_struct (void ) { -struct ksmbd_work *work =kmem_cache_zalloc (work_cache,GFP_KERNEL ); +struct ksmbd_work *work =kmem_cache_zalloc (work_cache,KSMBD_DEFAULT_GFP );if (work) { work->compound_fid =KSMBD_NO_FID ;
@@ -29,7 +29,7 @@ struct ksmbd_work *ksmbd_alloc_work_struct(void)INIT_LIST_HEAD (&work->aux_read_list); work->iov_alloc_cnt =4 ; work->iov =kcalloc (work->iov_alloc_cnt,sizeof (struct kvec ), -GFP_KERNEL ); +KSMBD_DEFAULT_GFP );if (!work->iov) {kmem_cache_free (work_cache, work); work =NULL ;
@@ -111,7 +111,7 @@ static int __ksmbd_iov_pin_rsp(struct ksmbd_work *work, void *ib, int len,if (aux_size) { need_iov_cnt++; - ar =kmalloc (sizeof (struct aux_read ),GFP_KERNEL ); + ar =kmalloc (sizeof (struct aux_read ),KSMBD_DEFAULT_GFP );if (!ar)return -ENOMEM ; }
@@ -122,7 +122,7 @@ static int __ksmbd_iov_pin_rsp(struct ksmbd_work *work, void *ib, int len, work->iov_alloc_cnt +=4 ; new =krealloc (work->iov,sizeof (struct kvec ) * work->iov_alloc_cnt, -GFP_KERNEL | __GFP_ZERO); +KSMBD_DEFAULT_GFP | __GFP_ZERO);if (!new) {kfree (ar); work->iov_alloc_cnt -=4 ;
@@ -166,7 +166,7 @@ int ksmbd_iov_pin_rsp_read(struct ksmbd_work *work, void *ib, int len,int allocate_interim_rsp_buf (struct ksmbd_work *work) { - work->response_buf =kzalloc (MAX_CIFS_SMALL_BUFFER_SIZE ,GFP_KERNEL ); + work->response_buf =kzalloc (MAX_CIFS_SMALL_BUFFER_SIZE ,KSMBD_DEFAULT_GFP );if (!work->response_buf)return -ENOMEM ; work->response_sz =MAX_CIFS_SMALL_BUFFER_SIZE ;
fs/smb/server/mgmt/ksmbd_ida.c +6 -5
@@ -4,31 +4,32 @@*/ #include "ksmbd_ida.h" +#include "../glob.h" int ksmbd_acquire_smb2_tid (struct ida *ida) { -return ida_alloc_range (ida,1 ,0xFFFFFFFE ,GFP_KERNEL ); +return ida_alloc_range (ida,1 ,0xFFFFFFFE ,KSMBD_DEFAULT_GFP ); }int ksmbd_acquire_smb2_uid (struct ida *ida) {int id; - id =ida_alloc_min (ida,1 ,GFP_KERNEL ); + id =ida_alloc_min (ida,1 ,KSMBD_DEFAULT_GFP );if (id ==0xFFFE ) - id =ida_alloc_min (ida,1 ,GFP_KERNEL ); + id =ida_alloc_min (ida,1 ,KSMBD_DEFAULT_GFP );return id; }int ksmbd_acquire_async_msg_id (struct ida *ida) { -return ida_alloc_min (ida,1 ,GFP_KERNEL ); +return ida_alloc_min (ida,1 ,KSMBD_DEFAULT_GFP ); }int ksmbd_acquire_id (struct ida *ida) { -return ida_alloc (ida,GFP_KERNEL ); +return ida_alloc (ida,KSMBD_DEFAULT_GFP ); }void ksmbd_release_id (struct ida *ida,int id)
fs/smb/server/mgmt/share_config.c +5 -5
@@ -102,11 +102,11 @@ static int parse_veto_list(struct ksmbd_share_config *share,if (!sz)break ; - p =kzalloc (sizeof (struct ksmbd_veto_pattern ),GFP_KERNEL ); + p =kzalloc (sizeof (struct ksmbd_veto_pattern ),KSMBD_DEFAULT_GFP );if (!p)return -ENOMEM ; - p->pattern =kstrdup (veto_list,GFP_KERNEL ); + p->pattern =kstrdup (veto_list,KSMBD_DEFAULT_GFP );if (!p->pattern) {kfree (p);return -ENOMEM ;
@@ -150,14 +150,14 @@ static struct ksmbd_share_config *share_config_request(struct ksmbd_work *work, goto out; } - share =kzalloc (sizeof (struct ksmbd_share_config ),GFP_KERNEL ); + share =kzalloc (sizeof (struct ksmbd_share_config ),KSMBD_DEFAULT_GFP );if (!share) goto out; share->flags = resp->flags;atomic_set (&share->refcount,1 );INIT_LIST_HEAD (&share->veto_list); - share->name =kstrdup (name,GFP_KERNEL ); + share->name =kstrdup (name,KSMBD_DEFAULT_GFP );if (!test_share_config_flag (share,KSMBD_SHARE_FLAG_PIPE )) {int path_len =PATH_MAX ;
@@ -166,7 +166,7 @@ static struct ksmbd_share_config *share_config_request(struct ksmbd_work *work, path_len = resp->payload_sz - resp->veto_list_sz; share->path =kstrndup (ksmbd_share_config_path (resp), path_len, -GFP_KERNEL ); +KSMBD_DEFAULT_GFP );if (share->path) { share->path_sz =strlen (share->path); while (share->path_sz > 1 &&
fs/smb/server/mgmt/tree_connect.c +3 -2
@@ -31,7 +31,8 @@ ksmbd_tree_conn_connect(struct ksmbd_work *work, const char *share_name)if (!sc)return status; - tree_conn =kzalloc (sizeof (struct ksmbd_tree_connect ),GFP_KERNEL ); + tree_conn =kzalloc (sizeof (struct ksmbd_tree_connect ), +KSMBD_DEFAULT_GFP );if (!tree_conn) { status.ret = -ENOMEM ; goto out_error;
@@ -80,7 +81,7 @@ ksmbd_tree_conn_connect(struct ksmbd_work *work, const char *share_name)init_waitqueue_head (&tree_conn->refcount_q); ret =xa_err (xa_store (&sess->tree_conns, tree_conn->id, tree_conn, -GFP_KERNEL )); +KSMBD_DEFAULT_GFP ));if (ret) { status.ret = -ENOMEM ; goto out_error;
fs/smb/server/mgmt/user_config.c +4 -4
@@ -36,16 +36,16 @@ struct ksmbd_user *ksmbd_alloc_user(struct ksmbd_login_response *resp, {struct ksmbd_user *user; - user =kmalloc (sizeof (struct ksmbd_user ),GFP_KERNEL ); + user =kmalloc (sizeof (struct ksmbd_user ),KSMBD_DEFAULT_GFP );if (!user)return NULL ; - user->name =kstrdup (resp->account,GFP_KERNEL ); + user->name =kstrdup (resp->account,KSMBD_DEFAULT_GFP ); user->flags = resp->status; user->gid = resp->gid; user->uid = resp->uid; user->passkey_sz = resp->hash_sz; - user->passkey =kmalloc (resp->hash_sz,GFP_KERNEL ); + user->passkey =kmalloc (resp->hash_sz,KSMBD_DEFAULT_GFP );if (user->passkey)memcpy (user->passkey, resp->hash, resp->hash_sz);
@@ -64,7 +64,7 @@ struct ksmbd_user *ksmbd_alloc_user(struct ksmbd_login_response *resp, user->sgid =kmemdup (resp_ext->____payload, resp_ext->ngroups *sizeof (gid_t), -GFP_KERNEL ); +KSMBD_DEFAULT_GFP );if (!user->sgid) goto err_free;
fs/smb/server/mgmt/user_session.c +5 -5
@@ -98,7 +98,7 @@ int ksmbd_session_rpc_open(struct ksmbd_session *sess, char *rpc_name)if (!method)return -EINVAL ; - entry =kzalloc (sizeof (struct ksmbd_session_rpc ),GFP_KERNEL ); + entry =kzalloc (sizeof (struct ksmbd_session_rpc ),KSMBD_DEFAULT_GFP );if (!entry)return -ENOMEM ;
@@ -106,7 +106,7 @@ int ksmbd_session_rpc_open(struct ksmbd_session *sess, char *rpc_name) entry->id =ksmbd_ipc_id_alloc ();if (entry->id <0 ) goto free_entry; - old =xa_store (&sess->rpc_handle_list, entry->id, entry,GFP_KERNEL ); + old =xa_store (&sess->rpc_handle_list, entry->id, entry,KSMBD_DEFAULT_GFP );if (xa_is_err (old)) goto free_id;
@@ -201,7 +201,7 @@ int ksmbd_session_register(struct ksmbd_conn *conn, sess->dialect = conn->dialect;memcpy (sess->ClientGUID, conn->ClientGUID,SMB2_CLIENT_GUID_SIZE );ksmbd_expire_session (conn); -return xa_err (xa_store (&conn->sessions, sess->id, sess,GFP_KERNEL )); +return xa_err (xa_store (&conn->sessions, sess->id, sess,KSMBD_DEFAULT_GFP )); }static int ksmbd_chann_del (struct ksmbd_conn *conn,struct ksmbd_session *sess)
@@ -339,7 +339,7 @@ struct preauth_session *ksmbd_preauth_session_alloc(struct ksmbd_conn *conn, {struct preauth_session *sess; - sess =kmalloc (sizeof (struct preauth_session ),GFP_KERNEL ); + sess =kmalloc (sizeof (struct preauth_session ),KSMBD_DEFAULT_GFP );if (!sess)return NULL ;
@@ -423,7 +423,7 @@ static struct ksmbd_session *__session_create(int protocol)if (protocol !=CIFDS_SESSION_FLAG_SMB2 )return NULL ; - sess =kzalloc (sizeof (struct ksmbd_session ),GFP_KERNEL ); + sess =kzalloc (sizeof (struct ksmbd_session ),KSMBD_DEFAULT_GFP );if (!sess)return NULL ;
fs/smb/server/misc.c +6 -5
@@ -165,7 +165,7 @@ char *convert_to_nt_pathname(struct ksmbd_share_config *share,char *pathname, *ab_pathname, *nt_pathname;int share_path_len = share->path_sz; - pathname =kmalloc (PATH_MAX ,GFP_KERNEL ); + pathname =kmalloc (PATH_MAX ,KSMBD_DEFAULT_GFP );if (!pathname)return ERR_PTR (-EACCES );
@@ -180,7 +180,8 @@ char *convert_to_nt_pathname(struct ksmbd_share_config *share, goto free_pathname; } - nt_pathname =kzalloc (strlen (&ab_pathname[share_path_len]) +2 ,GFP_KERNEL ); + nt_pathname =kzalloc (strlen (&ab_pathname[share_path_len]) +2 , +KSMBD_DEFAULT_GFP );if (!nt_pathname) { nt_pathname =ERR_PTR (-ENOMEM ); goto free_pathname;
@@ -232,7 +233,7 @@ char *ksmbd_casefold_sharename(struct unicode_map *um, const char *name)char *cf_name;int cf_len; - cf_name =kzalloc (KSMBD_REQ_MAX_SHARE_NAME ,GFP_KERNEL ); + cf_name =kzalloc (KSMBD_REQ_MAX_SHARE_NAME ,KSMBD_DEFAULT_GFP );if (!cf_name)return ERR_PTR (-ENOMEM );
@@ -294,7 +295,7 @@ char *convert_to_unix_name(struct ksmbd_share_config *share, const char *name) path_len = share->path_sz; name_len =strlen (name); - new_name =kmalloc (path_len + name_len +2 ,GFP_KERNEL ); + new_name =kmalloc (path_len + name_len +2 ,KSMBD_DEFAULT_GFP );if (!new_name)return new_name;
@@ -320,7 +321,7 @@ char *ksmbd_convert_dir_info_name(struct ksmbd_dir_info *d_info,if (!sz)return NULL ; - conv =kmalloc (sz,GFP_KERNEL ); + conv =kmalloc (sz,KSMBD_DEFAULT_GFP );if (!conv)return NULL ;
fs/smb/server/ndr.c +5 -5
@@ -18,7 +18,7 @@ static int try_to_realloc_ndr_blob(struct ndr *n, size_t sz) {char *data; - data =krealloc (n->data, n->offset + sz +1024 ,GFP_KERNEL ); + data =krealloc (n->data, n->offset + sz +1024 ,KSMBD_DEFAULT_GFP );if (!data)return -ENOMEM ;
@@ -174,7 +174,7 @@ int ndr_encode_dos_attr(struct ndr *n, struct xattr_dos_attrib *da) n->offset =0 ; n->length =1024 ; - n->data =kzalloc (n->length,GFP_KERNEL ); + n->data =kzalloc (n->length,KSMBD_DEFAULT_GFP );if (!n->data)return -ENOMEM ;
@@ -350,7 +350,7 @@ int ndr_encode_posix_acl(struct ndr *n, n->offset =0 ; n->length =1024 ; - n->data =kzalloc (n->length,GFP_KERNEL ); + n->data =kzalloc (n->length,KSMBD_DEFAULT_GFP );if (!n->data)return -ENOMEM ;
@@ -401,7 +401,7 @@ int ndr_encode_v4_ntacl(struct ndr *n, struct xattr_ntacl *acl) n->offset =0 ; n->length =2048 ; - n->data =kzalloc (n->length,GFP_KERNEL ); + n->data =kzalloc (n->length,KSMBD_DEFAULT_GFP );if (!n->data)return -ENOMEM ;
@@ -505,7 +505,7 @@ int ndr_decode_v4_ntacl(struct ndr *n, struct xattr_ntacl *acl)return ret; acl->sd_size = n->length - n->offset; - acl->sd_buf =kzalloc (acl->sd_size,GFP_KERNEL ); + acl->sd_buf =kzalloc (acl->sd_size,KSMBD_DEFAULT_GFP );if (!acl->sd_buf)return -ENOMEM ;
fs/smb/server/oplock.c +6 -6
@@ -34,7 +34,7 @@ static struct oplock_info *alloc_opinfo(struct ksmbd_work *work,struct ksmbd_session *sess = work->sess;struct oplock_info *opinfo; - opinfo =kzalloc (sizeof (struct oplock_info ),GFP_KERNEL ); + opinfo =kzalloc (sizeof (struct oplock_info ),KSMBD_DEFAULT_GFP );if (!opinfo)return NULL ;
@@ -93,7 +93,7 @@ static int alloc_lease(struct oplock_info *opinfo, struct lease_ctx_info *lctx) {struct lease *lease; - lease =kmalloc (sizeof (struct lease ),GFP_KERNEL ); + lease =kmalloc (sizeof (struct lease ),KSMBD_DEFAULT_GFP );if (!lease)return -ENOMEM ;
@@ -701,7 +701,7 @@ static int smb2_oplock_break_noti(struct oplock_info *opinfo)if (!work)return -ENOMEM ; - br_info =kmalloc (sizeof (struct oplock_break_info ),GFP_KERNEL ); + br_info =kmalloc (sizeof (struct oplock_break_info ),KSMBD_DEFAULT_GFP );if (!br_info) {ksmbd_free_work_struct (work);return -ENOMEM ;
@@ -806,7 +806,7 @@ static int smb2_lease_break_noti(struct oplock_info *opinfo)if (!work)return -ENOMEM ; - br_info =kmalloc (sizeof (struct lease_break_info ),GFP_KERNEL ); + br_info =kmalloc (sizeof (struct lease_break_info ),KSMBD_DEFAULT_GFP );if (!br_info) {ksmbd_free_work_struct (work);return -ENOMEM ;
@@ -1049,7 +1049,7 @@ static int add_lease_global_list(struct oplock_info *opinfo) }read_unlock (&lease_list_lock); - lb =kmalloc (sizeof (struct lease_table ),GFP_KERNEL ); + lb =kmalloc (sizeof (struct lease_table ),KSMBD_DEFAULT_GFP );if (!lb)return -ENOMEM ;
@@ -1487,7 +1487,7 @@ struct lease_ctx_info *parse_lease_state(void *open_req)if (IS_ERR_OR_NULL (cc))return NULL ; - lreq =kzalloc (sizeof (struct lease_ctx_info ),GFP_KERNEL ); + lreq =kzalloc (sizeof (struct lease_ctx_info ),KSMBD_DEFAULT_GFP );if (!lreq)return NULL ;
fs/smb/server/server.c +2 -2
@@ -47,7 +47,7 @@ static int ___server_conf_set(int idx, char *val)return -EINVAL ;kfree (server_conf.conf[idx]); - server_conf.conf[idx] =kstrdup (val,GFP_KERNEL ); + server_conf.conf[idx] =kstrdup (val,KSMBD_DEFAULT_GFP );if (!server_conf.conf[idx])return -ENOMEM ;return 0 ;
@@ -404,7 +404,7 @@ static int __queue_ctrl_work(int type) {struct server_ctrl_struct *ctrl; - ctrl =kmalloc (sizeof (struct server_ctrl_struct ),GFP_KERNEL ); + ctrl =kmalloc (sizeof (struct server_ctrl_struct ),KSMBD_DEFAULT_GFP );if (!ctrl)return -ENOMEM ;
fs/smb/server/smb2pdu.c +19 -19
@@ -553,7 +553,7 @@ int smb2_allocate_rsp_buf(struct ksmbd_work *work)if (le32_to_cpu (hdr->NextCommand) >0 ) sz = large_sz; - work->response_buf =kvzalloc (sz,GFP_KERNEL ); + work->response_buf =kvzalloc (sz,KSMBD_DEFAULT_GFP );if (!work->response_buf)return -ENOMEM ;
@@ -1150,7 +1150,7 @@ int smb2_handle_negotiate(struct ksmbd_work *work)case SMB311_PROT_ID : conn->preauth_info =kzalloc (sizeof (struct preauth_integrity_info ), -GFP_KERNEL ); +KSMBD_DEFAULT_GFP );if (!conn->preauth_info) { rc = -ENOMEM ; rsp->hdr.Status =STATUS_INVALID_PARAMETER ;
@@ -1272,7 +1272,7 @@ static int alloc_preauth_hash(struct ksmbd_session *sess,return -ENOMEM ; sess->Preauth_HashValue =kmemdup (conn->preauth_info->Preauth_HashValue, -PREAUTH_HASHVALUE_SIZE ,GFP_KERNEL ); +PREAUTH_HASHVALUE_SIZE ,KSMBD_DEFAULT_GFP );if (!sess->Preauth_HashValue)return -ENOMEM ;
@@ -1358,7 +1358,7 @@ static int ntlm_negotiate(struct ksmbd_work *work, sz =sizeof (struct challenge_message ); sz += (strlen (ksmbd_netbios_name ()) *2 +1 +4 ) *6 ; - neg_blob =kzalloc (sz,GFP_KERNEL ); + neg_blob =kzalloc (sz,KSMBD_DEFAULT_GFP );if (!neg_blob)return -ENOMEM ;
@@ -1549,12 +1549,12 @@ static int ntlm_authenticate(struct ksmbd_work *work,if (conn->dialect >=SMB30_PROT_ID ) { chann =lookup_chann_list (sess, conn);if (!chann) { - chann =kmalloc (sizeof (struct channel ),GFP_KERNEL ); + chann =kmalloc (sizeof (struct channel ),KSMBD_DEFAULT_GFP );if (!chann)return -ENOMEM ; chann->conn = conn; -xa_store (&sess->ksmbd_chann_list, (long )conn, chann,GFP_KERNEL ); +xa_store (&sess->ksmbd_chann_list, (long )conn, chann,KSMBD_DEFAULT_GFP ); } }
@@ -1632,12 +1632,12 @@ static int krb5_authenticate(struct ksmbd_work *work,if (conn->dialect >=SMB30_PROT_ID ) { chann =lookup_chann_list (sess, conn);if (!chann) { - chann =kmalloc (sizeof (struct channel ),GFP_KERNEL ); + chann =kmalloc (sizeof (struct channel ),KSMBD_DEFAULT_GFP );if (!chann)return -ENOMEM ; chann->conn = conn; -xa_store (&sess->ksmbd_chann_list, (long )conn, chann,GFP_KERNEL ); +xa_store (&sess->ksmbd_chann_list, (long )conn, chann,KSMBD_DEFAULT_GFP ); } }
@@ -2356,7 +2356,7 @@ static int smb2_set_ea(struct smb2_ea_info *eabuf, unsigned int buf_len, le16_to_cpu(eabuf->EaValueLength))return -EINVAL ; - attr_name =kmalloc (XATTR_NAME_MAX +1 ,GFP_KERNEL ); + attr_name =kmalloc (XATTR_NAME_MAX +1 ,KSMBD_DEFAULT_GFP );if (!attr_name)return -ENOMEM ;
@@ -2928,7 +2928,7 @@ int smb2_open(struct ksmbd_work *work) goto err_out2; } }else { - name =kstrdup ("" ,GFP_KERNEL ); + name =kstrdup ("" ,KSMBD_DEFAULT_GFP );if (!name) { rc = -ENOMEM ; goto err_out2;
@@ -3369,7 +3369,7 @@ int smb2_open(struct ksmbd_work *work)sizeof (struct smb_sid ) *3 +sizeof (struct smb_acl ) +sizeof (struct smb_ace ) * ace_num *2 , - GFP_KERNEL); + KSMBD_DEFAULT_GFP);if (!pntsd) {posix_acl_release (fattr.cf_acls);posix_acl_release (fattr.cf_dacls);
@@ -5007,7 +5007,7 @@ static int get_file_stream_info(struct ksmbd_work *work,/* plus : size */ streamlen +=1 ; - stream_buf =kmalloc (streamlen +1 ,GFP_KERNEL ); + stream_buf =kmalloc (streamlen +1 ,KSMBD_DEFAULT_GFP );if (!stream_buf)break ;
@@ -6002,7 +6002,7 @@ static int smb2_create_link(struct ksmbd_work *work,return -EINVAL ;ksmbd_debug (SMB ,"setting FILE_LINK_INFORMATION\n" ); - pathname =kmalloc (PATH_MAX ,GFP_KERNEL ); + pathname =kmalloc (PATH_MAX ,KSMBD_DEFAULT_GFP );if (!pathname)return -ENOMEM ;
@@ -6562,7 +6562,7 @@ static noinline int smb2_read_pipe(struct ksmbd_work *work) } aux_payload_buf = -kvmalloc (rpc_resp->payload_sz,GFP_KERNEL ); +kvmalloc (rpc_resp->payload_sz,KSMBD_DEFAULT_GFP );if (!aux_payload_buf) { err = -ENOMEM ; goto out;
@@ -6745,7 +6745,7 @@ int smb2_read(struct ksmbd_work *work)ksmbd_debug (SMB ,"filename %pD, offset %lld, len %zu\n" , fp->filp, offset, length); - aux_payload_buf =kvzalloc (length,GFP_KERNEL ); + aux_payload_buf =kvzalloc (length,KSMBD_DEFAULT_GFP );if (!aux_payload_buf) { err = -ENOMEM ; goto out;
@@ -6897,7 +6897,7 @@ static ssize_t smb2_write_rdma_channel(struct ksmbd_work *work,int ret;ssize_t nbytes; - data_buf =kvzalloc (length,GFP_KERNEL ); + data_buf =kvzalloc (length,KSMBD_DEFAULT_GFP );if (!data_buf)return -ENOMEM ;
@@ -7228,7 +7228,7 @@ static struct ksmbd_lock *smb2_lock_init(struct file_lock *flock, {struct ksmbd_lock *lock; - lock =kzalloc (sizeof (struct ksmbd_lock ),GFP_KERNEL ); + lock =kzalloc (sizeof (struct ksmbd_lock ),KSMBD_DEFAULT_GFP );if (!lock)return NULL ;
@@ -7496,7 +7496,7 @@ int smb2_lock(struct ksmbd_work *work) "would have to wait for getting lock\n");list_add (&smb_lock->llist, &rollback_list); - argv =kmalloc (sizeof (void *),GFP_KERNEL ); + argv =kmalloc (sizeof (void *),KSMBD_DEFAULT_GFP );if (!argv) { err = -ENOMEM ; goto out;
@@ -8990,7 +8990,7 @@ int smb3_encrypt_resp(struct ksmbd_work *work)int rc = -ENOMEM ;void *tr_buf; - tr_buf =kzalloc (sizeof (struct smb2_transform_hdr ) +4 ,GFP_KERNEL ); + tr_buf =kzalloc (sizeof (struct smb2_transform_hdr ) +4 ,KSMBD_DEFAULT_GFP );if (!tr_buf)return rc;
fs/smb/server/smb_common.c +1 -1
@@ -358,7 +358,7 @@ static int smb1_check_user_session(struct ksmbd_work *work)static int smb1_allocate_rsp_buf (struct ksmbd_work *work) { work->response_buf =kzalloc (MAX_CIFS_SMALL_BUFFER_SIZE , -GFP_KERNEL ); +KSMBD_DEFAULT_GFP ); work->response_sz =MAX_CIFS_SMALL_BUFFER_SIZE ;if (!work->response_buf) {
fs/smb/server/smbacl.c +12 -11
@@ -350,10 +350,10 @@ int init_acl_state(struct posix_acl_state *state, u16 cnt)*/ alloc =sizeof (struct posix_ace_state_array ) + cnt *sizeof (struct posix_user_ace_state ); - state->users =kzalloc (alloc,GFP_KERNEL ); + state->users =kzalloc (alloc,KSMBD_DEFAULT_GFP );if (!state->users)return -ENOMEM ; - state->groups =kzalloc (alloc,GFP_KERNEL ); + state->groups =kzalloc (alloc,KSMBD_DEFAULT_GFP );if (!state->groups) {kfree (state->users);return -ENOMEM ;
@@ -417,7 +417,7 @@ static void parse_dacl(struct mnt_idmap *idmap,return ; } - ppace =kmalloc_array (num_aces,sizeof (struct smb_ace *),GFP_KERNEL ); + ppace =kmalloc_array (num_aces,sizeof (struct smb_ace *),KSMBD_DEFAULT_GFP );if (!ppace) {free_acl_state (&default_acl_state);free_acl_state (&acl_state);
@@ -561,7 +561,7 @@ static void parse_dacl(struct mnt_idmap *idmap,if (IS_ENABLED (CONFIG_FS_POSIX_ACL )) { fattr->cf_acls =posix_acl_alloc (acl_state.users->n + - acl_state.groups->n +4 ,GFP_KERNEL ); + acl_state.groups->n +4 ,KSMBD_DEFAULT_GFP );if (fattr->cf_acls) { cf_pace = fattr->cf_acls->a_entries;posix_state_to_acl (&acl_state, cf_pace);
@@ -575,7 +575,7 @@ static void parse_dacl(struct mnt_idmap *idmap,if (IS_ENABLED (CONFIG_FS_POSIX_ACL )) { fattr->cf_dacls =posix_acl_alloc (default_acl_state.users->n + - default_acl_state.groups->n +4 ,GFP_KERNEL ); + default_acl_state.groups->n +4 ,KSMBD_DEFAULT_GFP );if (fattr->cf_dacls) { cf_pdace = fattr->cf_dacls->a_entries;posix_state_to_acl (&default_acl_state, cf_pdace);
@@ -603,7 +603,7 @@ static void set_posix_acl_entries_dacl(struct mnt_idmap *idmap,for (i =0 ; i < fattr->cf_acls->a_count; i++, pace++) {int flags =0 ; - sid =kmalloc (sizeof (struct smb_sid ),GFP_KERNEL ); + sid =kmalloc (sizeof (struct smb_sid ),KSMBD_DEFAULT_GFP );if (!sid)break ;
@@ -670,7 +670,7 @@ static void set_posix_acl_entries_dacl(struct mnt_idmap *idmap, pace = fattr->cf_dacls->a_entries;for (i =0 ; i < fattr->cf_dacls->a_count; i++, pace++) { - sid =kmalloc (sizeof (struct smb_sid ),GFP_KERNEL ); + sid =kmalloc (sizeof (struct smb_sid ),KSMBD_DEFAULT_GFP );if (!sid)break ;
@@ -930,7 +930,7 @@ int build_sec_desc(struct mnt_idmap *idmap,gid_t gid;unsigned int sid_type =SIDOWNER ; - nowner_sid_ptr =kmalloc (sizeof (struct smb_sid ),GFP_KERNEL ); + nowner_sid_ptr =kmalloc (sizeof (struct smb_sid ),KSMBD_DEFAULT_GFP );if (!nowner_sid_ptr)return -ENOMEM ;
@@ -939,7 +939,7 @@ int build_sec_desc(struct mnt_idmap *idmap, sid_type =SIDUNIX_USER ;id_to_sid (uid, sid_type, nowner_sid_ptr); - ngroup_sid_ptr =kmalloc (sizeof (struct smb_sid ),GFP_KERNEL ); + ngroup_sid_ptr =kmalloc (sizeof (struct smb_sid ),KSMBD_DEFAULT_GFP );if (!ngroup_sid_ptr) {kfree (nowner_sid_ptr);return -ENOMEM ;
@@ -1062,7 +1062,8 @@ int smb_inherit_dacl(struct ksmbd_conn *conn, goto free_parent_pntsd; } - aces_base =kmalloc (sizeof (struct smb_ace ) * num_aces *2 ,GFP_KERNEL ); + aces_base =kmalloc (sizeof (struct smb_ace ) * num_aces *2 , +KSMBD_DEFAULT_GFP );if (!aces_base) { rc = -ENOMEM ; goto free_parent_pntsd;
@@ -1156,7 +1157,7 @@ int smb_inherit_dacl(struct ksmbd_conn *conn, pntsd_alloc_size =sizeof (struct smb_ntsd ) + powner_sid_size + pgroup_sid_size +sizeof (struct smb_acl ) + nt_size; - pntsd =kzalloc (pntsd_alloc_size,GFP_KERNEL ); + pntsd =kzalloc (pntsd_alloc_size,KSMBD_DEFAULT_GFP );if (!pntsd) { rc = -ENOMEM ; goto free_aces_base;
fs/smb/server/transport_ipc.c +3 -3
@@ -244,7 +244,7 @@ static struct ksmbd_ipc_msg *ipc_msg_alloc(size_t sz)struct ksmbd_ipc_msg *msg;size_t msg_sz = sz +sizeof (struct ksmbd_ipc_msg ); - msg =kvzalloc (msg_sz,GFP_KERNEL ); + msg =kvzalloc (msg_sz,KSMBD_DEFAULT_GFP );if (msg) msg->sz = sz;return msg;
@@ -284,7 +284,7 @@ static int handle_response(int type, void *payload, size_t sz)continue ; } - entry->response =kvzalloc (sz,GFP_KERNEL ); + entry->response =kvzalloc (sz,KSMBD_DEFAULT_GFP );if (!entry->response) { ret = -ENOMEM ;break ;
@@ -453,7 +453,7 @@ static int ipc_msg_send(struct ksmbd_ipc_msg *msg)if (!ksmbd_tools_pid)return ret; - skb =genlmsg_new (msg->sz,GFP_KERNEL ); + skb =genlmsg_new (msg->sz,KSMBD_DEFAULT_GFP );if (!skb)return -ENOMEM ;
fs/smb/server/transport_rdma.c +5 -5
@@ -362,7 +362,7 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id)struct smb_direct_transport *t;struct ksmbd_conn *conn; - t =kzalloc (sizeof (*t),GFP_KERNEL ); + t =kzalloc (sizeof (*t),KSMBD_DEFAULT_GFP );if (!t)return NULL ;
@@ -462,7 +462,7 @@ static struct smb_direct_sendmsg {struct smb_direct_sendmsg *msg; - msg =mempool_alloc (t->sendmsg_mempool,GFP_KERNEL ); + msg =mempool_alloc (t->sendmsg_mempool,KSMBD_DEFAULT_GFP );if (!msg)return ERR_PTR (-ENOMEM ); msg->transport = t;
@@ -1406,7 +1406,7 @@ static int smb_direct_rdma_xmit(struct smb_direct_transport *t, desc_buf = buf;for (i =0 ; i < desc_num; i++) { msg =kzalloc (struct_size (msg, sg_list,SG_CHUNK_SIZE ), -GFP_KERNEL ); +KSMBD_DEFAULT_GFP );if (!msg) { ret = -ENOMEM ; goto out;
@@ -1852,7 +1852,7 @@ static int smb_direct_create_pools(struct smb_direct_transport *t)INIT_LIST_HEAD (&t->recvmsg_queue);for (i =0 ; i < t->recv_credit_max; i++) { - recvmsg =mempool_alloc (t->recvmsg_mempool,GFP_KERNEL ); + recvmsg =mempool_alloc (t->recvmsg_mempool,KSMBD_DEFAULT_GFP );if (!recvmsg) goto err; recvmsg->transport = t;
@@ -2144,7 +2144,7 @@ static int smb_direct_ib_client_add(struct ib_device *ib_dev)if (!rdma_frwr_is_supported (&ib_dev->attrs))return 0 ; - smb_dev =kzalloc (sizeof (*smb_dev),GFP_KERNEL ); + smb_dev =kzalloc (sizeof (*smb_dev),KSMBD_DEFAULT_GFP );if (!smb_dev)return -ENOMEM ; smb_dev->ib_dev = ib_dev;
fs/smb/server/transport_tcp.c +6 -6
@@ -76,7 +76,7 @@ static struct tcp_transport *alloc_transport(struct socket *client_sk)struct tcp_transport *t;struct ksmbd_conn *conn; - t =kzalloc (sizeof (*t),GFP_KERNEL ); + t =kzalloc (sizeof (*t),KSMBD_DEFAULT_GFP );if (!t)return NULL ; t->sock = client_sk;
@@ -151,7 +151,7 @@ static struct kvec *get_conn_iovec(struct tcp_transport *t, unsigned int nr_segsreturn t->iov;/* not big enough -- allocate a new one and release the old */ - new_iov =kmalloc_array (nr_segs,sizeof (*new_iov),GFP_KERNEL ); + new_iov =kmalloc_array (nr_segs,sizeof (*new_iov),KSMBD_DEFAULT_GFP );if (new_iov) {kfree (t->iov); t->iov = new_iov;
@@ -528,7 +528,7 @@ static int ksmbd_netdev_event(struct notifier_block *nb, unsigned long event, } }if (!found && bind_additional_ifaces) { - iface =alloc_iface (kstrdup (netdev->name,GFP_KERNEL )); + iface =alloc_iface (kstrdup (netdev->name,KSMBD_DEFAULT_GFP ));if (!iface)return NOTIFY_OK ; ret =create_socket (iface);
@@ -600,7 +600,7 @@ static struct interface *alloc_iface(char *ifname)if (!ifname)return NULL ; - iface =kzalloc (sizeof (struct interface ),GFP_KERNEL ); + iface =kzalloc (sizeof (struct interface ),KSMBD_DEFAULT_GFP );if (!iface) {kfree (ifname);return NULL ;
@@ -624,7 +624,7 @@ int ksmbd_tcp_set_interfaces(char *ifc_list, int ifc_list_sz)for_each_netdev (&init_net, netdev) {if (netif_is_bridge_port (netdev))continue ; -if (!alloc_iface (kstrdup (netdev->name,GFP_KERNEL ))) { +if (!alloc_iface (kstrdup (netdev->name,KSMBD_DEFAULT_GFP ))) {rtnl_unlock ();return -ENOMEM ; }
@@ -635,7 +635,7 @@ int ksmbd_tcp_set_interfaces(char *ifc_list, int ifc_list_sz) }while (ifc_list_sz >0 ) { -if (!alloc_iface (kstrdup (ifc_list,GFP_KERNEL ))) +if (!alloc_iface (kstrdup (ifc_list,KSMBD_DEFAULT_GFP )))return -ENOMEM ; sz =strlen (ifc_list);
fs/smb/server/unicode.c +2 -2
@@ -297,7 +297,7 @@ char *smb_strndup_from_utf16(const char *src, const int maxlen,if (is_unicode) { len =smb_utf16_bytes ((__le16 *)src, maxlen, codepage); len +=nls_nullsize (codepage); - dst =kmalloc (len,GFP_KERNEL ); + dst =kmalloc (len,KSMBD_DEFAULT_GFP );if (!dst)return ERR_PTR (-ENOMEM ); ret = smb_from_utf16(dst, (__le16 *)src, len, maxlen, codepage,
@@ -309,7 +309,7 @@ char *smb_strndup_from_utf16(const char *src, const int maxlen, }else { len =strnlen (src, maxlen); len++; - dst =kmalloc (len,GFP_KERNEL ); + dst =kmalloc (len,KSMBD_DEFAULT_GFP );if (!dst)return ERR_PTR (-ENOMEM );strscpy (dst, src, len);
fs/smb/server/vfs.c +6 -6
@@ -444,7 +444,7 @@ static int ksmbd_vfs_stream_write(struct ksmbd_file *fp, char *buf, loff_t *pos, }if (v_len < size) { - wbuf =kvzalloc (size,GFP_KERNEL ); + wbuf =kvzalloc (size,KSMBD_DEFAULT_GFP );if (!wbuf) { err = -ENOMEM ; goto out;
@@ -866,7 +866,7 @@ ssize_t ksmbd_vfs_listxattr(struct dentry *dentry, char **list)if (size <=0 )return size; - vlist =kvzalloc (size,GFP_KERNEL ); + vlist =kvzalloc (size,KSMBD_DEFAULT_GFP );if (!vlist)return -ENOMEM ;
@@ -908,7 +908,7 @@ ssize_t ksmbd_vfs_getxattr(struct mnt_idmap *idmap,if (xattr_len <0 )return xattr_len; - buf =kmalloc (xattr_len +1 ,GFP_KERNEL ); + buf =kmalloc (xattr_len +1 ,KSMBD_DEFAULT_GFP );if (!buf)return -ENOMEM ;
@@ -1413,7 +1413,7 @@ static struct xattr_smb_acl *ksmbd_vfs_make_xattr_posix_acl(struct mnt_idmap *id smb_acl =kzalloc (sizeof (struct xattr_smb_acl ) +sizeof (struct xattr_acl_entry ) * posix_acls->a_count, -GFP_KERNEL ); +KSMBD_DEFAULT_GFP );if (!smb_acl) goto out;
@@ -1769,7 +1769,7 @@ int ksmbd_vfs_xattr_stream_name(char *stream_name, char **xattr_stream_name,else type =":$DATA" ; - buf =kasprintf (GFP_KERNEL ,"%s%s%s" , + buf =kasprintf (KSMBD_DEFAULT_GFP ,"%s%s%s" ,XATTR_NAME_STREAM , stream_name, type);if (!buf)return -ENOMEM ;
@@ -1898,7 +1898,7 @@ int ksmbd_vfs_set_init_posix_acl(struct mnt_idmap *idmap, acl_state.group.allow; acl_state.mask.allow =0x07 ; - acls =posix_acl_alloc (6 ,GFP_KERNEL ); + acls =posix_acl_alloc (6 ,KSMBD_DEFAULT_GFP );if (!acls) {free_acl_state (&acl_state);return -ENOMEM ;
fs/smb/server/vfs_cache.c +5 -5
@@ -188,7 +188,7 @@ static struct ksmbd_inode *ksmbd_inode_get(struct ksmbd_file *fp)if (ci)return ci; - ci =kmalloc (sizeof (struct ksmbd_inode ),GFP_KERNEL ); + ci =kmalloc (sizeof (struct ksmbd_inode ),KSMBD_DEFAULT_GFP );if (!ci)return NULL ;
@@ -577,7 +577,7 @@ static int __open_id(struct ksmbd_file_table *ft, struct ksmbd_file *fp,return -EMFILE ; } -idr_preload (GFP_KERNEL ); +idr_preload (KSMBD_DEFAULT_GFP );write_lock (&ft->lock); ret =idr_alloc_cyclic (ft->idr, fp,0 ,INT_MAX -1 ,GFP_NOWAIT );if (ret >=0 ) {
@@ -605,7 +605,7 @@ struct ksmbd_file *ksmbd_open_fd(struct ksmbd_work *work, struct file *filp)struct ksmbd_file *fp;int ret; - fp =kmem_cache_zalloc (filp_cache,GFP_KERNEL ); + fp =kmem_cache_zalloc (filp_cache,KSMBD_DEFAULT_GFP );if (!fp) {pr_err ("Failed to allocate memory\n" );return ERR_PTR (-ENOMEM );
@@ -923,7 +923,7 @@ int ksmbd_validate_name_reconnect(struct ksmbd_share_config *share,char *pathname, *ab_pathname;int ret =0 ; - pathname =kmalloc (PATH_MAX ,GFP_KERNEL ); + pathname =kmalloc (PATH_MAX ,KSMBD_DEFAULT_GFP );if (!pathname)return -EACCES ;
@@ -983,7 +983,7 @@ int ksmbd_reopen_durable_fd(struct ksmbd_work *work, struct ksmbd_file *fp)int ksmbd_init_file_table (struct ksmbd_file_table *ft) { - ft->idr =kzalloc (sizeof (struct idr ),GFP_KERNEL ); + ft->idr =kzalloc (sizeof (struct idr ),KSMBD_DEFAULT_GFP );if (!ft->idr)return -ENOMEM ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 10/280 media: i2c: imx214: Simplify with dev_err_probe()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: André Apitzsch <[email protected]>
[ Upstream commit 5d6dc133e6e4053b4b92a15a2e1b99d54b3f8adb ]
Error handling in probe() can be a bit simpler with dev_err_probe().
Stable-dep-of: acc294519f17 ("media: i2c: imx214: Fix link frequency validation")
--- drivers/media/i2c/imx214.c | 54 +++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 30 deletions(-)
drivers/media/i2c/imx214.c +24 -30
@@ -933,14 +933,12 @@ static int imx214_parse_fwnode(struct device *dev)int ret; endpoint =fwnode_graph_get_next_endpoint (dev_fwnode (dev),NULL ); -if (!endpoint) { -dev_err (dev,"endpoint node not found\n" ); -return -EINVAL ; - } +if (!endpoint) +return dev_err_probe (dev, -EINVAL ,"endpoint node not found\n" ); ret =v4l2_fwnode_endpoint_alloc_parse (endpoint, &bus_cfg);if (ret) { -dev_err (dev,"parsing endpoint node failed\n" ); +dev_err_probe (dev, ret,"parsing endpoint node failed\n" ); goto done; }
@@ -949,8 +947,9 @@ static int imx214_parse_fwnode(struct device *dev)break ;if (i == bus_cfg.nr_of_link_frequencies) { -dev_err (dev,"link-frequencies %d not supported, Please review your DT\n" , -IMX214_DEFAULT_LINK_FREQ ); +dev_err_probe (dev, -EINVAL , +"link-frequencies %d not supported, Please review your DT\n" , +IMX214_DEFAULT_LINK_FREQ ); ret = -EINVAL ; goto done; }
@@ -978,34 +977,28 @@ static int imx214_probe(struct i2c_client *client) imx214->dev = dev; imx214->xclk =devm_clk_get (dev,NULL ); -if (IS_ERR (imx214->xclk)) { -dev_err (dev,"could not get xclk" ); -return PTR_ERR (imx214->xclk); - } +if (IS_ERR (imx214->xclk)) +return dev_err_probe (dev,PTR_ERR (imx214->xclk), +"failed to get xclk\n" ); ret =clk_set_rate (imx214->xclk,IMX214_DEFAULT_CLK_FREQ ); -if (ret) { -dev_err (dev,"could not set xclk frequency\n" ); -return ret; - } +if (ret) +return dev_err_probe (dev, ret, +"failed to set xclk frequency\n" ); ret =imx214_get_regulators (dev, imx214); -if (ret <0 ) { -dev_err (dev,"cannot get regulators\n" ); -return ret; - } +if (ret <0 ) +return dev_err_probe (dev, ret,"failed to get regulators\n" ); imx214->enable_gpio =devm_gpiod_get (dev,"enable" ,GPIOD_OUT_LOW ); -if (IS_ERR (imx214->enable_gpio)) { -dev_err (dev,"cannot get enable gpio\n" ); -return PTR_ERR (imx214->enable_gpio); - } +if (IS_ERR (imx214->enable_gpio)) +return dev_err_probe (dev,PTR_ERR (imx214->enable_gpio), +"failed to get enable gpio\n" ); imx214->regmap =devm_regmap_init_i2c (client, &sensor_regmap_config); -if (IS_ERR (imx214->regmap)) { -dev_err (dev,"regmap init failed\n" ); -return PTR_ERR (imx214->regmap); - } +if (IS_ERR (imx214->regmap)) +return dev_err_probe (dev,PTR_ERR (imx214->regmap), +"regmap init failed\n" );v4l2_i2c_subdev_init (&imx214->sd, client, &imx214_subdev_ops); imx214->sd.internal_ops = &imx214_internal_ops;
@@ -1027,14 +1020,14 @@ static int imx214_probe(struct i2c_client *client) ret =media_entity_pads_init (&imx214->sd.entity,1 , &imx214->pad);if (ret <0 ) { -dev_err (dev,"could not register media entity\n" ); +dev_err_probe (dev, ret,"failed to init entity pads\n" ); goto free_ctrl; } imx214->sd.state_lock = imx214->ctrls.lock; ret =v4l2_subdev_init_finalize (&imx214->sd);if (ret <0 ) { -dev_err (dev,"subdev init error: %d\n" , ret); +dev_err_probe (dev, ret,"subdev init error\n" ); goto free_entity; }
@@ -1043,7 +1036,8 @@ static int imx214_probe(struct i2c_client *client) ret =v4l2_async_register_subdev_sensor (&imx214->sd);if (ret <0 ) { -dev_err (dev,"could not register v4l2 device\n" ); +dev_err_probe (dev, ret, +"failed to register sensor sub-device\n" ); goto error_subdev_cleanup; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 11/280 media: i2c: imx214: Convert to CCI register access helpers
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: André Apitzsch <[email protected]>
[ Upstream commit 4f0aeba4f1556f829f09073bf267093c5b6f1821 ]
Use the new common CCI register access helpers to replace the private register access helpers in the imx214 driver. This simplifies the driver by reducing the amount of code.
Stable-dep-of: acc294519f17 ("media: i2c: imx214: Fix link frequency validation")
--- drivers/media/i2c/Kconfig | 1 + drivers/media/i2c/imx214.c | 672 +++++++++++++++++-------------------- 2 files changed, 310 insertions(+), 363 deletions(-)
drivers/media/i2c/Kconfig +1 -0
@@ -140,6 +140,7 @@ config VIDEO_IMX214 tristate "Sony IMX214 sensor support" depends on GPIOLIB select REGMAP_I2C + select V4L2_CCI_I2C help This is a Video4Linux2 sensor driver for the Sony IMX214 camera.
drivers/media/i2c/imx214.c +309 -363
800 lines not on this page · raw message
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 12/280 media: i2c: imx214: Replace register addresses with macros
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: André Apitzsch <[email protected]>
[ Upstream commit 341a133beb43f9009ebdde9eff276dfacbac114a ]
Define macros for all the known registers used in the register arrays, and use them to replace the numerical addresses. This improves readability.
Stable-dep-of: acc294519f17 ("media: i2c: imx214: Fix link frequency validation")
--- drivers/media/i2c/imx214.c | 407 +++++++++++++++++++++---------------- 1 file changed, 236 insertions(+), 171 deletions(-)
drivers/media/i2c/imx214.c +236 -171
@@ -24,18 +24,141 @@#define IMX214_MODE_STANDBY 0x00#define IMX214_MODE_STREAMING 0x01 +#define IMX214_REG_FAST_STANDBY_CTRL CCI_REG8(0x0106) +#define IMX214_DEFAULT_CLK_FREQ 24000000#define IMX214_DEFAULT_LINK_FREQ 480000000#define IMX214_DEFAULT_PIXEL_RATE ((IMX214_DEFAULT_LINK_FREQ * 8LL) / 10)#define IMX214_FPS 30#define IMX214_MBUS_CODE MEDIA_BUS_FMT_SRGGB10_1X10 +/* V-TIMING internal */ +#define IMX214_REG_FRM_LENGTH_LINES CCI_REG16(0x0340) +/* Exposure control */ #define IMX214_REG_EXPOSURE CCI_REG16(0x0202)#define IMX214_EXPOSURE_MIN 0#define IMX214_EXPOSURE_MAX 3184#define IMX214_EXPOSURE_STEP 1#define IMX214_EXPOSURE_DEFAULT 3184 +#define IMX214_REG_EXPOSURE_RATIO CCI_REG8(0x0222) +#define IMX214_REG_SHORT_EXPOSURE CCI_REG16(0x0224) + +/* Analog gain control */ +#define IMX214_REG_ANALOG_GAIN CCI_REG16(0x0204) +#define IMX214_REG_SHORT_ANALOG_GAIN CCI_REG16(0x0216) + +/* Digital gain control */ +#define IMX214_REG_DIG_GAIN_GREENR CCI_REG16(0x020e) +#define IMX214_REG_DIG_GAIN_RED CCI_REG16(0x0210) +#define IMX214_REG_DIG_GAIN_BLUE CCI_REG16(0x0212) +#define IMX214_REG_DIG_GAIN_GREENB CCI_REG16(0x0214) + +#define IMX214_REG_ORIENTATION CCI_REG8(0x0101) + +#define IMX214_REG_MASK_CORR_FRAMES CCI_REG8(0x0105) +#define IMX214_CORR_FRAMES_TRANSMIT 0 +#define IMX214_CORR_FRAMES_MASK 1 + +#define IMX214_REG_CSI_DATA_FORMAT CCI_REG16(0x0112) +#define IMX214_CSI_DATA_FORMAT_RAW8 0x0808 +#define IMX214_CSI_DATA_FORMAT_RAW10 0x0A0A +#define IMX214_CSI_DATA_FORMAT_COMP6 0x0A06 +#define IMX214_CSI_DATA_FORMAT_COMP8 0x0A08 + +#define IMX214_REG_CSI_LANE_MODE CCI_REG8(0x0114) +#define IMX214_CSI_2_LANE_MODE 1 +#define IMX214_CSI_4_LANE_MODE 3 + +#define IMX214_REG_EXCK_FREQ CCI_REG16(0x0136) +#define IMX214_EXCK_FREQ (n) ((n) * 256)/* n expressed in MHz */ + +#define IMX214_REG_TEMP_SENSOR_CONTROL CCI_REG8(0x0138) + +#define IMX214_REG_HDR_MODE CCI_REG8(0x0220) +#define IMX214_HDR_MODE_OFF 0 +#define IMX214_HDR_MODE_ON 1 + +#define IMX214_REG_HDR_RES_REDUCTION CCI_REG8(0x0221) +#define IMX214_HDR_RES_REDU_THROUGH 0x11 +#define IMX214_HDR_RES_REDU_2_BINNING 0x22 + +/* PLL settings */ +#define IMX214_REG_VTPXCK_DIV CCI_REG8(0x0301) +#define IMX214_REG_VTSYCK_DIV CCI_REG8(0x0303) +#define IMX214_REG_PREPLLCK_VT_DIV CCI_REG8(0x0305) +#define IMX214_REG_PLL_VT_MPY CCI_REG16(0x0306) +#define IMX214_REG_OPPXCK_DIV CCI_REG8(0x0309) +#define IMX214_REG_OPSYCK_DIV CCI_REG8(0x030b) +#define IMX214_REG_PLL_MULT_DRIV CCI_REG8(0x0310) +#define IMX214_PLL_SINGLE 0 +#define IMX214_PLL_DUAL 1 + +#define IMX214_REG_LINE_LENGTH_PCK CCI_REG16(0x0342) +#define IMX214_REG_X_ADD_STA CCI_REG16(0x0344) +#define IMX214_REG_Y_ADD_STA CCI_REG16(0x0346) +#define IMX214_REG_X_ADD_END CCI_REG16(0x0348) +#define IMX214_REG_Y_ADD_END CCI_REG16(0x034a) +#define IMX214_REG_X_OUTPUT_SIZE CCI_REG16(0x034c) +#define IMX214_REG_Y_OUTPUT_SIZE CCI_REG16(0x034e) +#define IMX214_REG_X_EVEN_INC CCI_REG8(0x0381) +#define IMX214_REG_X_ODD_INC CCI_REG8(0x0383) +#define IMX214_REG_Y_EVEN_INC CCI_REG8(0x0385) +#define IMX214_REG_Y_ODD_INC CCI_REG8(0x0387) + +#define IMX214_REG_SCALE_MODE CCI_REG8(0x0401) +#define IMX214_SCALE_NONE 0 +#define IMX214_SCALE_HORIZONTAL 1 +#define IMX214_SCALE_FULL 2 +#define IMX214_REG_SCALE_M CCI_REG16(0x0404) + +#define IMX214_REG_DIG_CROP_X_OFFSET CCI_REG16(0x0408) +#define IMX214_REG_DIG_CROP_Y_OFFSET CCI_REG16(0x040a) +#define IMX214_REG_DIG_CROP_WIDTH CCI_REG16(0x040c) +#define IMX214_REG_DIG_CROP_HEIGHT CCI_REG16(0x040e) + +#define IMX214_REG_REQ_LINK_BIT_RATE CCI_REG32(0x0820) +#define IMX214_LINK_BIT_RATE_MBPS (n) ((n) << 16) + +/* Binning mode */ +#define IMX214_REG_BINNING_MODE CCI_REG8(0x0900) +#define IMX214_BINNING_NONE 0 +#define IMX214_BINNING_ENABLE 1 +#define IMX214_REG_BINNING_TYPE CCI_REG8(0x0901) +#define IMX214_REG_BINNING_WEIGHTING CCI_REG8(0x0902) +#define IMX214_BINNING_AVERAGE 0x00 +#define IMX214_BINNING_SUMMED 0x01 +#define IMX214_BINNING_BAYER 0x02 + +#define IMX214_REG_SING_DEF_CORR_EN CCI_REG8(0x0b06) +#define IMX214_SING_DEF_CORR_OFF 0 +#define IMX214_SING_DEF_CORR_ON 1 + +/* AWB control */ +#define IMX214_REG_ABS_GAIN_GREENR CCI_REG16(0x0b8e) +#define IMX214_REG_ABS_GAIN_RED CCI_REG16(0x0b90) +#define IMX214_REG_ABS_GAIN_BLUE CCI_REG16(0x0b92) +#define IMX214_REG_ABS_GAIN_GREENB CCI_REG16(0x0b94) + +#define IMX214_REG_RMSC_NR_MODE CCI_REG8(0x3001) +#define IMX214_REG_STATS_OUT_EN CCI_REG8(0x3013) +#define IMX214_STATS_OUT_OFF 0 +#define IMX214_STATS_OUT_ON 1 + +/* Chroma noise reduction */ +#define IMX214_REG_NML_NR_EN CCI_REG8(0x30a2) +#define IMX214_NML_NR_OFF 0 +#define IMX214_NML_NR_ON 1 + +#define IMX214_REG_EBD_SIZE_V CCI_REG8(0x5041) +#define IMX214_EBD_NO 0 +#define IMX214_EBD_4_LINE 4 + +#define IMX214_REG_RG_STATS_LMT CCI_REG16(0x6d12) +#define IMX214_RG_STATS_LMT_10_BIT 0x03FF +#define IMX214_RG_STATS_LMT_14_BIT 0x3FFF + +#define IMX214_REG_ATR_FAST_MOVE CCI_REG8(0x9300)/* IMX214 native and active pixel array size */ #define IMX214_NATIVE_WIDTH 4224U
@@ -74,96 +197,70 @@ struct imx214 {/*From imx214_mode_tbls.h*/ static const struct cci_reg_sequence mode_4096x2304[] = { - {CCI_REG8 (0x0114 ),0x03 }, - {CCI_REG8 (0x0220 ),0x00 }, - {CCI_REG8 (0x0221 ),0x11 }, - {CCI_REG8 (0x0222 ),0x01 }, - {CCI_REG8 (0x0340 ),0x0C }, - {CCI_REG8 (0x0341 ),0x7A }, - {CCI_REG8 (0x0342 ),0x13 }, - {CCI_REG8 (0x0343 ),0x90 }, - {CCI_REG8 (0x0344 ),0x00 }, - {CCI_REG8 (0x0345 ),0x38 }, - {CCI_REG8 (0x0346 ),0x01 }, - {CCI_REG8 (0x0347 ),0x98 }, - {CCI_REG8 (0x0348 ),0x10 }, - {CCI_REG8 (0x0349 ),0x37 }, - {CCI_REG8 (0x034A ),0x0A }, - {CCI_REG8 (0x034B ),0x97 }, - {CCI_REG8 (0x0381 ),0x01 }, - {CCI_REG8 (0x0383 ),0x01 }, - {CCI_REG8 (0x0385 ),0x01 }, - {CCI_REG8 (0x0387 ),0x01 }, - {CCI_REG8 (0x0900 ),0x00 }, - {CCI_REG8 (0x0901 ),0x00 }, - {CCI_REG8 (0x0902 ),0x00 }, + {IMX214_REG_CSI_LANE_MODE ,IMX214_CSI_4_LANE_MODE }, + {IMX214_REG_HDR_MODE ,IMX214_HDR_MODE_OFF }, + {IMX214_REG_HDR_RES_REDUCTION ,IMX214_HDR_RES_REDU_THROUGH }, + {IMX214_REG_EXPOSURE_RATIO ,1 }, + {IMX214_REG_FRM_LENGTH_LINES ,3194 }, + {IMX214_REG_LINE_LENGTH_PCK ,5008 }, + {IMX214_REG_X_ADD_STA ,56 }, + {IMX214_REG_Y_ADD_STA ,408 }, + {IMX214_REG_X_ADD_END ,4151 }, + {IMX214_REG_Y_ADD_END ,2711 }, + {IMX214_REG_X_EVEN_INC ,1 }, + {IMX214_REG_X_ODD_INC ,1 }, + {IMX214_REG_Y_EVEN_INC ,1 }, + {IMX214_REG_Y_ODD_INC ,1 }, + {IMX214_REG_BINNING_MODE ,IMX214_BINNING_NONE }, + {IMX214_REG_BINNING_TYPE ,0 }, + {IMX214_REG_BINNING_WEIGHTING ,IMX214_BINNING_AVERAGE }, {CCI_REG8 (0x3000 ),0x35 }, {CCI_REG8 (0x3054 ),0x01 }, {CCI_REG8 (0x305C ),0x11 }, - {CCI_REG8 (0x0112 ),0x0A }, - {CCI_REG8 (0x0113 ),0x0A }, - {CCI_REG8 (0x034C ),0x10 }, - {CCI_REG8 (0x034D ),0x00 }, - {CCI_REG8 (0x034E ),0x09 }, - {CCI_REG8 (0x034F ),0x00 }, - {CCI_REG8 (0x0401 ),0x00 }, - {CCI_REG8 (0x0404 ),0x00 }, - {CCI_REG8 (0x0405 ),0x10 }, - {CCI_REG8 (0x0408 ),0x00 }, - {CCI_REG8 (0x0409 ),0x00 }, - {CCI_REG8 (0x040A ),0x00 }, - {CCI_REG8 (0x040B ),0x00 }, - {CCI_REG8 (0x040C ),0x10 }, - {CCI_REG8 (0x040D ),0x00 }, - {CCI_REG8 (0x040E ),0x09 }, - {CCI_REG8 (0x040F ),0x00 }, - - {CCI_REG8 (0x0301 ),0x05 }, - {CCI_REG8 (0x0303 ),0x02 }, - {CCI_REG8 (0x0305 ),0x03 }, - {CCI_REG8 (0x0306 ),0x00 }, - {CCI_REG8 (0x0307 ),0x96 }, - {CCI_REG8 (0x0309 ),0x0A }, - {CCI_REG8 (0x030B ),0x01 }, - {CCI_REG8 (0x0310 ),0x00 }, - - {CCI_REG8 (0x0820 ),0x12 }, - {CCI_REG8 (0x0821 ),0xC0 }, - {CCI_REG8 (0x0822 ),0x00 }, - {CCI_REG8 (0x0823 ),0x00 }, + {IMX214_REG_CSI_DATA_FORMAT ,IMX214_CSI_DATA_FORMAT_RAW10 }, + {IMX214_REG_X_OUTPUT_SIZE ,4096 }, + {IMX214_REG_Y_OUTPUT_SIZE ,2304 }, + {IMX214_REG_SCALE_MODE ,IMX214_SCALE_NONE }, + {IMX214_REG_SCALE_M ,2 }, + {IMX214_REG_DIG_CROP_X_OFFSET ,0 }, + {IMX214_REG_DIG_CROP_Y_OFFSET ,0 }, + {IMX214_REG_DIG_CROP_WIDTH ,4096 }, + {IMX214_REG_DIG_CROP_HEIGHT ,2304 }, + + {IMX214_REG_VTPXCK_DIV ,5 }, + {IMX214_REG_VTSYCK_DIV ,2 }, + {IMX214_REG_PREPLLCK_VT_DIV ,3 }, + {IMX214_REG_PLL_VT_MPY ,150 }, + {IMX214_REG_OPPXCK_DIV ,10 }, + {IMX214_REG_OPSYCK_DIV ,1 }, + {IMX214_REG_PLL_MULT_DRIV ,IMX214_PLL_SINGLE }, + + {IMX214_REG_REQ_LINK_BIT_RATE ,IMX214_LINK_BIT_RATE_MBPS (4800 ) }, {CCI_REG8 (0x3A03 ),0x09 }, {CCI_REG8 (0x3A04 ),0x50 }, {CCI_REG8 (0x3A05 ),0x01 }, - {CCI_REG8 (0x0B06 ),0x01 }, - {CCI_REG8 (0x30A2 ),0x00 }, + {IMX214_REG_SING_DEF_CORR_EN ,IMX214_SING_DEF_CORR_ON }, + {IMX214_REG_NML_NR_EN ,IMX214_NML_NR_OFF }, {CCI_REG8 (0x30B4 ),0x00 }, {CCI_REG8 (0x3A02 ),0xFF }, {CCI_REG8 (0x3011 ),0x00 }, - {CCI_REG8 (0x3013 ),0x01 }, - - {CCI_REG8 (0x0202 ),0x0C }, - {CCI_REG8 (0x0203 ),0x70 }, - {CCI_REG8 (0x0224 ),0x01 }, - {CCI_REG8 (0x0225 ),0xF4 }, - - {CCI_REG8 (0x0204 ),0x00 }, - {CCI_REG8 (0x0205 ),0x00 }, - {CCI_REG8 (0x020E ),0x01 }, - {CCI_REG8 (0x020F ),0x00 }, - {CCI_REG8 (0x0210 ),0x01 }, - {CCI_REG8 (0x0211 ),0x00 }, - {CCI_REG8 (0x0212 ),0x01 }, - {CCI_REG8 (0x0213 ),0x00 }, - {CCI_REG8 (0x0214 ),0x01 }, - {CCI_REG8 (0x0215 ),0x00 }, - {CCI_REG8 (0x0216 ),0x00 }, - {CCI_REG8 (0x0217 ),0x00 }, + {IMX214_REG_STATS_OUT_EN ,IMX214_STATS_OUT_ON }, + + {IMX214_REG_EXPOSURE ,IMX214_EXPOSURE_DEFAULT }, + {IMX214_REG_SHORT_EXPOSURE ,500 }, + + {IMX214_REG_ANALOG_GAIN ,0 }, + {IMX214_REG_DIG_GAIN_GREENR ,256 }, + {IMX214_REG_DIG_GAIN_RED ,256 }, + {IMX214_REG_DIG_GAIN_BLUE ,256 }, + {IMX214_REG_DIG_GAIN_GREENB ,256 }, + {IMX214_REG_SHORT_ANALOG_GAIN ,0 }, {CCI_REG8 (0x4170 ),0x00 }, {CCI_REG8 (0x4171 ),0x10 },
@@ -174,96 +271,70 @@ static const struct cci_reg_sequence mode_4096x2304[] = { };static const struct cci_reg_sequence mode_1920x1080[] = { - {CCI_REG8 (0x0114 ),0x03 }, - {CCI_REG8 (0x0220 ),0x00 }, - {CCI_REG8 (0x0221 ),0x11 }, - {CCI_REG8 (0x0222 ),0x01 }, - {CCI_REG8 (0x0340 ),0x0C }, - {CCI_REG8 (0x0341 ),0x7A }, - {CCI_REG8 (0x0342 ),0x13 }, - {CCI_REG8 (0x0343 ),0x90 }, - {CCI_REG8 (0x0344 ),0x04 }, - {CCI_REG8 (0x0345 ),0x78 }, - {CCI_REG8 (0x0346 ),0x03 }, - {CCI_REG8 (0x0347 ),0xFC }, - {CCI_REG8 (0x0348 ),0x0B }, - {CCI_REG8 (0x0349 ),0xF7 }, - {CCI_REG8 (0x034A ),0x08 }, - {CCI_REG8 (0x034B ),0x33 }, - {CCI_REG8 (0x0381 ),0x01 }, - {CCI_REG8 (0x0383 ),0x01 }, - {CCI_REG8 (0x0385 ),0x01 }, - {CCI_REG8 (0x0387 ),0x01 }, - {CCI_REG8 (0x0900 ),0x00 }, - {CCI_REG8 (0x0901 ),0x00 }, - {CCI_REG8 (0x0902 ),0x00 }, + {IMX214_REG_CSI_LANE_MODE ,IMX214_CSI_4_LANE_MODE }, + {IMX214_REG_HDR_MODE ,IMX214_HDR_MODE_OFF }, + {IMX214_REG_HDR_RES_REDUCTION ,IMX214_HDR_RES_REDU_THROUGH }, + {IMX214_REG_EXPOSURE_RATIO ,1 }, + {IMX214_REG_FRM_LENGTH_LINES ,3194 }, + {IMX214_REG_LINE_LENGTH_PCK ,5008 }, + {IMX214_REG_X_ADD_STA ,1144 }, + {IMX214_REG_Y_ADD_STA ,1020 }, + {IMX214_REG_X_ADD_END ,3063 }, + {IMX214_REG_Y_ADD_END ,2099 }, + {IMX214_REG_X_EVEN_INC ,1 }, + {IMX214_REG_X_ODD_INC ,1 }, + {IMX214_REG_Y_EVEN_INC ,1 }, + {IMX214_REG_Y_ODD_INC ,1 }, + {IMX214_REG_BINNING_MODE ,IMX214_BINNING_NONE }, + {IMX214_REG_BINNING_TYPE ,0 }, + {IMX214_REG_BINNING_WEIGHTING ,IMX214_BINNING_AVERAGE }, {CCI_REG8 (0x3000 ),0x35 }, {CCI_REG8 (0x3054 ),0x01 }, {CCI_REG8 (0x305C ),0x11 }, - {CCI_REG8 (0x0112 ),0x0A }, - {CCI_REG8 (0x0113 ),0x0A }, - {CCI_REG8 (0x034C ),0x07 }, - {CCI_REG8 (0x034D ),0x80 }, - {CCI_REG8 (0x034E ),0x04 }, - {CCI_REG8 (0x034F ),0x38 }, - {CCI_REG8 (0x0401 ),0x00 }, - {CCI_REG8 (0x0404 ),0x00 }, - {CCI_REG8 (0x0405 ),0x10 }, - {CCI_REG8 (0x0408 ),0x00 }, - {CCI_REG8 (0x0409 ),0x00 }, - {CCI_REG8 (0x040A ),0x00 }, - {CCI_REG8 (0x040B ),0x00 }, - {CCI_REG8 (0x040C ),0x07 }, - {CCI_REG8 (0x040D ),0x80 }, - {CCI_REG8 (0x040E ),0x04 }, - {CCI_REG8 (0x040F ),0x38 }, - - {CCI_REG8 (0x0301 ),0x05 }, - {CCI_REG8 (0x0303 ),0x02 }, - {CCI_REG8 (0x0305 ),0x03 }, - {CCI_REG8 (0x0306 ),0x00 }, - {CCI_REG8 (0x0307 ),0x96 }, - {CCI_REG8 (0x0309 ),0x0A }, - {CCI_REG8 (0x030B ),0x01 }, - {CCI_REG8 (0x0310 ),0x00 }, - - {CCI_REG8 (0x0820 ),0x12 }, - {CCI_REG8 (0x0821 ),0xC0 }, - {CCI_REG8 (0x0822 ),0x00 }, - {CCI_REG8 (0x0823 ),0x00 }, + {IMX214_REG_CSI_DATA_FORMAT ,IMX214_CSI_DATA_FORMAT_RAW10 }, + {IMX214_REG_X_OUTPUT_SIZE ,1920 }, + {IMX214_REG_Y_OUTPUT_SIZE ,1080 }, + {IMX214_REG_SCALE_MODE ,IMX214_SCALE_NONE }, + {IMX214_REG_SCALE_M ,2 }, + {IMX214_REG_DIG_CROP_X_OFFSET ,0 }, + {IMX214_REG_DIG_CROP_Y_OFFSET ,0 }, + {IMX214_REG_DIG_CROP_WIDTH ,1920 }, + {IMX214_REG_DIG_CROP_HEIGHT ,1080 }, + + {IMX214_REG_VTPXCK_DIV ,5 }, + {IMX214_REG_VTSYCK_DIV ,2 }, + {IMX214_REG_PREPLLCK_VT_DIV ,3 }, + {IMX214_REG_PLL_VT_MPY ,150 }, + {IMX214_REG_OPPXCK_DIV ,10 }, + {IMX214_REG_OPSYCK_DIV ,1 }, + {IMX214_REG_PLL_MULT_DRIV ,IMX214_PLL_SINGLE }, + + {IMX214_REG_REQ_LINK_BIT_RATE ,IMX214_LINK_BIT_RATE_MBPS (4800 ) }, {CCI_REG8 (0x3A03 ),0x04 }, {CCI_REG8 (0x3A04 ),0xF8 }, {CCI_REG8 (0x3A05 ),0x02 }, - {CCI_REG8 (0x0B06 ),0x01 }, - {CCI_REG8 (0x30A2 ),0x00 }, + {IMX214_REG_SING_DEF_CORR_EN ,IMX214_SING_DEF_CORR_ON }, + {IMX214_REG_NML_NR_EN ,IMX214_NML_NR_OFF }, {CCI_REG8 (0x30B4 ),0x00 }, {CCI_REG8 (0x3A02 ),0xFF }, {CCI_REG8 (0x3011 ),0x00 }, - {CCI_REG8 (0x3013 ),0x01 }, - - {CCI_REG8 (0x0202 ),0x0C }, - {CCI_REG8 (0x0203 ),0x70 }, - {CCI_REG8 (0x0224 ),0x01 }, - {CCI_REG8 (0x0225 ),0xF4 }, - - {CCI_REG8 (0x0204 ),0x00 }, - {CCI_REG8 (0x0205 ),0x00 }, - {CCI_REG8 (0x020E ),0x01 }, - {CCI_REG8 (0x020F ),0x00 }, - {CCI_REG8 (0x0210 ),0x01 }, - {CCI_REG8 (0x0211 ),0x00 }, - {CCI_REG8 (0x0212 ),0x01 }, - {CCI_REG8 (0x0213 ),0x00 }, - {CCI_REG8 (0x0214 ),0x01 }, - {CCI_REG8 (0x0215 ),0x00 }, - {CCI_REG8 (0x0216 ),0x00 }, - {CCI_REG8 (0x0217 ),0x00 }, + {IMX214_REG_STATS_OUT_EN ,IMX214_STATS_OUT_ON }, + + {IMX214_REG_EXPOSURE ,IMX214_EXPOSURE_DEFAULT }, + {IMX214_REG_SHORT_EXPOSURE ,500 }, + + {IMX214_REG_ANALOG_GAIN ,0 }, + {IMX214_REG_DIG_GAIN_GREENR ,256 }, + {IMX214_REG_DIG_GAIN_RED ,256 }, + {IMX214_REG_DIG_GAIN_BLUE ,256 }, + {IMX214_REG_DIG_GAIN_GREENB ,256 }, + {IMX214_REG_SHORT_ANALOG_GAIN ,0 }, {CCI_REG8 (0x4170 ),0x00 }, {CCI_REG8 (0x4171 ),0x10 },
@@ -277,20 +348,19 @@ static const struct cci_reg_sequence mode_table_common[] = {/* software reset */ /* software standby settings */ - { CCI_REG8(0x0100), 0x00 }, + { IMX214_REG_MODE_SELECT, IMX214_MODE_STANDBY },/* ATR setting */ - { CCI_REG8(0x9300), 0x02 }, + { IMX214_REG_ATR_FAST_MOVE, 2 },/* external clock setting */ - { CCI_REG8(0x0136), 0x18 }, - { CCI_REG8(0x0137), 0x00 }, + { IMX214_REG_EXCK_FREQ, IMX214_EXCK_FREQ(IMX214_DEFAULT_CLK_FREQ / 1000000) },/* global setting */ /* basic config */ - { CCI_REG8(0x0101), 0x00 }, - { CCI_REG8(0x0105), 0x01 }, - { CCI_REG8(0x0106), 0x01 }, + { IMX214_REG_ORIENTATION, 0 }, + { IMX214_REG_MASK_CORR_FRAMES, IMX214_CORR_FRAMES_MASK }, + { IMX214_REG_FAST_STANDBY_CTRL, 1 }, { CCI_REG8(0x4550), 0x02 }, { CCI_REG8(0x4601), 0x00 }, { CCI_REG8(0x4642), 0x05 },
@@ -335,18 +405,17 @@ static const struct cci_reg_sequence mode_table_common[] = { { CCI_REG8(0x4A87), 0xFF },/* embedded data */ - { CCI_REG8(0x5041), 0x04 }, + { IMX214_REG_EBD_SIZE_V, IMX214_EBD_4_LINE }, { CCI_REG8(0x583C), 0x04 }, { CCI_REG8(0x620E), 0x04 }, { CCI_REG8(0x6EB2), 0x01 }, { CCI_REG8(0x6EB3), 0x00 }, - { CCI_REG8(0x9300), 0x02 }, + { IMX214_REG_ATR_FAST_MOVE, 2 },/* imagequality */ /* HDR setting */ - { CCI_REG8(0x3001), 0x07 }, - { CCI_REG8(0x6D12), 0x3F }, - { CCI_REG8(0x6D13), 0xFF }, + { IMX214_REG_RMSC_NR_MODE, 0x07 }, + { IMX214_REG_RG_STATS_LMT, IMX214_RG_STATS_LMT_14_BIT }, { CCI_REG8(0x9344), 0x03 }, { CCI_REG8(0x9706), 0x10 }, { CCI_REG8(0x9707), 0x03 },
@@ -374,14 +443,10 @@ static const struct cci_reg_sequence mode_table_common[] = { { CCI_REG8(0x698B), 0x03 },/* white balanace */ - { CCI_REG8(0x0B8E), 0x01 }, - { CCI_REG8(0x0B8F), 0x00 }, - { CCI_REG8(0x0B90), 0x01 }, - { CCI_REG8(0x0B91), 0x00 }, - { CCI_REG8(0x0B92), 0x01 }, - { CCI_REG8(0x0B93), 0x00 }, - { CCI_REG8(0x0B94), 0x01 }, - { CCI_REG8(0x0B95), 0x00 }, + { IMX214_REG_ABS_GAIN_GREENR, 0x0100 }, + { IMX214_REG_ABS_GAIN_RED, 0x0100 }, + { IMX214_REG_ABS_GAIN_BLUE, 0x0100 }, + { IMX214_REG_ABS_GAIN_GREENB, 0x0100 },/* ATR setting */ { CCI_REG8(0x6E50), 0x00 },
@@ -737,7 +802,7 @@ static int imx214_start_streaming(struct imx214 *imx214)usleep_range (10000 ,10500 ); -cci_write (imx214->regmap,CCI_REG8 (0x0138 ),0x01 ,NULL ); +cci_write (imx214->regmap,IMX214_REG_TEMP_SENSOR_CONTROL ,0x01 ,NULL ); ret =__v4l2_ctrl_handler_setup (&imx214->ctrls);if (ret <0 ) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 13/280 media: i2c: imx214: Check number of lanes from device tree
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: André Apitzsch <[email protected]>
[ Upstream commit 3d55f4eb03fce69f3a72615fe9c5ca171f7b846b ]
The imx214 camera is capable of either two-lane or four-lane operation.
Currently only the four-lane mode is supported, as proper pixel rates and link frequences for the two-lane mode are unknown.
Stable-dep-of: acc294519f17 ("media: i2c: imx214: Fix link frequency validation")
--- drivers/media/i2c/imx214.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
drivers/media/i2c/imx214.c +14 -2
@@ -197,7 +197,6 @@ struct imx214 {/*From imx214_mode_tbls.h*/ static const struct cci_reg_sequence mode_4096x2304[] = { - {IMX214_REG_CSI_LANE_MODE ,IMX214_CSI_4_LANE_MODE }, {IMX214_REG_HDR_MODE ,IMX214_HDR_MODE_OFF }, {IMX214_REG_HDR_RES_REDUCTION ,IMX214_HDR_RES_REDU_THROUGH }, {IMX214_REG_EXPOSURE_RATIO ,1 },
@@ -271,7 +270,6 @@ static const struct cci_reg_sequence mode_4096x2304[] = { };static const struct cci_reg_sequence mode_1920x1080[] = { - {IMX214_REG_CSI_LANE_MODE ,IMX214_CSI_4_LANE_MODE }, {IMX214_REG_HDR_MODE ,IMX214_HDR_MODE_OFF }, {IMX214_REG_HDR_RES_REDUCTION ,IMX214_HDR_RES_REDU_THROUGH }, {IMX214_REG_EXPOSURE_RATIO ,1 },
@@ -789,6 +787,13 @@ static int imx214_start_streaming(struct imx214 *imx214)return ret; } + ret =cci_write (imx214->regmap,IMX214_REG_CSI_LANE_MODE , +IMX214_CSI_4_LANE_MODE ,NULL ); +if (ret) { +dev_err (imx214->dev,"failed to configure lanes\n" ); +return ret; + } + state =v4l2_subdev_get_locked_active_state (&imx214->sd); fmt =v4l2_subdev_state_get_format (state,0 ); mode = v4l2_find_nearest_size(imx214_modes, ARRAY_SIZE(imx214_modes),
@@ -953,6 +958,13 @@ static int imx214_parse_fwnode(struct device *dev) goto done; } +/* Check the number of MIPI CSI2 data lanes */ +if (bus_cfg.bus.mipi_csi2.num_data_lanes !=4 ) { + ret =dev_err_probe (dev, -EINVAL , +"only 4 data lanes are currently supported\n" ); + goto done; + } +for (i =0 ; i < bus_cfg.nr_of_link_frequencies; i++)if (bus_cfg.link_frequencies[i] ==IMX214_DEFAULT_LINK_FREQ )break ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 14/280 media: i2c: imx214: Fix link frequency validation
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: André Apitzsch <[email protected]>
[ Upstream commit acc294519f1749041e1b8c74d46bbf6c57d8b061 ]
The driver defines IMX214_DEFAULT_LINK_FREQ 480000000, and then IMX214_DEFAULT_PIXEL_RATE ((IMX214_DEFAULT_LINK_FREQ * 8LL) / 10), which works out as 384MPix/s. (The 8 is 4 lanes and DDR.)
Parsing the PLL registers with the defined 24MHz input. We're in single PLL mode, so MIPI frequency is directly linked to pixel rate. VTCK ends up being 1200MHz, and VTPXCK and OPPXCK both are 120MHz. Section 5.3 "Frame rate calculation formula" says "Pixel rate
[pixels/s] = VTPXCK [MHz] * 4", so 120 * 4 = 480MPix/s, which basically agrees with my number above.
3.1.4. MIPI global timing setting says "Output bitrate = OPPXCK * reg 0x113[7:0]", so 120MHz * 10, or 1200Mbit/s. That would be a link frequency of 600MHz due to DDR.
That also matches to 480MPix/s * 10bpp / 4 lanes / 2 for DDR.
Keep the previous link frequency for backward compatibility.
--- drivers/media/i2c/imx214.c | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-)
drivers/media/i2c/imx214.c +19 -9
@@ -27,7 +27,9 @@#define IMX214_REG_FAST_STANDBY_CTRL CCI_REG8(0x0106)#define IMX214_DEFAULT_CLK_FREQ 24000000 -#define IMX214_DEFAULT_LINK_FREQ 480000000 +#define IMX214_DEFAULT_LINK_FREQ 600000000 +/* Keep wrong link frequency for backward compatibility */ +#define IMX214_DEFAULT_LINK_FREQ_LEGACY 480000000#define IMX214_DEFAULT_PIXEL_RATE ((IMX214_DEFAULT_LINK_FREQ * 8LL) / 10)#define IMX214_FPS 30#define IMX214_MBUS_CODE MEDIA_BUS_FMT_SRGGB10_1X10
@@ -965,18 +967,26 @@ static int imx214_parse_fwnode(struct device *dev) goto done; } -for (i =0 ; i < bus_cfg.nr_of_link_frequencies; i++) +if (bus_cfg.nr_of_link_frequencies !=1 ) +dev_warn (dev,"Only one link-frequency supported, please review your DT. Continuing anyway\n" ); + +for (i =0 ; i < bus_cfg.nr_of_link_frequencies; i++) {if (bus_cfg.link_frequencies[i] ==IMX214_DEFAULT_LINK_FREQ )break ; - -if (i == bus_cfg.nr_of_link_frequencies) { -dev_err_probe (dev, -EINVAL , -"link-frequencies %d not supported, Please review your DT\n" , -IMX214_DEFAULT_LINK_FREQ ); - ret = -EINVAL ; - goto done; +if (bus_cfg.link_frequencies[i] == +IMX214_DEFAULT_LINK_FREQ_LEGACY ) { +dev_warn (dev, +"link-frequencies %d not supported, please review your DT. Continuing anyway\n" , +IMX214_DEFAULT_LINK_FREQ ); +break ; + } } +if (i == bus_cfg.nr_of_link_frequencies) + ret =dev_err_probe (dev, -EINVAL , +"link-frequencies %d not supported, please review your DT\n" , +IMX214_DEFAULT_LINK_FREQ ); + done:v4l2_fwnode_endpoint_free (&bus_cfg);fwnode_handle_put (endpoint);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 15/280 media: ov08x40: Move ov08x40_identify_module() function up
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hans de Goede <[email protected]>
[ Upstream commit 7a39639e448f070cbe37317ac922886b6080ff43 ]
Move the ov08x40_identify_module() function to above ov08x40_set_stream() this is a preparation patch for adding a missing ov08x40_identify_module() call to ov08x40_set_stream().
No functional changes, just moving code around.
Stable-dep-of: ebf185efadb7 ("media: ov08x40: Add missing ov08x40_identify_module() call on stream-start")
--- drivers/media/i2c/ov08x40.c | 52 ++++++++++++++++++------------------- 1 file changed, 26 insertions(+), 26 deletions(-)
drivers/media/i2c/ov08x40.c +26 -26
@@ -1869,6 +1869,32 @@ static int ov08x40_stop_streaming(struct ov08x40 *ov08x) OV08X40_REG_VALUE_08BIT, OV08X40_MODE_STANDBY); } +/* Verify chip ID */ +static int ov08x40_identify_module (struct ov08x40 *ov08x) +{ +struct i2c_client *client =v4l2_get_subdevdata (&ov08x->sd); +int ret; +u32 val; + +if (ov08x->identified) +return 0 ; + + ret =ov08x40_read_reg (ov08x,OV08X40_REG_CHIP_ID , +OV08X40_REG_VALUE_24BIT , &val); +if (ret) +return ret; + +if (val !=OV08X40_CHIP_ID ) { +dev_err (&client->dev,"chip id mismatch: %x!=%x\n" , +OV08X40_CHIP_ID , val); +return -ENXIO ; + } + + ov08x->identified = true; + +return 0 ; +} +static int ov08x40_set_stream (struct v4l2_subdev *sd,int enable) {struct ov08x40 *ov08x =to_ov08x40 (sd);
@@ -1906,32 +1932,6 @@ static int ov08x40_set_stream(struct v4l2_subdev *sd, int enable)return ret; } -/* Verify chip ID */ -static int ov08x40_identify_module (struct ov08x40 *ov08x) -{ -struct i2c_client *client =v4l2_get_subdevdata (&ov08x->sd); -int ret; -u32 val; - -if (ov08x->identified) -return 0 ; - - ret =ov08x40_read_reg (ov08x,OV08X40_REG_CHIP_ID , -OV08X40_REG_VALUE_24BIT , &val); -if (ret) -return ret; - -if (val !=OV08X40_CHIP_ID ) { -dev_err (&client->dev,"chip id mismatch: %x!=%x\n" , -OV08X40_CHIP_ID , val); -return -ENXIO ; - } - - ov08x->identified = true; - -return 0 ; -} -static const struct v4l2_subdev_video_ops ov08x40_video_ops = { .s_stream = ov08x40_set_stream, };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 6/280 mmc: sdhci-msm: fix dev reference leaked through of_qcom_ice_get
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tudor Ambarus <[email protected]>
[ Upstream commit cbef7442fba510b7eb229dcc9f39d3dde4a159a4 ]
The driver leaks the device reference taken with of_find_device_by_node(). Fix the leak by using devm_of_qcom_ice_get().
--- drivers/mmc/host/sdhci-msm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mmc/host/sdhci-msm.c +1 -1
@@ -1866,7 +1866,7 @@ static int sdhci_msm_ice_init(struct sdhci_msm_host *msm_host,if (!(cqhci_readl (cq_host,CQHCI_CAP ) &CQHCI_CAP_CS ))return 0 ; - ice =of_qcom_ice_get (dev); + ice =devm_of_qcom_ice_get (dev);if (ice ==ERR_PTR (-EOPNOTSUPP )) {dev_warn (dev,"Disabling inline encryption support\n" ); ice =NULL ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 38/280 ksmbd: browse interfaces list on FSCTL_QUERY_INTERFACE_INFO IOCTL
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <[email protected]>
[ Upstream commit b2d99376c5d61eb60ffdb6c503e4b6c8f9712ddd ]
ksmbd.mount will give each interfaces list and bind_interfaces_only flags to ksmbd server. Previously, the interfaces list was sent only when bind_interfaces_only was enabled.
ksmbd server browse only interfaces list given from ksmbd.conf on FSCTL_QUERY_INTERFACE_INFO IOCTL.
Stable-dep-of: 21a4e47578d4 ("ksmbd: fix use-after-free in __smb2_lease_break_noti()")
--- fs/smb/server/ksmbd_netlink.h | 3 +- fs/smb/server/server.h | 1 + fs/smb/server/smb2pdu.c | 4 ++ fs/smb/server/transport_ipc.c | 1 + fs/smb/server/transport_tcp.c | 73 +++++++++++++++-------------------- fs/smb/server/transport_tcp.h | 1 + 6 files changed, 41 insertions(+), 42 deletions(-)
fs/smb/server/ksmbd_netlink.h +2 -1
@@ -111,7 +111,8 @@ struct ksmbd_startup_request {__u32 smb2_max_credits;/* MAX credits */ __u32 smbd_max_io_size;/* smbd read write size */ __u32 max_connections;/* Number of maximum simultaneous connections */ -__u32 reserved[126 ];/* Reserved room */ +__s8 bind_interfaces_only; +__s8 reserved[503 ];/* Reserved room */ __u32 ifc_list_sz;/* interfaces list size */ __s8 ____payload[]; };
fs/smb/server/server.h +1 -0
@@ -46,6 +46,7 @@ struct ksmbd_server_config {char *conf[SERVER_CONF_WORK_GROUP +1 ];struct task_struct *dh_task; +bool bind_interfaces_only; };extern struct ksmbd_server_config server_conf;
fs/smb/server/smb2pdu.c +4 -0
@@ -38,6 +38,7 @@#include "mgmt/user_session.h" #include "mgmt/ksmbd_ida.h" #include "ndr.h" +#include "transport_tcp.h" static void __wbuf (struct ksmbd_work *work,void **req,void **rsp) {
@@ -7771,6 +7772,9 @@ static int fsctl_query_iface_info_ioctl(struct ksmbd_conn *conn,if (netdev->type ==ARPHRD_LOOPBACK )continue ; +if (!ksmbd_find_netdev_name_iface_list (netdev->name)) +continue ; + flags =dev_get_flags (netdev);if (!(flags &IFF_RUNNING ))continue ;
fs/smb/server/transport_ipc.c +1 -0
@@ -338,6 +338,7 @@ static int ipc_server_config_on_startup(struct ksmbd_startup_request *req) ret =ksmbd_set_netbios_name (req->netbios_name); ret |=ksmbd_set_server_string (req->server_string); ret |=ksmbd_set_work_group (req->work_group); + server_conf.bind_interfaces_only = req->bind_interfaces_only; ret |=ksmbd_tcp_set_interfaces (KSMBD_STARTUP_CONFIG_INTERFACES (req), req->ifc_list_sz); out:
fs/smb/server/transport_tcp.c +32 -41
103 lines not on this page · raw message
fs/smb/server/transport_tcp.h +1 -0
@@ -7,6 +7,7 @@#define __KSMBD_TRANSPORT_TCP_H__int ksmbd_tcp_set_interfaces (char *ifc_list,int ifc_list_sz); +struct interface *ksmbd_find_netdev_name_iface_list (char *netdev_name);int ksmbd_tcp_init (void );void ksmbd_tcp_destroy (void );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 47/280 drm/amd/display: Fix unnecessary cast warnings from checkpatch
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rohit Chavan <[email protected]>
[ Upstream commit c299cb6eafaf76d0cb4094623d6401c45d8bd0dc ]
This patch addresses warnings produced by the checkpatch script related to unnecessary casts that could potentially hide bugs.
The specific warnings are as follows:
- Warning at drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_wrapper.c:16
- Warning at drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_wrapper.c:20
- Warning at drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_wrapper.c:30
Stable-dep-of: cd9e6d6fdd2d ("drm/amd/display/dml2: use vzalloc rather than kzalloc")
--- drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_wrapper.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_wrapper.c +3 -3
@@ -13,11 +13,11 @@static bool dml21_allocate_memory (struct dml2_context **dml_ctx) { - *dml_ctx = (struct dml2_context *)kzalloc (sizeof (struct dml2_context ),GFP_KERNEL ); + *dml_ctx =kzalloc (sizeof (struct dml2_context ),GFP_KERNEL );if (!(*dml_ctx))return false; - (*dml_ctx)->v21.dml_init.dml2_instance = (struct dml2_instance *)kzalloc (sizeof (struct dml2_instance ),GFP_KERNEL ); + (*dml_ctx)->v21.dml_init.dml2_instance =kzalloc (sizeof (struct dml2_instance ),GFP_KERNEL );if (!((*dml_ctx)->v21.dml_init.dml2_instance))return false;
@@ -27,7 +27,7 @@ static bool dml21_allocate_memory(struct dml2_context **dml_ctx) (*dml_ctx)->v21.mode_support.display_config = &(*dml_ctx)->v21.display_config; (*dml_ctx)->v21.mode_programming.display_config = (*dml_ctx)->v21.mode_support.display_config; - (*dml_ctx)->v21.mode_programming.programming = (struct dml2_display_cfg_programming *)kzalloc (sizeof (struct dml2_display_cfg_programming ),GFP_KERNEL ); + (*dml_ctx)->v21.mode_programming.programming =kzalloc (sizeof (struct dml2_display_cfg_programming ),GFP_KERNEL );if (!((*dml_ctx)->v21.mode_programming.programming))return false;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 48/280 drm/amd/display/dml2: use vzalloc rather than kzalloc
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alex Deucher <[email protected]>
[ Upstream commit cd9e6d6fdd2de60bfb4672387c17d4ee7157cf8e ]
The structures are large and they do not require contiguous memory so use vzalloc.
--- .../gpu/drm/amd/display/dc/dml2/dml21/dml21_wrapper.c | 11 ++++++----- drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c | 6 ++++-- 2 files changed, 10 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_wrapper.c +6 -5
@@ -2,6 +2,7 @@// // Copyright 2024 Advanced Micro Devices, Inc. +#include <linux/vmalloc.h> #include "dml2_internal_types.h" #include "dml_top.h"
@@ -13,11 +14,11 @@static bool dml21_allocate_memory (struct dml2_context **dml_ctx) { - *dml_ctx =kzalloc (sizeof (struct dml2_context ),GFP_KERNEL ); + *dml_ctx =vzalloc (sizeof (struct dml2_context ));if (!(*dml_ctx))return false; - (*dml_ctx)->v21.dml_init.dml2_instance =kzalloc (sizeof (struct dml2_instance ),GFP_KERNEL ); + (*dml_ctx)->v21.dml_init.dml2_instance =vzalloc (sizeof (struct dml2_instance ));if (!((*dml_ctx)->v21.dml_init.dml2_instance))return false;
@@ -27,7 +28,7 @@ static bool dml21_allocate_memory(struct dml2_context **dml_ctx) (*dml_ctx)->v21.mode_support.display_config = &(*dml_ctx)->v21.display_config; (*dml_ctx)->v21.mode_programming.display_config = (*dml_ctx)->v21.mode_support.display_config; - (*dml_ctx)->v21.mode_programming.programming =kzalloc (sizeof (struct dml2_display_cfg_programming ),GFP_KERNEL ); + (*dml_ctx)->v21.mode_programming.programming =vzalloc (sizeof (struct dml2_display_cfg_programming ));if (!((*dml_ctx)->v21.mode_programming.programming))return false;
@@ -116,8 +117,8 @@ bool dml21_create(const struct dc *in_dc, struct dml2_context **dml_ctx, const svoid dml21_destroy (struct dml2_context *dml2) { -kfree (dml2->v21.dml_init.dml2_instance); -kfree (dml2->v21.mode_programming.programming); +vfree (dml2->v21.dml_init.dml2_instance); +vfree (dml2->v21.mode_programming.programming); } static void dml21_calculate_rq_and_dlg_params(const struct dc *dc, struct dc_state *context, struct resource_context *out_new_hw_state,
drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c +4 -2
@@ -24,6 +24,8 @@* */ +#include <linux/vmalloc.h> +#include "display_mode_core.h" #include "dml2_internal_types.h" #include "dml2_utils.h"
@@ -749,7 +751,7 @@ bool dml2_validate(const struct dc *in_dc, struct dc_state *context, struct dml2static inline struct dml2_context *dml2_allocate_memory (void ) { -return (struct dml2_context *)kzalloc (sizeof (struct dml2_context ),GFP_KERNEL ); +return (struct dml2_context *)vzalloc (sizeof (struct dml2_context )); }static void dml2_init (const struct dc *in_dc,const struct dml2_configuration_options *config,struct dml2_context **dml2)
@@ -820,7 +822,7 @@ void dml2_destroy(struct dml2_context *dml2)if (dml2->architecture == dml2_architecture_21)dml21_destroy (dml2); -kfree (dml2); +vfree (dml2); } void dml2_extract_dram_and_fclk_change_support(struct dml2_context *dml2,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 49/280 lib/Kconfig.ubsan: Remove default UBSAN from UBSAN_INTEGER_WRAP
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nathan Chancellor <[email protected]>
commit cdc2e1d9d929d7f7009b3a5edca52388a2b0891f upstream.
CONFIG_UBSAN_INTEGER_WRAP is 'default UBSAN', which is problematic for a couple of reasons.
The first is that this sanitizer is under active development on the compiler side to come up with a solution that is maintainable on the compiler side and usable on the kernel side. As a result of this, there are many warnings when the sanitizer is enabled that have no clear path to resolution yet but users may see them and report them in the meantime.
The second is that this option was renamed from CONFIG_UBSAN_SIGNED_WRAP, meaning that if a configuration has CONFIG_UBSAN=y but CONFIG_UBSAN_SIGNED_WRAP=n and it is upgraded via olddefconfig (common in non-interactive scenarios such as CI), CONFIG_UBSAN_INTEGER_WRAP will be silently enabled again.
Remove 'default UBSAN' from CONFIG_UBSAN_INTEGER_WRAP until it is ready for regular usage and testing from a broader community than the folks actively working on the feature.
--- lib/Kconfig.ubsan | 1 - 1 file changed, 1 deletion(-)
lib/Kconfig.ubsan +0 -1
@@ -118,7 +118,6 @@ config UBSAN_UNREACHABLE config UBSAN_SIGNED_WRAP bool "Perform checking for signed arithmetic wrap-around" - default UBSAN depends on !COMPILE_TEST # The no_sanitize attribute was introduced in GCC with version 8. depends on !CC_IS_GCC || GCC_VERSION >= 80000
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 50/280 ceph: Fix incorrect flush end position calculation
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Howells <[email protected]>
[ Upstream commit f452a2204614fc10e2c3b85904c4bd300c2789dc ]
In ceph, in fill_fscrypt_truncate(), the end flush position is calculated by:
loff_t lend = orig_pos + CEPH_FSCRYPT_BLOCK_SHIFT - 1;
but that's using the block shift not the block size.
Fix this to use the block size instead.
--- fs/ceph/inode.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/ceph/inode.c +1 -1
@@ -2362,7 +2362,7 @@ static int fill_fscrypt_truncate(struct inode *inode,/* Try to writeback the dirty pagecaches */ if (issued & (CEPH_CAP_FILE_BUFFER )) { -loff_t lend = orig_pos +CEPH_FSCRYPT_BLOCK_SHIFT -1 ; +loff_t lend = orig_pos +CEPH_FSCRYPT_BLOCK_SIZE -1 ; ret =filemap_write_and_wait_range (inode->i_mapping, orig_pos, lend);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 51/280 cpufreq: sun50i: prevent out-of-bounds access
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andre Przywara <[email protected]>
[ Upstream commit 14c8a418159e541d70dbf8fc71225d1623beaf0f ]
A KASAN enabled kernel reports an out-of-bounds access when handling the nvmem cell in the sun50i cpufreq driver:
==================================================================
BUG: KASAN: slab-out-of-bounds in sun50i_cpufreq_nvmem_probe+0x180/0x3d4 Read of size 4 at addr ffff000006bf31e0 by task kworker/u16:1/38
This is because the DT specifies the nvmem cell as covering only two bytes, but we use a u32 pointer to read the value. DTs for other SoCs indeed specify 4 bytes, so we cannot just shorten the variable to a u16.
Fortunately nvmem_cell_read() allows to return the length of the nvmem cell, in bytes, so we can use that information to only access the valid portion of the data.
To cover multiple cell sizes, use memcpy() to copy the information into a zeroed u32 buffer, then also make sure we always read the data in little endian fashion, as this is how the data is stored in the SID efuses.
--- drivers/cpufreq/sun50i-cpufreq-nvmem.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/cpufreq/sun50i-cpufreq-nvmem.c +12 -6
@@ -167,7 +167,9 @@ static int sun50i_cpufreq_get_efuse(void)struct nvmem_cell *speedbin_nvmem;const struct of_device_id *match;struct device *cpu_dev; -u32 *speedbin; +void *speedbin_ptr; +u32 speedbin =0 ; +size_t len;int ret; cpu_dev =get_cpu_device (0 );
@@ -190,14 +192,18 @@ static int sun50i_cpufreq_get_efuse(void)return dev_err_probe (cpu_dev,PTR_ERR (speedbin_nvmem),"Could not get nvmem cell\n" ); - speedbin =nvmem_cell_read (speedbin_nvmem,NULL ); + speedbin_ptr =nvmem_cell_read (speedbin_nvmem, &len);nvmem_cell_put (speedbin_nvmem); -if (IS_ERR (speedbin)) -return PTR_ERR (speedbin); +if (IS_ERR (speedbin_ptr)) +return PTR_ERR (speedbin_ptr); - ret = opp_data->efuse_xlate (*speedbin); +if (len <=4 ) +memcpy (&speedbin, speedbin_ptr, len); + speedbin =le32_to_cpu (speedbin); -kfree (speedbin); + ret = opp_data->efuse_xlate (speedbin); + +kfree (speedbin_ptr);return ret; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 52/280 dma/contiguous: avoid warning about unused size_bytes
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Arnd Bergmann <[email protected]>
[ Upstream commit d7b98ae5221007d3f202746903d4c21c7caf7ea9 ]
When building with W=1, this variable is unused for configs with CONFIG_CMA_SIZE_SEL_PERCENTAGE=y:
kernel/dma/contiguous.c:67:26: error: 'size_bytes' defined but not used [-Werror=unused-const-variable=]
Change this to a macro to avoid the warning.
--- kernel/dma/contiguous.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
kernel/dma/contiguous.c +1 -2
@@ -64,8 +64,7 @@ struct cma *dma_contiguous_default_area;* Users, who want to set the size of global CMA area for their system * should use cma= kernel parameter. */ -static const phys_addr_t size_bytes__initconst = - (phys_addr_t )CMA_SIZE_MBYTES *SZ_1M ; +#define size_bytes ((phys_addr_t)CMA_SIZE_MBYTES * SZ_1M)static phys_addr_t size_cmdline__initdata =-1 ;static phys_addr_t base_cmdline__initdata ;static phys_addr_t limit_cmdline__initdata ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 53/280 cpufreq: apple-soc: Fix null-ptr-deref in apple_soc_cpufreq_get_rate()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Henry Martin <[email protected]>
[ Upstream commit 9992649f6786921873a9b89dafa5e04d8c5fef2b ]
cpufreq_cpu_get_raw() can return NULL when the target CPU is not present in the policy->cpus mask. apple_soc_cpufreq_get_rate() does not check for this case, which results in a NULL pointer dereference.
--- drivers/cpufreq/apple-soc-cpufreq.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/cpufreq/apple-soc-cpufreq.c +8 -2
@@ -103,11 +103,17 @@ static const struct of_device_id apple_soc_cpufreq_of_match[] __maybe_unused = {static unsigned int apple_soc_cpufreq_get_rate (unsigned int cpu) { -struct cpufreq_policy *policy =cpufreq_cpu_get_raw (cpu); -struct apple_cpu_priv *priv = policy->driver_data; +struct cpufreq_policy *policy; +struct apple_cpu_priv *priv;struct cpufreq_frequency_table *p;unsigned int pstate; + policy =cpufreq_cpu_get_raw (cpu); +if (unlikely (!policy)) +return 0 ; + + priv = policy->driver_data; +if (priv->info->cur_pstate_mask) {u64 reg =readq_relaxed (priv->reg_base +APPLE_DVFS_STATUS );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 54/280 cpufreq: scmi: Fix null-ptr-deref in scmi_cpufreq_get_rate()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Henry Martin <[email protected]>
[ Upstream commit 484d3f15cc6cbaa52541d6259778e715b2c83c54 ]
cpufreq_cpu_get_raw() can return NULL when the target CPU is not present in the policy->cpus mask. scmi_cpufreq_get_rate() does not check for this case, which results in a NULL pointer dereference.
Add NULL check after cpufreq_cpu_get_raw() to prevent this issue.
--- drivers/cpufreq/scmi-cpufreq.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
drivers/cpufreq/scmi-cpufreq.c +8 -2
@@ -34,11 +34,17 @@ static struct cpufreq_driver scmi_cpufreq_driver;static unsigned int scmi_cpufreq_get_rate (unsigned int cpu) { -struct cpufreq_policy *policy =cpufreq_cpu_get_raw (cpu); -struct scmi_data *priv = policy->driver_data; +struct cpufreq_policy *policy; +struct scmi_data *priv;unsigned long rate;int ret; + policy =cpufreq_cpu_get_raw (cpu); +if (unlikely (!policy)) +return 0 ; + + priv = policy->driver_data; + ret = perf_ops->freq_get (ph, priv->domain_id, &rate, false);if (ret)return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 55/280 cpufreq: scpi: Fix null-ptr-deref in scpi_cpufreq_get_rate()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Henry Martin <[email protected]>
[ Upstream commit 73b24dc731731edf762f9454552cb3a5b7224949 ]
cpufreq_cpu_get_raw() can return NULL when the target CPU is not present in the policy->cpus mask. scpi_cpufreq_get_rate() does not check for this case, which results in a NULL pointer dereference.
--- drivers/cpufreq/scpi-cpufreq.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-)
drivers/cpufreq/scpi-cpufreq.c +10 -3
@@ -29,9 +29,16 @@ static struct scpi_ops *scpi_ops;static unsigned int scpi_cpufreq_get_rate (unsigned int cpu) { -struct cpufreq_policy *policy =cpufreq_cpu_get_raw (cpu); -struct scpi_data *priv = policy->driver_data; -unsigned long rate =clk_get_rate (priv->clk); +struct cpufreq_policy *policy; +struct scpi_data *priv; +unsigned long rate; + + policy =cpufreq_cpu_get_raw (cpu); +if (unlikely (!policy)) +return 0 ; + + priv = policy->driver_data; + rate =clk_get_rate (priv->clk);return rate /1000 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 56/280 scsi: ufs: mcq: Add NULL check in ufshcd_mcq_abort()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chenyuan Yang <[email protected]>
[ Upstream commit 4c324085062919d4e21c69e5e78456dcec0052fe ]
A race can occur between the MCQ completion path and the abort handler:
once a request completes, __blk_mq_free_request() sets rq->mq_hctx to NULL, meaning the subsequent ufshcd_mcq_req_to_hwq() call in ufshcd_mcq_abort() can return a NULL pointer. If this NULL pointer is dereferenced, the kernel will crash.
Add a NULL check for the returned hwq pointer. If hwq is NULL, log an error and return FAILED, preventing a potential NULL-pointer dereference. As suggested by Bart, the ufshcd_cmd_inflight() check is removed.
This is similar to the fix in commit 74736103fb41 ("scsi: ufs: core: Fix ufshcd_abort_one racing issue").
This is found by our static analysis tool KNighter.
--- drivers/ufs/core/ufs-mcq.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-)
drivers/ufs/core/ufs-mcq.c +5 -7
@@ -673,13 +673,6 @@ int ufshcd_mcq_abort(struct scsi_cmnd *cmd)unsigned long flags;int err; -if (!ufshcd_cmd_inflight (lrbp->cmd)) { -dev_err (hba->dev, -"%s: skip abort. cmd at tag %d already completed.\n" , - __func__, tag); -return FAILED ; - } -/* Skip task abort in case previous aborts failed and report failure */ if (lrbp->req_abort_skip) { dev_err(hba->dev, "%s: skip abort. tag %d failed earlier\n",
@@ -688,6 +681,11 @@ int ufshcd_mcq_abort(struct scsi_cmnd *cmd) } hwq =ufshcd_mcq_req_to_hwq (hba,scsi_cmd_to_rq (cmd)); +if (!hwq) { +dev_err (hba->dev,"%s: skip abort. cmd at tag %d already completed.\n" , + __func__, tag); +return FAILED ; + }if (ufshcd_mcq_sqe_search (hba, hwq, tag)) {/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 39/280 ksmbd: fix use-after-free in __smb2_lease_break_noti()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <[email protected]>
[ Upstream commit 21a4e47578d44c6b37c4fc4aba8ed7cc8dbb13de ]
Move tcp_transport free to ksmbd_conn_free. If ksmbd connection is referenced when ksmbd server thread terminates, It will not be freed, but conn->tcp_transport is freed. __smb2_lease_break_noti can be performed asynchronously when the connection is disconnected. __smb2_lease_break_noti calls ksmbd_conn_write, which can cause use-after-free
when conn->ksmbd_transport is already freed.
--- fs/smb/server/connection.c | 4 +++- fs/smb/server/transport_tcp.c | 14 +++++++++----- fs/smb/server/transport_tcp.h | 1 + 3 files changed, 13 insertions(+), 6 deletions(-)
fs/smb/server/connection.c +3 -1
@@ -39,8 +39,10 @@ void ksmbd_conn_free(struct ksmbd_conn *conn)xa_destroy (&conn->sessions);kvfree (conn->request_buf);kfree (conn->preauth_info); -if (atomic_dec_and_test (&conn->refcnt)) +if (atomic_dec_and_test (&conn->refcnt)) { +ksmbd_free_transport (conn->transport);kfree (conn); + } }/**
fs/smb/server/transport_tcp.c +9 -5
@@ -93,17 +93,21 @@ static struct tcp_transport *alloc_transport(struct socket *client_sk)return t; } -static void free_transport (struct tcp_transport *t) +void ksmbd_free_transport (struct ksmbd_transport *kt) { -kernel_sock_shutdown (t->sock,SHUT_RDWR ); -sock_release (t->sock); - t->sock =NULL ; +struct tcp_transport *t =TCP_TRANS (kt); -ksmbd_conn_free (KSMBD_TRANS (t)->conn); +sock_release (t->sock);kfree (t->iov);kfree (t); } +static void free_transport (struct tcp_transport *t) +{ +kernel_sock_shutdown (t->sock,SHUT_RDWR ); +ksmbd_conn_free (KSMBD_TRANS (t)->conn); +} +/** * kvec_array_init() - initialize a IO vector segment * @new: IO vector to be initialized
fs/smb/server/transport_tcp.h +1 -0
@@ -8,6 +8,7 @@int ksmbd_tcp_set_interfaces (char *ifc_list,int ifc_list_sz);struct interface *ksmbd_find_netdev_name_iface_list (char *netdev_name); +void ksmbd_free_transport (struct ksmbd_transport *kt);int ksmbd_tcp_init (void );void ksmbd_tcp_destroy (void );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 57/280 cpufreq: cppc: Fix invalid return value in .get() callback
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marc Zyngier <[email protected]>
[ Upstream commit 2b8e6b58889c672e1ae3601d9b2b070be4dc2fbc ]
Returning a negative error code in a function with an unsigned return type is a pretty bad idea. It is probably worse when the justification for the change is "our static analisys tool found it".
--- drivers/cpufreq/cppc_cpufreq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/cpufreq/cppc_cpufreq.c +1 -1
@@ -767,7 +767,7 @@ static unsigned int cppc_cpufreq_get_rate(unsigned int cpu)int ret;if (!policy) -return -ENODEV ; +return 0 ; cpu_data = policy->driver_data;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 58/280 cpufreq: Do not enable by default during compile testing
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krzysztof Kozlowski <[email protected]>
[ Upstream commit d4f610a9bafdec8e3210789aa19335367da696ea ]
Enabling the compile test should not cause automatic enabling of all drivers.
Stable-dep-of: a374f28700ab ("cpufreq: fix compile-test defaults")
--- drivers/cpufreq/Kconfig.arm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/cpufreq/Kconfig.arm +8 -8
@@ -67,7 +67,7 @@ config ARM_VEXPRESS_SPC_CPUFREQ config ARM_BRCMSTB_AVS_CPUFREQ tristate "Broadcom STB AVS CPUfreq driver" depends on (ARCH_BRCMSTB && !ARM_SCMI_CPUFREQ) || COMPILE_TEST - default y + default ARCH_BRCMSTB help Some Broadcom STB SoCs use a co-processor running proprietary firmware ("AVS") to handle voltage and frequency scaling. This driver provides
@@ -172,7 +172,7 @@ config ARM_RASPBERRYPI_CPUFREQ config ARM_S3C64XX_CPUFREQ bool "Samsung S3C64XX" depends on CPU_S3C6410 || COMPILE_TEST - default y + default CPU_S3C6410 help This adds the CPUFreq driver for Samsung S3C6410 SoC.
@@ -181,7 +181,7 @@ config ARM_S3C64XX_CPUFREQ config ARM_S5PV210_CPUFREQ bool "Samsung S5PV210 and S5PC110" depends on CPU_S5PV210 || COMPILE_TEST - default y + default CPU_S5PV210 help This adds the CPUFreq driver for Samsung S5PV210 and S5PC110 SoCs.
@@ -205,7 +205,7 @@ config ARM_SCMI_CPUFREQ config ARM_SPEAR_CPUFREQ bool "SPEAr CPUFreq support" depends on PLAT_SPEAR || COMPILE_TEST - default y + default PLAT_SPEAR help This adds the CPUFreq driver support for SPEAr SOCs.
@@ -224,7 +224,7 @@ config ARM_TEGRA20_CPUFREQ tristate "Tegra20/30 CPUFreq support" depends on ARCH_TEGRA || COMPILE_TEST depends on CPUFREQ_DT - default y + default ARCH_TEGRA help This adds the CPUFreq driver support for Tegra20/30 SOCs.
@@ -232,7 +232,7 @@ config ARM_TEGRA124_CPUFREQ bool "Tegra124 CPUFreq support" depends on ARCH_TEGRA || COMPILE_TEST depends on CPUFREQ_DT - default y + default ARCH_TEGRA help This adds the CPUFreq driver support for Tegra124 SOCs.
@@ -247,14 +247,14 @@ config ARM_TEGRA194_CPUFREQ tristate "Tegra194 CPUFreq support" depends on ARCH_TEGRA_194_SOC || ARCH_TEGRA_234_SOC || (64BIT && COMPILE_TEST) depends on TEGRA_BPMP - default y + default ARCH_TEGRA help This adds CPU frequency driver support for Tegra194 SOCs. config ARM_TI_CPUFREQ bool "Texas Instruments CPUFreq support" depends on ARCH_OMAP2PLUS || ARCH_K3 || COMPILE_TEST - default y + default ARCH_OMAP2PLUS || ARCH_K3 help This driver enables valid OPPs on the running platform based on values contained within the SoC in use. Enable this in order to
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 59/280 cpufreq: fix compile-test defaults
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
[ Upstream commit a374f28700abd20e8a7d026f89aa26f759445918 ]
Commit 3f66425a4fc8 ("cpufreq: Enable COMPILE_TEST on Arm drivers") enabled compile testing of most Arm CPUFreq drivers but left the existing default values unchanged so that many drivers are enabled by default whenever COMPILE_TEST is selected.
This specifically results in the S3C64XX CPUFreq driver being enabled and initialised during boot of non-S3C64XX platforms with the following error logged:
cpufreq: Unable to obtain ARMCLK: -2
Commit d4f610a9bafd ("cpufreq: Do not enable by default during compile testing") recently fixed most of the default values, but two entries were missed and two could use a more specific default condition.
Fix the default values for drivers that can be compile tested and that should be enabled by default when not compile testing.
--- drivers/cpufreq/Kconfig.arm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/cpufreq/Kconfig.arm +4 -4
@@ -67,7 +67,7 @@ config ARM_VEXPRESS_SPC_CPUFREQ config ARM_BRCMSTB_AVS_CPUFREQ tristate "Broadcom STB AVS CPUfreq driver" depends on (ARCH_BRCMSTB && !ARM_SCMI_CPUFREQ) || COMPILE_TEST - default ARCH_BRCMSTB + default y if ARCH_BRCMSTB && !ARM_SCMI_CPUFREQ help Some Broadcom STB SoCs use a co-processor running proprietary firmware ("AVS") to handle voltage and frequency scaling. This driver provides
@@ -79,7 +79,7 @@ config ARM_HIGHBANK_CPUFREQ tristate "Calxeda Highbank-based" depends on ARCH_HIGHBANK || COMPILE_TEST depends on CPUFREQ_DT && REGULATOR && PL320_MBOX - default m + default m if ARCH_HIGHBANK help This adds the CPUFreq driver for Calxeda Highbank SoC based boards.
@@ -124,7 +124,7 @@ config ARM_MEDIATEK_CPUFREQ config ARM_MEDIATEK_CPUFREQ_HW tristate "MediaTek CPUFreq HW driver" depends on ARCH_MEDIATEK || COMPILE_TEST - default m + default m if ARCH_MEDIATEK help Support for the CPUFreq HW driver. Some MediaTek chipsets have a HW engine to offload the steps
@@ -247,7 +247,7 @@ config ARM_TEGRA194_CPUFREQ tristate "Tegra194 CPUFreq support" depends on ARCH_TEGRA_194_SOC || ARCH_TEGRA_234_SOC || (64BIT && COMPILE_TEST) depends on TEGRA_BPMP - default ARCH_TEGRA + default ARCH_TEGRA_194_SOC || ARCH_TEGRA_234_SOC help This adds CPU frequency driver support for Tegra194 SOCs.
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 60/280 btrfs: avoid page_lockend underflow in btrfs_punch_hole_lock_range()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qu Wenruo <[email protected]>
[ Upstream commit bc2dbc4983afedd198490cca043798f57c93e9bf ]
[BUG]
When running btrfs/004 with 4K fs block size and 64K page size, sometimes fsstress workload can take 100% CPU for a while, but not long enough to trigger a 120s hang warning.
[CAUSE]
When such 100% CPU usage happens, btrfs_punch_hole_lock_range() is always in the call trace.
One example when this problem happens, the function btrfs_punch_hole_lock_range() got the following parameters:
lock_start = 4096, lockend = 20469
Then we calculate @page_lockstart by rounding up lock_start to page boundary, which is 64K (page size is 64K).
For @page_lockend, we round down the value towards page boundary, which result 0. Then since we need to pass an inclusive end to filemap_range_has_page(), we subtract 1 from the rounded down value, resulting in (u64)-1.
In the above case, the range is inside the same page, and we do not even need to call filemap_range_has_page(), not to mention to call it with (u64)-1 at the end.
This behavior will cause btrfs_punch_hole_lock_range() to busy loop waiting for irrelevant range to have its pages dropped.
[FIX]
Calculate @page_lockend by just rounding down @lockend, without decreasing the value by one. So @page_lockend will no longer overflow.
Then exit early if @page_lockend is no larger than @page_lockstart. As it means either the range is inside the same page, or the two pages are adjacent already.
Finally only decrease @page_lockend when calling filemap_range_has_page().
--- fs/btrfs/file.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
fs/btrfs/file.c +7 -2
@@ -2235,15 +2235,20 @@ static void btrfs_punch_hole_lock_range(struct inode *inode,* will always return true. * So here we need to do extra page alignment for * filemap_range_has_page(). +* +* And do not decrease page_lockend right now, as it can be 0. */ const u64 page_lockstart =round_up (lockstart,PAGE_SIZE ); -const u64 page_lockend =round_down (lockend +1 ,PAGE_SIZE ) -1 ; +const u64 page_lockend =round_down (lockend +1 ,PAGE_SIZE );while (1 ) {truncate_pagecache_range (inode, lockstart, lockend);lock_extent (&BTRFS_I (inode)->io_tree, lockstart, lockend, cached_state); +/* The same page or adjacent pages. */ +if (page_lockend <= page_lockstart) +break ;/* * We can't have ordered extents in the range, nor dirty/writeback * pages, because we have locked the inode's VFS lock in exclusive
@@ -2255,7 +2260,7 @@ static void btrfs_punch_hole_lock_range(struct inode *inode,* we do, unlock the range and retry. */ if (!filemap_range_has_page (inode->i_mapping, page_lockstart, - page_lockend)) + page_lockend -1 ))break ; unlock_extent(&BTRFS_I(inode)->io_tree, lockstart, lockend,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 61/280 btrfs: zoned: return EIO on RAID1 block group write pointer mismatch
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johannes Thumshirn <[email protected]>
[ Upstream commit b0c26f47992672661340dd6ea931240213016609 ]
There was a bug report about a NULL pointer dereference in __btrfs_add_free_space_zoned() that ultimately happens because a conversion from the default metadata profile DUP to a RAID1 profile on two disks.
The stack trace has the following signature:
BTRFS error (device sdc): zoned: write pointer offset mismatch of zones in raid1 profile
BUG: kernel NULL pointer dereference, address: 0000000000000058 #PF: supervisor read access in kernel mode #PF: error_code(0x0000) - not-present page PGD 0 P4D 0 Oops: Oops: 0000 [#1] PREEMPT SMP NOPTI RIP: 0010:__btrfs_add_free_space_zoned.isra.0+0x61/0x1a0 RSP: 0018:ffffa236b6f3f6d0 EFLAGS: 00010246 RAX: 0000000000000000 RBX: ffff96c8132f3400 RCX: 0000000000000001 RDX: 0000000010000000 RSI: 0000000000000000 RDI: ffff96c8132f3410 RBP: 0000000010000000 R08: 0000000000000003 R09: 0000000000000000 R10: 0000000000000000 R11: 00000000ffffffff R12: 0000000000000000 R13: ffff96c758f65a40 R14: 0000000000000001 R15: 000011aac0000000 FS: 00007fdab1cb2900(0000) GS:ffff96e60ca00000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000058 CR3: 00000001a05ae000 CR4: 0000000000350ef0 Call Trace: <TASK> ? __die_body.cold+0x19/0x27 ? page_fault_oops+0x15c/0x2f0 ? exc_page_fault+0x7e/0x180 ? asm_exc_page_fault+0x26/0x30 ? __btrfs_add_free_space_zoned.isra.0+0x61/0x1a0 btrfs_add_free_space_async_trimmed+0x34/0x40 btrfs_add_new_free_space+0x107/0x120 btrfs_make_block_group+0x104/0x2b0 btrfs_create_chunk+0x977/0xf20 btrfs_chunk_alloc+0x174/0x510 ? srso_return_thunk+0x5/0x5f btrfs_inc_block_group_ro+0x1b1/0x230 btrfs_relocate_block_group+0x9e/0x410 btrfs_relocate_chunk+0x3f/0x130 btrfs_balance+0x8ac/0x12b0 ? srso_return_thunk+0x5/0x5f ? srso_return_thunk+0x5/0x5f ? __kmalloc_cache_noprof+0x14c/0x3e0 btrfs_ioctl+0x2686/0x2a80 ? srso_return_thunk+0x5/0x5f ? ioctl_has_perm.constprop.0.isra.0+0xd2/0x120 __x64_sys_ioctl+0x97/0xc0 do_syscall_64+0x82/0x160 ? srso_return_thunk+0x5/0x5f ? __memcg_slab_free_hook+0x11a/0x170 ? srso_return_thunk+0x5/0x5f ? kmem_cache_free+0x3f0/0x450 ? srso_return_thunk+0x5/0x5f ? srso_return_thunk+0x5/0x5f ? syscall_exit_to_user_mode+0x10/0x210 ? srso_return_thunk+0x5/0x5f ? do_syscall_64+0x8e/0x160 ? sysfs_emit+0xaf/0xc0 ? srso_return_thunk+0x5/0x5f ? srso_return_thunk+0x5/0x5f ? seq_read_iter+0x207/0x460 ? srso_return_thunk+0x5/0x5f ? vfs_read+0x29c/0x370 ? srso_return_thunk+0x5/0x5f ? srso_return_thunk+0x5/0x5f ? syscall_exit_to_user_mode+0x10/0x210 ? srso_return_thunk+0x5/0x5f ? do_syscall_64+0x8e/0x160 ? srso_return_thunk+0x5/0x5f ? exc_page_fault+0x7e/0x180 entry_SYSCALL_64_after_hwframe+0x76/0x7e RIP: 0033:0x7fdab1e0ca6d RSP: 002b:00007ffeb2b60c80 EFLAGS: 00000246 ORIG_RAX: 0000000000000010 RAX: ffffffffffffffda RBX: 0000000000000003 RCX: 00007fdab1e0ca6d RDX: 00007ffeb2b60d80 RSI: 00000000c4009420 RDI: 0000000000000003 RBP: 00007ffeb2b60cd0 R08: 0000000000000000 R09: 0000000000000013 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 00007ffeb2b6343b R14: 00007ffeb2b60d80 R15: 0000000000000001 </TASK> CR2: 0000000000000058 ---[ end trace 0000000000000000 ]---
The 1st line is the most interesting here:
BTRFS error (device sdc): zoned: write pointer offset mismatch of zones in raid1 profile
When a RAID1 block-group is created and a write pointer mismatch between the disks in the RAID set is detected, btrfs sets the alloc_offset to the length of the block group marking it as full. Afterwards the code expects that a balance operation will evacuate the data in this block-group and repair the problems.
But before this is possible, the new space of this block-group will be accounted in the free space cache. But in __btrfs_add_free_space_zoned() it is being checked if it is a initial creation of a block group and if not a reclaim decision will be made. But the decision if a block-group's free space accounting is done for an initial creation depends on if the size of the added free space is the whole length of the block-group and the allocation offset is 0.
But as btrfs_load_block_group_zone_info() sets the allocation offset to the zone capacity (i.e. marking the block-group as full) this initial decision is not met, and the space_info pointer in the 'struct btrfs_block_group' has not yet been assigned.
Fail creation of the block group and rely on manual user intervention to re-balance the filesystem.
Afterwards the filesystem can be unmounted, mounted in degraded mode and the missing device can be removed after a full balance of the filesystem.
--- fs/btrfs/zoned.c | 1 - 1 file changed, 1 deletion(-)
fs/btrfs/zoned.c +0 -1
@@ -1655,7 +1655,6 @@ int btrfs_load_block_group_zone_info(struct btrfs_block_group *cache, bool new)* stripe. */ cache->alloc_offset = cache->zone_capacity; - ret =0 ; } out:
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 62/280 cgroup/cpuset-v1: Add missing support for cpuset_v2_mode
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: T.J. Mercier <[email protected]>
[ Upstream commit 1bf67c8fdbda21fadd564a12dbe2b13c1ea5eda7 ]
Android has mounted the v1 cpuset controller using filesystem type "cpuset" (not "cgroup") since 2015 [1], and depends on the resulting behavior where the controller name is not added as a prefix for cgroupfs files. [2]
Later, a problem was discovered where cpu hotplug onlining did not affect the cpuset/cpus files, which Android carried an out-of-tree patch to address for a while. An attempt was made to upstream this patch, but the recommendation was to use the "cpuset_v2_mode" mount option instead. [3]
An effort was made to do so, but this fails with "cgroup: Unknown parameter 'cpuset_v2_mode'" because commit e1cba4b85daa ("cgroup: Add mount flag to enable cpuset to use v2 behavior in v1 cgroup") did not update the special cased cpuset_mount(), and only the cgroup (v1) filesystem type was updated.
Add parameter parsing to the cpuset filesystem type so that cpuset_v2_mode works like the cgroup filesystem type:
$ mkdir /dev/cpuset $ mount -t cpuset -ocpuset_v2_mode none /dev/cpuset $ mount|grep cpuset none on /dev/cpuset type cgroup (rw,relatime,cpuset,noprefix,cpuset_v2_mode,release_agent=/sbin/cpuset_release_agent)
[1] https://cs.android.com/android/_/android/platform/system/core/+/b769c8d24fd7be96f8968aa4c80b669525b930d3
[2] https://cs.android.com/android/platform/superproject/main/+/main:system/core/libprocessgroup/setup/cgroup_map_write.cpp;drc=2dac5d89a0f024a2d0cc46a80ba4ee13472f1681;l=192
[3] https://lore.kernel.org/lkml/[email protected]/T/
--- kernel/cgroup/cgroup.c | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+)
kernel/cgroup/cgroup.c +29 -0
@@ -2339,9 +2339,37 @@ static struct file_system_type cgroup2_fs_type = { };#ifdef CONFIG_CPUSETS_V1 +enum cpuset_param { + Opt_cpuset_v2_mode, +}; + +static const struct fs_parameter_spec cpuset_fs_parameters[] = { +fsparam_flag ("cpuset_v2_mode" , Opt_cpuset_v2_mode), + {} +}; + +static int cpuset_parse_param (struct fs_context *fc,struct fs_parameter *param) +{ +struct cgroup_fs_context *ctx =cgroup_fc2context (fc); +struct fs_parse_result result; +int opt; + + opt =fs_parse (fc, cpuset_fs_parameters, param, &result); +if (opt <0 ) +return opt; + +switch (opt) { +case Opt_cpuset_v2_mode: + ctx->flags |=CGRP_ROOT_CPUSET_V2_MODE ; +return 0 ; + } +return -EINVAL ; +} +static const struct fs_context_operations cpuset_fs_context_ops = { .get_tree = cgroup1_get_tree, .free = cgroup_fs_context_free, + .parse_param = cpuset_parse_param, };/*
@@ -2378,6 +2406,7 @@ static int cpuset_init_fs_context(struct fs_context *fc)static struct file_system_type cpuset_fs_type = { .name ="cpuset" , .init_fs_context = cpuset_init_fs_context, + .parameters = cpuset_fs_parameters, .fs_flags =FS_USERNS_MOUNT , };#endif
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 63/280 vhost-scsi: Add better resource allocation failure handling
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mike Christie <[email protected]>
[ Upstream commit 3ca51662f8186b569b8fb282242c20ccbb3993c2 ]
If we can't allocate mem to map in data for a request or can't find a tag for a command, we currently drop the command. This leads to the error handler running to clean it up. Instead of dropping the command this has us return an error telling the initiator that it queued more commands than we can handle. The initiator will then reduce how many commands it will send us and retry later.
Message-Id: <[email protected]>
Stable-dep-of: b18268713547 ("vhost-scsi: Fix vhost_scsi_send_bad_target()")
--- drivers/vhost/scsi.c | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-)
drivers/vhost/scsi.c +25 -3
@@ -630,7 +630,7 @@ vhost_scsi_get_cmd(struct vhost_virtqueue *vq, struct vhost_scsi_tpg *tpg, tag =sbitmap_get (&svq->scsi_tags);if (tag <0 ) { -pr_err ("Unable to obtain tag for vhost_scsi_cmd\n" ); +pr_warn_once ("Guest sent too many cmds. Returning TASK_SET_FULL.\n" );return ERR_PTR (-ENOMEM ); }
@@ -929,6 +929,24 @@ static void vhost_scsi_target_queue_cmd(struct vhost_scsi_cmd *cmd)target_submit (se_cmd); } +static void +vhost_scsi_send_status (struct vhost_scsi *vs,struct vhost_virtqueue *vq, +int head,unsigned int out,u8 status) +{ +struct virtio_scsi_cmd_resp __user *resp; +struct virtio_scsi_cmd_resp rsp; +int ret; + +memset (&rsp,0 ,sizeof (rsp)); + rsp.status = status; + resp = vq->iov[out].iov_base; + ret =__copy_to_user (resp, &rsp,sizeof (rsp)); +if (!ret) +vhost_add_used_and_signal (&vs->dev, vq, head,0 ); +else +pr_err ("Faulted on virtio_scsi_cmd_resp\n" ); +} + static void vhost_scsi_send_bad_target(struct vhost_scsi *vs, struct vhost_virtqueue *vq,
@@ -1216,8 +1234,8 @@ vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq) exp_data_len + prot_bytes, data_direction);if (IS_ERR (cmd)) { -vq_err (vq,"vhost_scsi_get_cmd failed %ld\n" , -PTR_ERR (cmd)); + ret =PTR_ERR (cmd); +vq_err (vq,"vhost_scsi_get_tag failed %dd\n" , ret); goto err; } cmd->tvc_vhost = vs;
@@ -1254,11 +1272,15 @@ vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq)* EINVAL: Invalid response buffer, drop the request * EIO: Respond with bad target * EAGAIN: Pending request +* ENOMEM: Could not allocate resources for request */ if (ret == -ENXIO )break ;else if (ret == -EIO )vhost_scsi_send_bad_target (vs, vq, vc.head, vc.out); +else if (ret == -ENOMEM ) +vhost_scsi_send_status (vs, vq, vc.head, vc.out, +SAM_STAT_TASK_SET_FULL ); }while (likely (!vhost_exceeds_weight (vq, ++c,0 ))); out:mutex_unlock (&vq->mutex);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 64/280 vhost-scsi: Fix vhost_scsi_send_bad_target()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dongli Zhang <[email protected]>
[ Upstream commit b182687135474d7ed905a07cc6cb2734b359e13e ]
Although the support of VIRTIO_F_ANY_LAYOUT + VIRTIO_F_VERSION_1 was signaled by the commit 664ed90e621c ("vhost/scsi: Set VIRTIO_F_ANY_LAYOUT + VIRTIO_F_VERSION_1 feature bits"), vhost_scsi_send_bad_target() still assumes the response in a single descriptor.
In addition, although vhost_scsi_send_bad_target() is used by both I/O queue and control queue, the response header is always virtio_scsi_cmd_resp. It is required to use virtio_scsi_ctrl_tmf_resp or virtio_scsi_ctrl_an_resp for control queue.
Message-Id: <[email protected]>
--- drivers/vhost/scsi.c | 48 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 37 insertions(+), 11 deletions(-)
drivers/vhost/scsi.c +37 -11
@@ -947,23 +947,46 @@ vhost_scsi_send_status(struct vhost_scsi *vs, struct vhost_virtqueue *vq,pr_err ("Faulted on virtio_scsi_cmd_resp\n" ); } +#define TYPE_IO_CMD 0 +#define TYPE_CTRL_TMF 1 +#define TYPE_CTRL_AN 2 +static void vhost_scsi_send_bad_target (struct vhost_scsi *vs,struct vhost_virtqueue *vq, -int head,unsigned out) +struct vhost_scsi_ctx *vc,int type) { -struct virtio_scsi_cmd_resp __user *resp; -struct virtio_scsi_cmd_resp rsp; +union { +struct virtio_scsi_cmd_resp cmd; +struct virtio_scsi_ctrl_tmf_resp tmf; +struct virtio_scsi_ctrl_an_resp an; + } rsp; +struct iov_iter iov_iter; +size_t rsp_size;int ret;memset (&rsp,0 ,sizeof (rsp)); - rsp.response =VIRTIO_SCSI_S_BAD_TARGET ; - resp = vq->iov[out].iov_base; - ret =__copy_to_user (resp, &rsp,sizeof (rsp)); -if (!ret) -vhost_add_used_and_signal (&vs->dev, vq, head,0 ); + +if (type ==TYPE_IO_CMD ) { + rsp_size =sizeof (struct virtio_scsi_cmd_resp ); + rsp.cmd.response =VIRTIO_SCSI_S_BAD_TARGET ; + }else if (type ==TYPE_CTRL_TMF ) { + rsp_size =sizeof (struct virtio_scsi_ctrl_tmf_resp ); + rsp.tmf.response =VIRTIO_SCSI_S_BAD_TARGET ; + }else { + rsp_size =sizeof (struct virtio_scsi_ctrl_an_resp ); + rsp.an.response =VIRTIO_SCSI_S_BAD_TARGET ; + } + +iov_iter_init (&iov_iter,ITER_DEST , &vq->iov[vc->out], vc->in, + rsp_size); + + ret =copy_to_iter (&rsp, rsp_size, &iov_iter); + +if (likely (ret == rsp_size)) +vhost_add_used_and_signal (&vs->dev, vq, vc->head,0 );else -pr_err ("Faulted on virtio_scsi_cmd_resp\n" ); +pr_err ("Faulted on virtio scsi type=%d\n" , type); } static int
@@ -1277,7 +1300,7 @@ vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq)if (ret == -ENXIO )break ;else if (ret == -EIO ) -vhost_scsi_send_bad_target (vs, vq, vc.head, vc.out); +vhost_scsi_send_bad_target (vs, vq, &vc,TYPE_IO_CMD );else if (ret == -ENOMEM )vhost_scsi_send_status (vs, vq, vc.head, vc.out,SAM_STAT_TASK_SET_FULL );
@@ -1510,7 +1533,10 @@ vhost_scsi_ctl_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq)if (ret == -ENXIO )break ;else if (ret == -EIO ) -vhost_scsi_send_bad_target (vs, vq, vc.head, vc.out); +vhost_scsi_send_bad_target (vs, vq, &vc, + v_req.type ==VIRTIO_SCSI_T_TMF ? +TYPE_CTRL_TMF : +TYPE_CTRL_AN ); }while (likely (!vhost_exceeds_weight (vq, ++c,0 ))); out:mutex_unlock (&vq->mutex);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 65/280 vhost-scsi: Fix vhost_scsi_send_status()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dongli Zhang <[email protected]>
[ Upstream commit 58465d86071b61415e25fb054201f61e83d21465 ]
Although the support of VIRTIO_F_ANY_LAYOUT + VIRTIO_F_VERSION_1 was signaled by the commit 664ed90e621c ("vhost/scsi: Set VIRTIO_F_ANY_LAYOUT + VIRTIO_F_VERSION_1 feature bits"), vhost_scsi_send_bad_target() still assumes the response in a single descriptor.
Similar issue in vhost_scsi_send_bad_target() has been fixed in previous commit. In addition, similar issue for vhost_scsi_complete_cmd_work() has been fixed by the commit 6dd88fd59da8 ("vhost-scsi: unbreak any layout for response").
Message-Id: <[email protected]>
--- drivers/vhost/scsi.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-)
drivers/vhost/scsi.c +11 -7
@@ -931,18 +931,22 @@ static void vhost_scsi_target_queue_cmd(struct vhost_scsi_cmd *cmd)static void vhost_scsi_send_status (struct vhost_scsi *vs,struct vhost_virtqueue *vq, -int head,unsigned int out,u8 status) +struct vhost_scsi_ctx *vc,u8 status) { -struct virtio_scsi_cmd_resp __user *resp;struct virtio_scsi_cmd_resp rsp; +struct iov_iter iov_iter;int ret;memset (&rsp,0 ,sizeof (rsp)); rsp.status = status; - resp = vq->iov[out].iov_base; - ret =__copy_to_user (resp, &rsp,sizeof (rsp)); -if (!ret) -vhost_add_used_and_signal (&vs->dev, vq, head,0 ); + +iov_iter_init (&iov_iter,ITER_DEST , &vq->iov[vc->out], vc->in, +sizeof (rsp)); + + ret =copy_to_iter (&rsp,sizeof (rsp), &iov_iter); + +if (likely (ret ==sizeof (rsp))) +vhost_add_used_and_signal (&vs->dev, vq, vc->head,0 );else pr_err ("Faulted on virtio_scsi_cmd_resp\n" ); }
@@ -1302,7 +1306,7 @@ vhost_scsi_handle_vq(struct vhost_scsi *vs, struct vhost_virtqueue *vq)else if (ret == -EIO )vhost_scsi_send_bad_target (vs, vq, &vc,TYPE_IO_CMD );else if (ret == -ENOMEM ) -vhost_scsi_send_status (vs, vq, vc.head, vc.out, +vhost_scsi_send_status (vs, vq, &vc,SAM_STAT_TASK_SET_FULL ); }while (likely (!vhost_exceeds_weight (vq, ++c,0 ))); out:
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 66/280 net/mlx5: Fix null-ptr-deref in mlx5_create_{inner_,}ttc_table()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Henry Martin <[email protected]>
[ Upstream commit 91037037ee3d611ce17f39d75f79c7de394b122a ]
Add NULL check for mlx5_get_flow_namespace() returns in mlx5_create_inner_ttc_table() and mlx5_create_ttc_table() to prevent NULL pointer dereference.
--- drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c +10 -0
@@ -636,6 +636,11 @@ struct mlx5_ttc_table *mlx5_create_inner_ttc_table(struct mlx5_core_dev *dev, } ns =mlx5_get_flow_namespace (dev, params->ns_type); +if (!ns) { +kvfree (ttc); +return ERR_PTR (-EOPNOTSUPP ); + } + groups = use_l4_type ? &inner_ttc_groups[TTC_GROUPS_USE_L4_TYPE ] : &inner_ttc_groups[TTC_GROUPS_DEFAULT ];
@@ -709,6 +714,11 @@ struct mlx5_ttc_table *mlx5_create_ttc_table(struct mlx5_core_dev *dev, } ns =mlx5_get_flow_namespace (dev, params->ns_type); +if (!ns) { +kvfree (ttc); +return ERR_PTR (-EOPNOTSUPP ); + } + groups = use_l4_type ? &ttc_groups[TTC_GROUPS_USE_L4_TYPE ] : &ttc_groups[TTC_GROUPS_DEFAULT ];
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 40/280 scsi: ufs: exynos: Remove empty drv_init method
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tudor Ambarus <[email protected]>
[ Upstream commit 07c2a737504457c41678c5c30abe9107cd28dce6 ]
Remove empty method. When the method is not set, the call is not made, saving a few cycles.
Stable-dep-of: 68f5ef7eebf0 ("scsi: ufs: exynos: Move UFS shareability value to drvdata")
--- drivers/ufs/host/ufs-exynos.c | 6 ------ 1 file changed, 6 deletions(-)
drivers/ufs/host/ufs-exynos.c +0 -6
@@ -198,11 +198,6 @@ static inline void exynos_ufs_ungate_clks(struct exynos_ufs *ufs)exynos_ufs_ctrl_clkstop (ufs, false); } -static int exynos7_ufs_drv_init (struct device *dev,struct exynos_ufs *ufs) -{ -return 0 ; -} -static int exynosauto_ufs_drv_init (struct device *dev,struct exynos_ufs *ufs) {struct exynos_ufs_uic_attr *attr = ufs->drv_data->uic_attr;
@@ -2044,7 +2039,6 @@ static const struct exynos_ufs_drv_data exynos_ufs_drvs = {EXYNOS_UFS_OPT_BROKEN_RX_SEL_IDX |EXYNOS_UFS_OPT_SKIP_CONNECTION_ESTAB | EXYNOS_UFS_OPT_USE_SW_HIBERN8_TIMER, - .drv_init = exynos7_ufs_drv_init, .pre_link = exynos7_ufs_pre_link, .post_link = exynos7_ufs_post_link, .pre_pwr_change = exynos7_ufs_pre_pwr_change,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 67/280 net/mlx5: Move ttc allocation after switch case to prevent leaks
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Henry Martin <[email protected]>
[ Upstream commit fa8fd315127ca48c65e7e6692a84ffcf3d07168e ]
Relocate the memory allocation for ttc table after the switch statement that validates params->ns_type in both mlx5_create_inner_ttc_table() and mlx5_create_ttc_table(). This ensures memory is only allocated after confirming valid input, eliminating potential memory leaks when invalid ns_type cases occur.
--- .../net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c +8 -8
@@ -618,10 +618,6 @@ struct mlx5_ttc_table *mlx5_create_inner_ttc_table(struct mlx5_core_dev *dev,bool use_l4_type;int err; - ttc =kvzalloc (sizeof (*ttc),GFP_KERNEL ); -if (!ttc) -return ERR_PTR (-ENOMEM ); -switch (params->ns_type) {case MLX5_FLOW_NAMESPACE_PORT_SEL : use_l4_type = MLX5_CAP_GEN_2(dev, pcc_ifa2) &&
@@ -635,6 +631,10 @@ struct mlx5_ttc_table *mlx5_create_inner_ttc_table(struct mlx5_core_dev *dev,return ERR_PTR (-EINVAL ); } + ttc =kvzalloc (sizeof (*ttc),GFP_KERNEL ); +if (!ttc) +return ERR_PTR (-ENOMEM ); + ns =mlx5_get_flow_namespace (dev, params->ns_type);if (!ns) {kvfree (ttc);
@@ -696,10 +696,6 @@ struct mlx5_ttc_table *mlx5_create_ttc_table(struct mlx5_core_dev *dev,bool use_l4_type;int err; - ttc =kvzalloc (sizeof (*ttc),GFP_KERNEL ); -if (!ttc) -return ERR_PTR (-ENOMEM ); -switch (params->ns_type) {case MLX5_FLOW_NAMESPACE_PORT_SEL : use_l4_type = MLX5_CAP_GEN_2(dev, pcc_ifa2) &&
@@ -713,6 +709,10 @@ struct mlx5_ttc_table *mlx5_create_ttc_table(struct mlx5_core_dev *dev,return ERR_PTR (-EINVAL ); } + ttc =kvzalloc (sizeof (*ttc),GFP_KERNEL ); +if (!ttc) +return ERR_PTR (-ENOMEM ); + ns =mlx5_get_flow_namespace (dev, params->ns_type);if (!ns) {kvfree (ttc);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 68/280 scsi: core: Clear flags for scsi_cmnd that did not complete
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anastasia Kovaleva <[email protected]>
[ Upstream commit 54bebe46871d4e56e05fcf55c1a37e7efa24e0a8 ]
Commands that have not been completed with scsi_done() do not clear the SCMD_INITIALIZED flag and therefore will not be properly reinitialized. Thus, the next time the scsi_cmnd structure is used, the command may fail in scsi_cmd_runtime_exceeded() due to the old jiffies_at_alloc value:
kernel: sd 16:0:1:84: [sdts] tag#405 timing out command, waited 720s
kernel: sd 16:0:1:84: [sdts] tag#405 FAILED Result: hostbyte=DID_OK driverbyte=DRIVER_OK cmd_age=66636s
Clear flags for commands that have not been completed by SCSI.
--- drivers/scsi/scsi_lib.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/scsi/scsi_lib.c +5 -1
@@ -1237,8 +1237,12 @@ EXPORT_SYMBOL_GPL(scsi_alloc_request);*/ static void scsi_cleanup_rq (struct request *rq) { +struct scsi_cmnd *cmd =blk_mq_rq_to_pdu (rq); + + cmd->flags =0 ; +if (rq->rq_flags &RQF_DONTPREP ) { -scsi_mq_uninit_cmd (blk_mq_rq_to_pdu (rq)); +scsi_mq_uninit_cmd (cmd); rq->rq_flags &= ~RQF_DONTPREP ; } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 41/280 scsi: ufs: exynos: Remove superfluous function parameter
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tudor Ambarus <[email protected]>
[ Upstream commit afd613ca2c60d0a970d434bc73e1ddcdb925c799 ]
The pointer to device can be obtained from ufs->hba->dev, remove superfluous function parameter.
Stable-dep-of: 68f5ef7eebf0 ("scsi: ufs: exynos: Move UFS shareability value to drvdata")
--- drivers/ufs/host/ufs-exynos.c | 4 ++-- drivers/ufs/host/ufs-exynos.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/ufs/host/ufs-exynos.c +2 -2
@@ -198,7 +198,7 @@ static inline void exynos_ufs_ungate_clks(struct exynos_ufs *ufs)exynos_ufs_ctrl_clkstop (ufs, false); } -static int exynosauto_ufs_drv_init (struct device *dev,struct exynos_ufs *ufs) +static int exynosauto_ufs_drv_init (struct exynos_ufs *ufs) {struct exynos_ufs_uic_attr *attr = ufs->drv_data->uic_attr;
@@ -1433,7 +1433,7 @@ static int exynos_ufs_init(struct ufs_hba *hba)exynos_ufs_fmp_init (hba, ufs);if (ufs->drv_data->drv_init) { - ret = ufs->drv_data->drv_init (dev, ufs); + ret = ufs->drv_data->drv_init (ufs);if (ret) {dev_err (dev,"failed to init drv-data\n" ); goto out;
drivers/ufs/host/ufs-exynos.h +1 -1
@@ -182,7 +182,7 @@ struct exynos_ufs_drv_data {unsigned int quirks;unsigned int opts;/* SoC's specific operations */ -int (*drv_init)(struct device *dev,struct exynos_ufs *ufs); +int (*drv_init)(struct exynos_ufs *ufs);int (*pre_link)(struct exynos_ufs *ufs);int (*post_link)(struct exynos_ufs *ufs); int (*pre_pwr_change)(struct exynos_ufs *ufs,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 42/280 scsi: ufs: exynos: Add gs101_ufs_drv_init() hook and enable WriteBooster
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Griffin <[email protected]>
[ Upstream commit 9cc4a4a5767756b1ebe45a76c4673432545ea70e ]
Factor out the common code into a new exynos_ufs_shareability() function and provide a dedicated gs101_drv_init() hook.
This allows us to enable WriteBooster capability (UFSHCD_CAP_WB_EN) in a way that doesn't effect other SoCs supported in this driver.
WriteBooster improves write speeds by enabling a pseudo SLC cache. Using the 'fio seqwrite' test we can achieve speeds of 945MB/s with this feature enabled (until the cache is exhausted) before dropping back to ~260MB/s (which are the speeds we see without the WriteBooster feature enabled).
Assuming the UFSHCD_CAP_WB_EN capability is set by the host then WriteBooster can also be enabled and disabled via sysfs so it is possible for the system to only enable it when extra write performance is required.
Stable-dep-of: 68f5ef7eebf0 ("scsi: ufs: exynos: Move UFS shareability value to drvdata")
--- drivers/ufs/host/ufs-exynos.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
drivers/ufs/host/ufs-exynos.c +17 -2
@@ -198,7 +198,7 @@ static inline void exynos_ufs_ungate_clks(struct exynos_ufs *ufs)exynos_ufs_ctrl_clkstop (ufs, false); } -static int exynosauto_ufs_drv_init (struct exynos_ufs *ufs) +static int exynos_ufs_shareability (struct exynos_ufs *ufs) {struct exynos_ufs_uic_attr *attr = ufs->drv_data->uic_attr;
@@ -214,6 +214,21 @@ static int exynosauto_ufs_drv_init(struct exynos_ufs *ufs)return 0 ; } +static int gs101_ufs_drv_init (struct exynos_ufs *ufs) +{ +struct ufs_hba *hba = ufs->hba; + +/* Enable WriteBooster */ + hba->caps |=UFSHCD_CAP_WB_EN ; + +return exynos_ufs_shareability (ufs); +} + +static int exynosauto_ufs_drv_init (struct exynos_ufs *ufs) +{ +return exynos_ufs_shareability (ufs); +} +static int exynosauto_ufs_post_hce_enable (struct exynos_ufs *ufs) {struct ufs_hba *hba = ufs->hba;
@@ -2128,7 +2143,7 @@ static const struct exynos_ufs_drv_data gs101_ufs_drvs = {EXYNOS_UFS_OPT_SKIP_CONFIG_PHY_ATTR |EXYNOS_UFS_OPT_UFSPR_SECURE | EXYNOS_UFS_OPT_TIMER_TICK_SELECT, - .drv_init = exynosauto_ufs_drv_init, + .drv_init = gs101_ufs_drv_init, .pre_link = gs101_ufs_pre_link, .post_link = gs101_ufs_post_link, .pre_pwr_change = gs101_ufs_pre_pwr_change,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 43/280 scsi: ufs: exynos: Move UFS shareability value to drvdata
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Griffin <[email protected]>
[ Upstream commit 68f5ef7eebf0f41df4d38ea55a54c2462af1e3d6 ]
gs101 I/O coherency shareability bits differ from exynosauto SoC. To support both SoCs move this info the SoC drvdata.
Currently both the value and mask are the same for both gs101 and exynosauto, thus we use the same value.
--- drivers/ufs/host/ufs-exynos.c | 20 ++++++++++++++------ drivers/ufs/host/ufs-exynos.h | 2 ++ 2 files changed, 16 insertions(+), 6 deletions(-)
drivers/ufs/host/ufs-exynos.c +14 -6
@@ -86,11 +86,16 @@ UIC_TRANSPORT_NO_CONNECTION_RX |\ UIC_TRANSPORT_BAD_TC) -/* FSYS UFS Shareability */ -#define UFS_WR_SHARABLE BIT(2) -#define UFS_RD_SHARABLE BIT(1) -#define UFS_SHARABLE (UFS_WR_SHARABLE | UFS_RD_SHARABLE) -#define UFS_SHAREABILITY_OFFSET 0x710 +/* UFS Shareability */ +#define UFS_EXYNOSAUTO_WR_SHARABLE BIT(2) +#define UFS_EXYNOSAUTO_RD_SHARABLE BIT(1) +#define UFS_EXYNOSAUTO_SHARABLE (UFS_EXYNOSAUTO_WR_SHARABLE | \ + UFS_EXYNOSAUTO_RD_SHARABLE) +#define UFS_GS101_WR_SHARABLE BIT(1) +#define UFS_GS101_RD_SHARABLE BIT(0) +#define UFS_GS101_SHARABLE (UFS_GS101_WR_SHARABLE | \ + UFS_GS101_RD_SHARABLE) +#define UFS_SHAREABILITY_OFFSET 0x710/* Multi-host registers */ #define MHCTRL 0xC4
@@ -206,7 +211,7 @@ static int exynos_ufs_shareability(struct exynos_ufs *ufs)if (ufs->sysreg) {return regmap_update_bits (ufs->sysreg, ufs->shareability_reg_offset, -UFS_SHARABLE ,UFS_SHARABLE ); + ufs->iocc_mask, ufs->iocc_mask); } attr->tx_dif_p_nsec =3200000 ;
@@ -1148,6 +1153,7 @@ static int exynos_ufs_parse_dt(struct device *dev, struct exynos_ufs *ufs) } } + ufs->iocc_mask = ufs->drv_data->iocc_mask; ufs->pclk_avail_min =PCLK_AVAIL_MIN ; ufs->pclk_avail_max =PCLK_AVAIL_MAX ;
@@ -2021,6 +2027,7 @@ static const struct exynos_ufs_drv_data exynosauto_ufs_drvs = { .opts = EXYNOS_UFS_OPT_BROKEN_AUTO_CLK_CTRL |EXYNOS_UFS_OPT_SKIP_CONFIG_PHY_ATTR | EXYNOS_UFS_OPT_BROKEN_RX_SEL_IDX, + .iocc_mask = UFS_EXYNOSAUTO_SHARABLE, .drv_init = exynosauto_ufs_drv_init, .post_hce_enable = exynosauto_ufs_post_hce_enable, .pre_link = exynosauto_ufs_pre_link,
@@ -2143,6 +2150,7 @@ static const struct exynos_ufs_drv_data gs101_ufs_drvs = {EXYNOS_UFS_OPT_SKIP_CONFIG_PHY_ATTR |EXYNOS_UFS_OPT_UFSPR_SECURE | EXYNOS_UFS_OPT_TIMER_TICK_SELECT, + .iocc_mask = UFS_GS101_SHARABLE, .drv_init = gs101_ufs_drv_init, .pre_link = gs101_ufs_pre_link, .post_link = gs101_ufs_post_link,
drivers/ufs/host/ufs-exynos.h +2 -0
@@ -181,6 +181,7 @@ struct exynos_ufs_drv_data {struct exynos_ufs_uic_attr *uic_attr;unsigned int quirks;unsigned int opts; +u32 iocc_mask;/* SoC's specific operations */ int (*drv_init)(struct exynos_ufs *ufs);int (*pre_link)(struct exynos_ufs *ufs);
@@ -231,6 +232,7 @@ struct exynos_ufs {const struct exynos_ufs_drv_data *drv_data;struct regmap *sysreg;u32 shareability_reg_offset; +u32 iocc_mask;u32 opts;#define EXYNOS_UFS_OPT_HAS_APB_CLK_CTRL BIT(0)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 44/280 scsi: ufs: exynos: Disable iocc if dma-coherent property isnt set
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Griffin <[email protected]>
[ Upstream commit f92bb7436802f8eb7ee72dc911a33c8897fde366 ]
If dma-coherent property isn't set then descriptors are non-cacheable and the iocc shareability bits should be disabled. Without this UFS can end up in an incompatible configuration and suffer from random cache related stability issues.
--- drivers/ufs/host/ufs-exynos.c | 17 +++++++++++++---- drivers/ufs/host/ufs-exynos.h | 3 ++- 2 files changed, 15 insertions(+), 5 deletions(-)
drivers/ufs/host/ufs-exynos.c +13 -4
@@ -210,8 +210,8 @@ static int exynos_ufs_shareability(struct exynos_ufs *ufs)/* IO Coherency setting */ if (ufs->sysreg) {return regmap_update_bits (ufs->sysreg, - ufs->shareability_reg_offset, - ufs->iocc_mask, ufs->iocc_mask); + ufs->iocc_offset, + ufs->iocc_mask, ufs->iocc_val); } attr->tx_dif_p_nsec =3200000 ;
@@ -1147,13 +1147,22 @@ static int exynos_ufs_parse_dt(struct device *dev, struct exynos_ufs *ufs) ufs->sysreg =NULL ; else {if (of_property_read_u32_index (np,"samsung,sysreg" ,1 , - &ufs->shareability_reg_offset)) { + &ufs->iocc_offset)) {dev_warn (dev,"can't get an offset from sysreg. Set to default value\n" ); - ufs->shareability_reg_offset =UFS_SHAREABILITY_OFFSET ; + ufs->iocc_offset =UFS_SHAREABILITY_OFFSET ; } } ufs->iocc_mask = ufs->drv_data->iocc_mask; +/* +* no 'dma-coherent' property means the descriptors are +* non-cacheable so iocc shareability should be disabled. +*/ +if (of_dma_is_coherent (dev->of_node)) + ufs->iocc_val = ufs->iocc_mask; +else + ufs->iocc_val =0 ; + ufs->pclk_avail_min =PCLK_AVAIL_MIN ; ufs->pclk_avail_max =PCLK_AVAIL_MAX ;
drivers/ufs/host/ufs-exynos.h +2 -1
@@ -231,8 +231,9 @@ struct exynos_ufs {ktime_t entry_hibern8_t;const struct exynos_ufs_drv_data *drv_data;struct regmap *sysreg; -u32 shareability_reg_offset; +u32 iocc_offset;u32 iocc_mask; +u32 iocc_val;u32 opts;#define EXYNOS_UFS_OPT_HAS_APB_CLK_CTRL BIT(0)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 45/280 net/niu: Niu requires MSIX ENTRY_DATA fields touch before entry reads
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonathan Currier <[email protected]>
[ Upstream commit fbb429ddff5c8e479edcc7dde5a542c9295944e6 ]
Fix niu_try_msix() to not cause a fatal trap on sparc systems.
Set PCI_DEV_FLAGS_MSIX_TOUCH_ENTRY_DATA_FIRST on the struct pci_dev to work around a bug in the hardware or firmware.
For each vector entry in the msix table, niu chips will cause a fatal trap if any registers in that entry are read before that entries' ENTRY_DATA register is written to. Testing indicates writes to other registers are not sufficient to prevent the fatal trap, however the value does not appear to matter. This only needs to happen once after power up, so simply rebooting into a kernel lacking this fix will NOT cause the trap.
NON-RESUMABLE ERROR: Reporting on cpu 64
NON-RESUMABLE ERROR: TPC [0x00000000005f6900] <msix_prepare_msi_desc+0x90/0xa0> NON-RESUMABLE ERROR: RAW [4010000000000016:00000e37f93e32ff:0000000202000080:ffffffffffffffff
NON-RESUMABLE ERROR: 0000000800000000:0000000000000000:0000000000000000:0000000000000000]
NON-RESUMABLE ERROR: handle [0x4010000000000016] stick [0x00000e37f93e32ff] NON-RESUMABLE ERROR: type [precise nonresumable]
NON-RESUMABLE ERROR: attrs [0x02000080] < ASI sp-faulted priv >
NON-RESUMABLE ERROR: raddr [0xffffffffffffffff]
NON-RESUMABLE ERROR: insn effective address [0x000000c50020000c]
NON-RESUMABLE ERROR: size [0x8]
NON-RESUMABLE ERROR: asi [0x00]
CPU: 64 UID: 0 PID: 745 Comm: kworker/64:1 Not tainted 6.11.5 #63 Workqueue: events work_for_cpu_fn TSTATE: 0000000011001602 TPC: 00000000005f6900 TNPC: 00000000005f6904 Y: 00000000 Not tainted TPC: <msix_prepare_msi_desc+0x90/0xa0> g0: 00000000000002e9 g1: 000000000000000c g2: 000000c50020000c g3: 0000000000000100 g4: ffff8000470307c0 g5: ffff800fec5be000 g6: ffff800047a08000 g7: 0000000000000000 o0: ffff800014feb000 o1: ffff800047a0b620 o2: 0000000000000011 o3: ffff800047a0b620 o4: 0000000000000080 o5: 0000000000000011 sp: ffff800047a0ad51 ret_pc: 00000000005f7128 RPC: <__pci_enable_msix_range+0x3cc/0x460> l0: 000000000000000d l1: 000000000000c01f l2: ffff800014feb0a8 l3: 0000000000000020 l4: 000000000000c000 l5: 0000000000000001 l6: 0000000020000000 l7: ffff800047a0b734 i0: ffff800014feb000 i1: ffff800047a0b730 i2: 0000000000000001 i3: 000000000000000d i4: 0000000000000000 i5: 0000000000000000 i6: ffff800047a0ae81 i7: 00000000101888b0 I7: <niu_try_msix.constprop.0+0xc0/0x130 [niu]> Call Trace: [<00000000101888b0>] niu_try_msix.constprop.0+0xc0/0x130 [niu] [<000000001018f840>] niu_get_invariants+0x183c/0x207c [niu] [<00000000101902fc>] niu_pci_init_one+0x27c/0x2fc [niu] [<00000000005ef3e4>] local_pci_probe+0x28/0x74 [<0000000000469240>] work_for_cpu_fn+0x8/0x1c [<000000000046b008>] process_scheduled_works+0x144/0x210 [<000000000046b518>] worker_thread+0x13c/0x1c0 [<00000000004710e0>] kthread+0xb8/0xc8 [<00000000004060c8>] ret_from_fork+0x1c/0x2c [<0000000000000000>] 0x0 Kernel panic - not syncing: Non-resumable error.
--- drivers/net/ethernet/sun/niu.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/ethernet/sun/niu.c +2 -0
@@ -9058,6 +9058,8 @@ static void niu_try_msix(struct niu *np, u8 *ldg_num_map) msi_vec[i].entry = i; } + pdev->dev_flags |=PCI_DEV_FLAGS_MSIX_TOUCH_ENTRY_DATA_FIRST ; + num_irqs =pci_enable_msix_range (pdev, msi_vec,1 , num_irqs);if (num_irqs <0 ) { np->flags &= ~NIU_FLAGS_MSIX ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 46/280 drm/xe/bmg: Add one additional PCI ID
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Matt Roper <[email protected]>
[ Upstream commit 5529df92b8e8cbb4b14a226665888f74648260ad ]
One additional BMG PCI ID has been added to the spec; make sure our driver recognizes devices with this ID properly.
Bspec: 68090
--- include/drm/intel/i915_pciids.h | 1 + 1 file changed, 1 insertion(+)
include/drm/intel/i915_pciids.h +1 -0
@@ -810,6 +810,7 @@ MACRO__(0xE20C, ## __VA_ARGS__), \ MACRO__(0xE20D, ## __VA_ARGS__), \ MACRO__(0xE210, ## __VA_ARGS__), \ + MACRO__(0xE211, ## __VA_ARGS__), \ MACRO__(0xE212, ## __VA_ARGS__), \ MACRO__(0xE215, ## __VA_ARGS__), \ MACRO__(0xE216, ## __VA_ARGS__)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 37/280 ksmbd: add netdev-up/down event debug print
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <[email protected]>
[ Upstream commit 5f3f274e2ce68999b49901de4794c4b04125b154 ]
Add netdev-up/down event debug print to find what netdev is connected or disconnected.
Stable-dep-of: 21a4e47578d4 ("ksmbd: fix use-after-free in __smb2_lease_break_noti()")
--- fs/smb/server/transport_tcp.c | 6 ++++++ 1 file changed, 6 insertions(+)
fs/smb/server/transport_tcp.c +6 -0
@@ -521,6 +521,8 @@ static int ksmbd_netdev_event(struct notifier_block *nb, unsigned long event, found =1 ;if (iface->state !=IFACE_STATE_DOWN )break ; +ksmbd_debug (CONN ,"netdev-up event: netdev(%s) is going up\n" , + iface->name); ret =create_socket (iface);if (ret)return NOTIFY_OK ;
@@ -531,6 +533,8 @@ static int ksmbd_netdev_event(struct notifier_block *nb, unsigned long event, iface =alloc_iface (kstrdup (netdev->name,KSMBD_DEFAULT_GFP ));if (!iface)return NOTIFY_OK ; +ksmbd_debug (CONN ,"netdev-up event: netdev(%s) is going up\n" , + iface->name); ret =create_socket (iface);if (ret)break ;
@@ -540,6 +544,8 @@ static int ksmbd_netdev_event(struct notifier_block *nb, unsigned long event,list_for_each_entry (iface, &iface_list, entry) {if (!strcmp (iface->name, netdev->name) && iface->state ==IFACE_STATE_CONFIGURED ) { +ksmbd_debug (CONN ,"netdev-down event: netdev(%s) is going down\n" , + iface->name);tcp_stop_kthread (iface->ksmbd_kthread); iface->ksmbd_kthread =NULL ;mutex_lock (&iface->sock_release_lock);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 70/280 net: lwtunnel: disable BHs when required
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Justin Iurman <[email protected]>
[ Upstream commit c03a49f3093a4903c8a93c8b5c9a297b5343b169 ]
In lwtunnel_{output|xmit}(), dev_xmit_recursion() may be called in preemptible scope for PREEMPT kernels. This patch disables BHs before calling dev_xmit_recursion(). BHs are re-enabled only at the end, since we must ensure the same CPU is used for both dev_xmit_recursion_inc() and dev_xmit_recursion_dec() (and any other recursion levels in some cases) in order to maintain valid per-cpu counters.
--- net/core/lwtunnel.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-)
net/core/lwtunnel.c +20 -6
@@ -332,6 +332,8 @@ int lwtunnel_output(struct net *net, struct sock *sk, struct sk_buff *skb)struct dst_entry *dst;int ret; +local_bh_disable (); +if (dev_xmit_recursion ()) {net_crit_ratelimited ("%s(): recursion limit reached on datapath\n" , __func__);
@@ -347,8 +349,10 @@ int lwtunnel_output(struct net *net, struct sock *sk, struct sk_buff *skb) lwtstate = dst->lwtstate;if (lwtstate->type ==LWTUNNEL_ENCAP_NONE || - lwtstate->type >LWTUNNEL_ENCAP_MAX ) -return 0 ; + lwtstate->type >LWTUNNEL_ENCAP_MAX ) { + ret =0 ; + goto out; + } ret = -EOPNOTSUPP ;rcu_read_lock ();
@@ -363,11 +367,13 @@ int lwtunnel_output(struct net *net, struct sock *sk, struct sk_buff *skb)if (ret == -EOPNOTSUPP ) goto drop; -return ret; + goto out; drop:kfree_skb (skb); +out: +local_bh_enable ();return ret; }EXPORT_SYMBOL_GPL (lwtunnel_output);
@@ -379,6 +385,8 @@ int lwtunnel_xmit(struct sk_buff *skb)struct dst_entry *dst;int ret; +local_bh_disable (); +if (dev_xmit_recursion ()) {net_crit_ratelimited ("%s(): recursion limit reached on datapath\n" , __func__);
@@ -395,8 +403,10 @@ int lwtunnel_xmit(struct sk_buff *skb) lwtstate = dst->lwtstate;if (lwtstate->type ==LWTUNNEL_ENCAP_NONE || - lwtstate->type >LWTUNNEL_ENCAP_MAX ) -return 0 ; + lwtstate->type >LWTUNNEL_ENCAP_MAX ) { + ret =0 ; + goto out; + } ret = -EOPNOTSUPP ;rcu_read_lock ();
@@ -411,11 +421,13 @@ int lwtunnel_xmit(struct sk_buff *skb)if (ret == -EOPNOTSUPP ) goto drop; -return ret; + goto out; drop:kfree_skb (skb); +out: +local_bh_enable ();return ret; }EXPORT_SYMBOL_GPL (lwtunnel_xmit);
@@ -427,6 +439,8 @@ int lwtunnel_input(struct sk_buff *skb)struct dst_entry *dst;int ret; +DEBUG_NET_WARN_ON_ONCE (!in_softirq ()); +if (dev_xmit_recursion ()) {net_crit_ratelimited ("%s(): recursion limit reached on datapath\n" , __func__);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 79/280 pds_core: handle unsupported PDS_CORE_CMD_FW_CONTROL result
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brett Creeley <[email protected]>
[ Upstream commit 2567daad69cd1107fc0ec29b1615f110d7cf7385 ]
If the FW doesn't support the PDS_CORE_CMD_FW_CONTROL command the driver might at the least print garbage and at the worst crash when the user runs the "devlink dev info" devlink command.
This happens because the stack variable fw_list is not 0 initialized which results in fw_list.num_fw_slots being a garbage value from the stack. Then the driver tries to access fw_list.fw_names[i] with i >= ARRAY_SIZE and runs off the end of the array.
Fix this by initializing the fw_list and by not failing completely if the devcmd fails because other useful information is printed via devlink dev info even if the devcmd fails.
--- drivers/net/ethernet/amd/pds_core/devlink.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/ethernet/amd/pds_core/devlink.c +1 -3
@@ -102,7 +102,7 @@ int pdsc_dl_info_get(struct devlink *dl, struct devlink_info_req *req, .fw_control.opcode = PDS_CORE_CMD_FW_CONTROL, .fw_control.oper = PDS_CORE_FW_GET_LIST, }; -struct pds_core_fw_list_info fw_list; +struct pds_core_fw_list_info fw_list = {};struct pdsc *pdsc =devlink_priv (dl);union pds_core_dev_comp comp;char buf[32 ];
@@ -115,8 +115,6 @@ int pdsc_dl_info_get(struct devlink *dl, struct devlink_info_req *req,if (!err)memcpy_fromio (&fw_list, pdsc->cmd_regs->data,sizeof (fw_list));mutex_unlock (&pdsc->devcmd_lock); -if (err && err != -EIO ) -return err; listlen =min (fw_list.num_fw_slots,ARRAY_SIZE (fw_list.fw_names));for (i =0 ; i < listlen; i++) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 80/280 pds_core: Remove unnecessary check in pds_client_adminq_cmd()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brett Creeley <[email protected]>
[ Upstream commit f9559d818205a4a0b9cd87181ef46e101ea11157 ]
When the pds_core driver was first created there were some race conditions around using the adminq, especially for client drivers. To reduce the possibility of a race condition there's a check against pf->state in pds_client_adminq_cmd(). This is problematic for a couple of reasons:
1. The PDSC_S_INITING_DRIVER bit is set during probe, but not cleared until after everything in probe is complete, which includes creating the auxiliary devices. For pds_fwctl this means it can't make any adminq commands until after pds_core's probe is complete even though the adminq is fully up by the time pds_fwctl's auxiliary device is created.
2. The race conditions around using the adminq have been fixed and this path is already protected against client drivers calling pds_client_adminq_cmd() if the adminq isn't ready, i.e. see pdsc_adminq_post() -> pdsc_adminq_inc_if_up().
Fix this by removing the pf->state check in pds_client_adminq_cmd() because invalid accesses to pds_core's adminq is already handled by pdsc_adminq_post()->pdsc_adminq_inc_if_up().
--- drivers/net/ethernet/amd/pds_core/auxbus.c | 3 --- 1 file changed, 3 deletions(-)
drivers/net/ethernet/amd/pds_core/auxbus.c +0 -3
@@ -107,9 +107,6 @@ int pds_client_adminq_cmd(struct pds_auxiliary_dev *padev,dev_dbg (pf->dev,"%s: %s opcode %d\n" , __func__,dev_name (&padev->aux_dev.dev), req->opcode); -if (pf->state) -return -ENXIO ; -/* Wrap the client's request */ cmd.client_request.opcode =PDS_AQ_CMD_CLIENT_CMD ; cmd.client_request.client_id =cpu_to_le16 (padev->client_id);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 81/280 pds_core: make wait_context part of q_info
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shannon Nelson <[email protected]>
[ Upstream commit 3f77c3dfffc7063428b100c4945ca2a7a8680380 ]
Make the wait_context a full part of the q_info struct rather than a stack variable that goes away after pdsc_adminq_post() is done so that the context is still available after the wait loop has given up.
There was a case where a slow development firmware caused the adminq request to time out, but then later the FW finally finished the request and sent the interrupt. The handler tried to complete_all() the completion context that had been created on the stack in pdsc_adminq_post() but no longer existed. This caused bad pointer usage, kernel crashes, and much wailing and gnashing of teeth.
--- drivers/net/ethernet/amd/pds_core/adminq.c | 36 +++++++++------------- drivers/net/ethernet/amd/pds_core/core.c | 4 ++- drivers/net/ethernet/amd/pds_core/core.h | 2 +- 3 files changed, 18 insertions(+), 24 deletions(-)
drivers/net/ethernet/amd/pds_core/adminq.c +14 -22
@@ -5,11 +5,6 @@#include "core.h" -struct pdsc_wait_context { -struct pdsc_qcq *qcq; -struct completion wait_completion; -}; -static int pdsc_process_notifyq (struct pdsc_qcq *qcq) {union pds_core_notifyq_comp *comp;
@@ -109,10 +104,10 @@ void pdsc_process_adminq(struct pdsc_qcq *qcq) q_info = &q->info[q->tail_idx]; q->tail_idx = (q->tail_idx +1 ) & (q->num_descs -1 ); -/* Copy out the completion data */ -memcpy (q_info->dest, comp,sizeof (*comp)); - -complete_all (&q_info->wc->wait_completion); +if (!completion_done (&q_info->completion)) { +memcpy (q_info->dest, comp,sizeof (*comp)); +complete (&q_info->completion); + }if (cq->tail_idx == cq->num_descs -1 ) cq->done_color = !cq->done_color;
@@ -162,8 +157,7 @@ irqreturn_t pdsc_adminq_isr(int irq, void *data)static int __pdsc_adminq_post (struct pdsc *pdsc,struct pdsc_qcq *qcq,union pds_core_adminq_cmd *cmd, -union pds_core_adminq_comp *comp, -struct pdsc_wait_context *wc) +union pds_core_adminq_comp *comp) {struct pdsc_queue *q = &qcq->q;struct pdsc_q_info *q_info;
@@ -205,9 +199,9 @@ static int __pdsc_adminq_post(struct pdsc *pdsc,/* Post the request */ index = q->head_idx; q_info = &q->info[index]; - q_info->wc = wc; q_info->dest = comp;memcpy (q_info->desc, cmd,sizeof (*cmd)); +reinit_completion (&q_info->completion);dev_dbg (pdsc->dev,"head_idx %d tail_idx %d\n" , q->head_idx, q->tail_idx);
@@ -231,16 +225,13 @@ int pdsc_adminq_post(struct pdsc *pdsc, union pds_core_adminq_comp *comp, bool fast_poll) { -struct pdsc_wait_context wc = { - .wait_completion = -COMPLETION_INITIALIZER_ONSTACK (wc.wait_completion), - };unsigned long poll_interval =1 ;unsigned long poll_jiffies;unsigned long time_limit;unsigned long time_start;unsigned long time_done;unsigned long remaining; +struct completion *wc;int err =0 ;int index;
@@ -250,20 +241,19 @@ int pdsc_adminq_post(struct pdsc *pdsc,return -ENXIO ; } - wc.qcq = &pdsc->adminqcq; - index =__pdsc_adminq_post (pdsc, &pdsc->adminqcq, cmd, comp, &wc); + index =__pdsc_adminq_post (pdsc, &pdsc->adminqcq, cmd, comp);if (index <0 ) { err = index; goto err_out; } + wc = &pdsc->adminqcq.q.info[index].completion; time_start = jiffies; time_limit = time_start +HZ * pdsc->devcmd_timeout; do { /* Timeslice the actual wait to catch IO errors etc early */ poll_jiffies = msecs_to_jiffies(poll_interval); - remaining = wait_for_completion_timeout(&wc.wait_completion, - poll_jiffies); + remaining = wait_for_completion_timeout(wc, poll_jiffies); if (remaining) break;
@@ -292,9 +282,11 @@ int pdsc_adminq_post(struct pdsc *pdsc,dev_dbg (pdsc->dev,"%s: elapsed %d msecs\n" , __func__,jiffies_to_msecs (time_done - time_start)); -/* Check the results */ -if (time_after_eq (time_done, time_limit)) +/* Check the results and clear an un-completed timeout */ +if (time_after_eq (time_done, time_limit) && !completion_done (wc)) { err = -ETIMEDOUT ; +complete (wc); + }dev_dbg (pdsc->dev,"read admin queue completion idx %d:\n" , index); dynamic_hex_dump("comp ", DUMP_PREFIX_OFFSET, 16, 1,
drivers/net/ethernet/amd/pds_core/core.c +3 -1
@@ -167,8 +167,10 @@ static void pdsc_q_map(struct pdsc_queue *q, void *base, dma_addr_t base_pa) q->base = base; q->base_pa = base_pa; -for (i =0 , cur = q->info; i < q->num_descs; i++, cur++) +for (i =0 , cur = q->info; i < q->num_descs; i++, cur++) { cur->desc = base + (i * q->desc_size); +init_completion (&cur->completion); + } }static void pdsc_cq_map (struct pdsc_cq *cq,void *base,dma_addr_t base_pa)
drivers/net/ethernet/amd/pds_core/core.h +1 -1
@@ -96,7 +96,7 @@ struct pdsc_q_info {unsigned int bytes;unsigned int nbufs;struct pdsc_buf_info bufs[PDS_CORE_MAX_FRAGS ]; -struct pdsc_wait_context *wc; +struct completion completion;void *dest; };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 82/280 block: never reduce ra_pages in blk_apply_bdi_limits
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christoph Hellwig <[email protected]>
[ Upstream commit 7b720c720253e2070459420b2628a7b9ee6733b3 ]
When the user increased the read-ahead size through sysfs this value currently get lost if the device is reprobe, including on a resume from suspend.
As there is no hardware limitation for the read-ahead size there is no real need to reset it or track a separate hardware limitation like for max_sectors.
This restores the pre-atomic queue limit behavior in the sd driver as sd did not use blk_queue_io_opt and thus never updated the read ahead size to the value based of the optimal I/O, but changes behavior for all other drivers. As the new behavior seems useful and sd is the driver for which the readahead size tweaks are most useful that seems like a worthwhile trade off.
--- block/blk-settings.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)
block/blk-settings.c +7 -1
@@ -61,8 +61,14 @@ void blk_apply_bdi_limits(struct backing_dev_info *bdi,/* * For read-ahead of large files to be effective, we need to read ahead * at least twice the optimal I/O size. +* +* There is no hardware limitation for the read-ahead size and the user +* might have increased the read-ahead size through sysfs, so don't ever +* decrease it. */ - bdi->ra_pages =max (lim->io_opt *2 /PAGE_SIZE ,VM_READAHEAD_PAGES ); + bdi->ra_pages =max3 (bdi->ra_pages, + lim->io_opt *2 /PAGE_SIZE , +VM_READAHEAD_PAGES ); bdi->io_pages = lim->max_sectors >>PAGE_SECTORS_SHIFT ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 83/280 iommu/amd: Return an error if vCPU affinity is set for non-vCPU IRTE
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
[ Upstream commit 07172206a26dcf3f0bf7c3ecaadd4242b008ea54 ]
Return -EINVAL instead of success if amd_ir_set_vcpu_affinity() is invoked without use_vapic; lying to KVM about whether or not the IRTE was configured to post IRQs is all kinds of bad.
Message-ID: <[email protected]>
--- drivers/iommu/amd/iommu.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/iommu/amd/iommu.c +1 -1
@@ -3660,7 +3660,7 @@ static int amd_ir_set_vcpu_affinity(struct irq_data *data, void *vcpu_info)* we should not modify the IRTE */ if (!dev_data || !dev_data->use_vapic) -return 0 ; +return -EINVAL ; ir_data->cfg =irqd_cfg (data); pi_data->ir_data = ir_data;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 84/280 riscv: Replace function-like macro by static inline function
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Björn Töpel <[email protected]>
[ Upstream commit 121f34341d396b666d8a90b24768b40e08ca0d61 ]
The flush_icache_range() function is implemented as a "function-like macro with unused parameters", which can result in "unused variables" warnings.
Replace the macro with a static inline function, as advised by Documentation/process/coding-style.rst.
--- arch/riscv/include/asm/cacheflush.h | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
arch/riscv/include/asm/cacheflush.h +10 -5
@@ -34,11 +34,6 @@ static inline void flush_dcache_page(struct page *page)flush_dcache_folio (page_folio (page)); } -/* -* RISC-V doesn't have an instruction to flush parts of the instruction cache, -* so instead we just flush the whole thing. -*/ -#define flush_icache_range (start, end) flush_icache_all()#define flush_icache_user_page (vma, pg, addr, len) \ do { \ if (vma->vm_flags & VM_EXEC) \
@@ -78,6 +73,16 @@ void flush_icache_mm(struct mm_struct *mm, bool local);#endif /* CONFIG_SMP */ +/* +* RISC-V doesn't have an instruction to flush parts of the instruction cache, +* so instead we just flush the whole thing. +*/ +#define flush_icache_range flush_icache_range +static inline void flush_icache_range (unsigned long start,unsigned long end) +{ +flush_icache_all (); +} +extern unsigned int riscv_cbom_block_size;extern unsigned int riscv_cboz_block_size;void riscv_init_cbo_blocksizes (void );
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 85/280 riscv: uprobes: Add missing fence.i after building the XOL buffer
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Björn Töpel <[email protected]>
[ Upstream commit 7d1d19a11cfbfd8bae1d89cc010b2cc397cd0c48 ]
The XOL (execute out-of-line) buffer is used to single-step the replaced instruction(s) for uprobes. The RISC-V port was missing a proper fence.i (i$ flushing) after constructing the XOL buffer, which can result in incorrect execution of stale/broken instructions.
This was found running the BPF selftests "test_progs:uprobe_autoattach, attach_probe" on the Spacemit K1/X60, where the uprobes tests randomly blew up.
--- arch/riscv/kernel/probes/uprobes.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
arch/riscv/kernel/probes/uprobes.c +2 -8
@@ -167,6 +167,7 @@ void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr,/* Initialize the slot */ void *kaddr =kmap_atomic (page);void *dst = kaddr + (vaddr & ~PAGE_MASK ); +unsigned long start = (unsigned long )dst;memcpy (dst, src, len);
@@ -176,13 +177,6 @@ void arch_uprobe_copy_ixol(struct page *page, unsigned long vaddr, *(uprobe_opcode_t *)dst = __BUG_INSN_32; } +flush_icache_range (start, start + len);kunmap_atomic (kaddr); - -/* -* We probably need flush_icache_user_page() but it needs vma. -* This should work on most of architectures by default. If -* architecture needs to do something different it can define -* its own version of the function. -*/ -flush_dcache_page (page); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 86/280 splice: remove duplicate noinline from pipe_clear_nowait
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: T.J. Mercier <[email protected]>
[ Upstream commit e6f141b332ddd9007756751b6afd24f799488fd8 ]
pipe_clear_nowait has two noinline macros, but we only need one.
I checked the whole tree, and this is the only occurrence:
$ grep -r "noinline .* noinline" fs/splice.c:static noinline void noinline pipe_clear_nowait(struct file *file) $
--- fs/splice.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
fs/splice.c +1 -1
@@ -45,7 +45,7 @@* here if set to avoid blocking other users of this pipe if splice is * being done on it. */ -static noinline void noinline pipe_clear_nowait(struct file *file) +static noinline void pipe_clear_nowait(struct file *file) {fmode_t fmode =READ_ONCE (file->f_mode);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 87/280 bpf: Add namespace to BPF internal symbols
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexei Starovoitov <[email protected]>
[ Upstream commit f88886de0927a2adf4c1b4c5c1f1d31d2023ef74 ]
Add namespace to BPF internal symbols used by light skeleton to prevent abuse and document with the code their allowed usage.
--- Documentation/bpf/bpf_devel_QA.rst | 8 ++++++++ kernel/bpf/preload/bpf_preload_kern.c | 1 + kernel/bpf/syscall.c | 6 +++--- 3 files changed, 12 insertions(+), 3 deletions(-)
Documentation/bpf/bpf_devel_QA.rst +8 -0
@@ -382,6 +382,14 @@ In case of new BPF instructions, once th into the Linux kernel, please implement support into LLVM's BPF back end. See LLVM_ section below for further information. +Q: What "BPF_INTERNAL" symbol namespace is for? +----------------------------------------------- +A: Symbols exported as BPF_INTERNAL can only be used by BPF infrastructure +like preload kernel modules with light skeleton. Most symbols outside +of BPF_INTERNAL are not expected to be used by code outside of BPF either. +Symbols may lack the designation because they predate the namespaces, +or due to an oversight. + Stable submission =================
kernel/bpf/preload/bpf_preload_kern.c +1 -0
@@ -89,4 +89,5 @@ static void __exit fini(void) }late_initcall (load);module_exit (fini); +MODULE_IMPORT_NS ("BPF_INTERNAL" );MODULE_LICENSE ("GPL" );
kernel/bpf/syscall.c +3 -3
@@ -1457,7 +1457,7 @@ struct bpf_map *bpf_map_get(u32 ufd)return map; } -EXPORT_SYMBOL (bpf_map_get); +EXPORT_SYMBOL_NS (bpf_map_get,BPF_INTERNAL );struct bpf_map *bpf_map_get_with_uref (u32 ufd) {
@@ -3223,7 +3223,7 @@ struct bpf_link *bpf_link_get_from_fd(u3bpf_link_inc (link);return link; } -EXPORT_SYMBOL (bpf_link_get_from_fd); +EXPORT_SYMBOL_NS (bpf_link_get_from_fd,BPF_INTERNAL );static void bpf_tracing_link_release (struct bpf_link *link) {
@@ -5853,7 +5853,7 @@ int kern_sys_bpf(int cmd, union bpf_attrreturn ____bpf_sys_bpf (cmd, attr, size); } } -EXPORT_SYMBOL (kern_sys_bpf); +EXPORT_SYMBOL_NS (kern_sys_bpf,BPF_INTERNAL );static const struct bpf_func_proto bpf_sys_bpf_proto = { .func = bpf_sys_bpf,
Greg Kroah-Hartman
maintainerPATCH 88/280 perf/x86: Fix non-sampling (counting) events on certain x86 platforms
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Luo Gengkun <[email protected]>
[ Upstream commit 1a97fea9db9e9b9c4839d4232dde9f505ff5b4cc ]
Perf doesn't work at perf stat for hardware events on certain x86 platforms:
$perf stat -- sleep 1
Performance counter stats for 'sleep 1':
16.44 msec task-clock # 0.016 CPUs utilized
2 context-switches # 121.691 /sec
0 cpu-migrations # 0.000 /sec
54 page-faults # 3.286 K/sec <not supported> cycles
<not supported> instructions
<not supported> branches
<not supported> branch-misses
The reason is that the check in x86_pmu_hw_config() for sampling events is unexpectedly applied to counting events as well.
It should only impact x86 platforms with limit_period used for non-PEBS events. For Intel platforms, it should only impact some older platforms, e.g., HSW, BDW and NHM.
--- arch/x86/events/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/events/core.c +1 -1
@@ -628,7 +628,7 @@ int x86_pmu_hw_config(struct perf_event *event)if (event->attr.type == event->pmu->type) event->hw.config |=x86_pmu_get_event_config (event); -if (!event->attr.freq && x86_pmu.limit_period) { +if (is_sampling_event (event) && !event->attr.freq && x86_pmu.limit_period) {s64 left = event->attr.sample_period; x86_pmu.limit_period (event, &left);if (left > event->attr.sample_period)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 71/280 net: phy: leds: fix memory leak
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Qingfang Deng <[email protected]>
[ Upstream commit b7f0ee992adf601aa00c252418266177eb7ac2bc ]
A network restart test on a router led to an out-of-memory condition, which was traced to a memory leak in the PHY LED trigger code.
The root cause is misuse of the devm API. The registration function (phy_led_triggers_register) is called from phy_attach_direct, not phy_probe, and the unregister function (phy_led_triggers_unregister) is called from phy_detach, not phy_remove. This means the register and unregister functions can be called multiple times for the same PHY device, but devm-allocated memory is not freed until the driver is unbound.
This also prevents kmemleak from detecting the leak, as the devm API internally stores the allocated pointer.
Fix this by replacing devm_kzalloc/devm_kcalloc with standard kzalloc/kcalloc, and add the corresponding kfree calls in the unregister path.
--- drivers/net/phy/phy_led_triggers.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-)
drivers/net/phy/phy_led_triggers.c +13 -10
@@ -91,9 +91,8 @@ int phy_led_triggers_register(struct phy_device *phy)if (!phy->phy_num_led_triggers)return 0 ; - phy->led_link_trigger =devm_kzalloc (&phy->mdio.dev, -sizeof (*phy->led_link_trigger), -GFP_KERNEL ); + phy->led_link_trigger =kzalloc (sizeof (*phy->led_link_trigger), +GFP_KERNEL );if (!phy->led_link_trigger) { err = -ENOMEM ; goto out_clear;
@@ -103,10 +102,9 @@ int phy_led_triggers_register(struct phy_device *phy)if (err) goto out_free_link; - phy->phy_led_triggers =devm_kcalloc (&phy->mdio.dev, - phy->phy_num_led_triggers, -sizeof (struct phy_led_trigger ), -GFP_KERNEL ); + phy->phy_led_triggers =kcalloc (phy->phy_num_led_triggers, +sizeof (struct phy_led_trigger ), +GFP_KERNEL );if (!phy->phy_led_triggers) { err = -ENOMEM ; goto out_unreg_link;
@@ -127,11 +125,11 @@ int phy_led_triggers_register(struct phy_device *phy) out_unreg:while (i--)phy_led_trigger_unregister (&phy->phy_led_triggers[i]); -devm_kfree (&phy->mdio.dev, phy->phy_led_triggers); +kfree (phy->phy_led_triggers); out_unreg_link:phy_led_trigger_unregister (phy->led_link_trigger); out_free_link: -devm_kfree (&phy->mdio.dev, phy->led_link_trigger); +kfree (phy->led_link_trigger); phy->led_link_trigger =NULL ; out_clear: phy->phy_num_led_triggers =0 ;
@@ -145,8 +143,13 @@ void phy_led_triggers_unregister(struct phy_device *phy)for (i =0 ; i < phy->phy_num_led_triggers; i++)phy_led_trigger_unregister (&phy->phy_led_triggers[i]); +kfree (phy->phy_led_triggers); + phy->phy_led_triggers =NULL ; -if (phy->led_link_trigger) +if (phy->led_link_trigger) {phy_led_trigger_unregister (phy->led_link_trigger); +kfree (phy->led_link_trigger); + phy->led_link_trigger =NULL ; + } }EXPORT_SYMBOL_GPL (phy_led_triggers_unregister);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 89/280 LoongArch: Select ARCH_USE_MEMTEST
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Yuli Wang <[email protected]>
[ Upstream commit fb8e9f59d6f292c3d9fea6c155c22ea5fc3053ab ]
As of commit dce44566192e ("mm/memtest: add ARCH_USE_MEMTEST"), architectures must select ARCH_USE_MEMTESET to enable CONFIG_MEMTEST.
Commit 628c3bb40e9a ("LoongArch: Add boot and setup routines") added support for early_memtest but did not select ARCH_USE_MEMTESET.
--- arch/loongarch/Kconfig | 1 + 1 file changed, 1 insertion(+)
arch/loongarch/Kconfig +1 -0
@@ -68,6 +68,7 @@ config LOONGARCH select ARCH_SUPPORTS_NUMA_BALANCING select ARCH_USE_BUILTIN_BSWAP select ARCH_USE_CMPXCHG_LOCKREF + select ARCH_USE_MEMTEST select ARCH_USE_QUEUED_RWLOCKS select ARCH_USE_QUEUED_SPINLOCKS select ARCH_WANT_DEFAULT_BPF_JIT
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 90/280 LoongArch: Make regs_irqs_disabled() more clear
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tiezhu Yang <[email protected]>
[ Upstream commit bb0511d59db9b3e40c8d51f0d151ccd0fd44071d ]
In the current code, the definition of regs_irqs_disabled() is actually "!(regs->csr_prmd & CSR_CRMD_IE)" because arch_irqs_disabled_flags() is defined as "!(flags & CSR_CRMD_IE)", it looks a little strange.
Define regs_irqs_disabled() as !(regs->csr_prmd & CSR_PRMD_PIE) directly to make it more clear, no functional change.
While at it, the return value of regs_irqs_disabled() is true or false, so change its type to reflect that and also make it always inline.
--- arch/loongarch/include/asm/ptrace.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/loongarch/include/asm/ptrace.h +2 -2
@@ -33,9 +33,9 @@ struct pt_regs {unsigned long __last[]; }__aligned(8) ; -static inline int regs_irqs_disabled (struct pt_regs *regs) +static __always_inline bool regs_irqs_disabled(struct pt_regs *regs) { -return arch_irqs_disabled_flags (regs->csr_prmd); +return !(regs->csr_prmd &CSR_PRMD_PIE ); }static inline unsigned long kernel_stack_pointer (struct pt_regs *regs)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 91/280 LoongArch: Make do_xyz() exception handlers more robust
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tiezhu Yang <[email protected]>
[ Upstream commit cc73cc6bcdb5f959670e3ff9abdc62461452ddff ]
Currently, interrupts need to be disabled before single-step mode is set, it requires that CSR_PRMD_PIE be cleared in save_local_irqflag() which is called by setup_singlestep(), this is reasonable.
But in the first kprobe breakpoint exception, if the irq is enabled at the beginning of do_bp(), it will not be disabled at the end of do_bp() due to the CSR_PRMD_PIE has been cleared in save_local_irqflag(). So for this case, it may corrupt exception context when restoring the exception after do_bp() in handle_bp(), this is not reasonable.
In order to restore exception safely in handle_bp(), it needs to ensure the irq is disabled at the end of do_bp(), so just add a local variable to record the original interrupt status in the parent context, then use it as the check condition to enable and disable irq in do_bp().
While at it, do the similar thing for other do_xyz() exception handlers to make them more robust.
--- arch/loongarch/kernel/traps.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-)
arch/loongarch/kernel/traps.c +12 -8
@@ -553,9 +553,10 @@ asmlinkage void noinstr do_ale(struct pt_regs *regs)die_if_kernel ("Kernel ale access" , regs);force_sig_fault (SIGBUS ,BUS_ADRALN , (void __user *)regs->csr_badvaddr);#else +bool pie =regs_irqs_disabled (regs);unsigned int *pc; -if (regs->csr_prmd &CSR_PRMD_PIE ) +if (!pie)local_irq_enable ();perf_sw_event (PERF_COUNT_SW_ALIGNMENT_FAULTS ,1 , regs, regs->csr_badvaddr);
@@ -582,7 +583,7 @@ asmlinkage void noinstr do_ale(struct pt_regs *regs)die_if_kernel ("Kernel ale access" , regs);force_sig_fault (SIGBUS ,BUS_ADRALN , (void __user *)regs->csr_badvaddr); out: -if (regs->csr_prmd &CSR_PRMD_PIE ) +if (!pie)local_irq_disable ();#endif irqentry_exit (regs, state);
@@ -614,12 +615,13 @@ static void bug_handler(struct pt_regs *regs) asmlinkage void noinstr do_bce(struct pt_regs *regs) {bool user =user_mode (regs); +bool pie =regs_irqs_disabled (regs);unsigned long era =exception_era (regs);u64 badv =0 , lower =0 , upper =ULONG_MAX ;union loongarch_instruction insn;irqentry_state_t state =irqentry_enter (regs); -if (regs->csr_prmd &CSR_PRMD_PIE ) +if (!pie)local_irq_enable (); current->thread.trap_nr =read_csr_excode ();
@@ -685,7 +687,7 @@ asmlinkage void noinstr do_bce(struct pt_regs *regs)force_sig_bnderr ((void __user *)badv, (void __user *)lower, (void __user *)upper); out: -if (regs->csr_prmd &CSR_PRMD_PIE ) +if (!pie)local_irq_disable ();irqentry_exit (regs, state);
@@ -703,11 +705,12 @@ asmlinkage void noinstr do_bce(struct pt_regs *regs) asmlinkage void noinstr do_bp(struct pt_regs *regs) {bool user =user_mode (regs); +bool pie =regs_irqs_disabled (regs);unsigned int opcode, bcode;unsigned long era =exception_era (regs);irqentry_state_t state =irqentry_enter (regs); -if (regs->csr_prmd &CSR_PRMD_PIE ) +if (!pie)local_irq_enable ();if (__get_inst (&opcode, (u32 *)era, user))
@@ -773,7 +776,7 @@ asmlinkage void noinstr do_bp(struct pt_regs *regs) } out: -if (regs->csr_prmd &CSR_PRMD_PIE ) +if (!pie)local_irq_disable ();irqentry_exit (regs, state);
@@ -1008,6 +1011,7 @@ static void init_restore_lbt(void) asmlinkage void noinstr do_lbt(struct pt_regs *regs) { +bool pie =regs_irqs_disabled (regs);irqentry_state_t state =irqentry_enter (regs);/*
@@ -1017,7 +1021,7 @@ asmlinkage void noinstr do_lbt(struct pt_regs *regs)* (including the user using 'MOVGR2GCSR' to turn on TM, which * will not trigger the BTE), we need to check PRMD first. */ -if (regs->csr_prmd &CSR_PRMD_PIE ) +if (!pie)local_irq_enable ();if (!cpu_has_lbt) {
@@ -1031,7 +1035,7 @@ asmlinkage void noinstr do_lbt(struct pt_regs *regs)preempt_enable (); out: -if (regs->csr_prmd &CSR_PRMD_PIE ) +if (!pie)local_irq_disable ();irqentry_exit (regs, state);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 92/280 KVM: SVM: Disable AVIC on SNP-enabled system without HvInUseWrAllowed feature
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Suravee Suthikulpanit <[email protected]>
commit d81cadbe164265337f149cf31c9462d7217c1eed upstream.
On SNP-enabled system, VMRUN marks AVIC Backing Page as in-use while the guest is running for both secure and non-secure guest. Any hypervisor write to the in-use vCPU's AVIC backing page (e.g. to inject an interrupt) will generate unexpected #PF in the host.
Currently, attempt to run AVIC guest would result in the following error:
BUG: unable to handle page fault for address: ff3a442e549cc270
#PF: supervisor write access in kernel mode
#PF: error_code(0x80000003) - RMP violation
PGD b6ee01067 P4D b6ee02067 PUD 10096d063 PMD 11c540063 PTE 80000001149cc163
SEV-SNP: PFN 0x1149cc unassigned, dumping non-zero entries in 2M PFN region: [0x114800 - 0x114a00]
...Newer AMD system is enhanced to allow hypervisor to modify the backing page for non-secure guest on SNP-enabled system. This enhancement is available when the CPUID Fn8000_001F_EAX bit 30 is set (HvInUseWrAllowed).
This table describes AVIC support matrix w.r.t. SNP enablement:
| Non-SNP system | SNP system
-----------------------------------------------------
Non-SNP guest | AVIC Activate | AVIC Activate iff
| | HvInuseWrAllowed=1-----------------------------------------------------
SNP guest | N/A | Secure AVIC
Therefore, check and disable AVIC in kvm_amd driver when the feature is not available on SNP-enabled system.
See the AMD64 Architecture Programmer’s Manual (APM) Volume 2 for detail.
(https://www.amd.com/content/dam/amd/en/documents/processor-tech-docs/
programmer-references/40332.pdf)
--- arch/x86/include/asm/cpufeatures.h | 1 + arch/x86/kvm/svm/avic.c | 6 ++++++ 2 files changed, 7 insertions(+)
arch/x86/include/asm/cpufeatures.h +1 -0
@@ -449,6 +449,7 @@#define X86_FEATURE_SME_COHERENT (19*32+10)/* AMD hardware-enforced cache coherency */ #define X86_FEATURE_DEBUG_SWAP (19*32+14)/* "debug_swap" AMD SEV-ES full debug state swap support */ #define X86_FEATURE_SVSM (19*32+28)/* "svsm" SVSM present */ +#define X86_FEATURE_HV_INUSE_WR_ALLOWED (19*32+30)/* Allow Write to in-use hypervisor-owned pages */ /* AMD-defined Extended Feature 2 EAX, CPUID level 0x80000021 (EAX), word 20 */ #define X86_FEATURE_NO_NESTED_DATA_BP (20*32+ 0)/* No Nested Data Breakpoints */
arch/x86/kvm/svm/avic.c +6 -0
@@ -1199,6 +1199,12 @@ bool avic_hardware_setup(void)return false; } +if (cc_platform_has (CC_ATTR_HOST_SEV_SNP ) && + !boot_cpu_has (X86_FEATURE_HV_INUSE_WR_ALLOWED )) { +pr_warn ("AVIC disabled: missing HvInUseWrAllowed on SNP-enabled system\n" ); +return false; + } +if (boot_cpu_has (X86_FEATURE_AVIC )) {pr_info ("AVIC enabled\n" ); }else if (force_avic) {
Greg Kroah-Hartman
maintainerPATCH 93/280 netfilter: fib: avoid lookup if socket is available
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Florian Westphal <[email protected]>
commit eaaff9b6702e99be5d79135f2afa9fc48a0d59e0 upstream.
In case the fib match is used from the input hook we can avoid the fib lookup if early demux assigned a socket for us: check that the input interface matches sk-cached one.
Rework the existing 'lo bypass' logic to first check sk, then for loopback interface type to elide the fib lookup.
This speeds up fib matching a little, before:
93.08 GBit/s (no rules at all)
75.1 GBit/s ("fib saddr . iif oif missing drop" in prerouting) 75.62 GBit/s ("fib saddr . iif oif missing drop" in input)
After:
92.48 GBit/s (no rules at all)
75.62 GBit/s (fib rule in prerouting)
90.37 GBit/s (fib rule in input).
Numbers for the 'no rules' and 'prerouting' are expected to closely match in-between runs, the 3rd/input test case exercises the the 'avoid lookup if cached ifindex in sk matches' case.
Test used iperf3 via veth interface, lo can't be used due to existing loopback test.
--- include/net/netfilter/nft_fib.h | 21 +++++++++++++++++++++ net/ipv4/netfilter/nft_fib_ipv4.c | 11 +++++------ net/ipv6/netfilter/nft_fib_ipv6.c | 19 ++++++++++--------- 3 files changed, 36 insertions(+), 15 deletions(-)
include/net/netfilter/nft_fib.h +21 -0
@@ -18,6 +18,27 @@ nft_fib_is_loopback(const struct sk_buffreturn skb->pkt_type ==PACKET_LOOPBACK || in->flags &IFF_LOOPBACK ; } +static inline bool nft_fib_can_skip (const struct nft_pktinfo *pkt) +{ +const struct net_device *indev =nft_in (pkt); +const struct sock *sk; + +switch (nft_hook (pkt)) { +case NF_INET_PRE_ROUTING : +case NF_INET_INGRESS : +case NF_INET_LOCAL_IN : +break ; +default : +return false; + } + + sk = pkt->skb->sk; +if (sk &&sk_fullsock (sk)) +return sk->sk_rx_dst_ifindex == indev->ifindex; + +return nft_fib_is_loopback (pkt->skb, indev); +} +int nft_fib_dump (struct sk_buff *skb,const struct nft_expr *expr,bool reset);int nft_fib_init (const struct nft_ctx *ctx,const struct nft_expr *expr,const struct nlattr *const tb[]);
net/ipv4/netfilter/nft_fib_ipv4.c +5 -6
@@ -70,6 +70,11 @@ void nft_fib4_eval(const struct nft_exprconst struct net_device *oif;const struct net_device *found; +if (nft_fib_can_skip (pkt)) { +nft_fib_store_result (dest, priv,nft_in (pkt)); +return ; + } +/* * Do not set flowi4_oif, it restricts results (for example, asking * for oif 3 will get RTN_UNICAST result even if the daddr exits
@@ -84,12 +89,6 @@ void nft_fib4_eval(const struct nft_exprelse oif =NULL ; -if (nft_hook (pkt) ==NF_INET_PRE_ROUTING && -nft_fib_is_loopback (pkt->skb,nft_in (pkt))) { -nft_fib_store_result (dest, priv,nft_in (pkt)); -return ; - } - iph =skb_header_pointer (pkt->skb, noff,sizeof (_iph), &_iph);if (!iph) { regs->verdict.code =NFT_BREAK ;
net/ipv6/netfilter/nft_fib_ipv6.c +10 -9
@@ -170,6 +170,11 @@ void nft_fib6_eval(const struct nft_exprstruct rt6_info *rt;int lookup_flags; +if (nft_fib_can_skip (pkt)) { +nft_fib_store_result (dest, priv,nft_in (pkt)); +return ; + } +if (priv->flags &NFTA_FIB_F_IIF ) oif =nft_in (pkt);else if (priv->flags &NFTA_FIB_F_OIF )
@@ -181,17 +186,13 @@ void nft_fib6_eval(const struct nft_exprreturn ; } - lookup_flags =nft_fib6_flowi_init (&fl6, priv, pkt, oif, iph); - -if (nft_hook (pkt) ==NF_INET_PRE_ROUTING || -nft_hook (pkt) ==NF_INET_INGRESS ) { -if (nft_fib_is_loopback (pkt->skb,nft_in (pkt)) || -nft_fib_v6_skip_icmpv6 (pkt->skb, pkt->tprot, iph)) { -nft_fib_store_result (dest, priv,nft_in (pkt)); -return ; - } +if (nft_fib_v6_skip_icmpv6 (pkt->skb, pkt->tprot, iph)) { +nft_fib_store_result (dest, priv,nft_in (pkt)); +return ; } + lookup_flags =nft_fib6_flowi_init (&fl6, priv, pkt, oif, iph); + *dest =0 ; rt = (void *)ip6_route_lookup (nft_net (pkt), &fl6, pkt->skb, lookup_flags);
Greg Kroah-Hartman
maintainerPATCH 94/280 virtio_console: fix missing byte order handling for cols and rows
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Halil Pasic <[email protected]>
commit fbd3039a64b01b769040677c4fc68badeca8e3b2 upstream.
As per virtio spec the fields cols and rows are specified as little endian. Although there is no legacy interface requirement that would state that cols and rows need to be handled as native endian when legacy interface is used, unlike for the fields of the adjacent struct virtio_console_control, I decided to err on the side of caution based on some non-conclusive virtio spec repo archaeology and opt for using virtio16_to_cpu() much like for virtio_console_control.event. Strictly by the letter of the spec virtio_le_to_cpu() would have been sufficient. But when the legacy interface is not used, it boils down to the same.
And when using the legacy interface, the device formatting these as little endian when the guest is big endian would surprise me more than it using guest native byte order (which would make it compatible with the current implementation). Nevertheless somebody trying to implement the spec following it to the letter could end up forcing little endian byte order when the legacy interface is in use. So IMHO this ultimately needs a judgement call by the maintainers.
Message-Id: <[email protected]>
--- drivers/char/virtio_console.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/char/virtio_console.c +4 -3
@@ -1579,8 +1579,8 @@ static void handle_control_message(strucbreak ;case VIRTIO_CONSOLE_RESIZE : {struct { -__u16 rows; -__u16 cols; +__virtio16 rows; +__virtio16 cols; } size;if (!is_console_port (port))
@@ -1588,7 +1588,8 @@ static void handle_control_message(strucmemcpy (&size, buf->buf + buf->offset +sizeof (*cpkt),sizeof (size)); -set_console_size (port, size.rows, size.cols); +set_console_size (port,virtio16_to_cpu (vdev, size.rows), +virtio16_to_cpu (vdev, size.cols)); port->cons.hvc->irq_requested =1 ;resize_console (port);
Greg Kroah-Hartman
maintainerPATCH 95/280 sched_ext: Use kvzalloc for large exit_dump allocation
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Breno Leitao <[email protected]>
commit 47068309b5777313b6ac84a77d8d10dc7312260a upstream.
Replace kzalloc with kvzalloc for the exit_dump buffer allocation, which can require large contiguous memory depending on the implementation. This change prevents allocation failures by allowing the system to fall back to vmalloc when contiguous memory allocation fails.
Since this buffer is only used for debugging purposes, physical memory contiguity is not required, making vmalloc a suitable alternative.
--- kernel/sched/ext.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
kernel/sched/ext.c +2 -2
@@ -4530,7 +4530,7 @@ unlock:static void free_exit_info (struct scx_exit_info *ei) { -kfree (ei->dump); +kvfree (ei->dump);kfree (ei->msg);kfree (ei->bt);kfree (ei);
@@ -4546,7 +4546,7 @@ static struct scx_exit_info *alloc_exit_ ei->bt =kcalloc (SCX_EXIT_BT_LEN ,sizeof (ei->bt[0 ]),GFP_KERNEL ); ei->msg =kzalloc (SCX_EXIT_MSG_LEN ,GFP_KERNEL ); - ei->dump =kzalloc (exit_dump_len,GFP_KERNEL ); + ei->dump =kvzalloc (exit_dump_len,GFP_KERNEL );if (!ei->bt || !ei->msg || !ei->dump) {free_exit_info (ei);
Greg Kroah-Hartman
maintainerPATCH 96/280 crypto: atmel-sha204a - Set hwrng quality to lowest possible
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Behún <[email protected]>
commit 8006aff15516a170640239c5a8e6696c0ba18d8e upstream.
According to the review by Bill Cox [1], the Atmel SHA204A random number generator produces random numbers with very low entropy.
Set the lowest possible entropy for this chip just to be safe.
[1] https://www.metzdowd.com/pipermail/cryptography/2014-December/023858.html
--- drivers/crypto/atmel-sha204a.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/crypto/atmel-sha204a.c +6 -0
@@ -163,6 +163,12 @@ static int atmel_sha204a_probe(struct i2 i2c_priv->hwrng.name =dev_name (&client->dev); i2c_priv->hwrng.read = atmel_sha204a_rng_read; +/* +* According to review by Bill Cox [1], this HWRNG has very low entropy. +* [1] https://www.metzdowd.com/pipermail/cryptography/2014-December/023858.html +*/ + i2c_priv->hwrng.quality =1 ; + ret =devm_hwrng_register (&client->dev, &i2c_priv->hwrng);if (ret)dev_warn (&client->dev,"failed to register RNG (%d)\n" , ret);
Greg Kroah-Hartman
maintainerPATCH 97/280 xen-netfront: handle NULL returned by xdp_convert_buff_to_frame()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexey Nepomnyashih <[email protected]>
commit cc3628dcd851ddd8d418bf0c897024b4621ddc92 upstream.
The function xdp_convert_buff_to_frame() may return NULL if it fails to correctly convert the XDP buffer into an XDP frame due to memory constraints, internal errors, or invalid data. Failing to check for NULL may lead to a NULL pointer dereference if the result is used later in processing, potentially causing crashes, data corruption, or undefined behavior.
On XDP redirect failure, the associated page must be released explicitly if it was previously retained via get_page(). Failing to do so may result in a memory leak, as the pages reference count is not decremented.
--- drivers/net/xen-netfront.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-)
drivers/net/xen-netfront.c +12 -5
@@ -985,20 +985,27 @@ static u32 xennet_run_xdp(struct netfron act =bpf_prog_run_xdp (prog, xdp);switch (act) {case XDP_TX : -get_page (pdata); xdpf =xdp_convert_buff_to_frame (xdp); +if (unlikely (!xdpf)) { +trace_xdp_exception (queue->info->netdev, prog, act); +break ; + } +get_page (pdata); err =xennet_xdp_xmit (queue->info->netdev,1 , &xdpf,0 ); -if (unlikely (!err)) +if (unlikely (err <=0 )) { +if (err <0 ) +trace_xdp_exception (queue->info->netdev, prog, act);xdp_return_frame_rx_napi (xdpf); -else if (unlikely (err <0 )) -trace_xdp_exception (queue->info->netdev, prog, act); + }break ;case XDP_REDIRECT :get_page (pdata); err =xdp_do_redirect (queue->info->netdev, xdp, prog); *need_xdp_flush = true; -if (unlikely (err)) +if (unlikely (err)) {trace_xdp_exception (queue->info->netdev, prog, act); +xdp_return_buff (xdp); + }break ;case XDP_PASS :case XDP_DROP :
Greg Kroah-Hartman
maintainerPATCH 98/280 net: selftests: initialize TCP header and skb payload with zero
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oleksij Rempel <[email protected]>
commit 9e8d1013b0c38910cbc9e60de74dbe883878469d upstream.
Zero-initialize TCP header via memset() to avoid garbage values that may affect checksum or behavior during test transmission.
Also zero-fill allocated payload and padding regions using memset() after skb_put(), ensuring deterministic content for all outgoing test packets.
--- net/core/selftests.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-)
net/core/selftests.c +13 -5
@@ -100,10 +100,10 @@ static struct sk_buff *net_test_get_skb( ehdr->h_proto =htons (ETH_P_IP );if (attr->tcp) { +memset (thdr,0 ,sizeof (*thdr)); thdr->source =htons (attr->sport); thdr->dest =htons (attr->dport); thdr->doff =sizeof (struct tcphdr ) /4 ; - thdr->check =0 ; }else { uhdr->source =htons (attr->sport); uhdr->dest =htons (attr->dport);
@@ -144,10 +144,18 @@ static struct sk_buff *net_test_get_skb( attr->id = net_test_next_id; shdr->id = net_test_next_id++; -if (attr->size) -skb_put (skb, attr->size); -if (attr->max_size && attr->max_size > skb->len) -skb_put (skb, attr->max_size - skb->len); +if (attr->size) { +void *payload =skb_put (skb, attr->size); + +memset (payload,0 , attr->size); + } + +if (attr->max_size && attr->max_size > skb->len) { +size_t pad_len = attr->max_size - skb->len; +void *pad =skb_put (skb, pad_len); + +memset (pad,0 , pad_len); + } skb->csum =0 ; skb->ip_summed =CHECKSUM_PARTIAL ;
Greg Kroah-Hartman
maintainerPATCH 72/280 tipc: fix NULL pointer dereference in tipc_mon_reinit_self()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tung Nguyen <[email protected]>
[ Upstream commit d63527e109e811ef11abb1c2985048fdb528b4cb ]
syzbot reported:
tipc: Node number set to 1055423674
Oops: general protection fault, probably for non-canonical address 0xdffffc0000000000: 0000 [#1] SMP KASAN NOPTI KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007] CPU: 3 UID: 0 PID: 6017 Comm: kworker/3:5 Not tainted 6.15.0-rc1-syzkaller-00246-g900241a5cc15 #0 PREEMPT(full) Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.3-debian-1.16.3-2~bpo12+1 04/01/2014 Workqueue: events tipc_net_finalize_work RIP: 0010:tipc_mon_reinit_self+0x11c/0x210 net/tipc/monitor.c:719 ... RSP: 0018:ffffc9000356fb68 EFLAGS: 00010246 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 000000003ee87cba RDX: 0000000000000000 RSI: ffffffff8dbc56a7 RDI: ffff88804c2cc010 RBP: dffffc0000000000 R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000001 R11: 0000000000000000 R12: 0000000000000007 R13: fffffbfff2111097 R14: ffff88804ead8000 R15: ffff88804ead9010 FS: 0000000000000000(0000) GS:ffff888097ab9000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00000000f720eb00 CR3: 000000000e182000 CR4: 0000000000352ef0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> tipc_net_finalize+0x10b/0x180 net/tipc/net.c:140 process_one_work+0x9cc/0x1b70 kernel/workqueue.c:3238 process_scheduled_works kernel/workqueue.c:3319 [inline] worker_thread+0x6c8/0xf10 kernel/workqueue.c:3400 kthread+0x3c2/0x780 kernel/kthread.c:464 ret_from_fork+0x45/0x80 arch/x86/kernel/process.c:153 ret_from_fork_asm+0x1a/0x30 arch/x86/entry/entry_64.S:245 </TASK> ... RIP: 0010:tipc_mon_reinit_self+0x11c/0x210 net/tipc/monitor.c:719 ... RSP: 0018:ffffc9000356fb68 EFLAGS: 00010246 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 000000003ee87cba RDX: 0000000000000000 RSI: ffffffff8dbc56a7 RDI: ffff88804c2cc010 RBP: dffffc0000000000 R08: 0000000000000001 R09: 0000000000000000 R10: 0000000000000001 R11: 0000000000000000 R12: 0000000000000007 R13: fffffbfff2111097 R14: ffff88804ead8000 R15: ffff88804ead9010 FS: 0000000000000000(0000) GS:ffff888097ab9000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00000000f720eb00 CR3: 000000000e182000 CR4: 0000000000352ef0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400
There is a racing condition between workqueue created when enabling bearer and another thread created when disabling bearer right after that as follow:
enabling_bearer | disabling_bearer
--------------- | ----------------
tipc_disc_timeout() |
{ | bearer_disable()
... | {
schedule_work(&tn->work); | tipc_mon_delete()
... | {
} | ...
| write_lock_bh(&mon->lock);
| mon->self = NULL;
| write_unlock_bh(&mon->lock);
| ...
| }
tipc_net_finalize_work() | }
{ |
... |
tipc_net_finalize() |
{ |
... |
tipc_mon_reinit_self() |
{ |
... |
write_lock_bh(&mon->lock); |
mon->self->addr = tipc_own_addr(net); |
write_unlock_bh(&mon->lock); |
... |
} |
... |
} |
... |
} |'mon->self' is set to NULL in disabling_bearer thread and dereferenced later in enabling_bearer thread.
This commit fixes this issue by validating 'mon->self' before assigning node address to it.
--- net/tipc/monitor.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/tipc/monitor.c +2 -1
@@ -716,7 +716,8 @@ void tipc_mon_reinit_self(struct net *net)if (!mon)continue ;write_lock_bh (&mon->lock); - mon->self->addr =tipc_own_addr (net); +if (mon->self) + mon->self->addr =tipc_own_addr (net);write_unlock_bh (&mon->lock); } }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 99/280 net: phy: microchip: force IRQ polling mode for lan88xx
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fiona Klute <[email protected]>
commit 30a41ed32d3088cd0d682a13d7f30b23baed7e93 upstream.
With lan88xx based devices the lan78xx driver can get stuck in an interrupt loop while bringing the device up, flooding the kernel log with messages like the following:
lan78xx 2-3:1.0 enp1s0u3: kevent 4 may have been dropped
Removing interrupt support from the lan88xx PHY driver forces the driver to use polling instead, which avoids the problem.
The issue has been observed with Raspberry Pi devices at least since 4.14 (see [1], bug report for their downstream kernel), as well as with Nvidia devices [2] in 2020, where disabling interrupts was the vendor-suggested workaround (together with the claim that phylib changes in 4.9 made the interrupt handling in lan78xx incompatible).
Iperf reports well over 900Mbits/sec per direction with client in --dualtest mode, so there does not seem to be a significant impact on throughput (lan88xx device connected via switch to the peer).
[1] https://github.com/raspberrypi/linux/issues/2447
[2] https://forums.developer.nvidia.com/t/jetson-xavier-and-lan7800-problem/142134/11
--- drivers/net/phy/microchip.c | 46 ++------------------------------------------ 1 file changed, 3 insertions(+), 43 deletions(-)
drivers/net/phy/microchip.c +3 -43
@@ -37,47 +37,6 @@ static int lan88xx_write_page(struct phyreturn __phy_write (phydev,LAN88XX_EXT_PAGE_ACCESS , page); } -static int lan88xx_phy_config_intr (struct phy_device *phydev) -{ -int rc; - -if (phydev->interrupts ==PHY_INTERRUPT_ENABLED ) { -/* unmask all source and clear them before enable */ - rc =phy_write (phydev,LAN88XX_INT_MASK ,0x7FFF ); - rc =phy_read (phydev,LAN88XX_INT_STS ); - rc =phy_write (phydev,LAN88XX_INT_MASK , -LAN88XX_INT_MASK_MDINTPIN_EN_ | -LAN88XX_INT_MASK_LINK_CHANGE_ ); - }else { - rc =phy_write (phydev,LAN88XX_INT_MASK ,0 ); -if (rc) -return rc; - -/* Ack interrupts after they have been disabled */ - rc =phy_read (phydev,LAN88XX_INT_STS ); - } - -return rc <0 ? rc :0 ; -} - -static irqreturn_t lan88xx_handle_interrupt (struct phy_device *phydev) -{ -int irq_status; - - irq_status =phy_read (phydev,LAN88XX_INT_STS ); -if (irq_status <0 ) { -phy_error (phydev); -return IRQ_NONE ; - } - -if (!(irq_status &LAN88XX_INT_STS_LINK_CHANGE_ )) -return IRQ_NONE ; - -phy_trigger_machine (phydev); - -return IRQ_HANDLED ; -} -static int lan88xx_suspend (struct phy_device *phydev) {struct lan88xx_priv *priv = phydev->priv;
@@ -528,8 +487,9 @@ static struct phy_driver microchip_phy_d .config_aneg = lan88xx_config_aneg, .link_change_notify = lan88xx_link_change_notify, - .config_intr = lan88xx_phy_config_intr, - .handle_interrupt = lan88xx_handle_interrupt, +/* Interrupt handling is broken, do not define related +* functions to force polling. +*/ .suspend = lan88xx_suspend, .resume = genphy_resume,
Greg Kroah-Hartman
maintainerPATCH 100/280 scsi: mpi3mr: Fix pending I/O counter
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ranjan Kumar <[email protected]>
commit cdd445258db9919e9dde497a6d5c3477ea7faf4d upstream.
Commit 199510e33dea ("scsi: mpi3mr: Update consumer index of reply queues after every 100 replies") introduced a regression with the per-reply queue pending I/O counter which was erroneously decremented, leading to the counter going negative.
Drop the incorrect atomic decrement for the pending I/O counter.
--- drivers/scsi/mpi3mr/mpi3mr_fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/mpi3mr/mpi3mr_fw.c +1 -1
@@ -563,7 +563,7 @@ int mpi3mr_process_op_reply_q(struct mpiWRITE_ONCE (op_req_q->ci,le16_to_cpu (reply_desc->request_queue_ci));mpi3mr_process_op_reply_desc (mrioc, reply_desc, &reply_dma, reply_qidx); -atomic_dec (&op_reply_q->pend_ios); +if (reply_dma)mpi3mr_repost_reply_buf (mrioc, reply_dma); num_op_reply++;
Greg Kroah-Hartman
maintainerPATCH 101/280 rust: firmware: Use `ffi::c_char` type in `FwFunc`
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Christian Schrefl <[email protected]>
commit 53bd97801632c940767f4c8407c2cbdeb56b40e7 upstream.
The FwFunc struct contains an function with a char pointer argument, for which a *const u8 pointer was used. This is not really the "proper" type for this, so use a *const kernel::ffi::c_char pointer instead.
This has no real functionality changes, since now kernel::ffi::c_char (which bindgen uses for char) is now a type alias to u8 anyways, but before commit 1bae8729e50a ("rust: map long to isize and char to u8") the concrete type of kernel::ffi::c_char depended on the architecture (However all supported architectures at the time mapped to i8).
This caused problems on the v6.13 tag when building for 32 bit arm (with my patches), since back then *const i8 was used in the function argument and the function that bindgen generated used *const core::ffi::c_char which Rust mapped to *const u8 on 32 bit arm. The stable v6.13.y branch does not have this issue since commit 1bae8729e50a ("rust: map long to isize and char to u8") was backported.
This caused the following build error:
```
error[E0308]: mismatched types
--> rust/kernel/firmware.rs:20:4
|
20 | Self(bindings::request_firmware)
| ---- ^^^^^^^^^^^^^^^^^^^^^^^^^^ expected fn pointer, found fn item
| |
| arguments to this function are incorrect
|
= note: expected fn pointer `unsafe extern "C" fn(_, *const i8, _) -> _`
found fn item `unsafe extern "C" fn(_, *const u8, _) -> _ {request_firmware}`
note: tuple struct defined here
--> rust/kernel/firmware.rs:14:8
|
14 | struct FwFunc(
| ^^^^^^
error[E0308]: mismatched types
--> rust/kernel/firmware.rs:24:14
|
24 | Self(bindings::firmware_request_nowarn)
| ---- ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ expected fn pointer, found fn item
| |
| arguments to this function are incorrect
|
= note: expected fn pointer `unsafe extern "C" fn(_, *const i8, _) -> _`
found fn item `unsafe extern "C" fn(_, *const u8, _) -> _ {firmware_request_nowarn}`
note: tuple struct defined here
--> rust/kernel/firmware.rs:14:8
|
14 | struct FwFunc(
| ^^^^^^
error[E0308]: mismatched types
--> rust/kernel/firmware.rs:64:45
|
64 | let ret = unsafe { func.0(pfw as _, name.as_char_ptr(), dev.as_raw()) };
| ------ ^^^^^^^^^^^^^^^^^^ expected `*const i8`, found `*const u8`
| |
| arguments to this function are incorrect
|
= note: expected raw pointer `*const i8`
found raw pointer `*const u8`
error: aborting due to 3 previous errors
```--- rust/kernel/firmware.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
rust/kernel/firmware.rs +6 -2
@@ -4,7 +4,7 @@//! //! C header: [`include/linux/firmware.h`](srctree/include/linux/firmware.h) -use crate ::{bindings, device::Device , error::Error , error::Result , str::CStr }; +use crate ::{bindings, device::Device , error::Error , error::Result , ffi, str::CStr };use core::ptr::NonNull ;/// # Invariants
@@ -12,7 +12,11 @@/// One of the following: `bindings::request_firmware`, `bindings::firmware_request_nowarn`, /// `bindings::firmware_request_platform`, `bindings::request_firmware_direct`. struct FwFunc ( -unsafe extern "C" fn (*mut *const bindings::firmware , *const u8 , *mut bindings::device ) ->i32 , +unsafe extern "C" fn ( + *mut *const bindings::firmware , + *const ffi::c_char , + *mut bindings::device , + ) ->i32 , );impl FwFunc {
Signature · 1 line
2.49.0
Greg Kroah-Hartman
maintainerPATCH 73/280 net: ethernet: mtk_eth_soc: net: revise NETSYSv3 hardware configuration
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bo-Cun Chen <[email protected]>
[ Upstream commit 491ef1117c56476f199b481f8c68820fe4c3a7c2 ]
Change hardware configuration for the NETSYSv3.
- Enable PSE dummy page mechanism for the GDM1/2/3
- Enable PSE drop mechanism when the WDMA Rx ring full
- Enable PSE no-drop mechanism for packets from the WDMA Tx
- Correct PSE free drop threshold
- Correct PSE CDMA high threshold
--- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 24 +++++++++++++++++---- drivers/net/ethernet/mediatek/mtk_eth_soc.h | 10 ++++++++- 2 files changed, 29 insertions(+), 5 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +20 -4
@@ -3997,11 +3997,27 @@ static int mtk_hw_init(struct mtk_eth *eth, bool reset)mtk_w32 (eth,0x21021000 ,MTK_FE_INT_GRP );if (mtk_is_netsys_v3_or_greater (eth)) { -/* PSE should not drop port1, port8 and port9 packets */ -mtk_w32 (eth,0x00000302 ,PSE_DROP_CFG ); +/* PSE dummy page mechanism */ +mtk_w32 (eth,PSE_DUMMY_WORK_GDM (1 ) |PSE_DUMMY_WORK_GDM (2 ) | +PSE_DUMMY_WORK_GDM (3 ) |DUMMY_PAGE_THR ,PSE_DUMY_REQ ); + +/* PSE free buffer drop threshold */ +mtk_w32 (eth,0x00600009 ,PSE_IQ_REV (8 )); + +/* PSE should not drop port8, port9 and port13 packets from +* WDMA Tx +*/ +mtk_w32 (eth,0x00002300 ,PSE_DROP_CFG ); + +/* PSE should drop packets to port8, port9 and port13 on WDMA Rx +* ring full +*/ +mtk_w32 (eth,0x00002300 ,PSE_PPE_DROP (0 )); +mtk_w32 (eth,0x00002300 ,PSE_PPE_DROP (1 )); +mtk_w32 (eth,0x00002300 ,PSE_PPE_DROP (2 ));/* GDM and CDM Threshold */ -mtk_w32 (eth,0x00000707 ,MTK_CDMW0_THRES ); +mtk_w32 (eth,0x08000707 ,MTK_CDMW0_THRES );mtk_w32 (eth,0x00000077 ,MTK_CDMW1_THRES );/* Disable GDM1 RX CRC stripping */
@@ -4018,7 +4034,7 @@ static int mtk_hw_init(struct mtk_eth *eth, bool reset)mtk_w32 (eth,0x00000300 ,PSE_DROP_CFG );/* PSE should drop packets to port 8/9 on WDMA Rx ring full */ -mtk_w32 (eth,0x00000300 ,PSE_PPE0_DROP ); +mtk_w32 (eth,0x00000300 ,PSE_PPE_DROP (0 ));/* PSE Free Queue Flow Control */ mtk_w32 (eth,0x01fa01f4 ,PSE_FQFC_CFG2 );
drivers/net/ethernet/mediatek/mtk_eth_soc.h +9 -1
@@ -151,7 +151,15 @@#define PSE_FQFC_CFG1 0x100#define PSE_FQFC_CFG2 0x104#define PSE_DROP_CFG 0x108 -#define PSE_PPE0_DROP 0x110 +#define PSE_PPE_DROP (x) (0x110 + ((x) * 0x4)) + +/* PSE Last FreeQ Page Request Control */ +#define PSE_DUMY_REQ 0x10C +/* PSE_DUMY_REQ is not a typo but actually called like that also in +* MediaTek's datasheet +*/ +#define PSE_DUMMY_WORK_GDM (x) BIT(16 + (x)) +#define DUMMY_PAGE_THR 0x1/* PSE Input Queue Reservation Register*/ #define PSE_IQ_REV (x) (0x140 + (((x) - 1) << 2))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 74/280 fix a couple of races in MNT_TREE_BENEATH handling by do_move_mount()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Al Viro <[email protected]>
[ Upstream commit 0d039eac6e5950f9d1ecc9e410c2fd1feaeab3b6 ]
Normally do_lock_mount(path, _) is locking a mountpoint pinned by *path and at the time when matching unlock_mount() unlocks that location it is still pinned by the same thing.
Unfortunately, for 'beneath' case it's no longer that simple - the object being locked is not the one *path points to. It's the mountpoint of path->mnt. The thing is, without sufficient locking ->mnt_parent may change under us and none of the locks are held at that point. The rules are
* mount_lock stabilizes m->mnt_parent for any mount m.
* namespace_sem stabilizes m->mnt_parent, provided that
m is mounted.
* if either of the above holds and refcount of m is positive,
we are guaranteed the same for refcount of m->mnt_parent.
namespace_sem nests inside inode_lock(), so do_lock_mount() has to take inode_lock() before grabbing namespace_sem. It does recheck that path->mnt is still mounted in the same place after getting namespace_sem, and it does take care to pin the dentry. It is needed, since otherwise we might end up with racing mount --move (or umount) happening while we were getting locks; in that case dentry would no longer be a mountpoint and could've been evicted on memory pressure along with its inode - not something you want when grabbing lock on that inode.
However, pinning a dentry is not enough - the matching mount is also pinned only by the fact that path->mnt is mounted on top it and at that point we are not holding any locks whatsoever, so the same kind of races could end up with all references to that mount gone just as we are about to enter inode_lock(). If that happens, we are left with filesystem being shut down while we are holding a dentry reference on it; results are not pretty.
What we need to do is grab both dentry and mount at the same time; that makes inode_lock() safe *and* avoids the problem with fs getting shut down under us. After taking namespace_sem we verify that path->mnt is still mounted (which stabilizes its ->mnt_parent) and check that it's still mounted at the same place. From that point on to the matching namespace_unlock() we are guaranteed that mount/dentry pair we'd grabbed are also pinned by being the mountpoint of path->mnt, so we can quietly drop both the dentry reference (as the current code does) and mnt one - it's OK to do under namespace_sem, since we are not dropping the final refs.
That solves the problem on do_lock_mount() side; unlock_mount() also has one, since dentry is guaranteed to stay pinned only until the namespace_unlock(). That's easy to fix - just have inode_unlock() done earlier, while it's still pinned by mp->m_dentry.
--- fs/namespace.c | 69 ++++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 33 deletions(-)
fs/namespace.c +36 -33
@@ -2596,56 +2596,62 @@ static struct mountpoint *do_lock_mount(struct path *path, bool beneath)struct vfsmount *mnt = path->mnt;struct dentry *dentry;struct mountpoint *mp =ERR_PTR (-ENOENT ); +struct path under = {};for (;;) { -struct mount *m; +struct mount *m =real_mount (mnt);if (beneath) { - m =real_mount (mnt); +path_put (&under);read_seqlock_excl (&mount_lock); - dentry =dget (m->mnt_mountpoint); + under.mnt =mntget (&m->mnt_parent->mnt); + under.dentry =dget (m->mnt_mountpoint);read_sequnlock_excl (&mount_lock); + dentry = under.dentry; }else { dentry = path->dentry; }inode_lock (dentry->d_inode); -if (unlikely (cant_mount (dentry))) { -inode_unlock (dentry->d_inode); - goto out; - } -namespace_lock (); -if (beneath && (!is_mounted (mnt) || m->mnt_mountpoint != dentry)) { +if (unlikely (cant_mount (dentry) || !is_mounted (mnt))) +break ;// not to be mounted on + +if (beneath &&unlikely (m->mnt_mountpoint != dentry || + &m->mnt_parent->mnt != under.mnt)) {namespace_unlock ();inode_unlock (dentry->d_inode); - goto out; +continue ;// got moved } mnt =lookup_mnt (path); -if (likely (!mnt)) +if (unlikely (mnt)) { +namespace_unlock (); +inode_unlock (dentry->d_inode); +path_put (path); + path->mnt = mnt; + path->dentry =dget (mnt->mnt_root); +continue ;// got overmounted + } + mp =get_mountpoint (dentry); +if (IS_ERR (mp))break ; - -namespace_unlock (); -inode_unlock (dentry->d_inode); -if (beneath) -dput (dentry); -path_put (path); - path->mnt = mnt; - path->dentry =dget (mnt->mnt_root); - } - - mp =get_mountpoint (dentry); -if (IS_ERR (mp)) { -namespace_unlock (); -inode_unlock (dentry->d_inode); +if (beneath) { +/* +* @under duplicates the references that will stay +* at least until namespace_unlock(), so the path_put() +* below is safe (and OK to do under namespace_lock - +* we are not dropping the final references here). +*/ +path_put (&under); + } +return mp; } - -out: +namespace_unlock (); +inode_unlock (dentry->d_inode);if (beneath) -dput (dentry); - +path_put (&under);return mp; }
@@ -2656,14 +2662,11 @@ static inline struct mountpoint *lock_mount(struct path *path)static void unlock_mount (struct mountpoint *where) { -struct dentry *dentry = where->m_dentry; - +inode_unlock (where->m_dentry->d_inode);read_seqlock_excl (&mount_lock);put_mountpoint (where);read_sequnlock_excl (&mount_lock); -namespace_unlock (); -inode_unlock (dentry->d_inode); }static int graft_tree (struct mount *mnt,struct mount *p,struct mountpoint *mp)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 75/280 net_sched: hfsc: Fix a UAF vulnerability in class handling
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cong Wang <[email protected]>
[ Upstream commit 3df275ef0a6ae181e8428a6589ef5d5231e58b5c ]
This patch fixes a Use-After-Free vulnerability in the HFSC qdisc class handling. The issue occurs due to a time-of-check/time-of-use condition in hfsc_change_class() when working with certain child qdiscs like netem or codel.
The vulnerability works as follows:
1. hfsc_change_class() checks if a class has packets (q.qlen != 0)
2. It then calls qdisc_peek_len(), which for certain qdiscs (e.g., codel, netem) might drop packets and empty the queue
3. The code continues assuming the queue is still non-empty, adding the class to vttree
4. This breaks HFSC scheduler assumptions that only non-empty classes are in vttree
5. Later, when the class is destroyed, this can lead to a Use-After-Free
The fix adds a second queue length check after qdisc_peek_len() to verify the queue wasn't emptied.
--- net/sched/sch_hfsc.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
net/sched/sch_hfsc.c +7 -2
@@ -958,6 +958,7 @@ hfsc_change_class(struct Qdisc *sch, u32 classid, u32 parentid,if (cl !=NULL ) {int old_flags; +int len =0 ;if (parentid) { if (cl->cl_parent &&
@@ -988,9 +989,13 @@ hfsc_change_class(struct Qdisc *sch, u32 classid, u32 parentid,if (usc !=NULL )hfsc_change_usc (cl, usc, cur_time); +if (cl->qdisc->q.qlen !=0 ) + len =qdisc_peek_len (cl->qdisc); +/* Check queue length again since some qdisc implementations +* (e.g., netem/codel) might empty the queue during the peek +* operation. +*/ if (cl->qdisc->q.qlen !=0 ) { -int len =qdisc_peek_len (cl->qdisc); -if (cl->cl_flags &HFSC_RSC ) {if (old_flags &HFSC_RSC )update_ed (cl, len);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 76/280 net_sched: hfsc: Fix a potential UAF in hfsc_dequeue() too
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Cong Wang <[email protected]>
[ Upstream commit 6ccbda44e2cc3d26fd22af54c650d6d5d801addf ]
Similarly to the previous patch, we need to safe guard hfsc_dequeue() too. But for this one, we don't have a reliable reproducer.
--- net/sched/sch_hfsc.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-)
net/sched/sch_hfsc.c +10 -4
@@ -1637,10 +1637,16 @@ hfsc_dequeue(struct Qdisc *sch)if (cl->qdisc->q.qlen !=0 ) {/* update ed */ next_len =qdisc_peek_len (cl->qdisc); -if (realtime) -update_ed (cl, next_len); -else -update_d (cl, next_len); +/* Check queue length again since some qdisc implementations +* (e.g., netem/codel) might empty the queue during the peek +* operation. +*/ +if (cl->qdisc->q.qlen !=0 ) { +if (realtime) +update_ed (cl, next_len); +else +update_d (cl, next_len); + } }else {/* the class becomes passive */ eltree_remove (cl);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 77/280 net: dsa: mt7530: sync driver-specific behavior of MT7531 variants
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Daniel Golle <[email protected]>
[ Upstream commit 497041d763016c2e8314d2f6a329a9b77c3797ca ]
MT7531 standalone and MMIO variants found in MT7988 and EN7581 share most basic properties. Despite that, assisted_learning_on_cpu_port and mtu_enforcement_ingress were only applied for MT7531 but not for MT7988 or EN7581, causing the expected issues on MMIO devices.
Apply both settings equally also for MT7988 and EN7581 by moving both assignments form mt7531_setup() to mt7531_setup_common().
This fixes unwanted flooding of packets due to unknown unicast during DA lookup, as well as issues with heterogenous MTU settings.
--- drivers/net/dsa/mt7530.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/net/dsa/mt7530.c +3 -3
@@ -2540,6 +2540,9 @@ mt7531_setup_common(struct dsa_switch *ds)struct mt7530_priv *priv = ds->priv;int ret, i; + ds->assisted_learning_on_cpu_port = true; + ds->mtu_enforcement_ingress = true; +mt753x_trap_frames (priv);/* Enable and reset MIB counters */
@@ -2687,9 +2690,6 @@ mt7531_setup(struct dsa_switch *ds)if (ret)return ret; - ds->assisted_learning_on_cpu_port = true; - ds->mtu_enforcement_ingress = true; -return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 78/280 pds_core: Prevent possible adminq overflow/stuck condition
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Brett Creeley <[email protected]>
[ Upstream commit d9e2f070d8af60f2c8c02b2ddf0a9e90b4e9220c ]
The pds_core's adminq is protected by the adminq_lock, which prevents more than 1 command to be posted onto it at any one time. This makes it so the client drivers cannot simultaneously post adminq commands. However, the completions happen in a different context, which means multiple adminq commands can be posted sequentially and all waiting on completion.
On the FW side, the backing adminq request queue is only 16 entries long and the retry mechanism and/or overflow/stuck prevention is lacking. This can cause the adminq to get stuck, so commands are no longer processed and completions are no longer sent by the FW.
As an initial fix, prevent more than 16 outstanding adminq commands so there's no way to cause the adminq from getting stuck. This works because the backing adminq request queue will never have more than 16 pending adminq commands, so it will never overflow. This is done by reducing the adminq depth to 16.
--- drivers/net/ethernet/amd/pds_core/core.c | 5 +---- drivers/net/ethernet/amd/pds_core/core.h | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-)
drivers/net/ethernet/amd/pds_core/core.c +1 -4
@@ -325,10 +325,7 @@ static int pdsc_core_init(struct pdsc *pdsc)size_t sz;int err; -/* Scale the descriptor ring length based on number of CPUs and VFs */ - numdescs =max_t (int,PDSC_ADMINQ_MIN_LENGTH ,num_online_cpus ()); - numdescs +=2 *pci_sriov_get_totalvfs (pdsc->pdev); - numdescs =roundup_pow_of_two (numdescs); + numdescs =PDSC_ADMINQ_MAX_LENGTH ; err = pdsc_qcq_alloc(pdsc, PDS_CORE_QTYPE_ADMINQ, 0, "adminq", PDS_CORE_QCQ_F_CORE | PDS_CORE_QCQ_F_INTR, numdescs,
drivers/net/ethernet/amd/pds_core/core.h +1 -1
@@ -16,7 +16,7 @@#define PDSC_WATCHDOG_SECS 5#define PDSC_QUEUE_NAME_MAX_SZ 16 -#define PDSC_ADMINQ_MIN_LENGTH 16/* must be a power of two */ +#define PDSC_ADMINQ_MAX_LENGTH 16/* must be a power of two */ #define PDSC_NOTIFYQ_LENGTH 64/* must be a power of two */ #define PDSC_TEARDOWN_RECOVERY false#define PDSC_TEARDOWN_REMOVING true
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 69/280 scsi: ufs: core: Add NULL check in ufshcd_mcq_compl_pending_transfer()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chenyuan Yang <[email protected]>
[ Upstream commit 08a966a917fe3d92150fa3cc15793ad5e57051eb ]
Add a NULL check for the returned hwq pointer by ufshcd_mcq_req_to_hwq().
This is similar to the fix in commit 74736103fb41 ("scsi: ufs: core: Fix ufshcd_abort_one racing issue").
--- drivers/ufs/core/ufshcd.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/ufs/core/ufshcd.c +2 -0
@@ -5689,6 +5689,8 @@ static void ufshcd_mcq_compl_pending_transfer(struct ufs_hba *hba,continue ; hwq =ufshcd_mcq_req_to_hwq (hba,scsi_cmd_to_rq (cmd)); +if (!hwq) +continue ;if (force_compl) {ufshcd_mcq_compl_all_cqes_lock (hba, hwq);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 103/280 drm/amd/display: Fix gpu reset in multidisplay config
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roman Li <[email protected]>
commit 7eb287beeb60be1e4437be2b4e4e9f0da89aab97 upstream.
[Why]
The indexing of stream_status in dm_gpureset_commit_state() is incorrect. That leads to asserts in multi-display configuration after gpu reset.
[How]
Adjust the indexing logic to align stream_status with surface_updates.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3 -3
@@ -3216,16 +3216,16 @@ static void dm_gpureset_commit_state(strfor (k =0 ; k < dc_state->stream_count; k++) { bundle->stream_update.stream = dc_state->streams[k]; -for (m =0 ; m < dc_state->stream_status->plane_count; m++) { +for (m =0 ; m < dc_state->stream_status[k].plane_count; m++) { bundle->surface_updates[m].surface = - dc_state->stream_status->plane_states[m]; + dc_state->stream_status[k].plane_states[m]; bundle->surface_updates[m].surface->force_full_update = true; }update_planes_and_stream_adapter (dm->dc,UPDATE_TYPE_FULL , - dc_state->stream_status->plane_count, + dc_state->stream_status[k].plane_count, dc_state->streams[k], &bundle->stream_update, bundle->surface_updates);
Greg Kroah-Hartman
maintainerPATCH 112/280 io_uring: fix sync handling of io_fallback_tw()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
commit edd43f4d6f50ec3de55a0c9e9df6348d1da51965 upstream.
A previous commit added a 'sync' parameter to io_fallback_tw(), which if true, means the caller wants to wait on the fallback thread handling it. But the logic is somewhat messed up, ensure that ctxs are swapped and flushed appropriately.
--- io_uring/io_uring.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-)
io_uring/io_uring.c +7 -6
@@ -1103,21 +1103,22 @@ static __cold void io_fallback_tw(structwhile (node) { req = container_of(node, struct io_kiocb, io_task_work.node); node = node->next; -if (sync && last_ctx != req->ctx) { +if (last_ctx != req->ctx) {if (last_ctx) { -flush_delayed_work (&last_ctx->fallback_work); +if (sync) +flush_delayed_work (&last_ctx->fallback_work);percpu_ref_put (&last_ctx->refs); } last_ctx = req->ctx;percpu_ref_get (&last_ctx->refs); } -if (llist_add (&req->io_task_work.node, - &req->ctx->fallback_llist)) -schedule_delayed_work (&req->ctx->fallback_work,1 ); +if (llist_add (&req->io_task_work.node, &last_ctx->fallback_llist)) +schedule_delayed_work (&last_ctx->fallback_work,1 ); }if (last_ctx) { -flush_delayed_work (&last_ctx->fallback_work); +if (sync) +flush_delayed_work (&last_ctx->fallback_work);percpu_ref_put (&last_ctx->refs); } }
Greg Kroah-Hartman
maintainerPATCH 113/280 KVM: SVM: Allocate IR data using atomic allocation
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Christopherson <[email protected]>
commit 7537deda36521fa8fff9133b39c46e31893606f2 upstream.
Allocate SVM's interrupt remapping metadata using GFP_ATOMIC as svm_ir_list_add() is called with IRQs are disabled and irqfs.lock held when kvm_irq_routing_update() reacts to GSI routing changes.
Message-ID: <[email protected]>
--- arch/x86/kvm/svm/avic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kvm/svm/avic.c +1 -1
@@ -820,7 +820,7 @@ static int svm_ir_list_add(struct vcpu_s* Allocating new amd_iommu_pi_data, which will get * add to the per-vcpu ir_list. */ - ir =kzalloc (sizeof (struct amd_svm_iommu_ir ),GFP_KERNEL_ACCOUNT ); + ir =kzalloc (sizeof (struct amd_svm_iommu_ir ),GFP_ATOMIC | __GFP_ACCOUNT);if (!ir) { ret = -ENOMEM ; goto out;
Greg Kroah-Hartman
maintainerPATCH 114/280 cxl/core/regs.c: Skip Memory Space Enable check for RCD and RCH Ports
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Smita Koralahalli <[email protected]>
commit 078d3ee7c162cd66d76171579c02d7890bd77daf upstream.
According to CXL r3.2 section 8.2.1.2, the PCI_COMMAND register fields, including Memory Space Enable bit, have no effect on the behavior of an RCD Upstream Port. Retaining this check may incorrectly cause cxl_pci_probe() to fail on a valid RCD upstream Port.
While the specification is explicit only for RCD Upstream Ports, this check is solely for accessing the RCRB, which is always mapped through memory space. Therefore, its safe to remove the check entirely. In practice, firmware reliably enables the Memory Space Enable bit for RCH Downstream Ports and no failures have been observed.
Removing the check simplifies the code and avoids unnecessary special-casing, while relying on BIOS/firmware to configure devices correctly. Moreover, any failures due to inaccessible RCRB regions will still be caught either in __rcrb_to_component() or while parsing the component register block.
The following failure was observed in dmesg when the check was present:
cxl_pci 0000:7f:00.0: No component registers (-6)
--- drivers/cxl/core/regs.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/cxl/core/regs.c +0 -4
@@ -513,7 +513,6 @@ resource_size_t __rcrb_to_component(struresource_size_t rcrb = ri->base;void __iomem *addr;u32 bar0, bar1; -u16 cmd;u32 id;if (which ==CXL_RCRB_UPSTREAM )
@@ -535,7 +534,6 @@ resource_size_t __rcrb_to_component(stru } id =readl (addr +PCI_VENDOR_ID ); - cmd =readw (addr +PCI_COMMAND ); bar0 =readl (addr +PCI_BASE_ADDRESS_0 ); bar1 =readl (addr +PCI_BASE_ADDRESS_1 );iounmap (addr);
@@ -550,8 +548,6 @@ resource_size_t __rcrb_to_component(strudev_err (dev,"Failed to access Downstream Port RCRB\n" );return CXL_RESOURCE_NONE ; } -if (!(cmd &PCI_COMMAND_MEMORY )) -return CXL_RESOURCE_NONE ;/* The RCRB is a Memory Window, and the MEM_TYPE_1M bit is obsolete */ if (bar0 & (PCI_BASE_ADDRESS_MEM_TYPE_1M |PCI_BASE_ADDRESS_SPACE_IO ))return CXL_RESOURCE_NONE ;
Greg Kroah-Hartman
maintainerPATCH 115/280 mcb: fix a double free bug in chameleon_parse_gdd()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haoxiang Li <[email protected]>
commit 7c7f1bfdb2249f854a736d9b79778c7e5a29a150 upstream.
In chameleon_parse_gdd(), if mcb_device_register() fails, 'mdev' would be released in mcb_device_register() via put_device(). Thus, goto 'err' label and free 'mdev' again causes a double free. Just return if mcb_device_register() fails.
--- drivers/mcb/mcb-parse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mcb/mcb-parse.c +1 -1
@@ -96,7 +96,7 @@ static int chameleon_parse_gdd(struct mc ret =mcb_device_register (bus, mdev);if (ret <0 ) - goto err; +return ret;return 0 ;
Greg Kroah-Hartman
maintainerPATCH 116/280 ata: libata-scsi: Improve CDL control
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damien Le Moal <[email protected]>
commit 17e897a456752ec9c2d7afb3d9baf268b442451b upstream.
With ATA devices supporting the CDL feature, using CDL requires that the feature be enabled with a SET FEATURES command. This command is issued as the translated command for the MODE SELECT command issued by scsi_cdl_enable() when the user enables CDL through the device cdl_enable sysfs attribute.
Currently, ata_mselect_control_ata_feature() always translates a MODE SELECT command for the ATA features subpage of the control mode page to a SET FEATURES command to enable or disable CDL based on the cdl_ctrl field. However, there is no need to issue the SET FEATURES command if:
1) The MODE SELECT command requests disabling CDL and CDL is already disabled.
2) The MODE SELECT command requests enabling CDL and CDL is already enabled.
Fix ata_mselect_control_ata_feature() to issue the SET FEATURES command only when necessary. Since enabling CDL also implies a reset of the CDL statistics log page, avoiding useless CDL enable operations also avoids clearing the CDL statistics log.
Also add debug messages to clearly signal when CDL is being enabled or disabled using a SET FEATURES command.
--- drivers/ata/libata-scsi.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/ata/libata-scsi.c +12 -2
@@ -3757,17 +3757,27 @@ static unsigned int ata_mselect_control_/* Check cdl_ctrl */ switch (buf[0 ] &0x03 ) {case 0 : -/* Disable CDL */ +/* Disable CDL if it is enabled */ +if (!(dev->flags &ATA_DFLAG_CDL_ENABLED )) +return 0 ; +ata_dev_dbg (dev,"Disabling CDL\n" ); cdl_action =0 ; dev->flags &= ~ATA_DFLAG_CDL_ENABLED ;break ;case 0x02 : -/* Enable CDL T2A/T2B: NCQ priority must be disabled */ +/* +* Enable CDL if not already enabled. Since this is mutually +* exclusive with NCQ priority, allow this only if NCQ priority +* is disabled. +*/ +if (dev->flags &ATA_DFLAG_CDL_ENABLED ) +return 0 ;if (dev->flags &ATA_DFLAG_NCQ_PRIO_ENABLED ) {ata_dev_err (dev,"NCQ priority must be disabled to enable CDL\n" );return -EINVAL ; } +ata_dev_dbg (dev,"Enabling CDL\n" ); cdl_action =1 ; dev->flags |=ATA_DFLAG_CDL_ENABLED ;break ;
Greg Kroah-Hartman
maintainerPATCH 117/280 ata: libata-scsi: Fix ata_mselect_control_ata_feature() return type
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damien Le Moal <[email protected]>
commit db91586b1e8f36122a9e5b8fbced11741488dd22 upstream.
The function ata_mselect_control_ata_feature() has a return type defined as unsigned int but this function may return negative error codes, which are correctly propagated up the call chain as integers.
Fix ata_mselect_control_ata_feature() to have the correct int return type.
While at it, also fix a typo in this function description comment.
--- drivers/ata/libata-scsi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/ata/libata-scsi.c +3 -4
@@ -3734,12 +3734,11 @@ static int ata_mselect_control_spg0(stru }/* -* Translate MODE SELECT control mode page, sub-pages f2h (ATA feature mode +* Translate MODE SELECT control mode page, sub-page f2h (ATA feature mode * page) into a SET FEATURES command. */ -static unsigned int ata_mselect_control_ata_feature (struct ata_queued_cmd *qc, -const u8 *buf,int len, -u16 *fp) +static int ata_mselect_control_ata_feature (struct ata_queued_cmd *qc, +const u8 *buf,int len,u16 *fp) {struct ata_device *dev = qc->dev;struct ata_taskfile *tf = &qc->tf;
Greg Kroah-Hartman
maintainerPATCH 118/280 ata: libata-scsi: Fix ata_msense_control_ata_feature()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damien Le Moal <[email protected]>
commit 88474ad734fb2000805c63e01cc53ea930adf2c7 upstream.
For the ATA features subpage of the control mode page, the T10 SAT-6 specifications state that:
For a MODE SENSE command, the SATL shall return the CDL_CTRL field value that was last set by an application client.
However, the function ata_msense_control_ata_feature() always sets the CDL_CTRL field to the 0x02 value to indicate support for the CDL T2A and T2B pages. This is thus incorrect and the value 0x02 must be reported only after the user enables the CDL feature, which is indicated with the ATA_DFLAG_CDL_ENABLED device flag. When this flag is not set, the CDL_CTRL field of the ATA feature subpage of the control mode page must report a value of 0x00.
Fix ata_msense_control_ata_feature() to report the correct values for the CDL_CTRL field, according to the enable/disable state of the device CDL feature.
--- drivers/ata/libata-scsi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/ata/libata-scsi.c +2 -2
@@ -2325,8 +2325,8 @@ static unsigned int ata_msense_control_a*/ put_unaligned_be16 (ATA_FEATURE_SUB_MPAGE_LEN -4 , &buf[2 ]); -if (dev->flags &ATA_DFLAG_CDL ) - buf[4 ] =0x02 ;/* Support T2A and T2B pages */ +if (dev->flags &ATA_DFLAG_CDL_ENABLED ) + buf[4 ] =0x02 ;/* T2A and T2B pages enabled */ else buf[4 ] =0 ;
Greg Kroah-Hartman
maintainerPATCH 119/280 USB: storage: quirk for ADATA Portable HDD CH94
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Oliver Neukum <[email protected]>
commit 9ab75eee1a056f896b87d139044dd103adc532b9 upstream.
Version 1.60 specifically needs this quirk.
Version 2.00 is known good.
--- drivers/usb/storage/unusual_uas.h | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/usb/storage/unusual_uas.h +7 -0
@@ -83,6 +83,13 @@ UNUSUAL_DEV(0x0bc2, 0x331a, 0x0000, 0x99 USB_SC_DEVICE, USB_PR_DEVICE, NULL, US_FL_NO_REPORT_LUNS), +/* Reported-by: Oliver Neukum <[email protected]> */ +UNUSUAL_DEV (0x125f ,0xa94a ,0x0160 ,0x0160 , +"ADATA" , +"Portable HDD CH94" , +USB_SC_DEVICE ,USB_PR_DEVICE ,NULL , +US_FL_NO_ATA_1X ), +/* Reported-by: Benjamin Tissoires <[email protected]> */ UNUSUAL_DEV(0x13fd, 0x3940, 0x0000, 0x9999, "Initio Corporation",
Greg Kroah-Hartman
maintainerPATCH 120/280 scsi: Improve CDL control
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Damien Le Moal <[email protected]>
commit 14a3cc755825ef7b34c986aa2786ea815023e9c5 upstream.
With ATA devices supporting the CDL feature, using CDL requires that the feature be enabled with a SET FEATURES command. This command is issued as the translated command for the MODE SELECT command issued by scsi_cdl_enable() when the user enables CDL through the device cdl_enable sysfs attribute.
However, the implementation of scsi_cdl_enable() always issues a MODE SELECT command for ATA devices when the enable argument is true, even if CDL is already enabled on the device. While this does not cause any issue with using CDL descriptors with read/write commands (the CDL feature will be enabled on the drive), issuing the MODE SELECT command even when the device CDL feature is already enabled will cause a reset of the ATA device CDL statistics log page (as defined in ACS, any CDL enable action must reset the device statistics).
Avoid this needless actions (and the implied statistics log page reset) by modifying scsi_cdl_enable() to issue the MODE SELECT command to enable CDL if and only if CDL is not reported as already enabled on the device.
And while at it, simplify the initialization of the is_ata boolean variable and move the declaration of the scsi mode data and sense header variables to within the scope of ATA device handling.
--- drivers/scsi/scsi.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-)
drivers/scsi/scsi.c +24 -12
@@ -695,26 +695,23 @@ void scsi_cdl_check(struct scsi_device **/ int scsi_cdl_enable (struct scsi_device *sdev,bool enable) { -struct scsi_mode_data data; -struct scsi_sense_hdr sshdr; -struct scsi_vpd *vpd; -bool is_ata = false;char buf[64 ]; +bool is_ata;int ret;if (!sdev->cdl_supported)return -EOPNOTSUPP ;rcu_read_lock (); - vpd =rcu_dereference (sdev->vpd_pg89); -if (vpd) - is_ata = true; + is_ata =rcu_dereference (sdev->vpd_pg89);rcu_read_unlock ();/* * For ATA devices, CDL needs to be enabled with a SET FEATURES command. */ if (is_ata) { +struct scsi_mode_data data; +struct scsi_sense_hdr sshdr;char *buf_data;int len;
@@ -723,16 +720,30 @@ int scsi_cdl_enable(struct scsi_device *if (ret)return -EINVAL ; -/* Enable CDL using the ATA feature page */ +/* Enable or disable CDL using the ATA feature page */ len =min_t (size_t,sizeof (buf), data.length - data.header_length - data.block_descriptor_length); buf_data = buf + data.header_length + data.block_descriptor_length; -if (enable) - buf_data[4 ] =0x02 ; -else - buf_data[4 ] =0 ; + +/* +* If we want to enable CDL and CDL is already enabled on the +* device, do nothing. This avoids needlessly resetting the CDL +* statistics on the device as that is implied by the CDL enable +* action. Similar to this, there is no need to do anything if +* we want to disable CDL and CDL is already disabled. +*/ +if (enable) { +if ((buf_data[4 ] &0x03 ) ==0x02 ) + goto out; + buf_data[4 ] &= ~0x03 ; + buf_data[4 ] |=0x02 ; + }else { +if ((buf_data[4 ] &0x03 ) ==0x00 ) + goto out; + buf_data[4 ] &= ~0x03 ; + } ret =scsi_mode_select (sdev,1 ,0 , buf_data, len,5 *HZ ,3 , &data, &sshdr);
@@ -744,6 +755,7 @@ int scsi_cdl_enable(struct scsi_device * } } +out: sdev->cdl_enable = enable;return 0 ;
Greg Kroah-Hartman
maintainerPATCH 121/280 mei: me: add panther lake H DID
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexander Usyskin <[email protected]>
commit 86ce5c0a1dec02e21b4c864b2bc0cc5880a2c13c upstream.
Add Panther Lake H device id.
--- drivers/misc/mei/hw-me-regs.h | 1 + drivers/misc/mei/pci-me.c | 1 + 2 files changed, 2 insertions(+)
drivers/misc/mei/hw-me-regs.h +1 -0
@@ -117,6 +117,7 @@#define MEI_DEV_ID_LNL_M 0xA870/* Lunar Lake Point M */ +#define MEI_DEV_ID_PTL_H 0xE370/* Panther Lake H */ #define MEI_DEV_ID_PTL_P 0xE470/* Panther Lake P */ /*
drivers/misc/mei/pci-me.c +1 -0
@@ -124,6 +124,7 @@ static const struct pci_device_id mei_me {MEI_PCI_DEVICE(MEI_DEV_ID_LNL_M, MEI_ME_PCH15_CFG)}, + {MEI_PCI_DEVICE(MEI_DEV_ID_PTL_H, MEI_ME_PCH15_CFG)}, {MEI_PCI_DEVICE(MEI_DEV_ID_PTL_P, MEI_ME_PCH15_CFG)},/* required last entry */
Greg Kroah-Hartman
maintainerPATCH 104/280 drm/amd/display: Force full update in gpu reset
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Roman Li <[email protected]>
commit 67fe574651c73fe5cc176e35f28f2ec1ba498d14 upstream.
[Why]
While system undergoing gpu reset always do full update to sync the dc state before and after reset.
[How]
Return true in should_reset_plane() if gpu reset detected
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +3 -0
@@ -10775,6 +10775,9 @@ static bool should_reset_plane(struct dr state->allow_modeset)return true; +if (amdgpu_in_reset (adev) && state->allow_modeset) +return true; +/* Exit early if we know that we're adding or removing the plane. */ if (old_plane_state->crtc != new_plane_state->crtc)return true;