6.12.35-rc1 review
Subsystems (5)
Greg Kroah-Hartman
maintainerPATCH 303/414 LoongArch: Fix panic caused by NULL-PMD in huge_pte_offset()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tianyang Zhang <[email protected]>
commit ee084fa96123ede8b0563a1b5a9b23adc43cd50d upstream.
ERROR INFO:
CPU 25 Unable to handle kernel paging request at virtual address 0x0
... Call Trace: [<900000000023c30c>] huge_pte_offset+0x3c/0x58 [<900000000057fd4c>] hugetlb_follow_page_mask+0x74/0x438 [<900000000051fee8>] __get_user_pages+0xe0/0x4c8 [<9000000000522414>] faultin_page_range+0x84/0x380 [<9000000000564e8c>] madvise_vma_behavior+0x534/0xa48 [<900000000056689c>] do_madvise+0x1bc/0x3e8 [<9000000000566df4>] sys_madvise+0x24/0x38 [<90000000015b9e88>] do_syscall+0x78/0x98 [<9000000000221f18>] handle_syscall+0xb8/0x158
In some cases, pmd may be NULL and rely on NULL as the return value for processing, so it is necessary to determine this situation here.
--- arch/loongarch/mm/hugetlbpage.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/loongarch/mm/hugetlbpage.c +2 -1
@@ -47,7 +47,8 @@ pte_t *huge_pte_offset(struct mm_struct pmd =pmd_offset (pud, addr); } } -return pmd_none (pmdp_get (pmd)) ?NULL : (pte_t *) pmd; + +return (!pmd ||pmd_none (pmdp_get (pmd))) ?NULL : (pte_t *) pmd; }uint64_t pmd_to_entrylo (unsigned long pmd_val)
Greg Kroah-Hartman
maintainerPATCH 304/414 jffs2: check that raw node were preallocated before writing summary
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Artem Sadovnikov <[email protected]>
commit ec9e6f22bce433b260ea226de127ec68042849b0 upstream.
Syzkaller detected a kernel bug in jffs2_link_node_ref, caused by fault injection in jffs2_prealloc_raw_node_refs. jffs2_sum_write_sumnode doesn't check return value of jffs2_prealloc_raw_node_refs and simply lets any error propagate into jffs2_sum_write_data, which eventually calls jffs2_link_node_ref in order to link the summary to an expectedly allocated node.
kernel BUG at fs/jffs2/nodelist.c:592!
invalid opcode: 0000 [#1] PREEMPT SMP KASAN NOPTI
CPU: 1 PID: 31277 Comm: syz-executor.7 Not tainted 6.1.128-syzkaller-00139-ge10f83ca10a1 #0 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.12.0-1 04/01/2014 RIP: 0010:jffs2_link_node_ref+0x570/0x690 fs/jffs2/nodelist.c:592 Call Trace: <TASK> jffs2_sum_write_data fs/jffs2/summary.c:841 [inline] jffs2_sum_write_sumnode+0xd1a/0x1da0 fs/jffs2/summary.c:874 jffs2_do_reserve_space+0xa18/0xd60 fs/jffs2/nodemgmt.c:388 jffs2_reserve_space+0x55f/0xaa0 fs/jffs2/nodemgmt.c:197 jffs2_write_inode_range+0x246/0xb50 fs/jffs2/write.c:362 jffs2_write_end+0x726/0x15d0 fs/jffs2/file.c:301 generic_perform_write+0x314/0x5d0 mm/filemap.c:3856 __generic_file_write_iter+0x2ae/0x4d0 mm/filemap.c:3973 generic_file_write_iter+0xe3/0x350 mm/filemap.c:4005 call_write_iter include/linux/fs.h:2265 [inline] do_iter_readv_writev+0x20f/0x3c0 fs/read_write.c:735 do_iter_write+0x186/0x710 fs/read_write.c:861 vfs_iter_write+0x70/0xa0 fs/read_write.c:902 iter_file_splice_write+0x73b/0xc90 fs/splice.c:685 do_splice_from fs/splice.c:763 [inline] direct_splice_actor+0x10c/0x170 fs/splice.c:950 splice_direct_to_actor+0x337/0xa10 fs/splice.c:896 do_splice_direct+0x1a9/0x280 fs/splice.c:1002 do_sendfile+0xb13/0x12c0 fs/read_write.c:1255 __do_sys_sendfile64 fs/read_write.c:1323 [inline] __se_sys_sendfile64 fs/read_write.c:1309 [inline] __x64_sys_sendfile64+0x1cf/0x210 fs/read_write.c:1309 do_syscall_x64 arch/x86/entry/common.c:51 [inline] do_syscall_64+0x35/0x80 arch/x86/entry/common.c:81 entry_SYSCALL_64_after_hwframe+0x6e/0xd8
Fix this issue by checking return value of jffs2_prealloc_raw_node_refs before calling jffs2_sum_write_data.
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
--- fs/jffs2/summary.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
fs/jffs2/summary.c +6 -1
@@ -858,7 +858,10 @@ int jffs2_sum_write_sumnode(struct jffs2spin_unlock (&c->erase_completion_lock); jeb = c->nextblock; -jffs2_prealloc_raw_node_refs (c, jeb,1 ); + ret =jffs2_prealloc_raw_node_refs (c, jeb,1 ); + +if (ret) + goto out;if (!c->summary->sum_num || !c->summary->sum_list_head) {JFFS2_WARNING ("Empty summary info!!!\n" );
@@ -872,6 +875,8 @@ int jffs2_sum_write_sumnode(struct jffs2 datasize += padsize; ret =jffs2_sum_write_data (c, jeb, infosize, datasize, padsize); + +out:spin_lock (&c->erase_completion_lock);return ret; }
Greg Kroah-Hartman
maintainerPATCH 305/414 jffs2: check jffs2_prealloc_raw_node_refs() result in few other places
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Fedor Pchelkin <[email protected]>
commit 2b6d96503255a3ed676cd70f8368870c6d6a25c6 upstream.
Fuzzing hit another invalid pointer dereference due to the lack of checking whether jffs2_prealloc_raw_node_refs() completed successfully. Subsequent logic implies that the node refs have been allocated.
Handle that. The code is ready for propagating the error upwards.
KASAN: null-ptr-deref in range [0x0000000000000008-0x000000000000000f] CPU: 1 PID: 5835 Comm: syz-executor145 Not tainted 5.10.234-syzkaller #0 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.12.0-1 04/01/2014 RIP: 0010:jffs2_link_node_ref+0xac/0x690 fs/jffs2/nodelist.c:600 Call Trace: jffs2_mark_erased_block fs/jffs2/erase.c:460 [inline] jffs2_erase_pending_blocks+0x688/0x1860 fs/jffs2/erase.c:118 jffs2_garbage_collect_pass+0x638/0x1a00 fs/jffs2/gc.c:253 jffs2_reserve_space+0x3f4/0xad0 fs/jffs2/nodemgmt.c:167 jffs2_write_inode_range+0x246/0xb50 fs/jffs2/write.c:362 jffs2_write_end+0x712/0x1110 fs/jffs2/file.c:302 generic_perform_write+0x2c2/0x500 mm/filemap.c:3347 __generic_file_write_iter+0x252/0x610 mm/filemap.c:3465 generic_file_write_iter+0xdb/0x230 mm/filemap.c:3497 call_write_iter include/linux/fs.h:2039 [inline] do_iter_readv_writev+0x46d/0x750 fs/read_write.c:740 do_iter_write+0x18c/0x710 fs/read_write.c:866 vfs_writev+0x1db/0x6a0 fs/read_write.c:939 do_pwritev fs/read_write.c:1036 [inline] __do_sys_pwritev fs/read_write.c:1083 [inline] __se_sys_pwritev fs/read_write.c:1078 [inline] __x64_sys_pwritev+0x235/0x310 fs/read_write.c:1078 do_syscall_64+0x30/0x40 arch/x86/entry/common.c:46 entry_SYSCALL_64_after_hwframe+0x67/0xd1
Found by Linux Verification Center (linuxtesting.org) with Syzkaller.
--- fs/jffs2/erase.c | 4 +++- fs/jffs2/scan.c | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-)
fs/jffs2/erase.c +3 -1
@@ -425,7 +425,9 @@ static void jffs2_mark_erased_block(stru .totlen = cpu_to_je32(c->cleanmarker_size) }; -jffs2_prealloc_raw_node_refs (c, jeb,1 ); + ret =jffs2_prealloc_raw_node_refs (c, jeb,1 ); +if (ret) + goto filebad; marker.hdr_crc =cpu_to_je32 (crc32 (0 , &marker,sizeof (struct jffs2_unknown_node )-4 ));
fs/jffs2/scan.c +3 -1
@@ -256,7 +256,9 @@ int jffs2_scan_medium(struct jffs2_sb_injffs2_dbg (1 ,"%s(): Skipping %d bytes in nextblock to ensure page alignment\n" , __func__, skip); -jffs2_prealloc_raw_node_refs (c, c->nextblock,1 ); + ret =jffs2_prealloc_raw_node_refs (c, c->nextblock,1 ); +if (ret) + goto out; jffs2_scan_dirty_space(c, c->nextblock, skip); }#endif
Greg Kroah-Hartman
maintainerPATCH 306/414 cifs: deal with the channel loading lag while picking channels
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shyam Prasad N <[email protected]>
commit 66d590b828b1fd9fa337047ae58fe1c4c6f43609 upstream.
Our current approach to select a channel for sending requests is this:
1. iterate all channels to find the min and max queue depth
2. if min and max are not the same, pick the channel with min depth
3. if min and max are same, round robin, as all channels are equally loaded
The problem with this approach is that there's a lag between selecting a channel and sending the request (that increases the queue depth on the channel). While these numbers will eventually catch up, there could be a skew in the channel usage, depending on the application's I/O parallelism and the server's speed of handling requests.
With sufficient parallelism, this lag can artificially increase the queue depth, thereby impacting the performance negatively.
This change will change the step 1 above to start the iteration from the last selected channel. This is to reduce the skew in channel usage even in the presence of this lag.
--- fs/smb/client/transport.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
fs/smb/client/transport.c +7 -7
@@ -1029,14 +1029,16 @@ struct TCP_Server_Info *cifs_pick_channeuint index =0 ;unsigned int min_in_flight =UINT_MAX , max_in_flight =0 ;struct TCP_Server_Info *server =NULL ; -int i; +int i, start, cur;if (!ses)return NULL ;spin_lock (&ses->chan_lock); + start =atomic_inc_return (&ses->chan_seq);for (i =0 ; i < ses->chan_count; i++) { - server = ses->chans[i].server; + cur = (start + i) % ses->chan_count; + server = ses->chans[cur].server;if (!server || server->terminate)continue ;
@@ -1053,17 +1055,15 @@ struct TCP_Server_Info *cifs_pick_channe*/ if (server->in_flight < min_in_flight) { min_in_flight = server->in_flight; - index = i; + index = cur; }if (server->in_flight > max_in_flight) max_in_flight = server->in_flight; }/* if all channels are equally loaded, fall back to round-robin */ -if (min_in_flight == max_in_flight) { - index = (uint )atomic_inc_return (&ses->chan_seq); - index %= ses->chan_count; - } +if (min_in_flight == max_in_flight) + index = (uint )start % ses->chan_count; server = ses->chans[index].server;spin_unlock (&ses->chan_lock);
Greg Kroah-Hartman
maintainerPATCH 307/414 cifs: serialize other channels when query server interfaces is pending
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shyam Prasad N <[email protected]>
commit b5e3e6e28cf3853566ba5d816f79aba5be579158 upstream.
Today, during smb2_reconnect, session_mutex is released as soon as the tcon is reconnected and is in a good state. However, in case multichannel is enabled, there is also a query of server interfaces that follows. We've seen that this query can race with reconnects of other channels, causing them to step on each other with reconnects.
This change extends the hold of session_mutex till after the query of server interfaces is complete. In order to avoid recursive smb2_reconnect checks during query ioctl, this change also introduces a session flag for sessions where such a query is in progress.
--- fs/smb/client/cifsglob.h | 1 + fs/smb/client/smb2pdu.c | 24 ++++++++++++++++++------ 2 files changed, 19 insertions(+), 6 deletions(-)
fs/smb/client/cifsglob.h +1 -0
@@ -1058,6 +1058,7 @@ struct cifs_chan { };#define CIFS_SES_FLAG_SCALE_CHANNELS (0x1) +#define CIFS_SES_FLAGS_PENDING_QUERY_INTERFACES (0x2)/* * Session structure. One of these for each uid session with a particular host
fs/smb/client/smb2pdu.c +18 -6
@@ -428,14 +428,19 @@ skip_sess_setup:if (!rc && (server->capabilities &SMB2_GLOBAL_CAP_MULTI_CHANNEL ) && server->ops->query_server_interfaces) { -mutex_unlock (&ses->session_mutex); -/* -* query server network interfaces, in case they change +* query server network interfaces, in case they change. +* Also mark the session as pending this update while the query +* is in progress. This will be used to avoid calling +* smb2_reconnect recursively. */ + ses->flags |=CIFS_SES_FLAGS_PENDING_QUERY_INTERFACES ; xid =get_xid (); rc = server->ops->query_server_interfaces (xid, tcon, false);free_xid (xid); + ses->flags &= ~CIFS_SES_FLAGS_PENDING_QUERY_INTERFACES ; + +mutex_unlock (&ses->session_mutex);if (rc == -EOPNOTSUPP && ses->chan_count >1 ) {/*
@@ -577,11 +582,18 @@ static int smb2_ioctl_req_init(u32 opcod struct TCP_Server_Info *server, void **request_buf, unsigned int *total_len) { - /* Skip reconnect only for FSCTL_VALIDATE_NEGOTIATE_INFO IOCTLs */ - if (opcode == FSCTL_VALIDATE_NEGOTIATE_INFO) { +/* +* Skip reconnect in one of the following cases: +* 1. For FSCTL_VALIDATE_NEGOTIATE_INFO IOCTLs +* 2. For FSCTL_QUERY_NETWORK_INTERFACE_INFO IOCTL when called from +* smb2_reconnect (indicated by CIFS_SES_FLAG_SCALE_CHANNELS ses flag) +*/ +if (opcode ==FSCTL_VALIDATE_NEGOTIATE_INFO || + (opcode ==FSCTL_QUERY_NETWORK_INTERFACE_INFO && + (tcon->ses->flags &CIFS_SES_FLAGS_PENDING_QUERY_INTERFACES )))return __smb2_plain_req_init (SMB2_IOCTL , tcon, server, request_buf, total_len); - } +return smb2_plain_req_init (SMB2_IOCTL , tcon, server, request_buf, total_len); }
Greg Kroah-Hartman
maintainerPATCH 308/414 cifs: do not disable interface polling on failure
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shyam Prasad N <[email protected]>
commit 42ca547b13a20e7cbb04fbdf8d5f089ac4bb35b7 upstream.
When a server has multichannel enabled, we keep polling the server for interfaces periodically. However, when this query fails, we disable the polling. This can be problematic as it takes away the chance for the server to start advertizing again.
This change reschedules the delayed work, even if the current call failed. That way, multichannel sessions can recover.
--- fs/smb/client/connect.c | 6 +----- fs/smb/client/smb2pdu.c | 9 +++++---- 2 files changed, 6 insertions(+), 9 deletions(-)
fs/smb/client/connect.c +1 -5
@@ -132,13 +132,9 @@ static void smb2_query_server_interfaces rc = server->ops->query_server_interfaces (xid, tcon, false);free_xid (xid); -if (rc) { -if (rc == -EOPNOTSUPP ) -return ; - +if (rc)cifs_dbg (FYI ,"%s: failed to query server interfaces: %d\n" , __func__, rc); - }queue_delayed_work (cifsiod_wq, &tcon->query_interfaces, (SMB_INTERFACE_POLL_INTERVAL *HZ ));
fs/smb/client/smb2pdu.c +5 -4
@@ -440,6 +440,10 @@ skip_sess_setup:free_xid (xid); ses->flags &= ~CIFS_SES_FLAGS_PENDING_QUERY_INTERFACES ; +/* regardless of rc value, setup polling */ +queue_delayed_work (cifsiod_wq, &tcon->query_interfaces, + (SMB_INTERFACE_POLL_INTERVAL *HZ )); +mutex_unlock (&ses->session_mutex);if (rc == -EOPNOTSUPP && ses->chan_count >1 ) {
@@ -460,11 +464,8 @@ skip_sess_setup:if (ses->chan_max > ses->chan_count && ses->iface_count && !SERVER_IS_CHAN (server)) { -if (ses->chan_count ==1 ) { +if (ses->chan_count ==1 )cifs_server_dbg (VFS ,"supports multichannel now\n" ); -queue_delayed_work (cifsiod_wq, &tcon->query_interfaces, - (SMB_INTERFACE_POLL_INTERVAL *HZ )); - }cifs_try_adding_channels (ses); }
Greg Kroah-Hartman
maintainerPATCH 309/414 smb: improve directory cache reuse for readdir operations
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bharath SM <[email protected]>
commit 72dd7961a4bb4fa1fc456169a61dd12e68e50645 upstream.
Currently, cached directory contents were not reused across subsequent 'ls' operations because the cache validity check relied on comparing the ctx pointer, which changes with each readdir invocation. As a result, the cached dir entries was not marked as valid and the cache was not utilized for subsequent 'ls' operations.
This change uses the file pointer, which remains consistent across all readdir calls for a given directory instance, to associate and validate the cache. As a result, cached directory contents can now be correctly reused, improving performance for repeated directory listings.
Performance gains with local windows SMB server:
Without the patch and default actimeo=1:
1000 directory enumeration operations on dir with 10k files took 135.0s
With this patch and actimeo=0:
1000 directory enumeration operations on dir with 10k files took just 5.1s
--- fs/smb/client/cached_dir.h | 8 ++++---- fs/smb/client/readdir.c | 28 +++++++++++++++------------- 2 files changed, 19 insertions(+), 17 deletions(-)
fs/smb/client/cached_dir.h +4 -4
@@ -21,10 +21,10 @@ struct cached_dirent {struct cached_dirents {bool is_valid:1 ;bool is_failed:1 ; -struct dir_context *ctx;/* -* Only used to make sure we only take entries -* from a single context. Never dereferenced. -*/ +struct file *file;/* +* Used to associate the cache with a single +* open file instance. +*/ struct mutex de_mutex;int pos;/* Expected ctx->pos */ struct list_head entries;
fs/smb/client/readdir.c +15 -13
@@ -850,9 +850,9 @@ static bool emit_cached_dirents(struct c }static void update_cached_dirents_count (struct cached_dirents *cde, -struct dir_context *ctx) +struct file *file) { -if (cde->ctx != ctx) +if (cde->file != file)return ;if (cde->is_valid || cde->is_failed)return ;
@@ -861,9 +861,9 @@ static void update_cached_dirents_count( }static void finished_cached_dirents_count (struct cached_dirents *cde, -struct dir_context *ctx) +struct dir_context *ctx,struct file *file) { -if (cde->ctx != ctx) +if (cde->file != file)return ;if (cde->is_valid || cde->is_failed)return ;
@@ -876,11 +876,12 @@ static void finished_cached_dirents_counstatic void add_cached_dirent (struct cached_dirents *cde,struct dir_context *ctx,const char *name,int namelen, -struct cifs_fattr *fattr) +struct cifs_fattr *fattr, +struct file *file) {struct cached_dirent *de; -if (cde->ctx != ctx) +if (cde->file != file)return ;if (cde->is_valid || cde->is_failed)return ;
@@ -910,7 +911,8 @@ static void add_cached_dirent(struct cacstatic bool cifs_dir_emit (struct dir_context *ctx,const char *name,int namelen,struct cifs_fattr *fattr, -struct cached_fid *cfid) +struct cached_fid *cfid, +struct file *file) {bool rc;ino_t ino =cifs_uniqueid_to_ino_t (fattr->cf_uniqueid);
@@ -922,7 +924,7 @@ static bool cifs_dir_emit(struct dir_conif (cfid) {mutex_lock (&cfid->dirents.de_mutex);add_cached_dirent (&cfid->dirents, ctx, name, namelen, - fattr); + fattr, file);mutex_unlock (&cfid->dirents.de_mutex); }
@@ -1022,7 +1024,7 @@ static int cifs_filldir(char *find_entrycifs_prime_dcache (file_dentry (file), &name, &fattr);return !cifs_dir_emit (ctx, name.name, name.len, - &fattr, cfid); + &fattr, cfid, file); }
@@ -1073,8 +1075,8 @@ int cifs_readdir(struct file *file, stru* we need to initialize scanning and storing the * directory content. */ -if (ctx->pos ==0 && cfid->dirents.ctx ==NULL ) { - cfid->dirents.ctx = ctx; +if (ctx->pos ==0 && cfid->dirents.file ==NULL ) { + cfid->dirents.file = file; cfid->dirents.pos =2 ; }/*
@@ -1142,7 +1144,7 @@ int cifs_readdir(struct file *file, stru }else {if (cfid) {mutex_lock (&cfid->dirents.de_mutex); -finished_cached_dirents_count (&cfid->dirents, ctx); +finished_cached_dirents_count (&cfid->dirents, ctx, file);mutex_unlock (&cfid->dirents.de_mutex); }cifs_dbg (FYI ,"Could not find entry\n" );
@@ -1183,7 +1185,7 @@ int cifs_readdir(struct file *file, stru ctx->pos++;if (cfid) {mutex_lock (&cfid->dirents.de_mutex); -update_cached_dirents_count (&cfid->dirents, ctx); +update_cached_dirents_count (&cfid->dirents, file);mutex_unlock (&cfid->dirents.de_mutex); }
Greg Kroah-Hartman
maintainerPATCH 310/414 scsi: storvsc: Increase the timeouts to storvsc_timeout
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dexuan Cui <[email protected]>
commit b2f966568faaad326de97481096d0f3dc0971c43 upstream.
Currently storvsc_timeout is only used in storvsc_sdev_configure(), and 5s and 10s are used elsewhere. It turns out that rarely the 5s is not enough on Azure, so let's use storvsc_timeout everywhere.
In case a timeout happens and storvsc_channel_init() returns an error, close the VMBus channel so that any host-to-guest messages in the channel's ringbuffer, which might come late, can be safely ignored.
Add a "const" to storvsc_timeout.
--- drivers/scsi/storvsc_drv.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/scsi/storvsc_drv.c +6 -4
@@ -362,7 +362,7 @@ MODULE_PARM_DESC(ring_avail_percent_lowa/* * Timeout in seconds for all devices managed by this driver. */ -static int storvsc_timeout =180 ; +static const int storvsc_timeout =180 ;#if IS_ENABLED (CONFIG_SCSI_FC_ATTRS )static struct scsi_transport_template *fc_transport_template;
@@ -768,7 +768,7 @@ static void handle_multichannel_storagereturn ; } - t =wait_for_completion_timeout (&request->wait_event,10 *HZ ); + t =wait_for_completion_timeout (&request->wait_event, storvsc_timeout *HZ );if (t ==0 ) {dev_err (dev,"Failed to create sub-channel: timed out\n" );return ;
@@ -833,7 +833,7 @@ static int storvsc_execute_vstor_op(struif (ret !=0 )return ret; - t =wait_for_completion_timeout (&request->wait_event,5 *HZ ); + t =wait_for_completion_timeout (&request->wait_event, storvsc_timeout *HZ );if (t ==0 )return -ETIMEDOUT ;
@@ -1351,6 +1351,8 @@ static int storvsc_connect_to_vsp(structreturn ret; ret =storvsc_channel_init (device, is_fc); +if (ret) +vmbus_close (device->channel);return ret; }
@@ -1668,7 +1670,7 @@ static int storvsc_host_reset_handler(stif (ret !=0 )return FAILED ; - t =wait_for_completion_timeout (&request->wait_event,5 *HZ ); + t =wait_for_completion_timeout (&request->wait_event, storvsc_timeout *HZ );if (t ==0 )return TIMEOUT_ERROR ;
Greg Kroah-Hartman
maintainerPATCH 311/414 scsi: s390: zfcp: Ensure synchronous unit_add
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Oberparleiter <[email protected]>
commit 9697ca0d53e3db357be26d2414276143c4a2cd49 upstream.
Improve the usability of the unit_add sysfs attribute by ensuring that the associated FCP LUN scan processing is completed synchronously. This enables configuration tooling to consistently determine the end of the scan process to allow for serialization of follow-on actions.
While the scan process associated with unit_add typically completes synchronously, it is deferred to an asynchronous background process if unit_add is used before initial remote port scanning has completed. This occurs when unit_add is used immediately after setting the associated FCP device online.
To ensure synchronous unit_add processing, wait for remote port scanning to complete before initiating the FCP LUN scan.
--- drivers/s390/scsi/zfcp_sysfs.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/s390/scsi/zfcp_sysfs.c +2 -0
@@ -450,6 +450,8 @@ static ssize_t zfcp_sysfs_unit_add_storeif (kstrtoull (buf,0 , (unsigned long long *) &fcp_lun))return -EINVAL ; +flush_work (&port->rport_work); + retval =zfcp_unit_add (port, fcp_lun);if (retval)return retval;
Greg Kroah-Hartman
maintainerPATCH 312/414 nvme: always punt polled uring_cmd end_io work to task_work
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 9ce6c9875f3e995be5fd720b65835291f8a609b1 upstream.
Currently NVMe uring_cmd completions will complete locally, if they are polled. This is done because those completions are always invoked from task context. And while that is true, there's no guarantee that it's invoked under the right ring context, or even task. If someone does NVMe passthrough via multiple threads and with a limited number of poll queues, then ringA may find completions from ringB. For that case, completing the request may not be sound.
Always just punt the passthrough completions via task_work, which will redirect the completion, if needed.
--- drivers/nvme/host/ioctl.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-)
drivers/nvme/host/ioctl.c +7 -14
@@ -442,21 +442,14 @@ static enum rq_end_io_ret nvme_uring_cmd pdu->result =le64_to_cpu (nvme_req (req)->result.u64);/* -* For iopoll, complete it directly. Note that using the uring_cmd -* helper for this is safe only because we check blk_rq_is_poll(). -* As that returns false if we're NOT on a polled queue, then it's -* safe to use the polled completion helper. -* -* Otherwise, move the completion to task work. +* IOPOLL could potentially complete this request directly, but +* if multiple rings are polling on the same queue, then it's possible +* for one ring to find completions for another ring. Punting the +* completion via task_work will always direct it to the right +* location, rather than potentially complete requests for ringA +* under iopoll invocations from ringB. */ -if (blk_rq_is_poll (req)) { -if (pdu->bio) -blk_rq_unmap_user (pdu->bio); -io_uring_cmd_iopoll_done (ioucmd, pdu->result, pdu->status); - }else { -io_uring_cmd_do_in_task_lazy (ioucmd, nvme_uring_task_cb); - } - +io_uring_cmd_do_in_task_lazy (ioucmd, nvme_uring_task_cb);return RQ_END_IO_FREE ; }
Greg Kroah-Hartman
maintainerPATCH 313/414 net_sched: sch_sfq: reject invalid perturb period
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
commit 7ca52541c05c832d32b112274f81a985101f9ba8 upstream.
Gerrard Tai reported that SFQ perturb_period has no range check yet, and this can be used to trigger a race condition fixed in a separate patch.
We want to make sure ctl->perturb_period * HZ will not overflow and is positive.
Tested:
tc qd add dev lo root sfq perturb -10 # negative value : error
Error: sch_sfq: invalid perturb period.
tc qd add dev lo root sfq perturb 1000000000 # too big : error
Error: sch_sfq: invalid perturb period.
tc qd add dev lo root sfq perturb 2000000 # acceptable value
tc -s -d qd sh dev lo
qdisc sfq 8005: root refcnt 2 limit 127p quantum 64Kb depth 127 flows 128 divisor 1024 perturb 2000000sec
Sent 0 bytes 0 pkt (dropped 0, overlimits 0 requeues 0)
backlog 0b 0p requeues 0
--- net/sched/sch_sfq.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
net/sched/sch_sfq.c +8 -2
@@ -656,6 +656,14 @@ static int sfq_change(struct Qdisc *sch,NL_SET_ERR_MSG_MOD (extack,"invalid quantum" );return -EINVAL ; } + +if (ctl->perturb_period <0 || + ctl->perturb_period >INT_MAX /HZ ) { +NL_SET_ERR_MSG_MOD (extack,"invalid perturb period" ); +return -EINVAL ; + } + perturb_period = ctl->perturb_period *HZ ; +if (ctl_v1 && !red_check_params (ctl_v1->qth_min, ctl_v1->qth_max, ctl_v1->Wlog, ctl_v1->Scell_log,NULL ))return -EINVAL ;
@@ -672,14 +680,12 @@ static int sfq_change(struct Qdisc *sch, headdrop = q->headdrop; maxdepth = q->maxdepth; maxflows = q->maxflows; - perturb_period = q->perturb_period; quantum = q->quantum; flags = q->flags;/* update and validate configuration */ if (ctl->quantum) quantum = ctl->quantum; - perturb_period = ctl->perturb_period *HZ ;if (ctl->flows) maxflows =min_t (u32, ctl->flows,SFQ_MAX_FLOWS );if (ctl->divisor) {
Greg Kroah-Hartman
maintainerPATCH 314/414 net: clear the dst when changing skb protocol
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
commit ba9db6f907ac02215e30128770f85fbd7db2fcf9 upstream.
A not-so-careful NAT46 BPF program can crash the kernel if it indiscriminately flips ingress packets from v4 to v6:
BUG: kernel NULL pointer dereference, address: 0000000000000000
ip6_rcv_core (net/ipv6/ip6_input.c:190:20)
ipv6_rcv (net/ipv6/ip6_input.c:306:8)
process_backlog (net/core/dev.c:6186:4)
napi_poll (net/core/dev.c:6906:9)
net_rx_action (net/core/dev.c:7028:13)
do_softirq (kernel/softirq.c:462:3)
netif_rx (net/core/dev.c:5326:3)
dev_loopback_xmit (net/core/dev.c:4015:2)
ip_mc_finish_output (net/ipv4/ip_output.c:363:8)
NF_HOOK (./include/linux/netfilter.h:314:9)
ip_mc_output (net/ipv4/ip_output.c:400:5)
dst_output (./include/net/dst.h:459:9)
ip_local_out (net/ipv4/ip_output.c:130:9)
ip_send_skb (net/ipv4/ip_output.c:1496:8)
udp_send_skb (net/ipv4/udp.c:1040:8)
udp_sendmsg (net/ipv4/udp.c:1328:10)The output interface has a 4->6 program attached at ingress. We try to loop the multicast skb back to the sending socket. Ingress BPF runs as part of netif_rx(), pushes a valid v6 hdr and changes skb->protocol to v6. We enter ip6_rcv_core which tries to use skb_dst(). But the dst is still an IPv4 one left after IPv4 mcast output.
Clear the dst in all BPF helpers which change the protocol. Try to preserve metadata dsts, those may carry non-routing metadata.
--- net/core/filter.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
net/core/filter.c +13 -6
@@ -3249,6 +3249,13 @@ static const struct bpf_func_proto bpf_s .arg1_type = ARG_PTR_TO_CTX, }; +static void bpf_skb_change_protocol (struct sk_buff *skb,u16 proto) +{ + skb->protocol =htons (proto); +if (skb_valid_dst (skb)) +skb_dst_drop (skb); +} +static int bpf_skb_generic_push (struct sk_buff *skb,u32 off,u32 len) {/* Caller already did skb_cow() with len as headroom,
@@ -3345,7 +3352,7 @@ static int bpf_skb_proto_4_to_6(struct s } } - skb->protocol =htons (ETH_P_IPV6 ); +bpf_skb_change_protocol (skb,ETH_P_IPV6 );skb_clear_hash (skb);return 0 ;
@@ -3375,7 +3382,7 @@ static int bpf_skb_proto_6_to_4(struct s } } - skb->protocol =htons (ETH_P_IP ); +bpf_skb_change_protocol (skb,ETH_P_IP );skb_clear_hash (skb);return 0 ;
@@ -3566,10 +3573,10 @@ static int bpf_skb_net_grow(struct sk_bu/* Match skb->protocol to new outer l3 protocol */ if (skb->protocol ==htons (ETH_P_IP ) && flags &BPF_F_ADJ_ROOM_ENCAP_L3_IPV6 ) - skb->protocol =htons (ETH_P_IPV6 ); +bpf_skb_change_protocol (skb,ETH_P_IPV6 );else if (skb->protocol ==htons (ETH_P_IPV6 ) && flags &BPF_F_ADJ_ROOM_ENCAP_L3_IPV4 ) - skb->protocol =htons (ETH_P_IP ); +bpf_skb_change_protocol (skb,ETH_P_IP ); }if (skb_is_gso (skb)) {
@@ -3622,10 +3629,10 @@ static int bpf_skb_net_shrink(struct sk_/* Match skb->protocol to new outer l3 protocol */ if (skb->protocol ==htons (ETH_P_IP ) && flags &BPF_F_ADJ_ROOM_DECAP_L3_IPV6 ) - skb->protocol =htons (ETH_P_IPV6 ); +bpf_skb_change_protocol (skb,ETH_P_IPV6 );else if (skb->protocol ==htons (ETH_P_IPV6 ) && flags &BPF_F_ADJ_ROOM_DECAP_L3_IPV4 ) - skb->protocol =htons (ETH_P_IP ); +bpf_skb_change_protocol (skb,ETH_P_IP );if (skb_is_gso (skb)) {struct skb_shared_info *shinfo =skb_shinfo (skb);
Greg Kroah-Hartman
maintainerPATCH 315/414 mm: close theoretical race where stale TLB entries could linger
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryan Roberts <[email protected]>
commit 383c4613c67c26e90e8eebb72e3083457d02033f upstream.
Commit 3ea277194daa ("mm, mprotect: flush TLB if potentially racing with a parallel reclaim leaving stale TLB entries") described a theoretical race as such:
"""
Nadav Amit identified a theoretical race between page reclaim and mprotect due to TLB flushes being batched outside of the PTL being held.
He described the race as follows:
CPU0 CPU1 ---- ---- user accesses memory using RW PTE [PTE now cached in TLB] try_to_unmap_one() ==> ptep_get_and_clear() ==> set_tlb_ubc_flush_pending() mprotect(addr, PROT_READ) ==> change_pte_range() ==> [ PTE non-present - no flush ] user writes using cached RW PTE ... try_to_unmap_flush()
The same type of race exists for reads when protecting for PROT_NONE and also exists for operations that can leave an old TLB entry behind such as munmap, mremap and madvise.
"""
The solution was to introduce flush_tlb_batched_pending() and call it under the PTL from mprotect/madvise/munmap/mremap to complete any pending tlb flushes.
However, while madvise_free_pte_range() and madvise_cold_or_pageout_pte_range() were both retro-fitted to call flush_tlb_batched_pending() immediately after initially acquiring the PTL, they both temporarily release the PTL to split a large folio if they stumble upon one. In this case, where re-acquiring the PTL flush_tlb_batched_pending() must be called again, but it previously was not. Let's fix that.
There are 2 Fixes: tags here: the first is the commit that fixed madvise_free_pte_range(). The second is the commit that added madvise_cold_or_pageout_pte_range(), which looks like it copy/pasted the faulty pattern from madvise_free_pte_range().
This is a theoretical bug discovered during code review.
--- mm/madvise.c | 2 ++ 1 file changed, 2 insertions(+)
mm/madvise.c +2 -0
@@ -495,6 +495,7 @@ restart:pte_offset_map_lock (mm, pmd, addr, &ptl);if (!start_pte)break ; +flush_tlb_batched_pending (mm);arch_enter_lazy_mmu_mode ();if (!err) nr =0 ;
@@ -728,6 +729,7 @@ static int madvise_free_pte_range(pmd_t start_pte = pte;if (!start_pte)break ; +flush_tlb_batched_pending (mm);arch_enter_lazy_mmu_mode ();if (!err) nr =0 ;
Greg Kroah-Hartman
maintainerPATCH 316/414 udmabuf: use sgtable-based scatterlist wrappers
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Marek Szyprowski <[email protected]>
commit afe382843717d44b24ef5014d57dcbaab75a4052 upstream.
Use common wrappers operating directly on the struct sg_table objects to fix incorrect use of scatterlists sync calls. dma_sync_sg_for_*() functions have to be called with the number of elements originally passed to dma_map_sg_*() function, not the one returned in sgtable's nents.
--- drivers/dma-buf/udmabuf.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
drivers/dma-buf/udmabuf.c +2 -3
@@ -223,8 +223,7 @@ static int begin_cpu_udmabuf(struct dma_ ubuf->sg =NULL ; } }else { -dma_sync_sg_for_cpu (dev, ubuf->sg->sgl, ubuf->sg->nents, - direction); +dma_sync_sgtable_for_cpu (dev, ubuf->sg, direction); }return ret;
@@ -239,7 +238,7 @@ static int end_cpu_udmabuf(struct dma_buif (!ubuf->sg)return -EINVAL ; -dma_sync_sg_for_device (dev, ubuf->sg->sgl, ubuf->sg->nents, direction); +dma_sync_sgtable_for_device (dev, ubuf->sg, direction);return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 317/414 x86/virt/tdx: Avoid indirect calls to TDX assembly functions
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kai Huang <[email protected]>
commit 0b3bc018e86afdc0cbfef61328c63d5c08f8b370 upstream.
Two 'static inline' TDX helper functions (sc_retry() and sc_retry_prerr()) take function pointer arguments which refer to assembly functions. Normally, the compiler inlines the TDX helper, realizes that the function pointer targets are completely static -- thus can be resolved at compile time -- and generates direct call instructions.
But, other times (like when CONFIG_CC_OPTIMIZE_FOR_SIZE=y), the compiler declines to inline the helpers and will instead generate indirect call instructions.
Indirect calls to assembly functions require special annotation (for various Control Flow Integrity mechanisms). But TDX assembly functions lack the special annotations and can only be called directly.
Annotate both the helpers as '__always_inline' to prod the compiler into maintaining the direct calls. There is no guarantee here, but Peter has volunteered to report the compiler bug if this assumption ever breaks[1].
--- arch/x86/include/asm/tdx.h | 2 +- arch/x86/virt/vmx/tdx/tdx.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-)
arch/x86/include/asm/tdx.h +1 -1
@@ -97,7 +97,7 @@ void tdx_init(void);typedef u64 (*sc_func_t )(u64 fn,struct tdx_module_args *args); -static inline u64 sc_retry (sc_func_t func,u64 fn, +static __always_inline u64 sc_retry(sc_func_t func, u64 fn,struct tdx_module_args *args) {int retry =RDRAND_RETRY_LOOPS ;
arch/x86/virt/vmx/tdx/tdx.c +3 -2
@@ -69,8 +69,9 @@ static inline void seamcall_err_ret(u64 args->r9, args->r10, args->r11); } -static inline int sc_retry_prerr (sc_func_t func,sc_err_func_t err_func, -u64 fn,struct tdx_module_args *args) +static __always_inline int sc_retry_prerr(sc_func_t func, +sc_err_func_t err_func, +u64 fn,struct tdx_module_args *args) {u64 sret =sc_retry (func, fn, args);
Greg Kroah-Hartman
maintainerPATCH 318/414 selftests/x86: Add a test to detect infinite SIGTRAP handler loop
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Xin Li (Intel) <[email protected]>
commit f287822688eeb44ae1cf6ac45701d965efc33218 upstream.
When FRED is enabled, if the Trap Flag (TF) is set without an external debugger attached, it can lead to an infinite loop in the SIGTRAP handler. To avoid this, the software event flag in the augmented SS must be cleared, ensuring that no single-step trap remains pending when ERETU completes.
This test checks for that specific scenario—verifying whether the kernel correctly prevents an infinite SIGTRAP loop in this edge case when FRED is enabled.
The test should _always_ pass with IDT event delivery, thus no need to disable the test even when FRED is not enabled.
--- tools/testing/selftests/x86/Makefile | 2 tools/testing/selftests/x86/sigtrap_loop.c | 101 +++++++++++++++++++++++++++++ 2 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/x86/sigtrap_loop.c
tools/testing/selftests/x86/Makefile +1 -1
@@ -12,7 +12,7 @@ CAN_BUILD_WITH_NOPIE := $(shell ./check_ TARGETS_C_BOTHBITS := single_step_syscall sysret_ss_attrs syscall_nt test_mremap_vdso \ check_initial_reg_state sigreturn iopl ioperm \ - test_vsyscall mov_ss_trap \ + test_vsyscall mov_ss_trap sigtrap_loop \ syscall_arg_fault fsgsbase_restore sigaltstack TARGETS_C_BOTHBITS += nx_stack TARGETS_C_32BIT_ONLY := entry_from_vm86 test_syscall_vdso unwind_vdso \
tools/testing/selftests/x86/sigtrap_loop.c new file +101 -0
101 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 319/414 ksmbd: fix null pointer dereference in destroy_previous_session
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Namjae Jeon <[email protected]>
commit 7ac5b66acafcc9292fb935d7e03790f2b8b2dc0e upstream.
If client set ->PreviousSessionId on kerberos session setup stage, NULL pointer dereference error will happen. Since sess->user is not set yet, It can pass the user argument as NULL to destroy_previous_session. sess->user will be set in ksmbd_krb5_authenticate(). So this patch move calling destroy_previous_session() after ksmbd_krb5_authenticate().
--- fs/smb/server/smb2pdu.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)
fs/smb/server/smb2pdu.c +6 -5
@@ -1605,17 +1605,18 @@ static int krb5_authenticate(struct ksmb out_len = work->response_sz - (le16_to_cpu (rsp->SecurityBufferOffset) +4 ); -/* Check previous session */ - prev_sess_id =le64_to_cpu (req->PreviousSessionId); -if (prev_sess_id && prev_sess_id != sess->id) -destroy_previous_session (conn, sess->user, prev_sess_id); - retval =ksmbd_krb5_authenticate (sess, in_blob, in_len, out_blob, &out_len);if (retval) {ksmbd_debug (SMB ,"krb5 authentication failed\n" );return -EINVAL ; } + +/* Check previous session */ + prev_sess_id =le64_to_cpu (req->PreviousSessionId); +if (prev_sess_id && prev_sess_id != sess->id) +destroy_previous_session (conn, sess->user, prev_sess_id); + rsp->SecurityBufferLength =cpu_to_le16 (out_len); if ((conn->sign || server_conf.enforced_signing) ||
Greg Kroah-Hartman
maintainerPATCH 320/414 platform/x86: ideapad-laptop: use usleep_range() for EC polling
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Rong Zhang <[email protected]>
commit 5808c34216954cd832bd4b8bc52dfa287049122b upstream.
It was reported that ideapad-laptop sometimes causes some recent (since 2024) Lenovo ThinkBook models shut down when:
- suspending/resuming
- closing/opening the lid
- (dis)connecting a charger
- reading/writing some sysfs properties, e.g., fan_mode, touchpad
- pressing down some Fn keys, e.g., Brightness Up/Down (Fn+F5/F6)
- (seldom) loading the kmod
The issue has existed since the launch day of such models, and there have been some out-of-tree workarounds (see Link:) for the issue. One disables some functionalities, while another one simply shortens IDEAPAD_EC_TIMEOUT. The disabled functionalities have read_ec_data() in their call chains, which calls schedule() between each poll.
It turns out that these models suffer from the indeterminacy of schedule() because of their low tolerance for being polled too frequently. Sometimes schedule() returns too soon due to the lack of ready tasks, causing the margin between two polls to be too short. In this case, the command is somehow aborted, and too many subsequent polls (they poll for "nothing!") may eventually break the state machine in the EC, resulting in a hard shutdown. This explains why shortening IDEAPAD_EC_TIMEOUT works around the issue - it reduces the total number of polls sent to the EC.
Even when it doesn't lead to a shutdown, frequent polls may also disturb the ongoing operation and notably delay (+ 10-20ms) the availability of EC response. This phenomenon is unlikely to be exclusive to the models mentioned above, so dropping the schedule() manner should also slightly improve the responsiveness of various models.
Fix these issues by migrating to usleep_range(150, 300). The interval is chosen to add some margin to the minimal 50us and considering EC responses are usually available after 150-2500us based on my test. It should be enough to fix these issues on all models subject to the EC bug without introducing latency on other models.
Tested on ThinkBook 14 G7+ ASP and solved both issues. No regression was introduced in the test on a model without the EC bug (ThinkBook X IMH, thanks Eric).
--- drivers/platform/x86/ideapad-laptop.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-)
drivers/platform/x86/ideapad-laptop.c +17 -2
@@ -15,6 +15,7 @@#include <linux/bug.h> #include <linux/cleanup.h> #include <linux/debugfs.h> +#include <linux/delay.h> #include <linux/device.h> #include <linux/dmi.h> #include <linux/i8042.h>
@@ -267,6 +268,20 @@ static void ideapad_shared_exit(struct i*/ #define IDEAPAD_EC_TIMEOUT 200/* in ms */ +/* +* Some models (e.g., ThinkBook since 2024) have a low tolerance for being +* polled too frequently. Doing so may break the state machine in the EC, +* resulting in a hard shutdown. +* +* It is also observed that frequent polls may disturb the ongoing operation +* and notably delay the availability of EC response. +* +* These values are used as the delay before the first poll and the interval +* between subsequent polls to solve the above issues. +*/ +#define IDEAPAD_EC_POLL_MIN_US 150 +#define IDEAPAD_EC_POLL_MAX_US 300 +static int eval_int (acpi_handle handle,const char *name,unsigned long *res) {unsigned long long result;
@@ -383,7 +398,7 @@ static int read_ec_data(acpi_handle hand end_jiffies = jiffies +msecs_to_jiffies (IDEAPAD_EC_TIMEOUT ) +1 ;while (time_before (jiffies, end_jiffies)) { -schedule (); +usleep_range (IDEAPAD_EC_POLL_MIN_US ,IDEAPAD_EC_POLL_MAX_US ); err =eval_vpcr (handle,1 , &val);if (err)
@@ -414,7 +429,7 @@ static int write_ec_cmd(acpi_handle hand end_jiffies = jiffies +msecs_to_jiffies (IDEAPAD_EC_TIMEOUT ) +1 ;while (time_before (jiffies, end_jiffies)) { -schedule (); +usleep_range (IDEAPAD_EC_POLL_MIN_US ,IDEAPAD_EC_POLL_MAX_US ); err =eval_vpcr (handle,1 , &val);if (err)
Greg Kroah-Hartman
maintainerPATCH 321/414 selinux: fix selinux_xfrm_alloc_user() to set correct ctx_len
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stephen Smalley <[email protected]>
commit 86c8db86af43f52f682e53a0f2f0828683be1e52 upstream.
We should count the terminating NUL byte as part of the ctx_len. Otherwise, UBSAN logs a warning:
UBSAN: array-index-out-of-bounds in security/selinux/xfrm.c:99:14 index 60 is out of range for type 'char [*]'
The allocation itself is correct so there is no actual out of bounds indexing, just a warning.
--- security/selinux/xfrm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
security/selinux/xfrm.c +1 -1
@@ -94,7 +94,7 @@ static int selinux_xfrm_alloc_user(struc ctx->ctx_doi =XFRM_SC_DOI_LSM ; ctx->ctx_alg =XFRM_SC_ALG_SELINUX ; - ctx->ctx_len = str_len; + ctx->ctx_len = str_len +1 ;memcpy (ctx->ctx_str, &uctx[1 ], str_len); ctx->ctx_str[str_len] ='\0' ; rc = security_context_to_sid(ctx->ctx_str, str_len,
Greg Kroah-Hartman
maintainerPATCH 322/414 platform/x86/intel-uncore-freq: Fail module load when plat_info is NULL
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Srinivas Pandruvada <[email protected]>
commit 685f88c72a0c4d12d3bd2ff50286938f14486f85 upstream.
Address a Smatch static checker warning regarding an unchecked dereference in the function call:set_cdie_id(i, cluster_info, plat_info)
when plat_info is NULL.
Instead of addressing this one case, in general if plat_info is NULL then it can cause other issues. For example in a two package system it will give warning for duplicate sysfs entry as package ID will be always zero for both packages when creating string for attribute group name.
plat_info is derived from TPMI ID TPMI_BUS_INFO, which is integral to the core TPMI design. Therefore, it should not be NULL on a production platform. Consequently, the module should fail to load if plat_info is NULL.
--- drivers/platform/x86/intel/uncore-frequency/uncore-frequency-tpmi.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/platform/x86/intel/uncore-frequency/uncore-frequency-tpmi.c +6 -3
@@ -467,10 +467,13 @@ static int uncore_probe(struct auxiliary/* Get the package ID from the TPMI core */ plat_info =tpmi_get_platform_data (auxdev); -if (plat_info) - pkg = plat_info->package_id; -else +if (unlikely (!plat_info)) {dev_info (&auxdev->dev,"Platform information is NULL\n" ); + ret = -ENODEV ; + goto err_rem_common; + } + + pkg = plat_info->package_id;for (i =0 ; i < num_resources; ++i) {struct tpmi_uncore_power_domain_info *pd_info;
Greg Kroah-Hartman
maintainerPATCH 323/414 sched_ext, sched/core: Dont call scx_group_set_weight() prematurely from sched_create_group()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tejun Heo <[email protected]>
commit 33796b91871ad4010c8188372dd1faf97cf0f1c0 upstream.
During task_group creation, sched_create_group() calls scx_group_set_weight() with CGROUP_WEIGHT_DFL to initialize the sched_ext portion. This is premature and ends up calling ops.cgroup_set_weight() with an incorrect @cgrp before ops.cgroup_init() is called.
sched_create_group() should just initialize SCX related fields in the new task_group. Fix it by factoring out scx_tg_init() from sched_init() and making sched_create_group() call that function instead of scx_group_set_weight().
v2: Retain CONFIG_EXT_GROUP_SCHED ifdef in sched_init() as removing it leads
to build failures on !CONFIG_GROUP_SCHED configs.
--- kernel/sched/core.c | 4 ++-- kernel/sched/ext.c | 5 +++++ kernel/sched/ext.h | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-)
kernel/sched/core.c +2 -2
@@ -8423,7 +8423,7 @@ void __init sched_init(void)init_cfs_bandwidth (&root_task_group.cfs_bandwidth,NULL );#endif /* CONFIG_FAIR_GROUP_SCHED */ #ifdef CONFIG_EXT_GROUP_SCHED - root_task_group.scx_weight =CGROUP_WEIGHT_DFL ; +scx_tg_init (&root_task_group);#endif /* CONFIG_EXT_GROUP_SCHED */ #ifdef CONFIG_RT_GROUP_SCHED root_task_group.rt_se = (struct sched_rt_entity **)ptr;
@@ -8863,7 +8863,7 @@ struct task_group *sched_create_group(stif (!alloc_rt_sched_group (tg, parent)) goto err; -scx_group_set_weight (tg,CGROUP_WEIGHT_DFL ); +scx_tg_init (tg);alloc_uclamp_sched_group (tg, parent);return tg;
kernel/sched/ext.c +5 -0
@@ -3918,6 +3918,11 @@ static void scx_cgroup_warn_missing_idle cgroup_warned_missing_idle = true; } +void scx_tg_init (struct task_group *tg) +{ + tg->scx_weight =CGROUP_WEIGHT_DFL ; +} +int scx_tg_online (struct task_group *tg) {int ret =0 ;
kernel/sched/ext.h +2 -0
@@ -70,6 +70,7 @@ static inline void scx_update_idle(struc#ifdef CONFIG_CGROUP_SCHED #ifdef CONFIG_EXT_GROUP_SCHED +void scx_tg_init (struct task_group *tg);int scx_tg_online (struct task_group *tg);void scx_tg_offline (struct task_group *tg);int scx_cgroup_can_attach (struct cgroup_taskset *tset);
@@ -79,6 +80,7 @@ void scx_cgroup_cancel_attach(struct cgrvoid scx_group_set_weight (struct task_group *tg,unsigned long cgrp_weight);void scx_group_set_idle (struct task_group *tg,bool idle);#else /* CONFIG_EXT_GROUP_SCHED */ +static inline void scx_tg_init (struct task_group *tg) {}static inline int scx_tg_online (struct task_group *tg) {return 0 ; }static inline void scx_tg_offline (struct task_group *tg) {}static inline int scx_cgroup_can_attach (struct cgroup_taskset *tset) {return 0 ; }
Greg Kroah-Hartman
maintainerPATCH 324/414 atm: Revert atm_account_tx() if copy_from_iter_full() fails.
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
commit 7851263998d4269125fd6cb3fdbfc7c6db853859 upstream.
In vcc_sendmsg(), we account skb->truesize to sk->sk_wmem_alloc by atm_account_tx().
It is expected to be reverted by atm_pop_raw() later called by vcc->dev->ops->send(vcc, skb).
However, vcc_sendmsg() misses the same revert when copy_from_iter_full() fails, and then we will leak a socket.
Let's factorise the revert part as atm_return_tx() and call it in the failure path.
Note that the corresponding sk_wmem_alloc operation can be found in alloc_tx() as of the blamed commit.
$ git blame -L:alloc_tx net/atm/common.c c55fa3cccbc2c~
--- include/linux/atmdev.h | 6 ++++++ net/atm/common.c | 1 + net/atm/raw.c | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-)
include/linux/atmdev.h +6 -0
@@ -249,6 +249,12 @@ static inline void atm_account_tx(structATM_SKB (skb)->atm_options = vcc->atm_options; } +static inline void atm_return_tx (struct atm_vcc *vcc,struct sk_buff *skb) +{ +WARN_ON_ONCE (refcount_sub_and_test (ATM_SKB (skb)->acct_truesize, + &sk_atm (vcc)->sk_wmem_alloc)); +} +static inline void atm_force_charge (struct atm_vcc *vcc,int truesize) {atomic_add (truesize, &sk_atm (vcc)->sk_rmem_alloc);
net/atm/common.c +1 -0
@@ -635,6 +635,7 @@ int vcc_sendmsg(struct socket *sock, str skb->dev =NULL ;/* for paths shared with net_device interfaces */ if (!copy_from_iter_full (skb_put (skb, size), size, &m->msg_iter)) { +atm_return_tx (vcc, skb);kfree_skb (skb); error = -EFAULT ; goto out;
net/atm/raw.c +1 -1
@@ -36,7 +36,7 @@ static void atm_pop_raw(struct atm_vcc *pr_debug ("(%d) %d -= %d\n" , vcc->vci,sk_wmem_alloc_get (sk),ATM_SKB (skb)->acct_truesize); -WARN_ON (refcount_sub_and_test (ATM_SKB (skb)->acct_truesize, &sk->sk_wmem_alloc)); +atm_return_tx (vcc, skb);dev_kfree_skb_any (skb); sk->sk_write_space (sk); }
Greg Kroah-Hartman
maintainerPATCH 325/414 wifi: rtw89: phy: add dummy C2H event handler for report of TAS power
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ping-Ke Shih <[email protected]>
commit 09489812013f9ff3850c3af9900c88012b8c1e5d upstream.
The newer firmware, lik RTL8852C version 0.27.111.0, will notify driver report of TAS (Time Averaged SAR) power by new C2H events. This is to assist in higher accurate calculation of TAS.
For now, driver doesn't use the report yet, so add a dummy handler to avoid it throws info like:
rtw89_8852ce 0000:03:00.0: c2h class 9 func 6 not support
Also add "MAC" and "PHY" to the message to disambiguate the source of C2H event.
--- drivers/net/wireless/realtek/rtw89/mac.c | 4 ++-- drivers/net/wireless/realtek/rtw89/phy.c | 10 ++++++++-- drivers/net/wireless/realtek/rtw89/phy.h | 1 + 3 files changed, 11 insertions(+), 4 deletions(-)
drivers/net/wireless/realtek/rtw89/mac.c +2 -2
@@ -5513,11 +5513,11 @@ void rtw89_mac_c2h_handle(struct rtw89_dcase RTW89_MAC_C2H_CLASS_FWDBG :return ;default : -rtw89_info (rtwdev,"c2h class %d not support\n" , class); +rtw89_info (rtwdev,"MAC c2h class %d not support\n" , class);return ; }if (!handler) { -rtw89_info (rtwdev,"c2h class %d func %d not support\n" , class, +rtw89_info (rtwdev,"MAC c2h class %d func %d not support\n" , class, func);return ; }
drivers/net/wireless/realtek/rtw89/phy.c +8 -2
@@ -3062,10 +3062,16 @@ rtw89_phy_c2h_rfk_report_state(struct rt (int)(len - sizeof(report->hdr)), &report->state); } +static void +rtw89_phy_c2h_rfk_log_tas_pwr (struct rtw89_dev *rtwdev,struct sk_buff *c2h,u32 len) +{ +} +static void (*const rtw89_phy_c2h_rfk_report_handler[])(struct rtw89_dev *rtwdev,struct sk_buff *c2h,u32 len) = { [RTW89_PHY_C2H_RFK_REPORT_FUNC_STATE ] = rtw89_phy_c2h_rfk_report_state, + [RTW89_PHY_C2H_RFK_LOG_TAS_PWR ] = rtw89_phy_c2h_rfk_log_tas_pwr, };bool rtw89_phy_c2h_chk_atomic (struct rtw89_dev *rtwdev,u8 class,u8 func)
@@ -3119,11 +3125,11 @@ void rtw89_phy_c2h_handle(struct rtw89_dreturn ; fallthrough;default : -rtw89_info (rtwdev,"c2h class %d not support\n" , class); +rtw89_info (rtwdev,"PHY c2h class %d not support\n" , class);return ; }if (!handler) { -rtw89_info (rtwdev,"c2h class %d func %d not support\n" , class, +rtw89_info (rtwdev,"PHY c2h class %d func %d not support\n" , class, func);return ; }
drivers/net/wireless/realtek/rtw89/phy.h +1 -0
@@ -151,6 +151,7 @@ enum rtw89_phy_c2h_rfk_log_func {enum rtw89_phy_c2h_rfk_report_func {RTW89_PHY_C2H_RFK_REPORT_FUNC_STATE =0 , +RTW89_PHY_C2H_RFK_LOG_TAS_PWR =6 , };enum rtw89_phy_c2h_dm_func {
Greg Kroah-Hartman
maintainerPATCH 326/414 cpufreq/amd-pstate: Add missing NULL ptr check in amd_pstate_update
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dhananjay Ugwekar <[email protected]>
commit 426db24d4db2e4f0d6720aeb7795eafcb9e82640 upstream.
Check if policy is NULL before dereferencing it in amd_pstate_update.
--- drivers/cpufreq/amd-pstate.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/cpufreq/amd-pstate.c +3 -0
@@ -482,6 +482,9 @@ static void amd_pstate_update(struct amdu32 nominal_perf =READ_ONCE (cpudata->nominal_perf);u64 value = prev; +if (!policy) +return ; + min_perf = clamp_t(unsigned long, min_perf, cpudata->min_limit_perf, cpudata->max_limit_perf); max_perf = clamp_t(unsigned long, max_perf, cpudata->min_limit_perf,
Greg Kroah-Hartman
maintainerPATCH 327/414 Input: sparcspkr - avoid unannotated fall-through
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: WangYuli <[email protected]>
commit 8b1d858cbd4e1800e9336404ba7892b5a721230d upstream.
Fix follow warnings with clang-21i (and reformat for clarity):
drivers/input/misc/sparcspkr.c:78:3: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
78 | case SND_TONE: break;
| ^
drivers/input/misc/sparcspkr.c:78:3: note: insert 'break;' to avoid fall-through
78 | case SND_TONE: break;
| ^
| break;
drivers/input/misc/sparcspkr.c:113:3: warning: unannotated fall-through between switch labels [-Wimplicit-fallthrough]
113 | case SND_TONE: break;
| ^
drivers/input/misc/sparcspkr.c:113:3: note: insert 'break;' to avoid fall-through
113 | case SND_TONE: break;
| ^
| break;2 warnings generated.
--- drivers/input/misc/sparcspkr.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-)
drivers/input/misc/sparcspkr.c +16 -6
@@ -75,9 +75,14 @@ static int bbc_spkr_event(struct input_dreturn -1 ;switch (code) { -case SND_BELL :if (value) value =1000 ; -case SND_TONE :break ; -default :return -1 ; +case SND_BELL : +if (value) + value =1000 ; +break ; +case SND_TONE : +break ; +default : +return -1 ; }if (value >20 && value <32767 )
@@ -113,9 +118,14 @@ static int grover_spkr_event(struct inpureturn -1 ;switch (code) { -case SND_BELL :if (value) value =1000 ; -case SND_TONE :break ; -default :return -1 ; +case SND_BELL : +if (value) + value =1000 ; +break ; +case SND_TONE : +break ; +default : +return -1 ; }if (value >20 && value <32767 )
Greg Kroah-Hartman
maintainerPATCH 328/414 wifi: ath12k: Clear affinity hint before calling ath12k_pci_free_irq() in error path
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Manivannan Sadhasivam <[email protected]>
commit b43b1e2c52db77c872bd60d30cdcc72c47df70c7 upstream.
If a shared IRQ is used by the driver due to platform limitation, then the IRQ affinity hint is set right after the allocation of IRQ vectors in ath12k_pci_msi_alloc(). This does no harm unless one of the functions requesting the IRQ fails and attempt to free the IRQ.
This may end up with a warning from the IRQ core that is expecting the affinity hint to be cleared before freeing the IRQ:
kernel/irq/manage.c:
/* make sure affinity_hint is cleaned up */ if (WARN_ON_ONCE(desc->affinity_hint)) desc->affinity_hint = NULL;
So to fix this issue, clear the IRQ affinity hint before calling ath12k_pci_free_irq() in the error path. The affinity will be cleared once again further down the error path due to code organization, but that does no harm.
--- drivers/net/wireless/ath/ath12k/pci.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/ath/ath12k/pci.c +2 -0
@@ -1506,6 +1506,8 @@ static int ath12k_pci_probe(struct pci_dreturn 0 ; err_free_irq: +/* __free_irq() expects the caller to have cleared the affinity hint */ +ath12k_pci_set_irq_affinity_hint (ab_pci,NULL );ath12k_pci_free_irq (ab); err_ce_free:
Greg Kroah-Hartman
maintainerPATCH 329/414 wifi: cfg80211: init wiphy_work before allocating rfkill fails
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Edward Adam Davis <[email protected]>
commit fc88dee89d7b63eeb17699393eb659aadf9d9b7c upstream.
syzbort reported a uninitialize wiphy_work_lock in cfg80211_dev_free. [1]
After rfkill allocation fails, the wiphy release process will be performed, which will cause cfg80211_dev_free to access the uninitialized wiphy_work related data.
Move the initialization of wiphy_work to before rfkill initialization to avoid this issue.
[1]
INFO: trying to register non-static key.
The code is fine but needs lockdep annotation, or maybe you didn't initialize this object before use? turning off the locking correctness validator.
CPU: 0 UID: 0 PID: 5935 Comm: syz-executor550 Not tainted 6.14.0-rc6-syzkaller-00103-g4003c9e78778 #0 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.16.3-debian-1.16.3-2~bpo12+1 04/01/2014 Call Trace: <TASK> __dump_stack lib/dump_stack.c:94 [inline] dump_stack_lvl+0x116/0x1f0 lib/dump_stack.c:120 assign_lock_key kernel/locking/lockdep.c:983 [inline] register_lock_class+0xc39/0x1240 kernel/locking/lockdep.c:1297 __lock_acquire+0x135/0x3c40 kernel/locking/lockdep.c:5103 lock_acquire.part.0+0x11b/0x380 kernel/locking/lockdep.c:5851 __raw_spin_lock_irqsave include/linux/spinlock_api_smp.h:110 [inline] _raw_spin_lock_irqsave+0x3a/0x60 kernel/locking/spinlock.c:162 cfg80211_dev_free+0x30/0x3d0 net/wireless/core.c:1196 device_release+0xa1/0x240 drivers/base/core.c:2568 kobject_cleanup lib/kobject.c:689 [inline] kobject_release lib/kobject.c:720 [inline] kref_put include/linux/kref.h:65 [inline] kobject_put+0x1e4/0x5a0 lib/kobject.c:737 put_device+0x1f/0x30 drivers/base/core.c:3774 wiphy_free net/wireless/core.c:1224 [inline] wiphy_new_nm+0x1c1f/0x2160 net/wireless/core.c:562 ieee80211_alloc_hw_nm+0x1b7a/0x2260 net/mac80211/main.c:835 mac80211_hwsim_new_radio+0x1d6/0x54e0 drivers/net/wireless/virtual/mac80211_hwsim.c:5185 hwsim_new_radio_nl+0xb42/0x12b0 drivers/net/wireless/virtual/mac80211_hwsim.c:6242 genl_family_rcv_msg_doit+0x202/0x2f0 net/netlink/genetlink.c:1115 genl_family_rcv_msg net/netlink/genetlink.c:1195 [inline] genl_rcv_msg+0x565/0x800 net/netlink/genetlink.c:1210 netlink_rcv_skb+0x16b/0x440 net/netlink/af_netlink.c:2533 genl_rcv+0x28/0x40 net/netlink/genetlink.c:1219 netlink_unicast_kernel net/netlink/af_netlink.c:1312 [inline] netlink_unicast+0x53c/0x7f0 net/netlink/af_netlink.c:1338 netlink_sendmsg+0x8b8/0xd70 net/netlink/af_netlink.c:1882 sock_sendmsg_nosec net/socket.c:718 [inline] __sock_sendmsg net/socket.c:733 [inline] ____sys_sendmsg+0xaaf/0xc90 net/socket.c:2573 ___sys_sendmsg+0x135/0x1e0 net/socket.c:2627 __sys_sendmsg+0x16e/0x220 net/socket.c:2659 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xcd/0x250 arch/x86/entry/common.c:83
Close: https://syzkaller.appspot.com/bug?extid=aaf0488c83d1d5f4f029
--- net/wireless/core.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
net/wireless/core.c +3 -3
@@ -553,6 +553,9 @@ use_default_name:INIT_WORK (&rdev->mgmt_registrations_update_wk, cfg80211_mgmt_registrations_update_wk);spin_lock_init (&rdev->mgmt_registrations_lock); +INIT_WORK (&rdev->wiphy_work, cfg80211_wiphy_work); +INIT_LIST_HEAD (&rdev->wiphy_work_list); +spin_lock_init (&rdev->wiphy_work_lock);#ifdef CONFIG_CFG80211_DEFAULT_PS rdev->wiphy.flags |=WIPHY_FLAG_PS_ON_BY_DEFAULT ;
@@ -570,9 +573,6 @@ use_default_name:return NULL ; } -INIT_WORK (&rdev->wiphy_work, cfg80211_wiphy_work); -INIT_LIST_HEAD (&rdev->wiphy_work_list); -spin_lock_init (&rdev->wiphy_work_lock);INIT_WORK (&rdev->rfkill_block, cfg80211_rfkill_block_work);INIT_WORK (&rdev->conn_work, cfg80211_conn_work);INIT_WORK (&rdev->event_work, cfg80211_event_work);
Greg Kroah-Hartman
maintainerPATCH 330/414 arm64: Restrict pagetable teardown to avoid false warning
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dev Jain <[email protected]>
commit 650768c512faba8070bf4cfbb28c95eb5cd203f3 upstream.
Commit 9c006972c3fe ("arm64: mmu: drop pXd_present() checks from pXd_free_pYd_table()") removes the pxd_present() checks because the caller checks pxd_present(). But, in case of vmap_try_huge_pud(), the caller only checks pud_present(); pud_free_pmd_page() recurses on each pmd through pmd_free_pte_page(), wherein the pmd may be none. Thus it is possible to hit a warning in the latter, since pmd_none => !pmd_table(). Thus, add a pmd_present() check in pud_free_pmd_page().
This problem was found by code inspection.
--- arch/arm64/mm/mmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/arm64/mm/mmu.c +2 -1
@@ -1285,7 +1285,8 @@ int pud_free_pmd_page(pud_t *pudp, unsig next = addr; end = addr +PUD_SIZE ;do { -pmd_free_pte_page (pmdp, next); +if (pmd_present (pmdp_get (pmdp))) +pmd_free_pte_page (pmdp, next); }while (pmdp++, next +=PMD_SIZE , next != end);pud_clear (pudp);
Greg Kroah-Hartman
maintainerPATCH 331/414 ALSA: usb-audio: Rename ALSA kcontrol PCM and PCM1 for the KTMicro sound card
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: wangdicheng <[email protected]>
commit 93adf20ff4d6e865e0b974110d3cf2f07c057177 upstream.
PCM1 not in Pulseaudio's control list; standardize control to "Speaker" and "Headphone".
--- sound/usb/mixer_maps.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
sound/usb/mixer_maps.c +12 -0
@@ -383,6 +383,13 @@ static const struct usbmix_name_map ms_u { 0 } /* terminator */ }; +/* KTMicro USB */ +static struct usbmix_name_map s31b2_0022_map[] = { + {23 ,"Speaker Playback" }, + {18 ,"Headphone Playback" }, + {0 } +}; +/* ASUS ROG Zenith II with Realtek ALC1220-VB */ static const struct usbmix_name_map asus_zenith_ii_map[] = { {19 ,NULL ,12 },/* FU, Input Gain Pad - broken response, disabled */
@@ -692,6 +699,11 @@ static const struct usbmix_ctl_map usbmi .id = USB_ID(0x045e, 0x083c), .map = ms_usb_link_map, }, + { +/* KTMicro USB */ + .id = USB_ID(0X31b2, 0x0022), + .map = s31b2_0022_map, + }, { 0 } /* terminator */ };
Greg Kroah-Hartman
maintainerPATCH 332/414 ALSA: hda/intel: Add Thinkpad E15 to PM deny list
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit c987a390f1b3b8bdac11031d7004e3410fe259bd upstream.
Lenovo Thinkpad E15 with Conexant CX8070 codec seems causing ugly noises after runtime-PM suspend. Disable the codec runtime PM as a workaround.
--- sound/pci/hda/hda_intel.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/hda_intel.c +2 -0
@@ -2286,6 +2286,8 @@ static const struct snd_pci_quirk power_SND_PCI_QUIRK (0x1734 ,0x1232 ,"KONTRON SinglePC" ,0 ),/* Dell ALC3271 */ SND_PCI_QUIRK (0x1028 ,0x0962 ,"Dell ALC3271" ,0 ), +/* https://bugzilla.kernel.org/show_bug.cgi?id=220210 */ + SND_PCI_QUIRK(0x17aa, 0x5079, "Lenovo Thinkpad E15", 0), {} };
Greg Kroah-Hartman
maintainerPATCH 333/414 ALSA: hda/realtek - Add mute LED support for HP Victus 16-s1xxx and HP Victus 15-fa1xxx
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Edip Hazuri <[email protected]>
commit a0914bf56e26d2cf457690602883f9cd2ec2c646 upstream.
The mute led on those laptops is using ALC245 but requires a quirk to work This patch enables the existing quirk for the devices.
Tested on my Victus 16-s1011nt Laptop and my friend's Victus 15-fa1xxx. The LED behaviour works as intended.
--- sound/pci/hda/patch_realtek.c | 2 ++ 1 file changed, 2 insertions(+)
sound/pci/hda/patch_realtek.c +2 -0
@@ -10727,6 +10727,7 @@ static const struct hda_quirk alc269_fixSND_PCI_QUIRK (0x103c ,0x8b97 ,"HP" ,ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF ),SND_PCI_QUIRK (0x103c ,0x8bb3 ,"HP Slim OMEN" ,ALC287_FIXUP_CS35L41_I2C_2 ),SND_PCI_QUIRK (0x103c ,0x8bb4 ,"HP Slim OMEN" ,ALC287_FIXUP_CS35L41_I2C_2 ), +SND_PCI_QUIRK (0x103c ,0x8bc8 ,"HP Victus 15-fa1xxx" ,ALC245_FIXUP_HP_MUTE_LED_COEFBIT ),SND_PCI_QUIRK (0x103c ,0x8bcd ,"HP Omen 16-xd0xxx" ,ALC245_FIXUP_HP_MUTE_LED_V1_COEFBIT ),SND_PCI_QUIRK (0x103c ,0x8bdd ,"HP Envy 17" ,ALC287_FIXUP_CS35L41_I2C_2 ), SND_PCI_QUIRK(0x103c, 0x8bde, "HP Envy 17", ALC287_FIXUP_CS35L41_I2C_2),
@@ -10780,6 +10781,7 @@ static const struct hda_quirk alc269_fixSND_PCI_QUIRK (0x103c ,0x8c91 ,"HP EliteBook 660" ,ALC236_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8c96 ,"HP" ,ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF ),SND_PCI_QUIRK (0x103c ,0x8c97 ,"HP ZBook" ,ALC236_FIXUP_HP_MUTE_LED_MICMUTE_VREF ), +SND_PCI_QUIRK (0x103c ,0x8c9c ,"HP Victus 16-s1xxx (MB 8C9C)" ,ALC245_FIXUP_HP_MUTE_LED_COEFBIT ),SND_PCI_QUIRK (0x103c ,0x8ca1 ,"HP ZBook Power" ,ALC236_FIXUP_HP_GPIO_LED ),SND_PCI_QUIRK (0x103c ,0x8ca2 ,"HP ZBook Power" ,ALC236_FIXUP_HP_GPIO_LED ), SND_PCI_QUIRK(0x103c, 0x8ca4, "HP ZBook Fury", ALC245_FIXUP_CS35L41_SPI_2_HP_GPIO_LED),
Greg Kroah-Hartman
maintainerPATCH 334/414 ALSA: hda/realtek: enable headset mic on Latitude 5420 Rugged
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jonathan Lane <[email protected]>
commit efa6bdf1bc75e26cafaa5f1d775e8bb7c5b0c431 upstream.
Like many Dell laptops, the 3.5mm port by default can not detect a combined headphones+mic headset or even a pure microphone. This change enables the port's functionality.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -10449,6 +10449,7 @@ static const struct hda_quirk alc269_fixSND_PCI_QUIRK (0x1028 ,0x0871 ,"Dell Precision 3630" ,ALC255_FIXUP_DELL_HEADSET_MIC ),SND_PCI_QUIRK (0x1028 ,0x0872 ,"Dell Precision 3630" ,ALC255_FIXUP_DELL_HEADSET_MIC ),SND_PCI_QUIRK (0x1028 ,0x0873 ,"Dell Precision 3930" ,ALC255_FIXUP_DUMMY_LINEOUT_VERB ), +SND_PCI_QUIRK (0x1028 ,0x0879 ,"Dell Latitude 5420 Rugged" ,ALC269_FIXUP_DELL4_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x08ad ,"Dell WYSE AIO" ,ALC225_FIXUP_DELL_WYSE_AIO_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1028 ,0x08ae ,"Dell WYSE NB" ,ALC225_FIXUP_DELL1_MIC_NO_PRESENCE ), SND_PCI_QUIRK(0x1028, 0x0935, "Dell", ALC274_FIXUP_DELL_AIO_LINEOUT_VERB),
Greg Kroah-Hartman
maintainerPATCH 335/414 ALSA: hda/realtek: Fix built-in mic on ASUS VivoBook X513EA
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chris Chiu <[email protected]>
commit c6451a7325874c119def1d4094f6815c0c8fdc23 upstream.
The built-in mic of ASUS VivoBook X513EA is broken recently by the fix of the pin sort. The fixup ALC256_FIXUP_ASUS_MIC_NO_PRESENCE is working for addressing the regression, too.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -10840,6 +10840,7 @@ static const struct hda_quirk alc269_fixSND_PCI_QUIRK (0x103c ,0x8e60 ,"HP Trekker " ,ALC287_FIXUP_CS35L41_I2C_2 ),SND_PCI_QUIRK (0x103c ,0x8e61 ,"HP Trekker " ,ALC287_FIXUP_CS35L41_I2C_2 ),SND_PCI_QUIRK (0x103c ,0x8e62 ,"HP Trekker " ,ALC287_FIXUP_CS35L41_I2C_2 ), +SND_PCI_QUIRK (0x1043 ,0x1032 ,"ASUS VivoBook X513EA" ,ALC256_FIXUP_ASUS_MIC_NO_PRESENCE ),SND_PCI_QUIRK (0x1043 ,0x103e ,"ASUS X540SA" ,ALC256_FIXUP_ASUS_MIC ),SND_PCI_QUIRK (0x1043 ,0x103f ,"ASUS TX300" ,ALC282_FIXUP_ASUS_TX300 ), SND_PCI_QUIRK(0x1043, 0x1054, "ASUS G614FH/FM/FP", ALC287_FIXUP_CS35L41_I2C_2),
Greg Kroah-Hartman
maintainerPATCH 336/414 ALSA: hda/realtek: Add quirk for Asus GU605C
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Richard Fitzgerald <[email protected]>
commit 7b23887a0c70d15459f02c51651a111e9e5cab86 upstream.
The GU605C has similar audio hardware to the GU605M so apply the same quirk.
Note that in the linked bugzilla there are two separate problems with the GU605C. This patch fixes one of the problems, so I haven't added a Closes: tag.
--- sound/pci/hda/patch_realtek.c | 1 + 1 file changed, 1 insertion(+)
sound/pci/hda/patch_realtek.c +1 -0
@@ -10841,6 +10841,7 @@ static const struct hda_quirk alc269_fixSND_PCI_QUIRK (0x103c ,0x8e61 ,"HP Trekker " ,ALC287_FIXUP_CS35L41_I2C_2 ),SND_PCI_QUIRK (0x103c ,0x8e62 ,"HP Trekker " ,ALC287_FIXUP_CS35L41_I2C_2 ),SND_PCI_QUIRK (0x1043 ,0x1032 ,"ASUS VivoBook X513EA" ,ALC256_FIXUP_ASUS_MIC_NO_PRESENCE ), +SND_PCI_QUIRK (0x1043 ,0x1034 ,"ASUS GU605C" ,ALC285_FIXUP_ASUS_GU605_SPI_SPEAKER2_TO_DAC1 ),SND_PCI_QUIRK (0x1043 ,0x103e ,"ASUS X540SA" ,ALC256_FIXUP_ASUS_MIC ),SND_PCI_QUIRK (0x1043 ,0x103f ,"ASUS TX300" ,ALC282_FIXUP_ASUS_TX300 ), SND_PCI_QUIRK(0x1043, 0x1054, "ASUS G614FH/FM/FP", ALC287_FIXUP_CS35L41_I2C_2),
Greg Kroah-Hartman
maintainerPATCH 337/414 iio: accel: fxls8962af: Fix temperature calculation
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sean Nyekjaer <[email protected]>
commit 16038474e3a0263572f36326ef85057aaf341814 upstream.
According to spec temperature should be returned in milli degrees Celsius. Add in_temp_scale to calculate from Celsius to milli Celsius.
--- drivers/iio/accel/fxls8962af-core.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/iio/accel/fxls8962af-core.c +12 -2
@@ -22,6 +22,7 @@#include <linux/property.h> #include <linux/regulator/consumer.h> #include <linux/regmap.h> +#include <linux/units.h> #include <linux/iio/buffer.h> #include <linux/iio/events.h>
@@ -436,8 +437,16 @@ static int fxls8962af_read_raw(struct ii *val =FXLS8962AF_TEMP_CENTER_VAL ;return IIO_VAL_INT ;case IIO_CHAN_INFO_SCALE : - *val =0 ; -return fxls8962af_read_full_scale (data, val2); +switch (chan->type) { +case IIO_TEMP : + *val =MILLIDEGREE_PER_DEGREE ; +return IIO_VAL_INT ; +case IIO_ACCEL : + *val =0 ; +return fxls8962af_read_full_scale (data, val2); +default : +return -EINVAL ; + }case IIO_CHAN_INFO_SAMP_FREQ :return fxls8962af_read_samp_freq (data, val, val2);default :
@@ -736,6 +745,7 @@ static const struct iio_event_spec fxls8 .type = IIO_TEMP, \ .address = FXLS8962AF_TEMP_OUT, \ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW) | \ + BIT(IIO_CHAN_INFO_SCALE) | \ BIT(IIO_CHAN_INFO_OFFSET),\ .scan_index = -1, \ .scan_type = { \
Greg Kroah-Hartman
maintainerPATCH 338/414 mm/hugetlb: unshare page tables during VMA split, not before
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jann Horn <[email protected]>
commit 081056dc00a27bccb55ccc3c6f230a3d5fd3f7e0 upstream.
Currently, __split_vma() triggers hugetlb page table unsharing through vm_ops->may_split(). This happens before the VMA lock and rmap locks are taken - which is too early, it allows racing VMA-locked page faults in our process and racing rmap walks from other processes to cause page tables to be shared again before we actually perform the split.
Fix it by explicitly calling into the hugetlb unshare logic from __split_vma() in the same place where THP splitting also happens. At that point, both the VMA and the rmap(s) are write-locked.
An annoying detail is that we can now call into the helper hugetlb_unshare_pmds() from two different locking contexts:
1. from hugetlb_split(), holding:
- mmap lock (exclusively)
- VMA lock
- file rmap lock (exclusively)
2. hugetlb_unshare_all_pmds(), which I think is designed to be able to call us with only the mmap lock held (in shared mode), but currently only runs while holding mmap lock (exclusively) and VMA lock
Backporting note:
This commit fixes a racy protection that was introduced in commit b30c14cd6102 ("hugetlb: unshare some PMDs when splitting VMAs"); that commit claimed to fix an issue introduced in 5.13, but it should actually also go all the way back.
--- include/linux/hugetlb.h | 3 + mm/hugetlb.c | 60 ++++++++++++++++++++++++++++----------- mm/vma.c | 7 ++++ mm/vma_internal.h | 1 tools/testing/vma/vma_internal.h | 2 + 5 files changed, 57 insertions(+), 16 deletions(-)
include/linux/hugetlb.h +3 -0
@@ -272,6 +272,7 @@ long hugetlb_change_protection(struct vmbool is_hugetlb_entry_migration (pte_t pte);bool is_hugetlb_entry_hwpoisoned (pte_t pte);void hugetlb_unshare_all_pmds (struct vm_area_struct *vma); +void hugetlb_split (struct vm_area_struct *vma,unsigned long addr);#else /* !CONFIG_HUGETLB_PAGE */
@@ -465,6 +466,8 @@ static inline vm_fault_t hugetlb_fault(sstatic inline void hugetlb_unshare_all_pmds (struct vm_area_struct *vma) { } +static inline void hugetlb_split (struct vm_area_struct *vma,unsigned long addr) {} +#endif /* !CONFIG_HUGETLB_PAGE */ #ifndef pgd_write
mm/hugetlb.c +44 -16
109 lines not on this page · raw message
mm/vma.c +7 -0
@@ -416,7 +416,14 @@ static int __split_vma(struct vma_iteratinit_vma_prep (&vp, vma); vp.insert = new;vma_prepare (&vp); + +/* +* Get rid of huge pages and shared page tables straddling the split +* boundary. +*/ vma_adjust_trans_huge (vma, vma->vm_start, addr,0 ); +if (is_vm_hugetlb_page (vma)) +hugetlb_split (vma, addr);if (new_below) { vma->vm_start = addr;
mm/vma_internal.h +1 -0
@@ -17,6 +17,7 @@#include <linux/file.h> #include <linux/fs.h> #include <linux/huge_mm.h> +#include <linux/hugetlb.h> #include <linux/hugetlb_inline.h> #include <linux/kernel.h> #include <linux/khugepaged.h>
tools/testing/vma/vma_internal.h +2 -0
@@ -735,6 +735,8 @@ static inline void vma_adjust_trans_huge (void )adjust_next; } +static inline void hugetlb_split (struct vm_area_struct *,unsigned long ) {} +static inline void vma_iter_free (struct vma_iterator *vmi) {mas_destroy (&vmi->mas);
Greg Kroah-Hartman
maintainerPATCH 339/414 drm/amdgpu: read back register after written for VCN v4.0.5
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: David (Ming Qiang) Wu <[email protected]>
commit ee7360fc27d6045510f8fe459b5649b2af27811a upstream.
On VCN v4.0.5 there is a race condition where the WPTR is not updated after starting from idle when doorbell is used. Adding register read-back after written at function end is to ensure all register writes are done before they can be used.
Hand modified for contextual changes where there is a for loop in 6.12 that was dropped later on.
--- drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c +8 -0
@@ -985,6 +985,10 @@ static int vcn_v4_0_5_start_dpg_mode(str ring->doorbell_index <<VCN_RB1_DB_CTRL__OFFSET__SHIFT | VCN_RB1_DB_CTRL__EN_MASK); +/* Keeping one read-back to ensure all register writes are done, otherwise +* it may introduce race conditions */ +RREG32_SOC15 (VCN , inst_idx, regVCN_RB1_DB_CTRL); +return 0 ; }
@@ -1167,6 +1171,10 @@ static int vcn_v4_0_5_start(struct amdgp tmp |=VCN_RB_ENABLE__RB1_EN_MASK ;WREG32_SOC15 (VCN , i, regVCN_RB_ENABLE, tmp); fw_shared->sq.queue_mode &= ~(FW_QUEUE_RING_RESET |FW_QUEUE_DPG_HOLD_OFF ); + +/* Keeping one read-back to ensure all register writes are done, otherwise +* it may introduce race conditions */ +RREG32_SOC15 (VCN , i, regVCN_RB_ENABLE); }return 0 ;
Greg Kroah-Hartman
maintainerPATCH 340/414 kbuild: rust: add rustc-min-version support function
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Miguel Ojeda <[email protected]>
commit ac954145e1ee3f72033161cbe4ac0b16b5354ae7 upstream.
Introduce rustc-min-version support function that mimics {gcc,clang}-min-version ones, following commit 88b61e3bff93 ("Makefile.compiler: replace cc-ifversion with compiler-specific macros").
In addition, use it in the first use case we have in the kernel (which was done independently to minimize the changes needed for the fix).
--- Documentation/kbuild/makefiles.rst | 14 ++++++++++++++ arch/arm64/Makefile | 2 +- scripts/Makefile.compiler | 4 ++++ 3 files changed, 19 insertions(+), 1 deletion(-)
Documentation/kbuild/makefiles.rst +14 -0
@@ -656,6 +656,20 @@ cc-cross-prefix endif endif +$(RUSTC) support functions +-------------------------- + +rustc-min-version + rustc-min-version tests if the value of $(CONFIG_RUSTC_VERSION) is greater + than or equal to the provided value and evaluates to y if so. + + Example:: + + rustflags-$(call rustc-min-version, 108500) := -Cfoo + + In this example, rustflags-y will be assigned the value -Cfoo if + $(CONFIG_RUSTC_VERSION) is >= 1.85.0. + $(LD) support functions -----------------------
arch/arm64/Makefile +1 -1
@@ -48,7 +48,7 @@ KBUILD_CFLAGS += $(CC_FLAGS_NO_FPU) \ KBUILD_CFLAGS += $(call cc-disable-warning, psabi) KBUILD_AFLAGS += $(compat_vdso) -ifeq ($(call test-ge, $(CONFIG_RUSTC_VERSION), 108500),y) +ifeq ($(call rustc-min-version, 108500),y) KBUILD_RUSTFLAGS += --target=aarch64-unknown-none-softfloat else KBUILD_RUSTFLAGS += --target=aarch64-unknown-none -Ctarget-feature="-neon"
scripts/Makefile.compiler +4 -0
@@ -67,6 +67,10 @@ gcc-min-version = $(call test-ge, $(CONF # Usage: cflags-$(call clang-min-version, 110000) += -foo clang-min-version = $(call test-ge, $(CONFIG_CLANG_VERSION), $1) +# rustc-min-version +# Usage: rustc-$(call rustc-min-version, 108500) += -Cfoo +rustc-min-version = $(call test-ge, $(CONFIG_RUSTC_VERSION), $1) + # ld-option # Usage: KBUILD_LDFLAGS += $(call ld-option, -X, -Y) ld-option = $(call try-run, $(LD) $(KBUILD_LDFLAGS) $(1) -v,$(1),$(2),$(3))
Greg Kroah-Hartman
maintainerPATCH 341/414 rust: compile libcore with edition 2024 for 1.87+
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gary Guo <[email protected]>
commit f4daa80d6be7d3c55ca72a8e560afc4e21f886aa upstream.
Rust 1.87 (released on 2025-05-15) compiles core library with edition 2024 instead of 2021 [1]. Ensure that the edition matches libcore's expectation to avoid potential breakage.
[ J3m3 reported in Zulip [2] that the rust-analyzer target was
broken after this patch -- indeed, we need to avoid core-cfgs since those are passed to the rust-analyzer target.
So, instead, I tweaked the patch to create a new core-edition variable and explicitly mention the --edition flag instead of reusing core-cfgs.
In addition, pass a new argument using this new variable to generate_rust_analyzer.py so that we set the right edition there.
By the way, for future reference: the filter-out change is needed for Rust < 1.87, since otherwise we would skip the --edition=2021 we just added, ending up with no edition flag, and thus the compiler would default to the 2015 one.
[2] https://rust-for-linux.zulipchat.com/#narrow/channel/291565/topic/x/near/520206547
- Miguel ]
--- rust/Makefile | 14 ++++++++------ scripts/generate_rust_analyzer.py | 13 ++++++++----- 2 files changed, 16 insertions(+), 11 deletions(-)
rust/Makefile +8 -6
@@ -53,6 +53,8 @@ endif core-cfgs = \ --cfg no_fp_fmt_parse +core-edition := $(if $(call rustc-min-version,108700),2024,2021) + quiet_cmd_rustdoc = RUSTDOC $(if $(rustdoc_host),H, ) $< cmd_rustdoc = \ OBJTREE=$(abspath $(objtree)) \
@@ -95,8 +97,8 @@ rustdoc-macros: $(src)/macros/lib.rs FOR # Starting with Rust 1.82.0, skipping `-Wrustdoc::unescaped_backticks` should # not be needed -- see https://github.com/rust-lang/rust/pull/128307. -rustdoc-core: private skip_flags = -Wrustdoc::unescaped_backticks -rustdoc-core: private rustc_target_flags = $(core-cfgs) +rustdoc-core: private skip_flags = --edition=2021 -Wrustdoc::unescaped_backticks +rustdoc-core: private rustc_target_flags = --edition=$(core-edition) $(core-cfgs) rustdoc-core: $(RUST_LIB_SRC)/core/src/lib.rs FORCE +$(call if_changed,rustdoc)
@@ -372,7 +374,7 @@ quiet_cmd_rustc_library = $(if $(skip_cl cmd_rustc_library = \ OBJTREE=$(abspath $(objtree)) \ $(if $(skip_clippy),$(RUSTC),$(RUSTC_OR_CLIPPY)) \ - $(filter-out $(skip_flags),$(rust_flags) $(rustc_target_flags)) \ + $(filter-out $(skip_flags),$(rust_flags)) $(rustc_target_flags) \ --emit=dep-info=$(depfile) --emit=obj=$@ \ --emit=metadata=$(dir $@)$(patsubst %.o,lib%.rmeta,$(notdir $@)) \ --crate-type rlib -L$(objtree)/$(obj) \
@@ -383,7 +385,7 @@ quiet_cmd_rustc_library = $(if $(skip_cl rust-analyzer: $(Q)$(srctree)/scripts/generate_rust_analyzer.py \ - --cfgs='core=$(core-cfgs)' \ + --cfgs='core=$(core-cfgs)' $(core-edition) \ $(realpath $(srctree)) $(realpath $(objtree)) \ $(rustc_sysroot) $(RUST_LIB_SRC) $(KBUILD_EXTMOD) > \ $(if $(KBUILD_EXTMOD),$(extmod_prefix),$(objtree))/rust-project.json
@@ -407,9 +409,9 @@ define rule_rustc_library endef $(obj)/core.o: private skip_clippy = 1 -$(obj)/core.o: private skip_flags = -Wunreachable_pub +$(obj)/core.o: private skip_flags = --edition=2021 -Wunreachable_pub $(obj)/core.o: private rustc_objcopy = $(foreach sym,$(redirect-intrinsics),--redefine-sym $(sym)=__rust$(sym)) -$(obj)/core.o: private rustc_target_flags = $(core-cfgs) +$(obj)/core.o: private rustc_target_flags = --edition=$(core-edition) $(core-cfgs) $(obj)/core.o: $(RUST_LIB_SRC)/core/src/lib.rs \ $(wildcard $(objtree)/include/config/RUSTC_VERSION_TEXT) FORCE +$(call if_changed_rule,rustc_library)
scripts/generate_rust_analyzer.py +8 -5
@@ -18,7 +18,7 @@ def args_crates_cfgs(cfgs): return crates_cfgs -def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs): +def generate_crates(srctree, objtree, sysroot_src, external_src, cfgs, core_edition): # Generate the configuration list. cfg = [] with open(objtree / "include" / "generated" / "rustc_cfg") as fd:
@@ -34,7 +34,7 @@ def generate_crates(srctree, objtree, sy crates_indexes = {} crates_cfgs = args_crates_cfgs(cfgs) - def append_crate(display_name, root_module, deps, cfg=[], is_workspace_member=True, is_proc_macro=False): + def append_crate(display_name, root_module, deps, cfg=[], is_workspace_member=True, is_proc_macro=False, edition="2021"): crates_indexes[display_name] = len(crates) crates.append({ "display_name": display_name,
@@ -43,7 +43,7 @@ def generate_crates(srctree, objtree, sy "is_proc_macro": is_proc_macro, "deps": [{"crate": crates_indexes[dep], "name": dep} for dep in deps], "cfg": cfg, - "edition": "2021", + "edition": edition, "env": { "RUST_MODFILE": "This is only for rust-analyzer" }
@@ -53,6 +53,7 @@ def generate_crates(srctree, objtree, sy display_name, deps, cfg=[], + edition="2021", ): append_crate( display_name,
@@ -60,12 +61,13 @@ def generate_crates(srctree, objtree, sy deps, cfg, is_workspace_member=False, + edition=edition, ) # NB: sysroot crates reexport items from one another so setting up our transitive dependencies # here is important for ensuring that rust-analyzer can resolve symbols. The sources of truth # for this dependency graph are `(sysroot_src / crate / "Cargo.toml" for crate in crates)`. - append_sysroot_crate("core", [], cfg=crates_cfgs.get("core", [])) + append_sysroot_crate("core", [], cfg=crates_cfgs.get("core", []), edition=core_edition) append_sysroot_crate("alloc", ["core"]) append_sysroot_crate("std", ["alloc", "core"]) append_sysroot_crate("proc_macro", ["core", "std"])
@@ -155,6 +157,7 @@ def main(): parser = argparse.ArgumentParser() parser.add_argument('--verbose', '-v', action='store_true') parser.add_argument('--cfgs', action='append', default=[]) + parser.add_argument("core_edition") parser.add_argument("srctree", type=pathlib.Path) parser.add_argument("objtree", type=pathlib.Path) parser.add_argument("sysroot", type=pathlib.Path)
@@ -171,7 +174,7 @@ def main(): assert args.sysroot in args.sysroot_src.parents rust_project = { - "crates": generate_crates(args.srctree, args.objtree, args.sysroot_src, args.exttree, args.cfgs), + "crates": generate_crates(args.srctree, args.objtree, args.sysroot_src, args.exttree, args.cfgs, args.core_edition), "sysroot": str(args.sysroot), }
Greg Kroah-Hartman
maintainerPATCH 342/414 net: Fix checksum update for ILA adj-transport
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Chaignon <[email protected]>
commit 6043b794c7668c19dabc4a93c75b924a19474d59 upstream.
During ILA address translations, the L4 checksums can be handled in different ways. One of them, adj-transport, consist in parsing the transport layer and updating any found checksum. This logic relies on inet_proto_csum_replace_by_diff and produces an incorrect skb->csum when in state CHECKSUM_COMPLETE.
This bug can be reproduced with a simple ILA to SIR mapping, assuming packets are received with CHECKSUM_COMPLETE:
$ ip a show dev eth0
14: eth0@if15: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UP group default qlen 1000
link/ether 62:ae:35:9e:0f:8d brd ff:ff:ff:ff:ff:ff link-netnsid 0
inet6 3333:0:0:1::c078/64 scope global
valid_lft forever preferred_lft forever
inet6 fd00:10:244:1::c078/128 scope global nodad
valid_lft forever preferred_lft forever
inet6 fe80::60ae:35ff:fe9e:f8d/64 scope link proto kernel_ll
valid_lft forever preferred_lft forever
$ ip ila add loc_match fd00:10:244:1 loc 3333:0:0:1 \
csum-mode adj-transport ident-type luid dev eth0Then I hit [fd00:10:244:1::c078]:8000 with a server listening only on [3333:0:0:1::c078]:8000. With the bug, the SYN packet is dropped with SKB_DROP_REASON_TCP_CSUM after inet_proto_csum_replace_by_diff changed skb->csum. The translation and drop are visible on pwru [1] traces:
IFACE TUPLE FUNC eth0:9 [fd00:10:244:3::3d8]:51420->[fd00:10:244:1::c078]:8000(tcp) ipv6_rcv eth0:9 [fd00:10:244:3::3d8]:51420->[fd00:10:244:1::c078]:8000(tcp) ip6_rcv_core eth0:9 [fd00:10:244:3::3d8]:51420->[fd00:10:244:1::c078]:8000(tcp) nf_hook_slow eth0:9 [fd00:10:244:3::3d8]:51420->[fd00:10:244:1::c078]:8000(tcp) inet_proto_csum_replace_by_diff eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) tcp_v6_early_demux eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) ip6_route_input eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) ip6_input eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) ip6_input_finish eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) ip6_protocol_deliver_rcu eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) raw6_local_deliver eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) ipv6_raw_deliver eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) tcp_v6_rcv eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) __skb_checksum_complete eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) kfree_skb_reason(SKB_DROP_REASON_TCP_CSUM) eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) skb_release_head_state eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) skb_release_data eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) skb_free_head eth0:9 [fd00:10:244:3::3d8]:51420->[3333:0:0:1::c078]:8000(tcp) kfree_skbmem
This is happening because inet_proto_csum_replace_by_diff is updating skb->csum when it shouldn't. The L4 checksum is updated such that it "cancels" the IPv6 address change in terms of checksum computation, so the impact on skb->csum is null.
Note this would be different for an IPv4 packet since three fields would be updated: the IPv4 address, the IP checksum, and the L4 checksum. Two would cancel each other and skb->csum would still need to be updated to take the L4 checksum change into account.
This patch fixes it by passing an ipv6 flag to inet_proto_csum_replace_by_diff, to skip the skb->csum update if we're in the IPv6 case. Note the behavior of the only other user of inet_proto_csum_replace_by_diff, the BPF subsystem, is left as is in this patch and fixed in the subsequent patch.
With the fix, using the reproduction from above, I can confirm skb->csum is not touched by inet_proto_csum_replace_by_diff and the TCP SYN proceeds to the application after the ILA translation.
--- include/net/checksum.h | 2 +- net/core/filter.c | 2 +- net/core/utils.c | 4 ++-- net/ipv6/ila/ila_common.c | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-)
include/net/checksum.h +1 -1
@@ -158,7 +158,7 @@ void inet_proto_csum_replace16(__sum16 * const __be32 *from, const __be32 *to, bool pseudohdr);void inet_proto_csum_replace_by_diff (__sum16 *sum,struct sk_buff *skb, -__wsum diff,bool pseudohdr); +__wsum diff,bool pseudohdr,bool ipv6); static __always_inline void inet_proto_csum_replace2(__sum16 *sum, struct sk_buff *skb,
net/core/filter.c +1 -1
@@ -1999,7 +1999,7 @@ BPF_CALL_5(bpf_l4_csum_replace, struct sif (unlikely (from !=0 ))return -EINVAL ; -inet_proto_csum_replace_by_diff (ptr, skb, to, is_pseudo); +inet_proto_csum_replace_by_diff (ptr, skb, to, is_pseudo, false);break ;case 2 :inet_proto_csum_replace2 (ptr, skb, from, to, is_pseudo);
net/core/utils.c +2 -2
@@ -473,11 +473,11 @@ void inet_proto_csum_replace16(__sum16 *EXPORT_SYMBOL (inet_proto_csum_replace16);void inet_proto_csum_replace_by_diff (__sum16 *sum,struct sk_buff *skb, -__wsum diff,bool pseudohdr) +__wsum diff,bool pseudohdr,bool ipv6) {if (skb->ip_summed !=CHECKSUM_PARTIAL ) {csum_replace_by_diff (sum, diff); -if (skb->ip_summed ==CHECKSUM_COMPLETE && pseudohdr) +if (skb->ip_summed ==CHECKSUM_COMPLETE && pseudohdr && !ipv6) skb->csum = ~csum_sub (diff, skb->csum); }else if (pseudohdr) { *sum = ~csum_fold (csum_add (diff,csum_unfold (*sum)));
net/ipv6/ila/ila_common.c +3 -3
@@ -86,7 +86,7 @@ static void ila_csum_adjust_transport(st diff =get_csum_diff (ip6h, p);inet_proto_csum_replace_by_diff (&th->check, skb, - diff, true); + diff, true, true); }break ;case NEXTHDR_UDP :
@@ -97,7 +97,7 @@ static void ila_csum_adjust_transport(stif (uh->check || skb->ip_summed ==CHECKSUM_PARTIAL ) { diff =get_csum_diff (ip6h, p);inet_proto_csum_replace_by_diff (&uh->check, skb, - diff, true); + diff, true, true);if (!uh->check) uh->check =CSUM_MANGLED_0 ; }
@@ -111,7 +111,7 @@ static void ila_csum_adjust_transport(st diff =get_csum_diff (ip6h, p);inet_proto_csum_replace_by_diff (&ih->icmp6_cksum, skb, - diff, true); + diff, true, true); }break ; }
Greg Kroah-Hartman
maintainerPATCH 343/414 bpf: Fix L4 csum update on IPv6 in CHECKSUM_COMPLETE
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Chaignon <[email protected]>
commit ead7f9b8de65632ef8060b84b0c55049a33cfea1 upstream.
In Cilium, we use bpf_csum_diff + bpf_l4_csum_replace to, among other things, update the L4 checksum after reverse SNATing IPv6 packets. That use case is however not currently supported and leads to invalid skb->csum values in some cases. This patch adds support for IPv6 address changes in bpf_l4_csum_update via a new flag.
When calling bpf_l4_csum_replace in Cilium, it ends up calling inet_proto_csum_replace_by_diff:
1: void inet_proto_csum_replace_by_diff(__sum16 *sum, struct sk_buff *skb,
2: __wsum diff, bool pseudohdr)
3: {
4: if (skb->ip_summed != CHECKSUM_PARTIAL) {
5: csum_replace_by_diff(sum, diff);
6: if (skb->ip_summed == CHECKSUM_COMPLETE && pseudohdr)
7: skb->csum = ~csum_sub(diff, skb->csum);
8: } else if (pseudohdr) {
9: *sum = ~csum_fold(csum_add(diff, csum_unfold(*sum)));
10: }
11: }The bug happens when we're in the CHECKSUM_COMPLETE state. We've just updated one of the IPv6 addresses. The helper now updates the L4 header checksum on line 5. Next, it updates skb->csum on line 7. It shouldn't.
For an IPv6 packet, the updates of the IPv6 address and of the L4 checksum will cancel each other. The checksums are set such that computing a checksum over the packet including its checksum will result in a sum of 0. So the same is true here when we update the L4 checksum on line 5. We'll update it as to cancel the previous IPv6 address update. Hence skb->csum should remain untouched in this case.
The same bug doesn't affect IPv4 packets because, in that case, three fields are updated: the IPv4 address, the IP checksum, and the L4 checksum. The change to the IPv4 address and one of the checksums still cancel each other in skb->csum, but we're left with one checksum update and should therefore update skb->csum accordingly. That's exactly what inet_proto_csum_replace_by_diff does.
This special case for IPv6 L4 checksums is also described atop inet_proto_csum_replace16, the function we should be using in this case.
This patch introduces a new bpf_l4_csum_replace flag, BPF_F_IPV6, to indicate that we're updating the L4 checksum of an IPv6 packet. When the flag is set, inet_proto_csum_replace_by_diff will skip the skb->csum update.
--- include/uapi/linux/bpf.h | 2 ++ net/core/filter.c | 5 +++-- tools/include/uapi/linux/bpf.h | 2 ++ 3 files changed, 7 insertions(+), 2 deletions(-)
include/uapi/linux/bpf.h +2 -0
@@ -2035,6 +2035,7 @@ union bpf_attr {* for updates resulting in a null checksum the value is set to * **CSUM_MANGLED_0** instead. Flag **BPF_F_PSEUDO_HDR** indicates * the checksum is to be computed against a pseudo-header. +* Flag **BPF_F_IPV6** should be set for IPv6 packets. * * This helper works in combination with **bpf_csum_diff**\ (), * which does not update the checksum in-place, but offers more
@@ -6049,6 +6050,7 @@ enum {BPF_F_PSEUDO_HDR = (1ULL <<4 ),BPF_F_MARK_MANGLED_0 = (1ULL <<5 ),BPF_F_MARK_ENFORCE = (1ULL <<6 ), + BPF_F_IPV6 = (1ULL << 7), };/* BPF_FUNC_skb_set_tunnel_key and BPF_FUNC_skb_get_tunnel_key flags. */
net/core/filter.c +3 -2
@@ -1980,10 +1980,11 @@ BPF_CALL_5(bpf_l4_csum_replace, struct sbool is_pseudo = flags &BPF_F_PSEUDO_HDR ;bool is_mmzero = flags &BPF_F_MARK_MANGLED_0 ;bool do_mforce = flags &BPF_F_MARK_ENFORCE ; +bool is_ipv6 = flags &BPF_F_IPV6 ;__sum16 *ptr;if (unlikely (flags & ~(BPF_F_MARK_MANGLED_0 |BPF_F_MARK_ENFORCE | -BPF_F_PSEUDO_HDR |BPF_F_HDR_FIELD_MASK ))) +BPF_F_PSEUDO_HDR |BPF_F_HDR_FIELD_MASK |BPF_F_IPV6 )))return -EINVAL ;if (unlikely (offset >0xffff || offset &1 ))return -EFAULT ;
@@ -1999,7 +2000,7 @@ BPF_CALL_5(bpf_l4_csum_replace, struct sif (unlikely (from !=0 ))return -EINVAL ; -inet_proto_csum_replace_by_diff (ptr, skb, to, is_pseudo, false); +inet_proto_csum_replace_by_diff (ptr, skb, to, is_pseudo, is_ipv6);break ;case 2 :inet_proto_csum_replace2 (ptr, skb, from, to, is_pseudo);
tools/include/uapi/linux/bpf.h +2 -0
@@ -2035,6 +2035,7 @@ union bpf_attr {* for updates resulting in a null checksum the value is set to * **CSUM_MANGLED_0** instead. Flag **BPF_F_PSEUDO_HDR** indicates * the checksum is to be computed against a pseudo-header. +* Flag **BPF_F_IPV6** should be set for IPv6 packets. * * This helper works in combination with **bpf_csum_diff**\ (), * which does not update the checksum in-place, but offers more
@@ -6049,6 +6050,7 @@ enum {BPF_F_PSEUDO_HDR = (1ULL <<4 ),BPF_F_MARK_MANGLED_0 = (1ULL <<5 ),BPF_F_MARK_ENFORCE = (1ULL <<6 ), + BPF_F_IPV6 = (1ULL << 7), };/* BPF_FUNC_skb_set_tunnel_key and BPF_FUNC_skb_get_tunnel_key flags. */
Greg Kroah-Hartman
maintainerPATCH 344/414 erofs: remove unused trace event erofs_destroy_inode
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Gao Xiang <[email protected]>
commit 30b58444807c93bffeaba7d776110f2a909d2f9a upstream.
The trace event erofs_destroy_inode was added but remains unused. This unused event contributes approximately 5KB to the kernel module size.
--- include/trace/events/erofs.h | 18 ------------------ 1 file changed, 18 deletions(-)
include/trace/events/erofs.h +0 -18
@@ -211,24 +211,6 @@ TRACE_EVENT(erofs_map_blocks_exit, show_mflags(__entry->mflags), __entry->ret) ); -TRACE_EVENT (erofs_destroy_inode, - TP_PROTO(struct inode *inode), - -TP_ARGS (inode), - -TP_STRUCT__entry ( - __field( dev_t, dev ) -__field ( erofs_nid_t, nid ) - ), - -TP_fast_assign ( - __entry->dev = inode->i_sb->s_dev; - __entry->nid = EROFS_I(inode)->nid; - ), - -TP_printk ("dev = (%d,%d), nid = %llu" ,show_dev_nid (__entry)) -); -#endif /* _TRACE_EROFS_H */ /* This part must be outside protection */
Greg Kroah-Hartman
maintainerPATCH 345/414 nfsd: use threads array as-is in netlink interface
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeff Layton <[email protected]>
commit 8ea688a3372e8369dc04395b39b4e71a6d91d4d5 upstream.
The old nfsdfs interface for starting a server with multiple pools handles the special case of a single entry array passed down from userland by distributing the threads over every NUMA node.
The netlink control interface however constructs an array of length nfsd_nrpools() and fills any unprovided slots with 0's. This behavior defeats the special casing that the old interface relies on.
Change nfsd_nl_threads_set_doit() to pass down the array from userland as-is.
--- fs/nfsd/nfsctl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-)
fs/nfsd/nfsctl.c +2 -3
@@ -1653,7 +1653,7 @@ out_unlock:*/ int nfsd_nl_threads_set_doit (struct sk_buff *skb,struct genl_info *info) { -int *nthreads, count =0 , nrpools, i, ret = -EOPNOTSUPP , rem; +int *nthreads, nrpools =0 , i, ret = -EOPNOTSUPP , rem;struct net *net =genl_info_net (info);struct nfsd_net *nn =net_generic (net, nfsd_net_id);const struct nlattr *attr;
@@ -1665,12 +1665,11 @@ int nfsd_nl_threads_set_doit(struct sk_b/* count number of SERVER_THREADS values */ nlmsg_for_each_attr (attr, info->nlhdr,GENL_HDRLEN , rem) {if (nla_type (attr) ==NFSD_A_SERVER_THREADS ) - count++; + nrpools++; }mutex_lock (&nfsd_mutex); - nrpools =max (count,nfsd_nrpools (net)); nthreads =kcalloc (nrpools,sizeof (int ),GFP_KERNEL );if (!nthreads) { ret = -ENOMEM ;
Greg Kroah-Hartman
maintainerPATCH 346/414 sunrpc: handle SVC_GARBAGE during svc auth processing as auth error
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jeff Layton <[email protected]>
commit 94d10a4dba0bc482f2b01e39f06d5513d0f75742 upstream.
tianshuo han reported a remotely-triggerable crash if the client sends a kernel RPC server a specially crafted packet. If decoding the RPC reply fails in such a way that SVC_GARBAGE is returned without setting the rq_accept_statp pointer, then that pointer can be dereferenced and a value stored there.
If it's the first time the thread has processed an RPC, then that pointer will be set to NULL and the kernel will crash. In other cases, it could create a memory scribble.
The server sunrpc code treats a SVC_GARBAGE return from svc_authenticate or pg_authenticate as if it should send a GARBAGE_ARGS reply. RFC 5531 says that if authentication fails that the RPC should be rejected instead with a status of AUTH_ERR.
Handle a SVC_GARBAGE return as an AUTH_ERROR, with a reason of AUTH_BADCRED instead of returning GARBAGE_ARGS in that case. This sidesteps the whole problem of touching the rpc_accept_statp pointer in this situation and avoids the crash.
--- net/sunrpc/svc.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-)
net/sunrpc/svc.c +2 -9
@@ -1369,7 +1369,8 @@ svc_process_common(struct svc_rqst *rqstcase SVC_OK :break ;case SVC_GARBAGE : - goto err_garbage_args; + rqstp->rq_auth_stat = rpc_autherr_badcred; + goto err_bad_auth;case SVC_SYSERR : goto err_system_err;case SVC_DENIED :
@@ -1510,14 +1511,6 @@ err_bad_proc: *rqstp->rq_accept_statp = rpc_proc_unavail; goto sendit; -err_garbage_args: -svc_printk (rqstp,"failed to decode RPC header\n" ); - -if (serv->sv_stats) - serv->sv_stats->rpcbadfmt++; - *rqstp->rq_accept_statp = rpc_garbage_args; - goto sendit; - err_system_err:if (serv->sv_stats) serv->sv_stats->rpcbadfmt++;
Greg Kroah-Hartman
maintainerPATCH 347/414 drm/v3d: Avoid NULL pointer dereference in `v3d_job_update_stats()`
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maíra Canal <[email protected]>
commit e1bc3a13bd775791cca0bb144d977b00f3598042 upstream.
The following kernel Oops was recently reported by Mesa CI:
[ 800.139824] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000588 [ 800.148619] Mem abort info: [ 800.151402] ESR = 0x0000000096000005 [ 800.155141] EC = 0x25: DABT (current EL), IL = 32 bits [ 800.160444] SET = 0, FnV = 0 [ 800.163488] EA = 0, S1PTW = 0 [ 800.166619] FSC = 0x05: level 1 translation fault [ 800.171487] Data abort info: [ 800.174357] ISV = 0, ISS = 0x00000005, ISS2 = 0x00000000 [ 800.179832] CM = 0, WnR = 0, TnD = 0, TagAccess = 0 [ 800.184873] GCS = 0, Overlay = 0, DirtyBit = 0, Xs = 0 [ 800.190176] user pgtable: 4k pages, 39-bit VAs, pgdp=00000001014c2000 [ 800.196607] [0000000000000588] pgd=0000000000000000, p4d=0000000000000000, pud=0000000000000000 [ 800.205305] Internal error: Oops: 0000000096000005 [#1] PREEMPT SMP [ 800.211564] Modules linked in: vc4 snd_soc_hdmi_codec drm_display_helper v3d cec gpu_sched drm_dma_helper drm_shmem_helper drm_kms_helper drm drm_panel_orientation_quirks snd_soc_core snd_compress snd_pcm_dmaengine snd_pcm i2c_brcmstb snd_timer snd backlight [ 800.234448] CPU: 0 UID: 0 PID: 0 Comm: swapper/0 Not tainted 6.12.25+rpt-rpi-v8 #1 Debian 1:6.12.25-1+rpt1 [ 800.244182] Hardware name: Raspberry Pi 4 Model B Rev 1.4 (DT) [ 800.250005] pstate: 600000c5 (nZCv daIF -PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 800.256959] pc : v3d_job_update_stats+0x60/0x130 [v3d] [ 800.262112] lr : v3d_job_update_stats+0x48/0x130 [v3d] [ 800.267251] sp : ffffffc080003e60 [ 800.270555] x29: ffffffc080003e60 x28: ffffffd842784980 x27: 0224012000000000 [ 800.277687] x26: ffffffd84277f630 x25: ffffff81012fd800 x24: 0000000000000020 [ 800.284818] x23: ffffff8040238b08 x22: 0000000000000570 x21: 0000000000000158 [ 800.291948] x20: 0000000000000000 x19: ffffff8040238000 x18: 0000000000000000 [ 800.299078] x17: ffffffa8c1bd2000 x16: ffffffc080000000 x15: 0000000000000000 [ 800.306208] x14: 0000000000000000 x13: 0000000000000000 x12: 0000000000000000 [ 800.313338] x11: 0000000000000040 x10: 0000000000001a40 x9 : ffffffd83b39757c [ 800.320468] x8 : ffffffd842786420 x7 : 7fffffffffffffff x6 : 0000000000ef32b0 [ 800.327598] x5 : 00ffffffffffffff x4 : 0000000000000015 x3 : ffffffd842784980 [ 800.334728] x2 : 0000000000000004 x1 : 0000000000010002 x0 : 000000ba4c0ca382 [ 800.341859] Call trace: [ 800.344294] v3d_job_update_stats+0x60/0x130 [v3d] [ 800.349086] v3d_irq+0x124/0x2e0 [v3d] [ 800.352835] __handle_irq_event_percpu+0x58/0x218 [ 800.357539] handle_irq_event+0x54/0xb8 [ 800.361369] handle_fasteoi_irq+0xac/0x240 [ 800.365458] handle_irq_desc+0x48/0x68 [ 800.369200] generic_handle_domain_irq+0x24/0x38 [ 800.373810] gic_handle_irq+0x48/0xd8 [ 800.377464] call_on_irq_stack+0x24/0x58 [ 800.381379] do_interrupt_handler+0x88/0x98 [ 800.385554] el1_interrupt+0x34/0x68 [ 800.389123] el1h_64_irq_handler+0x18/0x28 [ 800.393211] el1h_64_irq+0x64/0x68 [ 800.396603] default_idle_call+0x3c/0x168 [ 800.400606] do_idle+0x1fc/0x230 [ 800.403827] cpu_startup_entry+0x40/0x50 [ 800.407742] rest_init+0xe4/0xf0 [ 800.410962] start_kernel+0x5e8/0x790 [ 800.414616] __primary_switched+0x80/0x90 [ 800.418622] Code: 8b170277 8b160296 11000421 b9000861 (b9401ac1) [ 800.424707] ---[ end trace 0000000000000000 ]--- [ 800.457313] ---[ end Kernel panic - not syncing: Oops: Fatal exception in interrupt ]---
This issue happens when the file descriptor is closed before the jobs submitted by it are completed. When the job completes, we update the global GPU stats and the per-fd GPU stats, which are exposed through fdinfo. If the file descriptor was closed, then the struct v3d_file_priv and its stats were already freed and we can't update the per-fd stats.
Therefore, if the file descriptor was already closed, don't update the per-fd GPU stats, only update the global ones.
--- drivers/gpu/drm/v3d/v3d_sched.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/v3d/v3d_sched.c +6 -2
@@ -191,7 +191,6 @@ v3d_job_update_stats(struct v3d_job *jobstruct v3d_dev *v3d = job->v3d;struct v3d_file_priv *file = job->file->driver_priv;struct v3d_stats *global_stats = &v3d->queue[queue].stats; -struct v3d_stats *local_stats = &file->stats[queue];u64 now =local_clock ();unsigned long flags;
@@ -201,7 +200,12 @@ v3d_job_update_stats(struct v3d_job *jobelse preempt_disable (); -v3d_stats_update (local_stats, now); +/* Don't update the local stats if the file context has already closed */ +if (file) +v3d_stats_update (&file->stats[queue], now); +else +drm_dbg (&v3d->drm,"The file descriptor was closed before job completion\n" ); +v3d_stats_update (global_stats, now);if (IS_ENABLED (CONFIG_LOCKDEP ))
Greg Kroah-Hartman
maintainerPATCH 348/414 Kunit to check the longest symbol length
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sergio González Collado <[email protected]>
commit c104c16073b7fdb3e4eae18f66f4009f6b073d6f upstream.
The longest length of a symbol (KSYM_NAME_LEN) was increased to 512 in the reference [1]. This patch adds kunit test suite to check the longest symbol length. These tests verify that the longest symbol length defined is supported.
This test can also help other efforts for longer symbol length, like [2].
The test suite defines one symbol with the longest possible length.
The first test verify that functions with names of the created symbol, can be called or not.
The second test, verify that the symbols are created (or not) in the kernel symbol table.
[1] https://lore.kernel.org/lkml/[email protected]/
[2] https://lore.kernel.org/lkml/[email protected]/
--- arch/x86/tools/insn_decoder_test.c | 3 - lib/Kconfig.debug | 9 ++++ lib/Makefile | 2 lib/longest_symbol_kunit.c | 82 +++++++++++++++++++++++++++++++++++++ 4 files changed, 95 insertions(+), 1 deletion(-) create mode 100644 lib/longest_symbol_kunit.c
arch/x86/tools/insn_decoder_test.c +2 -1
@@ -10,6 +10,7 @@#include <assert.h> #include <unistd.h> #include <stdarg.h> +#include <linux/kallsyms.h> #define unlikely (cond) (cond)
@@ -106,7 +107,7 @@ static void parse_args(int argc, char ** } } -#define BUFSIZE 256 +#define BUFSIZE (256 + KSYM_NAME_LEN)int main (int argc,char **argv) {
lib/Kconfig.debug +9 -0
@@ -2807,6 +2807,15 @@ config FORTIFY_KUNIT_TEST by the str*() and mem*() family of functions. For testing runtime traps of FORTIFY_SOURCE, see LKDTM's "FORTIFY_*" tests. +config LONGEST_SYM_KUNIT_TEST + tristate "Test the longest symbol possible" if !KUNIT_ALL_TESTS + depends on KUNIT && KPROBES + default KUNIT_ALL_TESTS + help + Tests the longest symbol possible + + If unsure, say N. + config HW_BREAKPOINT_KUNIT_TEST bool "Test hw_breakpoint constraints accounting" if !KUNIT_ALL_TESTS depends on HAVE_HW_BREAKPOINT
lib/Makefile +2 -0
@@ -389,6 +389,8 @@ CFLAGS_fortify_kunit.o += $(DISABLE_STRU obj-$(CONFIG_FORTIFY_KUNIT_TEST) += fortify_kunit.o obj-$(CONFIG_SIPHASH_KUNIT_TEST) += siphash_kunit.o obj-$(CONFIG_USERCOPY_KUNIT_TEST) += usercopy_kunit.o +obj-$(CONFIG_LONGEST_SYM_KUNIT_TEST) += longest_symbol_kunit.o +CFLAGS_longest_symbol_kunit.o += $(call cc-disable-warning, missing-prototypes) obj-$(CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED) += devmem_is_allowed.o
lib/longest_symbol_kunit.c new file +82 -0
82 lines not on this page · raw message
Greg Kroah-Hartman
maintainerPATCH 349/414 x86/tools: Drop duplicate unlikely() definition in insn_decoder_test.c
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 f710202b2a45addea3dcdcd862770ecbaf6597ef upstream.
After commit c104c16073b7 ("Kunit to check the longest symbol length"), there is a warning when building with clang because there is now a definition of unlikely from compiler.h in tools/include/linux, which conflicts with the one in the instruction decoder selftest:
arch/x86/tools/insn_decoder_test.c:15:9: warning: 'unlikely' macro redefined [-Wmacro-redefined]
Remove the second unlikely() definition, as it is no longer necessary, clearing up the warning.
--- arch/x86/tools/insn_decoder_test.c | 2 -- 1 file changed, 2 deletions(-)
arch/x86/tools/insn_decoder_test.c +0 -2
@@ -12,8 +12,6 @@#include <stdarg.h> #include <linux/kallsyms.h> -#define unlikely (cond) (cond) -#include <asm/insn.h> #include <inat.c> #include <insn.c>
Greg Kroah-Hartman
maintainerPATCH 350/414 ipv6: remove leftover ip6 cookie initializer
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Willem de Bruijn <[email protected]>
commit 54580ccdd8a9c6821fd6f72171d435480867e4c3 upstream.
As of the blamed commit ipc6.dontfrag is always initialized at the start of udpv6_sendmsg, by ipcm6_init_sk, to either 0 or 1.
Later checks against -1 are no longer needed and the branches are now dead code.
The blamed commit had removed those branches. But I had overlooked this one case.
UDP has both a lockless fast path and a slower path for corked requests. This branch remained in the fast path.
--- net/ipv6/ip6_output.c | 2 -- 1 file changed, 2 deletions(-)
net/ipv6/ip6_output.c +0 -2
@@ -2043,8 +2043,6 @@ struct sk_buff *ip6_make_skb(struct sockip6_cork_release (cork, &v6_cork);return ERR_PTR (err); } -if (ipc6->dontfrag <0 ) - ipc6->dontfrag =inet6_test_bit (DONTFRAG , sk); err = __ip6_append_data(sk, &queue, cork, &v6_cork, ¤t->task_frag, getfrag, from,
Greg Kroah-Hartman
maintainerPATCH 351/414 ipv6: replace ipcm6_init calls with ipcm6_init_sk
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Willem de Bruijn <[email protected]>
commit 096208592b09c2f5fc0c1a174694efa41c04209d upstream.
This initializes tclass and dontfrag before cmsg parsing, removing the need for explicit checks against -1 in each caller.
Leave hlimit set to -1, because its full initialization (in ip6_sk_dst_hoplimit) requires more state (dst, flowi6, ..).
This also prepares for calling sockcm_init in a follow-on patch.
--- include/net/ipv6.h | 9 --------- net/ipv6/raw.c | 8 +------- net/ipv6/udp.c | 7 +------ net/l2tp/l2tp_ip6.c | 8 +------- 4 files changed, 3 insertions(+), 29 deletions(-)
include/net/ipv6.h +0 -9
@@ -363,15 +363,6 @@ struct ipcm6_cookie {struct ipv6_txoptions *opt; }; -static inline void ipcm6_init (struct ipcm6_cookie *ipc6) -{ - *ipc6 = (struct ipcm6_cookie ) { - .hlimit =-1 , - .tclass =-1 , - .dontfrag =-1 , - }; -} -static inline void ipcm6_init_sk (struct ipcm6_cookie *ipc6,const struct sock *sk) {
net/ipv6/raw.c +1 -7
@@ -777,7 +777,7 @@ static int rawv6_sendmsg(struct sock *sk fl6.flowi6_mark =READ_ONCE (sk->sk_mark); fl6.flowi6_uid = sk->sk_uid; -ipcm6_init (&ipc6); +ipcm6_init_sk (&ipc6, sk); ipc6.sockc.tsflags =READ_ONCE (sk->sk_tsflags); ipc6.sockc.mark = fl6.flowi6_mark;
@@ -890,9 +890,6 @@ static int rawv6_sendmsg(struct sock *skif (hdrincl) fl6.flowi6_flags |=FLOWI_FLAG_KNOWN_NH ; -if (ipc6.tclass <0 ) - ipc6.tclass = np->tclass; - fl6.flowlabel =ip6_make_flowinfo (ipc6.tclass, fl6.flowlabel); dst =ip6_dst_lookup_flow (sock_net (sk), sk, &fl6, final_p);
@@ -903,9 +900,6 @@ static int rawv6_sendmsg(struct sock *skif (ipc6.hlimit <0 ) ipc6.hlimit =ip6_sk_dst_hoplimit (np, &fl6, dst); -if (ipc6.dontfrag <0 ) - ipc6.dontfrag =inet6_test_bit (DONTFRAG , sk); -if (msg->msg_flags&MSG_CONFIRM ) goto do_confirm;
net/ipv6/udp.c +1 -6
@@ -1399,7 +1399,7 @@ int udpv6_sendmsg(struct sock *sk, strucint is_udplite =IS_UDPLITE (sk);int (*getfrag)(void *,char *,int ,int ,int ,struct sk_buff *); -ipcm6_init (&ipc6); +ipcm6_init_sk (&ipc6, sk); ipc6.gso_size =READ_ONCE (up->gso_size); ipc6.sockc.tsflags =READ_ONCE (sk->sk_tsflags); ipc6.sockc.mark =READ_ONCE (sk->sk_mark);
@@ -1608,9 +1608,6 @@ do_udp_sendmsg:security_sk_classify_flow (sk,flowi6_to_flowi_common (fl6)); -if (ipc6.tclass <0 ) - ipc6.tclass = np->tclass; - fl6->flowlabel =ip6_make_flowinfo (ipc6.tclass, fl6->flowlabel); dst =ip6_sk_dst_lookup_flow (sk, fl6, final_p, connected);
@@ -1656,8 +1653,6 @@ back_from_confirm:WRITE_ONCE (up->pending,AF_INET6 ); do_append_data: -if (ipc6.dontfrag <0 ) - ipc6.dontfrag =inet6_test_bit (DONTFRAG , sk); up->len += ulen; err = ip6_append_data(sk, getfrag, msg, ulen, sizeof(struct udphdr), &ipc6, fl6, dst_rt6_info(dst),
net/l2tp/l2tp_ip6.c +1 -7
@@ -547,7 +547,7 @@ static int l2tp_ip6_sendmsg(struct sock fl6.flowi6_mark =READ_ONCE (sk->sk_mark); fl6.flowi6_uid = sk->sk_uid; -ipcm6_init (&ipc6); +ipcm6_init_sk (&ipc6, sk);if (lsa) {if (addr_len <SIN6_LEN_RFC2133 )
@@ -634,9 +634,6 @@ static int l2tp_ip6_sendmsg(struct socksecurity_sk_classify_flow (sk,flowi6_to_flowi_common (&fl6)); -if (ipc6.tclass <0 ) - ipc6.tclass = np->tclass; - fl6.flowlabel =ip6_make_flowinfo (ipc6.tclass, fl6.flowlabel); dst =ip6_dst_lookup_flow (sock_net (sk), sk, &fl6, final_p);
@@ -648,9 +645,6 @@ static int l2tp_ip6_sendmsg(struct sockif (ipc6.hlimit <0 ) ipc6.hlimit =ip6_sk_dst_hoplimit (np, &fl6, dst); -if (ipc6.dontfrag <0 ) - ipc6.dontfrag =inet6_test_bit (DONTFRAG , sk); -if (msg->msg_flags &MSG_CONFIRM ) goto do_confirm;
Greg Kroah-Hartman
maintainerPATCH 352/414 smb: fix secondary channel creation issue with kerberos by populating hostname when adding channels
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bharath SM <[email protected]>
commit 306cb65bb0cb243389fcbd0a66907d5bdea07d1e upstream.
When mounting a share with kerberos authentication with multichannel support, share mounts correctly, but fails to create secondary channels. This occurs because the hostname is not populated when adding the channels. The hostname is necessary for the userspace cifs.upcall program to retrieve the required credentials and pass it back to kernel, without hostname secondary channels fails establish.
--- fs/smb/client/sess.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/smb/client/sess.c +1 -2
@@ -526,8 +526,7 @@ cifs_ses_add_channel(struct cifs_ses *se ctx->domainauto = ses->domainAuto; ctx->domainname = ses->domainName; -/* no hostname for extra channels */ - ctx->server_hostname ="" ; + ctx->server_hostname = ses->server->hostname; ctx->username = ses->user_name; ctx->password = ses->password;
Greg Kroah-Hartman
maintainerPATCH 353/414 drm/msm/disp: Correct porch timing for SDM845
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: James A. MacInnes <[email protected]>
[ Upstream commit 146e87f3e11de0dfa091ff87e34b4bc6eec761a4 ]
Type-C DisplayPort inoperable due to incorrect porch settings.
- Re-used wide_bus_en as flag to prevent porch shifting
Patchwork: https://patchwork.freedesktop.org/patch/636945/
--- .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)
drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c +9 -5
@@ -94,17 +94,21 @@ static void drm_mode_to_intf_timing_params( timing->vsync_polarity =0 ; } -/* for DP/EDP, Shift timings to align it to bottom right */ -if (phys_enc->hw_intf->cap->type ==INTF_DP ) { + timing->wide_bus_en =dpu_encoder_is_widebus_enabled (phys_enc->parent); + timing->compression_en =dpu_encoder_is_dsc_enabled (phys_enc->parent); + +/* +* For DP/EDP, Shift timings to align it to bottom right. +* wide_bus_en is set for everything excluding SDM845 & +* porch changes cause DisplayPort failure and HDMI tearing. +*/ +if (phys_enc->hw_intf->cap->type ==INTF_DP && timing->wide_bus_en) { timing->h_back_porch += timing->h_front_porch; timing->h_front_porch =0 ; timing->v_back_porch += timing->v_front_porch; timing->v_front_porch =0 ; } - timing->wide_bus_en =dpu_encoder_is_widebus_enabled (phys_enc->parent); - timing->compression_en =dpu_encoder_is_dsc_enabled (phys_enc->parent); -/* * for DP, divide the horizonal parameters by 2 when * widebus is enabled
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 354/414 drm/msm/dsi/dsi_phy_10nm: Fix missing initial VCO rate
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 8a48e35becb214743214f5504e726c3ec131cd6d ]
Driver unconditionally saves current state on first init in dsi_pll_10nm_init(), but does not save the VCO rate, only some of the divider registers. The state is then restored during probe/enable via msm_dsi_phy_enable() -> msm_dsi_phy_pll_restore_state() -> dsi_10nm_pll_restore_state().
Restoring calls dsi_pll_10nm_vco_set_rate() with pll_10nm->vco_current_rate=0, which basically overwrites existing rate of VCO and messes with clock hierarchy, by setting frequency to 0 to clock tree. This makes anyway little sense - VCO rate was not saved, so should not be restored.
If PLL was not configured configure it to minimum rate to avoid glitches and configuring entire in clock hierarchy to 0 Hz.
Patchwork: https://patchwork.freedesktop.org/patch/654796/
--- drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 7 +++++++ 1 file changed, 7 insertions(+)
drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c +7 -0
@@ -703,6 +703,13 @@ static int dsi_pll_10nm_init(struct msm_dsi_phy *phy)/* TODO: Remove this when we have proper display handover support */ msm_dsi_phy_pll_save_state (phy); +/* +* Store also proper vco_current_rate, because its value will be used in +* dsi_10nm_pll_restore_state(). +*/ +if (!dsi_pll_10nm_vco_recalc_rate (&pll_10nm->clk_hw,VCO_REF_CLK_RATE )) + pll_10nm->vco_current_rate = pll_10nm->phy->cfg->min_pll_rate; +return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 355/414 drm/msm: Fix CP_RESET_CONTEXT_STATE bitfield names
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Connor Abbott <[email protected]>
[ Upstream commit b1c9e797ad37d188675505b66a3a4bbeea5d9560 ]
Based on kgsl.
Patchwork: https://patchwork.freedesktop.org/patch/654922/
--- drivers/gpu/drm/msm/registers/adreno/adreno_pm4.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/msm/registers/adreno/adreno_pm4.xml +2 -1
@@ -2260,7 +2260,8 @@ opcode: CP_LOAD_STATE4 (30) (4 dwords) <reg32 offset="0" name="0"> <bitfield name="CLEAR_ON_CHIP_TS" pos="0" type="boolean"/> <bitfield name="CLEAR_RESOURCE_TABLE" pos="1" type="boolean"/> - <bitfield name="CLEAR_GLOBAL_LOCAL_TS" pos="2" type="boolean"/> + <bitfield name="CLEAR_BV_BR_COUNTER" pos="2" type="boolean"/> + <bitfield name="RESET_GLOBAL_LOCAL_TS" pos="3" type="boolean"/> </reg32> </domain>
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 356/414 drm/msm/a7xx: Call CP_RESET_CONTEXT_STATE
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Connor Abbott <[email protected]>
[ Upstream commit 2b520c6104f34e3a548525173c38ebca4402cac3 ]
Calling this packet is necessary when we switch contexts because there are various pieces of state used by userspace to synchronize between BR and BV that are persistent across submits and we need to make sure that they are in a "safe" state when switching contexts. Otherwise a userspace submission in one context could cause another context to function incorrectly and hang, effectively a denial of service (although without leaking data). This was missed during initial a7xx bringup.
Patchwork: https://patchwork.freedesktop.org/patch/654924/
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +14 -0
@@ -123,6 +123,20 @@ static void a6xx_set_pagetable(struct a6xx_gpu *a6xx_gpu,OUT_RING (ring,lower_32_bits (rbmemptr (ring, fence)));OUT_RING (ring,upper_32_bits (rbmemptr (ring, fence)));OUT_RING (ring, submit->seqno -1 ); + +OUT_PKT7 (ring,CP_THREAD_CONTROL ,1 ); +OUT_RING (ring,CP_SET_THREAD_BOTH ); + +/* Reset state used to synchronize BR and BV */ +OUT_PKT7 (ring,CP_RESET_CONTEXT_STATE ,1 ); +OUT_RING (ring, +CP_RESET_CONTEXT_STATE_0_CLEAR_ON_CHIP_TS | +CP_RESET_CONTEXT_STATE_0_CLEAR_RESOURCE_TABLE | +CP_RESET_CONTEXT_STATE_0_CLEAR_BV_BR_COUNTER | +CP_RESET_CONTEXT_STATE_0_RESET_GLOBAL_LOCAL_TS ); + +OUT_PKT7 (ring,CP_THREAD_CONTROL ,1 ); +OUT_RING (ring,CP_SET_THREAD_BR ); }if (!sysprof) {
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 357/414 drm/ssd130x: fix ssd132x_clear_screen() columns
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: John Keeping <[email protected]>
[ Upstream commit e479da4054875c4cc53a7fb956ebff03d2dac939 ]
The number of columns relates to the width, not the height. Use the correct variable.
--- drivers/gpu/drm/solomon/ssd130x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/solomon/ssd130x.c +1 -1
@@ -974,7 +974,7 @@ static void ssd130x_clear_screen(struct ssd130x_device *ssd130x, u8 *data_array)static void ssd132x_clear_screen (struct ssd130x_device *ssd130x,u8 *data_array) { -unsigned int columns =DIV_ROUND_UP (ssd130x->height,SSD132X_SEGMENT_WIDTH ); +unsigned int columns =DIV_ROUND_UP (ssd130x->width,SSD132X_SEGMENT_WIDTH );unsigned int height = ssd130x->height;memset (data_array,0 , columns * height);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 358/414 ionic: Prevent driver/fw getting out of sync on devcmd(s)
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 5466491c9e3309ed5c7adbb8fad6e93fcc9a8fe9 ]
Some stress/negative firmware testing around devcmd(s) returning EAGAIN found that the done bit could get out of sync in the firmware when it wasn't cleared in a retry case.
While here, change the type of the local done variable to a bool to match the return type from ionic_dev_cmd_done().
--- drivers/net/ethernet/pensando/ionic/ionic_main.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/net/ethernet/pensando/ionic/ionic_main.c +2 -1
@@ -515,9 +515,9 @@ static int __ionic_dev_cmd_wait(struct ionic *ionic, unsigned long max_seconds,unsigned long start_time;unsigned long max_wait;unsigned long duration; -int done =0 ;bool fw_up;int opcode; +bool done;int err;/* Wait for dev cmd to complete, retrying if we get EAGAIN,
@@ -525,6 +525,7 @@ static int __ionic_dev_cmd_wait(struct ionic *ionic, unsigned long max_seconds,*/ max_wait = jiffies + (max_seconds *HZ ); try_again: + done = false; opcode = idev->opcode; start_time = jiffies; for (fw_up = ionic_is_fw_running(idev);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 359/414 drm/nouveau/bl: increase buffer size to avoid truncate warning
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jacob Keller <[email protected]>
[ Upstream commit 61b2b3737499f1fb361a54a16828db24a8345e85 ]
The nouveau_get_backlight_name() function generates a unique name for the backlight interface, appending an id from 1 to 99 for all backlight devices after the first.
GCC 15 (and likely other compilers) produce the following -Wformat-truncation warning:
nouveau_backlight.c: In function ‘nouveau_backlight_init’:
nouveau_backlight.c:56:69: error: ‘%d’ directive output may be truncated writing between 1 and 10 bytes into a region of size 3 [-Werror=format-truncation=]
56 | snprintf(backlight_name, BL_NAME_SIZE, "nv_backlight%d", nb);
| ^~
In function ‘nouveau_get_backlight_name’,
inlined from ‘nouveau_backlight_init’ at nouveau_backlight.c:351:7:
nouveau_backlight.c:56:56: note: directive argument in the range [1, 2147483647]
56 | snprintf(backlight_name, BL_NAME_SIZE, "nv_backlight%d", nb);
| ^~~~~~~~~~~~~~~~
nouveau_backlight.c:56:17: note: ‘snprintf’ output between 14 and 23 bytes into a destination of size 15
56 | snprintf(backlight_name, BL_NAME_SIZE, "nv_backlight%d", nb);
| ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~The warning started appearing after commit ab244be47a8f ("drm/nouveau:
Fix a potential theorical leak in nouveau_get_backlight_name()") This fix for the ida usage removed the explicit value check for ids larger than 99. The compiler is unable to intuit that the ida_alloc_max() limits the returned value range between 0 and 99.
Because the compiler can no longer infer that the number ranges from 0 to 99, it thinks that it could use as many as 11 digits (10 + the potential - sign for negative numbers).
The warning has gone unfixed for some time, with at least one kernel test robot report. The code breaks W=1 builds, which is especially frustrating with the introduction of CONFIG_WERROR.
The string is stored temporarily on the stack and then copied into the device name. Its not a big deal to use 11 more bytes of stack rounding out to an even 24 bytes. Increase BL_NAME_SIZE to 24 to avoid the truncation warning. This fixes the W=1 builds that include this driver.
Compile tested only.
--- drivers/gpu/drm/nouveau/nouveau_backlight.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/nouveau/nouveau_backlight.c +1 -1
@@ -42,7 +42,7 @@#include "nouveau_acpi.h" static struct ida bl_ida; -#define BL_NAME_SIZE 15 // 12 for name + 2 for digits + 1 for '\0' +#define BL_NAME_SIZE 24 // 12 for name + 11 for digits + 1 for '\0' static bool nouveau_get_backlight_name(char backlight_name[BL_NAME_SIZE],
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 360/414 drm/i915/pmu: Fix build error with GCOV and AutoFDO enabled
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tzung-Bi Shih <[email protected]>
[ Upstream commit a7137b1825b535eb7258b25beeb0d5425e0037d2 ]
i915_pmu.c may fail to build with GCOV and AutoFDO enabled.
../drivers/gpu/drm/i915/i915_pmu.c:116:3: error: call to '__compiletime_assert_487' declared with 'error' attribute: BUILD_BUG_ON failed: bit > BITS_PER_TYPE(typeof_member(struct i915_pmu, enable)) - 1
116 | BUILD_BUG_ON(bit >
| ^Here is a way to reproduce the issue:
$ git checkout v6.15 $ mkdir build $ ./scripts/kconfig/merge_config.sh -O build -n -m <(cat <<EOF CONFIG_DRM=y CONFIG_PCI=y CONFIG_DRM_I915=y
CONFIG_PERF_EVENTS=y
CONFIG_DEBUG_FS=yCONFIG_GCOV_KERNEL=yCONFIG_GCOV_PROFILE_ALL=y
CONFIG_AUTOFDO_CLANG=y
EOF
)
$ PATH=${PATH}:${HOME}/llvm-20.1.5-x86_64/bin make LLVM=1 O=build \
olddefconfig
$ PATH=${PATH}:${HOME}/llvm-20.1.5-x86_64/bin make LLVM=1 O=build \
CLANG_AUTOFDO_PROFILE=...PATH_TO_SOME_AFDO_PROFILE... \
drivers/gpu/drm/i915/i915_pmu.oAlthough not super sure what happened, by reviewing the code, it should depend on __builtin_constant_p(bit) directly instead of assuming __builtin_constant_p(config) makes bit a builtin constant.
Also fix a nit, to reuse the bit local variable.
--- drivers/gpu/drm/i915/i915_pmu.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_pmu.c +2 -2
@@ -115,7 +115,7 @@ static u32 config_mask(const u64 config) {unsigned int bit =config_bit (config); -if (__builtin_constant_p (config)) +if (__builtin_constant_p (bit))BUILD_BUG_ON (bit > BITS_PER_TYPE(typeof_member(struct i915_pmu, enable)) -1 );
@@ -124,7 +124,7 @@ static u32 config_mask(const u64 config)BITS_PER_TYPE (typeof_member (struct i915_pmu , enable)) - 1); -return BIT (config_bit (config)); +return BIT (bit); }static bool is_engine_event (struct perf_event *event)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 361/414 hwmon: (occ) Rework attribute registration for stack usage
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 744c2fe950e936c4d62430de899d6253424200ed ]
clang produces an output with excessive stack usage when building the occ_setup_sensor_attrs() function, apparently the result of having a lot of struct literals and building with the -fno-strict-overflow option that leads clang to skip some optimization in case the 'attr' pointer overruns:
drivers/hwmon/occ/common.c:775:12: error: stack frame size (1392) exceeds limit (1280) in 'occ_setup_sensor_attrs' [-Werror,-Wframe-larger-than]
Replace the custom macros for initializing the attributes with a simpler function call that does not run into this corner case.
--- drivers/hwmon/occ/common.c | 212 +++++++++++++++---------------------- 1 file changed, 85 insertions(+), 127 deletions(-)
drivers/hwmon/occ/common.c +85 -127
@@ -747,29 +747,30 @@ static ssize_t occ_show_extended(struct device *dev, }/* -* Some helper macros to make it easier to define an occ_attribute. Since these -* are dynamically allocated, we shouldn't use the existing kernel macros which +* A helper to make it easier to define an occ_attribute. Since these +* are dynamically allocated, we cannot use the existing kernel macros which * stringify the name argument. */ -#define ATTR_OCC (_name, _mode, _show, _store) { \ - .attr = { \ - .name = _name, \ - .mode = VERIFY_OCTAL_PERMISSIONS(_mode), \ - }, \ - .show = _show, \ - .store = _store, \ -} - -#define SENSOR_ATTR_OCC (_name, _mode, _show, _store, _nr, _index) { \ - .dev_attr = ATTR_OCC(_name, _mode, _show, _store), \ - .index = _index, \ - .nr = _nr, \ +static void occ_init_attribute (struct occ_attribute *attr,int mode, +ssize_t (*show)(struct device *dev,struct device_attribute *attr,char *buf), +ssize_t (*store)(struct device *dev,struct device_attribute *attr, +const char *buf,size_t count), +int nr,int index,const char *fmt, ...) +{ +va_list args; + +va_start (args, fmt); +vsnprintf (attr->name,sizeof (attr->name), fmt, args); +va_end (args); + + attr->sensor.dev_attr.attr.name = attr->name; + attr->sensor.dev_attr.attr.mode = mode; + attr->sensor.dev_attr.show = show; + attr->sensor.dev_attr.store = store; + attr->sensor.index = index; + attr->sensor.nr = nr; } -#define OCC_INIT_ATTR (_name, _mode, _show, _store, _nr, _index) \ - ((struct sensor_device_attribute_2) \ - SENSOR_ATTR_OCC(_name, _mode, _show, _store, _nr, _index)) -/* * Allocate and instatiate sensor_device_attribute_2s. It's most efficient to * use our own instead of the built-in hwmon attribute types.
@@ -855,14 +856,15 @@ static int occ_setup_sensor_attrs(struct occ *occ) sensors->extended.num_sensors =0 ; } - occ->attrs =devm_kzalloc (dev,sizeof (*occ->attrs) * num_attrs, + occ->attrs =devm_kcalloc (dev, num_attrs,sizeof (*occ->attrs),GFP_KERNEL );if (!occ->attrs)return -ENOMEM ;/* null-terminated list */ - occ->group.attrs =devm_kzalloc (dev,sizeof (*occ->group.attrs) * - num_attrs +1 ,GFP_KERNEL ); + occ->group.attrs =devm_kcalloc (dev, num_attrs +1 , +sizeof (*occ->group.attrs), +GFP_KERNEL );if (!occ->group.attrs)return -ENOMEM ;
@@ -872,43 +874,33 @@ static int occ_setup_sensor_attrs(struct occ *occ) s = i +1 ; temp = ((struct temp_sensor_2 *)sensors->temp.data) + i; -snprintf (attr->name,sizeof (attr->name),"temp%d_label" , s); - attr->sensor =OCC_INIT_ATTR (attr->name,0444 , show_temp,NULL , -0 , i); +occ_init_attribute (attr,0444 , show_temp,NULL , +0 , i,"temp%d_label" , s); attr++;if (sensors->temp.version ==2 && temp->fru_type ==OCC_FRU_TYPE_VRM ) { -snprintf (attr->name,sizeof (attr->name), -"temp%d_alarm" , s); +occ_init_attribute (attr,0444 , show_temp,NULL , +1 , i,"temp%d_alarm" , s); }else { -snprintf (attr->name,sizeof (attr->name), -"temp%d_input" , s); +occ_init_attribute (attr,0444 , show_temp,NULL , +1 , i,"temp%d_input" , s); } - attr->sensor =OCC_INIT_ATTR (attr->name,0444 , show_temp,NULL , -1 , i); attr++;if (sensors->temp.version >1 ) { -snprintf (attr->name,sizeof (attr->name), -"temp%d_fru_type" , s); - attr->sensor =OCC_INIT_ATTR (attr->name,0444 , - show_temp,NULL ,2 , i); +occ_init_attribute (attr,0444 , show_temp,NULL , +2 , i,"temp%d_fru_type" , s); attr++; -snprintf (attr->name,sizeof (attr->name), -"temp%d_fault" , s); - attr->sensor =OCC_INIT_ATTR (attr->name,0444 , - show_temp,NULL ,3 , i); +occ_init_attribute (attr,0444 , show_temp,NULL , +3 , i,"temp%d_fault" , s); attr++;if (sensors->temp.version ==0x10 ) { -snprintf (attr->name,sizeof (attr->name), -"temp%d_max" , s); - attr->sensor =OCC_INIT_ATTR (attr->name,0444 , - show_temp,NULL , -4 , i); +occ_init_attribute (attr,0444 , show_temp,NULL , +4 , i,"temp%d_max" , s); attr++; } }
@@ -917,14 +909,12 @@ static int occ_setup_sensor_attrs(struct occ *occ)for (i =0 ; i < sensors->freq.num_sensors; ++i) { s = i +1 ; -snprintf (attr->name,sizeof (attr->name),"freq%d_label" , s); - attr->sensor =OCC_INIT_ATTR (attr->name,0444 , show_freq,NULL , -0 , i); +occ_init_attribute (attr,0444 , show_freq,NULL , +0 , i,"freq%d_label" , s); attr++; -snprintf (attr->name,sizeof (attr->name),"freq%d_input" , s); - attr->sensor =OCC_INIT_ATTR (attr->name,0444 , show_freq,NULL , -1 , i); +occ_init_attribute (attr,0444 , show_freq,NULL , +1 , i,"freq%d_input" , s); attr++; }
@@ -940,32 +930,24 @@ static int occ_setup_sensor_attrs(struct occ *occ) s = (i *4 ) +1 ;for (j =0 ; j <4 ; ++j) { -snprintf (attr->name,sizeof (attr->name), -"power%d_label" , s); - attr->sensor =OCC_INIT_ATTR (attr->name,0444 , - show_power,NULL , - nr++, i); +occ_init_attribute (attr,0444 , show_power, +NULL , nr++, i, +"power%d_label" , s); attr++; -snprintf (attr->name,sizeof (attr->name), -"power%d_average" , s); - attr->sensor =OCC_INIT_ATTR (attr->name,0444 , - show_power,NULL , - nr++, i); +occ_init_attribute (attr,0444 , show_power, +NULL , nr++, i, +"power%d_average" , s); attr++; -snprintf (attr->name,sizeof (attr->name), -"power%d_average_interval" , s); - attr->sensor =OCC_INIT_ATTR (attr->name,0444 , - show_power,NULL , - nr++, i); +occ_init_attribute (attr,0444 , show_power, +NULL , nr++, i, +"power%d_average_interval" , s); attr++; -snprintf (attr->name,sizeof (attr->name), -"power%d_input" , s); - attr->sensor =OCC_INIT_ATTR (attr->name,0444 , - show_power,NULL , - nr++, i); +occ_init_attribute (attr,0444 , show_power, +NULL , nr++, i, +"power%d_input" , s); attr++; s++;
@@ -977,28 +959,20 @@ static int occ_setup_sensor_attrs(struct occ *occ)for (i =0 ; i < sensors->power.num_sensors; ++i) { s = i +1 ; -snprintf (attr->name,sizeof (attr->name), -"power%d_label" , s); - attr->sensor =OCC_INIT_ATTR (attr->name,0444 , - show_power,NULL ,0 , i); +occ_init_attribute (attr,0444 , show_power,NULL , +0 , i,"power%d_label" , s); attr++; -snprintf (attr->name,sizeof (attr->name), -"power%d_average" , s); - attr->sensor =OCC_INIT_ATTR (attr->name,0444 , - show_power,NULL ,1 , i); +occ_init_attribute (attr,0444 , show_power,NULL , +1 , i,"power%d_average" , s); attr++; -snprintf (attr->name,sizeof (attr->name), -"power%d_average_interval" , s); - attr->sensor =OCC_INIT_ATTR (attr->name,0444 , - show_power,NULL ,2 , i); +occ_init_attribute (attr,0444 , show_power,NULL , +2 , i,"power%d_average_interval" , s); attr++; -snprintf (attr->name,sizeof (attr->name), -"power%d_input" , s); - attr->sensor =OCC_INIT_ATTR (attr->name,0444 , - show_power,NULL ,3 , i); +occ_init_attribute (attr,0444 , show_power,NULL , +3 , i,"power%d_input" , s); attr++; }
@@ -1006,56 +980,43 @@ static int occ_setup_sensor_attrs(struct occ *occ) }if (sensors->caps.num_sensors >=1 ) { -snprintf (attr->name,sizeof (attr->name),"power%d_label" , s); - attr->sensor =OCC_INIT_ATTR (attr->name,0444 , show_caps,NULL , -0 ,0 ); +occ_init_attribute (attr,0444 , show_caps,NULL , +0 ,0 ,"power%d_label" , s); attr++; -snprintf (attr->name,sizeof (attr->name),"power%d_cap" , s); - attr->sensor =OCC_INIT_ATTR (attr->name,0444 , show_caps,NULL , -1 ,0 ); +occ_init_attribute (attr,0444 , show_caps,NULL , +1 ,0 ,"power%d_cap" , s); attr++; -snprintf (attr->name,sizeof (attr->name),"power%d_input" , s); - attr->sensor =OCC_INIT_ATTR (attr->name,0444 , show_caps,NULL , -2 ,0 ); +occ_init_attribute (attr,0444 , show_caps,NULL , +2 ,0 ,"power%d_input" , s); attr++; -snprintf (attr->name,sizeof (attr->name), -"power%d_cap_not_redundant" , s); - attr->sensor =OCC_INIT_ATTR (attr->name,0444 , show_caps,NULL , -3 ,0 ); +occ_init_attribute (attr,0444 , show_caps,NULL , +3 ,0 ,"power%d_cap_not_redundant" , s); attr++; -snprintf (attr->name,sizeof (attr->name),"power%d_cap_max" , s); - attr->sensor =OCC_INIT_ATTR (attr->name,0444 , show_caps,NULL , -4 ,0 ); +occ_init_attribute (attr,0444 , show_caps,NULL , +4 ,0 ,"power%d_cap_max" , s); attr++; -snprintf (attr->name,sizeof (attr->name),"power%d_cap_min" , s); - attr->sensor =OCC_INIT_ATTR (attr->name,0444 , show_caps,NULL , -5 ,0 ); +occ_init_attribute (attr,0444 , show_caps,NULL , +5 ,0 ,"power%d_cap_min" , s); attr++; -snprintf (attr->name,sizeof (attr->name),"power%d_cap_user" , - s); - attr->sensor =OCC_INIT_ATTR (attr->name,0644 , show_caps, - occ_store_caps_user,6 ,0 ); +occ_init_attribute (attr,0644 , show_caps, occ_store_caps_user, +6 ,0 ,"power%d_cap_user" , s); attr++;if (sensors->caps.version >1 ) { -snprintf (attr->name,sizeof (attr->name), -"power%d_cap_user_source" , s); - attr->sensor =OCC_INIT_ATTR (attr->name,0444 , - show_caps,NULL ,7 ,0 ); +occ_init_attribute (attr,0444 , show_caps,NULL , +7 ,0 ,"power%d_cap_user_source" , s); attr++;if (sensors->caps.version >2 ) { -snprintf (attr->name,sizeof (attr->name), -"power%d_cap_min_soft" , s); - attr->sensor =OCC_INIT_ATTR (attr->name,0444 , - show_caps,NULL , -8 ,0 ); +occ_init_attribute (attr,0444 , show_caps,NULL , +8 ,0 , +"power%d_cap_min_soft" , s); attr++; } }
@@ -1064,19 +1025,16 @@ static int occ_setup_sensor_attrs(struct occ *occ)for (i =0 ; i < sensors->extended.num_sensors; ++i) { s = i +1 ; -snprintf (attr->name,sizeof (attr->name),"extn%d_label" , s); - attr->sensor =OCC_INIT_ATTR (attr->name,0444 , - occ_show_extended,NULL ,0 , i); +occ_init_attribute (attr,0444 , occ_show_extended,NULL , +0 , i,"extn%d_label" , s); attr++; -snprintf (attr->name,sizeof (attr->name),"extn%d_flags" , s); - attr->sensor =OCC_INIT_ATTR (attr->name,0444 , - occ_show_extended,NULL ,1 , i); +occ_init_attribute (attr,0444 , occ_show_extended,NULL , +1 , i,"extn%d_flags" , s); attr++; -snprintf (attr->name,sizeof (attr->name),"extn%d_input" , s); - attr->sensor =OCC_INIT_ATTR (attr->name,0444 , - occ_show_extended,NULL ,2 , i); +occ_init_attribute (attr,0444 , occ_show_extended,NULL , +2 , i,"extn%d_input" , s); attr++; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 362/414 hwmon: (occ) fix unaligned accesses
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 2c021b45c154958566aad0cae9f74ab26a2d5732 ]
Passing a pointer to an unaligned integer as a function argument is undefined behavior:
drivers/hwmon/occ/common.c:492:27: warning: taking address of packed member 'accumulator' of class or structure 'power_sensor_2' may result in an unaligned pointer value [-Waddress-of-packed-member]
492 | val = occ_get_powr_avg(&power->accumulator,
| ^~~~~~~~~~~~~~~~~~
drivers/hwmon/occ/common.c:493:13: warning: taking address of packed member 'update_tag' of class or structure 'power_sensor_2' may result in an unaligned pointer value [-Waddress-of-packed-member]
493 | &power->update_tag);
| ^~~~~~~~~~~~~~~~~Move the get_unaligned() calls out of the function and pass these through argument registers instead.
--- drivers/hwmon/occ/common.c | 28 +++++++++++++--------------- 1 file changed, 13 insertions(+), 15 deletions(-)
drivers/hwmon/occ/common.c +13 -15
@@ -459,12 +459,10 @@ static ssize_t occ_show_power_1(struct device *dev,return sysfs_emit (buf,"%llu\n" , val); } -static u64 occ_get_powr_avg (u64 *accum,u32 *samples) +static u64 occ_get_powr_avg (u64 accum,u32 samples) { -u64 divisor =get_unaligned_be32 (samples); - -return (divisor ==0 ) ?0 : -div64_u64 (get_unaligned_be64 (accum) *1000000ULL , divisor); +return (samples ==0 ) ?0 : +mul_u64_u32_div (accum,1000000UL , samples); } static ssize_t occ_show_power_2(struct device *dev,
@@ -489,8 +487,8 @@ static ssize_t occ_show_power_2(struct device *dev,get_unaligned_be32 (&power->sensor_id), power->function_id, power->apss_channel);case 1 : - val =occ_get_powr_avg (&power->accumulator, - &power->update_tag); + val =occ_get_powr_avg (get_unaligned_be64 (&power->accumulator), +get_unaligned_be32 (&power->update_tag));break ;case 2 : val = (u64)get_unaligned_be32(&power->update_tag) *
@@ -527,8 +525,8 @@ static ssize_t occ_show_power_a0(struct device *dev,return sysfs_emit (buf,"%u_system\n" ,get_unaligned_be32 (&power->sensor_id));case 1 : - val =occ_get_powr_avg (&power->system.accumulator, - &power->system.update_tag); + val =occ_get_powr_avg (get_unaligned_be64 (&power->system.accumulator), +get_unaligned_be32 (&power->system.update_tag));break ;case 2 : val = (u64)get_unaligned_be32(&power->system.update_tag) *
@@ -541,8 +539,8 @@ static ssize_t occ_show_power_a0(struct device *dev,return sysfs_emit (buf,"%u_proc\n" ,get_unaligned_be32 (&power->sensor_id));case 5 : - val =occ_get_powr_avg (&power->proc.accumulator, - &power->proc.update_tag); + val =occ_get_powr_avg (get_unaligned_be64 (&power->proc.accumulator), +get_unaligned_be32 (&power->proc.update_tag));break ;case 6 : val = (u64)get_unaligned_be32(&power->proc.update_tag) *
@@ -555,8 +553,8 @@ static ssize_t occ_show_power_a0(struct device *dev,return sysfs_emit (buf,"%u_vdd\n" ,get_unaligned_be32 (&power->sensor_id));case 9 : - val =occ_get_powr_avg (&power->vdd.accumulator, - &power->vdd.update_tag); + val =occ_get_powr_avg (get_unaligned_be64 (&power->vdd.accumulator), +get_unaligned_be32 (&power->vdd.update_tag));break ;case 10 : val = (u64)get_unaligned_be32(&power->vdd.update_tag) *
@@ -569,8 +567,8 @@ static ssize_t occ_show_power_a0(struct device *dev,return sysfs_emit (buf,"%u_vdn\n" ,get_unaligned_be32 (&power->sensor_id));case 13 : - val =occ_get_powr_avg (&power->vdn.accumulator, - &power->vdn.update_tag); + val =occ_get_powr_avg (get_unaligned_be64 (&power->vdn.accumulator), +get_unaligned_be32 (&power->vdn.update_tag));break ;case 14 : val = (u64)get_unaligned_be32(&power->vdn.update_tag) *
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 363/414 hwmon: (ltc4282) avoid repeated register write
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Nuno Sá <[email protected]>
[ Upstream commit c25892b7a1744355e16281cd24a9b59ec15ec974 ]
The fault enabled bits were being mistankenly enabled twice in case the FW property is present. Remove one of the writes.
--- drivers/hwmon/ltc4282.c | 7 ------- 1 file changed, 7 deletions(-)
drivers/hwmon/ltc4282.c +0 -7
@@ -1511,13 +1511,6 @@ static int ltc4282_setup(struct ltc4282_state *st, struct device *dev)return ret; } -if (device_property_read_bool (dev,"adi,fault-log-enable" )) { - ret =regmap_set_bits (st->map,LTC4282_ADC_CTRL , -LTC4282_FAULT_LOG_EN_MASK ); -if (ret) -return ret; - } -if (device_property_read_bool (dev,"adi,fault-log-enable" )) { ret =regmap_set_bits (st->map,LTC4282_ADC_CTRL ,LTC4282_FAULT_LOG_EN_MASK );if (ret)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 364/414 pldmfw: Select CRC32 when PLDMFW is selected
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Simon Horman <[email protected]>
[ Upstream commit 1224b218a4b9203656ecc932152f4c81a97b4fcc ]
pldmfw calls crc32 code and depends on it being enabled, else there is a link error as follows. So PLDMFW should select CRC32.
lib/pldmfw/pldmfw.o: In function `pldmfw_flash_image':
pldmfw.c:(.text+0x70f): undefined reference to `crc32_le_base'
This problem was introduced by commit b8265621f488 ("Add pldmfw library for PLDM firmware update").
It manifests as of commit d69ea414c9b4 ("ice: implement device flash update via devlink").
And is more likely to occur as of commit 9ad19171b6d6 ("lib/crc: remove unnecessary prompt for CONFIG_CRC32 and drop 'default y'").
Found by chance while exercising builds based on tinyconfig.
--- lib/Kconfig | 1 + 1 file changed, 1 insertion(+)
lib/Kconfig +1 -0
@@ -767,6 +767,7 @@ config GENERIC_LIB_DEVMEM_IS_ALLOWED config PLDMFW bool + select CRC32 default n config ASN1_ENCODER
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 365/414 aoe: clean device rq_list in aoedev_downdev()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Justin Sanders <[email protected]>
[ Upstream commit 7f90d45e57cb2ef1f0adcaf925ddffdfc5e680ca ]
An aoe device's rq_list contains accepted block requests that are waiting to be transmitted to the aoe target. This queue was added as part of the conversion to blk_mq. However, the queue was not cleaned out when an aoe device is downed which caused blk_mq_freeze_queue() to sleep indefinitely waiting for those requests to complete, causing a hang. This fix cleans out the queue before calling blk_mq_freeze_queue().
--- drivers/block/aoe/aoedev.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/block/aoe/aoedev.c +8 -0
@@ -198,6 +198,7 @@ aoedev_downdev(struct aoedev *d) {struct aoetgt *t, **tt, **te;struct list_head *head, *pos, *nx; +struct request *rq, *rqnext;int i; d->flags &= ~DEVFL_UP ;
@@ -223,6 +224,13 @@ aoedev_downdev(struct aoedev *d)/* clean out the in-process request (if any) */ aoe_failip (d); +/* clean out any queued block requests */ +list_for_each_entry_safe (rq, rqnext, &d->rq_list, queuelist) { +list_del_init (&rq->queuelist); +blk_mq_start_request (rq); +blk_mq_end_request (rq,BLK_STS_IOERR ); + } +/* fast fail all pending I/O */ if (d->blkq) {/* UP is cleared, freeze+quiesce to insure all are errored */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 366/414 io_uring/sqpoll: dont put task_struct on tctx setup failure
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jens Axboe <[email protected]>
[ Upstream commit f2320f1dd6f6f82cb2c7aff23a12bab537bdea89 ]
A recent commit moved the error handling of sqpoll thread and tctx failures into the thread itself, as part of fixing an issue. However, it missed that tctx allocation may also fail, and that io_sq_offload_create() does its own error handling for the task_struct in that case.
Remove the manual task putting in io_sq_offload_create(), as io_sq_thread() will notice that the tctx did not get setup and hence it should put itself and exit.
--- io_uring/sqpoll.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
io_uring/sqpoll.c +1 -4
@@ -426,7 +426,6 @@ void io_sqpoll_wait_sq(struct io_ring_ctx *ctx)__cold int io_sq_offload_create (struct io_ring_ctx *ctx,struct io_uring_params *p) { -struct task_struct *task_to_put =NULL ;int ret;/* Retain compatibility with failing for an invalid attach attempt */
@@ -510,7 +509,7 @@ __cold int io_sq_offload_create(struct io_ring_ctx *ctx,rcu_assign_pointer (sqd->thread, tsk);mutex_unlock (&sqd->lock); - task_to_put =get_task_struct (tsk); +get_task_struct (tsk); ret =io_uring_alloc_task_context (tsk, ctx);wake_up_new_task (tsk);if (ret)
@@ -525,8 +524,6 @@ __cold int io_sq_offload_create(struct io_ring_ctx *ctx,complete (&ctx->sq_data->exited); err:io_sq_thread_finish (ctx); -if (task_to_put) -put_task_struct (task_to_put);return ret; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 367/414 net: ice: Perform accurate aRFS flow match
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Krishna Kumar <[email protected]>
[ Upstream commit 5d3bc9e5e725aa36cca9b794e340057feb6880b4 ]
This patch fixes an issue seen in a large-scale deployment under heavy incoming pkts where the aRFS flow wrongly matches a flow and reprograms the NIC with wrong settings. That mis-steering causes RX-path latency spikes and noisy neighbor effects when many connections collide on the same hash (some of our production servers have 20-30K connections).
set_rps_cpu() calls ndo_rx_flow_steer() with flow_id that is calculated by hashing the skb sized by the per rx-queue table size. This results in multiple connections (even across different rx-queues) getting the same hash value. The driver steer function modifies the wrong flow to use this rx-queue, e.g.: Flow#1 is first added:
Flow#1: <ip1, port1, ip2, port2>, Hash 'h', q#10
Later when a new flow needs to be added:
Flow#2: <ip3, port3, ip4, port4>, Hash 'h', q#20
The driver finds the hash 'h' from Flow#1 and updates it to use q#20. This results in both flows getting un-optimized - packets for Flow#1 goes to q#20, and then reprogrammed back to q#10 later and so on; and Flow #2 programming is never done as Flow#1 is matched first for all misses. Many flows may wrongly share the same hash and reprogram rules of the original flow each with their own q#.
Tested on two 144-core servers with 16K netperf sessions for 180s. Netperf clients are pinned to cores 0-71 sequentially (so that wrong packets on q#s 72-143 can be measured). IRQs are set 1:1 for queues -> CPUs, enable XPS, enable aRFS (global value is 144 * rps_flow_cnt).
Test notes about results from ice_rx_flow_steer():
---------------------------------------------------
1. "Skip:" counter increments here:
if (fltr_info->q_index == rxq_idx ||
arfs_entry->fltr_state != ICE_ARFS_ACTIVE)
goto out;
2. "Add:" counter increments here:
ret = arfs_entry->fltr_info.fltr_id;
INIT_HLIST_NODE(&arfs_entry->list_entry);
3. "Update:" counter increments here:
/* update the queue to forward to on an already existing flow */Runtime comparison: original code vs with the patch for different rps_flow_cnt values.
+-------------------------------+--------------+--------------+ | rps_flow_cnt | 512 | 2048 | +-------------------------------+--------------+--------------+ | Ratio of Pkts on Good:Bad q's | 214 vs 822K | 1.1M vs 980K | | Avoid wrong aRFS programming | 0 vs 310K | 0 vs 30K | | CPU User | 216 vs 183 | 216 vs 206 | | CPU System | 1441 vs 1171 | 1447 vs 1320 | | CPU Softirq | 1245 vs 920 | 1238 vs 961 | | CPU Total | 29 vs 22.7 | 29 vs 24.9 | | aRFS Update | 533K vs 59 | 521K vs 32 | | aRFS Skip | 82M vs 77M | 7.2M vs 4.5M | +-------------------------------+--------------+--------------+
A separate TCP_STREAM and TCP_RR with 1,4,8,16,64,128,256,512 connections showed no performance degradation.
Some points on the patch/aRFS behavior:
1. Enabling full tuple matching ensures flows are always correctly matched, even with smaller hash sizes.
2. 5-6% drop in CPU utilization as the packets arrive at the correct CPUs and fewer calls to driver for programming on misses.
3. Larger hash tables reduces mis-steering due to more unique flow hashes, but still has clashes. However, with larger per-device rps_flow_cnt, old flows take more time to expire and new aRFS flows cannot be added if h/w limits are reached (rps_may_expire_flow() succeeds when 10*rps_flow_cnt pkts have been processed by this cpu that are not part of the flow).
--- drivers/net/ethernet/intel/ice/ice_arfs.c | 48 +++++++++++++++++++++++ 1 file changed, 48 insertions(+)
drivers/net/ethernet/intel/ice/ice_arfs.c +48 -0
@@ -377,6 +377,50 @@ ice_arfs_is_perfect_flow_set(struct ice_hw *hw, __be16 l3_proto, u8 l4_proto)return false; } +/** +* ice_arfs_cmp - Check if aRFS filter matches this flow. +* @fltr_info: filter info of the saved ARFS entry. +* @fk: flow dissector keys. +* @n_proto: One of htons(ETH_P_IP) or htons(ETH_P_IPV6). +* @ip_proto: One of IPPROTO_TCP or IPPROTO_UDP. +* +* Since this function assumes limited values for n_proto and ip_proto, it +* is meant to be called only from ice_rx_flow_steer(). +* +* Return: +* * true - fltr_info refers to the same flow as fk. +* * false - fltr_info and fk refer to different flows. +*/ +static bool +ice_arfs_cmp (const struct ice_fdir_fltr *fltr_info,const struct flow_keys *fk, +__be16 n_proto,u8 ip_proto) +{ +/* Determine if the filter is for IPv4 or IPv6 based on flow_type, +* which is one of ICE_FLTR_PTYPE_NONF_IPV{4,6}_{TCP,UDP}. +*/ +bool is_v4 = fltr_info->flow_type ==ICE_FLTR_PTYPE_NONF_IPV4_TCP || + fltr_info->flow_type ==ICE_FLTR_PTYPE_NONF_IPV4_UDP ; + +/* Following checks are arranged in the quickest and most discriminative +* fields first for early failure. +*/ +if (is_v4) +return n_proto ==htons (ETH_P_IP ) && + fltr_info->ip.v4.src_port == fk->ports.src && + fltr_info->ip.v4.dst_port == fk->ports.dst && + fltr_info->ip.v4.src_ip == fk->addrs.v4addrs.src && + fltr_info->ip.v4.dst_ip == fk->addrs.v4addrs.dst && + fltr_info->ip.v4.proto == ip_proto; + +return fltr_info->ip.v6.src_port == fk->ports.src && + fltr_info->ip.v6.dst_port == fk->ports.dst && + fltr_info->ip.v6.proto == ip_proto && + !memcmp (&fltr_info->ip.v6.src_ip, &fk->addrs.v6addrs.src, +sizeof (struct in6_addr )) && + !memcmp (&fltr_info->ip.v6.dst_ip, &fk->addrs.v6addrs.dst, +sizeof (struct in6_addr )); +} +/** * ice_rx_flow_steer - steer the Rx flow to where application is being run * @netdev: ptr to the netdev being adjusted
@@ -448,6 +492,10 @@ ice_rx_flow_steer(struct net_device *netdev, const struct sk_buff *skb,continue ; fltr_info = &arfs_entry->fltr_info; + +if (!ice_arfs_cmp (fltr_info, &fk, n_proto, ip_proto)) +continue ; + ret = fltr_info->fltr_id; if (fltr_info->q_index == rxq_idx ||
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 368/414 ice: fix eswitch code memory leak in reset scenario
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Grzegorz Nitka <[email protected]>
[ Upstream commit 48c8b214974dc55283bd5f12e3a483b27c403bbc ]
Add simple eswitch mode checker in attaching VF procedure and allocate required port representor memory structures only in switchdev mode. The reset flows triggers VF (if present) detach/attach procedure. It might involve VF port representor(s) re-creation if the device is configured is switchdev mode (not legacy one).
The memory was blindly allocated in current implementation, regardless of the mode and not freed if in legacy mode.
Kmemeleak trace:
unreferenced object (percpu) 0x7e3bce5b888458 (size 40):
comm "bash", pid 1784, jiffies 4295743894
hex dump (first 32 bytes on cpu 45):
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................
backtrace (crc 0):
pcpu_alloc_noprof+0x4c4/0x7c0
ice_repr_create+0x66/0x130 [ice]
ice_repr_create_vf+0x22/0x70 [ice]
ice_eswitch_attach_vf+0x1b/0xa0 [ice]
ice_reset_all_vfs+0x1dd/0x2f0 [ice]
ice_pci_err_resume+0x3b/0xb0 [ice]
pci_reset_function+0x8f/0x120
reset_store+0x56/0xa0
kernfs_fop_write_iter+0x120/0x1b0
vfs_write+0x31c/0x430
ksys_write+0x61/0xd0
do_syscall_64+0x5b/0x180
entry_SYSCALL_64_after_hwframe+0x76/0x7eTesting hints (ethX is PF netdev):
- create at least one VF
echo 1 > /sys/class/net/ethX/device/sriov_numvfs
- trigger the reset
echo 1 > /sys/class/net/ethX/device/reset
--- drivers/net/ethernet/intel/ice/ice_eswitch.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/net/ethernet/intel/ice/ice_eswitch.c +5 -1
@@ -502,10 +502,14 @@ ice_eswitch_attach(struct ice_pf *pf, struct ice_repr *repr, unsigned long *id)*/ int ice_eswitch_attach_vf (struct ice_pf *pf,struct ice_vf *vf) { -struct ice_repr *repr =ice_repr_create_vf (vf);struct devlink *devlink =priv_to_devlink (pf); +struct ice_repr *repr;int err; +if (!ice_is_eswitch_mode_switchdev (pf)) +return 0 ; + + repr =ice_repr_create_vf (vf);if (IS_ERR (repr))return PTR_ERR (repr);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 369/414 e1000e: set fixed clock frequency indication for Nahum 11 and Nahum 13
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vitaly Lifshits <[email protected]>
[ Upstream commit 688a0d61b2d7427189c4eb036ce485d8fc957cbb ]
On some systems with Nahum 11 and Nahum 13 the value of the XTAL clock in the software STRAP is incorrect. This causes the PTP timer to run at the wrong rate and can lead to synchronization issues.
The STRAP value is configured by the system firmware, and a firmware update is not always possible. Since the XTAL clock on these systems always runs at 38.4MHz, the driver may ignore the STRAP and just set the correct value.
--- drivers/net/ethernet/intel/e1000e/netdev.c | 14 +++++++++++--- drivers/net/ethernet/intel/e1000e/ptp.c | 8 +++++--- 2 files changed, 16 insertions(+), 6 deletions(-)
drivers/net/ethernet/intel/e1000e/netdev.c +11 -3
@@ -3540,9 +3540,6 @@ s32 e1000e_get_base_timinca(struct e1000_adapter *adapter, u32 *timinca)case e1000_pch_cnp:case e1000_pch_tgp:case e1000_pch_adp: -case e1000_pch_mtp: -case e1000_pch_lnp: -case e1000_pch_ptp:case e1000_pch_nvp:if (er32 (TSYNCRXCTL ) &E1000_TSYNCRXCTL_SYSCFI ) {/* Stable 24MHz frequency */
@@ -3558,6 +3555,17 @@ s32 e1000e_get_base_timinca(struct e1000_adapter *adapter, u32 *timinca) adapter->cc.shift = shift; }break ; +case e1000_pch_mtp: +case e1000_pch_lnp: +case e1000_pch_ptp: +/* System firmware can misreport this value, so set it to a +* stable 38400KHz frequency. +*/ + incperiod =INCPERIOD_38400KHZ ; + incvalue =INCVALUE_38400KHZ ; + shift =INCVALUE_SHIFT_38400KHZ ; + adapter->cc.shift = shift; +break ;case e1000_82574:case e1000_82583:/* Stable 25MHz frequency */
drivers/net/ethernet/intel/e1000e/ptp.c +5 -3
@@ -295,15 +295,17 @@ void e1000e_ptp_init(struct e1000_adapter *adapter)case e1000_pch_cnp:case e1000_pch_tgp:case e1000_pch_adp: -case e1000_pch_mtp: -case e1000_pch_lnp: -case e1000_pch_ptp:case e1000_pch_nvp:if (er32 (TSYNCRXCTL ) &E1000_TSYNCRXCTL_SYSCFI ) adapter->ptp_clock_info.max_adj =MAX_PPB_24MHZ ;else adapter->ptp_clock_info.max_adj =MAX_PPB_38400KHZ ;break ; +case e1000_pch_mtp: +case e1000_pch_lnp: +case e1000_pch_ptp: + adapter->ptp_clock_info.max_adj =MAX_PPB_38400KHZ ; +break ;case e1000_82574:case e1000_82583: adapter->ptp_clock_info.max_adj =MAX_PPB_25MHZ ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 370/414 workqueue: Initialize wq_isolated_cpumask in workqueue_init_early()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Chuyi Zhou <[email protected]>
[ Upstream commit 261dce3d64021e7ec828a17b4975ce9182e54ceb ]
Now when isolcpus is enabled via the cmdline, wq_isolated_cpumask does not include these isolated CPUs, even wq_unbound_cpumask has already excluded them. It is only when we successfully configure an isolate cpuset partition that wq_isolated_cpumask gets overwritten by workqueue_unbound_exclude_cpumask(), including both the cmdline-specified isolated CPUs and the isolated CPUs within the cpuset partitions.
Fix this issue by initializing wq_isolated_cpumask properly in workqueue_init_early().
--- kernel/workqueue.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/workqueue.c +2 -1
@@ -7731,7 +7731,8 @@ void __init workqueue_init_early(void)restrict_unbound_cpumask ("workqueue.unbound_cpus" , &wq_cmdline_cpumask);cpumask_copy (wq_requested_unbound_cpumask, wq_unbound_cpumask); - +cpumask_andnot (wq_isolated_cpumask, cpu_possible_mask, +housekeeping_cpumask (HK_TYPE_DOMAIN )); pwq_cache =KMEM_CACHE (pool_workqueue,SLAB_PANIC ); unbound_wq_update_pwq_attrs_buf =alloc_workqueue_attrs ();
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 371/414 ksmbd: add free_transport ops in ksmbd connection
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 a89f5fae998bdc4d0505306f93844c9ae059d50c ]
free_transport function for tcp connection can be called from smbdirect. It will cause kernel oops. This patch add free_transport ops in ksmbd connection, and add each free_transports for tcp and smbdirect.
--- fs/smb/server/connection.c | 2 +- fs/smb/server/connection.h | 1 + fs/smb/server/transport_rdma.c | 10 ++++++++-- fs/smb/server/transport_tcp.c | 3 ++- 4 files changed, 12 insertions(+), 4 deletions(-)
fs/smb/server/connection.c +1 -1
@@ -40,7 +40,7 @@ void ksmbd_conn_free(struct ksmbd_conn *conn)kvfree (conn->request_buf);kfree (conn->preauth_info);if (atomic_dec_and_test (&conn->refcnt)) { -ksmbd_free_transport (conn->transport); + conn->transport->ops->free_transport (conn->transport);kfree (conn); } }
fs/smb/server/connection.h +1 -0
@@ -132,6 +132,7 @@ struct ksmbd_transport_ops { void *buf, unsigned int len, struct smb2_buffer_desc_v1 *desc, unsigned int desc_len); +void (*free_transport)(struct ksmbd_transport *kt); };struct ksmbd_transport {
fs/smb/server/transport_rdma.c +8 -2
@@ -158,7 +158,8 @@ struct smb_direct_transport { };#define KSMBD_TRANS (t) ((struct ksmbd_transport *)&((t)->transport)) - +#define SMBD_TRANS (t) ((struct smb_direct_transport *)container_of(t, \ + struct smb_direct_transport, transport))enum {SMB_DIRECT_MSG_NEGOTIATE_REQ =0 ,SMB_DIRECT_MSG_DATA_TRANSFER
@@ -409,6 +410,11 @@ static struct smb_direct_transport *alloc_transport(struct rdma_cm_id *cm_id)return NULL ; } +static void smb_direct_free_transport (struct ksmbd_transport *kt) +{ +kfree (SMBD_TRANS (kt)); +} +static void free_transport (struct smb_direct_transport *t) {struct smb_direct_recvmsg *recvmsg;
@@ -454,7 +460,6 @@ static void free_transport(struct smb_direct_transport *t)smb_direct_destroy_pools (t);ksmbd_conn_free (KSMBD_TRANS (t)->conn); -kfree (t); } static struct smb_direct_sendmsg
@@ -2300,4 +2305,5 @@ static const struct ksmbd_transport_ops ksmbd_smb_direct_transport_ops = { .read = smb_direct_read, .rdma_read = smb_direct_rdma_read, .rdma_write = smb_direct_rdma_write, + .free_transport = smb_direct_free_transport, };
fs/smb/server/transport_tcp.c +2 -1
@@ -93,7 +93,7 @@ static struct tcp_transport *alloc_transport(struct socket *client_sk)return t; } -void ksmbd_free_transport (struct ksmbd_transport *kt) +static void ksmbd_tcp_free_transport (struct ksmbd_transport *kt) {struct tcp_transport *t =TCP_TRANS (kt);
@@ -656,4 +656,5 @@ static const struct ksmbd_transport_ops ksmbd_tcp_transport_ops = { .read = ksmbd_tcp_read, .writev = ksmbd_tcp_writev, .disconnect = ksmbd_tcp_disconnect, + .free_transport = ksmbd_tcp_free_transport, };
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 372/414 net: netmem: fix skb_ensure_writable with unreadable skbs
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mina Almasry <[email protected]>
[ Upstream commit 6f793a1d053775f8324b8dba1e7ed224f8b0166f ]
skb_ensure_writable should succeed when it's trying to write to the header of the unreadable skbs, so it doesn't need an unconditional skb_frags_readable check. The preceding pskb_may_pull() call will succeed if write_len is within the head and fail if we're trying to write to the unreadable payload, so we don't need an additional check.
Removing this check restores DSCP functionality with unreadable skbs as it's called from dscp_tg.
--- net/core/skbuff.c | 3 --- 1 file changed, 3 deletions(-)
net/core/skbuff.c +0 -3
@@ -6197,9 +6197,6 @@ int skb_ensure_writable(struct sk_buff *skb, unsigned int write_len)if (!pskb_may_pull (skb, write_len))return -ENOMEM ; -if (!skb_frags_readable (skb)) -return -EFAULT ; -if (!skb_cloned (skb) ||skb_clone_writable (skb, write_len))return 0 ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 373/414 bnxt_en: Fix double invocation of bnxt_ulp_stop()/bnxt_ulp_start()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kalesh AP <[email protected]>
[ Upstream commit 1e9ac33fa271be0d2480fd732f9642d81542500b ]
Before the commit under the Fixes tag below, bnxt_ulp_stop() and bnxt_ulp_start() were always invoked in pairs. After that commit, the new bnxt_ulp_restart() can be invoked after bnxt_ulp_stop() has been called. This may result in the RoCE driver's aux driver .suspend() method being invoked twice. The 2nd bnxt_re_suspend() call will crash when it dereferences a NULL pointer:
(NULL ib_device): Handle device suspend call
BUG: kernel NULL pointer dereference, address: 0000000000000b78 PGD 0 P4D 0 Oops: Oops: 0000 [#1] SMP PTI CPU: 20 UID: 0 PID: 181 Comm: kworker/u96:5 Tainted: G S 6.15.0-rc1 #4 PREEMPT(voluntary) Tainted: [S]=CPU_OUT_OF_SPEC Hardware name: Dell Inc. PowerEdge R730/072T6D, BIOS 2.4.3 01/17/2017 Workqueue: bnxt_pf_wq bnxt_sp_task [bnxt_en] RIP: 0010:bnxt_re_suspend+0x45/0x1f0 [bnxt_re] Code: 8b 05 a7 3c 5b f5 48 89 44 24 18 31 c0 49 8b 5c 24 08 4d 8b 2c 24 e8 ea 06 0a f4 48 c7 c6 04 60 52 c0 48 89 df e8 1b ce f9 ff <48> 8b 83 78 0b 00 00 48 8b 80 38 03 00 00 a8 40 0f 85 b5 00 00 00 RSP: 0018:ffffa2e84084fd88 EFLAGS: 00010246 RAX: 0000000000000000 RBX: 0000000000000000 RCX: 0000000000000001 RDX: 0000000000000000 RSI: ffffffffb4b6b934 RDI: 00000000ffffffff RBP: ffffa1760954c9c0 R08: 0000000000000000 R09: c0000000ffffdfff R10: 0000000000000001 R11: ffffa2e84084fb50 R12: ffffa176031ef070 R13: ffffa17609775000 R14: ffffa17603adc180 R15: 0000000000000000 FS: 0000000000000000(0000) GS:ffffa17daa397000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 0000000000000b78 CR3: 00000004aaa30003 CR4: 00000000003706f0 DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 0000000000000400 Call Trace: <TASK> bnxt_ulp_stop+0x69/0x90 [bnxt_en] bnxt_sp_task+0x678/0x920 [bnxt_en] ? __schedule+0x514/0xf50 process_scheduled_works+0x9d/0x400 worker_thread+0x11c/0x260 ? __pfx_worker_thread+0x10/0x10 kthread+0xfe/0x1e0 ? __pfx_kthread+0x10/0x10 ret_from_fork+0x2b/0x40 ? __pfx_kthread+0x10/0x10 ret_from_fork_asm+0x1a/0x30
Check the BNXT_EN_FLAG_ULP_STOPPED flag and do not proceed if the flag is already set. This will preserve the original symmetrical bnxt_ulp_stop() and bnxt_ulp_start().
Also, inside bnxt_ulp_start(), clear the BNXT_EN_FLAG_ULP_STOPPED flag after taking the mutex to avoid any race condition. And for symmetry, only proceed in bnxt_ulp_start() if the BNXT_EN_FLAG_ULP_STOPPED is set.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c +10 -14
@@ -230,10 +230,9 @@ void bnxt_ulp_stop(struct bnxt *bp)return ;mutex_lock (&edev->en_dev_lock); -if (!bnxt_ulp_registered (edev)) { -mutex_unlock (&edev->en_dev_lock); -return ; - } +if (!bnxt_ulp_registered (edev) || + (edev->flags &BNXT_EN_FLAG_ULP_STOPPED )) + goto ulp_stop_exit; edev->flags |=BNXT_EN_FLAG_ULP_STOPPED ;if (aux_priv) {
@@ -249,6 +248,7 @@ void bnxt_ulp_stop(struct bnxt *bp) adrv->suspend (adev, pm); } } +ulp_stop_exit:mutex_unlock (&edev->en_dev_lock); }
@@ -257,19 +257,13 @@ void bnxt_ulp_start(struct bnxt *bp, int err)struct bnxt_aux_priv *aux_priv = bp->aux_priv;struct bnxt_en_dev *edev = bp->edev; -if (!edev) -return ; - - edev->flags &= ~BNXT_EN_FLAG_ULP_STOPPED ; - -if (err) +if (!edev || err)return ;mutex_lock (&edev->en_dev_lock); -if (!bnxt_ulp_registered (edev)) { -mutex_unlock (&edev->en_dev_lock); -return ; - } +if (!bnxt_ulp_registered (edev) || + !(edev->flags &BNXT_EN_FLAG_ULP_STOPPED )) + goto ulp_start_exit;if (edev->ulp_tbl->msix_requested)bnxt_fill_msix_vecs (bp, edev->msix_entries);
@@ -286,6 +280,8 @@ void bnxt_ulp_start(struct bnxt *bp, int err) adrv->resume (adev); } } +ulp_start_exit: + edev->flags &= ~BNXT_EN_FLAG_ULP_STOPPED ;mutex_unlock (&edev->en_dev_lock); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 374/414 eth: bnxt: fix out-of-range access of vnic_info array
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Taehee Yoo <[email protected]>
[ Upstream commit 919f9f497dbcee75d487400e8f9815b74a6a37df ]
The bnxt_queue_{start | stop}() access vnic_info as much as allocated, which indicates bp->nr_vnics.
So, it should not reach bp->vnic_info[bp->nr_vnics].
Stable-dep-of: 5dacc94c6fe6 ("bnxt_en: Update MRU and RSS table of RSS contexts on queue reset")
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +2 -2
@@ -15356,7 +15356,7 @@ static int bnxt_queue_start(struct net_device *dev, void *qmem, int idx) cpr = &rxr->bnapi->cp_ring; cpr->sw_stats->rx.rx_resets++; -for (i =0 ; i <= bp->nr_vnics; i++) { +for (i =0 ; i < bp->nr_vnics; i++) { vnic = &bp->vnic_info[i]; rc =bnxt_hwrm_vnic_set_rss_p5 (bp, vnic, true);
@@ -15384,7 +15384,7 @@ static int bnxt_queue_stop(struct net_device *dev, void *qmem, int idx)struct bnxt_vnic_info *vnic;int i; -for (i =0 ; i <= bp->nr_vnics; i++) { +for (i =0 ; i < bp->nr_vnics; i++) { vnic = &bp->vnic_info[i]; vnic->mru =0 ; bnxt_hwrm_vnic_update(bp, vnic,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 375/414 bnxt_en: Add a helper function to configure MRU and RSS
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pavan Chebbi <[email protected]>
[ Upstream commit e11baaea94e2923739a98abeee85eb0667c04fd3 ]
Add a new helper function that will configure MRU and RSS table of a VNIC. This will be useful when we configure both on a VNIC when resetting an RX ring. This function will be used again in the next bug fix patch where we have to reconfigure VNICs for RSS contexts.
Stable-dep-of: 5dacc94c6fe6 ("bnxt_en: Update MRU and RSS table of RSS contexts on queue reset")
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 37 ++++++++++++++++------- 1 file changed, 26 insertions(+), 11 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +26 -11
@@ -10390,6 +10390,26 @@ void bnxt_del_one_rss_ctx(struct bnxt *bp, struct bnxt_rss_ctx *rss_ctx, bp->num_rss_ctx--; } +static int bnxt_set_vnic_mru_p5 (struct bnxt *bp,struct bnxt_vnic_info *vnic, +u16 mru) +{ +int rc; + +if (mru) { + rc =bnxt_hwrm_vnic_set_rss_p5 (bp, vnic, true); +if (rc) { +netdev_err (bp->dev,"hwrm vnic %d set rss failure rc: %d\n" , + vnic->vnic_id, rc); +return rc; + } + } + vnic->mru = mru; +bnxt_hwrm_vnic_update (bp, vnic, +VNIC_UPDATE_REQ_ENABLES_MRU_VALID ); + +return 0 ; +} +static void bnxt_hwrm_realloc_rss_ctx_vnic (struct bnxt *bp) {bool set_tpa = !!(bp->flags &BNXT_FLAG_TPA );
@@ -15326,6 +15346,7 @@ static int bnxt_queue_start(struct net_device *dev, void *qmem, int idx)struct bnxt_cp_ring_info *cpr;struct bnxt_vnic_info *vnic;int i, rc; +u16 mru; rxr = &bp->rx_ring[idx]; clone = qmem;
@@ -15356,18 +15377,13 @@ static int bnxt_queue_start(struct net_device *dev, void *qmem, int idx) cpr = &rxr->bnapi->cp_ring; cpr->sw_stats->rx.rx_resets++; + mru = bp->dev->mtu +ETH_HLEN +VLAN_HLEN ;for (i =0 ; i < bp->nr_vnics; i++) { vnic = &bp->vnic_info[i]; - rc =bnxt_hwrm_vnic_set_rss_p5 (bp, vnic, true); -if (rc) { -netdev_err (bp->dev,"hwrm vnic %d set rss failure rc: %d\n" , - vnic->vnic_id, rc); + rc =bnxt_set_vnic_mru_p5 (bp, vnic, mru); +if (rc)return rc; - } - vnic->mru = bp->dev->mtu +ETH_HLEN +VLAN_HLEN ; -bnxt_hwrm_vnic_update (bp, vnic, -VNIC_UPDATE_REQ_ENABLES_MRU_VALID ); }return 0 ;
@@ -15386,9 +15402,8 @@ static int bnxt_queue_stop(struct net_device *dev, void *qmem, int idx)for (i =0 ; i < bp->nr_vnics; i++) { vnic = &bp->vnic_info[i]; - vnic->mru =0 ; -bnxt_hwrm_vnic_update (bp, vnic, -VNIC_UPDATE_REQ_ENABLES_MRU_VALID ); + +bnxt_set_vnic_mru_p5 (bp, vnic,0 ); }/* Make sure NAPI sees that the VNIC is disabled */ synchronize_net ();
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 376/414 bnxt_en: Update MRU and RSS table of RSS contexts on queue reset
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pavan Chebbi <[email protected]>
[ Upstream commit 5dacc94c6fe61cde6f700e95cf35af9944b022c4 ]
The commit under the Fixes tag below which updates the VNICs' RSS and MRU during .ndo_queue_start(), needs to be extended to cover any non-default RSS contexts which have their own VNICs. Without this step, packets that are destined to a non-default RSS context may be dropped after .ndo_queue_start().
We further optimize this scheme by updating the VNIC only if the RX ring being restarted is in the RSS table of the VNIC. Updating the VNIC (in particular setting the MRU to 0) will momentarily stop all traffic to all rings in the RSS table. Any VNIC that has the RX ring excluded from the RSS table can skip this step and avoid the traffic disruption.
Note that this scheme is just an improvement. A VNIC with multiple rings in the RSS table will still see traffic disruptions to all rings in the RSS table when one of the rings is being restarted. We are working on a FW scheme that will improve upon this further.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 56 +++++++++++++++++++++-- 1 file changed, 51 insertions(+), 5 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +51 -5
@@ -10390,11 +10390,39 @@ void bnxt_del_one_rss_ctx(struct bnxt *bp, struct bnxt_rss_ctx *rss_ctx, bp->num_rss_ctx--; } +static bool bnxt_vnic_has_rx_ring (struct bnxt *bp,struct bnxt_vnic_info *vnic, +int rxr_id) +{ +u16 tbl_size =bnxt_get_rxfh_indir_size (bp->dev); +int i, vnic_rx; + +/* Ntuple VNIC always has all the rx rings. Any change of ring id +* must be updated because a future filter may use it. +*/ +if (vnic->flags &BNXT_VNIC_NTUPLE_FLAG ) +return true; + +for (i =0 ; i < tbl_size; i++) { +if (vnic->flags &BNXT_VNIC_RSSCTX_FLAG ) + vnic_rx =ethtool_rxfh_context_indir (vnic->rss_ctx)[i]; +else + vnic_rx = bp->rss_indir_tbl[i]; + +if (rxr_id == vnic_rx) +return true; + } + +return false; +} +static int bnxt_set_vnic_mru_p5 (struct bnxt *bp,struct bnxt_vnic_info *vnic, -u16 mru) +u16 mru,int rxr_id) {int rc; +if (!bnxt_vnic_has_rx_ring (bp, vnic, rxr_id)) +return 0 ; +if (mru) { rc =bnxt_hwrm_vnic_set_rss_p5 (bp, vnic, true);if (rc) {
@@ -10410,6 +10438,24 @@ static int bnxt_set_vnic_mru_p5(struct bnxt *bp, struct bnxt_vnic_info *vnic,return 0 ; } +static int bnxt_set_rss_ctx_vnic_mru (struct bnxt *bp,u16 mru,int rxr_id) +{ +struct ethtool_rxfh_context *ctx; +unsigned long context; +int rc; + +xa_for_each (&bp->dev->ethtool->rss_ctx, context, ctx) { +struct bnxt_rss_ctx *rss_ctx =ethtool_rxfh_context_priv (ctx); +struct bnxt_vnic_info *vnic = &rss_ctx->vnic; + + rc =bnxt_set_vnic_mru_p5 (bp, vnic, mru, rxr_id); +if (rc) +return rc; + } + +return 0 ; +} +static void bnxt_hwrm_realloc_rss_ctx_vnic (struct bnxt *bp) {bool set_tpa = !!(bp->flags &BNXT_FLAG_TPA );
@@ -15381,12 +15427,11 @@ static int bnxt_queue_start(struct net_device *dev, void *qmem, int idx)for (i =0 ; i < bp->nr_vnics; i++) { vnic = &bp->vnic_info[i]; - rc =bnxt_set_vnic_mru_p5 (bp, vnic, mru); + rc =bnxt_set_vnic_mru_p5 (bp, vnic, mru, idx);if (rc)return rc; } - -return 0 ; +return bnxt_set_rss_ctx_vnic_mru (bp, mru, idx); err_free_hwrm_rx_ring:bnxt_hwrm_rx_ring_free (bp, rxr, false);
@@ -15403,8 +15448,9 @@ static int bnxt_queue_stop(struct net_device *dev, void *qmem, int idx)for (i =0 ; i < bp->nr_vnics; i++) { vnic = &bp->vnic_info[i]; -bnxt_set_vnic_mru_p5 (bp, vnic,0 ); +bnxt_set_vnic_mru_p5 (bp, vnic,0 , idx); } +bnxt_set_rss_ctx_vnic_mru (bp,0 , idx);/* Make sure NAPI sees that the VNIC is disabled */ synchronize_net (); rxr = &bp->rx_ring[idx];
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 377/414 ptp: fix breakage after ptp_vclock_in_use() rework
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Oltean <[email protected]>
[ Upstream commit 5ab73b010cad294851e558f1d4714a85c6f206c7 ]
What is broken
--------------
ptp4l, and any other application which calls clock_adjtime() on a physical clock, is greeted with error -EBUSY after commit 87f7ce260a3c ("ptp: remove ptp->n_vclocks check logic in ptp_vclock_in_use()").
Explanation for the breakage
----------------------------
The blamed commit was based on the false assumption that ptp_vclock_in_use() callers already test for n_vclocks prior to calling this function.
This is notably incorrect for the code path below, in which there is, in fact, no n_vclocks test:
ptp_clock_adjtime()
-> ptp_clock_freerun()
-> ptp_vclock_in_use()
The result is that any clock adjustment on any physical clock is now impossible. This is _despite_ there not being any vclock over this physical clock.
$ ptp4l -i eno0 -2 -P -m ptp4l[58.425]: selected /dev/ptp0 as PTP clock [ 58.429749] ptp: physical clock is free running ptp4l[58.431]: Failed to open /dev/ptp0: Device or resource busy failed to create a clock $ cat /sys/class/ptp/ptp0/n_vclocks 0
The patch makes the ptp_vclock_in_use() function say "if it's not a virtual clock, then this physical clock does have virtual clocks on top".
Then ptp_clock_freerun() uses this information to say "this physical clock has virtual clocks on top, so it must stay free-running".
Then ptp_clock_adjtime() uses this information to say "well, if this physical clock has to be free-running, I can't do it, return -EBUSY".
Simply put, ptp_vclock_in_use() cannot be simplified so as to remove the test whether vclocks are in use.
What did the blamed commit intend to fix
----------------------------------------
The blamed commit presents a lockdep warning stating "possible recursive locking detected", with the n_vclocks_store() and ptp_clock_unregister() functions involved.
The recursive locking seems this:n_vclocks_store()
-> mutex_lock_interruptible(&ptp->n_vclocks_mux) // 1 -> device_for_each_child_reverse(..., unregister_vclock)
-> unregister_vclock()
-> ptp_vclock_unregister()
-> ptp_clock_unregister()
-> ptp_vclock_in_use()
-> mutex_lock_interruptible(&ptp->n_vclocks_mux) // 2The issue can be triggered by creating and then deleting vclocks:
$ echo 2 > /sys/class/ptp/ptp0/n_vclocks $ echo 0 > /sys/class/ptp/ptp0/n_vclocks
But note that in the original stack trace, the address of the first lock is different from the address of the second lock. This is because at step 1 marked above, &ptp->n_vclocks_mux is the lock of the parent (physical) PTP clock, and at step 2, the lock is of the child (virtual) PTP clock. They are different locks of different devices.
In this situation there is no real deadlock, the lockdep warning is caused by the fact that the mutexes have the same lock class on both the parent and the child. Functionally it is fine.
Proposed alternative solution
-----------------------------
We must reintroduce the body of ptp_vclock_in_use() mostly as it was structured prior to the blamed commit, but avoid the lockdep warning.
Based on the fact that vclocks cannot be nested on top of one another (ptp_is_attribute_visible() hides n_vclocks for virtual clocks), we already know that ptp->n_vclocks is zero for a virtual clock. And ptp->is_virtual_clock is a runtime invariant, established at ptp_clock_register() time and never changed. There is no need to serialize on any mutex in order to read ptp->is_virtual_clock, and we take advantage of that by moving it outside the lock.
Thus, virtual clocks do not need to acquire &ptp->n_vclocks_mux at all, and step 2 in the code walkthrough above can simply go away. We can simply return false to the question "ptp_vclock_in_use(a virtual clock)".
Other notes
-----------
Releasing &ptp->n_vclocks_mux before ptp_vclock_in_use() returns execution seems racy, because the returned value can become stale as soon as the function returns and before the return value is used (i.e. n_vclocks_store() can run any time). The locking requirement should somehow be transferred to the caller, to ensure a longer life time for the returned value, but this seems out of scope for this severe bug fix.
Because we are also fixing up the logic from the original commit, there is another Fixes: tag for that.
--- drivers/ptp/ptp_private.h | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-)
drivers/ptp/ptp_private.h +21 -1
@@ -98,7 +98,27 @@ static inline int queue_cnt(const struct timestamp_event_queue *q)/* Check if ptp virtual clock is in use */ static inline bool ptp_vclock_in_use (struct ptp_clock *ptp) { -return !ptp->is_virtual_clock; +bool in_use = false; + +/* Virtual clocks can't be stacked on top of virtual clocks. +* Avoid acquiring the n_vclocks_mux on virtual clocks, to allow this +* function to be called from code paths where the n_vclocks_mux of the +* parent physical clock is already held. Functionally that's not an +* issue, but lockdep would complain, because they have the same lock +* class. +*/ +if (ptp->is_virtual_clock) +return false; + +if (mutex_lock_interruptible (&ptp->n_vclocks_mux)) +return true; + +if (ptp->n_vclocks) + in_use = true; + +mutex_unlock (&ptp->n_vclocks_mux); + +return in_use; }/* Check if ptp clock shall be free running */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 378/414 ptp: allow reading of currently dialed frequency to succeed on free-running clocks
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vladimir Oltean <[email protected]>
[ Upstream commit aa112cbc5f0ac6f3b44d829005bf34005d9fe9bb ]
There is a bug in ptp_clock_adjtime() which makes it refuse the operation even if we just want to read the current clock dialed frequency, not modify anything (tx->modes == 0). That should be possible even if the clock is free-running. For context, the kernel UAPI is the same for getting and setting the frequency of a POSIX clock.
For example, ptp4l errors out at clock_create() -> clockadj_get_freq() -> clock_adjtime() time, when it should logically only have failed on actual adjustments to the clock, aka if the clock was configured as slave. But in master mode it should work.
This was discovered when examining the issue described in the previous commit, where ptp_clock_freerun() returned true despite n_vclocks being zero.
--- drivers/ptp/ptp_clock.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/ptp/ptp_clock.c +2 -1
@@ -121,7 +121,8 @@ static int ptp_clock_adjtime(struct posix_clock *pc, struct __kernel_timex *tx)struct ptp_clock_info *ops;int err = -EOPNOTSUPP ; -if (ptp_clock_freerun (ptp)) { +if (tx->modes & (ADJ_SETOFFSET |ADJ_FREQUENCY |ADJ_OFFSET ) && +ptp_clock_freerun (ptp)) {pr_err ("ptp: physical clock is free running\n" );return -EBUSY ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 379/414 wifi: carl9170: do not ping device which has failed to load firmware
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Antipov <[email protected]>
[ Upstream commit 15d25307692312cec4b57052da73387f91a2e870 ]
Syzkaller reports [1, 2] crashes caused by an attempts to ping the device which has failed to load firmware. Since such a device doesn't pass 'ieee80211_register_hw()', an internal workqueue managed by 'ieee80211_queue_work()' is not yet created and an attempt to queue work on it causes null-ptr-deref.
[1] https://syzkaller.appspot.com/bug?extid=9a4aec827829942045ff
[2] https://syzkaller.appspot.com/bug?extid=0d8afba53e8fb2633217
--- drivers/net/wireless/ath/carl9170/usb.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-)
drivers/net/wireless/ath/carl9170/usb.c +13 -6
@@ -438,14 +438,21 @@ static void carl9170_usb_rx_complete(struct urb *urb)if (atomic_read (&ar->rx_anch_urbs) ==0 ) {/* -* The system is too slow to cope with -* the enormous workload. We have simply -* run out of active rx urbs and this -* unfortunately leads to an unpredictable -* device. +* At this point, either the system is too slow to +* cope with the enormous workload (so we have simply +* run out of active rx urbs and this unfortunately +* leads to an unpredictable device), or the device +* is not fully functional after an unsuccessful +* firmware loading attempts (so it doesn't pass +* ieee80211_register_hw() and there is no internal +* workqueue at all). */ -ieee80211_queue_work (ar->hw, &ar->ping_work); +if (ar->registered) +ieee80211_queue_work (ar->hw, &ar->ping_work); +else +pr_warn_once ("device %s is not registered\n" , +dev_name (&ar->udev->dev)); } }else {/*
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 380/414 mpls: Use rcu_dereference_rtnl() in mpls_route_input_rcu().
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 6dbb0d97c5096072c78a6abffe393584e57ae945 ]
As syzbot reported [0], mpls_route_input_rcu() can be called from mpls_getroute(), where is under RTNL.
net->mpls.platform_label is only updated under RTNL.
Let's use rcu_dereference_rtnl() in mpls_route_input_rcu() to silence the splat.
[0]:
WARNING: suspicious RCU usage 6.15.0-rc7-syzkaller-00082-g5cdb2c77c4c3 #0 Not tainted
----------------------------net/mpls/af_mpls.c:84 suspicious rcu_dereference_check() usage!
other info that might help us debug this:
rcu_scheduler_active = 2, debug_locks = 1
1 lock held by syz.2.4451/17730:
#0: ffffffff9012a3e8 (rtnl_mutex){+.+.}-{4:4}, at: rtnl_lock net/core/rtnetlink.c:80 [inline] #0: ffffffff9012a3e8 (rtnl_mutex){+.+.}-{4:4}, at: rtnetlink_rcv_msg+0x371/0xe90 net/core/rtnetlink.c:6961
stack backtrace: CPU: 1 UID: 0 PID: 17730 Comm: syz.2.4451 Not tainted 6.15.0-rc7-syzkaller-00082-g5cdb2c77c4c3 #0 PREEMPT(full) Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 05/07/2025 Call Trace: <TASK> __dump_stack lib/dump_stack.c:94 [inline] dump_stack_lvl+0x16c/0x1f0 lib/dump_stack.c:120 lockdep_rcu_suspicious+0x166/0x260 kernel/locking/lockdep.c:6865 mpls_route_input_rcu+0x1d4/0x200 net/mpls/af_mpls.c:84 mpls_getroute+0x621/0x1ea0 net/mpls/af_mpls.c:2381 rtnetlink_rcv_msg+0x3c9/0xe90 net/core/rtnetlink.c:6964 netlink_rcv_skb+0x16d/0x440 net/netlink/af_netlink.c:2534 netlink_unicast_kernel net/netlink/af_netlink.c:1313 [inline] netlink_unicast+0x53a/0x7f0 net/netlink/af_netlink.c:1339 netlink_sendmsg+0x8d1/0xdd0 net/netlink/af_netlink.c:1883 sock_sendmsg_nosec net/socket.c:712 [inline] __sock_sendmsg net/socket.c:727 [inline] ____sys_sendmsg+0xa98/0xc70 net/socket.c:2566 ___sys_sendmsg+0x134/0x1d0 net/socket.c:2620 __sys_sendmmsg+0x200/0x420 net/socket.c:2709 __do_sys_sendmmsg net/socket.c:2736 [inline] __se_sys_sendmmsg net/socket.c:2733 [inline] __x64_sys_sendmmsg+0x9c/0x100 net/socket.c:2733 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xcd/0x230 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7f0a2818e969 Code: ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 0f 1f 40 00 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 a8 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007f0a28f52038 EFLAGS: 00000246 ORIG_RAX: 0000000000000133 RAX: ffffffffffffffda RBX: 00007f0a283b5fa0 RCX: 00007f0a2818e969 RDX: 0000000000000003 RSI: 0000200000000080 RDI: 0000000000000003 RBP: 00007f0a28210ab1 R08: 0000000000000000 R09: 0000000000000000 R10: 0000000000000000 R11: 0000000000000246 R12: 0000000000000000 R13: 0000000000000000 R14: 00007f0a283b5fa0 R15: 00007ffce5e9f268 </TASK>
--- net/mpls/af_mpls.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/mpls/af_mpls.c +2 -2
@@ -81,8 +81,8 @@ static struct mpls_route *mpls_route_input_rcu(struct net *net, unsigned index)if (index < net->mpls.platform_labels) {struct mpls_route __rcu **platform_label = -rcu_dereference (net->mpls.platform_label); - rt =rcu_dereference (platform_label[index]); +rcu_dereference_rtnl (net->mpls.platform_label); + rt =rcu_dereference_rtnl (platform_label[index]); }return rt; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 381/414 atm: atmtcp: Free invalid length skb in atmtcp_c_send().
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 2f370ae1fb6317985f3497b1bb80d457508ca2f7 ]
syzbot reported the splat below. [0]
vcc_sendmsg() copies data passed from userspace to skb and passes it to vcc->dev->ops->send().
atmtcp_c_send() accesses skb->data as struct atmtcp_hdr after checking if skb->len is 0, but it's not enough.
Also, when skb->len == 0, skb and sk (vcc) were leaked because dev_kfree_skb() is not called and sk_wmem_alloc adjustment is missing to revert atm_account_tx() in vcc_sendmsg(), which is expected to be done in atm_pop_raw().
Let's properly free skb with an invalid length in atmtcp_c_send().
[0]:
BUG: KMSAN: uninit-value in atmtcp_c_send+0x255/0xed0 drivers/atm/atmtcp.c:294 atmtcp_c_send+0x255/0xed0 drivers/atm/atmtcp.c:294 vcc_sendmsg+0xd7c/0xff0 net/atm/common.c:644 sock_sendmsg_nosec net/socket.c:712 [inline] __sock_sendmsg+0x330/0x3d0 net/socket.c:727 ____sys_sendmsg+0x7e0/0xd80 net/socket.c:2566 ___sys_sendmsg+0x271/0x3b0 net/socket.c:2620 __sys_sendmsg net/socket.c:2652 [inline] __do_sys_sendmsg net/socket.c:2657 [inline] __se_sys_sendmsg net/socket.c:2655 [inline] __x64_sys_sendmsg+0x211/0x3e0 net/socket.c:2655 x64_sys_call+0x32fb/0x3db0 arch/x86/include/generated/asm/syscalls_64.h:47 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xd9/0x210 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f
Uninit was created at:
slab_post_alloc_hook mm/slub.c:4154 [inline] slab_alloc_node mm/slub.c:4197 [inline] kmem_cache_alloc_node_noprof+0x818/0xf00 mm/slub.c:4249 kmalloc_reserve+0x13c/0x4b0 net/core/skbuff.c:579 __alloc_skb+0x347/0x7d0 net/core/skbuff.c:670 alloc_skb include/linux/skbuff.h:1336 [inline] vcc_sendmsg+0xb40/0xff0 net/atm/common.c:628 sock_sendmsg_nosec net/socket.c:712 [inline] __sock_sendmsg+0x330/0x3d0 net/socket.c:727 ____sys_sendmsg+0x7e0/0xd80 net/socket.c:2566 ___sys_sendmsg+0x271/0x3b0 net/socket.c:2620 __sys_sendmsg net/socket.c:2652 [inline] __do_sys_sendmsg net/socket.c:2657 [inline] __se_sys_sendmsg net/socket.c:2655 [inline] __x64_sys_sendmsg+0x211/0x3e0 net/socket.c:2655 x64_sys_call+0x32fb/0x3db0 arch/x86/include/generated/asm/syscalls_64.h:47 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xd9/0x210 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f CPU: 1 UID: 0 PID: 5798 Comm: syz-executor192 Not tainted 6.16.0-rc1-syzkaller-00010-g2c4a1f3fe03e #0 PREEMPT(undef) Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 05/07/2025
--- drivers/atm/atmtcp.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/atm/atmtcp.c +3 -1
@@ -288,7 +288,9 @@ static int atmtcp_c_send(struct atm_vcc *vcc,struct sk_buff *skb)struct sk_buff *new_skb;int result =0 ; -if (!skb->len)return 0 ; +if (skb->len <sizeof (struct atmtcp_hdr )) + goto done; + dev = vcc->dev_data; hdr = (struct atmtcp_hdr *) skb->data;if (hdr->length ==ATMTCP_HDR_MAGIC ) {
Signature · 39 lines
2.39.5
multicast.c
+++ b/net/bridge/br_multicast.c
@@ -4037,6 +4037,32 @@ static void __br_multicast_stop(struct net_bridge_mcast *brmctx)
#endif
}
+void br_multicast_update_vlan_mcast_ctx(struct net_bridge_vlan *v, u8 state)
+{
+#if IS_ENABLED(CONFIG_BRIDGE_VLAN_FILTERING)
+ struct net_bridge *br;
+
+ if (!br_vlan_should_use(v))
+ return;
+
+ if (br_vlan_is_master(v))
+ return;
+
+ br = v->port->br;
+
+ if (!br_opt_get(br, BROPT_MCAST_VLAN_SNOOPING_ENABLED))
+ return;
+
+ if (br_vlan_state_allowed(state, true))
+ br_multicast_enable_port_ctx(&v->port_mcast_ctx);
+
+ /* Multicast is not disabled for the vlan when it goes in
+ * blocking state because the timers will expire and stop by
+ * themselves without sending more queries.
+ */
+#endif
+}
+
void br_multicast_toggle_one_vlan(struct net_bridge_vlan *vlan, bool on)
{
struct net_bridge *br;net/bridge/br_private.h +10 -1
@@ -977,6 +977,7 @@ void br_multicast_port_ctx_init(struct net_bridge_port *port,struct net_bridge_vlan *vlan, struct net_bridge_mcast_port *pmctx);void br_multicast_port_ctx_deinit (struct net_bridge_mcast_port *pmctx); +void br_multicast_update_vlan_mcast_ctx (struct net_bridge_vlan *v,u8 state);void br_multicast_toggle_one_vlan (struct net_bridge_vlan *vlan,bool on);int br_multicast_toggle_vlan_snooping (struct net_bridge *br,bool on,struct netlink_ext_ack *extack);
@@ -1403,6 +1404,11 @@ static inline void br_multicast_port_ctx_deinit(struct net_bridge_mcast_port *pm { } +static inline void br_multicast_update_vlan_mcast_ctx (struct net_bridge_vlan *v, +u8 state) +{ +} +static inline void br_multicast_toggle_one_vlan (struct net_bridge_vlan *vlan,bool on) {
@@ -1752,7 +1758,9 @@ bool br_vlan_global_opts_can_enter_range(const struct net_bridge_vlan *v_curr,bool br_vlan_global_opts_fill (struct sk_buff *skb,u16 vid,u16 vid_range,const struct net_bridge_vlan *v_opts); -/* vlan state manipulation helpers using *_ONCE to annotate lock-free access */ +/* vlan state manipulation helpers using *_ONCE to annotate lock-free access, +* while br_vlan_set_state() may access data protected by multicast_lock. +*/ static inline u8 br_vlan_get_state (const struct net_bridge_vlan *v) {return READ_ONCE (v->state);
@@ -1761,6 +1769,7 @@ static inline u8 br_vlan_get_state(const struct net_bridge_vlan *v)static inline void br_vlan_set_state (struct net_bridge_vlan *v,u8 state) {WRITE_ONCE (v->state, state); +br_multicast_update_vlan_mcast_ctx (v, state); }static inline u8 br_vlan_get_pvid_state (const struct net_bridge_vlan_group *vg)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 382/414 tcp: fix tcp_packet_delayed() for tcp_is_non_sack_preventing_reopen() behavior
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Neal Cardwell <[email protected]>
[ Upstream commit d0fa59897e049e84432600e86df82aab3dce7aa5 ]
After the following commit from 2024:
commit e37ab7373696 ("tcp: fix to allow timestamp undo if no retransmits were sent")
...there was buggy behavior where TCP connections without SACK support could easily see erroneous undo events at the end of fast recovery or RTO recovery episodes. The erroneous undo events could cause those connections to suffer repeated loss recovery episodes and high retransmit rates.
The problem was an interaction between the non-SACK behavior on these connections and the undo logic. The problem is that, for non-SACK connections at the end of a loss recovery episode, if snd_una == high_seq, then tcp_is_non_sack_preventing_reopen() holds steady in CA_Recovery or CA_Loss, but clears tp->retrans_stamp to 0. Then upon the next ACK the "tcp: fix to allow timestamp undo if no retransmits were sent" logic saw the tp->retrans_stamp at 0 and erroneously concluded that no data was retransmitted, and erroneously performed an undo of the cwnd reduction, restoring cwnd immediately to the value it had before loss recovery. This caused an immediate burst of traffic and build-up of queues and likely another immediate loss recovery episode.
This commit fixes tcp_packet_delayed() to ignore zero retrans_stamp values for non-SACK connections when snd_una is at or above high_seq, because tcp_is_non_sack_preventing_reopen() clears retrans_stamp in this case, so it's not a valid signal that we can undo.
Note that the commit named in the Fixes footer restored long-present behavior from roughly 2005-2019, so apparently this bug was present for a while during that era, and this was simply not caught.
--- net/ipv4/tcp_input.c | 37 +++++++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 12 deletions(-)
net/ipv4/tcp_input.c +25 -12
@@ -2482,20 +2482,33 @@ static inline bool tcp_packet_delayed(const struct tcp_sock *tp) {const struct sock *sk = (const struct sock *)tp; -if (tp->retrans_stamp && -tcp_tsopt_ecr_before (tp, tp->retrans_stamp)) -return true;/* got echoed TS before first retransmission */ - -/* Check if nothing was retransmitted (retrans_stamp==0), which may -* happen in fast recovery due to TSQ. But we ignore zero retrans_stamp -* in TCP_SYN_SENT, since when we set FLAG_SYN_ACKED we also clear -* retrans_stamp even if we had retransmitted the SYN. +/* Received an echoed timestamp before the first retransmission? */ +if (tp->retrans_stamp) +return tcp_tsopt_ecr_before (tp, tp->retrans_stamp); + +/* We set tp->retrans_stamp upon the first retransmission of a loss +* recovery episode, so normally if tp->retrans_stamp is 0 then no +* retransmission has happened yet (likely due to TSQ, which can cause +* fast retransmits to be delayed). So if snd_una advanced while +* (tp->retrans_stamp is 0 then apparently a packet was merely delayed, +* not lost. But there are exceptions where we retransmit but then +* clear tp->retrans_stamp, so we check for those exceptions. */ -if (!tp->retrans_stamp &&/* no record of a retransmit/SYN? */ - sk->sk_state !=TCP_SYN_SENT )/* not the FLAG_SYN_ACKED case? */ -return true;/* nothing was retransmitted */ -return false; +/* (1) For non-SACK connections, tcp_is_non_sack_preventing_reopen() +* clears tp->retrans_stamp when snd_una == high_seq. +*/ +if (!tcp_is_sack (tp) && !before (tp->snd_una, tp->high_seq)) +return false; + +/* (2) In TCP_SYN_SENT tcp_clean_rtx_queue() clears tp->retrans_stamp +* when setting FLAG_SYN_ACKED is set, even if the SYN was +* retransmitted. +*/ +if (sk->sk_state ==TCP_SYN_SENT ) +return false; + +return true;/* tp->retrans_stamp is zero; no retransmit yet */ }/* Undo procedures. */
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 383/414 tipc: fix null-ptr-deref when acquiring remote ip of ethernet bearer
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Haixia Qu <[email protected]>
[ Upstream commit f82727adcf2992822e12198792af450a76ebd5ef ]
The reproduction steps:
1. create a tun interface
2. enable l2 bearer
3. TIPC_NL_UDP_GET_REMOTEIP with media name set to tun
tipc: Started in network mode
tipc: Node identity 8af312d38a21, cluster identity 4711
tipc: Enabled bearer <eth:syz_tun>, priority 1
Oops: general protection fault KASAN: null-ptr-deref in range CPU: 1 UID: 1000 PID: 559 Comm: poc Not tainted 6.16.0-rc1+ #117 PREEMPT Hardware name: QEMU Ubuntu 24.04 PC RIP: 0010:tipc_udp_nl_dump_remoteip+0x4a4/0x8f0
the ub was in fact a struct dev.
when bid != 0 && skip_cnt != 0, bearer_list[bid] may be NULL or other media when other thread changes it.
fix this by checking media_id.
--- net/tipc/udp_media.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/tipc/udp_media.c +2 -2
@@ -489,7 +489,7 @@ int tipc_udp_nl_dump_remoteip(struct sk_buff *skb, struct netlink_callback *cb)rtnl_lock (); b =tipc_bearer_find (net, bname); -if (!b) { +if (!b || b->bcast_addr.media_id !=TIPC_MEDIA_TYPE_UDP ) {rtnl_unlock ();return -EINVAL ; }
@@ -500,7 +500,7 @@ int tipc_udp_nl_dump_remoteip(struct sk_buff *skb, struct netlink_callback *cb)rtnl_lock (); b =rtnl_dereference (tn->bearer_list[bid]); -if (!b) { +if (!b || b->bcast_addr.media_id !=TIPC_MEDIA_TYPE_UDP ) {rtnl_unlock ();return -EINVAL ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 384/414 tcp: fix passive TFO socket having invalid NAPI ID
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Wei <[email protected]>
[ Upstream commit dbe0ca8da1f62b6252e7be6337209f4d86d4a914 ]
There is a bug with passive TFO sockets returning an invalid NAPI ID 0 from SO_INCOMING_NAPI_ID. Normally this is not an issue, but zero copy receive relies on a correct NAPI ID to process sockets on the right queue.
Fix by adding a sk_mark_napi_id_set().
--- net/ipv4/tcp_fastopen.c | 3 +++ 1 file changed, 3 insertions(+)
net/ipv4/tcp_fastopen.c +3 -0
@@ -3,6 +3,7 @@#include <linux/tcp.h> #include <linux/rcupdate.h> #include <net/tcp.h> +#include <net/busy_poll.h> void tcp_fastopen_init_key_once (struct net *net) {
@@ -279,6 +280,8 @@ static struct sock *tcp_fastopen_create_child(struct sock *sk,refcount_set (&req->rsk_refcnt,2 ); +sk_mark_napi_id_set (child, skb); +/* Now finish processing the fastopen child socket. */ tcp_init_transfer (child,BPF_SOCK_OPS_PASSIVE_ESTABLISHED_CB , skb);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 385/414 eth: fbnic: avoid double free when failing to DMA-map FW msg
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Jakub Kicinski <[email protected]>
[ Upstream commit 5bd1bafd4474ee26f504b41aba11f3e2a1175b88 ]
The semantics are that caller of fbnic_mbx_map_msg() retains the ownership of the message on error. All existing callers dutifully free the page.
--- drivers/net/ethernet/meta/fbnic/fbnic_fw.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/net/ethernet/meta/fbnic/fbnic_fw.c +1 -4
@@ -127,11 +127,8 @@ static int fbnic_mbx_map_msg(struct fbnic_dev *fbd, int mbx_idx,return -EBUSY ; addr =dma_map_single (fbd->dev, msg,PAGE_SIZE , direction); -if (dma_mapping_error (fbd->dev, addr)) { -free_page ((unsigned long )msg); - +if (dma_mapping_error (fbd->dev, addr))return -ENOSPC ; - } mbx->buf_info[tail].msg = msg; mbx->buf_info[tail].addr = addr;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 386/414 net: lan743x: fix potential out-of-bounds write in lan743x_ptp_io_event_clock_get()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Alexey Kodanev <[email protected]>
[ Upstream commit e353b0854d3a1a31cb061df8d022fbfea53a0f24 ]
Before calling lan743x_ptp_io_event_clock_get(), the 'channel' value is checked against the maximum value of PCI11X1X_PTP_IO_MAX_CHANNELS(8). This seems correct and aligns with the PTP interrupt status register (PTP_INT_STS) specifications.
However, lan743x_ptp_io_event_clock_get() writes to ptp->extts[] with only LAN743X_PTP_N_EXTTS(4) elements, using channel as an index:
lan743x_ptp_io_event_clock_get(..., u8 channel,...)
{
...
/* Update Local timestamp */
extts = &ptp->extts[channel];
extts->ts.tv_sec = sec;
...
}To avoid an out-of-bounds write and utilize all the supported GPIO inputs, set LAN743X_PTP_N_EXTTS to 8.
Detected using the static analysis tool - Svace.
--- drivers/net/ethernet/microchip/lan743x_ptp.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/microchip/lan743x_ptp.h +2 -2
@@ -18,9 +18,9 @@*/ #define LAN743X_PTP_N_EVENT_CHAN 2#define LAN743X_PTP_N_PEROUT LAN743X_PTP_N_EVENT_CHAN -#define LAN743X_PTP_N_EXTTS 4 -#define LAN743X_PTP_N_PPS 0#define PCI11X1X_PTP_IO_MAX_CHANNELS 8 +#define LAN743X_PTP_N_EXTTS PCI11X1X_PTP_IO_MAX_CHANNELS +#define LAN743X_PTP_N_PPS 0#define PTP_CMD_CTL_TIMEOUT_CNT 50struct lan743x_adapter ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 387/414 ublk: santizize the arguments from userspace when adding a device
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ronnie Sahlberg <[email protected]>
[ Upstream commit 8c8472855884355caf3d8e0c50adf825f83454b2 ]
Sanity check the values for queue depth and number of queues we get from userspace when adding a device.
--- drivers/block/ublk_drv.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/block/ublk_drv.c +3 -0
@@ -2457,6 +2457,9 @@ static int ublk_ctrl_add_dev(struct io_uring_cmd *cmd)if (copy_from_user (&info, argp,sizeof (info)))return -EFAULT ; +if (info.queue_depth >UBLK_MAX_QUEUE_DEPTH || info.nr_hw_queues >UBLK_MAX_NR_QUEUES ) +return -EINVAL ; +if (capable (CAP_SYS_ADMIN )) info.flags &= ~UBLK_F_UNPRIVILEGED_DEV ;else if (!(info.flags &UBLK_F_UNPRIVILEGED_DEV ))
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 388/414 drm/xe: Wire up device shutdown handler
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Maarten Lankhorst <[email protected]>
[ Upstream commit 501d799a47e2b83b4e41d5306c2266ea5c100a08 ]
The system is turning off, and we should probably put the device in a safe power state. We don't need to evict VRAM or suspend running jobs to a safe state, as the device is rebooted anyway.
This does not imply the system is necessarily reset, as we can kexec into a new kernel. Without shutting down, things like USB Type-C may mysteriously start failing.
References: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/3500
Stable-dep-of: 16c1241b0875 ("drm/xe/bmg: Update Wa_16023588340")
--- drivers/gpu/drm/xe/display/xe_display.c | 43 +++++++++++++++++++++++++ drivers/gpu/drm/xe/display/xe_display.h | 4 +++ drivers/gpu/drm/xe/xe_device.c | 40 +++++++++++++++++++---- drivers/gpu/drm/xe/xe_gt.c | 7 ++++ drivers/gpu/drm/xe/xe_gt.h | 1 + 5 files changed, 89 insertions(+), 6 deletions(-)
drivers/gpu/drm/xe/display/xe_display.c +43 -0
@@ -352,6 +352,36 @@ void xe_display_pm_suspend(struct xe_device *xe)__xe_display_pm_suspend (xe, false); } +void xe_display_pm_shutdown (struct xe_device *xe) +{ +struct intel_display *display = &xe->display; + +if (!xe->info.probe_display) +return ; + +intel_power_domains_disable (xe); +intel_fbdev_set_suspend (&xe->drm,FBINFO_STATE_SUSPENDED , true); +if (has_display (xe)) { +drm_kms_helper_poll_disable (&xe->drm); +intel_display_driver_disable_user_access (xe); +intel_display_driver_suspend (xe); + } + +xe_display_flush_cleanup_work (xe); +intel_dp_mst_suspend (xe); +intel_hpd_cancel_work (xe); + +if (has_display (xe)) +intel_display_driver_suspend_access (xe); + +intel_encoder_suspend_all (display); +intel_encoder_shutdown_all (display); + +intel_opregion_suspend (display, PCI_D3cold); + +intel_dmc_suspend (xe); +} +void xe_display_pm_runtime_suspend (struct xe_device *xe) {if (!xe->info.probe_display)
@@ -376,6 +406,19 @@ void xe_display_pm_suspend_late(struct xe_device *xe)intel_display_power_suspend_late (xe); } +void xe_display_pm_shutdown_late (struct xe_device *xe) +{ +if (!xe->info.probe_display) +return ; + +/* +* The only requirement is to reboot with display DC states disabled, +* for now leaving all display power wells in the INIT power domain +* enabled. +*/ +intel_power_domains_driver_remove (xe); +} +void xe_display_pm_resume_early (struct xe_device *xe) {if (!xe->info.probe_display)
drivers/gpu/drm/xe/display/xe_display.h +4 -0
@@ -35,7 +35,9 @@ void xe_display_irq_reset(struct xe_device *xe);void xe_display_irq_postinstall (struct xe_device *xe,struct xe_gt *gt);void xe_display_pm_suspend (struct xe_device *xe); +void xe_display_pm_shutdown (struct xe_device *xe);void xe_display_pm_suspend_late (struct xe_device *xe); +void xe_display_pm_shutdown_late (struct xe_device *xe);void xe_display_pm_resume_early (struct xe_device *xe);void xe_display_pm_resume (struct xe_device *xe);void xe_display_pm_runtime_suspend (struct xe_device *xe);
@@ -66,7 +68,9 @@ static inline void xe_display_irq_reset(struct xe_device *xe) {}static inline void xe_display_irq_postinstall (struct xe_device *xe,struct xe_gt *gt) {}static inline void xe_display_pm_suspend (struct xe_device *xe) {} +static inline void xe_display_pm_shutdown (struct xe_device *xe) {}static inline void xe_display_pm_suspend_late (struct xe_device *xe) {} +static inline void xe_display_pm_shutdown_late (struct xe_device *xe) {}static inline void xe_display_pm_resume_early (struct xe_device *xe) {}static inline void xe_display_pm_resume (struct xe_device *xe) {}static inline void xe_display_pm_runtime_suspend (struct xe_device *xe) {}
drivers/gpu/drm/xe/xe_device.c +34 -6
@@ -374,6 +374,11 @@ struct xe_device *xe_device_create(struct pci_dev *pdev,return ERR_PTR (err); } +static bool xe_driver_flr_disabled (struct xe_device *xe) +{ +return xe_mmio_read32 (xe_root_mmio_gt (xe),GU_CNTL_PROTECTED ) &DRIVERINT_FLR_DIS ; +} +/* * The driver-initiated FLR is the highest level of reset that we can trigger * from within the driver. It is different from the PCI FLR in that it doesn't
@@ -387,17 +392,12 @@ struct xe_device *xe_device_create(struct pci_dev *pdev,* if/when a new instance of i915 is bound to the device it will do a full * re-init anyway. */ -static void xe_driver_flr (struct xe_device *xe) +static void __xe_driver_flr (struct xe_device *xe) {const unsigned int flr_timeout =3 *MICRO ;/* specs recommend a 3s wait */ struct xe_gt *gt =xe_root_mmio_gt (xe);int ret; -if (xe_mmio_read32 (gt,GU_CNTL_PROTECTED ) &DRIVERINT_FLR_DIS ) { -drm_info_once (&xe->drm,"BIOS Disabled Driver-FLR\n" ); -return ; - } -drm_dbg (&xe->drm,"Triggering Driver-FLR\n" );/*
@@ -438,6 +438,16 @@ static void xe_driver_flr(struct xe_device *xe)xe_mmio_write32 (gt,GU_DEBUG ,DRIVERFLR_STATUS ); } +static void xe_driver_flr (struct xe_device *xe) +{ +if (xe_driver_flr_disabled (xe)) { +drm_info_once (&xe->drm,"BIOS Disabled Driver-FLR\n" ); +return ; + } + +__xe_driver_flr (xe); +} +static void xe_driver_flr_fini (void *arg) {struct xe_device *xe = arg;
@@ -797,6 +807,24 @@ void xe_device_remove(struct xe_device *xe)void xe_device_shutdown (struct xe_device *xe) { +struct xe_gt *gt; +u8 id; + +drm_dbg (&xe->drm,"Shutting down device\n" ); + +if (xe_driver_flr_disabled (xe)) { +xe_display_pm_shutdown (xe); + +xe_irq_suspend (xe); + +for_each_gt (gt, xe, id) +xe_gt_shutdown (gt); + +xe_display_pm_shutdown_late (xe); + }else { +/* BOOM! */ +__xe_driver_flr (xe); + } }/**
drivers/gpu/drm/xe/xe_gt.c +7 -0
@@ -865,6 +865,13 @@ int xe_gt_suspend(struct xe_gt *gt)return err; } +void xe_gt_shutdown (struct xe_gt *gt) +{ +xe_force_wake_get (gt_to_fw (gt),XE_FORCEWAKE_ALL ); +do_gt_reset (gt); +xe_force_wake_put (gt_to_fw (gt),XE_FORCEWAKE_ALL ); +} +/** * xe_gt_sanitize_freq() - Restore saved frequencies if necessary. * @gt: the GT object
drivers/gpu/drm/xe/xe_gt.h +1 -0
@@ -48,6 +48,7 @@ void xe_gt_record_user_engines(struct xe_gt *gt);void xe_gt_suspend_prepare (struct xe_gt *gt);int xe_gt_suspend (struct xe_gt *gt); +void xe_gt_shutdown (struct xe_gt *gt);int xe_gt_resume (struct xe_gt *gt);void xe_gt_reset_async (struct xe_gt *gt);void xe_gt_sanitize (struct xe_gt *gt);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 389/414 drm/xe/gt: Update handling of xe_force_wake_get return
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Himal Prasad Ghimiray <[email protected]>
[ Upstream commit 30d105577a3319094f8ae5ff1ceea670f1931487 ]
xe_force_wake_get() now returns the reference count-incremented domain mask. If it fails for individual domains, the return value will always be 0. However, for XE_FORCEWAKE_ALL, it may return a non-zero value even in the event of failure. Use helper xe_force_wake_ref_has_domain to verify all domains are initialized or not. Update the return handling of xe_force_wake_get() to reflect this behavior, and ensure that the return value is passed as input to xe_force_wake_put().
v3
- return xe_wakeref_t instead of int in xe_force_wake_get()
- xe_force_wake_put() error doesn't need to be checked. It internally WARNS on domain ack failure.
v4
- Rebase fix
v5
- return unsigned int for xe_force_wake_get()
- remove redundant XE_WARN_ON()
v6
- use helper for checking all initialized domains are awake or not.
v7
- Fix commit message
v9
- Remove redundant WARN_ON (Badal)
Stable-dep-of: 16c1241b0875 ("drm/xe/bmg: Update Wa_16023588340")
--- drivers/gpu/drm/xe/xe_gt.c | 105 ++++++++++++++++++++----------------- 1 file changed, 58 insertions(+), 47 deletions(-)
drivers/gpu/drm/xe/xe_gt.c +58 -47
@@ -98,14 +98,14 @@ void xe_gt_sanitize(struct xe_gt *gt)static void xe_gt_enable_host_l2_vram (struct xe_gt *gt) { +unsigned int fw_ref;u32 reg; -int err;if (!XE_WA (gt,16023588340 ))return ; - err =xe_force_wake_get (gt_to_fw (gt),XE_FW_GT ); -if (WARN_ON (err)) + fw_ref =xe_force_wake_get (gt_to_fw (gt),XE_FW_GT ); +if (!fw_ref)return ;if (!xe_gt_is_media_type (gt)) {
@@ -115,13 +115,13 @@ static void xe_gt_enable_host_l2_vram(struct xe_gt *gt) }xe_gt_mcr_multicast_write (gt,XEHPC_L3CLOS_MASK (3 ),0x3 ); -xe_force_wake_put (gt_to_fw (gt),XE_FW_GT ); +xe_force_wake_put (gt_to_fw (gt), fw_ref); }static void xe_gt_disable_host_l2_vram (struct xe_gt *gt) { +unsigned int fw_ref;u32 reg; -int err;if (!XE_WA (gt,16023588340 ))return ;
@@ -129,15 +129,15 @@ static void xe_gt_disable_host_l2_vram(struct xe_gt *gt)if (xe_gt_is_media_type (gt))return ; - err =xe_force_wake_get (gt_to_fw (gt),XE_FW_GT ); -if (WARN_ON (err)) + fw_ref =xe_force_wake_get (gt_to_fw (gt),XE_FW_GT ); +if (!fw_ref)return ; reg =xe_gt_mcr_unicast_read_any (gt,XE2_GAMREQSTRM_CTRL ); reg &= ~CG_DIS_CNTLBUS ;xe_gt_mcr_multicast_write (gt,XE2_GAMREQSTRM_CTRL , reg); -xe_force_wake_put (gt_to_fw (gt),XE_FW_GT ); +xe_force_wake_put (gt_to_fw (gt), fw_ref); }/**
@@ -405,11 +405,14 @@ static void dump_pat_on_error(struct xe_gt *gt)static int gt_fw_domain_init (struct xe_gt *gt) { +unsigned int fw_ref;int err, i; - err =xe_force_wake_get (gt_to_fw (gt),XE_FW_GT ); -if (err) + fw_ref =xe_force_wake_get (gt_to_fw (gt),XE_FW_GT ); +if (!fw_ref) { + err = -ETIMEDOUT ; goto err_hw_fence_irq; + }if (!xe_gt_is_media_type (gt)) { err =xe_ggtt_init (gt_to_tile (gt)->mem.ggtt);
@@ -444,14 +447,12 @@ static int gt_fw_domain_init(struct xe_gt *gt)*/ gt->info.gmdid =xe_mmio_read32 (gt,GMD_ID ); - err =xe_force_wake_put (gt_to_fw (gt),XE_FW_GT ); -XE_WARN_ON (err); - +xe_force_wake_put (gt_to_fw (gt), fw_ref);return 0 ; err_force_wake:dump_pat_on_error (gt); -xe_force_wake_put (gt_to_fw (gt),XE_FW_GT ); +xe_force_wake_put (gt_to_fw (gt), fw_ref); err_hw_fence_irq:for (i =0 ; i <XE_ENGINE_CLASS_MAX ; ++i)xe_hw_fence_irq_finish (>->fence_irq[i]);
@@ -461,11 +462,14 @@ static int gt_fw_domain_init(struct xe_gt *gt)static int all_fw_domain_init (struct xe_gt *gt) { +unsigned int fw_ref;int err, i; - err =xe_force_wake_get (gt_to_fw (gt),XE_FORCEWAKE_ALL ); -if (err) - goto err_hw_fence_irq; + fw_ref =xe_force_wake_get (gt_to_fw (gt),XE_FORCEWAKE_ALL ); +if (!xe_force_wake_ref_has_domain (fw_ref,XE_FORCEWAKE_ALL )) { + err = -ETIMEDOUT ; + goto err_force_wake; + }xe_gt_mcr_set_implicit_defaults (gt);xe_wa_process_gt (gt);
@@ -531,14 +535,12 @@ static int all_fw_domain_init(struct xe_gt *gt)if (IS_SRIOV_PF (gt_to_xe (gt)))xe_gt_sriov_pf_init_hw (gt); - err =xe_force_wake_put (gt_to_fw (gt),XE_FORCEWAKE_ALL ); -XE_WARN_ON (err); +xe_force_wake_put (gt_to_fw (gt), fw_ref);return 0 ; err_force_wake: -xe_force_wake_put (gt_to_fw (gt),XE_FORCEWAKE_ALL ); -err_hw_fence_irq: +xe_force_wake_put (gt_to_fw (gt), fw_ref);for (i =0 ; i <XE_ENGINE_CLASS_MAX ; ++i)xe_hw_fence_irq_finish (>->fence_irq[i]);
@@ -551,11 +553,12 @@ static int all_fw_domain_init(struct xe_gt *gt)*/ int xe_gt_init_hwconfig (struct xe_gt *gt) { +unsigned int fw_ref;int err; - err =xe_force_wake_get (gt_to_fw (gt),XE_FW_GT ); -if (err) - goto out; + fw_ref =xe_force_wake_get (gt_to_fw (gt),XE_FW_GT ); +if (!fw_ref) +return -ETIMEDOUT ;xe_gt_mcr_init_early (gt);xe_pat_init (gt);
@@ -573,8 +576,7 @@ int xe_gt_init_hwconfig(struct xe_gt *gt)xe_gt_enable_host_l2_vram (gt); out_fw: -xe_force_wake_put (gt_to_fw (gt),XE_FW_GT ); -out: +xe_force_wake_put (gt_to_fw (gt), fw_ref);return err; }
@@ -744,6 +746,7 @@ static int do_gt_restart(struct xe_gt *gt)static int gt_reset (struct xe_gt *gt) { +unsigned int fw_ref;int err;if (xe_device_wedged (gt_to_xe (gt)))
@@ -764,9 +767,11 @@ static int gt_reset(struct xe_gt *gt)xe_gt_sanitize (gt); - err =xe_force_wake_get (gt_to_fw (gt),XE_FORCEWAKE_ALL ); -if (err) - goto err_msg; + fw_ref =xe_force_wake_get (gt_to_fw (gt),XE_FORCEWAKE_ALL ); +if (!xe_force_wake_ref_has_domain (fw_ref,XE_FORCEWAKE_ALL )) { + err = -ETIMEDOUT ; + goto err_out; + }xe_uc_gucrc_disable (>->uc);xe_uc_stop_prepare (>->uc);
@@ -784,8 +789,7 @@ static int gt_reset(struct xe_gt *gt)if (err) goto err_out; - err =xe_force_wake_put (gt_to_fw (gt),XE_FORCEWAKE_ALL ); -XE_WARN_ON (err); +xe_force_wake_put (gt_to_fw (gt), fw_ref);xe_pm_runtime_put (gt_to_xe (gt));xe_gt_info (gt,"reset done\n" );
@@ -793,8 +797,7 @@ static int gt_reset(struct xe_gt *gt)return 0 ; err_out: -XE_WARN_ON (xe_force_wake_put (gt_to_fw (gt),XE_FORCEWAKE_ALL )); -err_msg: +xe_force_wake_put (gt_to_fw (gt), fw_ref);XE_WARN_ON (xe_uc_start (>->uc)); err_fail:xe_gt_err (gt,"reset failed (%pe)\n" ,ERR_PTR (err));
@@ -826,22 +829,25 @@ void xe_gt_reset_async(struct xe_gt *gt)void xe_gt_suspend_prepare (struct xe_gt *gt) { -XE_WARN_ON (xe_force_wake_get (gt_to_fw (gt),XE_FORCEWAKE_ALL )); +unsigned int fw_ref; + + fw_ref =xe_force_wake_get (gt_to_fw (gt),XE_FORCEWAKE_ALL );xe_uc_suspend_prepare (>->uc); -XE_WARN_ON (xe_force_wake_put (gt_to_fw (gt),XE_FORCEWAKE_ALL )); +xe_force_wake_put (gt_to_fw (gt), fw_ref); }int xe_gt_suspend (struct xe_gt *gt) { +unsigned int fw_ref;int err;xe_gt_dbg (gt,"suspending\n" );xe_gt_sanitize (gt); - err =xe_force_wake_get (gt_to_fw (gt),XE_FORCEWAKE_ALL ); -if (err) + fw_ref =xe_force_wake_get (gt_to_fw (gt),XE_FORCEWAKE_ALL ); +if (!xe_force_wake_ref_has_domain (fw_ref,XE_FORCEWAKE_ALL )) goto err_msg; err =xe_uc_suspend (>->uc);
@@ -852,14 +858,15 @@ int xe_gt_suspend(struct xe_gt *gt)xe_gt_disable_host_l2_vram (gt); -XE_WARN_ON (xe_force_wake_put (gt_to_fw (gt),XE_FORCEWAKE_ALL )); +xe_force_wake_put (gt_to_fw (gt), fw_ref);xe_gt_dbg (gt,"suspended\n" );return 0 ; -err_force_wake: -XE_WARN_ON (xe_force_wake_put (gt_to_fw (gt),XE_FORCEWAKE_ALL )); err_msg: + err = -ETIMEDOUT ; +err_force_wake: +xe_force_wake_put (gt_to_fw (gt), fw_ref);xe_gt_err (gt,"suspend failed (%pe)\n" ,ERR_PTR (err));return err;
@@ -867,9 +874,11 @@ int xe_gt_suspend(struct xe_gt *gt)void xe_gt_shutdown (struct xe_gt *gt) { -xe_force_wake_get (gt_to_fw (gt),XE_FORCEWAKE_ALL ); +unsigned int fw_ref; + + fw_ref =xe_force_wake_get (gt_to_fw (gt),XE_FORCEWAKE_ALL );do_gt_reset (gt); -xe_force_wake_put (gt_to_fw (gt),XE_FORCEWAKE_ALL ); +xe_force_wake_put (gt_to_fw (gt), fw_ref); }/**
@@ -894,11 +903,12 @@ int xe_gt_sanitize_freq(struct xe_gt *gt)int xe_gt_resume (struct xe_gt *gt) { +unsigned int fw_ref;int err;xe_gt_dbg (gt,"resuming\n" ); - err =xe_force_wake_get (gt_to_fw (gt),XE_FORCEWAKE_ALL ); -if (err) + fw_ref =xe_force_wake_get (gt_to_fw (gt),XE_FORCEWAKE_ALL ); +if (!xe_force_wake_ref_has_domain (fw_ref,XE_FORCEWAKE_ALL )) goto err_msg; err =do_gt_restart (gt);
@@ -907,14 +917,15 @@ int xe_gt_resume(struct xe_gt *gt)xe_gt_idle_enable_pg (gt); -XE_WARN_ON (xe_force_wake_put (gt_to_fw (gt),XE_FORCEWAKE_ALL )); +xe_force_wake_put (gt_to_fw (gt), fw_ref);xe_gt_dbg (gt,"resumed\n" );return 0 ; -err_force_wake: -XE_WARN_ON (xe_force_wake_put (gt_to_fw (gt),XE_FORCEWAKE_ALL )); err_msg: + err = -ETIMEDOUT ; +err_force_wake: +xe_force_wake_put (gt_to_fw (gt), fw_ref);xe_gt_err (gt,"resume failed (%pe)\n" ,ERR_PTR (err));return err;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 390/414 drm/xe/bmg: Update Wa_16023588340
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vinay Belgaumkar <[email protected]>
[ Upstream commit 16c1241b08751a67cd7a0221ea9f82b0b02806f4 ]
This allows for additional L2 caching modes.
--- drivers/gpu/drm/xe/xe_gt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/xe/xe_gt.c +1 -1
@@ -114,7 +114,7 @@ static void xe_gt_enable_host_l2_vram(struct xe_gt *gt)xe_gt_mcr_multicast_write (gt,XE2_GAMREQSTRM_CTRL , reg); } -xe_gt_mcr_multicast_write (gt,XEHPC_L3CLOS_MASK (3 ),0x3 ); +xe_gt_mcr_multicast_write (gt,XEHPC_L3CLOS_MASK (3 ),0xF );xe_force_wake_put (gt_to_fw (gt), fw_ref); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 391/414 calipso: Fix null-ptr-deref in calipso_req_{set,del}attr().
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Kuniyuki Iwashima <[email protected]>
[ Upstream commit 10876da918fa1aec0227fb4c67647513447f53a9 ]
syzkaller reported a null-ptr-deref in sock_omalloc() while allocating a CALIPSO option. [0]
The NULL is of struct sock, which was fetched by sk_to_full_sk() in calipso_req_setattr().
Since commit a1a5344ddbe8 ("tcp: avoid two atomic ops for syncookies"), reqsk->rsk_listener could be NULL when SYN Cookie is returned to its client, as hinted by the leading SYN Cookie log.
Here are 3 options to fix the bug:
1) Return 0 in calipso_req_setattr()
2) Return an error in calipso_req_setattr()
3) Alaways set rsk_listener
1) is no go as it bypasses LSM, but 2) effectively disables SYN Cookie for CALIPSO. 3) is also no go as there have been many efforts to reduce atomic ops and make TCP robust against DDoS. See also commit 3b24d854cb35 ("tcp/dccp: do not touch listener sk_refcnt under synflood").
As of the blamed commit, SYN Cookie already did not need refcounting, and no one has stumbled on the bug for 9 years, so no CALIPSO user will care about SYN Cookie.
Let's return an error in calipso_req_setattr() and calipso_req_delattr() in the SYN Cookie case.
This can be reproduced by [1] on Fedora and now connect() of nc times out.
[0]:
TCP: request_sock_TCPv6: Possible SYN flooding on port [::]:20002. Sending cookies.
Oops: general protection fault, probably for non-canonical address 0xdffffc0000000006: 0000 [#1] PREEMPT SMP KASAN NOPTI KASAN: null-ptr-deref in range [0x0000000000000030-0x0000000000000037] CPU: 3 UID: 0 PID: 12262 Comm: syz.1.2611 Not tainted 6.14.0 #2 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS rel-1.16.3-0-ga6ed6b701f0a-prebuilt.qemu.org 04/01/2014 RIP: 0010:read_pnet include/net/net_namespace.h:406 [inline] RIP: 0010:sock_net include/net/sock.h:655 [inline] RIP: 0010:sock_kmalloc+0x35/0x170 net/core/sock.c:2806 Code: 89 d5 41 54 55 89 f5 53 48 89 fb e8 25 e3 c6 fd e8 f0 91 e3 00 48 8d 7b 30 48 b8 00 00 00 00 00 fc ff df 48 89 fa 48 c1 ea 03 <80> 3c 02 00 0f 85 26 01 00 00 48 b8 00 00 00 00 00 fc ff df 4c 8b RSP: 0018:ffff88811af89038 EFLAGS: 00010216 RAX: dffffc0000000000 RBX: 0000000000000000 RCX: ffff888105266400 RDX: 0000000000000006 RSI: ffff88800c890000 RDI: 0000000000000030 RBP: 0000000000000050 R08: 0000000000000000 R09: ffff88810526640e R10: ffffed1020a4cc81 R11: ffff88810526640f R12: 0000000000000000 R13: 0000000000000820 R14: ffff888105266400 R15: 0000000000000050 FS: 00007f0653a07640(0000) GS:ffff88811af80000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f863ba096f4 CR3: 00000000163c0005 CR4: 0000000000770ef0 PKRU: 80000000 Call Trace: <IRQ> ipv6_renew_options+0x279/0x950 net/ipv6/exthdrs.c:1288 calipso_req_setattr+0x181/0x340 net/ipv6/calipso.c:1204 calipso_req_setattr+0x56/0x80 net/netlabel/netlabel_calipso.c:597 netlbl_req_setattr+0x18a/0x440 net/netlabel/netlabel_kapi.c:1249 selinux_netlbl_inet_conn_request+0x1fb/0x320 security/selinux/netlabel.c:342 selinux_inet_conn_request+0x1eb/0x2c0 security/selinux/hooks.c:5551 security_inet_conn_request+0x50/0xa0 security/security.c:4945 tcp_v6_route_req+0x22c/0x550 net/ipv6/tcp_ipv6.c:825 tcp_conn_request+0xec8/0x2b70 net/ipv4/tcp_input.c:7275 tcp_v6_conn_request+0x1e3/0x440 net/ipv6/tcp_ipv6.c:1328 tcp_rcv_state_process+0xafa/0x52b0 net/ipv4/tcp_input.c:6781 tcp_v6_do_rcv+0x8a6/0x1a40 net/ipv6/tcp_ipv6.c:1667 tcp_v6_rcv+0x505e/0x5b50 net/ipv6/tcp_ipv6.c:1904 ip6_protocol_deliver_rcu+0x17c/0x1da0 net/ipv6/ip6_input.c:436 ip6_input_finish+0x103/0x180 net/ipv6/ip6_input.c:480 NF_HOOK include/linux/netfilter.h:314 [inline] NF_HOOK include/linux/netfilter.h:308 [inline] ip6_input+0x13c/0x6b0 net/ipv6/ip6_input.c:491 dst_input include/net/dst.h:469 [inline] ip6_rcv_finish net/ipv6/ip6_input.c:79 [inline] ip6_rcv_finish+0xb6/0x490 net/ipv6/ip6_input.c:69 NF_HOOK include/linux/netfilter.h:314 [inline] NF_HOOK include/linux/netfilter.h:308 [inline] ipv6_rcv+0xf9/0x490 net/ipv6/ip6_input.c:309 __netif_receive_skb_one_core+0x12e/0x1f0 net/core/dev.c:5896 __netif_receive_skb+0x1d/0x170 net/core/dev.c:6009 process_backlog+0x41e/0x13b0 net/core/dev.c:6357 __napi_poll+0xbd/0x710 net/core/dev.c:7191 napi_poll net/core/dev.c:7260 [inline] net_rx_action+0x9de/0xde0 net/core/dev.c:7382 handle_softirqs+0x19a/0x770 kernel/softirq.c:561 do_softirq.part.0+0x36/0x70 kernel/softirq.c:462 </IRQ> <TASK> do_softirq arch/x86/include/asm/preempt.h:26 [inline] __local_bh_enable_ip+0xf1/0x110 kernel/softirq.c:389 local_bh_enable include/linux/bottom_half.h:33 [inline] rcu_read_unlock_bh include/linux/rcupdate.h:919 [inline] __dev_queue_xmit+0xc2a/0x3c40 net/core/dev.c:4679 dev_queue_xmit include/linux/netdevice.h:3313 [inline] neigh_hh_output include/net/neighbour.h:523 [inline] neigh_output include/net/neighbour.h:537 [inline] ip6_finish_output2+0xd69/0x1f80 net/ipv6/ip6_output.c:141 __ip6_finish_output net/ipv6/ip6_output.c:215 [inline] ip6_finish_output+0x5dc/0xd60 net/ipv6/ip6_output.c:226 NF_HOOK_COND include/linux/netfilter.h:303 [inline] ip6_output+0x24b/0x8d0 net/ipv6/ip6_output.c:247 dst_output include/net/dst.h:459 [inline] NF_HOOK include/linux/netfilter.h:314 [inline] NF_HOOK include/linux/netfilter.h:308 [inline] ip6_xmit+0xbbc/0x20d0 net/ipv6/ip6_output.c:366 inet6_csk_xmit+0x39a/0x720 net/ipv6/inet6_connection_sock.c:135 __tcp_transmit_skb+0x1a7b/0x3b40 net/ipv4/tcp_output.c:1471 tcp_transmit_skb net/ipv4/tcp_output.c:1489 [inline] tcp_send_syn_data net/ipv4/tcp_output.c:4059 [inline] tcp_connect+0x1c0c/0x4510 net/ipv4/tcp_output.c:4148 tcp_v6_connect+0x156c/0x2080 net/ipv6/tcp_ipv6.c:333 __inet_stream_connect+0x3a7/0xed0 net/ipv4/af_inet.c:677 tcp_sendmsg_fastopen+0x3e2/0x710 net/ipv4/tcp.c:1039 tcp_sendmsg_locked+0x1e82/0x3570 net/ipv4/tcp.c:1091 tcp_sendmsg+0x2f/0x50 net/ipv4/tcp.c:1358 inet6_sendmsg+0xb9/0x150 net/ipv6/af_inet6.c:659 sock_sendmsg_nosec net/socket.c:718 [inline] __sock_sendmsg+0xf4/0x2a0 net/socket.c:733 __sys_sendto+0x29a/0x390 net/socket.c:2187 __do_sys_sendto net/socket.c:2194 [inline] __se_sys_sendto net/socket.c:2190 [inline] __x64_sys_sendto+0xe1/0x1c0 net/socket.c:2190 do_syscall_x64 arch/x86/entry/common.c:52 [inline] do_syscall_64+0xc3/0x1d0 arch/x86/entry/common.c:83 entry_SYSCALL_64_after_hwframe+0x77/0x7f RIP: 0033:0x7f06553c47ed Code: 02 b8 ff ff ff ff c3 66 0f 1f 44 00 00 f3 0f 1e fa 48 89 f8 48 89 f7 48 89 d6 48 89 ca 4d 89 c2 4d 89 c8 4c 8b 4c 24 08 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 c7 c1 a8 ff ff ff f7 d8 64 89 01 48 RSP: 002b:00007f0653a06fc8 EFLAGS: 00000246 ORIG_RAX: 000000000000002c RAX: ffffffffffffffda RBX: 00007f0655605fa0 RCX: 00007f06553c47ed RDX: 0000000000000000 RSI: 0000000000000000 RDI: 000000000000000b RBP: 00007f065545db38 R08: 0000200000000140 R09: 000000000000001c R10: f7384d4ea84b01bd R11: 0000000000000246 R12: 0000000000000000 R13: 00007f0655605fac R14: 00007f0655606038 R15: 00007f06539e7000 </TASK> Modules linked in:
[1]:
dnf install -y selinux-policy-targeted policycoreutils netlabel_tools procps-ng nmap-ncat mount -t selinuxfs none /sys/fs/selinuxload_policy
netlabelctl calipso add pass doi:1
netlabelctl map del default
netlabelctl map add default address:::1 protocol:calipso,1
sysctl net.ipv4.tcp_syncookies=2
nc -l ::1 80 &
nc ::1 80
--- net/ipv6/calipso.c | 8 ++++++++ 1 file changed, 8 insertions(+)
net/ipv6/calipso.c +8 -0
@@ -1207,6 +1207,10 @@ static int calipso_req_setattr(struct request_sock *req,struct ipv6_opt_hdr *old, *new;struct sock *sk =sk_to_full_sk (req_to_sk (req)); +/* sk is NULL for SYN+ACK w/ SYN Cookie */ +if (!sk) +return -ENOMEM ; +if (req_inet->ipv6_opt && req_inet->ipv6_opt->hopopt) old = req_inet->ipv6_opt->hopopt;else
@@ -1247,6 +1251,10 @@ static void calipso_req_delattr(struct request_sock *req)struct ipv6_txoptions *txopts;struct sock *sk =sk_to_full_sk (req_to_sk (req)); +/* sk is NULL for SYN+ACK w/ SYN Cookie */ +if (!sk) +return ; +if (!req_inet->ipv6_opt || !req_inet->ipv6_opt->hopopt)return ;
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 392/414 mlxbf_gige: return EPROBE_DEFER if PHY IRQ is not available
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Thompson <[email protected]>
[ Upstream commit e7ea5f5b1858ddb96b152584d5fe06e6fc623e89 ]
The message "Error getting PHY irq. Use polling instead" is emitted when the mlxbf_gige driver is loaded by the kernel before the associated gpio-mlxbf driver, and thus the call to get the PHY IRQ fails since it is not yet available. The driver probe() must return -EPROBE_DEFER if acpi_dev_gpio_irq_get_by() returns the same.
--- drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c +4 -2
@@ -447,8 +447,10 @@ static int mlxbf_gige_probe(struct platform_device *pdev) priv->llu_plu_irq =platform_get_irq (pdev,MLXBF_GIGE_LLU_PLU_INTR_IDX ); phy_irq =acpi_dev_gpio_irq_get_by (ACPI_COMPANION (&pdev->dev),"phy" ,0 ); -if (phy_irq <0 ) { -dev_err (&pdev->dev,"Error getting PHY irq. Use polling instead" ); +if (phy_irq == -EPROBE_DEFER ) { + err = -EPROBE_DEFER ; + goto out; + }else if (phy_irq <0 ) { phy_irq =PHY_POLL ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 393/414 net: atm: add lec_mutex
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit d13a3824bfd2b4774b671a75cf766a16637a0e67 ]
syzbot found its way in net/atm/lec.c, and found an error path in lecd_attach() could leave a dangling pointer in dev_lec[].
Add a mutex to protect dev_lecp[] uses from lecd_attach(), lec_vcc_attach() and lec_mcast_attach().
Following patch will use this mutex for /proc/net/atm/lec.
BUG: KASAN: slab-use-after-free in lecd_attach net/atm/lec.c:751 [inline] BUG: KASAN: slab-use-after-free in lane_ioctl+0x2224/0x23e0 net/atm/lec.c:1008 Read of size 8 at addr ffff88807c7b8e68 by task syz.1.17/6142 CPU: 1 UID: 0 PID: 6142 Comm: syz.1.17 Not tainted 6.16.0-rc1-syzkaller-00239-g08215f5486ec #0 PREEMPT(full) Hardware name: Google Google Compute Engine/Google Compute Engine, BIOS Google 05/07/2025 Call Trace: <TASK> __dump_stack lib/dump_stack.c:94 [inline] dump_stack_lvl+0x116/0x1f0 lib/dump_stack.c:120 print_address_description mm/kasan/report.c:408 [inline] print_report+0xcd/0x680 mm/kasan/report.c:521 kasan_report+0xe0/0x110 mm/kasan/report.c:634 lecd_attach net/atm/lec.c:751 [inline] lane_ioctl+0x2224/0x23e0 net/atm/lec.c:1008 do_vcc_ioctl+0x12c/0x930 net/atm/ioctl.c:159 sock_do_ioctl+0x118/0x280 net/socket.c:1190 sock_ioctl+0x227/0x6b0 net/socket.c:1311 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:907 [inline] __se_sys_ioctl fs/ioctl.c:893 [inline] __x64_sys_ioctl+0x18e/0x210 fs/ioctl.c:893 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xcd/0x4c0 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f </TASK> Allocated by task 6132: kasan_save_stack+0x33/0x60 mm/kasan/common.c:47 kasan_save_track+0x14/0x30 mm/kasan/common.c:68 poison_kmalloc_redzone mm/kasan/common.c:377 [inline] __kasan_kmalloc+0xaa/0xb0 mm/kasan/common.c:394 kasan_kmalloc include/linux/kasan.h:260 [inline] __do_kmalloc_node mm/slub.c:4328 [inline] __kvmalloc_node_noprof+0x27b/0x620 mm/slub.c:5015 alloc_netdev_mqs+0xd2/0x1570 net/core/dev.c:11711 lecd_attach net/atm/lec.c:737 [inline] lane_ioctl+0x17db/0x23e0 net/atm/lec.c:1008 do_vcc_ioctl+0x12c/0x930 net/atm/ioctl.c:159 sock_do_ioctl+0x118/0x280 net/socket.c:1190 sock_ioctl+0x227/0x6b0 net/socket.c:1311 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:907 [inline] __se_sys_ioctl fs/ioctl.c:893 [inline] __x64_sys_ioctl+0x18e/0x210 fs/ioctl.c:893 do_syscall_x64 arch/x86/entry/syscall_64.c:63 [inline] do_syscall_64+0xcd/0x4c0 arch/x86/entry/syscall_64.c:94 entry_SYSCALL_64_after_hwframe+0x77/0x7f Freed by task 6132: kasan_save_stack+0x33/0x60 mm/kasan/common.c:47 kasan_save_track+0x14/0x30 mm/kasan/common.c:68 kasan_save_free_info+0x3b/0x60 mm/kasan/generic.c:576 poison_slab_object mm/kasan/common.c:247 [inline] __kasan_slab_free+0x51/0x70 mm/kasan/common.c:264 kasan_slab_free include/linux/kasan.h:233 [inline] slab_free_hook mm/slub.c:2381 [inline] slab_free mm/slub.c:4643 [inline] kfree+0x2b4/0x4d0 mm/slub.c:4842 free_netdev+0x6c5/0x910 net/core/dev.c:11892 lecd_attach net/atm/lec.c:744 [inline] lane_ioctl+0x1ce8/0x23e0 net/atm/lec.c:1008 do_vcc_ioctl+0x12c/0x930 net/atm/ioctl.c:159 sock_do_ioctl+0x118/0x280 net/socket.c:1190 sock_ioctl+0x227/0x6b0 net/socket.c:1311 vfs_ioctl fs/ioctl.c:51 [inline] __do_sys_ioctl fs/ioctl.c:907 [inline] __se_sys_ioctl fs/ioctl.c:893 [inline] __x64_sys_ioctl+0x18e/0x210 fs/ioctl.c:893
--- net/atm/lec.c | 7 +++++++ 1 file changed, 7 insertions(+)
net/atm/lec.c +7 -0
@@ -124,6 +124,7 @@ static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };/* Device structures */ static struct net_device *dev_lec[MAX_LEC_ITF ]; +static DEFINE_MUTEX (lec_mutex);#if IS_ENABLED (CONFIG_BRIDGE )static void lec_handle_bridge (struct sk_buff *skb,struct net_device *dev)
@@ -685,6 +686,7 @@ static int lec_vcc_attach(struct atm_vcc *vcc, void __user *arg)int bytes_left;struct atmlec_ioc ioc_data; +lockdep_assert_held (&lec_mutex);/* Lecd must be up in this case */ bytes_left =copy_from_user (&ioc_data, arg,sizeof (struct atmlec_ioc ));if (bytes_left !=0 )
@@ -710,6 +712,7 @@ static int lec_vcc_attach(struct atm_vcc *vcc, void __user *arg)static int lec_mcast_attach (struct atm_vcc *vcc,int arg) { +lockdep_assert_held (&lec_mutex);if (arg <0 || arg >=MAX_LEC_ITF )return -EINVAL ; arg =array_index_nospec (arg,MAX_LEC_ITF );
@@ -725,6 +728,7 @@ static int lecd_attach(struct atm_vcc *vcc, int arg)int i;struct lec_priv *priv; +lockdep_assert_held (&lec_mutex);if (arg <0 ) arg =0 ;if (arg >=MAX_LEC_ITF )
@@ -742,6 +746,7 @@ static int lecd_attach(struct atm_vcc *vcc, int arg)snprintf (dev_lec[i]->name,IFNAMSIZ ,"lec%d" , i);if (register_netdev (dev_lec[i])) {free_netdev (dev_lec[i]); + dev_lec[i] =NULL ;return -EINVAL ; }
@@ -1003,6 +1008,7 @@ static int lane_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)return -ENOIOCTLCMD ; } +mutex_lock (&lec_mutex);switch (cmd) {case ATMLEC_CTRL : err =lecd_attach (vcc, (int )arg);
@@ -1017,6 +1023,7 @@ static int lane_ioctl(struct socket *sock, unsigned int cmd, unsigned long arg)break ; } +mutex_unlock (&lec_mutex);return err; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 394/414 net: atm: fix /proc/net/atm/lec handling
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Dumazet <[email protected]>
[ Upstream commit d03b79f459c7935cff830d98373474f440bd03ae ]
/proc/net/atm/lec must ensure safety against dev_lec[] changes.
It appears it had dev_put() calls without prior dev_hold(), leading to imbalance and UAF.
--- net/atm/lec.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
net/atm/lec.c +3 -2
@@ -909,7 +909,6 @@ static void *lec_itf_walk(struct lec_state *state, loff_t *l) v = (dev &&netdev_priv (dev)) ?lec_priv_walk (state, l,netdev_priv (dev)) :NULL ;if (!v && dev) { -dev_put (dev);/* Partial state reset for the next time we get called */ dev =NULL ; }
@@ -933,6 +932,7 @@ static void *lec_seq_start(struct seq_file *seq, loff_t *pos) {struct lec_state *state = seq->private; +mutex_lock (&lec_mutex); state->itf =0 ; state->dev =NULL ; state->locked =NULL ;
@@ -950,8 +950,9 @@ static void lec_seq_stop(struct seq_file *seq, void *v)if (state->dev) {spin_unlock_irqrestore (&state->locked->lec_arp_lock, state->flags); -dev_put (state->dev); + state->dev =NULL ; } +mutex_unlock (&lec_mutex); }static void *lec_seq_next (struct seq_file *seq,void *v,loff_t *pos)
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 395/414 EDAC/amd64: Correct number of UMCs for family 19h models 70h-7fh
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Avadhut Naik <[email protected]>
commit b2e673ae53ef4b943f68585207a5f21cfc9a0714 upstream.
AMD's Family 19h-based Models 70h-7fh support 4 unified memory controllers (UMC) per processor die.
The amd64_edac driver, however, assumes only 2 UMCs are supported since max_mcs variable for the models has not been explicitly set to 4. The same results in incomplete or incorrect memory information being logged to dmesg by the module during initialization in some instances.
--- drivers/edac/amd64_edac.c | 1 + 1 file changed, 1 insertion(+)
drivers/edac/amd64_edac.c +1 -0
@@ -3882,6 +3882,7 @@ static int per_family_init(struct amd64_break ; case 0x70 ... 0x7f: pvt->ctl_name ="F19h_M70h" ; + pvt->max_mcs =4 ; pvt->flags.zn_regs_v2 =1 ;break ; case 0x90 ... 0x9f:
Greg Kroah-Hartman
maintainerPATCH 396/414 dt-bindings: i2c: nvidia,tegra20-i2c: Specify the required properties
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Akhil R <[email protected]>
commit 903cc7096db22f889d48e2cee8840709ce04fdac upstream.
Specify the properties which are essential and which are not for the Tegra I2C driver to function correctly. This was not added correctly when the TXT binding was converted to yaml. All the existing DT nodes have these properties already and hence this does not break the ABI.
dmas and dma-names which were specified as a must in the TXT binding is now made optional since the driver can work in PIO mode if dmas are missing.
--- Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.yaml | 24 +++++++++- 1 file changed, 23 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/i2c/nvidia,tegra20-i2c.yaml +23 -1
@@ -97,7 +97,10 @@ properties: resets: items: - - description: module reset + - description: + Module reset. This property is optional for controllers in Tegra194, + Tegra234 etc where an internal software reset is available as an + alternative. reset-names: items:
@@ -116,6 +119,13 @@ properties: - const: rx - const: tx +required: + - compatible + - reg + - interrupts + - clocks + - clock-names + allOf: - $ref: /schemas/i2c/i2c-controller.yaml - if:
@@ -169,6 +179,18 @@ allOf: properties: power-domains: false + - if: + not: + properties: + compatible: + contains: + enum: + - nvidia,tegra194-i2c + then: + required: + - resets + - reset-names + unevaluatedProperties: false examples:
Greg Kroah-Hartman
maintainerPATCH 397/414 smb: Log an error when close_all_cached_dirs fails
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Paul Aurich <[email protected]>
commit a2182743a8b4969481f64aec4908ff162e8a206c upstream.
Under low-memory conditions, close_all_cached_dirs() can't move the dentries to a separate list to dput() them once the locks are dropped. This will result in a "Dentry still in use" error, so add an error message that makes it clear this is what happened:
[ 495.281119] CIFS: VFS: \\otters.example.com\share Out of memory while dropping dentries
[ 495.281595] ------------[ cut here ]------------
[ 495.281887] BUG: Dentry ffff888115531138{i=78,n=/} still in use (2) [unmount of cifs cifs]
[ 495.282391] WARNING: CPU: 1 PID: 2329 at fs/dcache.c:1536 umount_check+0xc8/0xf0Also, bail out of looping through all tcons as soon as a single allocation fails, since we're already in trouble, and kmalloc() attempts for subseqeuent tcons are likely to fail just like the first one did.
--- fs/smb/client/cached_dir.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
fs/smb/client/cached_dir.c +12 -2
@@ -484,8 +484,17 @@ void close_all_cached_dirs(struct cifs_sspin_lock (&cfids->cfid_list_lock);list_for_each_entry (cfid, &cfids->entries, entry) { tmp_list =kmalloc (sizeof (*tmp_list),GFP_ATOMIC ); -if (tmp_list ==NULL ) -break ; +if (tmp_list ==NULL ) { +/* +* If the malloc() fails, we won't drop all +* dentries, and unmounting is likely to trigger +* a 'Dentry still in use' error. +*/ +cifs_tcon_dbg (VFS ,"Out of memory while dropping dentries\n" ); +spin_unlock (&cfids->cfid_list_lock); +spin_unlock (&cifs_sb->tlink_tree_lock); + goto done; + }spin_lock (&cfid->fid_lock); tmp_list->dentry = cfid->dentry; cfid->dentry =NULL ;
@@ -497,6 +506,7 @@ void close_all_cached_dirs(struct cifs_s }spin_unlock (&cifs_sb->tlink_tree_lock); +done:list_for_each_entry_safe (tmp_list, q, &entry, entry) {list_del (&tmp_list->entry);dput (tmp_list->dentry);
Greg Kroah-Hartman
maintainerPATCH 398/414 serial: sh-sci: Clean sci_ports[0] after at earlycon exit
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Beznea <[email protected]>
commit 5f1017069933489add0c08659673443c9905659e upstream.
The early_console_setup() function initializes sci_ports[0].port with an object of type struct uart_port obtained from the struct earlycon_device passed as an argument to early_console_setup().
Later, during serial port probing, the serial port used as earlycon (e.g., port A) might be remapped to a different position in the sci_ports[] array, and a different serial port (e.g., port B) might be assigned to slot
0. For example:
sci_ports[0] = port B
sci_ports[X] = port A
In this scenario, the new port mapped at index zero (port B) retains the data associated with the earlycon configuration. Consequently, after the Linux boot process, any access to the serial port now mapped to sci_ports[0] (port B) will block the original earlycon port (port A).
To address this, introduce an early_console_exit() function to clean up sci_ports[0] when earlycon is exited.
To prevent the cleanup of sci_ports[0] while the serial device is still being used by earlycon, introduce the struct sci_port::probing flag and account for it in early_console_exit().
--- drivers/tty/serial/sh-sci.c | 32 ++++++++++++++++++++++++++++++-- 1 file changed, 30 insertions(+), 2 deletions(-)
drivers/tty/serial/sh-sci.c +30 -2
@@ -183,6 +183,7 @@ static struct sci_port sci_ports[SCI_NPOstatic unsigned long sci_ports_in_use;static struct uart_driver sci_uart_driver;static bool sci_uart_earlycon; +static bool sci_uart_earlycon_dev_probing;static inline struct sci_port *to_sci_port (struct uart_port *uart)
@@ -3404,7 +3405,8 @@ static struct plat_sci_port *sci_parse_dstatic int sci_probe_single (struct platform_device *dev,unsigned int index,struct plat_sci_port *p, -struct sci_port *sciport) +struct sci_port *sciport, +struct resource *sci_res) {int ret;
@@ -3451,6 +3453,14 @@ static int sci_probe_single(struct platf sciport->port.flags |=UPF_HARD_FLOW ; } +if (sci_uart_earlycon && sci_ports[0 ].port.mapbase == sci_res->start) { +/* +* Skip cleanup the sci_port[0] in early_console_exit(), this +* port is the same as the earlycon one. +*/ + sci_uart_earlycon_dev_probing = true; + } +return uart_add_one_port (&sci_uart_driver, &sciport->port); }
@@ -3509,7 +3519,7 @@ static int sci_probe(struct platform_devplatform_set_drvdata (dev, sp); - ret =sci_probe_single (dev, dev_id, p, sp); + ret =sci_probe_single (dev, dev_id, p, sp, res);if (ret)return ret;
@@ -3666,6 +3676,22 @@ sh_early_platform_init_buffer("earlyprin#ifdef CONFIG_SERIAL_SH_SCI_EARLYCON static struct plat_sci_port port_cfg; +static int early_console_exit (struct console *co) +{ +struct sci_port *sci_port = &sci_ports[0 ]; + +/* +* Clean the slot used by earlycon. A new SCI device might +* map to this slot. +*/ +if (!sci_uart_earlycon_dev_probing) { +memset (sci_port,0 ,sizeof (*sci_port)); + sci_uart_earlycon = false; + } + +return 0 ; +} +static int __init early_console_setup (struct earlycon_device *device,int type) {
@@ -3683,6 +3709,8 @@ static int __init early_console_setup(st SCSCR_RE | SCSCR_TE | port_cfg.scscr); device->con->write = serial_console_write; + device->con->exit = early_console_exit; +return 0 ; } static int __init sci_early_console_setup(struct earlycon_device *device,
Greg Kroah-Hartman
maintainerPATCH 399/414 serial: sh-sci: Increment the runtime usage counter for the earlycon device
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Claudiu Beznea <[email protected]>
commit 651dee03696e1dfde6d9a7e8664bbdcd9a10ea7f upstream.
In the sh-sci driver, serial ports are mapped to the sci_ports[] array, with earlycon mapped at index zero.
The uart_add_one_port() function eventually calls __device_attach(), which, in turn, calls pm_request_idle(). The identified code path is as follows:
uart_add_one_port() ->
serial_ctrl_register_port() ->
serial_core_register_port() ->
serial_core_port_device_add() ->
serial_base_port_add() ->
device_add() ->
bus_probe_device() ->
device_initial_probe() ->
__device_attach() ->
// ...
if (dev->p->dead) {
// ...
} else if (dev->driver) {
// ...
} else {
// ...
pm_request_idle(dev);
// ...
}The earlycon device clocks are enabled by the bootloader. However, the pm_request_idle() call in __device_attach() disables the SCI port clocks while earlycon is still active.
The earlycon write function, serial_console_write(), calls sci_poll_put_char() via serial_console_putchar(). If the SCI port clocks are disabled, writing to earlycon may sometimes cause the SR.TDFE bit to remain unset indefinitely, causing the while loop in sci_poll_put_char() to never exit. On single-core SoCs, this can result in the system being blocked during boot when this issue occurs.
To resolve this, increment the runtime PM usage counter for the earlycon SCI device before registering the UART port.
--- drivers/tty/serial/sh-sci.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
drivers/tty/serial/sh-sci.c +16 -0
@@ -3455,6 +3455,22 @@ static int sci_probe_single(struct platfif (sci_uart_earlycon && sci_ports[0 ].port.mapbase == sci_res->start) {/* +* In case: +* - this is the earlycon port (mapped on index 0 in sci_ports[]) and +* - it now maps to an alias other than zero and +* - the earlycon is still alive (e.g., "earlycon keep_bootcon" is +* available in bootargs) +* +* we need to avoid disabling clocks and PM domains through the runtime +* PM APIs called in __device_attach(). For this, increment the runtime +* PM reference counter (the clocks and PM domains were already enabled +* by the bootloader). Otherwise the earlycon may access the HW when it +* has no clocks enabled leading to failures (infinite loop in +* sci_poll_put_char()). +*/ +pm_runtime_get_noresume (&dev->dev); + +/* * Skip cleanup the sci_port[0] in early_console_exit(), this * port is the same as the earlycon one. */
Greg Kroah-Hartman
maintainerPATCH 400/414 smb: client: fix first command failure during re-negotiation
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: zhangjian <[email protected]>
commit 34331d7beed7576acfc98e991c39738b96162499 upstream.
after fabc4ed200f9, server_unresponsive add a condition to check whether client need to reconnect depending on server->lstrp. When client failed to reconnect for some time and abort connection, server->lstrp is updated for the last time. In the following scene, server->lstrp is too old. This cause next command failure in re-negotiation rather than waiting for re-negotiation done.
1. mount -t cifs -o username=Everyone,echo_internal=10 //$server_ip/export /mnt
2. ssh $server_ip "echo b > /proc/sysrq-trigger &"
3. ls /mnt
4. sleep 21s
5. ssh $server_ip "service firewalld stop"
6. ls # return EHOSTDOWN
If the interval between 5 and 6 is too small, 6 may trigger sending negotiation request. Before backgrounding cifsd thread try to receive negotiation response from server in cifs_readv_from_socket, server_unresponsive may trigger cifs_reconnect which cause 6 to be failed:
ls thread
----------------
smb2_negotiate
server->tcpStatus = CifsInNegotiate
compound_send_recv
wait_for_compound_requestcifsd thread
----------------
cifs_readv_from_socket
server_unresponsive
server->tcpStatus == CifsInNegotiate && jiffies > server->lstrp + 20s
cifs_reconnect
cifs_abort_connection: mid_state = MID_RETRY_NEEDED
ls thread
----------------
cifs_sync_mid_result return EAGAIN
smb2_negotiate return EHOSTDOWN
Though server->lstrp means last server response time, it is updated in cifs_abort_connection and cifs_get_tcp_session. We can also update server->lstrp before switching into CifsInNegotiate state to avoid failure in 6.
--- fs/smb/client/connect.c | 1 + 1 file changed, 1 insertion(+)
fs/smb/client/connect.c +1 -0
@@ -3993,6 +3993,7 @@ retry:return 0 ; } + server->lstrp = jiffies; server->tcpStatus = CifsInNegotiate;spin_unlock (&server->srv_lock);
Greg Kroah-Hartman
maintainerPATCH 401/414 smb: client: fix max_sge overflow in smb_extract_folioq_to_rdma()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Stefan Metzmacher <[email protected]>
commit a379a8a2a0032e12e7ef397197c9c2ad011588d6 upstream.
This fixes the following problem:
[ 749.901015] [ T8673] run fstests cifs/001 at 2025-06-17 09:40:30
[ 750.346409] [ T9870] ==================================================================
[ 750.346814] [ T9870] BUG: KASAN: slab-out-of-bounds in smb_set_sge+0x2cc/0x3b0 [cifs]
[ 750.347330] [ T9870] Write of size 8 at addr ffff888011082890 by task xfs_io/9870
[ 750.347705] [ T9870]
[ 750.348077] [ T9870] CPU: 0 UID: 0 PID: 9870 Comm: xfs_io Kdump: loaded Not tainted 6.16.0-rc2-metze.02+ #1 PREEMPT(voluntary)
[ 750.348082] [ T9870] Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS VirtualBox 12/01/2006
[ 750.348085] [ T9870] Call Trace:
[ 750.348086] [ T9870] <TASK>
[ 750.348088] [ T9870] dump_stack_lvl+0x76/0xa0
[ 750.348106] [ T9870] print_report+0xd1/0x640
[ 750.348116] [ T9870] ? __pfx__raw_spin_lock_irqsave+0x10/0x10
[ 750.348120] [ T9870] ? kasan_complete_mode_report_info+0x26/0x210
[ 750.348124] [ T9870] kasan_report+0xe7/0x130
[ 750.348128] [ T9870] ? smb_set_sge+0x2cc/0x3b0 [cifs]
[ 750.348262] [ T9870] ? smb_set_sge+0x2cc/0x3b0 [cifs]
[ 750.348377] [ T9870] __asan_report_store8_noabort+0x17/0x30
[ 750.348381] [ T9870] smb_set_sge+0x2cc/0x3b0 [cifs]
[ 750.348496] [ T9870] smbd_post_send_iter+0x1990/0x3070 [cifs]
[ 750.348625] [ T9870] ? __pfx_smbd_post_send_iter+0x10/0x10 [cifs]
[ 750.348741] [ T9870] ? update_stack_state+0x2a0/0x670
[ 750.348749] [ T9870] ? cifs_flush+0x153/0x320 [cifs]
[ 750.348870] [ T9870] ? cifs_flush+0x153/0x320 [cifs]
[ 750.348990] [ T9870] ? update_stack_state+0x2a0/0x670
[ 750.348995] [ T9870] smbd_send+0x58c/0x9c0 [cifs]
[ 750.349117] [ T9870] ? __pfx_smbd_send+0x10/0x10 [cifs]
[ 750.349231] [ T9870] ? unwind_get_return_address+0x65/0xb0
[ 750.349235] [ T9870] ? __pfx_stack_trace_consume_entry+0x10/0x10
[ 750.349242] [ T9870] ? arch_stack_walk+0xa7/0x100
[ 750.349250] [ T9870] ? stack_trace_save+0x92/0xd0
[ 750.349254] [ T9870] __smb_send_rqst+0x931/0xec0 [cifs]
[ 750.349374] [ T9870] ? kernel_text_address+0x173/0x190
[ 750.349379] [ T9870] ? kasan_save_stack+0x39/0x70
[ 750.349382] [ T9870] ? kasan_save_track+0x18/0x70
[ 750.349385] [ T9870] ? __kasan_slab_alloc+0x9d/0xa0
[ 750.349389] [ T9870] ? __pfx___smb_send_rqst+0x10/0x10 [cifs]
[ 750.349508] [ T9870] ? smb2_mid_entry_alloc+0xb4/0x7e0 [cifs]
[ 750.349626] [ T9870] ? cifs_call_async+0x277/0xb00 [cifs]
[ 750.349746] [ T9870] ? cifs_issue_write+0x256/0x610 [cifs]
[ 750.349867] [ T9870] ? netfs_do_issue_write+0xc2/0x340 [netfs]
[ 750.349900] [ T9870] ? netfs_advance_write+0x45b/0x1270 [netfs]
[ 750.349929] [ T9870] ? netfs_write_folio+0xd6c/0x1be0 [netfs]
[ 750.349958] [ T9870] ? netfs_writepages+0x2e9/0xa80 [netfs]
[ 750.349987] [ T9870] ? do_writepages+0x21f/0x590
[ 750.349993] [ T9870] ? filemap_fdatawrite_wbc+0xe1/0x140
[ 750.349997] [ T9870] ? entry_SYSCALL_64_after_hwframe+0x76/0x7e
[ 750.350002] [ T9870] smb_send_rqst+0x22e/0x2f0 [cifs]
[ 750.350131] [ T9870] ? __pfx_smb_send_rqst+0x10/0x10 [cifs]
[ 750.350255] [ T9870] ? local_clock_noinstr+0xe/0xd0
[ 750.350261] [ T9870] ? kasan_save_alloc_info+0x37/0x60
[ 750.350268] [ T9870] ? __kasan_check_write+0x14/0x30
[ 750.350271] [ T9870] ? _raw_spin_lock+0x81/0xf0
[ 750.350275] [ T9870] ? __pfx__raw_spin_lock+0x10/0x10
[ 750.350278] [ T9870] ? smb2_setup_async_request+0x293/0x580 [cifs]
[ 750.350398] [ T9870] cifs_call_async+0x477/0xb00 [cifs]
[ 750.350518] [ T9870] ? __pfx_smb2_writev_callback+0x10/0x10 [cifs]
[ 750.350636] [ T9870] ? __pfx_cifs_call_async+0x10/0x10 [cifs]
[ 750.350756] [ T9870] ? __pfx__raw_spin_lock+0x10/0x10
[ 750.350760] [ T9870] ? __kasan_check_write+0x14/0x30
[ 750.350763] [ T9870] ? __smb2_plain_req_init+0x933/0x1090 [cifs]
[ 750.350891] [ T9870] smb2_async_writev+0x15ff/0x2460 [cifs]
[ 750.351008] [ T9870] ? sched_clock_noinstr+0x9/0x10
[ 750.351012] [ T9870] ? local_clock_noinstr+0xe/0xd0
[ 750.351018] [ T9870] ? __pfx_smb2_async_writev+0x10/0x10 [cifs]
[ 750.351144] [ T9870] ? __pfx__raw_spin_lock_irqsave+0x10/0x10
[ 750.351150] [ T9870] ? _raw_spin_unlock+0xe/0x40
[ 750.351154] [ T9870] ? cifs_pick_channel+0x242/0x370 [cifs]
[ 750.351275] [ T9870] cifs_issue_write+0x256/0x610 [cifs]
[ 750.351554] [ T9870] ? cifs_issue_write+0x256/0x610 [cifs]
[ 750.351677] [ T9870] netfs_do_issue_write+0xc2/0x340 [netfs]
[ 750.351710] [ T9870] netfs_advance_write+0x45b/0x1270 [netfs]
[ 750.351740] [ T9870] ? rolling_buffer_append+0x12d/0x440 [netfs]
[ 750.351769] [ T9870] netfs_write_folio+0xd6c/0x1be0 [netfs]
[ 750.351798] [ T9870] ? __kasan_check_write+0x14/0x30
[ 750.351804] [ T9870] netfs_writepages+0x2e9/0xa80 [netfs]
[ 750.351835] [ T9870] ? __pfx_netfs_writepages+0x10/0x10 [netfs]
[ 750.351864] [ T9870] ? exit_files+0xab/0xe0
[ 750.351867] [ T9870] ? do_exit+0x148f/0x2980
[ 750.351871] [ T9870] ? do_group_exit+0xb5/0x250
[ 750.351874] [ T9870] ? arch_do_signal_or_restart+0x92/0x630
[ 750.351879] [ T9870] ? exit_to_user_mode_loop+0x98/0x170
[ 750.351882] [ T9870] ? do_syscall_64+0x2cf/0xd80
[ 750.351886] [ T9870] ? entry_SYSCALL_64_after_hwframe+0x76/0x7e
[ 750.351890] [ T9870] do_writepages+0x21f/0x590
[ 750.351894] [ T9870] ? __pfx_do_writepages+0x10/0x10
[ 750.351897] [ T9870] filemap_fdatawrite_wbc+0xe1/0x140
[ 750.351901] [ T9870] __filemap_fdatawrite_range+0xba/0x100
[ 750.351904] [ T9870] ? __pfx___filemap_fdatawrite_range+0x10/0x10
[ 750.351912] [ T9870] ? __kasan_check_write+0x14/0x30
[ 750.351916] [ T9870] filemap_write_and_wait_range+0x7d/0xf0
[ 750.351920] [ T9870] cifs_flush+0x153/0x320 [cifs]
[ 750.352042] [ T9870] filp_flush+0x107/0x1a0
[ 750.352046] [ T9870] filp_close+0x14/0x30
[ 750.352049] [ T9870] put_files_struct.part.0+0x126/0x2a0
[ 750.352053] [ T9870] ? __pfx__raw_spin_lock+0x10/0x10
[ 750.352058] [ T9870] exit_files+0xab/0xe0
[ 750.352061] [ T9870] do_exit+0x148f/0x2980
[ 750.352065] [ T9870] ? __pfx_do_exit+0x10/0x10
[ 750.352069] [ T9870] ? __kasan_check_write+0x14/0x30
[ 750.352072] [ T9870] ? _raw_spin_lock_irq+0x8a/0xf0
[ 750.352076] [ T9870] do_group_exit+0xb5/0x250
[ 750.352080] [ T9870] get_signal+0x22d3/0x22e0
[ 750.352086] [ T9870] ? __pfx_get_signal+0x10/0x10
[ 750.352089] [ T9870] ? fpregs_assert_state_consistent+0x68/0x100
[ 750.352101] [ T9870] ? folio_add_lru+0xda/0x120
[ 750.352105] [ T9870] arch_do_signal_or_restart+0x92/0x630
[ 750.352109] [ T9870] ? __pfx_arch_do_signal_or_restart+0x10/0x10
[ 750.352115] [ T9870] exit_to_user_mode_loop+0x98/0x170
[ 750.352118] [ T9870] do_syscall_64+0x2cf/0xd80
[ 750.352123] [ T9870] ? __kasan_check_read+0x11/0x20
[ 750.352126] [ T9870] ? count_memcg_events+0x1b4/0x420
[ 750.352132] [ T9870] ? handle_mm_fault+0x148/0x690
[ 750.352136] [ T9870] ? _raw_spin_lock_irq+0x8a/0xf0
[ 750.352140] [ T9870] ? __kasan_check_read+0x11/0x20
[ 750.352143] [ T9870] ? fpregs_assert_state_consistent+0x68/0x100
[ 750.352146] [ T9870] ? irqentry_exit_to_user_mode+0x2e/0x250
[ 750.352151] [ T9870] ? irqentry_exit+0x43/0x50
[ 750.352154] [ T9870] ? exc_page_fault+0x75/0xe0
[ 750.352160] [ T9870] entry_SYSCALL_64_after_hwframe+0x76/0x7e
[ 750.352163] [ T9870] RIP: 0033:0x7858c94ab6e2
[ 750.352167] [ T9870] Code: Unable to access opcode bytes at 0x7858c94ab6b8.
[ 750.352175] [ T9870] RSP: 002b:00007858c9248ce8 EFLAGS: 00000246 ORIG_RAX: 0000000000000022
[ 750.352179] [ T9870] RAX: fffffffffffffdfe RBX: 00007858c92496c0 RCX: 00007858c94ab6e2
[ 750.352182] [ T9870] RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000000
[ 750.352184] [ T9870] RBP: 00007858c9248d10 R08: 0000000000000000 R09: 0000000000000000
[ 750.352185] [ T9870] R10: 0000000000000000 R11: 0000000000000246 R12: fffffffffffffde0
[ 750.352187] [ T9870] R13: 0000000000000020 R14: 0000000000000002 R15: 00007ffc072d2230
[ 750.352191] [ T9870] </TASK>
[ 750.352195] [ T9870]
[ 750.395206] [ T9870] Allocated by task 9870 on cpu 0 at 750.346406s:
[ 750.395523] [ T9870] kasan_save_stack+0x39/0x70
[ 750.395532] [ T9870] kasan_save_track+0x18/0x70
[ 750.395536] [ T9870] kasan_save_alloc_info+0x37/0x60
[ 750.395539] [ T9870] __kasan_slab_alloc+0x9d/0xa0
[ 750.395543] [ T9870] kmem_cache_alloc_noprof+0x13c/0x3f0
[ 750.395548] [ T9870] mempool_alloc_slab+0x15/0x20
[ 750.395553] [ T9870] mempool_alloc_noprof+0x135/0x340
[ 750.395557] [ T9870] smbd_post_send_iter+0x63e/0x3070 [cifs]
[ 750.395694] [ T9870] smbd_send+0x58c/0x9c0 [cifs]
[ 750.395819] [ T9870] __smb_send_rqst+0x931/0xec0 [cifs]
[ 750.395950] [ T9870] smb_send_rqst+0x22e/0x2f0 [cifs]
[ 750.396081] [ T9870] cifs_call_async+0x477/0xb00 [cifs]
[ 750.396232] [ T9870] smb2_async_writev+0x15ff/0x2460 [cifs]
[ 750.396359] [ T9870] cifs_issue_write+0x256/0x610 [cifs]
[ 750.396492] [ T9870] netfs_do_issue_write+0xc2/0x340 [netfs]
[ 750.396544] [ T9870] netfs_advance_write+0x45b/0x1270 [netfs]
[ 750.396576] [ T9870] netfs_write_folio+0xd6c/0x1be0 [netfs]
[ 750.396608] [ T9870] netfs_writepages+0x2e9/0xa80 [netfs]
[ 750.396639] [ T9870] do_writepages+0x21f/0x590
[ 750.396643] [ T9870] filemap_fdatawrite_wbc+0xe1/0x140
[ 750.396647] [ T9870] __filemap_fdatawrite_range+0xba/0x100
[ 750.396651] [ T9870] filemap_write_and_wait_range+0x7d/0xf0
[ 750.396656] [ T9870] cifs_flush+0x153/0x320 [cifs]
[ 750.396787] [ T9870] filp_flush+0x107/0x1a0
[ 750.396791] [ T9870] filp_close+0x14/0x30
[ 750.396795] [ T9870] put_files_struct.part.0+0x126/0x2a0
[ 750.396800] [ T9870] exit_files+0xab/0xe0
[ 750.396803] [ T9870] do_exit+0x148f/0x2980
[ 750.396808] [ T9870] do_group_exit+0xb5/0x250
[ 750.396813] [ T9870] get_signal+0x22d3/0x22e0
[ 750.396817] [ T9870] arch_do_signal_or_restart+0x92/0x630
[ 750.396822] [ T9870] exit_to_user_mode_loop+0x98/0x170
[ 750.396827] [ T9870] do_syscall_64+0x2cf/0xd80
[ 750.396832] [ T9870] entry_SYSCALL_64_after_hwframe+0x76/0x7e
[ 750.396836] [ T9870]
[ 750.397150] [ T9870] The buggy address belongs to the object at ffff888011082800
which belongs to the cache smbd_request_0000000008f3bd7b of size 144
[ 750.397798] [ T9870] The buggy address is located 0 bytes to the right of
allocated 144-byte region [ffff888011082800, ffff888011082890)
[ 750.398469] [ T9870]
[ 750.398800] [ T9870] The buggy address belongs to the physical page:
[ 750.399141] [ T9870] page: refcount:0 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x11082
[ 750.399148] [ T9870] flags: 0xfffffc0000000(node=0|zone=1|lastcpupid=0x1fffff)
[ 750.399155] [ T9870] page_type: f5(slab)
[ 750.399161] [ T9870] raw: 000fffffc0000000 ffff888022d65640 dead000000000122 0000000000000000
[ 750.399165] [ T9870] raw: 0000000000000000 0000000080100010 00000000f5000000 0000000000000000
[ 750.399169] [ T9870] page dumped because: kasan: bad access detected
[ 750.399172] [ T9870]
[ 750.399505] [ T9870] Memory state around the buggy address:
[ 750.399863] [ T9870] ffff888011082780: fb fb fc fc fc fc fc fc fc fc fc fc fc fc fc fc
[ 750.400247] [ T9870] ffff888011082800: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00
[ 750.400618] [ T9870] >ffff888011082880: 00 00 fc fc fc fc fc fc fc fc fc fc fc fc fc fc
[ 750.400982] [ T9870] ^
[ 750.401370] [ T9870] ffff888011082900: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
[ 750.401774] [ T9870] ffff888011082980: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
[ 750.402171] [ T9870] ==================================================================
[ 750.402696] [ T9870] Disabling lock debugging due to kernel taint
[ 750.403202] [ T9870] BUG: unable to handle page fault for address: ffff8880110a2000
[ 750.403797] [ T9870] #PF: supervisor write access in kernel mode
[ 750.404204] [ T9870] #PF: error_code(0x0003) - permissions violation
[ 750.404581] [ T9870] PGD 5ce01067 P4D 5ce01067 PUD 5ce02067 PMD 78aa063 PTE 80000000110a2021
[ 750.404969] [ T9870] Oops: Oops: 0003 [#1] SMP KASAN PTI
[ 750.405394] [ T9870] CPU: 0 UID: 0 PID: 9870 Comm: xfs_io Kdump: loaded Tainted: G B 6.16.0-rc2-metze.02+ #1 PREEMPT(voluntary)
[ 750.406510] [ T9870] Tainted: [B]=BAD_PAGE
[ 750.406967] [ T9870] Hardware name: innotek GmbH VirtualBox/VirtualBox, BIOS VirtualBox 12/01/2006
[ 750.407440] [ T9870] RIP: 0010:smb_set_sge+0x15c/0x3b0 [cifs]
[ 750.408065] [ T9870] Code: 48 83 f8 ff 0f 84 b0 00 00 00 48 ba 00 00 00 00 00 fc ff df 4c 89 e1 48 c1 e9 03 80 3c 11 00 0f 85 69 01 00 00 49 8d 7c 24 08 <49> 89 04 24 48 b8 00 00 00 00 00 fc ff df 48 89 fa 48 c1 ea 03 0f
[ 750.409283] [ T9870] RSP: 0018:ffffc90005e2e758 EFLAGS: 00010246
[ 750.409803] [ T9870] RAX: ffff888036c53400 RBX: ffffc90005e2e878 RCX: 1ffff11002214400
[ 750.410323] [ T9870] RDX: dffffc0000000000 RSI: dffffc0000000000 RDI: ffff8880110a2008
[ 750.411217] [ T9870] RBP: ffffc90005e2e798 R08: 0000000000000001 R09: 0000000000000400
[ 750.411770] [ T9870] R10: ffff888011082800 R11: 0000000000000000 R12: ffff8880110a2000
[ 750.412325] [ T9870] R13: 0000000000000000 R14: ffffc90005e2e888 R15: ffff88801a4b6000
[ 750.412901] [ T9870] FS: 0000000000000000(0000) GS:ffff88812bc68000(0000) knlGS:0000000000000000
[ 750.413477] [ T9870] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
[ 750.414077] [ T9870] CR2: ffff8880110a2000 CR3: 000000005b0a6005 CR4: 00000000000726f0
[ 750.414654] [ T9870] Call Trace:
[ 750.415211] [ T9870] <TASK>
[ 750.415748] [ T9870] smbd_post_send_iter+0x1990/0x3070 [cifs]
[ 750.416449] [ T9870] ? __pfx_smbd_post_send_iter+0x10/0x10 [cifs]
[ 750.417128] [ T9870] ? update_stack_state+0x2a0/0x670
[ 750.417685] [ T9870] ? cifs_flush+0x153/0x320 [cifs]
[ 750.418380] [ T9870] ? cifs_flush+0x153/0x320 [cifs]
[ 750.419055] [ T9870] ? update_stack_state+0x2a0/0x670
[ 750.419624] [ T9870] smbd_send+0x58c/0x9c0 [cifs]
[ 750.420297] [ T9870] ? __pfx_smbd_send+0x10/0x10 [cifs]
[ 750.420936] [ T9870] ? unwind_get_return_address+0x65/0xb0
[ 750.421456] [ T9870] ? __pfx_stack_trace_consume_entry+0x10/0x10
[ 750.421954] [ T9870] ? arch_stack_walk+0xa7/0x100
[ 750.422460] [ T9870] ? stack_trace_save+0x92/0xd0
[ 750.422948] [ T9870] __smb_send_rqst+0x931/0xec0 [cifs]
[ 750.423579] [ T9870] ? kernel_text_address+0x173/0x190
[ 750.424056] [ T9870] ? kasan_save_stack+0x39/0x70
[ 750.424813] [ T9870] ? kasan_save_track+0x18/0x70
[ 750.425323] [ T9870] ? __kasan_slab_alloc+0x9d/0xa0
[ 750.425831] [ T9870] ? __pfx___smb_send_rqst+0x10/0x10 [cifs]
[ 750.426548] [ T9870] ? smb2_mid_entry_alloc+0xb4/0x7e0 [cifs]
[ 750.427231] [ T9870] ? cifs_call_async+0x277/0xb00 [cifs]
[ 750.427882] [ T9870] ? cifs_issue_write+0x256/0x610 [cifs]
[ 750.428909] [ T9870] ? netfs_do_issue_write+0xc2/0x340 [netfs]
[ 750.429425] [ T9870] ? netfs_advance_write+0x45b/0x1270 [netfs]
[ 750.429882] [ T9870] ? netfs_write_folio+0xd6c/0x1be0 [netfs]
[ 750.430345] [ T9870] ? netfs_writepages+0x2e9/0xa80 [netfs]
[ 750.430809] [ T9870] ? do_writepages+0x21f/0x590
[ 750.431239] [ T9870] ? filemap_fdatawrite_wbc+0xe1/0x140
[ 750.431652] [ T9870] ? entry_SYSCALL_64_after_hwframe+0x76/0x7e
[ 750.432041] [ T9870] smb_send_rqst+0x22e/0x2f0 [cifs]
[ 750.432586] [ T9870] ? __pfx_smb_send_rqst+0x10/0x10 [cifs]
[ 750.433108] [ T9870] ? local_clock_noinstr+0xe/0xd0
[ 750.433482] [ T9870] ? kasan_save_alloc_info+0x37/0x60
[ 750.433855] [ T9870] ? __kasan_check_write+0x14/0x30
[ 750.434214] [ T9870] ? _raw_spin_lock+0x81/0xf0
[ 750.434561] [ T9870] ? __pfx__raw_spin_lock+0x10/0x10
[ 750.434903] [ T9870] ? smb2_setup_async_request+0x293/0x580 [cifs]
[ 750.435394] [ T9870] cifs_call_async+0x477/0xb00 [cifs]
[ 750.435892] [ T9870] ? __pfx_smb2_writev_callback+0x10/0x10 [cifs]
[ 750.436388] [ T9870] ? __pfx_cifs_call_async+0x10/0x10 [cifs]
[ 750.436881] [ T9870] ? __pfx__raw_spin_lock+0x10/0x10
[ 750.437237] [ T9870] ? __kasan_check_write+0x14/0x30
[ 750.437579] [ T9870] ? __smb2_plain_req_init+0x933/0x1090 [cifs]
[ 750.438062] [ T9870] smb2_async_writev+0x15ff/0x2460 [cifs]
[ 750.438557] [ T9870] ? sched_clock_noinstr+0x9/0x10
[ 750.438906] [ T9870] ? local_clock_noinstr+0xe/0xd0
[ 750.439293] [ T9870] ? __pfx_smb2_async_writev+0x10/0x10 [cifs]
[ 750.439786] [ T9870] ? __pfx__raw_spin_lock_irqsave+0x10/0x10
[ 750.440143] [ T9870] ? _raw_spin_unlock+0xe/0x40
[ 750.440495] [ T9870] ? cifs_pick_channel+0x242/0x370 [cifs]
[ 750.440989] [ T9870] cifs_issue_write+0x256/0x610 [cifs]
[ 750.441492] [ T9870] ? cifs_issue_write+0x256/0x610 [cifs]
[ 750.441987] [ T9870] netfs_do_issue_write+0xc2/0x340 [netfs]
[ 750.442387] [ T9870] netfs_advance_write+0x45b/0x1270 [netfs]
[ 750.442969] [ T9870] ? rolling_buffer_append+0x12d/0x440 [netfs]
[ 750.443376] [ T9870] netfs_write_folio+0xd6c/0x1be0 [netfs]
[ 750.443768] [ T9870] ? __kasan_check_write+0x14/0x30
[ 750.444145] [ T9870] netfs_writepages+0x2e9/0xa80 [netfs]
[ 750.444541] [ T9870] ? __pfx_netfs_writepages+0x10/0x10 [netfs]
[ 750.444936] [ T9870] ? exit_files+0xab/0xe0
[ 750.445312] [ T9870] ? do_exit+0x148f/0x2980
[ 750.445672] [ T9870] ? do_group_exit+0xb5/0x250
[ 750.446028] [ T9870] ? arch_do_signal_or_restart+0x92/0x630
[ 750.446402] [ T9870] ? exit_to_user_mode_loop+0x98/0x170
[ 750.446762] [ T9870] ? do_syscall_64+0x2cf/0xd80
[ 750.447132] [ T9870] ? entry_SYSCALL_64_after_hwframe+0x76/0x7e
[ 750.447499] [ T9870] do_writepages+0x21f/0x590
[ 750.447859] [ T9870] ? __pfx_do_writepages+0x10/0x10
[ 750.448236] [ T9870] filemap_fdatawrite_wbc+0xe1/0x140
[ 750.448595] [ T9870] __filemap_fdatawrite_range+0xba/0x100
[ 750.448953] [ T9870] ? __pfx___filemap_fdatawrite_range+0x10/0x10
[ 750.449336] [ T9870] ? __kasan_check_write+0x14/0x30
[ 750.449697] [ T9870] filemap_write_and_wait_range+0x7d/0xf0
[ 750.450062] [ T9870] cifs_flush+0x153/0x320 [cifs]
[ 750.450592] [ T9870] filp_flush+0x107/0x1a0
[ 750.450952] [ T9870] filp_close+0x14/0x30
[ 750.451322] [ T9870] put_files_struct.part.0+0x126/0x2a0
[ 750.451678] [ T9870] ? __pfx__raw_spin_lock+0x10/0x10
[ 750.452033] [ T9870] exit_files+0xab/0xe0
[ 750.452401] [ T9870] do_exit+0x148f/0x2980
[ 750.452751] [ T9870] ? __pfx_do_exit+0x10/0x10
[ 750.453109] [ T9870] ? __kasan_check_write+0x14/0x30
[ 750.453459] [ T9870] ? _raw_spin_lock_irq+0x8a/0xf0
[ 750.453787] [ T9870] do_group_exit+0xb5/0x250
[ 750.454082] [ T9870] get_signal+0x22d3/0x22e0
[ 750.454406] [ T9870] ? __pfx_get_signal+0x10/0x10
[ 750.454709] [ T9870] ? fpregs_assert_state_consistent+0x68/0x100
[ 750.455031] [ T9870] ? folio_add_lru+0xda/0x120
[ 750.455347] [ T9870] arch_do_signal_or_restart+0x92/0x630
[ 750.455656] [ T9870] ? __pfx_arch_do_signal_or_restart+0x10/0x10
[ 750.455967] [ T9870] exit_to_user_mode_loop+0x98/0x170
[ 750.456282] [ T9870] do_syscall_64+0x2cf/0xd80
[ 750.456591] [ T9870] ? __kasan_check_read+0x11/0x20
[ 750.456897] [ T9870] ? count_memcg_events+0x1b4/0x420
[ 750.457280] [ T9870] ? handle_mm_fault+0x148/0x690
[ 750.457616] [ T9870] ? _raw_spin_lock_irq+0x8a/0xf0
[ 750.457925] [ T9870] ? __kasan_check_read+0x11/0x20
[ 750.458297] [ T9870] ? fpregs_assert_state_consistent+0x68/0x100
[ 750.458672] [ T9870] ? irqentry_exit_to_user_mode+0x2e/0x250
[ 750.459191] [ T9870] ? irqentry_exit+0x43/0x50
[ 750.459600] [ T9870] ? exc_page_fault+0x75/0xe0
[ 750.460130] [ T9870] entry_SYSCALL_64_after_hwframe+0x76/0x7e
[ 750.460570] [ T9870] RIP: 0033:0x7858c94ab6e2
[ 750.461206] [ T9870] Code: Unable to access opcode bytes at 0x7858c94ab6b8.
[ 750.461780] [ T9870] RSP: 002b:00007858c9248ce8 EFLAGS: 00000246 ORIG_RAX: 0000000000000022
[ 750.462327] [ T9870] RAX: fffffffffffffdfe RBX: 00007858c92496c0 RCX: 00007858c94ab6e2
[ 750.462653] [ T9870] RDX: 0000000000000000 RSI: 0000000000000000 RDI: 0000000000000000
[ 750.462969] [ T9870] RBP: 00007858c9248d10 R08: 0000000000000000 R09: 0000000000000000
[ 750.463290] [ T9870] R10: 0000000000000000 R11: 0000000000000246 R12: fffffffffffffde0
[ 750.463640] [ T9870] R13: 0000000000000020 R14: 0000000000000002 R15: 00007ffc072d2230
[ 750.463965] [ T9870] </TASK>
[ 750.464285] [ T9870] Modules linked in: siw ib_uverbs ccm cmac nls_utf8 cifs cifs_arc4 nls_ucs2_utils rdma_cm iw_cm ib_cm ib_core cifs_md4 netfs softdog vboxsf vboxguest cpuid intel_rapl_msr intel_rapl_common intel_uncore_frequency_common intel_pmc_core pmt_telemetry pmt_class intel_pmc_ssram_telemetry intel_vsec polyval_clmulni ghash_clmulni_intel sha1_ssse3 aesni_intel rapl i2c_piix4 i2c_smbus joydev input_leds mac_hid sunrpc binfmt_misc kvm_intel kvm irqbypass sch_fq_codel efi_pstore nfnetlink vsock_loopback vmw_vsock_virtio_transport_common vmw_vsock_vmci_transport vsock vmw_vmci dmi_sysfs ip_tables x_tables autofs4 hid_generic vboxvideo usbhid drm_vram_helper psmouse vga16fb vgastate drm_ttm_helper serio_raw hid ahci libahci ttm pata_acpi video wmi [last unloaded: vboxguest]
[ 750.467127] [ T9870] CR2: ffff8880110a2000--- fs/smb/client/smbdirect.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
fs/smb/client/smbdirect.c +3 -2
@@ -2552,13 +2552,14 @@ static ssize_t smb_extract_folioq_to_rdmsize_t fsize =folioq_folio_size (folioq, slot);if (offset < fsize) { -size_t part =umin (maxsize - ret, fsize - offset); +size_t part =umin (maxsize, fsize - offset);if (!smb_set_sge (rdma,folio_page (folio,0 ), offset, part))return -EIO ; offset += part; ret += part; + maxsize -= part; }if (offset >= fsize) {
@@ -2573,7 +2574,7 @@ static ssize_t smb_extract_folioq_to_rdm slot =0 ; } } - }while (rdma->nr_sge < rdma->max_sge || maxsize >0 ); + }while (rdma->nr_sge < rdma->max_sge && maxsize >0 ); iter->folioq = folioq; iter->folioq_slot = slot;
Greg Kroah-Hartman
maintainerPATCH 402/414 s390/pci: Fix __pcilg_mio_inuser() inline assembly
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Heiko Carstens <[email protected]>
commit c4abe6234246c75cdc43326415d9cff88b7cf06c upstream.
Use "a" constraint for the shift operand of the __pcilg_mio_inuser() inline assembly. The used "d" constraint allows the compiler to use any general purpose register for the shift operand, including register zero.
If register zero is used this my result in incorrect code generation:
8f6: a7 0a ff f8 ahi %r0,-8 8fa: eb 32 00 00 00 0c srlg %r3,%r2,0 <----
If register zero is selected to contain the shift value, the srlg instruction ignores the contents of the register and always shifts zero bits. Therefore use the "a" constraint which does not permit to select register zero.
--- arch/s390/pci/pci_mmio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/s390/pci/pci_mmio.c +1 -1
@@ -228,7 +228,7 @@ static inline int __pcilg_mio_inuser( [ioaddr_len] "+&d" (ioaddr_len.pair), [cc] "+d" (cc), [val] "=d" (val), [dst] "+a" (dst), [cnt] "+d" (cnt), [tmp] "=d" (tmp), - [shift] "+d" (shift) + [shift] "+a" (shift) :: "cc", "memory"); /* did we write everything to the user space buffer? */
Greg Kroah-Hartman
maintainerPATCH 403/414 perf: Fix sample vs do_exit()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <[email protected]>
[ Upstream commit 4f6fc782128355931527cefe3eb45338abd8ab39 ]
Baisheng Gao reported an ARM64 crash, which Mark decoded as being a synchronous external abort -- most likely due to trying to access MMIO in bad ways.
The crash further shows perf trying to do a user stack sample while in exit_mmap()'s tlb_finish_mmu() -- i.e. while tearing down the address space it is trying to access.
It turns out that we stop perf after we tear down the userspace mm; a receipie for disaster, since perf likes to access userspace for various reasons.
Flip this order by moving up where we stop perf in do_exit().
Additionally, harden PERF_SAMPLE_CALLCHAIN and PERF_SAMPLE_STACK_USER to abort when the current task does not have an mm (exit_mm() makes sure to set current->mm = NULL; before commencing with the actual teardown). Such that CPU wide events don't trip on this same problem.
--- kernel/events/core.c | 7 +++++++ kernel/exit.c | 17 +++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-)
kernel/events/core.c +7 -0
@@ -7097,6 +7097,10 @@ perf_sample_ustack_size(u16 stack_size, u16 header_size,if (!regs)return 0 ; +/* No mm, no stack, no dump. */ +if (!current->mm) +return 0 ; +/* * Check if we fit in with the requested stack size into the: * - TASK_SIZE
@@ -7808,6 +7812,9 @@ perf_callchain(struct perf_event *event, struct pt_regs *regs)const u32 max_stack = event->attr.sample_max_stack;struct perf_callchain_entry *callchain; +if (!current->mm) + user = false; +if (!kernel && !user)return &__empty_callchain;
kernel/exit.c +9 -8
@@ -923,6 +923,15 @@ void __noreturn do_exit(long code) tsk->exit_code = code;taskstats_exit (tsk, group_dead); +/* +* Since sampling can touch ->mm, make sure to stop everything before we +* tear it down. +* +* Also flushes inherited counters to the parent - before the parent +* gets woken up by child-exit notifications. +*/ +perf_event_exit_task (tsk); +exit_mm ();if (group_dead)
@@ -939,14 +948,6 @@ void __noreturn do_exit(long code)exit_task_work (tsk);exit_thread (tsk); -/* -* Flush inherited counters to the parent - before the parent -* gets woken up by child-exit notifications. -* -* because of cgroup mode, must be called before cgroup_exit() -*/ -perf_event_exit_task (tsk); -sched_autogroup_exit_task (tsk);cgroup_exit (tsk);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 404/414 perf: Fix cgroup state vs ERROR
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Peter Zijlstra <[email protected]>
[ Upstream commit 61988e36dc5457cdff7ae7927e8d9ad1419ee998 ]
While chasing down a missing perf_cgroup_event_disable() elsewhere, Leo Yan found that both perf_put_aux_event() and perf_remove_sibling_event() were also missing one.
Specifically, the rule is that events that switch to OFF,ERROR need to call perf_cgroup_event_disable().
Unify the disable paths to ensure this.
--- kernel/events/core.c | 51 ++++++++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 21 deletions(-)
kernel/events/core.c +30 -21
@@ -2111,8 +2111,9 @@ perf_aux_output_match(struct perf_event *event, struct perf_event *aux_event) }static void put_event (struct perf_event *event); -static void event_sched_out (struct perf_event *event, -struct perf_event_context *ctx); +static void __event_disable (struct perf_event *event, +struct perf_event_context *ctx, +enum perf_event_state state);static void perf_put_aux_event (struct perf_event *event) {
@@ -2145,8 +2146,7 @@ static void perf_put_aux_event(struct perf_event *event)* state so that we don't try to schedule it again. Note * that perf_event_enable() will clear the ERROR status. */ -event_sched_out (iter, ctx); -perf_event_set_state (event,PERF_EVENT_STATE_ERROR ); +__event_disable (iter, ctx,PERF_EVENT_STATE_ERROR ); } }
@@ -2204,18 +2204,6 @@ static inline struct list_head *get_event_list(struct perf_event *event) &event->pmu_ctx->flexible_active; } -/* -* Events that have PERF_EV_CAP_SIBLING require being part of a group and -* cannot exist on their own, schedule them out and move them into the ERROR -* state. Also see _perf_event_enable(), it will not be able to recover -* this ERROR state. -*/ -static inline void perf_remove_sibling_event (struct perf_event *event) -{ -event_sched_out (event, event->ctx); -perf_event_set_state (event,PERF_EVENT_STATE_ERROR ); -} -static void perf_group_detach (struct perf_event *event) {struct perf_event *leader = event->group_leader;
@@ -2251,8 +2239,15 @@ static void perf_group_detach(struct perf_event *event)*/ list_for_each_entry_safe (sibling, tmp, &event->sibling_list, sibling_list) { +/* +* Events that have PERF_EV_CAP_SIBLING require being part of +* a group and cannot exist on their own, schedule them out +* and move them into the ERROR state. Also see +* _perf_event_enable(), it will not be able to recover this +* ERROR state. +*/ if (sibling->event_caps &PERF_EV_CAP_SIBLING ) -perf_remove_sibling_event (sibling); +__event_disable (sibling, ctx,PERF_EVENT_STATE_ERROR ); sibling->group_leader = sibling;list_del_init (&sibling->sibling_list);
@@ -2512,6 +2507,15 @@ static void perf_remove_from_context(struct perf_event *event, unsigned long flaevent_function_call (event, __perf_remove_from_context, (void *)flags); } +static void __event_disable (struct perf_event *event, +struct perf_event_context *ctx, +enum perf_event_state state) +{ +event_sched_out (event, ctx); +perf_cgroup_event_disable (event, ctx); +perf_event_set_state (event, state); +} +/* * Cross CPU call to disable a performance event */
@@ -2526,13 +2530,18 @@ static void __perf_event_disable(struct perf_event *event,perf_pmu_disable (event->pmu_ctx->pmu);ctx_time_update_event (ctx, event); +/* +* When disabling a group leader, the whole group becomes ineligible +* to run, so schedule out the full group. +*/ if (event == event->group_leader)group_sched_out (event, ctx); -else -event_sched_out (event, ctx); -perf_event_set_state (event,PERF_EVENT_STATE_OFF ); -perf_cgroup_event_disable (event, ctx); +/* +* But only mark the leader OFF; the siblings will remain +* INACTIVE. +*/ +__event_disable (event, ctx,PERF_EVENT_STATE_OFF );perf_pmu_enable (event->pmu_ctx->pmu); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 405/414 perf/core: Fix WARN in perf_cgroup_switch()
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 3172fb986666dfb71bf483b6d3539e1e587fa197 ]
There may be concurrency between perf_cgroup_switch and perf_cgroup_event_disable. Consider the following scenario: after a new perf cgroup event is created on CPU0, the new event may not trigger a reprogramming, causing ctx->is_active to be 0. In this case, when CPU1 disables this perf event, it executes __perf_remove_from_context-> list _del_event->perf_cgroup_event_disable on CPU1, which causes a race with perf_cgroup_switch running on CPU0.
The following describes the details of this concurrency scenario:
CPU0 CPU1
perf_cgroup_switch:
...
# cpuctx->cgrp is not NULL here
if (READ_ONCE(cpuctx->cgrp) == NULL)
return;
perf_remove_from_context: ... raw_spin_lock_irq(&ctx->lock); ... # ctx->is_active == 0 because reprogramm is not # tigger, so CPU1 can do __perf_remove_from_context # for CPU0 __perf_remove_from_context: perf_cgroup_event_disable: ... if (--ctx->nr_cgroups) ...
# this warning will happened because CPU1 changed # ctx.nr_cgroups to 0. WARN_ON_ONCE(cpuctx->ctx.nr_cgroups == 0);
--- kernel/events/core.c | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-)
kernel/events/core.c +20 -2
@@ -206,6 +206,19 @@ static void perf_ctx_unlock(struct perf_cpu_context *cpuctx,__perf_ctx_unlock (&cpuctx->ctx); } +typedef struct { +struct perf_cpu_context *cpuctx; +struct perf_event_context *ctx; +}class_perf_ctx_lock_t ; + +static inline void class_perf_ctx_lock_destructor (class_perf_ctx_lock_t *_T) +{perf_ctx_unlock (_T->cpuctx, _T->ctx); } + +static inline class_perf_ctx_lock_t +class_perf_ctx_lock_constructor (struct perf_cpu_context *cpuctx, +struct perf_event_context *ctx) +{perf_ctx_lock (cpuctx, ctx);return (class_perf_ctx_lock_t ){ cpuctx, ctx }; } +#define TASK_TOMBSTONE ((void *)-1L)static bool is_kernel_event (struct perf_event *event)
@@ -898,7 +911,13 @@ static void perf_cgroup_switch(struct task_struct *task)if (READ_ONCE (cpuctx->cgrp) == cgrp)return ; -perf_ctx_lock (cpuctx, cpuctx->task_ctx); +guard (perf_ctx_lock)(cpuctx, cpuctx->task_ctx); +/* +* Re-check, could've raced vs perf_remove_from_context(). +*/ +if (READ_ONCE (cpuctx->cgrp) ==NULL ) +return ; +perf_ctx_disable (&cpuctx->ctx, true);ctx_sched_out (&cpuctx->ctx,NULL ,EVENT_ALL |EVENT_CGROUP );
@@ -916,7 +935,6 @@ static void perf_cgroup_switch(struct task_struct *task)ctx_sched_in (&cpuctx->ctx,NULL ,EVENT_ALL |EVENT_CGROUP );perf_ctx_enable (&cpuctx->ctx, true); -perf_ctx_unlock (cpuctx, cpuctx->task_ctx); } static int perf_cgroup_ensure_storage(struct perf_event *event,
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 406/414 arm64/ptrace: Fix stack-out-of-bounds read in regs_get_kernel_stack_nth()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Tengda Wu <[email protected]>
[ Upstream commit 39dfc971e42d886e7df01371cd1bef505076d84c ]
KASAN reports a stack-out-of-bounds read in regs_get_kernel_stack_nth().
Call Trace: [ 97.283505] BUG: KASAN: stack-out-of-bounds in regs_get_kernel_stack_nth+0xa8/0xc8 [ 97.284677] Read of size 8 at addr ffff800089277c10 by task 1.sh/2550 [ 97.285732] [ 97.286067] CPU: 7 PID: 2550 Comm: 1.sh Not tainted 6.6.0+ #11 [ 97.287032] Hardware name: linux,dummy-virt (DT) [ 97.287815] Call trace: [ 97.288279] dump_backtrace+0xa0/0x128 [ 97.288946] show_stack+0x20/0x38 [ 97.289551] dump_stack_lvl+0x78/0xc8 [ 97.290203] print_address_description.constprop.0+0x84/0x3c8 [ 97.291159] print_report+0xb0/0x280 [ 97.291792] kasan_report+0x84/0xd0 [ 97.292421] __asan_load8+0x9c/0xc0 [ 97.293042] regs_get_kernel_stack_nth+0xa8/0xc8 [ 97.293835] process_fetch_insn+0x770/0xa30 [ 97.294562] kprobe_trace_func+0x254/0x3b0 [ 97.295271] kprobe_dispatcher+0x98/0xe0 [ 97.295955] kprobe_breakpoint_handler+0x1b0/0x210 [ 97.296774] call_break_hook+0xc4/0x100 [ 97.297451] brk_handler+0x24/0x78 [ 97.298073] do_debug_exception+0xac/0x178 [ 97.298785] el1_dbg+0x70/0x90 [ 97.299344] el1h_64_sync_handler+0xcc/0xe8 [ 97.300066] el1h_64_sync+0x78/0x80 [ 97.300699] kernel_clone+0x0/0x500 [ 97.301331] __arm64_sys_clone+0x70/0x90 [ 97.302084] invoke_syscall+0x68/0x198 [ 97.302746] el0_svc_common.constprop.0+0x11c/0x150 [ 97.303569] do_el0_svc+0x38/0x50 [ 97.304164] el0_svc+0x44/0x1d8 [ 97.304749] el0t_64_sync_handler+0x100/0x130 [ 97.305500] el0t_64_sync+0x188/0x190 [ 97.306151] [ 97.306475] The buggy address belongs to stack of task 1.sh/2550 [ 97.307461] and is located at offset 0 in frame: [ 97.308257] __se_sys_clone+0x0/0x138 [ 97.308910] [ 97.309241] This frame has 1 object: [ 97.309873] [48, 184) 'args' [ 97.309876] [ 97.310749] The buggy address belongs to the virtual mapping at [ 97.310749] [ffff800089270000, ffff800089279000) created by: [ 97.310749] dup_task_struct+0xc0/0x2e8 [ 97.313347] [ 97.313674] The buggy address belongs to the physical page: [ 97.314604] page: refcount:1 mapcount:0 mapping:0000000000000000 index:0x0 pfn:0x14f69a [ 97.315885] flags: 0x15ffffe00000000(node=1|zone=2|lastcpupid=0xfffff) [ 97.316957] raw: 015ffffe00000000 0000000000000000 dead000000000122 0000000000000000 [ 97.318207] raw: 0000000000000000 0000000000000000 00000001ffffffff 0000000000000000 [ 97.319445] page dumped because: kasan: bad access detected [ 97.320371] [ 97.320694] Memory state around the buggy address: [ 97.321511] ffff800089277b00: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 97.322681] ffff800089277b80: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [ 97.323846] >ffff800089277c00: 00 00 f1 f1 f1 f1 f1 f1 00 00 00 00 00 00 00 00 [ 97.325023] ^ [ 97.325683] ffff800089277c80: 00 00 00 00 00 00 00 00 00 f3 f3 f3 f3 f3 f3 f3 [ 97.326856] ffff800089277d00: f3 f3 00 00 00 00 00 00 00 00 00 00 00 00 00 00
This issue seems to be related to the behavior of some gcc compilers and was also fixed on the s390 architecture before:
commit d93a855c31b7 ("s390/ptrace: Avoid KASAN false positives in regs_get_kernel_stack_nth()")
As described in that commit, regs_get_kernel_stack_nth() has confirmed that addr is on the stack, so reading the value at *addr should be allowed. Use READ_ONCE_NOCHECK() helper to silence the KASAN check for this case.
--- arch/arm64/kernel/ptrace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/kernel/ptrace.c +1 -1
@@ -140,7 +140,7 @@ unsigned long regs_get_kernel_stack_nth(struct pt_regs *regs, unsigned int n) addr += n;if (regs_within_kernel_stack (regs, (unsigned long )addr)) -return *addr; +return READ_ONCE_NOCHECK (*addr);else return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 407/414 scsi: elx: efct: Fix memory leak in efct_hw_parse_filter()
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Vitaliy Shevtsov <[email protected]>
[ Upstream commit 2a8a5a5dd06eef580f9818567773fd75057cb875 ]
strsep() modifies the address of the pointer passed to it so that it no longer points to the original address. This means kfree() gets the wrong pointer.
Fix this by passing unmodified pointer returned from kstrdup() to kfree().
Found by Linux Verification Center (linuxtesting.org) with Svace.
--- drivers/scsi/elx/efct/efct_hw.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/scsi/elx/efct/efct_hw.c +3 -2
@@ -1120,7 +1120,7 @@ int efct_hw_parse_filter(struct efct_hw *hw, void *value) { int rc = 0; -char *p =NULL ; +char *p =NULL , *pp =NULL ;char *token;u32 idx =0 ;
@@ -1132,6 +1132,7 @@ efct_hw_parse_filter(struct efct_hw *hw, void *value)efc_log_err (hw->os,"p is NULL\n" );return -ENOMEM ; } + pp = p; idx =0 ;while ((token =strsep (&p,"," )) && *token) {
@@ -1144,7 +1145,7 @@ efct_hw_parse_filter(struct efct_hw *hw, void *value)if (idx ==ARRAY_SIZE (hw->config.filter_def))break ; } -kfree (p); +kfree (pp);return rc; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 408/414 RISC-V: KVM: Fix the size parameter check in SBI SFENCE calls
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anup Patel <[email protected]>
[ Upstream commit 6aba0cb5bba6141158d5449f2cf53187b7f755f9 ]
As-per the SBI specification, an SBI remote fence operation applies to the entire address space if either:
1) start_addr and size are both 0
2) size is equal to 2^XLEN-1
Quoted 1 line
From the above, only #1 is checked by SBI SFENCE calls so fix the
size parameter check in SBI SFENCE calls to cover #2 as well.
--- arch/riscv/kvm/vcpu_sbi_replace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/riscv/kvm/vcpu_sbi_replace.c +2 -2
@@ -103,7 +103,7 @@ static int kvm_sbi_ext_rfence_handler(struct kvm_vcpu *vcpu, struct kvm_run *runkvm_riscv_vcpu_pmu_incr_fw (vcpu,SBI_PMU_FW_FENCE_I_SENT );break ;case SBI_EXT_RFENCE_REMOTE_SFENCE_VMA : -if (cp->a2 ==0 && cp->a3 ==0 ) +if ((cp->a2 ==0 && cp->a3 ==0 ) || cp->a3 ==-1UL )kvm_riscv_hfence_vvma_all (vcpu->kvm, hbase, hmask);else kvm_riscv_hfence_vvma_gva(vcpu->kvm, hbase, hmask,
@@ -111,7 +111,7 @@ static int kvm_sbi_ext_rfence_handler(struct kvm_vcpu *vcpu, struct kvm_run *runkvm_riscv_vcpu_pmu_incr_fw (vcpu,SBI_PMU_FW_HFENCE_VVMA_SENT );break ;case SBI_EXT_RFENCE_REMOTE_SFENCE_VMA_ASID : -if (cp->a2 ==0 && cp->a3 ==0 ) +if ((cp->a2 ==0 && cp->a3 ==0 ) || cp->a3 ==-1UL )kvm_riscv_hfence_vvma_asid_all (vcpu->kvm, hbase, hmask, cp->a4);else
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 409/414 RISC-V: KVM: Dont treat SBI HFENCE calls as NOPs
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Anup Patel <[email protected]>
[ Upstream commit 2e7be162996640bbe3b6da694cc064c511b8a5d9 ]
The SBI specification clearly states that SBI HFENCE calls should return SBI_ERR_NOT_SUPPORTED when one of the target hart doesn’t support hypervisor extension (aka nested virtualization in-case of KVM RISC-V).
--- arch/riscv/kvm/vcpu_sbi_replace.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/riscv/kvm/vcpu_sbi_replace.c +2 -2
@@ -127,9 +127,9 @@ static int kvm_sbi_ext_rfence_handler(struct kvm_vcpu *vcpu, struct kvm_run *runcase SBI_EXT_RFENCE_REMOTE_HFENCE_VVMA_ASID :/* * Until nested virtualization is implemented, the -* SBI HFENCE calls should be treated as NOPs +* SBI HFENCE calls should return not supported +* hence fallthrough. */ -break ;default : retdata->err_val =SBI_ERR_NOT_SUPPORTED ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 410/414 gpio: pca953x: fix wrong error probe return value
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sascha Hauer <[email protected]>
[ Upstream commit 0a1db19f66c0960eb00e1f2ccd40708b6747f5b1 ]
The second argument to dev_err_probe() is the error value. Pass the return value of devm_request_threaded_irq() there instead of the irq number.
--- drivers/gpio/gpio-pca953x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpio-pca953x.c +1 -1
@@ -951,7 +951,7 @@ static int pca953x_irq_setup(struct pca953x_chip *chip, int irq_base)IRQF_ONESHOT |IRQF_SHARED ,dev_name (dev), chip);if (ret) -return dev_err_probe (dev, client->irq,"failed to request irq\n" ); +return dev_err_probe (dev, ret,"failed to request irq\n" );return 0 ; }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 411/414 perf evsel: Missed close() when probing hybrid core PMUs
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit ebec62bc7ec435b475722a5467d67c720a1ad79f ]
Add missing close() to avoid leaking perf events.
In past perfs this mattered little as the function was just used by 'perf list'.
As the function is now used to detect hybrid PMUs leaking the perf event is somewhat more painful.
--- tools/perf/util/print-events.c | 1 + 1 file changed, 1 insertion(+)
tools/perf/util/print-events.c +1 -0
@@ -282,6 +282,7 @@ bool is_event_supported(u8 type, u64 config) ret =evsel__open (evsel,NULL , tmap) >=0 ; } +evsel__close (evsel);evsel__delete (evsel); }
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 412/414 perf test: Directory file descriptor leak
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ian Rogers <[email protected]>
[ Upstream commit 19f4422d485b2d0a935117a1a16015328f99be25 ]
Add missed close when iterating over the script directories.
--- tools/perf/tests/tests-scripts.c | 1 + 1 file changed, 1 insertion(+)
tools/perf/tests/tests-scripts.c +1 -0
@@ -255,6 +255,7 @@ static void append_scripts_in_dir(int dir_fd,continue ;/* Skip scripts that have a separate driver. */ fd =openat (dir_fd, ent->d_name,O_PATH );append_scripts_in_dir (fd, result, result_sz); +close (fd); }for (i =0 ; i < n_dirs; i++)/* Clean up */ zfree (&entlist[i]);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 413/414 gpio: mlxbf3: only get IRQ for device instance 0
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: David Thompson <[email protected]>
[ Upstream commit 10af0273a35ab4513ca1546644b8c853044da134 ]
The gpio-mlxbf3 driver interfaces with two GPIO controllers, device instance 0 and 1. There is a single IRQ resource shared between the two controllers, and it is found in the ACPI table for device instance 0. The driver should not attempt to get an IRQ resource when probing device instance 1, otherwise the following error is logged:
mlxbf3_gpio MLNXBF33:01: error -ENXIO: IRQ index 0 not found
--- drivers/gpio/gpio-mlxbf3.c | 54 ++++++++++++++++++++++++-------------- 1 file changed, 35 insertions(+), 19 deletions(-)
drivers/gpio/gpio-mlxbf3.c +35 -19
@@ -190,7 +190,9 @@ static int mlxbf3_gpio_probe(struct platform_device *pdev)struct mlxbf3_gpio_context *gs;struct gpio_irq_chip *girq;struct gpio_chip *gc; +char *colon_ptr;int ret, irq; +long num; gs =devm_kzalloc (dev,sizeof (*gs),GFP_KERNEL );if (!gs)
@@ -227,25 +229,39 @@ static int mlxbf3_gpio_probe(struct platform_device *pdev) gc->owner =THIS_MODULE ; gc->add_pin_ranges = mlxbf3_gpio_add_pin_ranges; - irq =platform_get_irq (pdev,0 ); -if (irq >=0 ) { - girq = &gs->gc.irq; -gpio_irq_chip_set_chip (girq, &gpio_mlxbf3_irqchip); - girq->default_type =IRQ_TYPE_NONE ; -/* This will let us handle the parent IRQ in the driver */ - girq->num_parents =0 ; - girq->parents =NULL ; - girq->parent_handler =NULL ; - girq->handler = handle_bad_irq; - -/* -* Directly request the irq here instead of passing -* a flow-handler because the irq is shared. -*/ - ret =devm_request_irq (dev, irq, mlxbf3_gpio_irq_handler, -IRQF_SHARED ,dev_name (dev), gs); -if (ret) -return dev_err_probe (dev, ret,"failed to request IRQ" ); + colon_ptr =strchr (dev_name (dev),':' ); +if (!colon_ptr) { +dev_err (dev,"invalid device name format\n" ); +return -EINVAL ; + } + + ret =kstrtol (++colon_ptr,16 , &num); +if (ret) { +dev_err (dev,"invalid device instance\n" ); +return ret; + } + +if (!num) { + irq =platform_get_irq (pdev,0 ); +if (irq >=0 ) { + girq = &gs->gc.irq; +gpio_irq_chip_set_chip (girq, &gpio_mlxbf3_irqchip); + girq->default_type =IRQ_TYPE_NONE ; +/* This will let us handle the parent IRQ in the driver */ + girq->num_parents =0 ; + girq->parents =NULL ; + girq->parent_handler =NULL ; + girq->handler = handle_bad_irq; + +/* +* Directly request the irq here instead of passing +* a flow-handler because the irq is shared. +*/ + ret =devm_request_irq (dev, irq, mlxbf3_gpio_irq_handler, +IRQF_SHARED ,dev_name (dev), gs); +if (ret) +return dev_err_probe (dev, ret,"failed to request IRQ" ); + } }platform_set_drvdata (pdev, gs);
Signature · 1 line
2.39.5
Greg Kroah-Hartman
maintainerPATCH 414/414 cifs: Remove duplicate fattr->cf_dtype assignment from wsl_to_fattr() function
In reply to Greg Kroah-Hartman6.12-stable review patch. If anyone has any objections, please let me know.
------------------
From: Pali Rohár <[email protected]>
[ Upstream commit 840738eae94864993a735ab677b9795bb8f3b961 ]
Commit 8bd25b61c5a5 ("smb: client: set correct d_type for reparse DFS/DFSR and mount point") deduplicated assignment of fattr->cf_dtype member from all places to end of the function cifs_reparse_point_to_fattr(). The only one missing place which was not deduplicated is wsl_to_fattr(). Fix it.
--- fs/smb/client/reparse.c | 1 - 1 file changed, 1 deletion(-)
fs/smb/client/reparse.c +0 -1
@@ -738,7 +738,6 @@ static bool wsl_to_fattr(struct cifs_open_info_data *data,if (!have_xattr_dev && (tag ==IO_REPARSE_TAG_LX_CHR || tag ==IO_REPARSE_TAG_LX_BLK ))return false; - fattr->cf_dtype =S_DT (fattr->cf_mode);return true; }
Signature · 1 line
2.39.5
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.12.35 release. There are 414 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 Wed, 25 Jun 2025 13:05:53 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.12.35-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.12.y
and the diffstat can be found below.thanks,
greg k-h
On ARCH_BRCMSTB using 32-bit and 64-bit ARM kernels, build tested on BMIPS_GENERIC:
Signature · 1 line
Florian
Quoted 9 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 6.12.35 release. There are 414 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 Wed, 25 Jun 2025 13:05:53 +0000. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
Quoted 8 lines
https://www.kernel.org/pub/linux/kernel/v6.x/stable-review/patch-6.12.35-rc1.gzor in the git tree and branch at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable-rc.gitlinux-6.12.y
and the diffstat can be found below.thanks,
greg k-h
Built and booted successfully on RISC-V RV64 (HiFive Unmatched).