scsi: target: iscsi: Fix timeout on deleted connection
Subsystems (4)
Sasha Levin
maintainerPATCH 1/3 scsi: target: iscsi: Fix timeout on deleted connection
From: Dmitry Bogdanov <[email protected]>
[ Upstream commit 7f533cc5ee4c4436cee51dc58e81dfd9c3384418 ]
NOPIN response timer may expire on a deleted connection and crash with such logs:
Did not receive response to NOPIN on CID: 0, failing connection for I_T Nexus (null),i,0x00023d000125,iqn.2017-01.com.iscsi.target,t,0x3d
BUG: Kernel NULL pointer dereference on read at 0x00000000 NIP strlcpy+0x8/0xb0 LR iscsit_fill_cxn_timeout_err_stats+0x5c/0xc0 [iscsi_target_mod] Call Trace: iscsit_handle_nopin_response_timeout+0xfc/0x120 [iscsi_target_mod] call_timer_fn+0x58/0x1f0 run_timer_softirq+0x740/0x860 __do_softirq+0x16c/0x420 irq_exit+0x188/0x1c0 timer_interrupt+0x184/0x410
That is because nopin response timer may be re-started on nopin timer expiration.
Stop nopin timer before stopping the nopin response timer to be sure that no one of them will be re-started.
--- drivers/target/iscsi/iscsi_target.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/target/iscsi/iscsi_target.c +1 -1
@@ -4168,8 +4168,8 @@ int iscsit_close_connection(spin_unlock (&iscsit_global->ts_bitmap_lock);iscsit_stop_timers_for_cmds (conn); -iscsit_stop_nopin_response_timer (conn);iscsit_stop_nopin_timer (conn); +iscsit_stop_nopin_response_timer (conn);if (conn->conn_transport->iscsit_wait_conn) conn->conn_transport->iscsit_wait_conn (conn);
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 2/3 dma-mapping: avoid potential unused data compilation warning
From: Marek Szyprowski <[email protected]>
[ Upstream commit c9b19ea63036fc537a69265acea1b18dabd1cbd3 ]
When CONFIG_NEED_DMA_MAP_STATE is not defined, dma-mapping clients might report unused data compilation warnings for dma_unmap_*() calls arguments. Redefine macros for those calls to let compiler to notice that it is okay when the provided arguments are not used.
--- include/linux/dma-mapping.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-)
include/linux/dma-mapping.h +8 -4
@@ -895,10 +895,14 @@ static inline int dma_mmap_wc(struct device *dev,#else #define DEFINE_DMA_UNMAP_ADDR (ADDR_NAME )#define DEFINE_DMA_UNMAP_LEN (LEN_NAME ) -#define dma_unmap_addr (PTR ,ADDR_NAME ) (0) -#define dma_unmap_addr_set (PTR ,ADDR_NAME ,VAL ) do { } while (0) -#define dma_unmap_len (PTR ,LEN_NAME ) (0) -#define dma_unmap_len_set (PTR ,LEN_NAME ,VAL ) do { } while (0) +#define dma_unmap_addr (PTR ,ADDR_NAME ) \ + ({ typeof(PTR) __p __maybe_unused = PTR; 0; }) +#define dma_unmap_addr_set (PTR ,ADDR_NAME ,VAL ) \ + do { typeof(PTR) __p __maybe_unused = PTR; } while (0) +#define dma_unmap_len (PTR ,LEN_NAME ) \ + ({ typeof(PTR) __p __maybe_unused = PTR; 0; }) +#define dma_unmap_len_set (PTR ,LEN_NAME ,VAL ) \ + do { typeof(PTR) __p __maybe_unused = PTR; } while (0)#endif #endif
Signature · 1 line
2.39.5
Sasha Levin
maintainerPATCH 3/3 cgroup: Fix compilation issue due to cgroup_mutex not being exported
In reply to Sasha LevinFrom: gaoxu <[email protected]>
[ Upstream commit 87c259a7a359e73e6c52c68fcbec79988999b4e6 ]
When adding folio_memcg function call in the zram module for Android16-6.12, the following error occurs during compilation:
ERROR: modpost: "cgroup_mutex" [../soc-repo/zram.ko] undefined!
This error is caused by the indirect call to lockdep_is_held(&cgroup_mutex) within folio_memcg. The export setting for cgroup_mutex is controlled by the CONFIG_PROVE_RCU macro. If CONFIG_LOCKDEP is enabled while CONFIG_PROVE_RCU is not, this compilation error will occur.
To resolve this issue, add a parallel macro CONFIG_LOCKDEP control to ensure cgroup_mutex is properly exported when needed.
--- kernel/cgroup/cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
kernel/cgroup/cgroup.c +1 -1
@@ -81,7 +81,7 @@DEFINE_MUTEX (cgroup_mutex);DEFINE_SPINLOCK (css_set_lock); -#ifdef CONFIG_PROVE_RCU +#if (definedCONFIG_PROVE_RCU || definedCONFIG_LOCKDEP )EXPORT_SYMBOL_GPL (cgroup_mutex);EXPORT_SYMBOL_GPL (css_set_lock);#endif
Signature · 1 line
2.39.5